diff options
Diffstat (limited to 'po/ru.po')
| -rw-r--r-- | po/ru.po | 3652 |
1 files changed, 1813 insertions, 1839 deletions
diff --git a/po/ru.po b/po/ru.po index b8c60718..812e9dc6 100644 --- a/po/ru.po +++ b/po/ru.po @@ -13,13 +13,11 @@ # ypoyarko <ypoyarko@redhat.com>, 2014. #zanata # Stas Solovey <whats_up@tut.by>, 2012, 2014, 2015. # -#: ../src/nm-iface-helper.c:297 msgid "" msgstr "" "Project-Id-Version: ru\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -"product=NetworkManager&keywords=I18N+L10N&component=Translations\n" -"POT-Creation-Date: 2015-02-26 11:39+0000\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-12-23 14:29+0100\n" "PO-Revision-Date: 2015-02-27 02:25+0300\n" "Last-Translator: Stas Solovey <whats_up@tut.by>\n" "Language-Team: Русский <gnome-cyr@gnome.org>\n" @@ -81,13 +79,11 @@ msgstr "" #: ../clients/cli/agent.c:154 #, fuzzy, c-format -#| msgid "Modem initialization failed" msgid "Error: secret agent initialization failed" msgstr "Не удалось инициализировать модем" #: ../clients/cli/agent.c:169 #, fuzzy, c-format -#| msgid "Error: Connection activation failed: %s" msgid "Error: polkit agent initialization failed: %s" msgstr "Ошибка: сбой активации соединения: %s" @@ -96,427 +92,498 @@ msgstr "Ошибка: сбой активации соединения: %s" msgid "nmcli successfully registered as a polkit agent.\n" msgstr "" -#: ../clients/cli/agent.c:209 ../clients/cli/connections.c:8958 -#: ../clients/cli/connections.c:8984 ../clients/cli/connections.c:9182 -#: ../clients/cli/devices.c:2908 ../clients/cli/general.c:361 -#: ../clients/cli/general.c:514 +#: ../clients/cli/agent.c:209 ../clients/cli/connections.c:9246 +#: ../clients/cli/devices.c:3060 ../clients/cli/general.c:325 +#: ../clients/cli/general.c:463 #, c-format msgid "Error: NetworkManager is not running." msgstr "Ошибка: NetworkManager не запущен." #: ../clients/cli/agent.c:245 #, fuzzy, c-format -#| msgid "Error: 'general' command '%s' is not valid." msgid "Error: 'agent' command '%s' is not valid." msgstr "Ошибка. Недопустимая команда «general»: «%s»." -#: ../clients/cli/common.c:40 ../clients/cli/common.c:53 -#: ../clients/cli/common.c:61 ../clients/cli/common.c:73 -#: ../clients/cli/connections.c:172 ../clients/cli/connections.c:194 +#: ../clients/cli/common.c:41 ../clients/cli/common.c:54 +#: ../clients/cli/common.c:62 ../clients/cli/common.c:74 +#: ../clients/cli/connections.c:173 ../clients/cli/connections.c:195 msgid "GROUP" msgstr "ГРУППА" #. 0 -#: ../clients/cli/common.c:41 ../clients/cli/common.c:62 +#: ../clients/cli/common.c:42 ../clients/cli/common.c:63 msgid "ADDRESS" msgstr "АДРЕС" #. 1 #. 2 -#: ../clients/cli/common.c:42 ../clients/cli/common.c:63 -#: ../clients/cli/connections.c:197 +#: ../clients/cli/common.c:43 ../clients/cli/common.c:64 +#: ../clients/cli/connections.c:198 msgid "GATEWAY" msgstr "ШЛЮЗ" #. 2 -#: ../clients/cli/common.c:43 ../clients/cli/common.c:64 +#: ../clients/cli/common.c:44 ../clients/cli/common.c:65 msgid "ROUTE" msgstr "МАРШРУТ" #. 3 -#: ../clients/cli/common.c:44 ../clients/cli/common.c:65 +#: ../clients/cli/common.c:45 ../clients/cli/common.c:66 msgid "DNS" msgstr "DNS" #. 4 -#: ../clients/cli/common.c:45 ../clients/cli/common.c:66 +#: ../clients/cli/common.c:46 ../clients/cli/common.c:67 msgid "DOMAIN" msgstr "ДОМЕН" #. 5 -#: ../clients/cli/common.c:46 +#: ../clients/cli/common.c:47 msgid "WINS" msgstr "WINS" #. 0 -#: ../clients/cli/common.c:54 ../clients/cli/common.c:74 +#: ../clients/cli/common.c:55 ../clients/cli/common.c:75 msgid "OPTION" msgstr "ПАРАМЕТР" -#: ../clients/cli/common.c:378 ../clients/cli/common.c:438 +#: ../clients/cli/common.c:379 ../clients/cli/common.c:439 #, fuzzy, c-format -#| msgid "invalid prefix '%s'; <1-32> allowed" msgid "invalid prefix '%s'; <1-%d> allowed" msgstr "недопустимый префикс «%s» (допускается <1-32>)" -#: ../clients/cli/common.c:386 +#: ../clients/cli/common.c:387 #, fuzzy, c-format -#| msgid "invalid IPv4 address '%s'" msgid "invalid IP address: %s" msgstr "недопустимый адрес IPv4: «%s»" -#: ../clients/cli/common.c:450 +#: ../clients/cli/common.c:451 #, c-format msgid "" "the second component of route ('%s') is neither a next hop address nor a " "metric" msgstr "" -#: ../clients/cli/common.c:459 +#: ../clients/cli/common.c:460 #, c-format msgid "invalid metric '%s'" msgstr "недопустимая метрика «%s»" -#: ../clients/cli/common.c:467 +#: ../clients/cli/common.c:468 #, fuzzy, c-format -#| msgid "invalid IPv4 route '%s'" msgid "invalid route: %s" msgstr "недопустимый маршрут IPv4: «%s»" -#: ../clients/cli/common.c:479 +#: ../clients/cli/common.c:480 msgid "default route cannot be added (NetworkManager handles it by itself)" msgstr "" -#: ../clients/cli/common.c:496 +#: ../clients/cli/common.c:497 msgid "unmanaged" msgstr "без управления" -#: ../clients/cli/common.c:498 +#: ../clients/cli/common.c:499 msgid "unavailable" msgstr "недоступен" -#: ../clients/cli/common.c:500 ../clients/cli/general.c:260 +#: ../clients/cli/common.c:501 ../clients/cli/general.c:260 msgid "disconnected" msgstr "отключено" -#: ../clients/cli/common.c:502 +#: ../clients/cli/common.c:503 msgid "connecting (prepare)" msgstr "подключение (подготовка)" -#: ../clients/cli/common.c:504 +#: ../clients/cli/common.c:505 msgid "connecting (configuring)" msgstr "подключение (настройка)" -#: ../clients/cli/common.c:506 +#: ../clients/cli/common.c:507 msgid "connecting (need authentication)" msgstr "подключение (требуется аутентификация)" -#: ../clients/cli/common.c:508 +#: ../clients/cli/common.c:509 msgid "connecting (getting IP configuration)" msgstr "подключение (получение конфигурации IP)" -#: ../clients/cli/common.c:510 +#: ../clients/cli/common.c:511 msgid "connecting (checking IP connectivity)" msgstr "подключение (проверка IP-подключения)" -#: ../clients/cli/common.c:512 +#: ../clients/cli/common.c:513 msgid "connecting (starting secondary connections)" msgstr "подключение (запуск второстепенных соединений)" -#: ../clients/cli/common.c:514 ../clients/cli/general.c:256 +#: ../clients/cli/common.c:515 ../clients/cli/general.c:256 msgid "connected" msgstr "подключено" -#: ../clients/cli/common.c:516 ../clients/cli/connections.c:540 +#: ../clients/cli/common.c:517 ../clients/cli/connections.c:544 msgid "deactivating" msgstr "деактивация" -#: ../clients/cli/common.c:518 +#: ../clients/cli/common.c:519 msgid "connection failed" msgstr "сбой соединения" -#: ../clients/cli/common.c:520 ../clients/cli/connections.c:545 -#: ../clients/cli/connections.c:568 ../clients/cli/connections.c:1859 -#: ../clients/cli/devices.c:940 ../clients/cli/general.c:263 -#: ../clients/cli/general.c:301 ../clients/cli/general.c:462 -#: ../clients/cli/general.c:478 ../clients/cli/settings.c:721 -#: ../clients/cli/settings.c:783 ../clients/cli/settings.c:1077 -#: ../clients/cli/utils.c:1311 ../src/main.c:315 ../src/main.c:343 +#: ../clients/cli/common.c:521 ../clients/cli/common.c:538 +#: ../clients/cli/connections.c:549 ../clients/cli/connections.c:572 +#: ../clients/cli/connections.c:1712 ../clients/cli/devices.c:891 +#: ../clients/cli/devices.c:932 ../clients/cli/devices.c:934 +#: ../clients/cli/general.c:263 ../clients/cli/general.c:281 +#: ../clients/cli/general.c:411 ../clients/cli/general.c:427 +#: ../clients/cli/settings.c:732 ../clients/cli/settings.c:817 +#: ../clients/cli/settings.c:1118 ../clients/cli/settings.c:2839 +#: ../clients/cli/utils.c:1200 ../src/main.c:241 ../src/main.c:386 +#: ../src/main.c:436 msgid "unknown" msgstr "неизвестно" -#: ../clients/cli/common.c:529 +#. "CAPABILITIES" +#: ../clients/cli/common.c:530 ../clients/cli/connections.c:819 +#: ../clients/cli/connections.c:821 ../clients/cli/connections.c:823 +#: ../clients/cli/connections.c:855 ../clients/cli/connections.c:922 +#: ../clients/cli/connections.c:923 ../clients/cli/connections.c:925 +#: ../clients/cli/connections.c:3158 ../clients/cli/connections.c:7239 +#: ../clients/cli/connections.c:7240 ../clients/cli/devices.c:598 +#: ../clients/cli/devices.c:648 ../clients/cli/devices.c:856 +#: ../clients/cli/devices.c:857 ../clients/cli/devices.c:858 +#: ../clients/cli/devices.c:859 ../clients/cli/devices.c:895 +#: ../clients/cli/devices.c:897 ../clients/cli/devices.c:925 +#: ../clients/cli/devices.c:926 ../clients/cli/devices.c:927 +#: ../clients/cli/devices.c:928 ../clients/cli/devices.c:929 +#: ../clients/cli/devices.c:930 ../clients/cli/devices.c:931 +#: ../clients/cli/devices.c:933 ../clients/cli/devices.c:935 +#: ../clients/cli/general.c:421 ../clients/cli/settings.c:2834 +msgid "yes" +msgstr "да" + +#: ../clients/cli/common.c:532 ../clients/cli/connections.c:819 +#: ../clients/cli/connections.c:821 ../clients/cli/connections.c:823 +#: ../clients/cli/connections.c:922 ../clients/cli/connections.c:923 +#: ../clients/cli/connections.c:925 ../clients/cli/connections.c:3159 +#: ../clients/cli/connections.c:7239 ../clients/cli/connections.c:7240 +#: ../clients/cli/devices.c:598 ../clients/cli/devices.c:648 +#: ../clients/cli/devices.c:856 ../clients/cli/devices.c:857 +#: ../clients/cli/devices.c:858 ../clients/cli/devices.c:859 +#: ../clients/cli/devices.c:895 ../clients/cli/devices.c:897 +#: ../clients/cli/devices.c:925 ../clients/cli/devices.c:926 +#: ../clients/cli/devices.c:927 ../clients/cli/devices.c:928 +#: ../clients/cli/devices.c:929 ../clients/cli/devices.c:930 +#: ../clients/cli/devices.c:931 ../clients/cli/devices.c:933 +#: ../clients/cli/devices.c:935 ../clients/cli/general.c:423 +#: ../clients/cli/settings.c:2836 +msgid "no" +msgstr "нет" + +#: ../clients/cli/common.c:534 +msgid "yes (guessed)" +msgstr "" + +#: ../clients/cli/common.c:536 +msgid "no (guessed)" +msgstr "" + +#: ../clients/cli/common.c:547 msgid "No reason given" msgstr "Причина не указана" -#: ../clients/cli/common.c:532 ../clients/cli/connections.c:2859 +#: ../clients/cli/common.c:550 ../clients/cli/connections.c:2729 #, c-format msgid "Unknown error" msgstr "Неизвестная ошибка" -#: ../clients/cli/common.c:535 +#: ../clients/cli/common.c:553 msgid "Device is now managed" msgstr "Устройство обслуживается" -#: ../clients/cli/common.c:538 +#: ../clients/cli/common.c:556 msgid "Device is now unmanaged" msgstr "Устройство не обслуживается" -#: ../clients/cli/common.c:541 +#: ../clients/cli/common.c:559 msgid "The device could not be readied for configuration" msgstr "Устройство не позволяет чтение конфигурации" -#: ../clients/cli/common.c:544 +#: ../clients/cli/common.c:562 msgid "" "IP configuration could not be reserved (no available address, timeout, etc.)" msgstr "" "Конфигурация IP не может быть зарезервирована (отсутствует доступный адрес, " "истекло время ожидания и т.д.)" -#: ../clients/cli/common.c:547 +#: ../clients/cli/common.c:565 msgid "The IP configuration is no longer valid" msgstr "Конфигурация IP не актуальна" -#: ../clients/cli/common.c:550 +#: ../clients/cli/common.c:568 msgid "Secrets were required, but not provided" msgstr "Не предоставлена требуемая секретная информация" -#: ../clients/cli/common.c:553 +#: ../clients/cli/common.c:571 msgid "802.1X supplicant disconnected" msgstr "Заявитель 802.1X отключён" -#: ../clients/cli/common.c:556 +#: ../clients/cli/common.c:574 msgid "802.1X supplicant configuration failed" msgstr "Сбой конфигурации заявителя 802.1X" -#: ../clients/cli/common.c:559 +#: ../clients/cli/common.c:577 msgid "802.1X supplicant failed" msgstr "Сбой заявителя 802.1X" -#: ../clients/cli/common.c:562 +#: ../clients/cli/common.c:580 msgid "802.1X supplicant took too long to authenticate" msgstr "Превышено время ожидания при проверке подлинности заявителя 802.1X" -#: ../clients/cli/common.c:565 +#: ../clients/cli/common.c:583 msgid "PPP service failed to start" msgstr "Не удалось запустить службу PPP" -#: ../clients/cli/common.c:568 +#: ../clients/cli/common.c:586 msgid "PPP service disconnected" msgstr "Служба PPP отключена" -#: ../clients/cli/common.c:571 +#: ../clients/cli/common.c:589 msgid "PPP failed" msgstr "Сбой PPP" -#: ../clients/cli/common.c:574 +#: ../clients/cli/common.c:592 msgid "DHCP client failed to start" msgstr "Не удалось запустить клиент DHCP" -#: ../clients/cli/common.c:577 +#: ../clients/cli/common.c:595 msgid "DHCP client error" msgstr "Ошибка клиента DHCP" -#: ../clients/cli/common.c:580 +#: ../clients/cli/common.c:598 msgid "DHCP client failed" msgstr "Сбой клиента DHCP" -#: ../clients/cli/common.c:583 +#: ../clients/cli/common.c:601 msgid "Shared connection service failed to start" msgstr "Не удалось запустить службу общего подключения" -#: ../clients/cli/common.c:586 +#: ../clients/cli/common.c:604 msgid "Shared connection service failed" msgstr "Сбой службы общего подключения" -#: ../clients/cli/common.c:589 +#: ../clients/cli/common.c:607 msgid "AutoIP service failed to start" msgstr "Не удалось запустить службу AutoIP" -#: ../clients/cli/common.c:592 +#: ../clients/cli/common.c:610 msgid "AutoIP service error" msgstr "Сбой службы AutoIP" -#: ../clients/cli/common.c:595 +#: ../clients/cli/common.c:613 msgid "AutoIP service failed" msgstr "Ошибка службы AutoIP" -#: ../clients/cli/common.c:598 +#: ../clients/cli/common.c:616 msgid "The line is busy" msgstr "Линия занята" -#: ../clients/cli/common.c:601 +#: ../clients/cli/common.c:619 msgid "No dial tone" msgstr "Нет гудка" -#: ../clients/cli/common.c:604 +#: ../clients/cli/common.c:622 msgid "No carrier could be established" msgstr "Не удалось установить несущую частоту" -#: ../clients/cli/common.c:607 +#: ../clients/cli/common.c:625 msgid "The dialing request timed out" msgstr "Истекло время ожидания набора номера" -#: ../clients/cli/common.c:610 +#: ../clients/cli/common.c:628 msgid "The dialing attempt failed" msgstr "Во время набора номера произошла ошибка" -#: ../clients/cli/common.c:613 +#: ../clients/cli/common.c:631 msgid "Modem initialization failed" msgstr "Не удалось инициализировать модем" -#: ../clients/cli/common.c:616 +#: ../clients/cli/common.c:634 msgid "Failed to select the specified APN" msgstr "Не удалось выбрать указанный APN" -#: ../clients/cli/common.c:619 +#: ../clients/cli/common.c:637 msgid "Not searching for networks" msgstr "Не выполнять поиск сетей" -#: ../clients/cli/common.c:622 +#: ../clients/cli/common.c:640 msgid "Network registration denied" msgstr "Регистрация сети запрещена" -#: ../clients/cli/common.c:625 +#: ../clients/cli/common.c:643 msgid "Network registration timed out" msgstr "Истекло время ожидания регистрации сети" -#: ../clients/cli/common.c:628 +#: ../clients/cli/common.c:646 msgid "Failed to register with the requested network" msgstr "Не удалось зарегистрироваться в запрошенной сети" -#: ../clients/cli/common.c:631 +#: ../clients/cli/common.c:649 msgid "PIN check failed" msgstr "PIN-код не прошёл проверку" -#: ../clients/cli/common.c:634 +#: ../clients/cli/common.c:652 msgid "Necessary firmware for the device may be missing" msgstr "" "Возможно для устройства требуется дополнительное программное обеспечение" -#: ../clients/cli/common.c:637 +#: ../clients/cli/common.c:655 msgid "The device was removed" msgstr "Устройство извлечено" -#: ../clients/cli/common.c:640 +#: ../clients/cli/common.c:658 msgid "NetworkManager went to sleep" msgstr "NetworkManager перешёл в спящий режим" -#: ../clients/cli/common.c:643 +#: ../clients/cli/common.c:661 msgid "The device's active connection disappeared" msgstr "Устройство потеряло используемое соединение" -#: ../clients/cli/common.c:646 +#: ../clients/cli/common.c:664 msgid "Device disconnected by user or client" msgstr "Устройство отключено пользователем или клиентом" -#: ../clients/cli/common.c:649 +#: ../clients/cli/common.c:667 msgid "Carrier/link changed" msgstr "Произошли изменения линии или несущей частоты" -#: ../clients/cli/common.c:652 +#: ../clients/cli/common.c:670 msgid "The device's existing connection was assumed" msgstr "Существующее соединение устройства принято" -#: ../clients/cli/common.c:655 +#: ../clients/cli/common.c:673 msgid "The supplicant is now available" msgstr "Доступен заявитель" -#: ../clients/cli/common.c:658 +#: ../clients/cli/common.c:676 msgid "The modem could not be found" msgstr "Не удалось обнаружить модем" -#: ../clients/cli/common.c:661 +#: ../clients/cli/common.c:679 msgid "The Bluetooth connection failed or timed out" msgstr "Время ожидания соединения по Bluetooth истекло или произошла ошибка" -#: ../clients/cli/common.c:664 +#: ../clients/cli/common.c:682 msgid "GSM Modem's SIM card not inserted" msgstr "Не вставлена SIM-карта GSM-модема" -#: ../clients/cli/common.c:667 +#: ../clients/cli/common.c:685 msgid "GSM Modem's SIM PIN required" msgstr "Требуется PIN-код к SIM-карте GSM-модема" -#: ../clients/cli/common.c:670 +#: ../clients/cli/common.c:688 msgid "GSM Modem's SIM PUK required" msgstr "Требуется PUK-код к SIM-карте GSM-модема" -#: ../clients/cli/common.c:673 +#: ../clients/cli/common.c:691 msgid "GSM Modem's SIM wrong" msgstr "Неверная SIM-карта GSM модема" -#: ../clients/cli/common.c:676 +#: ../clients/cli/common.c:694 msgid "InfiniBand device does not support connected mode" msgstr "Устройство InfiniBand не поддерживает режим соединения" -#: ../clients/cli/common.c:679 +#: ../clients/cli/common.c:697 msgid "A dependency of the connection failed" msgstr "Сбой зависимости соединения" -#: ../clients/cli/common.c:682 +#: ../clients/cli/common.c:700 msgid "A problem with the RFC 2684 Ethernet over ADSL bridge" msgstr "Ошибка RFC 2684 Ethernet с использованием моста ADSL" -#: ../clients/cli/common.c:685 +#: ../clients/cli/common.c:703 msgid "ModemManager is unavailable" msgstr "ModemManager недоступен" -#: ../clients/cli/common.c:688 +#: ../clients/cli/common.c:706 msgid "The Wi-Fi network could not be found" msgstr "Не удалось обнаружить сеть Wi-Fi" -#: ../clients/cli/common.c:691 +#: ../clients/cli/common.c:709 msgid "A secondary connection of the base connection failed" msgstr "Сбой вторичного подключения основого соединения" -#: ../clients/cli/common.c:694 +#: ../clients/cli/common.c:712 msgid "DCB or FCoE setup failed" msgstr "Не удалось настроить DCB или FCoE" -#: ../clients/cli/common.c:697 +#: ../clients/cli/common.c:715 msgid "teamd control failed" msgstr "Не удалось настроить teamd" -#: ../clients/cli/common.c:700 +#: ../clients/cli/common.c:718 #, fuzzy -#| msgid "ModemManager is unavailable" msgid "Modem failed or no longer available" msgstr "ModemManager недоступен" -#: ../clients/cli/common.c:703 +#: ../clients/cli/common.c:721 #, fuzzy -#| msgid "ModemManager is unavailable" msgid "Modem now ready and available" msgstr "ModemManager недоступен" -#: ../clients/cli/common.c:706 +#: ../clients/cli/common.c:724 msgid "SIM PIN was incorrect" msgstr "Неверный PIN-код SIM-карты" +#: ../clients/cli/common.c:727 +#, fuzzy +msgid "New connection activation was enqueued" +msgstr "Ошибка: сбой активации соединения." + +#: ../clients/cli/common.c:730 +#, fuzzy +msgid "The device's parent changed" +msgstr "Устройство извлечено" + +#: ../clients/cli/common.c:733 +#, fuzzy +msgid "The device parent's management changed" +msgstr "Устройство извлечено" + #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason) -#: ../clients/cli/common.c:710 ../clients/cli/devices.c:681 -#: ../libnm-glib/nm-device.c:1813 ../libnm/nm-device.c:1635 +#: ../clients/cli/common.c:737 ../clients/cli/devices.c:628 +#: ../libnm-glib/nm-device.c:1813 ../libnm/nm-device.c:1658 msgid "Unknown" msgstr "Неизвестно" -#: ../clients/cli/common.c:752 +#: ../clients/cli/common.c:779 #, c-format msgid "invalid priority map '%s'" msgstr "Неверная схема приоритетов «%s»" -#: ../clients/cli/common.c:759 ../clients/cli/common.c:765 +#: ../clients/cli/common.c:786 ../clients/cli/common.c:792 #, c-format msgid "priority '%s' is not valid (<0-%ld>)" msgstr "недопустимый приоритет «%s» (<0-%ld>)" -#: ../clients/cli/common.c:832 +#: ../clients/cli/common.c:859 #, c-format msgid "'%s' is not a valid team configuration or file name." msgstr "" "Недопустимое имя файла или неверная конфигурация агрегации (team): «%s»" -#: ../clients/cli/common.c:933 +#: ../clients/cli/common.c:961 +#, fuzzy, c-format +msgid "Error: openconnect failed: %s\n" +msgstr "Ошибка. Проверка соединения завершилась неудачей: %s\n" + +#: ../clients/cli/common.c:968 +#, fuzzy, c-format +msgid "Error: openconnect failed with status %d\n" +msgstr "Ошибка редактора: %s" + +#: ../clients/cli/common.c:970 +#, fuzzy, c-format +msgid "Error: openconnect failed with signal %d\n" +msgstr "Ошибка редактора: %s" + +#: ../clients/cli/common.c:1047 #, c-format msgid "" "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask " @@ -561,20 +628,25 @@ msgstr "Мастер-мост:" msgid "Connection (name, UUID, or path): " msgstr "Соединение (имя, UUID, или путь):" +#: ../clients/cli/connections.c:53 +#, fuzzy +msgid "Connection(s) (name, UUID, or path): " +msgstr "Соединение (имя, UUID, или путь):" + #. 0 -#: ../clients/cli/connections.c:60 ../clients/cli/connections.c:173 -#: ../clients/cli/devices.c:57 ../clients/cli/devices.c:86 -#: ../clients/cli/devices.c:96 ../clients/cli/devices.c:107 -#: ../clients/cli/devices.c:116 ../clients/cli/devices.c:131 -#: ../clients/cli/devices.c:144 ../clients/cli/devices.c:170 -#: ../clients/cli/devices.c:185 ../clients/cli/devices.c:194 -#: ../clients/cli/devices.c:204 +#: ../clients/cli/connections.c:61 ../clients/cli/connections.c:174 +#: ../clients/cli/devices.c:58 ../clients/cli/devices.c:91 +#: ../clients/cli/devices.c:101 ../clients/cli/devices.c:112 +#: ../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 msgid "NAME" msgstr "ИМЯ" #. 0 #. 1 -#: ../clients/cli/connections.c:61 ../clients/cli/connections.c:174 +#: ../clients/cli/connections.c:62 ../clients/cli/connections.c:175 msgid "UUID" msgstr "UUID" @@ -582,37 +654,36 @@ msgstr "UUID" #. 0 #. 1 #. 2 -#: ../clients/cli/connections.c:62 ../clients/cli/connections.c:195 -#: ../clients/cli/devices.c:43 ../clients/cli/devices.c:59 -#: ../clients/cli/devices.c:173 +#: ../clients/cli/connections.c:63 ../clients/cli/connections.c:196 +#: ../clients/cli/devices.c:44 ../clients/cli/devices.c:60 +#: ../clients/cli/devices.c:180 msgid "TYPE" msgstr "ТИП" #. 2 -#: ../clients/cli/connections.c:63 +#: ../clients/cli/connections.c:64 msgid "TIMESTAMP" msgstr "МЕТКА ВРЕМЕНИ" #. 3 -#: ../clients/cli/connections.c:64 +#: ../clients/cli/connections.c:65 msgid "TIMESTAMP-REAL" msgstr "ДЕЙСТВ. МЕТКА ВРЕМЕНИ" #. 4 -#. 15 -#: ../clients/cli/connections.c:65 ../clients/cli/devices.c:73 +#. 16 +#: ../clients/cli/connections.c:66 ../clients/cli/devices.c:75 msgid "AUTOCONNECT" msgstr "АВТОПОДКЛЮЧЕНИЕ" #. 5 -#: ../clients/cli/connections.c:66 +#: ../clients/cli/connections.c:67 #, fuzzy -#| msgid "AUTOCONNECT" msgid "AUTOCONNECT-PRIORITY" msgstr "АВТОПОДКЛЮЧЕНИЕ" #. 6 -#: ../clients/cli/connections.c:67 +#: ../clients/cli/connections.c:68 msgid "READONLY" msgstr "ТОЛЬКО ДЛЯ ЧТЕНИЯ" @@ -621,17 +692,17 @@ msgstr "ТОЛЬКО ДЛЯ ЧТЕНИЯ" #. 2 #. 15 #. 5 -#: ../clients/cli/connections.c:68 ../clients/cli/connections.c:181 -#: ../clients/cli/devices.c:45 ../clients/cli/devices.c:160 -#: ../clients/cli/devices.c:176 +#: ../clients/cli/connections.c:69 ../clients/cli/connections.c:182 +#: ../clients/cli/devices.c:46 ../clients/cli/devices.c:167 +#: ../clients/cli/devices.c:183 msgid "DBUS-PATH" msgstr "DBUS-PATH" #. 8 #. 13 #. 4 -#: ../clients/cli/connections.c:69 ../clients/cli/devices.c:158 -#: ../clients/cli/devices.c:175 +#: ../clients/cli/connections.c:70 ../clients/cli/devices.c:165 +#: ../clients/cli/devices.c:182 msgid "ACTIVE" msgstr "АКТИВЕН" @@ -639,164 +710,133 @@ msgstr "АКТИВЕН" #. 0 #. 12 #. 3 -#: ../clients/cli/connections.c:70 ../clients/cli/devices.c:42 -#: ../clients/cli/devices.c:58 ../clients/cli/devices.c:157 -#: ../clients/cli/devices.c:174 +#: ../clients/cli/connections.c:71 ../clients/cli/devices.c:43 +#: ../clients/cli/devices.c:59 ../clients/cli/devices.c:164 +#: ../clients/cli/devices.c:181 msgid "DEVICE" msgstr "УСТРОЙСТВО" #. 10 #. 3 #. 1 -#. 9 +#. 10 #. 1 -#: ../clients/cli/connections.c:71 ../clients/cli/connections.c:176 -#: ../clients/cli/devices.c:44 ../clients/cli/devices.c:67 +#: ../clients/cli/connections.c:72 ../clients/cli/connections.c:177 +#: ../clients/cli/devices.c:45 ../clients/cli/devices.c:69 #: ../clients/cli/general.c:37 msgid "STATE" msgstr "СОСТОЯНИЕ" #. 11 -#: ../clients/cli/connections.c:72 +#: ../clients/cli/connections.c:73 #, fuzzy -#| msgid "MASTER-PATH" msgid "ACTIVE-PATH" msgstr "МАСТЕР-ПУТЬ" #. 2 -#: ../clients/cli/connections.c:175 +#: ../clients/cli/connections.c:176 msgid "DEVICES" msgstr "УСТРОЙСТВА" #. 4 -#: ../clients/cli/connections.c:177 +#: ../clients/cli/connections.c:178 msgid "DEFAULT" msgstr "ПО УМОЛЧАНИЮ" #. 5 -#: ../clients/cli/connections.c:178 +#: ../clients/cli/connections.c:179 msgid "DEFAULT6" msgstr "ПО УМОЛЧАНИЮ 6" #. 6 -#: ../clients/cli/connections.c:179 +#: ../clients/cli/connections.c:180 msgid "SPEC-OBJECT" msgstr "SPEC-OBJECT" #. 7 #. 4 #. Ask for optional 'vpn' arguments. -#: ../clients/cli/connections.c:180 ../clients/cli/connections.c:218 -#: ../clients/cli/connections.c:3984 ../clients/tui/nm-editor-utils.c:234 +#: ../clients/cli/connections.c:181 ../clients/cli/connections.c:219 +#: ../clients/cli/connections.c:3863 ../clients/tui/nm-editor-utils.c:234 #: ../clients/tui/nmt-connect-connection-list.c:406 msgid "VPN" msgstr "VPN" #. 9 #. 5 -#. 19 -#: ../clients/cli/connections.c:182 ../clients/cli/devices.c:48 -#: ../clients/cli/devices.c:77 +#. 21 +#: ../clients/cli/connections.c:183 ../clients/cli/devices.c:49 +#: ../clients/cli/devices.c:80 msgid "CON-PATH" msgstr "ПУТЬ ПОДКЛЮЧЕНИЯ" #. 10 -#: ../clients/cli/connections.c:183 +#: ../clients/cli/connections.c:184 msgid "ZONE" msgstr "ЗОНА" #. 11 -#: ../clients/cli/connections.c:184 +#: ../clients/cli/connections.c:185 msgid "MASTER-PATH" msgstr "МАСТЕР-ПУТЬ" #. 1 -#: ../clients/cli/connections.c:196 +#: ../clients/cli/connections.c:197 msgid "USERNAME" msgstr "ИМЯ_ПОЛЬЗОВАТЕЛЯ" #. 3 -#: ../clients/cli/connections.c:198 +#: ../clients/cli/connections.c:199 msgid "BANNER" msgstr "БАННЕР" #. 4 -#: ../clients/cli/connections.c:199 +#: ../clients/cli/connections.c:200 msgid "VPN-STATE" msgstr "СТАТУС VPN" #. 5 -#: ../clients/cli/connections.c:200 +#: ../clients/cli/connections.c:201 msgid "CFG" msgstr "CFG" -#: ../clients/cli/connections.c:213 ../clients/cli/devices.c:219 +#: ../clients/cli/connections.c:214 ../clients/cli/devices.c:226 msgid "GENERAL" msgstr "ОБЩИЕ" #. 0 #. 6 -#: ../clients/cli/connections.c:214 ../clients/cli/devices.c:226 +#: ../clients/cli/connections.c:215 ../clients/cli/devices.c:233 msgid "IP4" msgstr "IP4" #. 1 #. 7 -#: ../clients/cli/connections.c:215 ../clients/cli/devices.c:227 +#: ../clients/cli/connections.c:216 ../clients/cli/devices.c:234 msgid "DHCP4" msgstr "DHCP4" #. 2 #. 8 -#: ../clients/cli/connections.c:216 ../clients/cli/devices.c:228 +#: ../clients/cli/connections.c:217 ../clients/cli/devices.c:235 msgid "IP6" msgstr "IP6" #. 3 #. 9 -#: ../clients/cli/connections.c:217 ../clients/cli/devices.c:229 +#: ../clients/cli/connections.c:218 ../clients/cli/devices.c:236 msgid "DHCP6" msgstr "DHCP6" -#: ../clients/cli/connections.c:251 -#, fuzzy, c-format -#| msgid "" -#| "Usage: nmcli connection { COMMAND | help }\n" -#| "\n" -#| "COMMAND := { show | up | down | add | modify | edit | delete | reload | " -#| "load }\n" -#| "\n" -#| " show configured [[id | uuid | path] <ID>]\n" -#| " show active [[id | uuid | path | apath] <ID>]\n" -#| "\n" -#| " up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [nsp " -#| "<name>]\n" -#| "\n" -#| " up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>]\n" -#| "\n" -#| " down [id | uuid | path | apath] <ID>\n" -#| "\n" -#| " add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n" -#| "\n" -#| " modify [id | uuid | path] <ID> <setting>.<property> <value>\n" -#| "\n" -#| " edit [id | uuid | path] <ID>\n" -#| " edit [type <new_con_type>] [con-name <new_con_name>]\n" -#| "\n" -#| " delete [id | uuid | path] <ID>\n" -#| "\n" -#| " reload\n" -#| "\n" -#| " load <filename> [ <filename>... ]\n" -#| "\n" +#: ../clients/cli/connections.c:253 +#, fuzzy, c-format msgid "" "Usage: nmcli connection { COMMAND | help }\n" "\n" "COMMAND := { show | up | down | add | modify | edit | delete | reload | " "load }\n" "\n" -" show [--active] [--order <order spec>]\n" -" show [--active] [--show-secrets] [id | uuid | path | apath] <ID> ...\n" +" show [--active] [[--show-secrets] [id | uuid | path | apath] <ID>] ...\n" "\n" " up [[id | uuid | path] <ID>] [ifname <ifname>] [ap <BSSID>] [nsp <name>] " "[passwd-file <file with passwords>]\n" @@ -849,19 +889,18 @@ msgstr "" " load <файл> [ <файл>... ]\n" "\n" -#: ../clients/cli/connections.c:273 +#: ../clients/cli/connections.c:274 #, c-format msgid "" "Usage: nmcli connection show { ARGUMENTS | help }\n" "\n" -"ARGUMENTS := [--active] [--order <order spec>]\n" +"ARGUMENTS := [--active]\n" "\n" "List in-memory and on-disk connection profiles, some of which may also be\n" "active if a device is using that connection profile. Without a parameter, " "all\n" "profiles are listed. When --active option is specified, only the active\n" -"profiles are shown. --order allows custom connection ordering (see manual " -"page).\n" +"profiles are shown.\n" "\n" "ARGUMENTS := [--active] [--show-secrets] [id | uuid | path | apath] " "<ID> ...\n" @@ -876,27 +915,8 @@ msgid "" "account. --show-secrets option will reveal associated secrets as well.\n" msgstr "" -#: ../clients/cli/connections.c:294 -#, fuzzy, c-format -#| msgid "" -#| "Usage: nmcli connection up { ARGUMENTS | help }\n" -#| "\n" -#| "ARGUMENTS := [id | uuid | path] <ID> [ifname <ifname>] [ap <BSSID>] [nsp " -#| "<name>]\n" -#| "\n" -#| "Activate a connection on a device. The profile to activate is identified " -#| "by its\n" -#| "name, UUID or D-Bus path.\n" -#| "\n" -#| "ARGUMENTS := ifname <ifname> [ap <BSSID>] [nsp <name>]\n" -#| "\n" -#| "Activate a device with a connection. The connection profile is selected\n" -#| "automatically by NetworkManager.\n" -#| "\n" -#| "ifname - specifies the device to active the connection on\n" -#| "ap - specifies AP to connect to (only valid for Wi-Fi)\n" -#| "nsp - specifies NSP to connect to (only valid for WiMAX)\n" -#| "\n" +#: ../clients/cli/connections.c:295 +#, fuzzy, c-format msgid "" "Usage: nmcli connection up { ARGUMENTS | help }\n" "\n" @@ -937,19 +957,8 @@ msgstr "" "nsp — NSP (только для WiMAX)\n" "\n" -#: ../clients/cli/connections.c:315 +#: ../clients/cli/connections.c:316 #, fuzzy, c-format -#| msgid "" -#| "Usage: nmcli connection down { ARGUMENTS | help }\n" -#| "\n" -#| "ARGUMENTS := [id | uuid | path | apath] <ID>\n" -#| "\n" -#| "Deactivate a connection from a device (without preventing the device " -#| "from\n" -#| "further auto-activation). The profile to deactivate is identified by its " -#| "name,\n" -#| "UUID or D-Bus path.\n" -#| "\n" msgid "" "Usage: nmcli connection down { ARGUMENTS | help }\n" "\n" @@ -971,102 +980,8 @@ msgstr "" "\n" "\n" -#: ../clients/cli/connections.c:327 -#, fuzzy, c-format -#| msgid "" -#| "Usage: nmcli connection add { ARGUMENTS | help }\n" -#| "\n" -#| "ARGUMENTS := COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n" -#| "\n" -#| " COMMON_OPTIONS:\n" -#| " type <type>\n" -#| " ifname <interface name> | \"*\"\n" -#| " [con-name <connection name>]\n" -#| " [autoconnect yes|no]\n" -#| "\n" -#| " TYPE_SPECIFIC_OPTIONS:\n" -#| " ethernet: [mac <MAC address>]\n" -#| " [cloned-mac <cloned MAC address>]\n" -#| " [mtu <MTU>]\n" -#| "\n" -#| " wifi: ssid <SSID>\n" -#| " [mac <MAC address>]\n" -#| " [cloned-mac <cloned MAC address>]\n" -#| " [mtu <MTU>]\n" -#| "\n" -#| " wimax: [mac <MAC address>]\n" -#| " [nsp <NSP>]\n" -#| "\n" -#| " pppoe: username <PPPoE username>\n" -#| " [password <PPPoE password>]\n" -#| " [service <PPPoE service name>]\n" -#| " [mtu <MTU>]\n" -#| " [mac <MAC address>]\n" -#| "\n" -#| " gsm: apn <APN>\n" -#| " [user <username>]\n" -#| " [password <password>]\n" -#| "\n" -#| " cdma: [user <username>]\n" -#| " [password <password>]\n" -#| "\n" -#| " infiniband: [mac <MAC address>]\n" -#| " [mtu <MTU>]\n" -#| " [transport-mode datagram | connected]\n" -#| " [parent <ifname>]\n" -#| " [p-key <IPoIB P_Key>]\n" -#| "\n" -#| " bluetooth: [addr <bluetooth address>]\n" -#| " [bt-type panu|dun-gsm|dun-cdma]\n" -#| "\n" -#| " vlan: dev <parent device (connection UUID, ifname, or MAC)>\n" -#| " id <VLAN ID>\n" -#| " [flags <VLAN flags>]\n" -#| " [ingress <ingress priority mapping>]\n" -#| " [egress <egress priority mapping>]\n" -#| " [mtu <MTU>]\n" -#| "\n" -#| " bond: [mode balance-rr (0) | active-backup (1) | balance-xor " -#| "(2) | broadcast (3) |\n" -#| " 802.3ad (4) | balance-tlb (5) | balance-alb " -#| "(6)]\n" -#| " [primary <ifname>]\n" -#| " [miimon <num>]\n" -#| " [downdelay <num>]\n" -#| " [updelay <num>]\n" -#| " [arp-interval <num>]\n" -#| " [arp-ip-target <num>]\n" -#| "\n" -#| " bond-slave: master <master (ifname or connection UUID)>\n" -#| "\n" -#| " team: [config <file>|<raw JSON data>]\n" -#| "\n" -#| " team-slave: master <master (ifname or connection UUID)>\n" -#| " [config <file>|<raw JSON data>]\n" -#| "\n" -#| " bridge: [stp yes|no]\n" -#| " [priority <num>]\n" -#| " [forward-delay <2-30>]\n" -#| " [hello-time <1-10>]\n" -#| " [max-age <6-40>]\n" -#| " [ageing-time <0-1000000>]\n" -#| "\n" -#| " bridge-slave: master <master (ifname or connection UUID)>\n" -#| " [priority <0-63>]\n" -#| " [path-cost <1-65535>]\n" -#| " [hairpin yes|no]\n" -#| "\n" -#| " vpn: vpn-type vpnc|openvpn|pptp|openconnect|openswan\n" -#| " [user <username>]\n" -#| "\n" -#| " olpc-mesh: ssid <SSID>\n" -#| " [channel <1-13>]\n" -#| " [dhcp-anycast <MAC address>]\n" -#| "\n" -#| " IP_OPTIONS:\n" -#| " [ip4 <IPv4 address>] [gw4 <IPv4 gateway>]\n" -#| " [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n" -#| "\n" +#: ../clients/cli/connections.c:328 +#, fuzzy, c-format msgid "" "Usage: nmcli connection add { ARGUMENTS | help }\n" "\n" @@ -1148,7 +1063,6 @@ msgid "" " [hello-time <1-10>]\n" " [max-age <6-40>]\n" " [ageing-time <0-1000000>]\n" -" [multicast-snooping yes|no]\n" " [mac <MAC address>]\n" "\n" " bridge-slave: master <master (ifname, or connection UUID or name)>\n" @@ -1164,6 +1078,11 @@ msgid "" " [channel <1-13>]\n" " [dhcp-anycast <MAC address>]\n" "\n" +" adsl: username <username>\n" +" protocol pppoa|pppoe|ipoatm\n" +" [password <password>]\n" +" [encapsulation vcmux|llc]\n" +"\n" " IP_OPTIONS:\n" " [ip4 <IPv4 address>] [gw4 <IPv4 gateway>]\n" " [ip6 <IPv6 address>] [gw6 <IPv6 gateway>]\n" @@ -1264,7 +1183,7 @@ msgstr "" " [ip6 <адрес IPv6>] [gw6 <шлюз IPv6>]\n" "\n" -#: ../clients/cli/connections.c:408 +#: ../clients/cli/connections.c:412 #, c-format msgid "" "Usage: nmcli connection modify { ARGUMENTS | help }\n" @@ -1289,7 +1208,7 @@ msgid "" "\n" msgstr "" -#: ../clients/cli/connections.c:431 +#: ../clients/cli/connections.c:435 #, c-format msgid "" "Usage: nmcli connection edit { ARGUMENTS | help }\n" @@ -1316,7 +1235,7 @@ msgstr "" "Добавление нового профиля соединения в интерактивном редакторе.\n" "\n" -#: ../clients/cli/connections.c:446 +#: ../clients/cli/connections.c:450 #, c-format msgid "" "Usage: nmcli connection delete { ARGUMENTS | help }\n" @@ -1335,7 +1254,7 @@ msgstr "" "Профиль определяется по имени, UUID или пути D-Bus.\n" "\n" -#: ../clients/cli/connections.c:457 +#: ../clients/cli/connections.c:461 #, c-format msgid "" "Usage: nmcli connection reload { help }\n" @@ -1348,7 +1267,7 @@ msgstr "" "Перезагрузка файлов соединений с диска.\n" "\n" -#: ../clients/cli/connections.c:465 +#: ../clients/cli/connections.c:469 #, c-format msgid "" "Usage: nmcli connection load { ARGUMENTS | help }\n" @@ -1370,424 +1289,385 @@ msgstr "" "\n" "\n" -#: ../clients/cli/connections.c:536 +#: ../clients/cli/connections.c:540 msgid "activating" msgstr "активация" -#: ../clients/cli/connections.c:538 +#: ../clients/cli/connections.c:542 msgid "activated" msgstr "включено" -#: ../clients/cli/connections.c:542 +#: ../clients/cli/connections.c:546 msgid "deactivated" msgstr "отключено" -#: ../clients/cli/connections.c:554 +#: ../clients/cli/connections.c:558 msgid "VPN connecting (prepare)" msgstr "Подключение VPN (подготовка)" -#: ../clients/cli/connections.c:556 +#: ../clients/cli/connections.c:560 msgid "VPN connecting (need authentication)" msgstr "Подключение VPN (требуется аутентификация)" -#: ../clients/cli/connections.c:558 +#: ../clients/cli/connections.c:562 msgid "VPN connecting" msgstr "Подключение VPN" -#: ../clients/cli/connections.c:560 +#: ../clients/cli/connections.c:564 msgid "VPN connecting (getting IP configuration)" msgstr "Подключение VPN (получение конфигурации IP)" -#: ../clients/cli/connections.c:562 +#: ../clients/cli/connections.c:566 msgid "VPN connected" msgstr "VPN подключён" -#: ../clients/cli/connections.c:564 +#: ../clients/cli/connections.c:568 msgid "VPN connection failed" msgstr "Сбой подключения VPN" -#: ../clients/cli/connections.c:566 +#: ../clients/cli/connections.c:570 msgid "VPN disconnected" msgstr "VPN отключён" -#: ../clients/cli/connections.c:636 +#: ../clients/cli/connections.c:640 #, fuzzy, c-format -#| msgid "Error saving connection: %s" msgid "Error updating secrets for %s: %s\n" msgstr "Ошибка при сохранении соединения: %s" -#: ../clients/cli/connections.c:656 +#: ../clients/cli/connections.c:660 #, fuzzy -#| msgid "Connection details" msgid "Connection profile details" msgstr "Свойства подключения" -#: ../clients/cli/connections.c:668 ../clients/cli/connections.c:1061 +#: ../clients/cli/connections.c:672 ../clients/cli/connections.c:1081 #, fuzzy, c-format -#| msgid "Error: 'device show': %s" msgid "Error: 'connection show': %s" msgstr "Ошибка «device show»: %s" -#: ../clients/cli/connections.c:824 +#: ../clients/cli/connections.c:818 msgid "never" msgstr "никогда" -#. "CAPABILITIES" -#: ../clients/cli/connections.c:825 ../clients/cli/connections.c:827 -#: ../clients/cli/connections.c:829 ../clients/cli/connections.c:863 -#: ../clients/cli/connections.c:932 ../clients/cli/connections.c:933 -#: ../clients/cli/connections.c:935 ../clients/cli/connections.c:3265 -#: ../clients/cli/connections.c:7123 ../clients/cli/connections.c:7124 -#: ../clients/cli/devices.c:644 ../clients/cli/devices.c:701 -#: ../clients/cli/devices.c:908 ../clients/cli/devices.c:909 -#: ../clients/cli/devices.c:910 ../clients/cli/devices.c:911 -#: ../clients/cli/devices.c:944 ../clients/cli/devices.c:946 -#: ../clients/cli/devices.c:974 ../clients/cli/devices.c:975 -#: ../clients/cli/devices.c:976 ../clients/cli/devices.c:977 -#: ../clients/cli/devices.c:978 ../clients/cli/devices.c:979 -#: ../clients/cli/devices.c:980 ../clients/cli/general.c:472 -#: ../clients/cli/settings.c:1542 -msgid "yes" -msgstr "да" - -#: ../clients/cli/connections.c:825 ../clients/cli/connections.c:827 -#: ../clients/cli/connections.c:829 ../clients/cli/connections.c:932 -#: ../clients/cli/connections.c:933 ../clients/cli/connections.c:935 -#: ../clients/cli/connections.c:3266 ../clients/cli/connections.c:7123 -#: ../clients/cli/connections.c:7124 ../clients/cli/devices.c:644 -#: ../clients/cli/devices.c:701 ../clients/cli/devices.c:908 -#: ../clients/cli/devices.c:909 ../clients/cli/devices.c:910 -#: ../clients/cli/devices.c:911 ../clients/cli/devices.c:944 -#: ../clients/cli/devices.c:946 ../clients/cli/devices.c:974 -#: ../clients/cli/devices.c:975 ../clients/cli/devices.c:976 -#: ../clients/cli/devices.c:977 ../clients/cli/devices.c:978 -#: ../clients/cli/devices.c:979 ../clients/cli/devices.c:980 -#: ../clients/cli/general.c:474 ../clients/cli/settings.c:1540 -msgid "no" -msgstr "нет" - -#: ../clients/cli/connections.c:1049 +#: ../clients/cli/connections.c:1069 #, fuzzy -#| msgid "Active connection details" msgid "Activate connection details" msgstr "Сведения об активном соединении" -#: ../clients/cli/connections.c:1285 +#: ../clients/cli/connections.c:1305 #, fuzzy, c-format -#| msgid "invalid field '%s'; allowed fields: %s" msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s" msgstr "неверное поле «%s»; допустимые поля: %s" -#: ../clients/cli/connections.c:1300 ../clients/cli/connections.c:1308 +#: ../clients/cli/connections.c:1320 ../clients/cli/connections.c:1328 #, fuzzy, c-format -#| msgid "field '%s' has to be alone" msgid "'%s' has to be alone" msgstr "поле «%s» должно быть единственным" #. Add headers -#: ../clients/cli/connections.c:1525 +#: ../clients/cli/connections.c:1383 #, fuzzy -#| msgid "NetworkManager status" msgid "NetworkManager active profiles" msgstr "Состояние NetworkManager" -#: ../clients/cli/connections.c:1526 +#: ../clients/cli/connections.c:1384 #, fuzzy -#| msgid "NetworkManager went to sleep" msgid "NetworkManager connection profiles" msgstr "NetworkManager перешёл в спящий режим" -#: ../clients/cli/connections.c:1572 ../clients/cli/connections.c:2299 -#: ../clients/cli/connections.c:2321 ../clients/cli/connections.c:2330 -#: ../clients/cli/connections.c:2340 ../clients/cli/connections.c:2350 -#: ../clients/cli/connections.c:2500 ../clients/cli/connections.c:8678 -#: ../clients/cli/connections.c:8895 ../clients/cli/devices.c:1985 -#: ../clients/cli/devices.c:1993 ../clients/cli/devices.c:2309 -#: ../clients/cli/devices.c:2316 ../clients/cli/devices.c:2330 -#: ../clients/cli/devices.c:2337 ../clients/cli/devices.c:2354 -#: ../clients/cli/devices.c:2362 ../clients/cli/devices.c:2550 -#: ../clients/cli/devices.c:2646 ../clients/cli/devices.c:2653 +#: ../clients/cli/connections.c:1424 ../clients/cli/connections.c:2152 +#: ../clients/cli/connections.c:2174 ../clients/cli/connections.c:2183 +#: ../clients/cli/connections.c:2193 ../clients/cli/connections.c:2203 +#: ../clients/cli/connections.c:2365 ../clients/cli/connections.c:8815 +#: ../clients/cli/connections.c:9020 ../clients/cli/devices.c:2028 +#: ../clients/cli/devices.c:2036 ../clients/cli/devices.c:2359 +#: ../clients/cli/devices.c:2366 ../clients/cli/devices.c:2380 +#: ../clients/cli/devices.c:2387 ../clients/cli/devices.c:2404 +#: ../clients/cli/devices.c:2412 ../clients/cli/devices.c:2425 +#: ../clients/cli/devices.c:2669 ../clients/cli/devices.c:2676 +#: ../clients/cli/devices.c:2795 ../clients/cli/devices.c:2802 #, c-format msgid "Error: %s argument is missing." msgstr "Ошибка: отсутствует аргумент %s." -#: ../clients/cli/connections.c:1587 +#: ../clients/cli/connections.c:1439 #, fuzzy, c-format -#| msgid "Error: %s - no such connection." msgid "Error: %s - no such connection profile." msgstr "Ошибка: неизвестное подключение %s." -#: ../clients/cli/connections.c:1646 ../clients/cli/connections.c:2373 -#: ../clients/cli/connections.c:9269 ../clients/cli/devices.c:2529 -#: ../clients/cli/devices.c:2997 ../clients/cli/general.c:569 -#: ../clients/cli/general.c:618 ../clients/cli/general.c:635 -#: ../clients/cli/general.c:674 ../clients/cli/general.c:688 -#: ../clients/cli/general.c:806 ../clients/cli/general.c:853 -#: ../clients/cli/general.c:873 +#: ../clients/cli/connections.c:1498 ../clients/cli/connections.c:2226 +#: ../clients/cli/connections.c:9319 ../clients/cli/devices.c:2636 +#: ../clients/cli/devices.c:3149 ../clients/cli/general.c:518 +#: ../clients/cli/general.c:567 ../clients/cli/general.c:584 +#: ../clients/cli/general.c:623 ../clients/cli/general.c:637 +#: ../clients/cli/general.c:755 ../clients/cli/general.c:802 +#: ../clients/cli/general.c:822 #, c-format msgid "Error: %s." msgstr "Ошибка: %s." -#: ../clients/cli/connections.c:1741 +#: ../clients/cli/connections.c:1594 #, c-format msgid "no active connection on device '%s'" msgstr "на устройстве «%s» нет активных соединений" -#: ../clients/cli/connections.c:1749 +#: ../clients/cli/connections.c:1602 msgid "no active connection or device" msgstr "на устройстве нет активных соединений" -#: ../clients/cli/connections.c:1820 +#: ../clients/cli/connections.c:1673 #, c-format msgid "device '%s' not compatible with connection '%s'" msgstr "устройство «%s» несовместимо с соединением «%s»" -#: ../clients/cli/connections.c:1823 +#: ../clients/cli/connections.c:1676 #, c-format msgid "no device found for connection '%s'" msgstr "не найдено устройство для соединения «%s»" -#: ../clients/cli/connections.c:1835 +#: ../clients/cli/connections.c:1688 msgid "unknown reason" msgstr "неизвестная причина" -#: ../clients/cli/connections.c:1837 ../clients/cli/general.c:292 +#: ../clients/cli/connections.c:1690 ../clients/cli/general.c:272 msgid "none" msgstr "нет" -#: ../clients/cli/connections.c:1839 +#: ../clients/cli/connections.c:1692 msgid "the user was disconnected" msgstr "пользователь был отключён" -#: ../clients/cli/connections.c:1841 +#: ../clients/cli/connections.c:1694 msgid "the base network connection was interrupted" msgstr "основное соединение с сетью было разорвано" -#: ../clients/cli/connections.c:1843 +#: ../clients/cli/connections.c:1696 msgid "the VPN service stopped unexpectedly" msgstr "служба VPN внезапно прекратила работу" -#: ../clients/cli/connections.c:1845 +#: ../clients/cli/connections.c:1698 msgid "the VPN service returned invalid configuration" msgstr "служба VPN вернула недопустимую конфигурацию" -#: ../clients/cli/connections.c:1847 +#: ../clients/cli/connections.c:1700 msgid "the connection attempt timed out" msgstr "время ожидания соединения истекло" -#: ../clients/cli/connections.c:1849 +#: ../clients/cli/connections.c:1702 msgid "the VPN service did not start in time" msgstr "служба VPN не была запущена вовремя" -#: ../clients/cli/connections.c:1851 +#: ../clients/cli/connections.c:1704 msgid "the VPN service failed to start" msgstr "не удалось запустить службу VPN" -#: ../clients/cli/connections.c:1853 +#: ../clients/cli/connections.c:1706 msgid "no valid VPN secrets" msgstr "нет верных секретов VPN" -#: ../clients/cli/connections.c:1855 +#: ../clients/cli/connections.c:1708 msgid "invalid VPN secrets" msgstr "неверные секреты VPN" -#: ../clients/cli/connections.c:1857 +#: ../clients/cli/connections.c:1710 msgid "the connection was removed" msgstr "соединение удалено" -#: ../clients/cli/connections.c:1879 ../clients/cli/connections.c:1907 -#: ../clients/cli/connections.c:2068 ../clients/cli/connections.c:7014 +#: ../clients/cli/connections.c:1732 ../clients/cli/connections.c:1760 +#: ../clients/cli/connections.c:1921 ../clients/cli/connections.c:7130 #, c-format msgid "Connection successfully activated (D-Bus active path: %s)\n" msgstr "Соединение успешно активировано (адрес действующего D-Bus: %s)\n" -#: ../clients/cli/connections.c:1886 +#: ../clients/cli/connections.c:1739 #, fuzzy, c-format -#| msgid "Connection successfully activated (D-Bus active path: %s)\n" msgid "" "Connection successfully activated (master waiting for slaves) (D-Bus active " "path: %s)\n" msgstr "Соединение успешно активировано (адрес действующего D-Bus: %s)\n" -#: ../clients/cli/connections.c:1890 ../clients/cli/connections.c:1912 +#: ../clients/cli/connections.c:1743 ../clients/cli/connections.c:1765 #, c-format msgid "Error: Connection activation failed." msgstr "Ошибка: сбой активации соединения." -#: ../clients/cli/connections.c:1963 +#: ../clients/cli/connections.c:1816 #, c-format msgid "VPN connection successfully activated (D-Bus active path: %s)\n" msgstr "VPN-соединение успешно установлено (адрес действующего D-Bus: %s)\n" -#: ../clients/cli/connections.c:1971 +#: ../clients/cli/connections.c:1824 #, c-format msgid "Error: Connection activation failed: %s." msgstr "Ошибка: сбой активации соединения: %s." -#: ../clients/cli/connections.c:1990 ../clients/cli/devices.c:1397 +#: ../clients/cli/connections.c:1843 ../clients/cli/devices.c:1339 #, c-format msgid "Error: Timeout %d sec expired." msgstr "Ошибка: превышено время ожидания (%d с)." -#: ../clients/cli/connections.c:2050 +#: ../clients/cli/connections.c:1903 #, c-format msgid "Error: Connection activation failed: %s" msgstr "Ошибка: сбой активации соединения: %s" -#: ../clients/cli/connections.c:2135 +#: ../clients/cli/connections.c:1988 #, fuzzy, c-format -#| msgid "Error: failed to remove value of '%s': %s\n" msgid "failed to read passwd-file '%s': %s" msgstr "Ошибка. Не удалось изменить значение «%s»: %s\n" -#: ../clients/cli/connections.c:2147 +#: ../clients/cli/connections.c:2000 #, c-format msgid "missing colon in 'password' entry '%s'" msgstr "" -#: ../clients/cli/connections.c:2155 +#: ../clients/cli/connections.c:2008 #, c-format msgid "missing dot in 'password' entry '%s'" msgstr "" -#: ../clients/cli/connections.c:2168 +#: ../clients/cli/connections.c:2021 #, c-format msgid "invalid setting name in 'password' entry '%s'" msgstr "" -#: ../clients/cli/connections.c:2215 ../clients/cli/connections.c:2374 +#: ../clients/cli/connections.c:2068 ../clients/cli/connections.c:2227 msgid "unknown error" msgstr "неизвестная ошибка" -#: ../clients/cli/connections.c:2224 +#: ../clients/cli/connections.c:2077 #, c-format msgid "unknown device '%s'." msgstr "неизвестное устройство «%s»" -#: ../clients/cli/connections.c:2229 +#: ../clients/cli/connections.c:2082 msgid "neither a valid connection nor device given" msgstr "недействительное подключение или устройство не определено" -#: ../clients/cli/connections.c:2312 +#: ../clients/cli/connections.c:2165 #, fuzzy, c-format -#| msgid "Error: connection is not valid: %s\n" msgid "Error: Connection '%s' does not exist." msgstr "Ошибка. Недействительное соединение: %s\n" -#: ../clients/cli/connections.c:2358 ../clients/cli/devices.c:1296 -#: ../clients/cli/devices.c:1999 ../clients/cli/devices.c:2373 -#: ../clients/cli/devices.c:2659 +#: ../clients/cli/connections.c:2211 ../clients/cli/devices.c:1238 +#: ../clients/cli/devices.c:2042 ../clients/cli/devices.c:2436 +#: ../clients/cli/devices.c:2682 ../clients/cli/devices.c:2808 #, c-format msgid "Unknown parameter: %s\n" msgstr "Неизвестный параметр: %s\n" -#: ../clients/cli/connections.c:2382 +#: ../clients/cli/connections.c:2235 msgid "preparing" msgstr "подготовка" -#: ../clients/cli/connections.c:2421 +#: ../clients/cli/connections.c:2259 +#, fuzzy, c-format +msgid "Connection '%s' (%s) successfully deleted.\n" +msgstr "Соединение «%s» (%s) добавлено.\n" + +#: ../clients/cli/connections.c:2275 #, fuzzy, c-format -#| msgid "Connection successfully activated (D-Bus active path: %s)\n" msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n" msgstr "Соединение успешно активировано (адрес действующего D-Bus: %s)\n" -#: ../clients/cli/connections.c:2479 ../clients/cli/connections.c:8876 -#: ../clients/cli/connections.c:8990 +#: ../clients/cli/connections.c:2347 ../clients/cli/connections.c:9006 +#: ../clients/cli/connections.c:9111 #, c-format msgid "Error: No connection specified." msgstr "Ошибка. Соединение не определено." -#: ../clients/cli/connections.c:2510 +#: ../clients/cli/connections.c:2379 #, fuzzy, c-format -#| msgid "Error: '%s' is not an active connection." msgid "Error: '%s' is not an active connection.\n" msgstr "Ошибка: «%s» не является активным соединением." -#: ../clients/cli/connections.c:2511 +#: ../clients/cli/connections.c:2380 ../clients/cli/connections.c:9035 #, fuzzy, c-format -#| msgid "Error: '%s' is not an active connection." msgid "Error: not all active connections found." msgstr "Ошибка: «%s» не является активным соединением." -#: ../clients/cli/connections.c:2520 +#: ../clients/cli/connections.c:2389 #, fuzzy, c-format -#| msgid "Error: %s - no such connection." msgid "Error: no active connection provided." msgstr "Ошибка: неизвестное подключение %s." -#: ../clients/cli/connections.c:2838 ../clients/cli/utils.c:609 +#: ../clients/cli/connections.c:2708 ../clients/cli/utils.c:569 #, c-format msgid "'%s' not among [%s]" msgstr "«%s» не входит в %s" -#: ../clients/cli/connections.c:2917 +#: ../clients/cli/connections.c:2787 #, c-format msgid "Error: '%s': '%s' is not a valid %s MAC address." msgstr "Ошибка. «%s»: «%s» не является действительным %s MAC-адресом." #. Ask for optional arguments -#: ../clients/cli/connections.c:2918 ../clients/cli/connections.c:3380 -#: ../clients/tui/nm-editor-utils.c:164 ../libnm-core/nm-connection.c:1575 -#: ../libnm-glib/nm-device.c:1801 ../libnm/nm-device.c:1623 +#: ../clients/cli/connections.c:2788 ../clients/cli/connections.c:3273 +#: ../clients/tui/nm-editor-utils.c:164 ../libnm-core/nm-connection.c:1614 +#: ../libnm-glib/nm-device.c:1801 ../libnm/nm-device.c:1646 msgid "InfiniBand" msgstr "InfiniBand" -#: ../clients/cli/connections.c:2918 ../clients/tui/nm-editor-utils.c:147 -#: ../libnm-glib/nm-device.c:1789 ../libnm/nm-device.c:1611 +#: ../clients/cli/connections.c:2788 ../clients/tui/nm-editor-utils.c:147 +#: ../libnm-glib/nm-device.c:1789 ../libnm/nm-device.c:1634 msgid "Ethernet" msgstr "Ethernet" -#: ../clients/cli/connections.c:2938 +#: ../clients/cli/connections.c:2808 #, c-format msgid "Error: 'mtu': '%s' is not a valid MTU." msgstr "Ошибка «mtu». Недействительный MTU: «%s» " -#: ../clients/cli/connections.c:2954 +#: ../clients/cli/connections.c:2824 #, c-format msgid "Error: 'parent': '%s' is not a valid interface name." msgstr "Ошибка «parent». Недействительное имя интерфейса: «%s» " -#: ../clients/cli/connections.c:2975 +#: ../clients/cli/connections.c:2845 #, c-format msgid "Error: 'p-key': '%s' is not a valid InfiniBand P_KEY." msgstr "Ошибка «p-key». Недействительный InfiniBand P_KEY: «%s»" -#: ../clients/cli/connections.c:3020 +#: ../clients/cli/connections.c:2890 #, fuzzy, c-format -#| msgid "Error: '%s': '%s' is not valid; %s " msgid "Error: '%s': '%s' is not a valid %s %s." msgstr "Error: '%s': '%s' is not valid; %s " -#: ../clients/cli/connections.c:3033 -#| msgid "Wi-Fi" +#: ../clients/cli/connections.c:2903 msgid "Wi-Fi mode" msgstr "Режим Wi-Fi" -#: ../clients/cli/connections.c:3042 +#: ../clients/cli/connections.c:2912 #, fuzzy -#| msgid "Transport mode" msgid "InfiniBand transport mode" msgstr "Транспортный режим" -#: ../clients/cli/connections.c:3055 +#: ../clients/cli/connections.c:2924 +msgid "ADSL protocol" +msgstr "" + +#: ../clients/cli/connections.c:2935 +#, fuzzy +msgid "ADSL encapsulation" +msgstr "Аутентификация DSL" + +#: ../clients/cli/connections.c:2948 #, c-format msgid "Error: 'flags': '%s' is not valid; use <0-7>." msgstr "Ошибка «flags». Неверное значение «%s». Допустимые значения: <0-7>." -#: ../clients/cli/connections.c:3077 +#: ../clients/cli/connections.c:2970 #, c-format msgid "Error: '%s': '%s' is not valid; %s " msgstr "Error: '%s': '%s' is not valid; %s " -#: ../clients/cli/connections.c:3256 +#: ../clients/cli/connections.c:3149 #, c-format msgid "Error: '%s': '%s' is not valid; use <%u-%u>." msgstr "Ошибка «%s». Недействительный «%s»: используйте <%u-%u>." #. Ask for optional arguments. -#: ../clients/cli/connections.c:3312 +#: ../clients/cli/connections.c:3205 #, fuzzy, c-format -#| msgid "There is 1 optional argument for '%s' connection type.\n" msgid "There is %d optional argument for '%s' connection type.\n" msgid_plural "There are %d optional arguments for '%s' connection type.\n" msgstr[0] "" @@ -1800,9 +1680,8 @@ msgstr[2] "" "При настройке соединений %s допускается использование одного дополнительного " "аргумента.\n" -#: ../clients/cli/connections.c:3315 +#: ../clients/cli/connections.c:3208 #, fuzzy, c-format -#| msgid "Do you want to provide it? (yes/no) [yes] " msgid "Do you want to provide it? %s" msgid_plural "Do you want to provide them? %s" msgstr[0] "Хотите его определить? (Да, нет) [да]" @@ -1810,503 +1689,482 @@ msgstr[1] "Хотите его определить? (Да, нет) [да]" msgstr[2] "Хотите его определить? (Да, нет) [да]" #. Ask for optional arguments -#: ../clients/cli/connections.c:3332 +#: ../clients/cli/connections.c:3225 msgid "ethernet" msgstr "ethernet" -#: ../clients/cli/connections.c:3337 ../clients/cli/connections.c:3385 -#: ../clients/cli/connections.c:3519 ../clients/cli/connections.c:3598 +#: ../clients/cli/connections.c:3230 ../clients/cli/connections.c:3278 +#: ../clients/cli/connections.c:3412 ../clients/cli/connections.c:3491 msgid "MTU [auto]: " msgstr "MTU [авто]: " -#: ../clients/cli/connections.c:3348 ../clients/cli/connections.c:3396 -#: ../clients/cli/connections.c:3491 ../clients/cli/connections.c:3530 -#: ../clients/cli/connections.c:3916 +#: ../clients/cli/connections.c:3241 ../clients/cli/connections.c:3289 +#: ../clients/cli/connections.c:3384 ../clients/cli/connections.c:3423 +#: ../clients/cli/connections.c:3795 msgid "MAC [none]: " msgstr "MAC [нет]: " -#: ../clients/cli/connections.c:3359 +#: ../clients/cli/connections.c:3252 msgid "Cloned MAC [none]: " msgstr "Клонированный MAC [нет]:" -#: ../clients/cli/connections.c:3407 +#: ../clients/cli/connections.c:3300 #, fuzzy, c-format -#| msgid "Transport mode" msgid "Transport mode %s" msgstr "Транспортный режим" -#: ../clients/cli/connections.c:3420 +#: ../clients/cli/connections.c:3313 msgid "Parent interface [none]: " msgstr "Родительский интерфейс [нет]:" -#: ../clients/cli/connections.c:3431 +#: ../clients/cli/connections.c:3324 msgid "P_KEY [none]: " msgstr "P_KEY [нет]: " -#: ../clients/cli/connections.c:3441 +#: ../clients/cli/connections.c:3334 #, c-format msgid "Error: 'p-key' is mandatory when 'parent' is specified.\n" msgstr "Ошибка. Если задан «parent», необходимо определить «p-key» \n" #. Ask for optional arguments -#: ../clients/cli/connections.c:3458 ../clients/tui/nm-editor-utils.c:155 -#: ../libnm-glib/nm-device.c:1791 ../libnm/nm-device.c:1613 +#: ../clients/cli/connections.c:3351 ../clients/tui/nm-editor-utils.c:155 +#: ../libnm-glib/nm-device.c:1791 ../libnm/nm-device.c:1636 msgid "Wi-Fi" msgstr "Wi-Fi" -#: ../clients/cli/connections.c:3466 +#: ../clients/cli/connections.c:3359 #, c-format -#| msgid "Mode" msgid "Mode %s" msgstr "Режим %s" #. Ask for optional 'wimax' arguments. -#: ../clients/cli/connections.c:3486 ../libnm-glib/nm-device.c:1797 -#: ../libnm/nm-device.c:1619 +#: ../clients/cli/connections.c:3379 ../libnm-glib/nm-device.c:1797 +#: ../libnm/nm-device.c:1642 msgid "WiMAX" msgstr "WiMAX" #. Ask for optional 'pppoe' arguments. -#: ../clients/cli/connections.c:3509 +#: ../clients/cli/connections.c:3402 msgid "PPPoE" msgstr "PPPoE" -#: ../clients/cli/connections.c:3513 ../clients/cli/connections.c:3551 +#: ../clients/cli/connections.c:3406 ../clients/cli/connections.c:3444 +#: ../clients/cli/connections.c:3917 msgid "Password [none]: " msgstr "Пароль [нет]: " -#: ../clients/cli/connections.c:3515 +#: ../clients/cli/connections.c:3408 msgid "Service [none]: " msgstr "Служба [нет]: " #. Ask for optional 'gsm' or 'cdma' arguments. -#: ../clients/cli/connections.c:3545 -#| msgid "Mobile Broadband" +#: ../clients/cli/connections.c:3438 msgid "mobile broadband" msgstr "мобильное широкополосное" -#: ../clients/cli/connections.c:3549 ../clients/cli/connections.c:3988 +#: ../clients/cli/connections.c:3442 ../clients/cli/connections.c:3867 msgid "Username [none]: " msgstr "Пользователь [нет]: " #. Ask for optional 'bluetooth' arguments. -#: ../clients/cli/connections.c:3564 -#| msgid "Bluetooth" +#: ../clients/cli/connections.c:3457 msgid "bluetooth" msgstr "bluetooth" -#: ../clients/cli/connections.c:3571 +#: ../clients/cli/connections.c:3464 #, c-format -#| msgid "Bluetooth" msgid "Bluetooth type %s" msgstr "Тип Bluetooth: %s" -#: ../clients/cli/connections.c:3577 +#: ../clients/cli/connections.c:3470 #, c-format msgid "Error: 'bt-type': '%s' is not a valid bluetooth type.\n" msgstr "Ошибка: «bt-type»: «%s» не является допустимым типом bluetooth.\n" #. Ask for optional 'vlan' arguments. #. 13 -#: ../clients/cli/connections.c:3593 ../clients/cli/devices.c:233 +#: ../clients/cli/connections.c:3486 ../clients/cli/devices.c:240 #: ../clients/tui/nm-editor-utils.c:218 ../clients/tui/nmt-page-vlan.c:97 -#: ../libnm-core/nm-connection.c:1573 ../libnm-glib/nm-device.c:1809 -#: ../libnm-util/nm-connection.c:1614 ../libnm/nm-device.c:1631 +#: ../libnm-core/nm-connection.c:1612 ../libnm-glib/nm-device.c:1809 +#: ../libnm-util/nm-connection.c:1601 ../libnm/nm-device.c:1654 msgid "VLAN" msgstr "VLAN" -#: ../clients/cli/connections.c:3609 +#: ../clients/cli/connections.c:3502 msgid "VLAN flags (<0-7>) [none]: " msgstr "Флаги VLAN (<0-7>) [нет]: " -#: ../clients/cli/connections.c:3620 +#: ../clients/cli/connections.c:3513 msgid "Ingress priority maps [none]: " msgstr "Соответствие приоритета на входе [нет]:" -#: ../clients/cli/connections.c:3631 +#: ../clients/cli/connections.c:3524 msgid "Egress priority maps [none]: " msgstr "Соответствие приоритета на выходе [нет]:" -#: ../clients/cli/connections.c:3642 +#: ../clients/cli/connections.c:3535 msgid "Bonding mode [balance-rr]: " msgstr "Режим агрегации (Bond) [balance-rr]: " #. Ask for optional 'bond' arguments. -#: ../clients/cli/connections.c:3658 +#: ../clients/cli/connections.c:3551 msgid "bond" msgstr "агрегированное (Bond)" -#: ../clients/cli/connections.c:3680 +#: ../clients/cli/connections.c:3573 msgid "Bonding primary interface [none]: " msgstr "Основной интерфейс агрегации (Bond) [нет]:" -#: ../clients/cli/connections.c:3683 +#: ../clients/cli/connections.c:3576 #, c-format msgid "Error: 'primary': '%s' is not a valid interface name.\n" msgstr "Ошибка: «primary»: «%s» не является допустимым именем интерфейса.\n" -#: ../clients/cli/connections.c:3691 +#: ../clients/cli/connections.c:3584 #, c-format -#| msgid "Link monitoring" msgid "Bonding monitoring mode %s" msgstr "Режим мониторинга агрегации (Bond): %s" -#: ../clients/cli/connections.c:3697 +#: ../clients/cli/connections.c:3590 #, 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:3706 +#: ../clients/cli/connections.c:3599 msgid "Bonding miimon [100]: " msgstr "Bonding miimon [100]: " -#: ../clients/cli/connections.c:3709 +#: ../clients/cli/connections.c:3602 #, c-format msgid "Error: 'miimon': '%s' is not a valid number <0-%u>.\n" msgstr "Ошибка «miimon». Недопустимое значение «%s». Ожидается: <0-%u>.\n" -#: ../clients/cli/connections.c:3717 +#: ../clients/cli/connections.c:3610 msgid "Bonding downdelay [0]: " msgstr "Bonding downdelay [0]: " -#: ../clients/cli/connections.c:3720 +#: ../clients/cli/connections.c:3613 #, c-format msgid "Error: 'downdelay': '%s' is not a valid number <0-%u>.\n" msgstr "Ошибка «downdelay». Недопустимое значение «%s». Ожидается: <0-%u>.\n" -#: ../clients/cli/connections.c:3728 +#: ../clients/cli/connections.c:3621 msgid "Bonding updelay [0]: " msgstr "Bonding updelay [0]: " -#: ../clients/cli/connections.c:3731 +#: ../clients/cli/connections.c:3624 #, c-format msgid "Error: 'updelay': '%s' is not a valid number <0-%u>.\n" msgstr "Ошибка «updelay». Недопустимое значение «%s». Ожидается: <0-%u>.\n" -#: ../clients/cli/connections.c:3740 +#: ../clients/cli/connections.c:3633 msgid "Bonding arp-interval [0]: " msgstr "Bonding arp-interval [0]: " -#: ../clients/cli/connections.c:3743 +#: ../clients/cli/connections.c:3636 #, c-format msgid "Error: 'arp-interval': '%s' is not a valid number <0-%u>.\n" msgstr "" "Ошибка «arp-interval». Недопустимое значение «%s». Ожидается: <0-%u>.\n" #. FIXME: verify the string -#: ../clients/cli/connections.c:3751 +#: ../clients/cli/connections.c:3644 msgid "Bonding arp-ip-target [none]: " msgstr "Bonding arp-ip-target [нет]: " -#: ../clients/cli/connections.c:3758 +#: ../clients/cli/connections.c:3651 msgid "LACP rate ('slow' or 'fast') [slow]: " msgstr "" -#: ../clients/cli/connections.c:3764 +#: ../clients/cli/connections.c:3657 #, fuzzy, c-format -#| msgid "Error: 'master': '%s' is not valid UUID nor interface." msgid "Error: 'lacp_rate': '%s' is invalid ('slow' or 'fast').\n" msgstr "Ошибка «master». «%s» не содержит UUID или интерфейс." -#: ../clients/cli/connections.c:3787 +#: ../clients/cli/connections.c:3680 msgid "Team JSON configuration [none]: " msgstr "Конфигурация JSON агрегированного соединения (team) [нет]:" -#: ../clients/cli/connections.c:3804 +#: ../clients/cli/connections.c:3697 msgid "team" msgstr "агрегированное (team)" -#: ../clients/cli/connections.c:3810 +#: ../clients/cli/connections.c:3703 msgid "team-slave" msgstr "Слейв агрегированного соединения (team)" #. Ask for optional 'bridge' arguments. -#: ../clients/cli/connections.c:3822 +#: ../clients/cli/connections.c:3715 msgid "bridge" msgstr "мост" -#: ../clients/cli/connections.c:3828 +#: ../clients/cli/connections.c:3721 #, c-format -#| msgid "Enable STP (yes/no) [yes]: " msgid "Enable STP %s" msgstr "Включить STP %s" -#: ../clients/cli/connections.c:3833 +#: ../clients/cli/connections.c:3726 #, c-format -#| msgid "Error: 'stp': %s." msgid "Error: 'stp': %s.\n" msgstr "Ошибка: «stp»: %s.\n" -#: ../clients/cli/connections.c:3841 -#| msgid "STP priority [128]: " +#: ../clients/cli/connections.c:3734 msgid "STP priority [32768]: " msgstr "Приоритет STP [32768]: " -#: ../clients/cli/connections.c:3845 +#: ../clients/cli/connections.c:3738 #, c-format msgid "Error: 'priority': '%s' is not a valid number <0-%d>.\n" msgstr "Недопустимое значение «priority»: «%s». Ожидается: <0-%d>.\n" -#: ../clients/cli/connections.c:3853 +#: ../clients/cli/connections.c:3746 msgid "Forward delay [15]: " msgstr "Forward delay [15]:" -#: ../clients/cli/connections.c:3857 +#: ../clients/cli/connections.c:3750 #, c-format msgid "Error: 'forward-delay': '%s' is not a valid number <2-30>.\n" msgstr "" "Ошибка «forward-delay». Недопустимое значение «%s». Ожидается: <2-30>.\n" -#: ../clients/cli/connections.c:3866 +#: ../clients/cli/connections.c:3759 msgid "Hello time [2]: " msgstr "Hello time [2]: " -#: ../clients/cli/connections.c:3870 +#: ../clients/cli/connections.c:3763 #, c-format msgid "Error: 'hello-time': '%s' is not a valid number <1-10>.\n" msgstr "Недопустимое значение «hello-time»: «%s». Ожидается: <1-10>.\n" -#: ../clients/cli/connections.c:3878 +#: ../clients/cli/connections.c:3771 msgid "Max age [20]: " msgstr "Max age [20]: " -#: ../clients/cli/connections.c:3882 +#: ../clients/cli/connections.c:3775 #, c-format msgid "Error: 'max-age': '%s' is not a valid number <6-40>.\n" msgstr "Недопустимое значение «max-age»: «%s». Ожидается: <6-40>.\n" -#: ../clients/cli/connections.c:3890 +#: ../clients/cli/connections.c:3783 msgid "MAC address ageing time [300]: " msgstr "Время действия MAC-адреса [300]: " -#: ../clients/cli/connections.c:3894 +#: ../clients/cli/connections.c:3787 #, c-format msgid "Error: 'ageing-time': '%s' is not a valid number <0-1000000>.\n" msgstr "Недопустимое значение «ageing-time»: «%s». Ожидается: <0-1000000>.\n" -#: ../clients/cli/connections.c:3903 -#, c-format -#| msgid "Enable STP (yes/no) [yes]: " -msgid "Enable IGMP snooping %s" -msgstr "Включить IGMP snooping %s" - -#: ../clients/cli/connections.c:3908 -#, fuzzy, c-format -#| msgid "Error: 'stp': %s." -msgid "Error: 'multicast-snooping': %s.\n" -msgstr "Ошибка «stp»: %s" - #. Ask for optional 'bridge-slave' arguments. -#: ../clients/cli/connections.c:3935 -#| msgid "team-slave" +#: ../clients/cli/connections.c:3814 msgid "bridge-slave" msgstr "Слейв соединения типа «мост»" -#: ../clients/cli/connections.c:3940 +#: ../clients/cli/connections.c:3819 msgid "Bridge port priority [32]: " msgstr "Приоритет порта моста [32]: " -#: ../clients/cli/connections.c:3953 +#: ../clients/cli/connections.c:3832 msgid "Bridge port STP path cost [100]: " msgstr "Стоимость STP порта моста [100]: " -#: ../clients/cli/connections.c:3967 +#: ../clients/cli/connections.c:3846 #, fuzzy, c-format -#| msgid "Hairpin mode" msgid "Hairpin %s" msgstr "Режим разворота пакетов" -#: ../clients/cli/connections.c:3972 +#: ../clients/cli/connections.c:3851 #, fuzzy, c-format -#| msgid "Error: 'hairpin': %s." msgid "Error: 'hairpin': %s.\n" msgstr "Ошибка «hairpin»: %s" #. Ask for optional 'olpc' arguments. -#: ../clients/cli/connections.c:3999 ../libnm-glib/nm-device.c:1795 -#: ../libnm/nm-device.c:1617 +#: ../clients/cli/connections.c:3878 ../libnm-glib/nm-device.c:1795 +#: ../libnm/nm-device.c:1640 msgid "OLPC Mesh" msgstr "OLPC Mesh" -#: ../clients/cli/connections.c:4004 +#: ../clients/cli/connections.c:3883 msgid "OLPC Mesh channel [1]: " msgstr "Канал OLPC mesh [1]:" -#: ../clients/cli/connections.c:4007 +#: ../clients/cli/connections.c:3886 #, c-format msgid "Error: 'channel': '%s' is not a valid number <1-13>.\n" msgstr "Ошибка «channel». Недопустимое значение «%s». Ожидается: <1-13>.\n" -#: ../clients/cli/connections.c:4015 +#: ../clients/cli/connections.c:3894 msgid "DHCP anycast MAC address [none]: " msgstr "MAC-адрес рассылки DHCP [нет]:" -#: ../clients/cli/connections.c:4057 +#. Ask for optional 'adsl' arguments. +#: ../clients/cli/connections.c:3913 ../libnm-glib/nm-device.c:1811 +#: ../libnm/nm-device.c:1656 +msgid "ADSL" +msgstr "ADSL" + +#: ../clients/cli/connections.c:3921 +#, fuzzy, c-format +msgid "ADSL encapsulation %s" +msgstr "Cоединение DSL %d" + +#: ../clients/cli/connections.c:3963 #, fuzzy -#| msgid "IPv4 address (IP[/plen] [gateway]) [none]: " msgid "IPv4 address (IP[/plen]) [none]: " msgstr "Адрес IPv4 (IP[/plen] [шлюз]) [нет]: " -#: ../clients/cli/connections.c:4059 +#: ../clients/cli/connections.c:3965 #, fuzzy -#| msgid "IPv6 address (IP[/plen] [gateway]) [none]: " msgid "IPv6 address (IP[/plen]) [none]: " msgstr "Адрес IPv6 (IP[/plen] [шлюз]) [нет]: " -#: ../clients/cli/connections.c:4073 +#: ../clients/cli/connections.c:3979 #, fuzzy, c-format -#| msgid " Address successfully added: %s %s\n" msgid " Address successfully added: %s\n" msgstr "Адрес добавлен: %s %s\n" -#: ../clients/cli/connections.c:4075 +#: ../clients/cli/connections.c:3981 #, fuzzy, c-format -#| msgid " Warning: address already present: %s %s\n" msgid " Warning: address already present: %s\n" msgstr "Предупреждение. Адрес уже используется: %s %s\n" -#: ../clients/cli/connections.c:4077 +#: ../clients/cli/connections.c:3983 #, c-format msgid " Warning: ignoring garbage at the end: '%s'\n" msgstr "Предупреждение. Игнорируется мусор в конце: «%s».\n" -#: ../clients/cli/connections.c:4079 ../clients/cli/connections.c:4960 -#: ../clients/cli/connections.c:5021 ../clients/cli/connections.c:5442 -#: ../clients/cli/connections.c:5475 +#: ../clients/cli/connections.c:3985 ../clients/cli/connections.c:4867 +#: ../clients/cli/connections.c:4928 ../clients/cli/connections.c:5401 +#: ../clients/cli/connections.c:5434 msgid "Error: " msgstr "Ошибка:" -#: ../clients/cli/connections.c:4099 +#: ../clients/cli/connections.c:4005 #, fuzzy -#| msgid "IPv4 address (IP[/plen] [gateway]) [none]: " msgid "IPv4 gateway [none]: " msgstr "Адрес IPv4 (IP[/plen] [шлюз]) [нет]: " -#: ../clients/cli/connections.c:4102 +#: ../clients/cli/connections.c:4008 #, fuzzy -#| msgid "IPv6 address (IP[/plen] [gateway]) [none]: " msgid "IPv6 gateway [none]: " msgstr "Адрес IPv6 (IP[/plen] [шлюз]) [нет]: " -#: ../clients/cli/connections.c:4122 +#: ../clients/cli/connections.c:4028 #, fuzzy, c-format -#| msgid "Error: invalid extra argument '%s'." msgid "Error: invalid gateway address '%s'\n" msgstr "Ошибка. Недопустимый дополнительный аргумент: «%s»." #. Ask for IP addresses -#: ../clients/cli/connections.c:4135 +#: ../clients/cli/connections.c:4041 #, fuzzy, c-format -#| msgid "Do you want to add IP addresses? (yes/no) [yes] " msgid "Do you want to add IP addresses? %s" msgstr "Добавить IP-адреса? (Да или нет) [да]" -#: ../clients/cli/connections.c:4143 +#: ../clients/cli/connections.c:4049 #, c-format msgid "Press <Enter> to finish adding addresses.\n" msgstr "Нажмите <Enter>, чтобы завершить процедуру добавления адресов.\n" -#: ../clients/cli/connections.c:4282 +#: ../clients/cli/connections.c:4189 #, c-format msgid "Error: 'parent': not valid without 'p-key'." msgstr "Ошибка «parent». Недействительно без «p-key». " -#: ../clients/cli/connections.c:4337 ../clients/cli/connections.c:5358 +#: ../clients/cli/connections.c:4244 ../clients/cli/connections.c:5249 msgid "SSID: " msgstr "SSID: " -#: ../clients/cli/connections.c:4340 ../clients/cli/connections.c:5361 +#: ../clients/cli/connections.c:4247 ../clients/cli/connections.c:5252 msgid "Error: 'ssid' is required." msgstr "Ошибка. Необходимо определить «ssid»." -#: ../clients/cli/connections.c:4404 +#: ../clients/cli/connections.c:4311 msgid "WiMAX NSP name: " msgstr "Имя WiMAX NSP" -#: ../clients/cli/connections.c:4407 +#: ../clients/cli/connections.c:4314 msgid "Error: 'nsp' is required." msgstr "Ошибка. Необходимо определить «nsp»." -#: ../clients/cli/connections.c:4459 +#: ../clients/cli/connections.c:4366 msgid "PPPoE username: " msgstr "Пользователь PPPoE:" -#: ../clients/cli/connections.c:4462 +#: ../clients/cli/connections.c:4369 ../clients/cli/connections.c:5319 msgid "Error: 'username' is required." msgstr "Ошибка. Необходимо определить имя пользователя." -#: ../clients/cli/connections.c:4531 +#: ../clients/cli/connections.c:4438 msgid "APN: " msgstr "APN: " -#: ../clients/cli/connections.c:4534 +#: ../clients/cli/connections.c:4441 msgid "Error: 'apn' is required." msgstr "Ошибка. Необходимо определить «apn»." -#: ../clients/cli/connections.c:4592 +#: ../clients/cli/connections.c:4499 msgid "Bluetooth device address: " msgstr "Адрес устройства Bluetooth:" -#: ../clients/cli/connections.c:4595 +#: ../clients/cli/connections.c:4502 msgid "Error: 'addr' is required." msgstr "Ошибка. Необходимо определить «addr»." -#: ../clients/cli/connections.c:4636 +#: ../clients/cli/connections.c:4543 #, 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:4680 +#: ../clients/cli/connections.c:4587 msgid "VLAN parent device or connection UUID: " msgstr "Родительское устройство VLAN или подключение UUID:" -#: ../clients/cli/connections.c:4683 +#: ../clients/cli/connections.c:4590 msgid "Error: 'dev' is required." msgstr "Ошибка. Необходимо определить «dev»." -#: ../clients/cli/connections.c:4687 +#: ../clients/cli/connections.c:4594 msgid "VLAN ID <0-4095>: " msgstr "VLAN ID <0-4095>: " -#: ../clients/cli/connections.c:4690 +#: ../clients/cli/connections.c:4597 msgid "Error: 'id' is required." msgstr "Ошибка. Необходимо определить «id»." -#: ../clients/cli/connections.c:4696 +#: ../clients/cli/connections.c:4603 #, c-format msgid "Error: 'id': '%s' is not valid; use <0-4095>." msgstr "Ошибка «id». Неверное значение «%s». Допустимые значения: <0-4095>." -#: ../clients/cli/connections.c:4706 +#: ../clients/cli/connections.c:4613 #, c-format msgid "Error: 'dev': '%s' is neither UUID, interface name, nor MAC." msgstr "Ошибка «dev». «%s» может содержать UUID, имя интерфейса или MAC-адрес." -#: ../clients/cli/connections.c:4840 +#: ../clients/cli/connections.c:4747 #, c-format msgid "Error: 'mode': %s." msgstr "Ошибка «mode»: %s" -#: ../clients/cli/connections.c:4849 +#: ../clients/cli/connections.c:4756 #, c-format msgid "Error: 'primary': '%s' is not a valid interface name." msgstr "Ошибка «primary». Недействительное имя интерфейса: «%s»." -#: ../clients/cli/connections.c:4901 ../clients/cli/connections.c:4999 -#: ../clients/cli/connections.c:5217 +#: ../clients/cli/connections.c:4808 ../clients/cli/connections.c:4906 +#: ../clients/cli/connections.c:5108 msgid "Error: 'master' is required." msgstr "Ошибка. Необходимо определить «master»." -#: ../clients/cli/connections.c:4907 ../clients/cli/connections.c:5005 -#: ../clients/cli/connections.c:5223 +#: ../clients/cli/connections.c:4814 ../clients/cli/connections.c:4912 +#: ../clients/cli/connections.c:5114 #, c-format msgid "Warning: master='%s' doesn't refer to any existing profile.\n" msgstr "" -#: ../clients/cli/connections.c:4910 ../clients/cli/connections.c:5013 -#: ../clients/cli/connections.c:5226 +#: ../clients/cli/connections.c:4817 ../clients/cli/connections.c:4920 +#: ../clients/cli/connections.c:5117 #, c-format msgid "" "Warning: 'type' is currently ignored. We only support ethernet slaves for " @@ -2315,125 +2173,132 @@ msgstr "" "Предупреждение: сейчас поддерживаются только слейвы Ethernet, поэтому «type» " "игнорируется.\n" -#: ../clients/cli/connections.c:5111 +#: ../clients/cli/connections.c:5014 #, c-format msgid "Error: 'stp': %s." msgstr "Ошибка «stp»: %s" -#: ../clients/cli/connections.c:5120 -#, fuzzy, c-format -#| msgid "Error: 'stp': %s." -msgid "Error: 'multicast-snooping': %s." -msgstr "Ошибка «stp»: %s" - -#: ../clients/cli/connections.c:5253 +#: ../clients/cli/connections.c:5144 #, c-format msgid "Error: 'hairpin': %s." msgstr "Ошибка «hairpin»: %s" -#: ../clients/cli/connections.c:5306 +#: ../clients/cli/connections.c:5197 msgid "Error: 'vpn-type' is required." msgstr "Ошибка. Необходимо определить «vpn-type»." -#: ../clients/cli/connections.c:5313 +#: ../clients/cli/connections.c:5204 #, fuzzy, c-format -#| msgid "Error: 'vpn-type': %s." msgid "Warning: 'vpn-type': %s not known.\n" msgstr "Ошибка «vpn-type»: %s." -#: ../clients/cli/connections.c:5374 +#: ../clients/cli/connections.c:5265 #, c-format msgid "Error: 'channel': '%s' is not valid; use <1-13>." msgstr "Ошибка «channel». Неверное значение «%s». Допустимые значения: <1-13>." -#: ../clients/cli/connections.c:5410 +#: ../clients/cli/connections.c:5316 +#, fuzzy +msgid "Username: " +msgstr "Пользователь" + +#: ../clients/cli/connections.c:5325 +#, c-format +msgid "Protocol %s" +msgstr "" + +#: ../clients/cli/connections.c:5328 +#, fuzzy +msgid "Error: 'protocol' is required." +msgstr "Ошибка. Необходимо определить «nsp»." + +#: ../clients/cli/connections.c:5369 #, c-format msgid "Error: '%s' is not a valid connection type." msgstr "Ошибка. Недопустимый тип соединения: «%s»" -#: ../clients/cli/connections.c:5454 +#: ../clients/cli/connections.c:5413 #, c-format msgid "Error: IPv4 gateway specified without IPv4 addresses" msgstr "" -#: ../clients/cli/connections.c:5458 +#: ../clients/cli/connections.c:5417 #, fuzzy, c-format -#| msgid "Error: No interface specified." msgid "Error: multiple IPv4 gateways specified" msgstr "Ошибка. Интерфейс не определен." -#: ../clients/cli/connections.c:5462 +#: ../clients/cli/connections.c:5421 #, fuzzy, c-format -#| msgid "invalid gateway '%s'" msgid "Error: Invalid IPv4 gateway '%s'" msgstr "недопустимый шлюз «%s»" -#: ../clients/cli/connections.c:5487 +#: ../clients/cli/connections.c:5446 #, c-format msgid "Error: IPv6 gateway specified without IPv6 addresses" msgstr "" -#: ../clients/cli/connections.c:5491 +#: ../clients/cli/connections.c:5450 #, fuzzy, c-format -#| msgid "Error: No interface specified." msgid "Error: multiple IPv6 gateways specified" msgstr "Ошибка. Интерфейс не определен." -#: ../clients/cli/connections.c:5495 +#: ../clients/cli/connections.c:5454 #, fuzzy, c-format -#| msgid "invalid gateway '%s'" msgid "Error: Invalid IPv6 gateway '%s'" msgstr "недопустимый шлюз «%s»" -#: ../clients/cli/connections.c:5555 +#: ../clients/cli/connections.c:5514 #, fuzzy, c-format -#| msgid "Error: Failed to add '%s' connection: (%d) %s" msgid "Error: Failed to add '%s' connection: %s" msgstr "Ошибка. Не удалось добавить соединение «%s»: (%d) %s" -#: ../clients/cli/connections.c:5560 +#: ../clients/cli/connections.c:5519 #, c-format msgid "Connection '%s' (%s) successfully added.\n" msgstr "Соединение «%s» (%s) добавлено.\n" -#: ../clients/cli/connections.c:5780 +#: ../clients/cli/connections.c:5757 #, c-format msgid "Error: 'type' argument is required." msgstr "Ошибка. Аргумент «type» является обязательным." -#: ../clients/cli/connections.c:5788 +#: ../clients/cli/connections.c:5765 #, c-format msgid "Error: invalid connection type; %s." msgstr "Ошибка. Недопустимый тип соединения: %s." -#: ../clients/cli/connections.c:5797 +#: ../clients/cli/connections.c:5774 #, c-format msgid "Error: 'autoconnect': %s." msgstr "Ошибка «autoconnect»: %s." -#: ../clients/cli/connections.c:5807 +#: ../clients/cli/connections.c:5784 #, fuzzy, c-format -#| msgid "Error: 'stp': %s." msgid "Error: 'save': %s." msgstr "Ошибка «stp»: %s" -#: ../clients/cli/connections.c:5823 +#: ../clients/cli/connections.c:5801 msgid "Interface name [*]: " msgstr "Имя интерфейса [*]: " -#: ../clients/cli/connections.c:5828 +#: ../clients/cli/connections.c:5806 #, c-format msgid "Error: 'ifname' argument is required." msgstr "Ошибка. Требуется аргумент «ifname»." -#: ../clients/cli/connections.c:5835 +#: ../clients/cli/connections.c:5808 +#, c-format +msgid "Error: mandatory 'ifname' not seen before '%s'." +msgstr "" + +#: ../clients/cli/connections.c:5817 #, c-format msgid "Error: 'ifname': '%s' is not a valid interface nor '*'." msgstr "" "Ошибка «ifname». Недействительный интерфейс: «%s». Укажите другой интерфейс " "или «*»." -#: ../clients/cli/connections.c:6596 +#: ../clients/cli/connections.c:6712 #, c-format msgid "['%s' setting values]\n" msgstr "[«%s» устанавливает значения]\n" @@ -2441,23 +2306,8 @@ msgstr "[«%s» устанавливает значения]\n" #. TRANSLATORS: do not translate command names and keywords before :: #. * However, you should translate terms enclosed in <>. #. -#: ../clients/cli/connections.c:6678 -#, fuzzy, c-format -#| msgid "" -#| "---[ Main menu ]---\n" -#| "goto [<setting> | <prop>] :: go to a setting or property\n" -#| "remove <setting>[.<prop>] | <prop> :: remove setting or reset property " -#| "value\n" -#| "set [<setting>.<prop> <value>] :: set property value\n" -#| "describe [<setting>.<prop>] :: describe property\n" -#| "print [all] :: print the connection\n" -#| "verify [all] :: verify the connection\n" -#| "save :: save the connection\n" -#| "activate [<ifname>] [/<ap>|<nsp>] :: activate the connection\n" -#| "back :: go one level up (back)\n" -#| "help/? [<command>] :: print this help\n" -#| "nmcli <conf-option> <value> :: nmcli configuration\n" -#| "quit :: exit nmcli\n" +#: ../clients/cli/connections.c:6794 +#, fuzzy, c-format msgid "" "---[ Main menu ]---\n" "goto [<setting> | <prop>] :: go to a setting or property\n" @@ -2490,7 +2340,7 @@ msgstr "" "nmcli <параметр> <значение> :: конфигурация nmcli\n" "quit :: выход\n" -#: ../clients/cli/connections.c:6705 +#: ../clients/cli/connections.c:6821 #, c-format msgid "" "goto <setting>[.<prop>] | <prop> :: enter setting/property for editing\n" @@ -2510,7 +2360,7 @@ msgstr "" " nmcli connection> goto secondaries\n" " nmcli> goto ipv4.addresses\n" -#: ../clients/cli/connections.c:6712 +#: ../clients/cli/connections.c:6828 #, c-format msgid "" "remove <setting>[.<prop>] :: remove setting or reset property value\n" @@ -2530,7 +2380,7 @@ msgstr "" "Примеры: nmcli> remove wifi-sec\n" " nmcli> remove eth.mtu\n" -#: ../clients/cli/connections.c:6719 +#: ../clients/cli/connections.c:6835 #, c-format msgid "" "set [<setting>.<prop> <value>] :: set property value\n" @@ -2545,7 +2395,7 @@ msgstr "" "\n" "Пример: nmcli> set con.id My connection\n" -#: ../clients/cli/connections.c:6724 +#: ../clients/cli/connections.c:6840 #, c-format msgid "" "describe [<setting>.<prop>] :: describe property\n" @@ -2558,7 +2408,7 @@ msgstr "" "Возвращает описание свойства. Полный список параметров и их значений можно " "найти на справочной странице nm-settings(5).\n" -#: ../clients/cli/connections.c:6729 +#: ../clients/cli/connections.c:6845 #, c-format msgid "" "print [all] :: print setting or connection values\n" @@ -2573,16 +2423,8 @@ msgstr "" "\n" "Пример: nmcli ipv4> print all\n" -#: ../clients/cli/connections.c:6734 +#: ../clients/cli/connections.c:6850 #, fuzzy, c-format -#| msgid "" -#| "verify [all] :: verify setting or connection validity\n" -#| "\n" -#| "Verifies whether the setting or connection is valid and can be saved " -#| "later. It indicates invalid values on error.\n" -#| "\n" -#| "Examples: nmcli> verify\n" -#| " nmcli bond> verify\n" msgid "" "verify [all | fix] :: verify setting or connection validity\n" "\n" @@ -2602,7 +2444,7 @@ msgstr "" "Примеры: nmcli> verify\n" " nmcli bond> verify\n" -#: ../clients/cli/connections.c:6743 +#: ../clients/cli/connections.c:6859 #, c-format msgid "" "save [persistent|temporary] :: save the connection\n" @@ -2618,7 +2460,7 @@ msgid "" "profile must be deleted.\n" msgstr "" -#: ../clients/cli/connections.c:6754 +#: ../clients/cli/connections.c:6870 #, c-format msgid "" "activate [<ifname>] [/<ap>|<nsp>] :: activate the connection\n" @@ -2639,7 +2481,7 @@ msgstr "" "/<ap>|<nsp> - AP (Wi-Fi) или NSP (WiMAX) (если интерфейс не задан, в начале " "строки надо добавить /)\n" -#: ../clients/cli/connections.c:6761 ../clients/cli/connections.c:6919 +#: ../clients/cli/connections.c:6877 ../clients/cli/connections.c:7035 #, c-format msgid "" "back :: go to upper menu level\n" @@ -2648,7 +2490,7 @@ msgstr "" "back :: возврат к предыдущему меню\n" "\n" -#: ../clients/cli/connections.c:6764 +#: ../clients/cli/connections.c:6880 #, c-format msgid "" "help/? [<command>] :: help for the nmcli commands\n" @@ -2657,28 +2499,8 @@ msgstr "" "help/? [<команда>] :: справка по командам nmcli\n" "\n" -#: ../clients/cli/connections.c:6767 -#, fuzzy, c-format -#| msgid "" -#| "nmcli [<conf-option> <value>] :: nmcli configuration\n" -#| "\n" -#| "Configures nmcli. The following options are available:\n" -#| "status-line yes | no [default: no]\n" -#| "save-confirmation yes | no [default: yes]\n" -#| "prompt-color <0-8> [default: 0]\n" -#| " 0 = normal\n" -#| " 1 = [30mblack[0m\n" -#| " 2 = [31mred[0m\n" -#| " 3 = [32mgreen[0m\n" -#| " 4 = [33myellow[0m\n" -#| " 5 = [34mblue[0m\n" -#| " 6 = [35mmagenta[0m\n" -#| " 7 = [36mcyan[0m\n" -#| " 8 = [37mwhite[0m\n" -#| "\n" -#| "Examples: nmcli> nmcli status-line yes\n" -#| " nmcli> nmcli save-confirmation no\n" -#| " nmcli> nmcli prompt-color 3\n" +#: ../clients/cli/connections.c:6883 +#, fuzzy, c-format msgid "" "nmcli [<conf-option> <value>] :: nmcli configuration\n" "\n" @@ -2721,7 +2543,7 @@ msgstr "" " nmcli> nmcli save-confirmation no\n" " nmcli> nmcli prompt-color 3\n" -#: ../clients/cli/connections.c:6788 ../clients/cli/connections.c:6925 +#: ../clients/cli/connections.c:6904 ../clients/cli/connections.c:7041 #, c-format msgid "" "quit :: exit nmcli\n" @@ -2733,8 +2555,8 @@ msgstr "" "\n" "Если изменения соединения не сохранены, появится окно подтверждения.\n" -#: ../clients/cli/connections.c:6793 ../clients/cli/connections.c:6930 -#: ../clients/cli/connections.c:7342 ../clients/cli/connections.c:8262 +#: ../clients/cli/connections.c:6909 ../clients/cli/connections.c:7046 +#: ../clients/cli/connections.c:7469 ../clients/cli/connections.c:8391 #, c-format msgid "Unknown command: '%s'\n" msgstr "Неизвестная команда: «%s»\n" @@ -2742,7 +2564,7 @@ msgstr "Неизвестная команда: «%s»\n" #. TRANSLATORS: do not translate command names and keywords before :: #. * However, you should translate terms enclosed in <>. #. -#: ../clients/cli/connections.c:6859 +#: ../clients/cli/connections.c:6975 #, c-format msgid "" "---[ Property menu ]---\n" @@ -2768,7 +2590,7 @@ msgstr "" "help/? [<команда>] :: показать справку или описание команды\n" "quit :: выход из nmcli\n" -#: ../clients/cli/connections.c:6884 +#: ../clients/cli/connections.c:7000 #, c-format msgid "" "set [<value>] :: set new value\n" @@ -2779,14 +2601,8 @@ msgstr "" "\n" "Эта команда определяет новое значение свойства.\n" -#: ../clients/cli/connections.c:6888 +#: ../clients/cli/connections.c:7004 #, fuzzy, c-format -#| msgid "" -#| "add [<value>] :: add new option to the property\n" -#| "\n" -#| "This command add provided <value> to this property, if the property is of " -#| "a container type. For single-valued properties it replaces the value " -#| "(same as 'set').\n" msgid "" "add [<value>] :: append new value to the property\n" "\n" @@ -2800,7 +2616,7 @@ msgstr "" "контейнера). Для свойств с единственным значением, оно будет перезаписано " "(аналогично команде «set»).\n" -#: ../clients/cli/connections.c:6894 +#: ../clients/cli/connections.c:7010 #, c-format msgid "" "change :: change current value\n" @@ -2811,7 +2627,7 @@ msgstr "" "\n" "Показывает значение и позволяет его отредактировать.\n" -#: ../clients/cli/connections.c:6898 +#: ../clients/cli/connections.c:7014 #, c-format msgid "" "remove [<value>|<index>|<option name>] :: delete the value\n" @@ -2831,7 +2647,7 @@ msgid "" "\n" msgstr "" -#: ../clients/cli/connections.c:6909 +#: ../clients/cli/connections.c:7025 #, c-format msgid "" "describe :: describe property\n" @@ -2844,7 +2660,7 @@ msgstr "" "Возвращает описание свойства. Полный список параметров и их значений можно " "найти на справочной странице nm-settings(5).\n" -#: ../clients/cli/connections.c:6914 +#: ../clients/cli/connections.c:7030 #, c-format msgid "" "print [property|setting|connection] :: print property (setting, connection) " @@ -2859,7 +2675,7 @@ msgstr "" "Если аргумент не указан, возвращает значение свойства. Укажите параметр или " "соединение, чтобы получить соответствующую информацию.\n" -#: ../clients/cli/connections.c:6922 +#: ../clients/cli/connections.c:7038 #, c-format msgid "" "help/? [<command>] :: help for nmcli commands\n" @@ -2868,30 +2684,28 @@ msgstr "" "help/? [<команда>] :: справка по командам nmcli\n" "\n" -#: ../clients/cli/connections.c:7020 +#: ../clients/cli/connections.c:7136 #, c-format msgid "Error: Connection activation failed.\n" msgstr "Ошибка. Не удалось активировать соединение.\n" -#: ../clients/cli/connections.c:7103 +#: ../clients/cli/connections.c:7219 #, 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:7121 +#: ../clients/cli/connections.c:7237 #, fuzzy, c-format -#| msgid "[ Connection type: %s | name: %s | UUID: %s | dirty: %s ]\n" msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n" msgstr "[Тип соединения: %s | имя: %s | UUID: %s | грязное: %s ]\n" -#: ../clients/cli/connections.c:7157 +#: ../clients/cli/connections.c:7273 #, fuzzy, c-format -#| msgid "The connection is not saved. Do you really want to quit? [y/n]\n" msgid "The connection is not saved. Do you really want to quit? %s" msgstr "Соединение не сохранено. Вы действительно хотите выйти? [y/n]\n" -#: ../clients/cli/connections.c:7203 +#: ../clients/cli/connections.c:7321 #, c-format msgid "" "The connection profile has been removed from another client. You may type " @@ -2900,65 +2714,67 @@ msgstr "" "Профиль соединения был удален из другого клиента. Чтобы его восстановить, " "введите «save».\n" -#: ../clients/cli/connections.c:7225 ../clients/cli/connections.c:7648 -#: ../clients/cli/connections.c:7703 +#: ../clients/cli/connections.c:7346 ../clients/cli/connections.c:7772 +#: ../clients/cli/connections.c:7830 +#, c-format +msgid "Allowed values for '%s' property: %s\n" +msgstr "Допустимые значения «%s»: %s\n" + +#: ../clients/cli/connections.c:7350 ../clients/cli/connections.c:7776 +#: ../clients/cli/connections.c:7834 #, c-format msgid "Enter '%s' value: " msgstr "Введите значение «%s»:" -#: ../clients/cli/connections.c:7240 ../clients/cli/connections.c:7262 -#: ../clients/cli/connections.c:7652 ../clients/cli/connections.c:7708 +#: ../clients/cli/connections.c:7365 ../clients/cli/connections.c:7387 +#: ../clients/cli/connections.c:7780 ../clients/cli/connections.c:7839 #, c-format msgid "Error: failed to set '%s' property: %s\n" msgstr "Ошибка. Не удалось установить свойство «%s»: %s\n" -#: ../clients/cli/connections.c:7256 +#: ../clients/cli/connections.c:7381 #, c-format msgid "Edit '%s' value: " msgstr "Измените значение «%s»:" -#: ../clients/cli/connections.c:7285 +#: ../clients/cli/connections.c:7410 #, c-format msgid "Error: %s\n" msgstr "Ошибка: %s\n" -#: ../clients/cli/connections.c:7291 ../clients/cli/connections.c:7787 -#: ../clients/cli/connections.c:7828 +#: ../clients/cli/connections.c:7416 ../clients/cli/connections.c:7918 +#: ../clients/cli/connections.c:7959 #, c-format msgid "Error: failed to remove value of '%s': %s\n" msgstr "Ошибка. Не удалось изменить значение «%s»: %s\n" -#: ../clients/cli/connections.c:7312 +#: ../clients/cli/connections.c:7437 #, c-format msgid "Unknown command argument: '%s'\n" msgstr "Неизвестный аргумент команды: «%s»\n" -#: ../clients/cli/connections.c:7438 +#: ../clients/cli/connections.c:7565 #, c-format msgid "Available settings: %s\n" msgstr "Доступные параметры: %s\n" -#: ../clients/cli/connections.c:7447 +#: ../clients/cli/connections.c:7574 #, c-format msgid "Error: invalid setting name; %s\n" msgstr "Ошибка. Недопустимое значение параметра: %s\n" -#: ../clients/cli/connections.c:7464 +#: ../clients/cli/connections.c:7591 #, c-format msgid "Available properties: %s\n" msgstr "Доступные свойства: %s\n" -#: ../clients/cli/connections.c:7472 +#: ../clients/cli/connections.c:7599 #, c-format msgid "Error: property %s\n" msgstr "Ошибка свойства %s\n" -#: ../clients/cli/connections.c:7513 +#: ../clients/cli/connections.c:7640 #, fuzzy, c-format -#| msgid "" -#| "Saving the connection with 'autoconnect=yes'. That might result in an " -#| "immediate activation of the connection.\n" -#| "Do you still want to save? [yes] " msgid "" "Saving the connection with 'autoconnect=yes'. That might result in an " "immediate activation of the connection.\n" @@ -2968,12 +2784,12 @@ msgstr "" "активирует соединение. \n" "Сохранить? [Да]" -#: ../clients/cli/connections.c:7589 +#: ../clients/cli/connections.c:7715 #, c-format msgid "You may edit the following settings: %s\n" msgstr "Разрешается изменить следующие параметры: %s\n" -#: ../clients/cli/connections.c:7617 +#: ../clients/cli/connections.c:7742 #, c-format msgid "" "The connection profile has been removed from another client. You may type " @@ -2982,230 +2798,216 @@ msgstr "" "Профиль соединения был удален из другого клиента. Чтобы его восстановить, " "введите «save».\n" -#: ../clients/cli/connections.c:7646 ../clients/cli/connections.c:7701 -#, c-format -msgid "Allowed values for '%s' property: %s\n" -msgstr "Допустимые значения «%s»: %s\n" - -#: ../clients/cli/connections.c:7656 ../clients/cli/connections.c:7870 +#: ../clients/cli/connections.c:7784 ../clients/cli/connections.c:8001 #, c-format msgid "Error: no setting selected; valid are [%s]\n" msgstr "Ошибка. Параметр не выбран. Допускается: [%s]\n" -#: ../clients/cli/connections.c:7657 +#: ../clients/cli/connections.c:7785 #, c-format msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n" msgstr "используйте «goto <параметр>» или «set <параметр>.<свойство>»\n" -#: ../clients/cli/connections.c:7671 ../clients/cli/connections.c:7807 -#: ../clients/cli/connections.c:7887 +#: ../clients/cli/connections.c:7799 ../clients/cli/connections.c:7938 +#: ../clients/cli/connections.c:8018 #, c-format msgid "Error: invalid setting argument '%s'; valid are [%s]\n" msgstr "Ошибка. Недопустимый аргумент «%s». Допускается: [%s]\n" -#: ../clients/cli/connections.c:7681 +#: ../clients/cli/connections.c:7809 #, c-format msgid "Error: missing setting for '%s' property\n" msgstr "Ошибка. Нет определения свойства «%s»\n" -#: ../clients/cli/connections.c:7688 +#: ../clients/cli/connections.c:7816 #, c-format msgid "Error: invalid property: %s\n" msgstr "Ошибка. Недействительное свойство: %s\n" -#: ../clients/cli/connections.c:7735 +#: ../clients/cli/connections.c:7866 #, c-format msgid "Error: unknown setting '%s'\n" msgstr "Ошибка: неизвестный параметр: %s\n" -#: ../clients/cli/connections.c:7748 +#: ../clients/cli/connections.c:7879 #, c-format msgid "You may edit the following properties: %s\n" msgstr "Вы можете изменить следующие свойства: %s\n" -#: ../clients/cli/connections.c:7792 +#: ../clients/cli/connections.c:7923 #, c-format msgid "Error: no argument given; valid are [%s]\n" msgstr "Ошибка. Аргумент не задан. Допускается: [%s]\n" -#: ../clients/cli/connections.c:7805 +#: ../clients/cli/connections.c:7936 #, c-format msgid "Setting '%s' is not present in the connection.\n" msgstr "Параметр «%s» не определен в соединении.\n" -#: ../clients/cli/connections.c:7846 +#: ../clients/cli/connections.c:7977 #, c-format msgid "Error: %s properties, nor it is a setting name.\n" msgstr "Ошибка. %s не является именем параметра или свойства.\n" -#: ../clients/cli/connections.c:7871 +#: ../clients/cli/connections.c:8002 #, c-format msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n" msgstr "используйте «goto <параметр>» или «describe <параметр>.<свойство>»\n" -#: ../clients/cli/connections.c:7912 +#: ../clients/cli/connections.c:8043 #, c-format msgid "Error: invalid property: %s, neither a valid setting name.\n" msgstr "Недопустимое свойство %s или неверное имя параметра.\n" -#: ../clients/cli/connections.c:7941 +#: ../clients/cli/connections.c:8072 #, c-format msgid "Error: unknown setting: '%s'\n" msgstr "Ошибка. Неизвестный параметр: %s\n" -#: ../clients/cli/connections.c:7946 +#: ../clients/cli/connections.c:8077 #, fuzzy, c-format -#| msgid "Setting '%s' is not present in the connection.\n" msgid "Error: '%s' setting not present in the connection\n" msgstr "Параметр «%s» не определен в соединении.\n" -#: ../clients/cli/connections.c:7971 +#: ../clients/cli/connections.c:8102 #, fuzzy, c-format -#| msgid "Error: invalid property: %s\n" msgid "Error: invalid property: %s%s\n" msgstr "Ошибка. Недействительное свойство: %s\n" -#: ../clients/cli/connections.c:7973 +#: ../clients/cli/connections.c:8104 #, fuzzy -#| msgid "Error: invalid property: %s, neither a valid setting name.\n" msgid ", neither a valid setting name" msgstr "Недопустимое свойство %s или неверное имя параметра.\n" -#: ../clients/cli/connections.c:7990 +#: ../clients/cli/connections.c:8121 #, fuzzy, c-format -#| msgid "invalid option '%s'" msgid "Invalid verify option: %s\n" msgstr "Недопустимый параметр «%s»" -#: ../clients/cli/connections.c:7998 +#: ../clients/cli/connections.c:8129 #, c-format msgid "Verify setting '%s': %s\n" msgstr "Проверьте параметр «%s»: %s\n" -#: ../clients/cli/connections.c:8013 +#: ../clients/cli/connections.c:8144 #, c-format msgid "Verify connection: %s\n" msgstr "Проверьте соединение: %s\n" -#: ../clients/cli/connections.c:8016 +#: ../clients/cli/connections.c:8147 #, c-format msgid "The error cannot be fixed automatically.\n" msgstr "" -#: ../clients/cli/connections.c:8033 +#: ../clients/cli/connections.c:8164 #, fuzzy, c-format -#| msgid "Error: invalid extra argument '%s'." msgid "Error: invalid argument '%s'\n" msgstr "Ошибка. Недопустимый дополнительный аргумент: «%s»." -#: ../clients/cli/connections.c:8066 +#: ../clients/cli/connections.c:8197 #, fuzzy, c-format -#| msgid "Error: Failed to save '%s' (%s) connection: (%d) %s\n" msgid "Error: Failed to save '%s' (%s) connection: %s\n" msgstr "Ошибка. Не удалось сохранить соединение «%s» (%s): (%d) %s\n" -#: ../clients/cli/connections.c:8073 +#: ../clients/cli/connections.c:8204 #, c-format msgid "Connection '%s' (%s) successfully saved.\n" msgstr "Соединение «%s» (%s) сохранено.\n" -#: ../clients/cli/connections.c:8074 +#: ../clients/cli/connections.c:8205 #, fuzzy, c-format -#| msgid "Connection '%s' (%s) successfully added.\n" msgid "Connection '%s' (%s) successfully updated.\n" msgstr "Соединение «%s» (%s) добавлено.\n" -#: ../clients/cli/connections.c:8107 +#: ../clients/cli/connections.c:8238 #, c-format msgid "Error: connection verification failed: %s\n" msgstr "Ошибка. Проверка соединения завершилась неудачей: %s\n" -#: ../clients/cli/connections.c:8108 +#: ../clients/cli/connections.c:8239 msgid "(unknown error)" msgstr "(неизвестная ошибка)" -#: ../clients/cli/connections.c:8109 +#: ../clients/cli/connections.c:8240 #, c-format msgid "You may try running 'verify fix' to fix errors.\n" msgstr "" -#: ../clients/cli/connections.c:8131 +#: ../clients/cli/connections.c:8262 #, c-format msgid "Error: connection is not saved. Type 'save' first.\n" msgstr "Ошибка. Соединение не сохранено. Сначала введите «type».\n" -#: ../clients/cli/connections.c:8135 +#: ../clients/cli/connections.c:8266 #, c-format msgid "Error: connection is not valid: %s\n" msgstr "Ошибка. Недействительное соединение: %s\n" -#: ../clients/cli/connections.c:8145 +#: ../clients/cli/connections.c:8276 #, c-format msgid "Error: Cannot activate connection: %s.\n" msgstr "Ошибка. Не удалось активировать соединение: %s\n" -#: ../clients/cli/connections.c:8155 +#: ../clients/cli/connections.c:8286 #, fuzzy, c-format -#| msgid "Error: Failed to activate '%s' (%s) connection: (%d) %s\n" msgid "Error: Failed to activate '%s' (%s) connection: %s\n" msgstr "Ошибка. Не удалось активировать соединение «%s» (%s): (%d) %s\n" -#: ../clients/cli/connections.c:8161 +#: ../clients/cli/connections.c:8292 #, c-format msgid "Monitoring connection activation (press any key to continue)\n" msgstr "" "Контроль активации соединения (нажмите любую клавишу для продолжения)\n" -#: ../clients/cli/connections.c:8199 +#: ../clients/cli/connections.c:8330 #, c-format msgid "Error: status-line: %s\n" msgstr "Ошибка status-line: %s\n" -#: ../clients/cli/connections.c:8207 +#: ../clients/cli/connections.c:8338 #, c-format msgid "Error: save-confirmation: %s\n" msgstr "Ошибка save-confirmation: %s\n" -#: ../clients/cli/connections.c:8215 +#: ../clients/cli/connections.c:8346 #, fuzzy, c-format -#| msgid "Error: 'show active': %s" msgid "Error: show-secrets: %s\n" msgstr "Ошибка «show active»: %s" -#: ../clients/cli/connections.c:8223 +#: ../clients/cli/connections.c:8354 #, c-format msgid "Error: bad color number: '%s'; use <0-8>\n" msgstr "Ошибка. Неверный код цвета: «%s». Допустимые значения: <0-8>\n" -#: ../clients/cli/connections.c:8237 +#: ../clients/cli/connections.c:8366 #, c-format msgid "Current nmcli configuration:\n" msgstr "Текущая конфигурация nmcli:\n" -#: ../clients/cli/connections.c:8247 +#: ../clients/cli/connections.c:8376 #, c-format msgid "Invalid configuration option '%s'; allowed [%s]\n" msgstr "Недопустимый параметр конфигурации «%s». Допускается: [%s]\n" -#: ../clients/cli/connections.c:8494 +#: ../clients/cli/connections.c:8631 #, c-format msgid "Error: only one of 'id', uuid, or 'path' can be provided." msgstr "Ошибка. Допускается только одно значение: «id», «uuid» или «path»." -#: ../clients/cli/connections.c:8506 ../clients/cli/connections.c:8693 -#: ../clients/cli/connections.c:8700 +#: ../clients/cli/connections.c:8643 ../clients/cli/connections.c:8830 +#: ../clients/cli/connections.c:8837 #, c-format msgid "Error: Unknown connection '%s'." msgstr "Ошибка. Неизвестное соединение: «%s»." -#: ../clients/cli/connections.c:8524 +#: ../clients/cli/connections.c:8661 #, c-format msgid "Warning: editing existing connection '%s'; 'type' argument is ignored\n" msgstr "" "Предупреждение. При редактировании соединения «%s» аргумент «type» будет " "пропущен.\n" -#: ../clients/cli/connections.c:8527 +#: ../clients/cli/connections.c:8664 #, c-format msgid "" "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n" @@ -3213,150 +3015,139 @@ msgstr "" "Предупреждение. При редактировании соединения «%s» аргумент «con-name» будет " "пропущен.\n" -#: ../clients/cli/connections.c:8541 +#: ../clients/cli/connections.c:8678 #, c-format msgid "Valid connection types: %s\n" msgstr "Доступные типы подключений: %s\n" -#: ../clients/cli/connections.c:8543 +#: ../clients/cli/connections.c:8680 #, c-format msgid "Error: invalid connection type; %s\n" msgstr "Ошибка. Недопустимый тип соединения: %s.\n" -#: ../clients/cli/connections.c:8582 +#: ../clients/cli/connections.c:8719 #, c-format msgid "===| nmcli interactive connection editor |===" msgstr "===| интерактивный редактор соединений nmcli |===" -#: ../clients/cli/connections.c:8585 +#: ../clients/cli/connections.c:8722 #, c-format msgid "Editing existing '%s' connection: '%s'" msgstr "Редактируется соединение «%s»: «%s»" -#: ../clients/cli/connections.c:8587 +#: ../clients/cli/connections.c:8724 #, c-format msgid "Adding a new '%s' connection" msgstr "Добавление нового соединения «%s»" -#: ../clients/cli/connections.c:8589 +#: ../clients/cli/connections.c:8726 #, c-format msgid "Type 'help' or '?' for available commands." msgstr "Для просмотра доступных команд введите «help» или «?»" -#: ../clients/cli/connections.c:8591 +#: ../clients/cli/connections.c:8728 #, c-format msgid "Type 'describe [<setting>.<prop>]' for detailed property description." msgstr "" "Для просмотра описания свойства введите «describe [<параметр>.<свойство>]»." -#: ../clients/cli/connections.c:8629 +#: ../clients/cli/connections.c:8766 #, fuzzy, c-format -#| msgid "Error: Failed to modify connection '%s': (%d) %s" msgid "Error: Failed to modify connection '%s': %s" msgstr "Ошибка. Не удалось изменить соединение «%s»: (%d) %s" -#: ../clients/cli/connections.c:8636 +#: ../clients/cli/connections.c:8773 #, c-format msgid "Connection '%s' (%s) successfully modified.\n" msgstr "Соединение «%s» (%s) изменено.\n" -#: ../clients/cli/connections.c:8668 +#: ../clients/cli/connections.c:8805 #, c-format msgid "Error: No arguments provided." msgstr "Ошибка. Аргументы не определены." -#: ../clients/cli/connections.c:8687 +#: ../clients/cli/connections.c:8824 #, c-format msgid "Error: connection ID is missing." msgstr "Ошибка. Идентификатор соединения отсутствует." -#: ../clients/cli/connections.c:8709 ../clients/cli/connections.c:8722 +#: ../clients/cli/connections.c:8846 ../clients/cli/connections.c:8859 #, c-format msgid "Error: <setting>.<property> argument is missing." msgstr "Ошибка. Отсутствует аргумент <параметр>.<свойство>" -#: ../clients/cli/connections.c:8727 +#: ../clients/cli/connections.c:8864 #, fuzzy, c-format -#| msgid "Error: fields for '%s' options are missing." msgid "Error: value for '%s' is missing." msgstr "Ошибка: отсутствуют поля для параметров «%s»." -#: ../clients/cli/connections.c:8745 +#: ../clients/cli/connections.c:8882 #, c-format msgid "Error: invalid <setting>.<property> '%s'." msgstr "Ошибка <параметр>.<свойство>: «%s»." -#: ../clients/cli/connections.c:8753 +#: ../clients/cli/connections.c:8890 #, c-format msgid "Error: invalid or not allowed setting '%s': %s." msgstr "Ошибка. Недопустимый параметр «%s»: %s." -#: ../clients/cli/connections.c:8774 +#: ../clients/cli/connections.c:8911 #, c-format msgid "Error: invalid property '%s': %s." msgstr "Ошибка. Недопустимое свойство «%s»: %s." -#: ../clients/cli/connections.c:8785 +#: ../clients/cli/connections.c:8922 #, c-format msgid "Error: failed to modify %s.%s: %s." msgstr "Ошибка. Не удалось изменить %s.%s: %s." -#: ../clients/cli/connections.c:8803 +#: ../clients/cli/connections.c:8940 #, fuzzy, c-format -#| msgid "Error: failed to remove value of '%s': %s\n" msgid "Error: failed to remove a value from %s.%s: %s." msgstr "Ошибка. Не удалось изменить значение «%s»: %s\n" -#: ../clients/cli/connections.c:8840 +#: ../clients/cli/connections.c:8971 +#, fuzzy, c-format +msgid "Error: not all connections deleted." +msgstr "Ошибка: «%s» не является активным соединением." + +#: ../clients/cli/connections.c:8972 #, c-format msgid "Error: Connection deletion failed: %s" msgstr "Ошибка: сбой удаления соединения: %s" -#: ../clients/cli/connections.c:8904 -#, c-format -msgid "Error: unknown connection: %s\n" +#: ../clients/cli/connections.c:9034 +#, fuzzy, c-format +msgid "Error: unknown connection '%s'\n" msgstr "Ошибка. Неизвестное соединение: %s\n" +#: ../clients/cli/connections.c:9048 +#, fuzzy, c-format +msgid "Error: no connection provided." +msgstr "Ошибка: неизвестное подключение %s." + #. truncate trailing ", " -#: ../clients/cli/connections.c:8941 +#: ../clients/cli/connections.c:9073 #, c-format msgid "Error: cannot delete unknown connection(s): %s." msgstr "Ошибка. Не удалось удалить неизвестные соединения: %s" -#: ../clients/cli/connections.c:8964 +#: ../clients/cli/connections.c:9091 #, fuzzy, c-format -#| msgid "Error: Failed to add '%s' connection: (%d) %s" msgid "Error: failed to reload connections: %s." msgstr "Ошибка. Не удалось добавить соединение «%s»: (%d) %s" -#: ../clients/cli/connections.c:9003 +#: ../clients/cli/connections.c:9124 #, fuzzy, c-format -#| msgid "Error: Failed to add '%s' connection: (%d) %s" msgid "Error: failed to load connection: %s." msgstr "Ошибка. Не удалось добавить соединение «%s»: (%d) %s" -#: ../clients/cli/connections.c:9011 +#: ../clients/cli/connections.c:9132 #, c-format msgid "Could not load file '%s'\n" msgstr "Не удалось загрузить «%s»\n" -#: ../clients/cli/connections.c:9108 -#, c-format -msgid "incorrect string '%s' of '--order' option" -msgstr "" - -#: ../clients/cli/connections.c:9134 -#, c-format -msgid "incorrect item '%s' in '--order' option" -msgstr "" - -#: ../clients/cli/connections.c:9219 -#, fuzzy -#| msgid "Error: %s argument is missing." -msgid "'--order' argument is missing" -msgstr "Ошибка: отсутствует аргумент %s." - -#: ../clients/cli/connections.c:9261 +#: ../clients/cli/connections.c:9311 #, c-format msgid "Error: '%s' is not valid 'connection' command." msgstr "Ошибка. Недопустимая команда «connection»: «%s»" @@ -3366,331 +3157,337 @@ msgstr "Ошибка. Недопустимая команда «connection»: « msgid "Interface: " msgstr "Интерфейс:" +#: ../clients/cli/devices.c:39 +#, fuzzy +msgid "Interface(s): " +msgstr "Интерфейс:" + #. 3 -#. 17 -#: ../clients/cli/devices.c:46 ../clients/cli/devices.c:75 +#. 19 +#: ../clients/cli/devices.c:47 ../clients/cli/devices.c:78 msgid "CONNECTION" msgstr "СОЕДИНЕНИЕ" #. 4 -#. 18 -#: ../clients/cli/devices.c:47 ../clients/cli/devices.c:76 +#. 20 +#: ../clients/cli/devices.c:48 ../clients/cli/devices.c:79 msgid "CON-UUID" msgstr "UUID СОЕДИНЕНИЯ" #. 2 -#: ../clients/cli/devices.c:60 +#: ../clients/cli/devices.c:61 +#, fuzzy +msgid "NM-TYPE" +msgstr "ТИП" + +#. 3 +#: ../clients/cli/devices.c:62 msgid "VENDOR" msgstr "ПРОИЗВОДИТЕЛЬ" -#. 3 -#: ../clients/cli/devices.c:61 +#. 4 +#: ../clients/cli/devices.c:63 msgid "PRODUCT" msgstr "ПРОДУКТ" -#. 4 -#: ../clients/cli/devices.c:62 +#. 5 +#: ../clients/cli/devices.c:64 msgid "DRIVER" msgstr "ДРАЙВЕР" -#. 5 -#: ../clients/cli/devices.c:63 +#. 6 +#: ../clients/cli/devices.c:65 msgid "DRIVER-VERSION" msgstr "ВЕРСИЯ ДРАЙВЕРА" -#. 6 -#: ../clients/cli/devices.c:64 +#. 7 +#: ../clients/cli/devices.c:66 msgid "FIRMWARE-VERSION" msgstr "ВЕРСИЯ ПРОШИВКИ" -#. 7 -#: ../clients/cli/devices.c:65 +#. 8 +#: ../clients/cli/devices.c:67 msgid "HWADDR" msgstr "АППАРАТНЫЙ АДРЕС" -#. 8 -#: ../clients/cli/devices.c:66 ../clients/tui/nmt-page-ethernet.c:86 +#. 9 +#: ../clients/cli/devices.c:68 ../clients/tui/nmt-page-ethernet.c:86 #: ../clients/tui/nmt-page-infiniband.c:97 ../clients/tui/nmt-page-vlan.c:131 #: ../clients/tui/nmt-page-wifi.c:373 msgid "MTU" msgstr "MTU" -#. 10 -#: ../clients/cli/devices.c:68 +#. 11 +#: ../clients/cli/devices.c:70 msgid "REASON" msgstr "ПРИЧИНА" -#. 11 -#: ../clients/cli/devices.c:69 +#. 12 +#: ../clients/cli/devices.c:71 msgid "UDI" msgstr "UDI" -#. 12 -#: ../clients/cli/devices.c:70 +#. 13 +#: ../clients/cli/devices.c:72 msgid "IP-IFACE" msgstr "IP_ИНТЕРФЕЙСА" -#. 13 +#. 14 #. 2 -#: ../clients/cli/devices.c:71 ../clients/cli/devices.c:99 +#: ../clients/cli/devices.c:73 ../clients/cli/devices.c:104 msgid "IS-SOFTWARE" msgstr "" -#. 14 -#: ../clients/cli/devices.c:72 +#. 15 +#: ../clients/cli/devices.c:74 msgid "NM-MANAGED" msgstr "ПОД УПРАВЛЕНИЕМ NM" -#. 16 -#: ../clients/cli/devices.c:74 +#. 17 +#: ../clients/cli/devices.c:76 msgid "FIRMWARE-MISSING" msgstr "ТРЕБУЕТСЯ ПРОШИВКА" +#. 18 +#: ../clients/cli/devices.c:77 +msgid "PHYS-PORT-ID" +msgstr "" + +#. 22 +#: ../clients/cli/devices.c:81 +msgid "METERED" +msgstr "" + #. 0 -#: ../clients/cli/devices.c:87 +#: ../clients/cli/devices.c:92 msgid "AVAILABLE-CONNECTION-PATHS" msgstr "ДОСТУПНЫЕ ПУТИ СОЕДИНЕНИЯ" #. 1 -#: ../clients/cli/devices.c:88 +#: ../clients/cli/devices.c:93 msgid "AVAILABLE-CONNECTIONS" msgstr "ДОСТУПНЫЕ СОЕДИНЕНИЯ" #. 0 -#: ../clients/cli/devices.c:97 +#: ../clients/cli/devices.c:102 msgid "CARRIER-DETECT" msgstr "ОПРЕД.НЕСУЩЕЙ" #. 1 -#: ../clients/cli/devices.c:98 +#: ../clients/cli/devices.c:103 msgid "SPEED" msgstr "СКОРОСТЬ" #. 0 -#: ../clients/cli/devices.c:108 +#: ../clients/cli/devices.c:113 msgid "CARRIER" msgstr "НЕСУЩАЯ" #. 0 -#: ../clients/cli/devices.c:117 ../clients/cli/devices.c:603 +#: ../clients/cli/devices.c:122 ../clients/cli/devices.c:557 msgid "WEP" msgstr "WEP" #. 1 -#: ../clients/cli/devices.c:118 +#: ../clients/cli/devices.c:123 msgid "WPA" msgstr "WPA" #. 2 -#: ../clients/cli/devices.c:119 ../clients/cli/devices.c:611 +#: ../clients/cli/devices.c:124 ../clients/cli/devices.c:565 msgid "WPA2" msgstr "WPA2" #. 3 -#: ../clients/cli/devices.c:120 +#: ../clients/cli/devices.c:125 msgid "TKIP" msgstr "TKIP" #. 4 -#: ../clients/cli/devices.c:121 +#: ../clients/cli/devices.c:126 msgid "CCMP" msgstr "CCMP" #. 5 #. 2 -#: ../clients/cli/devices.c:122 ../clients/cli/devices.c:222 +#: ../clients/cli/devices.c:127 ../clients/cli/devices.c:229 msgid "AP" msgstr "ТОЧКА ДОСТУПА" #. 6 -#: ../clients/cli/devices.c:123 +#: ../clients/cli/devices.c:128 msgid "ADHOC" msgstr "ADHOC" +#. 7 +#: ../clients/cli/devices.c:129 +msgid "2GHZ" +msgstr "" + +#. 8 +#: ../clients/cli/devices.c:130 +msgid "5GHZ" +msgstr "" + #. 0 -#: ../clients/cli/devices.c:132 +#: ../clients/cli/devices.c:139 msgid "CTR-FREQ" msgstr "CTR-FREQ" #. 1 -#: ../clients/cli/devices.c:133 +#: ../clients/cli/devices.c:140 msgid "RSSI" msgstr "RSSI" #. 2 -#: ../clients/cli/devices.c:134 +#: ../clients/cli/devices.c:141 msgid "CINR" msgstr "CINR" #. 3 -#: ../clients/cli/devices.c:135 +#: ../clients/cli/devices.c:142 msgid "TX-POW" msgstr "TX-POW" #. 4 -#: ../clients/cli/devices.c:136 +#: ../clients/cli/devices.c:143 msgid "BSID" msgstr "BSID" #. 0 -#: ../clients/cli/devices.c:145 ../clients/tui/nmt-page-wifi.c:227 +#: ../clients/cli/devices.c:152 ../clients/tui/nmt-page-wifi.c:227 msgid "SSID" msgstr "SSID" #. 1 -#: ../clients/cli/devices.c:146 +#: ../clients/cli/devices.c:153 msgid "SSID-HEX" msgstr "SSID-HEX" #. 2 -#: ../clients/cli/devices.c:147 ../clients/tui/nmt-page-wifi.c:361 +#: ../clients/cli/devices.c:154 ../clients/tui/nmt-page-wifi.c:361 msgid "BSSID" msgstr "BSSID" #. 3 -#: ../clients/cli/devices.c:148 +#: ../clients/cli/devices.c:155 msgid "MODE" msgstr "РЕЖИМ" #. 4 -#: ../clients/cli/devices.c:149 +#: ../clients/cli/devices.c:156 msgid "CHAN" msgstr "КАНАЛ" #. 5 -#: ../clients/cli/devices.c:150 +#: ../clients/cli/devices.c:157 msgid "FREQ" msgstr "ЧАСТОТА" #. 6 -#: ../clients/cli/devices.c:151 +#: ../clients/cli/devices.c:158 msgid "RATE" msgstr "СКОРОСТЬ" #. 7 #. 1 -#: ../clients/cli/devices.c:152 ../clients/cli/devices.c:172 +#: ../clients/cli/devices.c:159 ../clients/cli/devices.c:179 msgid "SIGNAL" msgstr "СИГНАЛ" #. 8 -#: ../clients/cli/devices.c:153 +#: ../clients/cli/devices.c:160 msgid "BARS" msgstr "СТОЛБЦЫ" #. 9 -#: ../clients/cli/devices.c:154 +#: ../clients/cli/devices.c:161 msgid "SECURITY" msgstr "ЗАЩИТА" #. 10 -#: ../clients/cli/devices.c:155 +#: ../clients/cli/devices.c:162 msgid "WPA-FLAGS" msgstr "ФЛАГИ WPA" #. 11 -#: ../clients/cli/devices.c:156 +#: ../clients/cli/devices.c:163 msgid "RSN-FLAGS" msgstr "ФЛАГИ RSN" #. 14 -#: ../clients/cli/devices.c:159 +#: ../clients/cli/devices.c:166 msgid "*" msgstr "*" #. 0 #. 5 -#: ../clients/cli/devices.c:171 ../clients/cli/devices.c:225 +#: ../clients/cli/devices.c:178 ../clients/cli/devices.c:232 msgid "NSP" msgstr "NSP" #. 0 -#: ../clients/cli/devices.c:186 +#: ../clients/cli/devices.c:193 msgid "SLAVES" msgstr "СЛЕЙВЫ" #. 0 -#: ../clients/cli/devices.c:195 +#: ../clients/cli/devices.c:202 msgid "PARENT" msgstr "" #. 1 -#: ../clients/cli/devices.c:196 +#: ../clients/cli/devices.c:203 msgid "ID" msgstr "ID" #. 0 -#: ../clients/cli/devices.c:205 ../clients/cli/devices.c:220 +#: ../clients/cli/devices.c:212 ../clients/cli/devices.c:227 msgid "CAPABILITIES" msgstr "ВОЗМОЖНОСТИ" #. 1 -#: ../clients/cli/devices.c:221 +#: ../clients/cli/devices.c:228 msgid "WIFI-PROPERTIES" msgstr "СВОЙСТВА WIFI" #. 3 -#: ../clients/cli/devices.c:223 +#: ../clients/cli/devices.c:230 msgid "WIRED-PROPERTIES" msgstr "СВОЙСТВА ПРОВОДНОГО СОЕДИНЕНИЯ" #. 4 -#: ../clients/cli/devices.c:224 +#: ../clients/cli/devices.c:231 msgid "WIMAX-PROPERTIES" msgstr "СВОЙСТВА WIMAX" #. 10 -#: ../clients/cli/devices.c:230 ../clients/tui/nmt-page-bond.c:354 +#: ../clients/cli/devices.c:237 ../clients/tui/nmt-page-bond.c:354 msgid "BOND" msgstr "АГРЕГАЦИЯ (BOND)" #. 11 -#: ../clients/cli/devices.c:231 ../clients/tui/nmt-page-team.c:148 +#: ../clients/cli/devices.c:238 ../clients/tui/nmt-page-team.c:148 msgid "TEAM" msgstr "АГРЕГАЦИЯ (TEAM)" #. 12 -#: ../clients/cli/devices.c:232 ../clients/tui/nmt-page-bridge.c:77 +#: ../clients/cli/devices.c:239 ../clients/tui/nmt-page-bridge.c:77 msgid "BRIDGE" msgstr "МОСТ" #. 14 -#: ../clients/cli/devices.c:234 +#: ../clients/cli/devices.c:241 msgid "BLUETOOTH" msgstr "BLUETOOTH" #. 15 -#: ../clients/cli/devices.c:235 +#: ../clients/cli/devices.c:242 msgid "CONNECTIONS" msgstr "СОЕДИНЕНИЯ" -#: ../clients/cli/devices.c:259 -#, fuzzy, c-format -#| msgid "" -#| "Usage: nmcli device { COMMAND | help }\n" -#| "\n" -#| "COMMAND := { status | show | connect | disconnect | wifi | wimax }\n" -#| "\n" -#| "COMMAND := { status | show | connect | disconnect | wifi }\n" -#| "\n" -#| " status\n" -#| "\n" -#| " show [<ifname>]\n" -#| "\n" -#| " connect <ifname>\n" -#| "\n" -#| " disconnect <ifname>\n" -#| "\n" -#| " wifi [list [ifname <ifname>] [bssid <BSSID>]]\n" -#| "\n" -#| " wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] " -#| "[ifname <ifname>]\n" -#| " [bssid <BSSID>] [name <name>] [private yes|no]\n" -#| "\n" -#| " wifi rescan [[ifname] <ifname>]\n" -#| "\n" -#| " wimax [list [ifname <ifname>] [nsp <name>]]\n" -#| "\n" +#: ../clients/cli/devices.c:266 +#, fuzzy, c-format msgid "" "Usage: nmcli device { COMMAND | help }\n" "\n" @@ -3704,17 +3501,18 @@ msgid "" "\n" " connect <ifname>\n" "\n" -" disconnect <ifname>\n" +" disconnect <ifname> ...\n" "\n" -" delete <ifname>\n" +" delete <ifname> ...\n" "\n" " wifi [list [ifname <ifname>] [bssid <BSSID>]]\n" "\n" " wifi connect <(B)SSID> [password <password>] [wep-key-type key|phrase] " "[ifname <ifname>]\n" -" [bssid <BSSID>] [name <name>] [private yes|no]\n" +" [bssid <BSSID>] [name <name>] [private yes|no] " +"[hidden yes|no]\n" "\n" -" wifi rescan [[ifname] <ifname>]\n" +" wifi rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n" "\n" " wimax [list [ifname <ifname>] [nsp <name>]]\n" "\n" @@ -3744,7 +3542,7 @@ msgstr "" " wimax [list [ifname <интерфейс>] [nsp <имя>]]\n" "\n" -#: ../clients/cli/devices.c:283 +#: ../clients/cli/devices.c:290 #, c-format msgid "" "Usage: nmcli device status { help }\n" @@ -3774,7 +3572,7 @@ msgstr "" "gen status».\n" "\n" -#: ../clients/cli/devices.c:298 +#: ../clients/cli/devices.c:305 #, c-format msgid "" "Usage: nmcli device show { ARGUMENTS | help }\n" @@ -3793,7 +3591,7 @@ msgstr "" "отдельно выбранном устройстве.\n" "\n" -#: ../clients/cli/devices.c:309 +#: ../clients/cli/devices.c:316 #, c-format msgid "" "Usage: nmcli device connect { ARGUMENTS | help }\n" @@ -3815,14 +3613,14 @@ msgstr "" "принимая во внимание соединения без включенных функций\n" "автоматического запуска.\n" -#: ../clients/cli/devices.c:321 -#, c-format +#: ../clients/cli/devices.c:328 +#, fuzzy, c-format msgid "" "Usage: nmcli device disconnect { ARGUMENTS | help }\n" "\n" -"ARGUMENTS := <ifname>\n" +"ARGUMENTS := <ifname> ...\n" "\n" -"Disconnect the device.\n" +"Disconnect devices.\n" "The command disconnects the device and prevents it from auto-activating\n" "further connections without user/manual intervention.\n" "\n" @@ -3836,23 +3634,15 @@ msgstr "" "\n" "\n" -#: ../clients/cli/devices.c:333 +#: ../clients/cli/devices.c:340 #, fuzzy, c-format -#| msgid "" -#| "Usage: nmcli device show { ARGUMENTS | help }\n" -#| "\n" -#| "ARGUMENTS := [<ifname>]\n" -#| "\n" -#| "Show details of device(s).\n" -#| "The command lists details for all devices, or for a given device.\n" -#| "\n" msgid "" "Usage: nmcli device delete { ARGUMENTS | help }\n" "\n" -"ARGUMENTS := <ifname>\n" +"ARGUMENTS := <ifname> ...\n" "\n" -"Deletes the software device.\n" -"The command removes the interface. It only works for software devices\n" +"Delete the software devices.\n" +"The command removes the interfaces. It only works for software devices\n" "(like bonds, bridges, etc.). Hardware devices cannot be deleted by the\n" "command.\n" "\n" @@ -3865,8 +3655,8 @@ msgstr "" "отдельно выбранном устройстве.\n" "\n" -#: ../clients/cli/devices.c:346 -#, c-format +#: ../clients/cli/devices.c:353 +#, fuzzy, c-format msgid "" "Usage: nmcli device wifi { ARGUMENTS | help }\n" "\n" @@ -3879,7 +3669,8 @@ msgid "" "\n" "ARGUMENTS := connect <(B)SSID> [password <password>] [wep-key-type key|" "phrase] [ifname <ifname>]\n" -" [bssid <BSSID>] [name <name>] [private yes|no]\n" +" [bssid <BSSID>] [name <name>] [private yes|no] [hidden " +"yes|no]\n" "\n" "Connect to a Wi-Fi network specified by SSID or BSSID. The command creates\n" "a new connection and then activates it on a device. This is a command-line\n" @@ -3890,14 +3681,17 @@ msgid "" "only open, WEP and WPA-PSK networks are supported at the moment. It is also\n" "assumed that IP configuration is obtained via DHCP.\n" "\n" -"ARGUMENTS := rescan [[ifname] <ifname>]\n" +"ARGUMENTS := rescan [ifname <ifname>] [[ssid <SSID to scan>] ...]\n" "\n" "Request that NetworkManager immediately re-scan for available access " "points.\n" "NetworkManager scans Wi-Fi networks periodically, but in some cases it " "might\n" -"be useful to start scanning manually. Note that this command does not show\n" -"the APs, use 'nmcli device wifi list' for that.\n" +"be useful to start scanning manually. 'ssid' allows scanning for a specific\n" +"SSID, which is useful for APs with hidden SSIDs. More 'ssid' parameters can " +"be\n" +"given. Note that this command does not show the APs,\n" +"use 'nmcli device wifi list' for that.\n" "\n" msgstr "" "Формат: nmcli device wifi { АРГУМЕНТЫ | help }\n" @@ -3931,7 +3725,7 @@ msgstr "" "но иногда это надо сделать сразу. Эта команда не показывает список \n" "точек доступа — для этой цели служит «nmcli device wifi list».\n" -#: ../clients/cli/devices.c:379 +#: ../clients/cli/devices.c:388 #, c-format msgid "" "Usage: nmcli device wimax { ARGUMENTS | help }\n" @@ -3954,222 +3748,255 @@ msgstr "" "«ifname» и «ncp» можно выбрать сети для конкретного интерфейса или NCP.\n" "\n" -#: ../clients/cli/devices.c:522 ../clients/cli/devices.c:721 +#: ../clients/cli/devices.c:477 ../clients/cli/devices.c:668 msgid "(none)" msgstr "(нет)" -#: ../clients/cli/devices.c:591 +#: ../clients/cli/devices.c:545 #, c-format msgid "%u MHz" msgstr "%u МГц" -#: ../clients/cli/devices.c:592 +#: ../clients/cli/devices.c:546 #, c-format msgid "%u Mbit/s" msgstr "%u МБ/с" -#: ../clients/cli/devices.c:607 +#: ../clients/cli/devices.c:561 msgid "WPA1" msgstr "WPA1" -#: ../clients/cli/devices.c:616 +#: ../clients/cli/devices.c:570 msgid "802.1X" msgstr "802.1X" -#: ../clients/cli/devices.c:632 +#: ../clients/cli/devices.c:586 msgid "Ad-Hoc" msgstr "Ad-Hoc" -#: ../clients/cli/devices.c:633 +#: ../clients/cli/devices.c:587 msgid "Infra" msgstr "Инфраструктура" -#: ../clients/cli/devices.c:634 +#: ../clients/cli/devices.c:588 msgid "N/A" msgstr "Н/Д" -#: ../clients/cli/devices.c:672 +#: ../clients/cli/devices.c:619 msgid "Home" msgstr "Дом" -#: ../clients/cli/devices.c:675 +#: ../clients/cli/devices.c:622 msgid "Partner" msgstr "Партнёр" -#: ../clients/cli/devices.c:678 +#: ../clients/cli/devices.c:625 msgid "Roaming" msgstr "Роуминг" -#: ../clients/cli/devices.c:836 +#: ../clients/cli/devices.c:783 msgid "Device details" msgstr "Сведения об устройстве" -#: ../clients/cli/devices.c:848 +#: ../clients/cli/devices.c:795 #, c-format msgid "Error: 'device show': %s" msgstr "Ошибка «device show»: %s" -#: ../clients/cli/devices.c:899 ../clients/cli/devices.c:902 +#: ../clients/cli/devices.c:847 ../clients/cli/devices.c:850 msgid "(unknown)" msgstr "(неизвестно)" -#: ../clients/cli/devices.c:940 +#: ../clients/cli/devices.c:891 #, c-format msgid "%u Mb/s" msgstr "%u Мб/c" -#: ../clients/cli/devices.c:1027 +#: ../clients/cli/devices.c:981 msgid "on" msgstr "вкл." -#: ../clients/cli/devices.c:1027 +#: ../clients/cli/devices.c:981 msgid "off" msgstr "выкл." -#: ../clients/cli/devices.c:1313 +#: ../clients/cli/devices.c:1255 #, c-format msgid "Error: 'device status': %s" msgstr "Ошибка: «device status»: %s" #. Add headers -#: ../clients/cli/devices.c:1320 +#: ../clients/cli/devices.c:1262 msgid "Status of devices" msgstr "Состояние устройств" -#: ../clients/cli/devices.c:1351 +#: ../clients/cli/devices.c:1293 #, c-format msgid "Error: invalid extra argument '%s'." msgstr "Ошибка. Недопустимый дополнительный аргумент: «%s»." -#: ../clients/cli/devices.c:1368 ../clients/cli/devices.c:1666 -#: ../clients/cli/devices.c:1816 ../clients/cli/devices.c:1903 -#: ../clients/cli/devices.c:2037 ../clients/cli/devices.c:2698 +#: ../clients/cli/devices.c:1310 ../clients/cli/devices.c:1608 +#: ../clients/cli/devices.c:2080 ../clients/cli/devices.c:2847 #, c-format msgid "Error: Device '%s' not found." msgstr "Ошибка: не найдено устройство «%s»." -#: ../clients/cli/devices.c:1446 +#: ../clients/cli/devices.c:1388 #, fuzzy, c-format -#| msgid "Success: Device '%s' successfully activated." msgid "Device '%s' successfully activated with '%s'.\n" msgstr "Устройство «%s» успешно подключено." -#: ../clients/cli/devices.c:1452 +#: ../clients/cli/devices.c:1394 #, fuzzy, c-format -#| msgid "Error: Connection activation failed: (%d) %s." msgid "Error: Connection activation failed: (%d) %s.\n" msgstr "Ошибка: сбой активации соединения: (%d) %s." -#: ../clients/cli/devices.c:1486 +#: ../clients/cli/devices.c:1428 #, fuzzy, c-format -#| msgid "Error: Failed to add/activate new connection: (%d) %s" msgid "Error: Failed to add/activate new connection: %s" msgstr "Ошибка: не удалось добавить или активировать новое соединение: (%d) %s" -#: ../clients/cli/devices.c:1495 +#: ../clients/cli/devices.c:1437 #, c-format msgid "Error: Failed to add/activate new connection: Unknown error" msgstr "" "Ошибка: не удалось добавить или активировать новое соединение: неизвестная " "ошибка" -#: ../clients/cli/devices.c:1506 +#: ../clients/cli/devices.c:1448 #, c-format msgid "Connection with UUID '%s' created and activated on device '%s'\n" msgstr "Соединение с UUID «%s» создано и задействовано на устройстве «%s»\n" -#: ../clients/cli/devices.c:1570 +#: ../clients/cli/devices.c:1512 #, c-format msgid "Error: Device activation failed: %s" msgstr "Ошибка. Не удалось отключить устройство: %s" -#: ../clients/cli/devices.c:1579 +#: ../clients/cli/devices.c:1521 #, fuzzy, c-format -#| msgid "Error: Device activation failed: %s" msgid "Error: Device activation failed: device was disconnected" msgstr "Ошибка. Не удалось отключить устройство: %s" -#: ../clients/cli/devices.c:1594 +#: ../clients/cli/devices.c:1536 #, c-format msgid "Device '%s' has been connected.\n" msgstr "Устройство «%s» подключено.\n" -#: ../clients/cli/devices.c:1635 ../clients/cli/devices.c:1644 -#: ../clients/cli/devices.c:1785 ../clients/cli/devices.c:1794 -#: ../clients/cli/devices.c:1873 ../clients/cli/devices.c:1881 +#: ../clients/cli/devices.c:1577 ../clients/cli/devices.c:1586 +#: ../clients/cli/devices.c:1787 ../clients/cli/devices.c:1902 #, c-format msgid "Error: No interface specified." msgstr "Ошибка. Интерфейс не определен." -#: ../clients/cli/devices.c:1650 ../clients/cli/devices.c:1800 -#: ../clients/cli/devices.c:1887 +#: ../clients/cli/devices.c:1592 #, c-format msgid "Error: extra argument not allowed: '%s'." msgstr "Ошибка. Дополнительный аргумент не разрешен: «%s»." -#: ../clients/cli/devices.c:1714 ../clients/cli/devices.c:1725 +#: ../clients/cli/devices.c:1676 ../clients/cli/devices.c:1691 +#: ../clients/cli/devices.c:1755 #, fuzzy, c-format -#| msgid "Success: Device '%s' successfully disconnected." msgid "Device '%s' successfully disconnected.\n" msgstr "Выполнено: устройство «%s» отключено." +#: ../clients/cli/devices.c:1679 +#, fuzzy, c-format +msgid "Device '%s' successfully removed.\n" +msgstr "Выполнено: устройство «%s» отключено." + #: ../clients/cli/devices.c:1739 -#, c-format -msgid "Error: Device '%s' (%s) disconnecting failed: %s" +#, fuzzy, c-format +msgid "Error: not all devices disconnected." +msgstr "Ошибка: «%s» не является активным соединением." + +#: ../clients/cli/devices.c:1740 +#, fuzzy, c-format +msgid "Error: Device '%s' (%s) disconnecting failed: %s\n" msgstr "Ошибка: не удалось отключить устройство «%s» (%s): %s" -#: ../clients/cli/devices.c:1754 +#: ../clients/cli/devices.c:1807 ../clients/cli/devices.c:1929 #, c-format -msgid "Device '%s' has been disconnected.\n" -msgstr "Устройство «%s» отключено.\n" +msgid "Warning: argument '%s' is duplicated.\n" +msgstr "" + +#: ../clients/cli/devices.c:1809 ../clients/cli/devices.c:1931 +#, fuzzy, c-format +msgid "Error: Device '%s' not found.\n" +msgstr "Ошибка: не найдено устройство «%s»." + +#: ../clients/cli/devices.c:1810 ../clients/cli/devices.c:1932 +#, fuzzy, c-format +msgid "Error: not all devices found." +msgstr "Ошибка: устройства Wi-Fi не найдены." + +#: ../clients/cli/devices.c:1820 ../clients/cli/devices.c:1942 +#, fuzzy, c-format +msgid "Error: no valid device provided." +msgstr "Ошибка: неизвестное подключение %s." -#: ../clients/cli/devices.c:1845 +#: ../clients/cli/devices.c:1864 #, fuzzy, c-format -#| msgid "Error: Device '%s' (%s) disconnecting failed: %s" -msgid "Error: Device '%s' (%s) deletion failed: %s" +msgid "Error: not all devices deleted." +msgstr "Ошибка: устройства Wi-Fi не найдены." + +#: ../clients/cli/devices.c:1865 +#, fuzzy, c-format +msgid "Error: Device '%s' (%s) deletion failed: %s\n" msgstr "Ошибка: не удалось отключить устройство «%s» (%s): %s" -#: ../clients/cli/devices.c:1909 +#: ../clients/cli/devices.c:1923 #, fuzzy, c-format -#| msgid "Error: setting '%s' is mandatory and cannot be removed.\n" -msgid "Error: Device '%s' is a hardware device. It can't be deleted." +msgid "Error: Device '%s' is a hardware device. It can't be deleted.\n" msgstr "Ошибка. Обязательное значение «%s» не может быть удалено.\n" -#: ../clients/cli/devices.c:1980 +#: ../clients/cli/devices.c:1925 +#, fuzzy, c-format +msgid "Error: not all devices valid." +msgstr "Ошибка: устройства Wi-Fi не найдены." + +#: ../clients/cli/devices.c:2023 msgid "Wi-Fi scan list" msgstr "Список сканирования Wi-Fi" -#: ../clients/cli/devices.c:2018 +#: ../clients/cli/devices.c:2061 #, c-format msgid "Error: 'device wifi': %s" msgstr "Ошибка «device wifi»: «%s»" -#: ../clients/cli/devices.c:2060 ../clients/cli/devices.c:2135 +#: ../clients/cli/devices.c:2103 ../clients/cli/devices.c:2184 #, c-format msgid "Error: Access point with bssid '%s' not found." msgstr "Ошибка: точка доступа с bssid «%s» не найдена." -#: ../clients/cli/devices.c:2084 ../clients/cli/devices.c:2401 -#: ../clients/cli/devices.c:2565 +#: ../clients/cli/devices.c:2130 +#, fuzzy, c-format +msgid "" +"Error: Device '%s' was not recognized as a Wi-Fi device, check " +"NetworkManager Wi-Fi plugin." +msgstr "Ошибка: «%s» не является устройством WiFi." + +#: ../clients/cli/devices.c:2132 ../clients/cli/devices.c:2464 +#: ../clients/cli/devices.c:2695 #, c-format msgid "Error: Device '%s' is not a Wi-Fi device." msgstr "Ошибка: «%s» не является устройством WiFi." -#: ../clients/cli/devices.c:2294 +#: ../clients/cli/devices.c:2344 msgid "SSID or BSSID: " msgstr "SSID или BSSID: " -#: ../clients/cli/devices.c:2299 +#: ../clients/cli/devices.c:2349 #, c-format msgid "Error: SSID or BSSID are missing." msgstr "Ошибка: не указан SSID или BSSID." -#: ../clients/cli/devices.c:2323 +#: ../clients/cli/devices.c:2373 #, c-format msgid "Error: bssid argument value '%s' is not a valid BSSID." msgstr "Ошибка: недопустимое значение аргумента bssid «%s»." -#: ../clients/cli/devices.c:2347 +#: ../clients/cli/devices.c:2397 #, c-format msgid "" "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'." @@ -4177,76 +4004,92 @@ msgstr "" "Ошибка: недопустимое значение аргумента wep-key-type «%s»; используйте «key» " "или «phrase»." -#: ../clients/cli/devices.c:2367 +#: ../clients/cli/devices.c:2417 ../clients/cli/devices.c:2430 #, c-format msgid "Error: %s: %s." msgstr "Ошибка: %s: %s." -#: ../clients/cli/devices.c:2382 +#: ../clients/cli/devices.c:2445 #, c-format msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)." msgstr "" "Ошибка: BSSID для подключения к (%s) отличается от bssid аргумента (%s)." -#: ../clients/cli/devices.c:2388 +#: ../clients/cli/devices.c:2451 #, c-format msgid "Error: Parameter '%s' is neither SSID nor BSSID." msgstr "Ошибка: параметр «%s» не является SSID или BSSID." -#: ../clients/cli/devices.c:2403 ../clients/cli/devices.c:2567 +#: ../clients/cli/devices.c:2466 ../clients/cli/devices.c:2697 #, c-format msgid "Error: No Wi-Fi device found." msgstr "Ошибка: устройства Wi-Fi не найдены." -#: ../clients/cli/devices.c:2421 +#: ../clients/cli/devices.c:2486 +#, fuzzy, c-format +msgid "Error: Failed to scan hidden SSID: %s." +msgstr "Ошибка. Отказ доступа при настройке журналирования, %s" + +#: ../clients/cli/devices.c:2511 #, c-format msgid "Error: No network with SSID '%s' found." msgstr "Ошибка: не найдена сеть с SSID «%s»." -#: ../clients/cli/devices.c:2423 +#: ../clients/cli/devices.c:2513 #, c-format msgid "Error: No access point with BSSID '%s' found." msgstr "Ошибка: точка доступа с BSSID «%s» не найдена." -#: ../clients/cli/devices.c:2462 +#: ../clients/cli/devices.c:2555 +#, c-format +msgid "" +"Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n" +msgstr "" + +#: ../clients/cli/devices.c:2569 msgid "Password: " msgstr "Пароль:" -#: ../clients/cli/devices.c:2594 +#: ../clients/cli/devices.c:2664 +#, fuzzy, c-format +msgid "Error: '%s' cannot repeat." +msgstr "Ошибка. Параметр «%s» не определен.\n" + +#: ../clients/cli/devices.c:2743 #, c-format msgid "Error: 'device wifi' command '%s' is not valid." msgstr "Ошибка. Неверная команда «device wifi»: «%s»." -#: ../clients/cli/devices.c:2641 +#: ../clients/cli/devices.c:2790 msgid "WiMAX NSP list" msgstr "Список WiMAX NSP" -#: ../clients/cli/devices.c:2678 +#: ../clients/cli/devices.c:2827 #, c-format msgid "Error: 'device wimax': %s" msgstr "Ошибка: «device wimax»: %s" -#: ../clients/cli/devices.c:2721 +#: ../clients/cli/devices.c:2870 #, c-format msgid "Error: NSP with name '%s' not found." msgstr "Ошибка: NSP с именем «%s» не найден." -#: ../clients/cli/devices.c:2734 +#: ../clients/cli/devices.c:2883 #, c-format msgid "Error: Device '%s' is not a WiMAX device." msgstr "Ошибка: «%s» не является устройством WIMAX." -#: ../clients/cli/devices.c:2778 +#: ../clients/cli/devices.c:2927 #, c-format msgid "Error: Access point with nsp '%s' not found." msgstr "Ошибка: точка доступа с nsp «%s» не найдена." -#: ../clients/cli/devices.c:2815 +#: ../clients/cli/devices.c:2964 #, c-format msgid "Error: 'device wimax' command '%s' is not valid." msgstr "Ошибка. Неверная команда «device wimax»: «%s»." -#: ../clients/cli/devices.c:2988 +#: ../clients/cli/devices.c:3140 #, c-format msgid "Error: 'dev' command '%s' is not valid." msgstr "Ошибка. Неверная команда «dev»: «%s»." @@ -4612,171 +4455,144 @@ msgstr "подключен (на узле)" msgid "disconnecting" msgstr "отключение" -#: ../clients/cli/general.c:294 +#: ../clients/cli/general.c:274 msgid "portal" msgstr "портал" -#: ../clients/cli/general.c:296 +#: ../clients/cli/general.c:276 msgid "limited" msgstr "ограничено" -#: ../clients/cli/general.c:298 +#: ../clients/cli/general.c:278 msgid "full" msgstr "полностью" -#: ../clients/cli/general.c:352 +#: ../clients/cli/general.c:316 #, c-format msgid "Error: only these fields are allowed: %s" msgstr "Ошибка. Допустимые поля: %s" -#: ../clients/cli/general.c:382 +#: ../clients/cli/general.c:336 ../clients/cli/general.c:337 +#: ../clients/cli/general.c:338 ../clients/cli/general.c:339 +#: ../clients/cli/general.c:340 ../clients/cli/general.c:342 +#: ../clients/cli/general.c:343 +msgid "enabled" +msgstr "включен" + +#: ../clients/cli/general.c:336 ../clients/cli/general.c:337 +#: ../clients/cli/general.c:338 ../clients/cli/general.c:339 +#: ../clients/cli/general.c:340 ../clients/cli/general.c:342 +#: ../clients/cli/general.c:343 +msgid "disabled" +msgstr "отключен" + +#: ../clients/cli/general.c:346 msgid "NetworkManager status" msgstr "Состояние NetworkManager" -#: ../clients/cli/general.c:387 +#: ../clients/cli/general.c:351 msgid "running" msgstr "выполняется" -#: ../clients/cli/general.c:390 +#: ../clients/cli/general.c:354 msgid "starting" msgstr "запускается" -#: ../clients/cli/general.c:390 +#: ../clients/cli/general.c:354 msgid "started" msgstr "запущено" -#: ../clients/cli/general.c:392 ../clients/cli/general.c:393 -#: ../clients/cli/general.c:394 ../clients/cli/general.c:395 -#: ../clients/cli/general.c:396 ../clients/cli/general.c:398 -#: ../clients/cli/general.c:399 -msgid "enabled" -msgstr "включен" - -#: ../clients/cli/general.c:392 ../clients/cli/general.c:393 -#: ../clients/cli/general.c:394 ../clients/cli/general.c:395 -#: ../clients/cli/general.c:396 ../clients/cli/general.c:398 -#: ../clients/cli/general.c:399 -msgid "disabled" -msgstr "отключен" - -#: ../clients/cli/general.c:476 +#: ../clients/cli/general.c:425 msgid "auth" msgstr "подлинный" -#: ../clients/cli/general.c:505 +#: ../clients/cli/general.c:454 #, c-format msgid "Error: 'general permissions': %s" msgstr "Ошибка общих разрешений: %s" -#: ../clients/cli/general.c:519 +#: ../clients/cli/general.c:468 msgid "NetworkManager permissions" msgstr "Разрешения NetworkManager" -#: ../clients/cli/general.c:560 +#: ../clients/cli/general.c:509 #, c-format msgid "Error: 'general logging': %s" msgstr "Ошибка «general logging»: %s" -#: ../clients/cli/general.c:575 +#: ../clients/cli/general.c:524 msgid "NetworkManager logging" msgstr "Ведение журналов NetworkManager" -#: ../clients/cli/general.c:597 +#: ../clients/cli/general.c:546 #, fuzzy, c-format -#| msgid "Error: failed to set hostname: (%d) %s" msgid "Error: failed to set hostname: %s" msgstr "Ошибка. Не удалось установить имя узла: (%d) %s" -#: ../clients/cli/general.c:710 +#: ../clients/cli/general.c:659 #, fuzzy, c-format -#| msgid "Error: access denied to set logging; %s" msgid "Error: failed to set logging: %s" msgstr "Ошибка. Отказ доступа при настройке журналирования, %s" -#: ../clients/cli/general.c:719 +#: ../clients/cli/general.c:668 #, c-format msgid "Error: 'general' command '%s' is not valid." msgstr "Ошибка. Недопустимая команда «general»: «%s»." -#: ../clients/cli/general.c:737 +#: ../clients/cli/general.c:686 #, c-format msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)" msgstr "Недопустимое поле «--fields»: «%s». Допускается: %s" -#: ../clients/cli/general.c:762 +#: ../clients/cli/general.c:711 #, c-format msgid "Error: invalid '%s' argument: '%s' (use on/off)." msgstr "Недопустимый аргумент «%s»: «%s». Может принимать значения on или off." -#: ../clients/cli/general.c:773 +#: ../clients/cli/general.c:722 msgid "Connectivity" msgstr "Соединение" -#: ../clients/cli/general.c:788 +#: ../clients/cli/general.c:737 msgid "Networking" msgstr "Сеть" -#: ../clients/cli/general.c:813 +#: ../clients/cli/general.c:762 #, c-format msgid "Error: 'networking connectivity' command '%s' is not valid." msgstr "Ошибка. Недопустимая команда «networking connectivity»: «%s»." -#: ../clients/cli/general.c:829 +#: ../clients/cli/general.c:778 #, c-format msgid "Error: 'networking' command '%s' is not valid." msgstr "Ошибка. Недопустимая команда «networking»: «%s»." -#: ../clients/cli/general.c:858 ../clients/cli/general.c:878 +#: ../clients/cli/general.c:807 ../clients/cli/general.c:827 msgid "Radio switches" msgstr "Переключатели" #. no argument, show current WiFi state -#: ../clients/cli/general.c:896 +#: ../clients/cli/general.c:845 msgid "Wi-Fi radio switch" msgstr "Переключатель Wi-Fi" #. no argument, show current WWAN (mobile broadband) state -#: ../clients/cli/general.c:912 +#: ../clients/cli/general.c:861 msgid "WWAN radio switch" msgstr "Переключатель WWAN" #. no argument, show current WiMAX state -#: ../clients/cli/general.c:929 +#: ../clients/cli/general.c:878 msgid "WiMAX radio switch" msgstr "Переключатель WiMAX" -#: ../clients/cli/general.c:941 +#: ../clients/cli/general.c:890 #, c-format msgid "Error: 'radio' command '%s' is not valid." msgstr "Ошибка. Недопустимая команда «radio»: «%s»." #: ../clients/cli/nmcli.c:86 #, fuzzy, c-format -#| msgid "" -#| "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n" -#| "\n" -#| "OPTIONS\n" -#| " -t[erse] terse output\n" -#| " -p[retty] pretty output\n" -#| " -m[ode] tabular|multiline output mode\n" -#| " -f[ields] <field1,field2,...>|all|common specify fields to output\n" -#| " -e[scape] yes|no escape columns separators in " -#| "values\n" -#| " -n[ocheck] don't check nmcli and " -#| "NetworkManager versions\n" -#| " -a[sk] ask for missing parameters\n" -#| " -w[ait] <seconds> set timeout waiting for " -#| "finishing operations\n" -#| " -v[ersion] show program version\n" -#| " -h[elp] print this help\n" -#| "\n" -#| "OBJECT\n" -#| " g[eneral] NetworkManager's general status and operations\n" -#| " n[etworking] overall networking control\n" -#| " r[adio] NetworkManager radio switches\n" -#| " c[onnection] NetworkManager's connections\n" -#| " d[evice] devices managed by NetworkManager\n" -#| "\n" msgid "" "Usage: %s [OPTIONS] OBJECT { COMMAND | help }\n" "\n" @@ -4784,8 +4600,6 @@ msgid "" " -t[erse] terse output\n" " -p[retty] pretty output\n" " -m[ode] tabular|multiline output mode\n" -" -c[olors] auto|yes|no whether to use colors in " -"output\n" " -f[ields] <field1,field2,...>|all|common specify fields to output\n" " -e[scape] yes|no escape columns separators in " "values\n" @@ -4832,68 +4646,64 @@ msgstr "" " d[evice] устройства под управлением NetworkManager\n" "\n" -#: ../clients/cli/nmcli.c:143 +#: ../clients/cli/nmcli.c:142 #, c-format msgid "Error: Object '%s' is unknown, try 'nmcli help'." msgstr "Неизвестный объект «%s». Попробуйте выполнить «nmcli help»." -#: ../clients/cli/nmcli.c:173 +#: ../clients/cli/nmcli.c:172 #, c-format msgid "Error: Option '--terse' is specified the second time." msgstr "Ошибка. Параметр «--terse» указан дважды." -#: ../clients/cli/nmcli.c:178 +#: ../clients/cli/nmcli.c:177 #, c-format msgid "Error: Option '--terse' is mutually exclusive with '--pretty'." msgstr "Ошибка: параметры «--terse» и «--pretty» взаимоисключаемы." -#: ../clients/cli/nmcli.c:186 +#: ../clients/cli/nmcli.c:185 #, c-format msgid "Error: Option '--pretty' is specified the second time." msgstr "Ошибка: параметр «--pretty» указан дважды." -#: ../clients/cli/nmcli.c:191 +#: ../clients/cli/nmcli.c:190 #, c-format msgid "Error: Option '--pretty' is mutually exclusive with '--terse'." msgstr "Ошибка: параметры «--pretty» и «--terse» взаимоисключаемы." -#: ../clients/cli/nmcli.c:201 ../clients/cli/nmcli.c:217 -#: ../clients/cli/nmcli.c:235 ../clients/cli/nmcli.c:264 +#: ../clients/cli/nmcli.c:200 ../clients/cli/nmcli.c:216 +#: ../clients/cli/nmcli.c:245 #, c-format msgid "Error: missing argument for '%s' option." msgstr "Ошибка: отсутствует аргумент параметра «%s»." -#: ../clients/cli/nmcli.c:210 ../clients/cli/nmcli.c:228 -#: ../clients/cli/nmcli.c:244 +#: ../clients/cli/nmcli.c:209 ../clients/cli/nmcli.c:225 #, c-format msgid "Error: '%s' is not valid argument for '%s' option." msgstr "Ошибка: недопустимый аргумент «%s» для параметра «%s»." -#: ../clients/cli/nmcli.c:251 +#: ../clients/cli/nmcli.c:232 #, c-format msgid "Error: fields for '%s' options are missing." msgstr "Ошибка: отсутствуют поля для параметров «%s»." -#: ../clients/cli/nmcli.c:269 +#: ../clients/cli/nmcli.c:250 #, c-format msgid "Error: '%s' is not a valid timeout for '%s' option." msgstr "Ошибка. Недопустимое время ожидания («%s») для параметра «%s»." -#: ../clients/cli/nmcli.c:276 +#: ../clients/cli/nmcli.c:257 #, c-format msgid "nmcli tool, version %s\n" msgstr "утилита nmcli, версия %s\n" -#: ../clients/cli/nmcli.c:282 +#: ../clients/cli/nmcli.c:263 #, c-format msgid "Error: Option '%s' is unknown, try 'nmcli -help'." msgstr "Ошибка: неизвестный параметр «%s». Попробуйте выполнить «nmcli -help»." -#: ../clients/cli/nmcli.c:365 ../clients/cli/nmcli.c:375 +#: ../clients/cli/nmcli.c:346 ../clients/cli/nmcli.c:356 #, fuzzy, c-format -#| msgid "" -#| "\n" -#| "Error: nmcli terminated by signal %d." msgid "" "\n" "Error: nmcli terminated by signal %s (%d)\n" @@ -4901,234 +4711,254 @@ msgstr "" "\n" "Ошибка. Работа nmcli прервана по сигналу %d." -#: ../clients/cli/nmcli.c:406 +#: ../clients/cli/nmcli.c:387 #, fuzzy, c-format -#| msgid "Failed to set signal mask: %d" msgid "Failed to set signal mask: %d\n" msgstr "Ошибка установки маски сигнала: %d" -#: ../clients/cli/nmcli.c:413 +#: ../clients/cli/nmcli.c:394 #, fuzzy, c-format -#| msgid "Failed to create signal handling thread: %d" msgid "Failed to create signal handling thread: %d\n" msgstr "Ошибка создания потока обработки сигнала: %d" -#: ../clients/cli/nmcli.c:510 ../clients/nm-online.c:197 +#: ../clients/cli/nmcli.c:491 ../clients/nm-online.c:197 #, fuzzy, c-format -#| msgid "Error: Could not create NMClient object." msgid "Error: Could not create NMClient object: %s." msgstr "Ошибка: невозможно создать объект NMClient." -#: ../clients/cli/nmcli.c:527 +#: ../clients/cli/nmcli.c:508 msgid "Success" msgstr "Успешно" #: ../clients/cli/polkit-agent.c:82 #, fuzzy, c-format -#| msgid "Authentication" msgid "Authentication message: %s\n" msgstr "Аутентификация" #: ../clients/cli/polkit-agent.c:88 #, fuzzy, c-format -#| msgid "Authentication" msgid "Authentication error: %s\n" msgstr "Аутентификация" #: ../clients/cli/polkit-agent.c:134 #, fuzzy, c-format -#| msgid "Modem initialization failed" msgid "Warning: polkit agent initialization failed: %s\n" msgstr "Не удалось инициализировать модем" -#: ../clients/cli/settings.c:674 +#: ../clients/cli/settings.c:685 #, fuzzy, c-format -#| msgid "%d (hex-ascii-key)" msgid "%d (key)" msgstr "%d (16-теричный ASCII-ключ)" -#: ../clients/cli/settings.c:676 +#: ../clients/cli/settings.c:687 #, fuzzy, c-format -#| msgid "%d (104/128-bit passphrase)" msgid "%d (passphrase)" msgstr "%d (104/128-битная парольная фраза)" -#: ../clients/cli/settings.c:679 ../clients/cli/settings.c:760 +#: ../clients/cli/settings.c:690 ../clients/cli/settings.c:774 #, c-format msgid "%d (unknown)" msgstr "%d (неизвестно)" -#: ../clients/cli/settings.c:708 +#: ../clients/cli/settings.c:719 msgid "0 (NONE)" msgstr "0 (НЕТ)" -#: ../clients/cli/settings.c:714 +#: ../clients/cli/settings.c:725 msgid "REORDER_HEADERS, " msgstr "УПОРЯДОЧИТЬ_ЗАГОЛОВКИ," -#: ../clients/cli/settings.c:716 +#: ../clients/cli/settings.c:727 msgid "GVRP, " msgstr "GVRP, " -#: ../clients/cli/settings.c:718 +#: ../clients/cli/settings.c:729 msgid "LOOSE_BINDING, " msgstr "LOOSE_BINDING, " -#: ../clients/cli/settings.c:754 +#: ../clients/cli/settings.c:768 #, c-format msgid "%d (disabled)" msgstr "%d (отключено)" -#: ../clients/cli/settings.c:756 +#: ../clients/cli/settings.c:770 #, c-format msgid "%d (enabled, prefer public IP)" msgstr "%d (включено, предпочитая открытый IP)" -#: ../clients/cli/settings.c:758 +#: ../clients/cli/settings.c:772 #, c-format msgid "%d (enabled, prefer temporary IP)" msgstr "%d (включено, предпочитая временный IP)" -#: ../clients/cli/settings.c:770 +#: ../clients/cli/settings.c:786 +#, fuzzy, c-format +msgid "%d (no)" +msgstr "%d (неизвестно)" + +#: ../clients/cli/settings.c:788 +#, fuzzy, c-format +msgid "%d (yes)" +msgstr "%d (16-теричный ASCII-ключ)" + +#: ../clients/cli/settings.c:791 +#, fuzzy, c-format +msgid "%d (default)" +msgstr "(по умолчанию)" + +#: ../clients/cli/settings.c:804 msgid "0 (none)" msgstr "0 (нет)" -#: ../clients/cli/settings.c:776 +#: ../clients/cli/settings.c:810 msgid "agent-owned, " msgstr "под управлением агента," -#: ../clients/cli/settings.c:778 +#: ../clients/cli/settings.c:812 msgid "not saved, " msgstr "не сохранено," -#: ../clients/cli/settings.c:780 +#: ../clients/cli/settings.c:814 msgid "not required, " msgstr "не требуется," -#: ../clients/cli/settings.c:1064 +#: ../clients/cli/settings.c:1105 msgid "0 (disabled)" msgstr "0 (отключено)" -#: ../clients/cli/settings.c:1070 +#: ../clients/cli/settings.c:1111 msgid "enabled, " msgstr "включено," -#: ../clients/cli/settings.c:1072 +#: ../clients/cli/settings.c:1113 msgid "advertise, " msgstr "объявление," -#: ../clients/cli/settings.c:1074 +#: ../clients/cli/settings.c:1115 msgid "willing, " msgstr "разрешение," -#: ../clients/cli/settings.c:1102 +#: ../clients/cli/settings.c:1143 msgid "-1 (unset)" msgstr "-1 (не задано)" -#: ../clients/cli/settings.c:1199 ../clients/cli/settings.c:1486 -#: ../clients/cli/settings.c:1528 +#: ../clients/cli/settings.c:1240 ../clients/cli/settings.c:1517 +#: ../clients/cli/settings.c:1619 msgid "auto" msgstr "автоматически" -#: ../clients/cli/settings.c:1212 +#: ../clients/cli/settings.c:1253 msgid "default" msgstr "по умолчанию" -#: ../clients/cli/settings.c:1544 +#: ../clients/cli/settings.c:1563 #, c-format -msgid "yes (%u)" +msgid "" +"invalid option '%s', use a combination of [%s] or 'ignore', 'default' or " +"'none'" +msgstr "" + +#: ../clients/cli/settings.c:1574 +msgid "'default' and 'ignore' are incompatible with other flags" msgstr "" -#: ../clients/cli/settings.c:1670 +#: ../clients/cli/settings.c:1750 #, c-format msgid "Do you also want to set '%s' to '%s'? [yes]: " msgstr "Присвоить «%s» значение «%s»? [да]:" -#: ../clients/cli/settings.c:1672 +#: ../clients/cli/settings.c:1752 #, c-format msgid "Do you also want to clear '%s'? [yes]: " msgstr "Очистить «%s»? [да]:" -#: ../clients/cli/settings.c:1833 +#: ../clients/cli/settings.c:1913 #, c-format msgid "" "Warning: %s.%s set to '%s', but it might be ignored in infrastructure mode\n" msgstr "" -#: ../clients/cli/settings.c:1852 +#: ../clients/cli/settings.c:1932 #, c-format msgid "Warning: setting %s.%s requires removing ipv4 and ipv6 settings\n" msgstr "" -#: ../clients/cli/settings.c:1854 +#: ../clients/cli/settings.c:1934 #, fuzzy -#| msgid "Do you want to provide them? (yes/no) [yes] " msgid "Do you want to remove them? [yes] " msgstr "Хотите их определить? (Да или нет)" -#: ../clients/cli/settings.c:1950 ../clients/cli/settings.c:2272 -#: ../clients/cli/settings.c:4405 +#: ../clients/cli/settings.c:2030 ../clients/cli/settings.c:2425 +#: ../clients/cli/settings.c:4572 #, c-format msgid "'%s' is not valid" msgstr "Недопустимое значение «%s»" -#: ../clients/cli/settings.c:1973 +#: ../clients/cli/settings.c:2053 #, c-format msgid "'%d' is not valid; use <%d-%d>" msgstr "«%d» выходит за пределы диапазона <%d-%d>" -#: ../clients/cli/settings.c:1995 +#: ../clients/cli/settings.c:2075 #, fuzzy, c-format -#| msgid "'%d' is not valid; use <%d-%d>" msgid "'%lld' is not valid; use <%lld-%lld>" msgstr "«%d» выходит за пределы диапазона <%d-%d>" -#: ../clients/cli/settings.c:2017 +#: ../clients/cli/settings.c:2097 #, fuzzy, c-format -#| msgid "'%u' is not valid; use <%d-%d>" msgid "'%u' is not valid; use <%u-%u>" msgstr "«%u» выходит за пределы <%d-%d>" -#: ../clients/cli/settings.c:2083 +#: ../clients/cli/settings.c:2136 +#, fuzzy, c-format +msgid "'%u' flags are not valid; use combination of %s" +msgstr "Недопустимое значение «%s». Ожидается [%s] или [%s]" + +#: ../clients/cli/settings.c:2203 #, c-format msgid "'%s' is not valid; use <option>=<value>" msgstr "Недопустимое значение «%s». Используйте формат: <параметр>=<значение>" -#: ../clients/cli/settings.c:2117 +#: ../clients/cli/settings.c:2237 #, c-format msgid "index '%s' is not valid" msgstr "Недопустимый индекс «%s»." -#: ../clients/cli/settings.c:2122 ../clients/cli/settings.c:2147 +#: ../clients/cli/settings.c:2242 ../clients/cli/settings.c:2267 msgid "no item to remove" msgstr "нечего удалять" -#: ../clients/cli/settings.c:2126 ../clients/cli/settings.c:2151 +#: ../clients/cli/settings.c:2246 ../clients/cli/settings.c:2271 #, c-format msgid "index '%d' is not in range <0-%d>" msgstr "Индекс «%d» выходит за пределы диапазона <0-%d>" -#: ../clients/cli/settings.c:2166 +#: ../clients/cli/settings.c:2286 #, c-format msgid "invalid option '%s'" msgstr "Недопустимый параметр «%s»" -#: ../clients/cli/settings.c:2168 +#: ../clients/cli/settings.c:2288 msgid "missing option" msgstr "пропущен параметр" -#: ../clients/cli/settings.c:2198 ../clients/cli/settings.c:2218 -#: ../clients/cli/settings.c:2238 +#: ../clients/cli/settings.c:2315 ../clients/cli/settings.c:2335 +#: ../clients/cli/settings.c:2355 ../clients/cli/settings.c:2375 #, c-format msgid "'%s' is not a valid number (or out of range)" msgstr "Число выходит за пределы диапазона или определено неверно: «%s»" -#: ../clients/cli/settings.c:2288 +#: ../clients/cli/settings.c:2409 +#, fuzzy, c-format +msgid "'%s' is not a valid value; use -1, 0 or 1" +msgstr "Недопустимое значение «%s». Используйте 0, 1 или 2." + +#: ../clients/cli/settings.c:2441 #, c-format msgid "'%s' is not a valid Ethernet MAC" msgstr "Недействительный MAC Ethernet: «%s»" -#: ../clients/cli/settings.c:2313 ../libnm-core/nm-setting-connection.c:795 +#: ../clients/cli/settings.c:2466 ../libnm-core/nm-setting-connection.c:836 #: ../libnm-core/nm-setting-infiniband.c:256 #: ../libnm-util/nm-setting-connection.c:835 #: ../libnm-util/nm-setting-infiniband.c:270 @@ -5136,39 +4966,38 @@ msgstr "Недействительный MAC Ethernet: «%s»" msgid "'%s' is not a valid interface name" msgstr "Недействительное имя интерфейса: «%s»" -#: ../clients/cli/settings.c:2337 +#: ../clients/cli/settings.c:2490 #, fuzzy, c-format -#| msgid "'%s' is not a valid channel; use <1-13>" msgid "'%s' is not a valid flag number; use <0-%d>" msgstr "Недопустимое значение «%s». Используйте значения от 1 до 13." -#: ../clients/cli/settings.c:2349 +#: ../clients/cli/settings.c:2502 #, c-format msgid "Warning: '%s' sum is higher than all flags => all flags set\n" msgstr "" -#: ../clients/cli/settings.c:2390 +#: ../clients/cli/settings.c:2543 #, c-format msgid "'%s' is not a valid hex character" msgstr "Неверное шестнадцатеричное значение: «%s»" -#: ../clients/cli/settings.c:2420 +#: ../clients/cli/settings.c:2573 #, c-format msgid "'%s' is not a valid MAC" msgstr "Недействительный MAC-адрес: «%s»" -#: ../clients/cli/settings.c:2457 ../libnm-core/nm-setting-connection.c:784 +#: ../clients/cli/settings.c:2599 ../libnm-core/nm-setting-connection.c:825 #: ../libnm-util/nm-setting-connection.c:792 #, c-format msgid "'%s' is not a valid UUID" msgstr "Недействительный UUID: «%s»" -#: ../clients/cli/settings.c:2524 +#: ../clients/cli/settings.c:2666 #, c-format msgid "the property doesn't contain permission '%s'" msgstr "" -#: ../clients/cli/settings.c:2536 +#: ../clients/cli/settings.c:2678 msgid "" "Enter a list of user permissions. This is a list of user names formatted " "as:\n" @@ -5183,42 +5012,39 @@ msgstr "" "\n" "Пример: alice bob charlie\n" -#: ../clients/cli/settings.c:2555 +#: ../clients/cli/settings.c:2697 #, c-format msgid "'%s' is not valid master; use ifname or connection UUID" msgstr "" "Недействительный мастер: «%s». Используйте имя интерфейса или UUID " "соединения." -#: ../clients/cli/settings.c:2599 +#: ../clients/cli/settings.c:2741 #, c-format msgid "Warning: %s is not an UUID of any existing connection profile\n" msgstr "" -#: ../clients/cli/settings.c:2603 ../clients/cli/settings.c:2619 +#: ../clients/cli/settings.c:2745 ../clients/cli/settings.c:2761 #, fuzzy, c-format -#| msgid "Error: '%s' is not a valid connection type." msgid "'%s' is not a VPN connection profile" msgstr "Ошибка. Недопустимый тип соединения: «%s»" -#: ../clients/cli/settings.c:2612 +#: ../clients/cli/settings.c:2754 #, fuzzy, c-format -#| msgid "'%s' is not a valid team configuration or file name." msgid "'%s' is not a name of any exiting profile" msgstr "Недопустимое имя файла или неверная конфигурация группы: «%s»" -#: ../clients/cli/settings.c:2646 +#: ../clients/cli/settings.c:2788 #, fuzzy, c-format -#| msgid "'%s' is not a valid UUID" msgid "the value '%s' is not a valid UUID" msgstr "Недействительный UUID: «%s»" -#: ../clients/cli/settings.c:2653 +#: ../clients/cli/settings.c:2795 #, c-format msgid "the property doesn't contain UUID '%s'" msgstr "" -#: ../clients/cli/settings.c:2665 +#: ../clients/cli/settings.c:2807 msgid "" "Enter secondary connections that should be activated when this connection " "is\n" @@ -5231,17 +5057,25 @@ msgid "" "Example: private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n" msgstr "" -#: ../clients/cli/settings.c:2742 +#: ../clients/cli/settings.c:2874 +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 "" + +#: ../clients/cli/settings.c:2948 msgid "private key password not provided" msgstr "Не указан пароль частного ключа " -#: ../clients/cli/settings.c:2769 +#: ../clients/cli/settings.c:2976 #, fuzzy, c-format -#| msgid "the property can't be changed" msgid "the property doesn't contain EAP method '%s'" msgstr "свойство не может быть изменено" -#: ../clients/cli/settings.c:2784 +#: ../clients/cli/settings.c:2993 msgid "" "Enter file path to CA certificate (optionally prefixed with file://).\n" " [file://]<file path>\n" @@ -5249,12 +5083,12 @@ msgid "" "Example: /home/cimrman/cacert.crt\n" msgstr "" -#: ../clients/cli/settings.c:2803 +#: ../clients/cli/settings.c:3012 #, c-format msgid "the property doesn't contain alternative subject match '%s'" msgstr "" -#: ../clients/cli/settings.c:2819 +#: ../clients/cli/settings.c:3028 msgid "" "Enter file path to client certificate (optionally prefixed with file://).\n" " [file://]<file path>\n" @@ -5262,7 +5096,7 @@ msgid "" "Example: /home/cimrman/jara.crt\n" msgstr "" -#: ../clients/cli/settings.c:2831 +#: ../clients/cli/settings.c:3040 msgid "" "Enter file path to CA certificate for inner authentication (optionally " "prefixed\n" @@ -5272,12 +5106,12 @@ msgid "" "Example: /home/cimrman/ca-zweite-phase.crt\n" msgstr "" -#: ../clients/cli/settings.c:2851 +#: ../clients/cli/settings.c:3060 #, c-format msgid "the property doesn't contain \"phase2\" alternative subject match '%s'" msgstr "" -#: ../clients/cli/settings.c:2867 +#: ../clients/cli/settings.c:3076 msgid "" "Enter file path to client certificate for inner authentication (optionally " "prefixed\n" @@ -5287,12 +5121,8 @@ msgid "" "Example: /home/cimrman/jara-zweite-phase.crt\n" msgstr "" -#: ../clients/cli/settings.c:2887 +#: ../clients/cli/settings.c:3096 #, fuzzy -#| msgid "" -#| "Enter path to a private key and the key password (if not set yet):\n" -#| " <file path> [<password>]\n" -#| "Example: /home/cimrman/jara-priv-key Dardanely\n" msgid "" "Enter path to a private key and the key password (if not set yet):\n" " [file://]<file path> [<password>]\n" @@ -5303,7 +5133,7 @@ msgstr "" " <путь> [<пароль>]\n" "Пример: /home/cimrman/jara-priv-key Dardanely\n" -#: ../clients/cli/settings.c:2958 +#: ../clients/cli/settings.c:3167 msgid "" "Enter bytes as a list of hexadecimal values.\n" "Two formats are accepted:\n" @@ -5324,7 +5154,7 @@ msgstr "" "Примеры: ab0455a6ea3a74C2\n" " ab 4 55 0xa6 ea 3a 74 C2\n" -#: ../clients/cli/settings.c:3061 +#: ../clients/cli/settings.c:3270 #, c-format msgid "" "Enter a list of bonding options formatted as:\n" @@ -5355,35 +5185,34 @@ msgstr "" "\n" "Пример: mode=2,miimon=120\n" -#: ../clients/cli/settings.c:3099 +#: ../clients/cli/settings.c:3301 #, c-format msgid "'%s' is not a valid InfiniBand MAC" msgstr "Недействительный MAC InfiniBand: «%s»" -#: ../clients/cli/settings.c:3136 +#: ../clients/cli/settings.c:3338 #, c-format msgid "'%s' is not a valid IBoIP P_Key" msgstr "Недопустимое значение IBoIP P_Key: «%s»" -#: ../clients/cli/settings.c:3167 +#: ../clients/cli/settings.c:3369 #, fuzzy, c-format -#| msgid "'%s' is not valid (use ip/[prefix] next-hop [metric])" msgid "'%s' is not valid (the format is: ip[/prefix] [next-hop] [metric])" msgstr "" "Недействительное значение «%s». Допустимый формат: ip[/префикс] next-hop " "[метрика]." -#: ../clients/cli/settings.c:3215 ../clients/cli/settings.c:3234 +#: ../clients/cli/settings.c:3417 ../clients/cli/settings.c:3436 #, c-format msgid "invalid IPv4 address '%s'" msgstr "недопустимый адрес IPv4: «%s»" -#: ../clients/cli/settings.c:3240 ../clients/cli/settings.c:3541 +#: ../clients/cli/settings.c:3442 ../clients/cli/settings.c:3712 #, c-format msgid "the property doesn't contain DNS server '%s'" msgstr "" -#: ../clients/cli/settings.c:3252 +#: ../clients/cli/settings.c:3454 msgid "" "Enter a list of IPv4 addresses of DNS servers.\n" "\n" @@ -5393,24 +5222,18 @@ msgstr "" "\n" "Пример: 8.8.8.8, 8.8.4.4\n" -#: ../clients/cli/settings.c:3288 ../clients/cli/settings.c:3595 +#: ../clients/cli/settings.c:3490 ../clients/cli/settings.c:3766 #, c-format msgid "the property doesn't contain DNS search domain '%s'" msgstr "" -#: ../clients/cli/settings.c:3342 ../clients/cli/settings.c:3648 +#: ../clients/cli/settings.c:3544 ../clients/cli/settings.c:3819 #, c-format msgid "the property doesn't contain IP address '%s'" msgstr "" -#: ../clients/cli/settings.c:3355 +#: ../clients/cli/settings.c:3557 #, fuzzy -#| msgid "" -#| "Enter a list of IPv4 addresses formatted as:\n" -#| " ip[/prefix] [gateway], ip[/prefix] [gateway],...\n" -#| "Missing prefix is regarded as prefix of 32.\n" -#| "\n" -#| "Example: 192.168.1.5/24 192.168.1.1, 10.0.0.11/24\n" msgid "" "Enter a list of IPv4 addresses formatted as:\n" " ip[/prefix], ip[/prefix],...\n" @@ -5424,27 +5247,18 @@ msgstr "" "\n" "Пример: 92.168.1.5/24 192.168.1.1, 10.0.0.11/24\n" -#: ../clients/cli/settings.c:3371 ../clients/cli/settings.c:3677 +#: ../clients/cli/settings.c:3573 ../clients/cli/settings.c:3848 #, fuzzy, c-format -#| msgid "invalid gateway '%s'" msgid "invalid gateway address '%s'" msgstr "недопустимый шлюз «%s»" -#: ../clients/cli/settings.c:3426 ../clients/cli/settings.c:3732 +#: ../clients/cli/settings.c:3628 ../clients/cli/settings.c:3903 #, fuzzy, c-format -#| msgid "the property can't be changed" msgid "the property doesn't contain route '%s'" msgstr "свойство не может быть изменено" -#: ../clients/cli/settings.c:3439 +#: ../clients/cli/settings.c:3641 #, fuzzy -#| msgid "" -#| "Enter a list of IPv4 routes formatted as:\n" -#| " ip/[prefix] next-hop [metric],...\n" -#| "Missing prefix is regarded as a prefix of 32.\n" -#| "Missing metric is regarded as a metric of 0.\n" -#| "\n" -#| "Example: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n" msgid "" "Enter a list of IPv4 routes formatted as:\n" " ip[/prefix] [next-hop] [metric],...\n" @@ -5463,12 +5277,12 @@ msgstr "" "\n" "Пример: 192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n" -#: ../clients/cli/settings.c:3516 ../clients/cli/settings.c:3535 +#: ../clients/cli/settings.c:3687 ../clients/cli/settings.c:3706 #, c-format msgid "invalid IPv6 address '%s'" msgstr "недопустимый адрес IPv6: «%s»" -#: ../clients/cli/settings.c:3553 +#: ../clients/cli/settings.c:3724 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 " @@ -5487,15 +5301,8 @@ msgstr "" "\n" "Пример: 2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n" -#: ../clients/cli/settings.c:3661 +#: ../clients/cli/settings.c:3832 #, fuzzy -#| msgid "" -#| "Enter a list of IPv6 addresses formatted as:\n" -#| " ip[/prefix] [gateway], ip[/prefix] [gateway],...\n" -#| "Missing prefix is regarded as prefix of 128.\n" -#| "\n" -#| "Example: 2607:f0d0:1002:51::4/64 2607:f0d0:1002:51::1, " -#| "1050:0:0:0:5:600:300c:326b\n" msgid "" "Enter a list of IPv6 addresses formatted as:\n" " ip[/prefix], ip[/prefix],...\n" @@ -5510,16 +5317,8 @@ 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:3745 +#: ../clients/cli/settings.c:3916 #, fuzzy -#| msgid "" -#| "Enter a list of IPv6 routes formatted as:\n" -#| " ip/[prefix] next-hop [metric],...\n" -#| "Missing prefix is regarded as a prefix of 128.\n" -#| "Missing metric is regarded as a metric of 0.\n" -#| "\n" -#| "Example: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:" -#| "db8:beef::3 2\n" msgid "" "Enter a list of IPv6 routes formatted as:\n" " ip[/prefix] [next-hop] [metric],...\n" @@ -5540,28 +5339,28 @@ msgstr "" "Пример: 2001:db8:beef:2::/64 2001:db8:beef::2, 2001:db8:beef:3::/64 2001:db8:" "beef::3 2\n" -#: ../clients/cli/settings.c:3762 ../libnm-core/nm-setting-gsm.c:317 -#: ../libnm-util/nm-setting-gsm.c:374 +#: ../clients/cli/settings.c:3933 ../libnm-core/nm-setting-gsm.c:308 +#: ../libnm-util/nm-setting-gsm.c:365 #, c-format msgid "'%s' is not a number" msgstr " «%s» не является числом" -#: ../clients/cli/settings.c:3769 +#: ../clients/cli/settings.c:3940 #, c-format msgid "'%s' is not valid; use 0, 1, or 2" msgstr "Недопустимое значение «%s». Используйте 0, 1 или 2." -#: ../clients/cli/settings.c:3786 +#: ../clients/cli/settings.c:3957 #, c-format msgid "'%s' is not a valid channel; use <1-13>" msgstr "Недопустимое значение «%s». Используйте значения от 1 до 13." -#: ../clients/cli/settings.c:3823 +#: ../clients/cli/settings.c:3994 #, c-format msgid "'%s' is not valid; use [e, o, n]" msgstr "Неверное значение «%s». Допустимые значения: [e, o, n]." -#: ../clients/cli/settings.c:3851 +#: ../clients/cli/settings.c:4022 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 " @@ -5577,55 +5376,52 @@ msgstr "" "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n" " set team.config /etc/my-team.conf\n" -#: ../clients/cli/settings.c:3891 +#: ../clients/cli/settings.c:4062 msgid "no priority to remove" msgstr "нет приоритета для удаления" -#: ../clients/cli/settings.c:3895 +#: ../clients/cli/settings.c:4066 #, c-format msgid "index '%d' is not in the range of <0-%d>" msgstr "Индекс «%d» выходит за пределы диапазона <0-%d>" -#: ../clients/cli/settings.c:3934 +#: ../clients/cli/settings.c:4105 #, c-format msgid "" "Warning: only one mapping at a time is supported; taking the first one (%s)\n" msgstr "" -#: ../clients/cli/settings.c:3941 +#: ../clients/cli/settings.c:4112 #, fuzzy, c-format -#| msgid "the property can't be changed" msgid "the property doesn't contain mapping '%s'" msgstr "свойство не может быть изменено" -#: ../clients/cli/settings.c:4050 ../clients/cli/settings.c:4213 -#: ../libnm-core/nm-setting-wired.c:604 -#: ../libnm-core/nm-setting-wireless.c:803 -#: ../libnm-core/nm-setting-wireless.c:815 -#: ../libnm-util/nm-setting-wired.c:647 -#: ../libnm-util/nm-setting-wireless.c:860 -#: ../libnm-util/nm-setting-wireless.c:874 +#: ../clients/cli/settings.c:4160 +#, fuzzy, c-format +msgid "'%s' cannot be empty" +msgstr "Пустой параметр: «%s»" + +#: ../clients/cli/settings.c:4234 ../clients/cli/settings.c:4401 +#: ../libnm-core/nm-setting-wired.c:646 ../libnm-core/nm-setting-wireless.c:784 +#: ../libnm-core/nm-setting-wireless.c:796 ../libnm-util/nm-setting-wired.c:647 +#: ../libnm-util/nm-setting-wireless.c:842 +#: ../libnm-util/nm-setting-wireless.c:856 #, c-format msgid "'%s' is not a valid MAC address" msgstr "Недействительный MAC-адрес: «%s»" -#: ../clients/cli/settings.c:4056 ../clients/cli/settings.c:4219 +#: ../clients/cli/settings.c:4240 ../clients/cli/settings.c:4407 #, c-format msgid "the property doesn't contain MAC address '%s'" msgstr "" -#: ../clients/cli/settings.c:4075 +#: ../clients/cli/settings.c:4259 #, fuzzy, c-format -#| msgid "'%s' is not valid; 3 strings should be provided" msgid "'%s' is not valid; 2 or 3 strings should be provided" msgstr "Строка «%s» должна содержать три значения." -#: ../clients/cli/settings.c:4089 +#: ../clients/cli/settings.c:4273 #, fuzzy -#| msgid "" -#| "Enter a list of three channels (comma or space separated).\n" -#| "\n" -#| "Example: 0.0.0e20 0.0.0e21 0.0.0e22\n" msgid "" "Enter a list of subchannels (comma or space separated).\n" "\n" @@ -5635,7 +5431,12 @@ msgstr "" "\n" "Пример: 0.0.0e20 0.0.0e21 0.0.0e22\n" -#: ../clients/cli/settings.c:4139 +#: ../clients/cli/settings.c:4295 +#, c-format +msgid "'%s' string value should consist of 1 - 199 characters" +msgstr "" + +#: ../clients/cli/settings.c:4327 #, c-format msgid "" "Enter a list of S/390 options formatted as:\n" @@ -5646,60 +5447,53 @@ msgstr "" " параметр = <значение>, параметр = <значение>,...\n" "Допустимые параметры: %s\n" -#: ../clients/cli/settings.c:4185 +#: ../clients/cli/settings.c:4373 #, c-format msgid "'%s' is not a valid channel" msgstr "Недопустимый канал «%s»." -#: ../clients/cli/settings.c:4191 +#: ../clients/cli/settings.c:4379 #, c-format msgid "'%ld' is not a valid channel" msgstr "Недопустимый канал «%ld»." -#: ../clients/cli/settings.c:4239 -#, fuzzy, c-format -#| msgid "'%s' is not a valid duplex value" -msgid "'%s' is not a valid powersave value" -msgstr "Недопустимое дуплексное значение: «%s»" - -#: ../clients/cli/settings.c:4299 ../clients/cli/settings.c:4337 -#: ../clients/cli/settings.c:4375 +#: ../clients/cli/settings.c:4466 ../clients/cli/settings.c:4504 +#: ../clients/cli/settings.c:4542 #, c-format msgid "the property doesn't contain protocol '%s'" msgstr "" -#: ../clients/cli/settings.c:4414 +#: ../clients/cli/settings.c:4581 #, c-format msgid "" "'%s' not compatible with %s '%s', please change the key or set the right %s " "first." msgstr "" -#: ../clients/cli/settings.c:4422 +#: ../clients/cli/settings.c:4589 #, c-format msgid "WEP key is guessed to be of '%s'\n" msgstr "Ключ WEP определен как «%s»\n" -#: ../clients/cli/settings.c:4424 +#: ../clients/cli/settings.c:4591 #, fuzzy, c-format -#| msgid "WEP key is guessed to be of '%s'\n" msgid "WEP key index set to '%d'\n" msgstr "Ключ WEP определен как «%s»\n" -#: ../clients/cli/settings.c:4447 +#: ../clients/cli/settings.c:4614 #, c-format msgid "'%s' not among [0 (unknown), 1 (key), 2 (passphrase)]" msgstr "«%s» может быть равно [0 (неизвестно), 1 (ключ), 2 (парольная фраза)]" -#: ../clients/cli/settings.c:4463 ../clients/cli/settings.c:4466 -#: ../clients/cli/settings.c:4469 ../clients/cli/settings.c:4472 +#: ../clients/cli/settings.c:4630 ../clients/cli/settings.c:4633 +#: ../clients/cli/settings.c:4636 ../clients/cli/settings.c:4639 #, c-format msgid "" "Warning: '%s' is not compatible with '%s' type, please change or delete the " "key.\n" msgstr "" -#: ../clients/cli/settings.c:4485 +#: ../clients/cli/settings.c:4652 #, c-format msgid "" "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, " @@ -5708,36 +5502,36 @@ msgstr "" "Определите тип ключей WEP. Возможные значения: 0 (неизвестно), 1 (ключ), 2 " "(парольная фраза).\n" -#: ../clients/cli/settings.c:4498 +#: ../clients/cli/settings.c:4665 #, c-format msgid "'%s' is not a valid PSK" msgstr "«%s» не является действительным PSK" -#: ../clients/cli/settings.c:4542 +#: ../clients/cli/settings.c:4709 #, c-format msgid "'%s' is not a valid DCB flag" msgstr "«%s» не содержит допустимый флаг DCB" -#: ../clients/cli/settings.c:4565 +#: ../clients/cli/settings.c:4732 #, c-format msgid "'%s' is not a DCB app priority" msgstr "«%s» не содержит приоритет приложения DCB" -#: ../clients/cli/settings.c:4591 +#: ../clients/cli/settings.c:4758 msgid "must contain 8 comma-separated numbers" msgstr "должен содержать 8 чисел, разделенных запятой" -#: ../clients/cli/settings.c:4608 +#: ../clients/cli/settings.c:4775 #, c-format msgid "'%s' not a number between 0 and %u (inclusive) or %u" msgstr "«%s» не является числом в диапазоне от 0 до %u включительно или %u" -#: ../clients/cli/settings.c:4611 +#: ../clients/cli/settings.c:4778 #, c-format msgid "'%s' not a number between 0 and %u (inclusive)" msgstr "«%s» не является числом в диапазоне от 0 до %u включительно" -#: ../clients/cli/settings.c:4633 +#: ../clients/cli/settings.c:4800 #, c-format msgid "" "Warning: changes will have no effect until '%s' includes 1 (enabled)\n" @@ -5747,35 +5541,34 @@ msgstr "" "(включено)\n" "\n" -#: ../clients/cli/settings.c:4686 +#: ../clients/cli/settings.c:4853 #, c-format msgid "bandwidth percentages must total 100%%" msgstr "сумма процентных частей пропускной способности должна быть равна 100%%" -#: ../clients/cli/settings.c:6395 +#: ../clients/cli/settings.c:6575 msgid "don't know how to get the property value" msgstr "неизвестно, как получить значение свойства" -#: ../clients/cli/settings.c:6448 ../clients/cli/settings.c:6488 +#: ../clients/cli/settings.c:6628 ../clients/cli/settings.c:6668 msgid "the property can't be changed" msgstr "свойство не может быть изменено" -#: ../clients/cli/settings.c:6572 +#: ../clients/cli/settings.c:6752 #, fuzzy -#| msgid "unavailable" msgid "(not available)" msgstr "недоступен" -#: ../clients/cli/settings.c:6597 +#: ../clients/cli/settings.c:6777 msgid "[NM property description]" msgstr "[описание свойства NM]" -#: ../clients/cli/settings.c:6602 +#: ../clients/cli/settings.c:6782 msgid "[nmcli specific description]" msgstr "[описание в nmcli]" #. ---------------------------------------------------------------------------- -#: ../clients/cli/settings.c:6651 +#: ../clients/cli/settings.c:6831 msgid "<hidden>" msgstr "" @@ -5804,48 +5597,55 @@ msgstr "Ошибка преобразования адреса IP4 «0x%X» в msgid "Error converting IP6 address '%s' to text form" msgstr "Ошибка преобразования адреса IP6 «%s» в текстовый формат" -#: ../clients/cli/utils.c:503 +#. Translators: the first %s is the partial value entered by +#. * the user, the second %s a list of compatible values. +#. +#: ../clients/cli/utils.c:413 ../clients/cli/utils.c:444 #, fuzzy, c-format -#| msgid "'%s' is ambiguous (%s x %s)" -msgid "'%s' is ambiguous (on x off)" -msgstr "Неоднозначное значение «%s» (%s x %s)" +msgid "'%s' is ambiguous (%s)" +msgstr "Неоднозначное значение «%s» (%s x %s)" -#: ../clients/cli/utils.c:513 +#: ../clients/cli/utils.c:423 #, c-format msgid "'%s' is not valid; use [%s] or [%s]" msgstr "Недопустимое значение «%s». Ожидается [%s] или [%s]" -#: ../clients/cli/utils.c:595 +#: ../clients/cli/utils.c:456 +#, fuzzy, c-format +msgid "'%s' is not valid; use [%s], [%s] or [%s]" +msgstr "Недопустимое значение «%s». Ожидается [%s] или [%s]" + +#: ../clients/cli/utils.c:555 #, c-format msgid "'%s' is ambiguous (%s x %s)" msgstr "Неоднозначное значение «%s» (%s x %s)" -#: ../clients/cli/utils.c:607 +#: ../clients/cli/utils.c:567 #, c-format msgid "missing name, try one of [%s]" msgstr "имя не определено, попробуйте выбрать значение из [%s]" -#: ../clients/cli/utils.c:869 +#: ../clients/cli/utils.c:808 #, c-format msgid "field '%s' has to be alone" msgstr "поле «%s» должно быть единственным" -#: ../clients/cli/utils.c:872 +#: ../clients/cli/utils.c:811 #, c-format msgid "invalid field '%s'; allowed fields: %s" msgstr "неверное поле «%s»; допустимые поля: %s" -#: ../clients/cli/utils.c:929 +#: ../clients/cli/utils.c:868 msgid "Option '--terse' requires specifying '--fields'" msgstr "Параметр «--terse» требует указания «--fields»" -#: ../clients/cli/utils.c:933 +#: ../clients/cli/utils.c:872 #, c-format msgid "Option '--terse' requires specific '--fields' option values , not '%s'" msgstr "" "Параметр «--terse» требует определённых значений «--fields», но не «%s»" -#: ../clients/cli/utils.c:1301 +#: ../clients/cli/utils.c:1190 #, c-format msgid "" "Warning: nmcli (%s) and NetworkManager (%s) versions don't match. Use --" @@ -5854,7 +5654,7 @@ msgstr "" "Предупреждение: версии nmcli (%s) и NetworkManager (%s) не совпадают. " "Используйте --nocheck для подавления этого предупреждения.\n" -#: ../clients/cli/utils.c:1310 +#: ../clients/cli/utils.c:1199 #, c-format msgid "" "Error: nmcli (%s) and NetworkManager (%s) versions don't match. Force " @@ -5871,47 +5671,50 @@ msgstr "" #. * is not visible here since we only care about phase2 authentication #. * (and don't even care of which one) #. -#: ../clients/common/nm-secret-agent-simple.c:209 -#: ../clients/common/nm-secret-agent-simple.c:300 +#: ../clients/common/nm-secret-agent-simple.c:226 +#: ../clients/common/nm-secret-agent-simple.c:331 #: ../clients/tui/nmt-page-dsl.c:69 ../clients/tui/nmt-page-wifi.c:335 msgid "Username" msgstr "Пользователь" -#: ../clients/common/nm-secret-agent-simple.c:214 -#: ../clients/common/nm-secret-agent-simple.c:251 -#: ../clients/common/nm-secret-agent-simple.c:277 -#: ../clients/common/nm-secret-agent-simple.c:310 -#: ../clients/common/nm-secret-agent-simple.c:379 -#: ../clients/common/nm-secret-agent-simple.c:392 -#: ../clients/common/nm-secret-agent-simple.c:408 -#: ../clients/tui/nmt-page-dsl.c:78 ../clients/tui/nmt-page-wifi.c:280 -#: ../clients/tui/nmt-page-wifi.c:311 ../clients/tui/nmt-page-wifi.c:344 +#: ../clients/common/nm-secret-agent-simple.c:233 +#: ../clients/common/nm-secret-agent-simple.c:276 +#: ../clients/common/nm-secret-agent-simple.c:306 +#: ../clients/common/nm-secret-agent-simple.c:345 +#: ../clients/common/nm-secret-agent-simple.c:509 +#: ../clients/common/nm-secret-agent-simple.c:524 +#: ../clients/common/nm-secret-agent-simple.c:542 +#: ../clients/common/nm-vpn-helpers.c:234 +#: ../clients/common/nm-vpn-helpers.c:235 +#: ../clients/common/nm-vpn-helpers.c:238 ../clients/tui/nmt-page-dsl.c:78 +#: ../clients/tui/nmt-page-wifi.c:280 ../clients/tui/nmt-page-wifi.c:311 +#: ../clients/tui/nmt-page-wifi.c:344 msgid "Password" msgstr "Пароль" -#: ../clients/common/nm-secret-agent-simple.c:223 +#: ../clients/common/nm-secret-agent-simple.c:244 msgid "Identity" msgstr "Идентификация" -#: ../clients/common/nm-secret-agent-simple.c:228 +#: ../clients/common/nm-secret-agent-simple.c:251 msgid "Private key password" msgstr "Пароль секретного ключа" -#: ../clients/common/nm-secret-agent-simple.c:265 +#: ../clients/common/nm-secret-agent-simple.c:292 #: ../clients/tui/nmt-page-wifi.c:292 msgid "Key" msgstr "Ключ" -#: ../clients/common/nm-secret-agent-simple.c:305 +#: ../clients/common/nm-secret-agent-simple.c:338 #: ../clients/tui/nmt-page-dsl.c:81 msgid "Service" msgstr "Служба" -#: ../clients/common/nm-secret-agent-simple.c:339 +#: ../clients/common/nm-secret-agent-simple.c:465 msgid "Authentication required by wireless network" msgstr "Для доступа к беспроводной сети требуется аутентификация" -#: ../clients/common/nm-secret-agent-simple.c:340 +#: ../clients/common/nm-secret-agent-simple.c:466 #, c-format msgid "" "Passwords or encryption keys are required to access the wireless network " @@ -5919,45 +5722,70 @@ msgid "" msgstr "" "Для доступа к беспроводной сети «%s» требуются пароли или ключи шифрования." -#: ../clients/common/nm-secret-agent-simple.c:348 +#: ../clients/common/nm-secret-agent-simple.c:474 msgid "Wired 802.1X authentication" msgstr "Аутентификация проводного соединения 802.1X" -#: ../clients/common/nm-secret-agent-simple.c:351 +#: ../clients/common/nm-secret-agent-simple.c:477 msgid "Network name" msgstr "Имя сети" -#: ../clients/common/nm-secret-agent-simple.c:358 +#: ../clients/common/nm-secret-agent-simple.c:486 msgid "DSL authentication" msgstr "Аутентификация DSL" -#: ../clients/common/nm-secret-agent-simple.c:366 +#: ../clients/common/nm-secret-agent-simple.c:494 msgid "PIN code required" msgstr "Требуется PIN" -#: ../clients/common/nm-secret-agent-simple.c:367 +#: ../clients/common/nm-secret-agent-simple.c:495 msgid "PIN code is needed for the mobile broadband device" msgstr "Для использования мобильного устройства требуется PIN-код" -#: ../clients/common/nm-secret-agent-simple.c:369 +#: ../clients/common/nm-secret-agent-simple.c:497 msgid "PIN" msgstr "PIN" -#: ../clients/common/nm-secret-agent-simple.c:375 -#: ../clients/common/nm-secret-agent-simple.c:388 -#: ../clients/common/nm-secret-agent-simple.c:404 +#: ../clients/common/nm-secret-agent-simple.c:505 +#: ../clients/common/nm-secret-agent-simple.c:520 +#: ../clients/common/nm-secret-agent-simple.c:538 msgid "Mobile broadband network password" msgstr "Пароль мобильной сети" -#: ../clients/common/nm-secret-agent-simple.c:376 -#: ../clients/common/nm-secret-agent-simple.c:389 -#: ../clients/common/nm-secret-agent-simple.c:405 +#: ../clients/common/nm-secret-agent-simple.c:506 +#: ../clients/common/nm-secret-agent-simple.c:521 +#: ../clients/common/nm-secret-agent-simple.c:539 +#: ../clients/common/nm-secret-agent-simple.c:559 #, c-format msgid "A password is required to connect to '%s'." msgstr "Для подключения к «%s» требуется пароль." +#: ../clients/common/nm-secret-agent-simple.c:554 +#, fuzzy +msgid "VPN password required" +msgstr "Требуется PIN" + +#: ../clients/common/nm-vpn-helpers.c:236 +#: ../clients/common/nm-vpn-helpers.c:239 +#, fuzzy +msgid "Group password" +msgstr "Показать пароль" + +#: ../clients/common/nm-vpn-helpers.c:241 ../clients/tui/nmt-page-ip4.c:146 +#: ../clients/tui/nmt-page-ip6.c:146 +msgid "Gateway" +msgstr "Шлюз" + +#: ../clients/common/nm-vpn-helpers.c:242 +msgid "Cookie" +msgstr "" + +#: ../clients/common/nm-vpn-helpers.c:243 +#, fuzzy +msgid "Gateway certificate hash" +msgstr "Ошибка инициализации данных сертификата: %s" + #: ../clients/nm-online.c:96 -#, c-format msgid "Connecting" msgstr "Подключение..." @@ -5969,7 +5797,6 @@ msgstr "Время ожидания соединения в секундах (п #: ../clients/nm-online.c:150 #, fuzzy -#| msgid "Exit immediately if NetworkManager is not running" msgid "Exit immediately if NetworkManager is not running or connecting" msgstr "Выйти немедленно, если NetworkManager не запущен" @@ -5979,8 +5806,6 @@ msgstr "Ничего не выводить" #: ../clients/nm-online.c:152 #, fuzzy -#| msgid "" -#| "Waits for NetworkManager to finish activating startup network connections." msgid "Wait for NetworkManager startup instead of a connection" msgstr "Ожидать успешного соединения в NetworkManager." @@ -5994,7 +5819,7 @@ msgid "Invalid option. Please use --help to see a list of valid options." msgstr "Неверный параметр. Используйте --help для вывода списка параметров." #: ../clients/tui/newt/nmt-newt-utils.c:180 ../clients/tui/nmt-editor.c:417 -#: ../clients/tui/nmt-password-dialog.c:174 +#: ../clients/tui/nmt-password-dialog.c:176 #: ../clients/tui/nmt-route-editor.c:125 ../clients/tui/nmtui-hostname.c:71 #: ../clients/tui/nmtui.c:117 msgid "OK" @@ -6013,13 +5838,11 @@ msgstr "Ошибка редактора: %s" #: ../clients/tui/newt/nmt-newt-utils.c:376 #, fuzzy, c-format -#| msgid "Editor failed: %s" msgid "Editor failed with status %d" msgstr "Ошибка редактора: %s" #: ../clients/tui/newt/nmt-newt-utils.c:378 #, fuzzy, c-format -#| msgid "Editor failed: %s" msgid "Editor failed with signal %d" msgstr "Ошибка редактора: %s" @@ -6044,7 +5867,7 @@ msgid "InfiniBand connection %d" msgstr "Соединение InfiniBand %d" #: ../clients/tui/nm-editor-utils.c:173 ../libnm-glib/nm-device.c:1799 -#: ../libnm/nm-device.c:1621 +#: ../libnm/nm-device.c:1644 msgid "Mobile Broadband" msgstr "Мобильное" @@ -6062,9 +5885,9 @@ msgstr "DSL" msgid "DSL connection %d" msgstr "Cоединение DSL %d" -#: ../clients/tui/nm-editor-utils.c:191 ../libnm-core/nm-connection.c:1567 -#: ../libnm-glib/nm-device.c:1803 ../libnm-util/nm-connection.c:1608 -#: ../libnm/nm-device.c:1625 ../src/settings/plugins/ifcfg-rh/reader.c:3921 +#: ../clients/tui/nm-editor-utils.c:191 ../libnm-core/nm-connection.c:1606 +#: ../libnm-glib/nm-device.c:1803 ../libnm-util/nm-connection.c:1595 +#: ../libnm/nm-device.c:1648 ../src/settings/plugins/ifcfg-rh/reader.c:4059 msgid "Bond" msgstr "Агрегированное (Bond)" @@ -6073,9 +5896,9 @@ msgstr "Агрегированное (Bond)" msgid "Bond connection %d" msgstr "Агрегированное (Bond) соединение %d" -#: ../clients/tui/nm-editor-utils.c:200 ../libnm-core/nm-connection.c:1571 -#: ../libnm-glib/nm-device.c:1807 ../libnm-util/nm-connection.c:1612 -#: ../libnm/nm-device.c:1629 ../src/settings/plugins/ifcfg-rh/reader.c:4218 +#: ../clients/tui/nm-editor-utils.c:200 ../libnm-core/nm-connection.c:1610 +#: ../libnm-glib/nm-device.c:1807 ../libnm-util/nm-connection.c:1599 +#: ../libnm/nm-device.c:1652 ../src/settings/plugins/ifcfg-rh/reader.c:4350 msgid "Bridge" msgstr "Мост" @@ -6084,9 +5907,9 @@ msgstr "Мост" msgid "Bridge connection %d" msgstr "Соединение типа «мост» %d" -#: ../clients/tui/nm-editor-utils.c:209 ../libnm-core/nm-connection.c:1569 -#: ../libnm-glib/nm-device.c:1805 ../libnm-util/nm-connection.c:1610 -#: ../libnm/nm-device.c:1627 ../src/settings/plugins/ifcfg-rh/reader.c:4027 +#: ../clients/tui/nm-editor-utils.c:209 ../libnm-core/nm-connection.c:1608 +#: ../libnm-glib/nm-device.c:1805 ../libnm-util/nm-connection.c:1597 +#: ../libnm/nm-device.c:1650 ../src/settings/plugins/ifcfg-rh/reader.c:4165 msgid "Team" msgstr "Агрегированное (Team)" @@ -6162,7 +5985,6 @@ msgstr "Имя профиля" #: ../clients/tui/nmt-editor.c:333 #, fuzzy -#| msgid "Ethernet" msgid "Ethernet device" msgstr "Ethernet" @@ -6179,7 +6001,7 @@ msgstr "Подключаться автоматически" msgid "Available to all users" msgstr "Доступно всем" -#: ../clients/tui/nmt-editor.c:414 ../clients/tui/nmt-password-dialog.c:171 +#: ../clients/tui/nmt-editor.c:414 ../clients/tui/nmt-password-dialog.c:173 #: ../clients/tui/nmt-route-editor.c:118 ../clients/tui/nmtui-edit.c:218 #: ../clients/tui/nmtui-edit.c:526 ../clients/tui/nmtui-hostname.c:69 msgid "Cancel" @@ -6375,10 +6197,6 @@ msgstr "КОНФИГУРАЦИЯ IPv4" msgid "Addresses" msgstr "Адреса" -#: ../clients/tui/nmt-page-ip4.c:146 ../clients/tui/nmt-page-ip6.c:146 -msgid "Gateway" -msgstr "Шлюз" - #: ../clients/tui/nmt-page-ip4.c:153 ../clients/tui/nmt-page-ip6.c:153 msgid "DNS servers" msgstr "Серверы DNS" @@ -6395,7 +6213,11 @@ msgstr "Маршрутизация" msgid "Never use this network for default route" msgstr "Не использовать эту сеть для текущего маршрута" -#: ../clients/tui/nmt-page-ip4.c:184 +#: ../clients/tui/nmt-page-ip4.c:182 ../clients/tui/nmt-page-ip6.c:180 +msgid "Ignore automatically obtained routes" +msgstr "" + +#: ../clients/tui/nmt-page-ip4.c:190 msgid "Require IPv4 addressing for this connection" msgstr "Соединение требует адресацию IPv4" @@ -6411,7 +6233,7 @@ msgstr "Автоматически (только DHCP)" msgid "IPv6 CONFIGURATION" msgstr "КОНФИГУРАЦИЯ IPv6" -#: ../clients/tui/nmt-page-ip6.c:182 +#: ../clients/tui/nmt-page-ip6.c:188 msgid "Require IPv6 addressing for this connection" msgstr "Соединение требует адресацию IPv6" @@ -6421,7 +6243,6 @@ msgstr "КОНФИГУРАЦИЯ PPP" #: ../clients/tui/nmt-page-ppp.c:143 #, fuzzy -#| msgid "Authentication" msgid "Allowed authentication methods:" msgstr "Аутентификация" @@ -6646,38 +6467,59 @@ msgstr "Добавить..." msgid "Remove" msgstr "Удалить" -#: ../clients/tui/nmtui-connect.c:90 +#: ../clients/tui/nmtui-connect.c:58 +msgid "" +"openconnect will be run to authenticate.\n" +"It will return to nmtui when completed." +msgstr "" + +#: ../clients/tui/nmtui-connect.c:72 +#, fuzzy, c-format +msgid "Error: openconnect failed: %s" +msgstr "Ошибка: сбой удаления соединения: %s" + +#: ../clients/tui/nmtui-connect.c:79 +#, fuzzy, c-format +msgid "openconnect failed with status %d" +msgstr "Ошибка редактора: %s" + +#: ../clients/tui/nmtui-connect.c:83 +#, fuzzy, c-format +msgid "openconnect failed with signal %d" +msgstr "Ошибка редактора: %s" + +#: ../clients/tui/nmtui-connect.c:182 msgid "Activation failed" msgstr "Ошибка подключения" -#: ../clients/tui/nmtui-connect.c:145 +#: ../clients/tui/nmtui-connect.c:237 msgid "Connecting..." msgstr "Подключение..." -#: ../clients/tui/nmtui-connect.c:180 ../clients/tui/nmtui-connect.c:211 +#: ../clients/tui/nmtui-connect.c:272 ../clients/tui/nmtui-connect.c:303 #, c-format msgid "Could not activate connection: %s" msgstr "Не удалось подключиться к %s" -#: ../clients/tui/nmtui-connect.c:271 ../clients/tui/nmtui-connect.c:320 +#: ../clients/tui/nmtui-connect.c:363 ../clients/tui/nmtui-connect.c:412 msgid "Activate" msgstr "Включить" -#: ../clients/tui/nmtui-connect.c:273 +#: ../clients/tui/nmtui-connect.c:365 msgid "Deactivate" msgstr "Отключить" -#: ../clients/tui/nmtui-connect.c:325 ../clients/tui/nmtui-edit.c:121 +#: ../clients/tui/nmtui-connect.c:417 ../clients/tui/nmtui-edit.c:121 #: ../clients/tui/nmtui.c:111 msgid "Quit" msgstr "Выйти" -#: ../clients/tui/nmtui-connect.c:348 +#: ../clients/tui/nmtui-connect.c:440 #, c-format msgid "No such connection '%s'" msgstr "Нет соединения «%s»." -#: ../clients/tui/nmtui-connect.c:350 +#: ../clients/tui/nmtui-connect.c:442 msgid "Connection is already active" msgstr "Соединение активно" @@ -6708,7 +6550,6 @@ msgstr "Не удалось удалить соединение: %s" #: ../clients/tui/nmtui-edit.c:506 #, fuzzy, c-format -#| msgid "Could not delete connection: %s" msgid "Could not delete connection '%s': %s" msgstr "Не удалось удалить соединение: %s" @@ -6774,7 +6615,6 @@ msgstr "Не удалось обработать аргументы" #: ../clients/tui/nmtui.c:237 #, fuzzy, c-format -#| msgid "Could not activate connection: %s" msgid "Could not contact NetworkManager: %s.\n" msgstr "Не удалось подключиться к %s" @@ -7086,215 +6926,373 @@ msgstr "Не удалось проверить файл PKCS#12: %d" msgid "Could not generate random data." msgstr "Ошибка при генерации случайных данных." -#: ../libnm-core/nm-connection.c:225 +#: ../libnm-core/nm-connection.c:226 msgid "wrong type; should be a list of strings." msgstr "" -#: ../libnm-core/nm-connection.c:280 +#: ../libnm-core/nm-connection.c:281 #, fuzzy -#| msgid "Error: unknown setting '%s'\n" msgid "unknown setting name" msgstr "Ошибка: неизвестный параметр: %s\n" -#: ../libnm-core/nm-connection.c:804 +#: ../libnm-core/nm-connection.c:805 msgid "setting not found" msgstr "" -#: ../libnm-core/nm-connection.c:868 +#: ../libnm-core/nm-connection.c:869 #, fuzzy -#| msgid "Setting '%s' is not present in the connection.\n" msgid "setting not allowed in slave connection" msgstr "Параметр «%s» не определен в соединении.\n" -#: ../libnm-core/nm-connection.c:879 +#: ../libnm-core/nm-connection.c:880 msgid "setting is required for non-slave connections" msgstr "" -#: ../libnm-core/nm-connection.c:945 +#: ../libnm-core/nm-connection.c:946 #, fuzzy -#| msgid "Unable to delete connection: %s" msgid "Unexpected failure to verify the connection" msgstr "Не удалось удалить соединение: %s" -#: ../libnm-core/nm-connection.c:978 +#: ../libnm-core/nm-connection.c:979 #, fuzzy -#| msgid "Unable to delete connection: %s" msgid "Unexpected failure to normalize the connection" msgstr "Не удалось удалить соединение: %s" -#: ../libnm-core/nm-connection.c:1442 ../libnm-core/nm-setting-8021x.c:2275 -#: ../libnm-core/nm-setting-8021x.c:2292 ../libnm-core/nm-setting-8021x.c:2323 -#: ../libnm-core/nm-setting-8021x.c:2340 ../libnm-core/nm-setting-8021x.c:2382 -#: ../libnm-core/nm-setting-8021x.c:2394 ../libnm-core/nm-setting-8021x.c:2412 -#: ../libnm-core/nm-setting-8021x.c:2424 ../libnm-core/nm-setting-8021x.c:2448 -#: ../libnm-core/nm-setting-8021x.c:2630 ../libnm-core/nm-setting-adsl.c:190 +#: ../libnm-core/nm-connection.c:1480 ../libnm-core/nm-setting-8021x.c:2375 +#: ../libnm-core/nm-setting-8021x.c:2392 ../libnm-core/nm-setting-8021x.c:2423 +#: ../libnm-core/nm-setting-8021x.c:2440 ../libnm-core/nm-setting-8021x.c:2482 +#: ../libnm-core/nm-setting-8021x.c:2494 ../libnm-core/nm-setting-8021x.c:2512 +#: ../libnm-core/nm-setting-8021x.c:2524 ../libnm-core/nm-setting-8021x.c:2548 +#: ../libnm-core/nm-setting-8021x.c:2713 ../libnm-core/nm-setting-adsl.c:190 #: ../libnm-core/nm-setting-bluetooth.c:121 -#: ../libnm-core/nm-setting-bluetooth.c:139 -#: ../libnm-core/nm-setting-cdma.c:142 -#: ../libnm-core/nm-setting-connection.c:768 -#: ../libnm-core/nm-setting-connection.c:807 -#: ../libnm-core/nm-setting-connection.c:908 -#: ../libnm-core/nm-setting-ip-config.c:1841 -#: ../libnm-core/nm-setting-olpc-mesh.c:113 +#: ../libnm-core/nm-setting-bluetooth.c:139 ../libnm-core/nm-setting-cdma.c:142 +#: ../libnm-core/nm-setting-connection.c:809 +#: ../libnm-core/nm-setting-connection.c:848 +#: ../libnm-core/nm-setting-connection.c:961 +#: ../libnm-core/nm-setting-ip-config.c:1844 +#: ../libnm-core/nm-setting-olpc-mesh.c:112 #: ../libnm-core/nm-setting-pppoe.c:143 ../libnm-core/nm-setting-vpn.c:400 #: ../libnm-core/nm-setting-wimax.c:117 #: ../libnm-core/nm-setting-wireless-security.c:862 -#: ../libnm-core/nm-setting-wireless.c:712 ../libnm-util/nm-setting.c:1366 -#: ../libnm-util/nm-setting.c:1385 ../libnm-util/nm-setting.c:1403 -#: ../libnm-util/nm-setting-8021x.c:2284 ../libnm-util/nm-setting-8021x.c:2301 -#: ../libnm-util/nm-setting-8021x.c:2342 ../libnm-util/nm-setting-8021x.c:2359 -#: ../libnm-util/nm-setting-8021x.c:2411 ../libnm-util/nm-setting-8021x.c:2423 -#: ../libnm-util/nm-setting-8021x.c:2441 ../libnm-util/nm-setting-8021x.c:2453 -#: ../libnm-util/nm-setting-8021x.c:2477 ../libnm-util/nm-setting-8021x.c:2655 -#: ../libnm-util/nm-setting-adsl.c:210 -#: ../libnm-util/nm-setting-bluetooth.c:143 -#: ../libnm-util/nm-setting-bluetooth.c:161 -#: ../libnm-util/nm-setting-cdma.c:163 +#: ../libnm-core/nm-setting-wireless.c:693 ../libnm-util/nm-setting.c:1372 +#: ../libnm-util/nm-setting.c:1391 ../libnm-util/nm-setting.c:1409 +#: ../libnm-util/nm-setting-8021x.c:2326 ../libnm-util/nm-setting-8021x.c:2343 +#: ../libnm-util/nm-setting-8021x.c:2384 ../libnm-util/nm-setting-8021x.c:2401 +#: ../libnm-util/nm-setting-8021x.c:2453 ../libnm-util/nm-setting-8021x.c:2465 +#: ../libnm-util/nm-setting-8021x.c:2483 ../libnm-util/nm-setting-8021x.c:2495 +#: ../libnm-util/nm-setting-8021x.c:2519 ../libnm-util/nm-setting-8021x.c:2681 +#: ../libnm-util/nm-setting-adsl.c:210 ../libnm-util/nm-setting-bluetooth.c:143 +#: ../libnm-util/nm-setting-bluetooth.c:161 ../libnm-util/nm-setting-cdma.c:163 #: ../libnm-util/nm-setting-connection.c:769 #: ../libnm-util/nm-setting-connection.c:785 #: ../libnm-util/nm-setting-connection.c:846 #: ../libnm-util/nm-setting-ip4-config.c:852 -#: ../libnm-util/nm-setting-ip6-config.c:833 -#: ../libnm-util/nm-setting-ip6-config.c:897 +#: ../libnm-util/nm-setting-ip6-config.c:835 +#: ../libnm-util/nm-setting-ip6-config.c:898 #: ../libnm-util/nm-setting-olpc-mesh.c:124 #: ../libnm-util/nm-setting-pppoe.c:164 ../libnm-util/nm-setting-vpn.c:424 #: ../libnm-util/nm-setting-wimax.c:139 #: ../libnm-util/nm-setting-wireless-security.c:892 -#: ../libnm-util/nm-setting-wireless.c:770 +#: ../libnm-util/nm-setting-wireless.c:752 msgid "property is missing" msgstr "свойство не определено" -#: ../libnm-core/nm-setting-8021x.c:579 ../libnm-util/nm-setting-8021x.c:598 +#: ../libnm-core/nm-keyfile-reader.c:141 +msgid "ignoring missing number" +msgstr "" + +#: ../libnm-core/nm-keyfile-reader.c:150 +#, fuzzy, c-format +msgid "ignoring invalid number '%s'" +msgstr "недопустимая метрика «%s»" + +#: ../libnm-core/nm-keyfile-reader.c:170 +#, fuzzy, c-format +msgid "ignoring invalid %s address: %s" +msgstr "недопустимый адрес IPv4: «%s»" + +#: ../libnm-core/nm-keyfile-reader.c:210 +#, c-format +msgid "ignoring invalid gateway '%s' for %s route" +msgstr "" + +#: ../libnm-core/nm-keyfile-reader.c:230 +#, fuzzy, c-format +msgid "ignoring invalid %s route: %s" +msgstr "недопустимый маршрут IPv4: «%s»" + +#: ../libnm-core/nm-keyfile-reader.c:348 +#, c-format +msgid "unexpected character '%c' for address %s: '%s' (position %td)" +msgstr "" + +#: ../libnm-core/nm-keyfile-reader.c:358 +#, c-format +msgid "unexpected character '%c' for %s: '%s' (position %td)" +msgstr "" + +#: ../libnm-core/nm-keyfile-reader.c:367 +#, c-format +msgid "unexpected character '%c' in prefix length for %s: '%s' (position %td)" +msgstr "" + +#: ../libnm-core/nm-keyfile-reader.c:378 +#, c-format +msgid "garbage at the end of value %s: '%s'" +msgstr "" + +#: ../libnm-core/nm-keyfile-reader.c:384 +#, c-format +msgid "deprecated semicolon at the end of value %s: '%s'" +msgstr "" + +#: ../libnm-core/nm-keyfile-reader.c:399 +#, c-format +msgid "invalid prefix length for %s '%s', defaulting to %d" +msgstr "" + +#: ../libnm-core/nm-keyfile-reader.c:406 +#, c-format +msgid "missing prefix length for %s '%s', defaulting to %d" +msgstr "" + +#: ../libnm-core/nm-keyfile-reader.c:509 +#, fuzzy, c-format +msgid "ignoring invalid DNS server IPv4 address '%s'" +msgstr "недопустимый адрес IPv4: «%s»" + +#: ../libnm-core/nm-keyfile-reader.c:548 +#, fuzzy, c-format +msgid "ignoring invalid DNS server IPv6 address '%s'" +msgstr "недопустимый адрес IPv6: «%s»" + +#: ../libnm-core/nm-keyfile-reader.c:611 ../libnm-core/nm-keyfile-reader.c:752 +#: ../libnm-core/nm-keyfile-reader.c:1423 +#, c-format +msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)" +msgstr "" + +#: ../libnm-core/nm-keyfile-reader.c:625 +#, fuzzy +msgid "ignoring invalid MAC address" +msgstr "недопустимый MAC-адрес" + +#: ../libnm-core/nm-keyfile-reader.c:741 +#, fuzzy +msgid "ignoring invalid binary property" +msgstr "Ошибка. Недействительное свойство: %s\n" + +#: ../libnm-core/nm-keyfile-reader.c:784 +msgid "ignoring invalid SSID" +msgstr "" + +#: ../libnm-core/nm-keyfile-reader.c:800 +msgid "ignoring invalid raw password" +msgstr "" + +#: ../libnm-core/nm-keyfile-reader.c:875 ../libnm-core/nm-keyfile-reader.c:1041 +#, fuzzy, c-format +msgid "certificate or key file '%s' does not exist" +msgstr "Ошибка. Недействительное соединение: %s\n" + +#: ../libnm-core/nm-keyfile-reader.c:880 +#, fuzzy, c-format +msgid "invalid key/cert value path \"%s\"" +msgstr "недопустимый параметр «%s» или его значение «%s»" + +#: ../libnm-core/nm-keyfile-reader.c:918 +msgid "invalid key/cert value data:;base64, is not base64" +msgstr "" + +#: ../libnm-core/nm-keyfile-reader.c:931 +msgid "invalid key/cert value data:;base64,file://" +msgstr "" + +#: ../libnm-core/nm-keyfile-reader.c:1078 +#, fuzzy +msgid "invalid key/cert value is not a valid blob" +msgstr "Недействительный UUID: «%s»" + +#: ../libnm-core/nm-keyfile-reader.c:1083 +#, fuzzy +msgid "invalid key/cert value" +msgstr "недопустимый параметр «%s» или его значение «%s»" + +#: ../libnm-core/nm-keyfile-reader.c:1130 +#, fuzzy, c-format +msgid "invalid parity value '%s'" +msgstr "недопустимый параметр «%s» или его значение «%s»" + +#: ../libnm-core/nm-keyfile-reader.c:1324 +#, fuzzy, c-format +msgid "error loading setting value: %s" +msgstr "Ошибка. Недопустимое значение параметра: %s\n" + +#: ../libnm-core/nm-keyfile-reader.c:1356 +#, fuzzy, c-format +msgid "invalid negative value (%i)" +msgstr "недопустимый шлюз «%s»" + +#: ../libnm-core/nm-keyfile-reader.c:1377 +#, fuzzy, c-format +msgid "invalid char value (%i)" +msgstr "недопустимый маршрут IPv4: «%s»" + +#: ../libnm-core/nm-keyfile-reader.c:1400 +#, fuzzy, c-format +msgid "invalid int64 value (%s)" +msgstr "недопустимый параметр «%s» или его значение «%s»" + +#: ../libnm-core/nm-keyfile-reader.c:1459 +#, c-format +msgid "too large FLAGS property '%s' (%llu)" +msgstr "" + +#: ../libnm-core/nm-keyfile-reader.c:1472 +#, fuzzy, c-format +msgid "unhandled setting property type '%s'" +msgstr "Ошибка <параметр>.<свойство>: «%s»." + +#: ../libnm-core/nm-keyfile-reader.c:1503 +#, fuzzy, c-format +msgid "invalid setting name '%s'" +msgstr "Ошибка. Недопустимое значение параметра: %s\n" + +#: ../libnm-core/nm-setting-8021x.c:412 +#, fuzzy +msgid "data missing" +msgstr "свойство не определено" + +#: ../libnm-core/nm-setting-8021x.c:444 +msgid "binary data missing" +msgstr "" + +#: ../libnm-core/nm-setting-8021x.c:461 +msgid "file:// URI not NUL terminated" +msgstr "" + +#: ../libnm-core/nm-setting-8021x.c:470 +msgid "file:// URI is empty" +msgstr "" + +#: ../libnm-core/nm-setting-8021x.c:478 +#, fuzzy +msgid "file:// URI is not valid UTF-8" +msgstr "Недопустимый индекс «%s»." + +#: ../libnm-core/nm-setting-8021x.c:677 ../libnm-util/nm-setting-8021x.c:640 msgid "CA certificate must be in X.509 format" msgstr "" -#: ../libnm-core/nm-setting-8021x.c:894 ../libnm-core/nm-setting-8021x.c:1158 -#: ../libnm-core/nm-setting-8021x.c:1478 ../libnm-util/nm-setting-8021x.c:916 -#: ../libnm-util/nm-setting-8021x.c:1179 ../libnm-util/nm-setting-8021x.c:1502 +#: ../libnm-core/nm-setting-8021x.c:992 ../libnm-core/nm-setting-8021x.c:1256 +#: ../libnm-core/nm-setting-8021x.c:1576 ../libnm-util/nm-setting-8021x.c:958 +#: ../libnm-util/nm-setting-8021x.c:1221 ../libnm-util/nm-setting-8021x.c:1544 #, fuzzy -#| msgid "Error initializing certificate data: %s" msgid "invalid certificate format" msgstr "Ошибка инициализации данных сертификата: %s" -#: ../libnm-core/nm-setting-8021x.c:1761 ../libnm-util/nm-setting-8021x.c:1771 +#: ../libnm-core/nm-setting-8021x.c:1859 ../libnm-util/nm-setting-8021x.c:1813 #, fuzzy -#| msgid "invalid gateway '%s'" msgid "invalid private key" msgstr "недопустимый шлюз «%s»" -#: ../libnm-core/nm-setting-8021x.c:2072 ../libnm-util/nm-setting-8021x.c:2082 +#: ../libnm-core/nm-setting-8021x.c:2171 ../libnm-util/nm-setting-8021x.c:2124 #, fuzzy -#| msgid "Failed to decrypt the private key." msgid "invalid phase2 private key" msgstr "Не удалось расшифровать личный ключ." -#: ../libnm-core/nm-setting-8021x.c:2282 ../libnm-core/nm-setting-8021x.c:2299 -#: ../libnm-core/nm-setting-8021x.c:2330 ../libnm-core/nm-setting-8021x.c:2347 -#: ../libnm-core/nm-setting-8021x.c:2388 ../libnm-core/nm-setting-8021x.c:2400 -#: ../libnm-core/nm-setting-8021x.c:2418 ../libnm-core/nm-setting-8021x.c:2430 -#: ../libnm-core/nm-setting-8021x.c:2455 ../libnm-core/nm-setting-adsl.c:197 -#: ../libnm-core/nm-setting-adsl.c:206 ../libnm-core/nm-setting-cdma.c:158 -#: ../libnm-core/nm-setting-cdma.c:167 -#: ../libnm-core/nm-setting-connection.c:775 -#: ../libnm-core/nm-setting-connection.c:818 -#: ../libnm-core/nm-setting-gsm.c:226 ../libnm-core/nm-setting-gsm.c:283 -#: ../libnm-core/nm-setting-gsm.c:292 -#: ../libnm-core/nm-setting-ip-config.c:1848 +#: ../libnm-core/nm-setting-8021x.c:2382 ../libnm-core/nm-setting-8021x.c:2399 +#: ../libnm-core/nm-setting-8021x.c:2430 ../libnm-core/nm-setting-8021x.c:2447 +#: ../libnm-core/nm-setting-8021x.c:2488 ../libnm-core/nm-setting-8021x.c:2500 +#: ../libnm-core/nm-setting-8021x.c:2518 ../libnm-core/nm-setting-8021x.c:2530 +#: ../libnm-core/nm-setting-8021x.c:2555 ../libnm-core/nm-setting-adsl.c:197 +#: ../libnm-core/nm-setting-cdma.c:149 ../libnm-core/nm-setting-cdma.c:158 +#: ../libnm-core/nm-setting-connection.c:816 +#: ../libnm-core/nm-setting-connection.c:859 ../libnm-core/nm-setting-gsm.c:226 +#: ../libnm-core/nm-setting-gsm.c:283 ../libnm-core/nm-setting-ip-config.c:1851 #: ../libnm-core/nm-setting-ip4-config.c:178 #: ../libnm-core/nm-setting-pppoe.c:150 ../libnm-core/nm-setting-pppoe.c:159 #: ../libnm-core/nm-setting-vpn.c:409 ../libnm-core/nm-setting-vpn.c:419 #: ../libnm-core/nm-setting-wimax.c:126 #: ../libnm-core/nm-setting-wireless-security.c:892 -#: ../libnm-core/nm-setting-wireless-security.c:900 -#: ../libnm-core/nm-setting-wireless-security.c:924 -#: ../libnm-util/nm-setting-8021x.c:2291 ../libnm-util/nm-setting-8021x.c:2308 -#: ../libnm-util/nm-setting-8021x.c:2349 ../libnm-util/nm-setting-8021x.c:2366 -#: ../libnm-util/nm-setting-8021x.c:2417 ../libnm-util/nm-setting-8021x.c:2429 -#: ../libnm-util/nm-setting-8021x.c:2447 ../libnm-util/nm-setting-8021x.c:2459 -#: ../libnm-util/nm-setting-8021x.c:2484 ../libnm-util/nm-setting-adsl.c:217 -#: ../libnm-util/nm-setting-adsl.c:226 ../libnm-util/nm-setting-cdma.c:179 -#: ../libnm-util/nm-setting-cdma.c:188 +#: ../libnm-core/nm-setting-wireless-security.c:916 +#: ../libnm-util/nm-setting-8021x.c:2333 ../libnm-util/nm-setting-8021x.c:2350 +#: ../libnm-util/nm-setting-8021x.c:2391 ../libnm-util/nm-setting-8021x.c:2408 +#: ../libnm-util/nm-setting-8021x.c:2459 ../libnm-util/nm-setting-8021x.c:2471 +#: ../libnm-util/nm-setting-8021x.c:2489 ../libnm-util/nm-setting-8021x.c:2501 +#: ../libnm-util/nm-setting-8021x.c:2526 ../libnm-util/nm-setting-adsl.c:217 +#: ../libnm-util/nm-setting-cdma.c:170 ../libnm-util/nm-setting-cdma.c:179 #: ../libnm-util/nm-setting-connection.c:776 -#: ../libnm-util/nm-setting-connection.c:853 -#: ../libnm-util/nm-setting-gsm.c:283 ../libnm-util/nm-setting-gsm.c:340 -#: ../libnm-util/nm-setting-gsm.c:349 -#: ../libnm-util/nm-setting-ip4-config.c:917 +#: ../libnm-util/nm-setting-connection.c:853 ../libnm-util/nm-setting-gsm.c:283 +#: ../libnm-util/nm-setting-gsm.c:340 ../libnm-util/nm-setting-ip4-config.c:917 #: ../libnm-util/nm-setting-ip4-config.c:926 #: ../libnm-util/nm-setting-pppoe.c:171 ../libnm-util/nm-setting-pppoe.c:180 #: ../libnm-util/nm-setting-vpn.c:433 ../libnm-util/nm-setting-vpn.c:443 #: ../libnm-util/nm-setting-wimax.c:148 #: ../libnm-util/nm-setting-wireless-security.c:922 -#: ../libnm-util/nm-setting-wireless-security.c:930 -#: ../libnm-util/nm-setting-wireless-security.c:954 +#: ../libnm-util/nm-setting-wireless-security.c:946 msgid "property is empty" msgstr "пустое свойство" -#: ../libnm-core/nm-setting-8021x.c:2312 ../libnm-core/nm-setting-8021x.c:2360 -#: ../libnm-util/nm-setting-8021x.c:2319 ../libnm-util/nm-setting-8021x.c:2331 -#: ../libnm-util/nm-setting-8021x.c:2377 ../libnm-util/nm-setting-8021x.c:2389 +#: ../libnm-core/nm-setting-8021x.c:2412 ../libnm-core/nm-setting-8021x.c:2460 +#: ../libnm-util/nm-setting-8021x.c:2361 ../libnm-util/nm-setting-8021x.c:2373 +#: ../libnm-util/nm-setting-8021x.c:2419 ../libnm-util/nm-setting-8021x.c:2431 #, c-format msgid "has to match '%s' property for PKCS#12" msgstr "должно соответствовать свойству «%s» для PKCS#12" -#: ../libnm-core/nm-setting-8021x.c:2605 ../libnm-core/nm-setting-8021x.c:2639 +#: ../libnm-core/nm-setting-8021x.c:2687 +#, fuzzy, c-format +msgid "certificate is invalid: %s" +msgstr "неверное свойство" + +#: ../libnm-core/nm-setting-8021x.c:2722 #: ../libnm-core/nm-setting-bluetooth.c:130 #: ../libnm-core/nm-setting-infiniband.c:193 #: ../libnm-core/nm-setting-infiniband.c:208 #: ../libnm-core/nm-setting-ip4-config.c:169 -#: ../libnm-core/nm-setting-ip6-config.c:166 -#: ../libnm-core/nm-setting-olpc-mesh.c:142 -#: ../libnm-core/nm-setting-wimax.c:135 ../libnm-core/nm-setting-wired.c:618 -#: ../libnm-core/nm-setting-wired.c:628 -#: ../libnm-core/nm-setting-wireless-security.c:943 -#: ../libnm-core/nm-setting-wireless-security.c:952 -#: ../libnm-core/nm-setting-wireless-security.c:960 -#: ../libnm-core/nm-setting-wireless-security.c:968 -#: ../libnm-core/nm-setting-wireless-security.c:976 -#: ../libnm-core/nm-setting-wireless-security.c:985 -#: ../libnm-core/nm-setting-wireless-security.c:994 -#: ../libnm-core/nm-setting-wireless-security.c:1003 -#: ../libnm-core/nm-setting-wireless-security.c:1039 -#: ../libnm-core/nm-setting-wireless-security.c:1049 -#: ../libnm-core/nm-setting-wireless.c:773 -#: ../libnm-core/nm-setting-wireless.c:782 -#: ../libnm-core/nm-setting-wireless.c:791 ../libnm-util/nm-setting.c:1376 -#: ../libnm-util/nm-setting.c:1394 ../libnm-util/nm-setting.c:1413 -#: ../libnm-util/nm-setting-8021x.c:2630 ../libnm-util/nm-setting-8021x.c:2664 +#: ../libnm-core/nm-setting-ip6-config.c:165 +#: ../libnm-core/nm-setting-olpc-mesh.c:141 +#: ../libnm-core/nm-setting-wimax.c:135 ../libnm-core/nm-setting-wired.c:660 +#: ../libnm-core/nm-setting-wired.c:670 +#: ../libnm-core/nm-setting-wireless-security.c:935 +#: ../libnm-core/nm-setting-wireless-security.c:944 +#: ../libnm-core/nm-setting-wireless-security.c:953 +#: ../libnm-core/nm-setting-wireless-security.c:989 +#: ../libnm-core/nm-setting-wireless-security.c:999 +#: ../libnm-core/nm-setting-wireless.c:754 +#: ../libnm-core/nm-setting-wireless.c:763 +#: ../libnm-core/nm-setting-wireless.c:772 ../libnm-util/nm-setting.c:1382 +#: ../libnm-util/nm-setting.c:1400 ../libnm-util/nm-setting.c:1419 +#: ../libnm-util/nm-setting-8021x.c:2656 ../libnm-util/nm-setting-8021x.c:2690 #: ../libnm-util/nm-setting-bluetooth.c:152 #: ../libnm-util/nm-setting-infiniband.c:206 #: ../libnm-util/nm-setting-infiniband.c:222 #: ../libnm-util/nm-setting-ip4-config.c:908 -#: ../libnm-util/nm-setting-ip6-config.c:888 +#: ../libnm-util/nm-setting-ip6-config.c:889 #: ../libnm-util/nm-setting-olpc-mesh.c:152 #: ../libnm-util/nm-setting-wimax.c:157 ../libnm-util/nm-setting-wired.c:659 #: ../libnm-util/nm-setting-wired.c:668 -#: ../libnm-util/nm-setting-wireless-security.c:973 -#: ../libnm-util/nm-setting-wireless-security.c:982 -#: ../libnm-util/nm-setting-wireless-security.c:990 -#: ../libnm-util/nm-setting-wireless-security.c:998 -#: ../libnm-util/nm-setting-wireless-security.c:1006 -#: ../libnm-util/nm-setting-wireless-security.c:1015 -#: ../libnm-util/nm-setting-wireless-security.c:1024 -#: ../libnm-util/nm-setting-wireless-security.c:1033 -#: ../libnm-util/nm-setting-wireless-security.c:1069 -#: ../libnm-util/nm-setting-wireless-security.c:1079 +#: ../libnm-util/nm-setting-wireless-security.c:965 +#: ../libnm-util/nm-setting-wireless-security.c:974 +#: ../libnm-util/nm-setting-wireless-security.c:983 +#: ../libnm-util/nm-setting-wireless-security.c:1019 +#: ../libnm-util/nm-setting-wireless-security.c:1029 +#: ../libnm-util/nm-setting-wireless.c:812 +#: ../libnm-util/nm-setting-wireless.c:821 #: ../libnm-util/nm-setting-wireless.c:830 -#: ../libnm-util/nm-setting-wireless.c:839 -#: ../libnm-util/nm-setting-wireless.c:848 msgid "property is invalid" msgstr "неверное свойство" -#: ../libnm-core/nm-setting-8021x.c:2664 ../libnm-core/nm-setting-8021x.c:2674 -#: ../libnm-core/nm-setting-8021x.c:2684 ../libnm-core/nm-setting-8021x.c:2694 -#: ../libnm-core/nm-setting-8021x.c:2704 ../libnm-core/nm-setting-adsl.c:218 -#: ../libnm-core/nm-setting-adsl.c:230 -#: ../libnm-core/nm-setting-bluetooth.c:147 +#: ../libnm-core/nm-setting-8021x.c:2747 ../libnm-core/nm-setting-8021x.c:2757 +#: ../libnm-core/nm-setting-8021x.c:2767 ../libnm-core/nm-setting-8021x.c:2777 +#: ../libnm-core/nm-setting-8021x.c:2787 ../libnm-core/nm-setting-adsl.c:209 +#: ../libnm-core/nm-setting-adsl.c:221 ../libnm-core/nm-setting-bluetooth.c:147 #: ../libnm-core/nm-setting-wireless-security.c:871 -#: ../libnm-util/nm-setting-8021x.c:2689 ../libnm-util/nm-setting-8021x.c:2699 -#: ../libnm-util/nm-setting-8021x.c:2709 ../libnm-util/nm-setting-8021x.c:2719 -#: ../libnm-util/nm-setting-8021x.c:2729 ../libnm-util/nm-setting-adsl.c:238 -#: ../libnm-util/nm-setting-adsl.c:250 -#: ../libnm-util/nm-setting-bluetooth.c:169 +#: ../libnm-util/nm-setting-8021x.c:2715 ../libnm-util/nm-setting-8021x.c:2725 +#: ../libnm-util/nm-setting-8021x.c:2735 ../libnm-util/nm-setting-8021x.c:2745 +#: ../libnm-util/nm-setting-8021x.c:2755 ../libnm-util/nm-setting-adsl.c:229 +#: ../libnm-util/nm-setting-adsl.c:241 ../libnm-util/nm-setting-bluetooth.c:169 #: ../libnm-util/nm-setting-wireless-security.c:901 #, c-format msgid "'%s' is not a valid value for the property" @@ -7302,7 +7300,6 @@ msgstr "«%s» — недопустимое значение свойства" #: ../libnm-core/nm-setting-bluetooth.c:169 #, fuzzy, c-format -#| msgid "requires '%s' or '%s' setting" msgid "'%s' connection requires '%s' or '%s' setting" msgstr "требует определения «%s» или «%s»" @@ -7366,13 +7363,11 @@ msgstr "Недопустимый адрес IPv4 («%s») для «%s»." #: ../libnm-core/nm-setting-bond.c:638 ../libnm-util/nm-setting-bond.c:683 #, fuzzy, c-format -#| msgid "'%s' option is only valid for '%s=%s'" msgid "'%s' option is only valid with mode '%s'" msgstr "Параметр «%s» действителен только для «%s=%s»." #: ../libnm-core/nm-setting-bond.c:653 #, fuzzy, c-format -#| msgid "'%s' option is empty" msgid "'%s' option should be string" msgstr "Пустой параметр: «%s»" @@ -7387,7 +7382,6 @@ msgstr "Недопустимое значение свойства: «%d» (до #: ../libnm-core/nm-setting-bridge-port.c:155 #: ../libnm-core/nm-setting-team-port.c:98 #, fuzzy, c-format -#| msgid "requires '%s' or '%s' setting" msgid "missing setting" msgstr "требует определения «%s» или «%s»" @@ -7399,62 +7393,62 @@ msgid "" "Instead it is '%s'" msgstr "" -#: ../libnm-core/nm-setting-bridge.c:228 ../libnm-util/nm-setting-bridge.c:270 +#: ../libnm-core/nm-setting-bridge.c:210 ../libnm-util/nm-setting-bridge.c:270 #, c-format msgid "value '%d' is out of range <%d-%d>" msgstr "значение «%d» выходит за пределы допустимого диапазона: <%d-%d>" -#: ../libnm-core/nm-setting-bridge.c:245 ../libnm-core/nm-setting-wired.c:592 -#: ../libnm-core/nm-setting-wired.c:652 ../libnm-util/nm-setting-bridge.c:287 -#: ../libnm-util/nm-setting-wired.c:634 ../libnm-util/nm-setting-wired.c:692 +#: ../libnm-core/nm-setting-bridge.c:227 ../libnm-core/nm-setting-wired.c:634 +#: ../libnm-core/nm-setting-wired.c:694 ../libnm-core/nm-setting-wired.c:722 +#: ../libnm-util/nm-setting-bridge.c:287 ../libnm-util/nm-setting-wired.c:634 +#: ../libnm-util/nm-setting-wired.c:692 msgid "is not a valid MAC address" msgstr "недопустимый MAC-адрес" -#: ../libnm-core/nm-setting-connection.c:747 +#: ../libnm-core/nm-setting-connection.c:788 #, fuzzy, c-format -#| msgid "Could not create editor for connection '%s' of type '%s'." msgid "setting required for connection of type '%s'" msgstr "Не удалось открыть окно редактора для соединения «%s» типа «%s»." -#: ../libnm-core/nm-setting-connection.c:828 +#: ../libnm-core/nm-setting-connection.c:869 #, fuzzy, c-format -#| msgid "index '%s' is not valid" msgid "connection type '%s' is not valid" msgstr "Недопустимый индекс «%s»." -#: ../libnm-core/nm-setting-connection.c:863 +#: ../libnm-core/nm-setting-connection.c:904 #: ../libnm-util/nm-setting-connection.c:878 #, fuzzy, c-format -#| msgid "Unknown log level '%s'" msgid "Unknown slave type '%s'" msgstr "Неизвестный уровень журналирования «%s»" -#: ../libnm-core/nm-setting-connection.c:873 +#: ../libnm-core/nm-setting-connection.c:914 #: ../libnm-util/nm-setting-connection.c:888 #, fuzzy, c-format -#| msgid "Shared connection service failed" msgid "Slave connections need a valid '%s' property" msgstr "Сбой службы общего подключения" -#: ../libnm-core/nm-setting-connection.c:894 +#: ../libnm-core/nm-setting-connection.c:935 #: ../libnm-util/nm-setting-connection.c:898 #, fuzzy, c-format -#| msgid "not saved, " msgid "Cannot set '%s' without '%s'" msgstr "не сохранено," -#: ../libnm-core/nm-setting-connection.c:917 +#: ../libnm-core/nm-setting-connection.c:949 +#, fuzzy, c-format +msgid "metered value %d is not valid" +msgstr "Недействительный UUID: «%s»" + +#: ../libnm-core/nm-setting-connection.c:970 #, c-format msgid "property type should be set to '%s'" msgstr "" -#: ../libnm-core/nm-setting-connection.c:932 +#: ../libnm-core/nm-setting-connection.c:985 #, fuzzy, c-format -#| msgid "requires presence of '%s' setting in the connection" msgid "slave-type '%s' requires a '%s' setting in the connection" msgstr "требует наличия «%s» в определении соединения" -#: ../libnm-core/nm-setting-connection.c:942 +#: ../libnm-core/nm-setting-connection.c:995 #, c-format msgid "" "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be " @@ -7501,7 +7495,7 @@ msgstr "пустое значение «%s» или свойство не опр msgid "'%s' contains invalid char(s) (use [A-Za-z._-])" msgstr "«%s» содержит недопустимые символы. Используйте [A-Za-z._-]." -#: ../libnm-core/nm-setting-gsm.c:306 ../libnm-util/nm-setting-gsm.c:363 +#: ../libnm-core/nm-setting-gsm.c:297 ../libnm-util/nm-setting-gsm.c:354 #, c-format msgid "'%s' length is invalid (should be 5 or 6 digits)" msgstr "«%s» должно содержать 5-6 цифр" @@ -7534,77 +7528,76 @@ msgstr "" msgid "mtu for transport mode '%s' can be at most %d but it is %d" msgstr "" -#: ../libnm-core/nm-setting-ip-config.c:79 +#: ../libnm-core/nm-setting-ip-config.c:77 +#, fuzzy, c-format +msgid "Missing IPv4 address" +msgstr "недопустимый адрес IPv4: «%s»" + +#: ../libnm-core/nm-setting-ip-config.c:77 +#, fuzzy, c-format +msgid "Missing IPv6 address" +msgstr "недопустимый адрес IPv6: «%s»" + +#: ../libnm-core/nm-setting-ip-config.c:82 #, fuzzy, c-format -#| msgid "invalid IPv4 address '%s'" msgid "Invalid IPv4 address '%s'" msgstr "недопустимый адрес IPv4: «%s»" -#: ../libnm-core/nm-setting-ip-config.c:79 +#: ../libnm-core/nm-setting-ip-config.c:82 #, fuzzy, c-format -#| msgid "invalid IPv6 address '%s'" msgid "Invalid IPv6 address '%s" msgstr "недопустимый адрес IPv6: «%s»" -#: ../libnm-core/nm-setting-ip-config.c:93 +#: ../libnm-core/nm-setting-ip-config.c:96 #, fuzzy, c-format -#| msgid "invalid IPv4 address '%s'" msgid "Invalid IPv4 address prefix '%u'" msgstr "недопустимый адрес IPv4: «%s»" -#: ../libnm-core/nm-setting-ip-config.c:93 +#: ../libnm-core/nm-setting-ip-config.c:96 #, fuzzy, c-format -#| msgid "invalid IPv6 address '%s'" msgid "Invalid IPv6 address prefix '%u" msgstr "недопустимый адрес IPv6: «%s»" -#: ../libnm-core/nm-setting-ip-config.c:111 +#: ../libnm-core/nm-setting-ip-config.c:114 #, fuzzy, c-format -#| msgid "invalid metric '%s'" msgid "Invalid routing metric '%s'" msgstr "недопустимая метрика «%s»" -#: ../libnm-core/nm-setting-ip-config.c:1861 +#: ../libnm-core/nm-setting-ip-config.c:1864 #, fuzzy, c-format -#| msgid "%d. IPv4 address is invalid" msgid "%d. DNS server address is invalid" msgstr "%d. Неверный адрес IPv4" -#: ../libnm-core/nm-setting-ip-config.c:1877 +#: ../libnm-core/nm-setting-ip-config.c:1880 #, fuzzy, c-format -#| msgid "%d. IPv4 address is invalid" msgid "%d. IP address is invalid" msgstr "%d. Неверный адрес IPv4" -#: ../libnm-core/nm-setting-ip-config.c:1889 +#: ../libnm-core/nm-setting-ip-config.c:1892 #, fuzzy, c-format -#| msgid "%d. IPv4 address has invalid prefix" msgid "%d. IP address has 'label' property with invalid type" msgstr "%d. Адрес IPv4 содержит недопустимый префикс" -#: ../libnm-core/nm-setting-ip-config.c:1898 +#: ../libnm-core/nm-setting-ip-config.c:1901 #, fuzzy, c-format -#| msgid "%d. IPv4 address has invalid prefix" msgid "%d. IP address has invalid label '%s'" msgstr "%d. Адрес IPv4 содержит недопустимый префикс" -#: ../libnm-core/nm-setting-ip-config.c:1912 +#: ../libnm-core/nm-setting-ip-config.c:1915 msgid "gateway cannot be set if there are no addresses configured" msgstr "" -#: ../libnm-core/nm-setting-ip-config.c:1921 +#: ../libnm-core/nm-setting-ip-config.c:1924 #, fuzzy -#| msgid "property is invalid" msgid "gateway is invalid" msgstr "неверное свойство" -#: ../libnm-core/nm-setting-ip-config.c:1935 -#: ../libnm-util/nm-setting-ip4-config.c:966 +#: ../libnm-core/nm-setting-ip-config.c:1938 #, c-format msgid "%d. route is invalid" msgstr "%d. Неверный маршрут" -#: ../libnm-core/nm-setting-ip-config.c:1944 +#: ../libnm-core/nm-setting-ip-config.c:1947 #, c-format msgid "%d. route cannot be a default route" msgstr "" @@ -7612,45 +7605,38 @@ msgstr "" #: ../libnm-core/nm-setting-ip4-config.c:123 #: ../libnm-core/nm-setting-ip6-config.c:121 #: ../libnm-util/nm-setting-ip4-config.c:862 -#: ../libnm-util/nm-setting-ip6-config.c:843 +#: ../libnm-util/nm-setting-ip6-config.c:845 #, fuzzy, c-format -#| msgid "this property is not allowed for '%s=%s'" msgid "this property cannot be empty for '%s=%s'" msgstr "это свойство не может использоваться для «%s=%s»" #: ../libnm-core/nm-setting-ip4-config.c:135 #: ../libnm-core/nm-setting-ip4-config.c:145 #: ../libnm-core/nm-setting-ip4-config.c:157 -#: ../libnm-core/nm-setting-ip6-config.c:134 -#: ../libnm-core/nm-setting-ip6-config.c:144 -#: ../libnm-core/nm-setting-ip6-config.c:154 +#: ../libnm-core/nm-setting-ip6-config.c:133 +#: ../libnm-core/nm-setting-ip6-config.c:143 +#: ../libnm-core/nm-setting-ip6-config.c:153 #: ../libnm-util/nm-setting-ip4-config.c:874 #: ../libnm-util/nm-setting-ip4-config.c:884 #: ../libnm-util/nm-setting-ip4-config.c:896 -#: ../libnm-util/nm-setting-ip6-config.c:856 -#: ../libnm-util/nm-setting-ip6-config.c:866 -#: ../libnm-util/nm-setting-ip6-config.c:876 +#: ../libnm-util/nm-setting-ip6-config.c:857 +#: ../libnm-util/nm-setting-ip6-config.c:867 +#: ../libnm-util/nm-setting-ip6-config.c:877 #, c-format msgid "this property is not allowed for '%s=%s'" msgstr "это свойство не может использоваться для «%s=%s»" -#: ../libnm-core/nm-setting-ip6-config.c:133 -#: ../libnm-util/nm-setting-ip6-config.c:855 -#, c-format -msgid "'%s' not allowed for %s=%s" -msgstr "«%s» не может использоваться для «%s=%s»" - -#: ../libnm-core/nm-setting-olpc-mesh.c:123 -#: ../libnm-core/nm-setting-wireless.c:722 +#: ../libnm-core/nm-setting-olpc-mesh.c:122 +#: ../libnm-core/nm-setting-wireless.c:703 #: ../libnm-util/nm-setting-olpc-mesh.c:133 -#: ../libnm-util/nm-setting-wireless.c:779 +#: ../libnm-util/nm-setting-wireless.c:761 msgid "SSID length is out of range <1-32> bytes" msgstr "Длина SSID должна быть в пределах от 1 до 32 байт." -#: ../libnm-core/nm-setting-olpc-mesh.c:132 -#: ../libnm-core/nm-setting-wireless.c:762 +#: ../libnm-core/nm-setting-olpc-mesh.c:131 +#: ../libnm-core/nm-setting-wireless.c:743 #: ../libnm-util/nm-setting-olpc-mesh.c:142 -#: ../libnm-util/nm-setting-wireless.c:819 +#: ../libnm-util/nm-setting-wireless.c:801 #, c-format msgid "'%d' is not a valid channel" msgstr "Недопустимый канал «%d»." @@ -7688,7 +7674,6 @@ msgstr "неверные флаги" #: ../libnm-core/nm-setting-vpn.c:441 #, fuzzy, c-format -#| msgid "property is empty" msgid "secret was empty" msgstr "пустое свойство" @@ -7701,7 +7686,7 @@ msgstr "" msgid "secret value was empty" msgstr "" -#: ../libnm-core/nm-setting-vpn.c:526 ../libnm-core/nm-setting.c:1607 +#: ../libnm-core/nm-setting-vpn.c:526 ../libnm-core/nm-setting.c:1650 msgid "not a secret property" msgstr "" @@ -7711,7 +7696,6 @@ msgstr "" #: ../libnm-core/nm-setting-vpn.c:567 #, fuzzy, c-format -#| msgid "Error: failed to remove value of '%s': %s\n" msgid "failed to convert value '%s' to uint" msgstr "Ошибка. Не удалось изменить значение «%s»: %s\n" @@ -7719,105 +7703,107 @@ msgstr "Ошибка. Не удалось изменить значение «% msgid "secret flags property not found" msgstr "" -#: ../libnm-core/nm-setting-wired.c:572 ../libnm-util/nm-setting-wired.c:614 +#: ../libnm-core/nm-setting-wired.c:614 ../libnm-util/nm-setting-wired.c:614 #, c-format -#| msgid "'%s' is not a valid ethernet port value" msgid "'%s' is not a valid Ethernet port value" msgstr "«%s» не является допустимым значением порта Ethernet" -#: ../libnm-core/nm-setting-wired.c:582 ../libnm-util/nm-setting-wired.c:624 +#: ../libnm-core/nm-setting-wired.c:624 ../libnm-util/nm-setting-wired.c:624 #, c-format msgid "'%s' is not a valid duplex value" msgstr "«%s» не является допустимым значением дуплекса" -#: ../libnm-core/nm-setting-wired.c:641 ../libnm-util/nm-setting-wired.c:681 +#: ../libnm-core/nm-setting-wired.c:683 ../libnm-util/nm-setting-wired.c:681 #, c-format msgid "invalid '%s' or its value '%s'" msgstr "недопустимый параметр «%s» или его значение «%s»" +#: ../libnm-core/nm-setting-wired.c:704 +msgid "Wake-on-LAN mode 'default' and 'ignore' are exclusive flags" +msgstr "" + +#: ../libnm-core/nm-setting-wired.c:713 +msgid "Wake-on-LAN password can only be used with magic packet mode" +msgstr "" + #: ../libnm-core/nm-setting-wireless-security.c:883 #: ../libnm-util/nm-setting-wireless-security.c:913 #, c-format msgid "'%s' security requires '%s=%s'" msgstr "Для защиты «%s» необходимо выражение «%s=%s»" -#: ../libnm-core/nm-setting-wireless-security.c:912 -#: ../libnm-util/nm-setting-wireless-security.c:942 +#: ../libnm-core/nm-setting-wireless-security.c:904 +#: ../libnm-util/nm-setting-wireless-security.c:934 #, c-format msgid "'%s' security requires '%s' setting presence" msgstr "Для защиты «%s» необходимо определить «%s»" -#: ../libnm-core/nm-setting-wireless-security.c:933 -#: ../libnm-util/nm-setting-wireless-security.c:963 +#: ../libnm-core/nm-setting-wireless-security.c:925 +#: ../libnm-util/nm-setting-wireless-security.c:955 #, c-format msgid "'%d' value is out of range <0-3>" msgstr "Значение «%d» вне диапазона <0-3>" -#: ../libnm-core/nm-setting-wireless-security.c:1030 -#: ../libnm-util/nm-setting-wireless-security.c:1060 +#: ../libnm-core/nm-setting-wireless-security.c:980 +#: ../libnm-util/nm-setting-wireless-security.c:1010 #, c-format msgid "'%s' connections require '%s' in this property" msgstr "Соединения «%s» требуют «%s» в этот свойстве" -#: ../libnm-core/nm-setting-wireless-security.c:1060 -#: ../libnm-util/nm-setting-wireless-security.c:1090 +#: ../libnm-core/nm-setting-wireless-security.c:1010 +#: ../libnm-util/nm-setting-wireless-security.c:1040 #, c-format msgid "'%s' can only be used with '%s=%s' (WEP)" msgstr " «%s» может использоваться только вместе с «%s=%s» (WEP)" -#: ../libnm-core/nm-setting-wireless.c:731 -#: ../libnm-util/nm-setting-wireless.c:788 +#: ../libnm-core/nm-setting-wireless.c:712 +#: ../libnm-util/nm-setting-wireless.c:770 #, c-format msgid "'%s' is not a valid Wi-Fi mode" msgstr "«%s» не является допустимым режимом Wi-Fi" -#: ../libnm-core/nm-setting-wireless.c:741 -#: ../libnm-util/nm-setting-wireless.c:798 +#: ../libnm-core/nm-setting-wireless.c:722 +#: ../libnm-util/nm-setting-wireless.c:780 #, c-format msgid "'%s' is not a valid band" msgstr "«%s» не является допустимым диапазоном" -#: ../libnm-core/nm-setting-wireless.c:751 +#: ../libnm-core/nm-setting-wireless.c:732 #, c-format -#| msgid "requires setting '%s' property" msgid "'%s' requires setting '%s' property" msgstr "«%s» требует установки свойства «%s»" -#: ../libnm-core/nm-setting.c:827 +#: ../libnm-core/nm-setting.c:833 #, c-format msgid "can't set property of type '%s' from value of type '%s'" msgstr "" -#: ../libnm-core/nm-setting.c:1505 +#: ../libnm-core/nm-setting.c:1548 msgid "secret not found" msgstr "" -#: ../libnm-core/nm-setting.c:1597 +#: ../libnm-core/nm-setting.c:1640 msgid "secret is not set" msgstr "" -#: ../libnm-core/nm-utils.c:2276 ../libnm-util/nm-utils.c:1813 +#: ../libnm-core/nm-utils.c:2480 ../libnm-util/nm-utils.c:1828 #, c-format msgid "Could not find \"%s\" binary" msgstr "Не удалось найти бинарный файл «%s»" -#: ../libnm-glib/nm-device.c:1793 ../libnm/nm-device.c:1615 +#: ../libnm-glib/nm-device.c:1793 ../libnm/nm-device.c:1638 msgid "Bluetooth" msgstr "Bluetooth" -#: ../libnm-glib/nm-device.c:1811 ../libnm/nm-device.c:1633 -msgid "ADSL" -msgstr "ADSL" - -#: ../libnm-glib/nm-device.c:1839 ../libnm/nm-device.c:1661 +#: ../libnm-glib/nm-device.c:1839 ../libnm/nm-device.c:1684 msgid "Wired" msgstr "Проводное" -#: ../libnm-glib/nm-device.c:1870 ../libnm/nm-device.c:1692 +#: ../libnm-glib/nm-device.c:1870 ../libnm/nm-device.c:1715 msgid "PCI" msgstr "PCI" -#: ../libnm-glib/nm-device.c:1872 ../libnm/nm-device.c:1694 +#: ../libnm-glib/nm-device.c:1872 ../libnm/nm-device.c:1717 msgid "USB" msgstr "USB" @@ -7828,14 +7814,13 @@ msgstr "USB" #. * the strings otherwise. #. #: ../libnm-glib/nm-device.c:1968 ../libnm-glib/nm-device.c:1987 -#: ../libnm/nm-device.c:1788 ../libnm/nm-device.c:1807 +#: ../libnm/nm-device.c:1811 ../libnm/nm-device.c:1830 #, c-format msgctxt "long device name" msgid "%s %s" msgstr "%s %s" #: ../libnm-glib/nm-remote-connection.c:151 -#| msgid "disconnected" msgid "Disconnected by D-Bus" msgstr "Отключено через D-Bus" @@ -7874,11 +7859,22 @@ msgstr "%d. Неверный адрес IPv4" msgid "%d. IPv4 address has invalid prefix" msgstr "%d. Адрес IPv4 содержит недопустимый префикс" -#: ../libnm-util/nm-setting-ip4-config.c:976 +#: ../libnm-util/nm-setting-ip4-config.c:966 +#: ../libnm-util/nm-setting-ip6-config.c:938 #, c-format msgid "%d. route has invalid prefix" msgstr "%d. Маршрут содержит недопустимый префикс" +#: ../libnm-util/nm-setting-ip6-config.c:912 +#, fuzzy, c-format +msgid "%d. IPv6 address is invalid" +msgstr "%d. Неверный адрес IPv4" + +#: ../libnm-util/nm-setting-ip6-config.c:922 +#, fuzzy, c-format +msgid "%d. IPv6 address has invalid prefix" +msgstr "%d. Адрес IPv4 содержит недопустимый префикс" + #: ../libnm-util/nm-setting-vpn.c:583 #, c-format msgid "Failed to convert '%s' value '%s' to uint" @@ -7889,32 +7885,28 @@ msgstr "" msgid "Secret flags property '%s' not found" msgstr "" -#: ../libnm-util/nm-setting-wireless.c:808 +#: ../libnm-util/nm-setting-wireless.c:790 #, c-format msgid "requires setting '%s' property" msgstr "требует определения свойства «%s»" #: ../libnm/nm-device-adsl.c:73 #, fuzzy -#| msgid "connecting (starting secondary connections)" msgid "The connection was not an ADSL connection." msgstr "подключение (запуск второстепенных соединений)" #: ../libnm/nm-device-bond.c:115 #, fuzzy -#| msgid "connecting (starting secondary connections)" msgid "The connection was not a bond connection." msgstr "подключение (запуск второстепенных соединений)" #: ../libnm/nm-device-bridge.c:115 #, fuzzy -#| msgid "connecting (starting secondary connections)" msgid "The connection was not a bridge connection." msgstr "подключение (запуск второстепенных соединений)" #: ../libnm/nm-device-bt.c:140 #, fuzzy, c-format -#| msgid "There is 1 optional argument for 'bluetooth' connection type.\n" msgid "The connection was not a Bluetooth connection." msgstr "Для соединений Bluetooth доступен один дополнительный аргумент.\n" @@ -7933,51 +7925,44 @@ msgstr "" #: ../libnm/nm-device-ethernet.c:138 #, fuzzy -#| msgid "There are 4 optional arguments for 'PPPoE' connection type.\n" msgid "The connection was not an Ethernet or PPPoE connection." msgstr "" "При настройке соединений PPPoE допускается использование четырех " "дополнительных аргументов.\n" #: ../libnm/nm-device-ethernet.c:154 ../libnm/nm-device-infiniband.c:105 -#: ../libnm/nm-device-wifi.c:492 ../libnm/nm-device-wimax.c:311 +#: ../libnm/nm-device-wifi.c:598 ../libnm/nm-device-wimax.c:311 #, fuzzy -#| msgid "is not a valid MAC address" msgid "Invalid device MAC address." msgstr "недопустимый MAC-адрес" #: ../libnm/nm-device-ethernet.c:160 ../libnm/nm-device-infiniband.c:113 -#: ../libnm/nm-device-wifi.c:499 ../libnm/nm-device-wimax.c:318 +#: ../libnm/nm-device-wifi.c:605 ../libnm/nm-device-wimax.c:318 msgid "The MACs of the device and the connection didn't match." msgstr "" #: ../libnm/nm-device-generic.c:92 #, fuzzy -#| msgid "connecting (starting secondary connections)" msgid "The connection was not a generic connection." msgstr "подключение (запуск второстепенных соединений)" #: ../libnm/nm-device-generic.c:99 #, fuzzy -#| msgid "InfiniBand P_Key connection did not specify parent interface name" msgid "The connection did not specify an interface name." msgstr "InfiniBand P_Key не содержит имя родительского интерфеса" #: ../libnm/nm-device-infiniband.c:97 #, fuzzy -#| msgid "There are 5 optional arguments for 'InfiniBand' connection type.\n" msgid "The connection was not an InfiniBand connection." msgstr "Для соединений «InfiniBand» доступно пять дополнительных аргументов.\n" #: ../libnm/nm-device-modem.c:123 #, fuzzy -#| msgid "the connection was removed" msgid "The connection was not a modem connection." msgstr "соединение удалено" #: ../libnm/nm-device-modem.c:131 #, fuzzy -#| msgid "connecting (starting secondary connections)" msgid "The connection was not a valid modem connection." msgstr "подключение (запуск второстепенных соединений)" @@ -7987,19 +7972,16 @@ msgstr "" #: ../libnm/nm-device-olpc-mesh.c:118 #, fuzzy -#| msgid "There are 2 optional arguments for 'OLPC Mesh' connection type.\n" msgid "The connection was not an OLPC Mesh connection." msgstr "Для соединений «OLPC Mesh» доступно два дополнительных аргумента.\n" #: ../libnm/nm-device-team.c:121 #, fuzzy -#| msgid "the connection was removed" msgid "The connection was not a team connection." msgstr "соединение удалено" #: ../libnm/nm-device-vlan.c:131 #, fuzzy -#| msgid "There are 4 optional arguments for 'VLAN' connection type.\n" msgid "The connection was not a VLAN connection." msgstr "Для соединений «VLAN» доступно четыре дополнительных аргумента.\n" @@ -8011,48 +7993,44 @@ msgstr "" msgid "The hardware address of the device and the connection didn't match." msgstr "" -#: ../libnm/nm-device-wifi.c:483 +#: ../libnm/nm-device-wifi.c:589 msgid "The connection was not a Wi-Fi connection." msgstr "" -#: ../libnm/nm-device-wifi.c:519 +#: ../libnm/nm-device-wifi.c:625 msgid "The device is lacking WPA capabilities required by the connection." msgstr "" -#: ../libnm/nm-device-wifi.c:526 +#: ../libnm/nm-device-wifi.c:632 msgid "The device is lacking WPA2/RSN capabilities required by the connection." msgstr "" #: ../libnm/nm-device-wimax.c:302 #, fuzzy -#| msgid "There is 1 optional argument for 'WiMax' connection type.\n" msgid "The connection was not a WiMAX connection." msgstr "Для соединений «WiMax» доступен один дополнительный аргумент.\n" -#: ../libnm/nm-device.c:2152 +#: ../libnm/nm-device.c:2174 #, fuzzy, c-format -#| msgid "Error: connection is not valid: %s\n" msgid "The connection was not valid: %s" msgstr "Ошибка. Недействительное соединение: %s\n" -#: ../libnm/nm-device.c:2161 +#: ../libnm/nm-device.c:2183 #, c-format msgid "The interface names of the device and the connection didn't match." msgstr "" -#: ../libnm/nm-manager.c:858 +#: ../libnm/nm-manager.c:861 #, fuzzy -#| msgid "no active connection or device" msgid "Active connection could not be attached to the device" msgstr "на устройстве нет активных соединений" -#: ../libnm/nm-manager.c:1082 +#: ../libnm/nm-manager.c:1085 #, fuzzy -#| msgid "Active connection details" msgid "Active connection removed before it was initialized" msgstr "Сведения об активном соединении" -#: ../libnm/nm-object.c:1439 ../libnm/nm-object.c:1585 +#: ../libnm/nm-object.c:1442 ../libnm/nm-object.c:1588 msgid "Caller did not specify D-Bus path for object" msgstr "" @@ -8060,9 +8038,8 @@ msgstr "" msgid "Connection removed before it was initialized" msgstr "" -#: ../libnm/nm-vpn-plugin-old.c:885 +#: ../libnm/nm-vpn-plugin-old.c:892 #, fuzzy -#| msgid "Error: No interface specified." msgid "No service name specified" msgstr "Ошибка. Интерфейс не определен." @@ -8175,60 +8152,60 @@ msgstr "" #. * as "Wired Connection" or "VPN Connection". The %d is a number #. * that is combined with the first argument to create a unique #. * connection id. -#: ../src/NetworkManagerUtils.c:1294 +#: ../src/NetworkManagerUtils.c:1660 #, c-format -#| msgctxt "long device name" -#| msgid "%s %s" msgctxt "connection id fallback" msgid "%s %d" msgstr "%s %d" +#: ../src/main.c:240 +#, fuzzy, c-format +msgid "Failed to read configuration: %s\n" +msgstr "Не удалось прочитать конфигурацию: (%d) %s\n" + #. Logging/debugging -#: ../src/main.c:223 ../src/nm-iface-helper.c:300 +#: ../src/main.c:255 ../src/nm-iface-helper.c:300 msgid "Print NetworkManager version and exit" msgstr "Показать версию NetworkManager и выйти" -#: ../src/main.c:224 ../src/nm-iface-helper.c:301 +#: ../src/main.c:256 ../src/nm-iface-helper.c:301 msgid "Don't become a daemon" msgstr "Не использовать в качестве службы" -#: ../src/main.c:225 ../src/nm-iface-helper.c:302 +#: ../src/main.c:257 ../src/nm-iface-helper.c:302 msgid "Don't become a daemon, and log to stderr" msgstr "Не работать в режиме службы и не входить в stderr" -#: ../src/main.c:226 ../src/nm-iface-helper.c:303 +#: ../src/main.c:258 ../src/nm-iface-helper.c:303 #, c-format msgid "Log level: one of [%s]" msgstr "Уровень журнала: одно значение из [%s]" -#: ../src/main.c:228 ../src/nm-iface-helper.c:305 +#: ../src/main.c:260 ../src/nm-iface-helper.c:305 #, c-format msgid "Log domains separated by ',': any combination of [%s]" msgstr "" "Домены журналов должны быть перечислены через запятую и могут содержать " "любую комбинацию [%s]. " -#: ../src/main.c:230 ../src/nm-iface-helper.c:307 +#: ../src/main.c:262 ../src/nm-iface-helper.c:307 msgid "Make all warnings fatal" msgstr "Сделать все предупреждения критическими" -#: ../src/main.c:231 +#: ../src/main.c:263 msgid "Specify the location of a PID file" msgstr "Укажите расположение PID файла" -#: ../src/main.c:231 -msgid "filename" -msgstr "имя файла" - -#: ../src/main.c:232 +#: ../src/main.c:264 msgid "State file location" msgstr "Расположение файла состояния" -#: ../src/main.c:232 -msgid "/path/to/state.file" -msgstr "/путь/к/state.file" +#: ../src/main.c:266 +#, fuzzy +msgid "Print NetworkManager configuration and exit" +msgstr "Показать версию NetworkManager и выйти" -#: ../src/main.c:248 +#: ../src/main.c:276 msgid "" "NetworkManager monitors all network connections and automatically\n" "chooses the best connection to use. It also allows the user to\n" @@ -8241,74 +8218,72 @@ msgstr "" "пользователю задать беспроводным картам точки доступа, с которыми они \n" "должны ассоциироваться." -#: ../src/main.c:261 ../src/main-utils.c:228 ../src/nm-iface-helper.c:337 +#: ../src/main.c:369 ../src/main-utils.c:249 ../src/nm-iface-helper.c:383 #, c-format msgid "%s. Please use --help to see a list of valid options.\n" msgstr "%s. Используйте --help для вывода списка допустимых параметров.\n" -#: ../src/main.c:266 ../src/nm-iface-helper.c:342 +#: ../src/main.c:374 ../src/nm-iface-helper.c:388 #, c-format msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n" msgstr "Неизвестные домены журналов «%s» в строке команды. Пропускаются...\n" -#: ../src/main.c:313 +#: ../src/main.c:384 #, c-format msgid "Failed to read configuration: (%d) %s\n" msgstr "Не удалось прочитать конфигурацию: (%d) %s\n" -#: ../src/main.c:327 +#: ../src/main.c:400 #, c-format msgid "Error in configuration file: %s.\n" msgstr "Ошибка в файле конфигурации: %s\n" -#: ../src/main.c:332 +#: ../src/main.c:405 #, c-format msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n" msgstr "" "Неизвестный домен журналов «%s» в файле конфигурации. Пропускается...\n" -#: ../src/main.c:340 -#, c-format -msgid "State file %s parsing failed: (%d) %s\n" -msgstr "Сбой при разборе файла состояния %s: (%d) %s\n" - -#: ../src/main.c:353 ../src/nm-iface-helper.c:359 +#: ../src/main.c:416 ../src/nm-iface-helper.c:398 #, c-format msgid "Could not daemonize: %s [error %u]\n" msgstr "Невозможно преобразовать в службу: %s [ошибка %u]\n" -#: ../src/main-utils.c:95 +#: ../src/main-utils.c:104 #, c-format msgid "Opening %s failed: %s\n" msgstr "При открытии %s произошла ошибка: %s\n" -#: ../src/main-utils.c:101 +#: ../src/main-utils.c:110 #, c-format msgid "Writing to %s failed: %s\n" msgstr "При записи в %s произошла ошибка: %s\n" -#: ../src/main-utils.c:106 +#: ../src/main-utils.c:115 #, c-format msgid "Closing %s failed: %s\n" msgstr "При закрытии %s произошла ошибка: %s\n" -#: ../src/main-utils.c:162 +#: ../src/main-utils.c:125 +#, fuzzy, c-format +msgid "Cannot create '%s': %s" +msgstr "не сохранено," + +#: ../src/main-utils.c:177 #, c-format -#| msgid "NetworkManager is already running (pid %ld)\n" msgid "%s is already running (pid %ld)\n" msgstr "%s уже запущен (pid %ld)\n" -#: ../src/main-utils.c:205 +#: ../src/main-utils.c:187 #, c-format -#| msgid "You must be root to run NetworkManager!\n" msgid "You must be root to run %s!\n" msgstr "Вы должны быть суперпользователем для запуска %s\n" -#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:205 +#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:210 msgid "# Created by NetworkManager\n" msgstr "# Создано в NetworkManager\n" -#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:212 +#: ../src/dhcp-manager/nm-dhcp-dhclient-utils.c:217 #, c-format msgid "" "# Merged from %s\n" @@ -8319,7 +8294,6 @@ msgstr "" #: ../src/dhcp-manager/nm-dhcp-manager.c:130 #, fuzzy, c-format -#| msgid "'dhcpcd' could be found." msgid "'%s' support not found or not enabled." msgstr "«dhcpcd» не найден." @@ -8328,22 +8302,21 @@ msgstr "«dhcpcd» не найден." msgid "no usable DHCP client could be found." msgstr "невозможно найти клиентов DHCP." -#: ../src/dns-manager/nm-dns-manager.c:363 +#: ../src/dns-manager/nm-dns-manager.c:364 msgid "NOTE: the libc resolver may not support more than 3 nameservers." msgstr "" "ЗАМЕЧАНИЕ: преобразователь имён glibc не поддерживает более трёх серверов " "имён." -#: ../src/dns-manager/nm-dns-manager.c:365 +#: ../src/dns-manager/nm-dns-manager.c:366 msgid "The nameservers listed below may not be recognized." msgstr "Нижеперечисленные серверы имён могут быть не распознаны." -#: ../src/devices/adsl/nm-device-adsl.c:129 -#| msgid "ADSL connection %d" +#: ../src/devices/adsl/nm-device-adsl.c:137 msgid "ADSL connection" msgstr "Соединение ADSL" -#: ../src/devices/bluetooth/nm-bluez-device.c:200 +#: ../src/devices/bluetooth/nm-bluez-device.c:201 #, c-format msgid "%s Network" msgstr "Сеть %s" @@ -8357,7 +8330,6 @@ msgid "PAN connections cannot specify GSM, CDMA, or serial settings" msgstr "" #: ../src/devices/bluetooth/nm-device-bt.c:278 -#| msgid "PAN connection %d" msgid "PAN connection" msgstr "Соединение PAN" @@ -8371,13 +8343,11 @@ msgstr "" #: ../src/devices/bluetooth/nm-device-bt.c:305 #: ../src/devices/wwan/nm-modem-broadband.c:540 -#| msgid "GSM connection %d" msgid "GSM connection" msgstr "Соединение GSM" #: ../src/devices/bluetooth/nm-device-bt.c:309 #: ../src/devices/wwan/nm-modem-broadband.c:563 -#| msgid "CDMA connection %d" msgid "CDMA connection" msgstr "Соединение CDMA" @@ -8386,32 +8356,27 @@ msgid "Unknown/unhandled Bluetooth connection type" msgstr "" #: ../src/devices/bluetooth/nm-device-bt.c:337 -#: ../src/devices/nm-device-ethernet.c:1442 -#: ../src/devices/nm-device-infiniband.c:196 -#: ../src/devices/wifi/nm-device-wifi.c:1116 +#: ../src/devices/nm-device-ethernet.c:1446 +#: ../src/devices/nm-device-infiniband.c:204 +#: ../src/devices/wifi/nm-device-wifi.c:1113 #: ../src/devices/wimax/nm-device-wimax.c:454 #, fuzzy -#| msgid "index '%s' is not valid" msgid "connection does not match device" msgstr "Недопустимый индекс «%s»." -#: ../src/devices/nm-device-bond.c:126 -#| msgid "Bond connection %d" +#: ../src/devices/nm-device-bond.c:124 msgid "Bond connection" msgstr "Агрегированное (Bond) соединение" -#: ../src/devices/nm-device-bridge.c:132 -#| msgid "Bridge connection %d" +#: ../src/devices/nm-device-bridge.c:130 msgid "Bridge connection" msgstr "Соединение типа «мост»" -#: ../src/devices/nm-device-ethernet.c:1425 -#| msgid "PPPoE connection %d" +#: ../src/devices/nm-device-ethernet.c:1427 msgid "PPPoE connection" msgstr "Соединение PPPoE" -#: ../src/devices/nm-device-ethernet.c:1425 -#| msgid "Wired connection %d" +#: ../src/devices/nm-device-ethernet.c:1427 msgid "Wired connection" msgstr "Проводное соединение" @@ -8420,40 +8385,34 @@ msgstr "Проводное соединение" msgid "Wired connection %d" msgstr "Проводное соединение %d" -#: ../src/devices/nm-device-infiniband.c:178 -#| msgid "InfiniBand connection %d" +#: ../src/devices/nm-device-infiniband.c:186 msgid "InfiniBand connection" msgstr "Соединение InfiniBand" -#: ../src/devices/nm-device-vlan.c:218 -#| msgid "VLAN connection %d" +#: ../src/devices/nm-device-vlan.c:343 msgid "VLAN connection" msgstr "Соединение VLAN" -#: ../src/devices/team/nm-device-team.c:132 -#| msgid "Team connection %d" +#: ../src/devices/team/nm-device-team.c:134 msgid "Team connection" msgstr "Агрегированное (Team) соединение" #: ../src/devices/wifi/nm-device-olpc-mesh.c:151 #, fuzzy -#| msgid "Mesh %d" msgid "Mesh" msgstr "Mesh %d" -#: ../src/devices/wifi/nm-device-wifi.c:1086 +#: ../src/devices/wifi/nm-device-wifi.c:1081 msgid "WPA Ad-Hoc disabled due to kernel bugs" msgstr "" #: ../src/devices/wifi/nm-wifi-ap-utils.c:44 #, fuzzy, c-format -#| msgid "'%s=%s' is incompatible with '%s > 0'" msgid "%s is incompatible with static WEP keys" msgstr " «%s=%s» несовместимо с «%s > 0»" #: ../src/devices/wifi/nm-wifi-ap-utils.c:78 #, fuzzy -#| msgid "Authentication required by wireless network" msgid "LEAP authentication requires a LEAP username" msgstr "Для доступа к беспроводной сети требуется аутентификация" @@ -8496,7 +8455,6 @@ msgstr "" #: ../src/devices/wifi/nm-wifi-ap-utils.c:242 #, fuzzy -#| msgid "Dynamic WEP (802.1x)" msgid "Dynamic WEP requires an 802.1x setting" msgstr "Динамический WEP (802.1x)" @@ -8515,7 +8473,6 @@ msgstr "" #: ../src/devices/wifi/nm-wifi-ap-utils.c:324 #, fuzzy -#| msgid "Wired 802.1X authentication" msgid "WPA-PSK requires 'open' authentication" msgstr "Аутентификация проводного соединения 802.1X" @@ -8529,7 +8486,6 @@ msgstr "" #: ../src/devices/wifi/nm-wifi-ap-utils.c:361 #, fuzzy -#| msgid "Authentication required by wireless network" msgid "WPA Ad-Hoc authentication requires 'none' pairwise cipher" msgstr "Для доступа к беспроводной сети требуется аутентификация" @@ -8547,7 +8503,6 @@ msgstr "" #: ../src/devices/wifi/nm-wifi-ap-utils.c:427 #, fuzzy -#| msgid "Wired 802.1X authentication" msgid "WPA-EAP requires 'open' authentication" msgstr "Аутентификация проводного соединения 802.1X" @@ -8603,67 +8558,51 @@ msgstr "" #: ../src/devices/wifi/nm-wifi-ap-utils.c:760 #, fuzzy -#| msgid "Failed to set symmetric key for decryption." msgid "Failed to determine AP security information" msgstr "Не удалось задать симметричный ключ расшифровки." #: ../src/devices/wwan/nm-modem-broadband.c:527 #, fuzzy -#| msgid "Mobile broadband connection %d" msgid "GSM mobile broadband connection requires a 'gsm' setting" msgstr "Мобильное соединение %d" -#: ../src/nm-config.c:393 +#: ../src/nm-config.c:463 msgid "Config file location" msgstr "Расположение файла конфигурации" -#: ../src/nm-config.c:393 -msgid "/path/to/config.file" -msgstr "/путь/к/config.file" - -#: ../src/nm-config.c:394 +#: ../src/nm-config.c:464 msgid "Config directory location" msgstr "Путь к каталогу конфигурации" -#: ../src/nm-config.c:394 -msgid "/path/to/config/dir" -msgstr "/путь/к/каталогу" +#: ../src/nm-config.c:465 +msgid "State file for no-auto-default devices" +msgstr "" -#: ../src/nm-config.c:396 +#: ../src/nm-config.c:466 msgid "List of plugins separated by ','" msgstr "Список модулей (через запятую)" -#: ../src/nm-config.c:396 -msgid "plugin1,plugin2" -msgstr "модуль1,модуль2" - -#: ../src/nm-config.c:397 +#: ../src/nm-config.c:467 #, fuzzy -#| msgid "Current nmcli configuration:\n" msgid "Quit after initial configuration" msgstr "Текущая конфигурация nmcli:\n" #. These three are hidden for now, and should eventually just go away. -#: ../src/nm-config.c:400 +#: ../src/nm-config.c:470 msgid "An http(s) address for checking internet connectivity" msgstr "http(s) адрес для проверки соединения с Интернетом" -#: ../src/nm-config.c:401 +#: ../src/nm-config.c:471 msgid "The interval between connectivity checks (in seconds)" msgstr "Интервал между проверками соединения (в секундах)" -#: ../src/nm-config.c:402 +#: ../src/nm-config.c:472 msgid "The expected start of the response" msgstr "Ожидается начало ответа" -#: ../src/nm-config.c:402 -msgid "Bingo!" -msgstr "Бинго!" - #. Interface/IP config #: ../src/nm-iface-helper.c:286 #, fuzzy -#| msgid "Parent interface [none]: " msgid "The interface to manage" msgstr "Родительский интерфейс [нет]:" @@ -8673,7 +8612,6 @@ msgstr "eth0" #: ../src/nm-iface-helper.c:287 #, fuzzy -#| msgid "connection" msgid "Connection UUID" msgstr "соединение" @@ -8695,7 +8633,6 @@ msgstr "" #: ../src/nm-iface-helper.c:291 #, fuzzy -#| msgid "Cloned MAC address" msgid "Current DHCPv4 address" msgstr "Клонированный MAC-адрес" @@ -8705,7 +8642,6 @@ msgstr "" #: ../src/nm-iface-helper.c:293 #, fuzzy -#| msgid "unsupported DHCP client '%s'" msgid "Hex-encoded DHCPv4 client ID" msgstr "клиент DHCP «%s» не поддерживается" @@ -8719,7 +8655,6 @@ msgstr "" #: ../src/nm-iface-helper.c:295 #, fuzzy -#| msgid "no priority to remove" msgid "Route priority for IPv4" msgstr "нет приоритета для удаления" @@ -8729,7 +8664,6 @@ msgstr "0" #: ../src/nm-iface-helper.c:296 #, fuzzy -#| msgid "no priority to remove" msgid "Route priority for IPv6" msgstr "нет приоритета для удаления" @@ -8741,40 +8675,38 @@ msgstr "1024" msgid "Hex-encoded Interface Identifier" msgstr "" -#: ../src/nm-iface-helper.c:319 +#: ../src/nm-iface-helper.c:317 msgid "" "nm-iface-helper is a small, standalone process that manages a single network " "interface." msgstr "" -#: ../src/nm-iface-helper.c:328 +#: ../src/nm-iface-helper.c:364 #, c-format msgid "An interface name and UUID are required\n" msgstr "" -#: ../src/nm-iface-helper.c:393 +#: ../src/nm-iface-helper.c:370 #, fuzzy, c-format -#| msgid "Failed to find expected PKCS#8 end tag '%s'." -msgid "Failed to find interface index for %s\n" +msgid "Failed to find interface index for %s (%s)\n" msgstr "Не удалось найти закрывающий тег PKCS#8 — «%s»." -#: ../src/nm-iface-helper.c:409 +#: ../src/nm-iface-helper.c:430 #, c-format msgid "(%s): Invalid IID %s\n" msgstr "" -#: ../src/nm-logging.c:140 +#: ../src/nm-logging.c:137 #, c-format msgid "Unknown log level '%s'" msgstr "Неизвестный уровень журналирования «%s»" -#: ../src/nm-logging.c:222 +#: ../src/nm-logging.c:219 #, c-format msgid "Unknown log domain '%s'" msgstr "Неизвестный домен журналирования «%s»" -#: ../src/nm-manager.c:3437 -#| msgid "VPN connecting" +#: ../src/nm-manager.c:3423 msgid "VPN connection" msgstr "VPN-соединение" @@ -8782,26 +8714,71 @@ msgstr "VPN-соединение" msgid "NetworkManager needs to turn off networks" msgstr "NetworkManager должен отключить сети" -#: ../src/settings/plugins/ibft/plugin.c:66 -#, c-format -msgid "ibft: failed to read iscsiadm records: %s" -msgstr "" - -#: ../src/settings/plugins/ibft/plugin.c:74 -#, fuzzy, c-format -#| msgid "Wired connection %d" -msgid "ibft: read connection '%s'" -msgstr "Проводное соединение %d" - -#: ../src/settings/plugins/ibft/plugin.c:80 -#, c-format -msgid "ibft: failed to read iscsiadm record: %s" -msgstr "" - #: ../src/settings/plugins/ifcfg-rh/reader.c:112 msgid "System" msgstr "Система" +#~| msgid "Enable STP (yes/no) [yes]: " +#~ msgid "Enable IGMP snooping %s" +#~ msgstr "Включить IGMP snooping %s" + +#, fuzzy +#~| msgid "Error: 'stp': %s." +#~ msgid "Error: 'multicast-snooping': %s.\n" +#~ msgstr "Ошибка «stp»: %s" + +#, fuzzy +#~| msgid "Error: 'stp': %s." +#~ msgid "Error: 'multicast-snooping': %s." +#~ msgstr "Ошибка «stp»: %s" + +#, fuzzy +#~| msgid "Error: %s argument is missing." +#~ msgid "'--order' argument is missing" +#~ msgstr "Ошибка: отсутствует аргумент %s." + +#~ msgid "Device '%s' has been disconnected.\n" +#~ msgstr "Устройство «%s» отключено.\n" + +#, fuzzy +#~| msgid "'%s' is not a valid duplex value" +#~ msgid "'%s' is not a valid powersave value" +#~ msgstr "Недопустимое дуплексное значение: «%s»" + +#, fuzzy +#~| msgid "'%s' is ambiguous (%s x %s)" +#~ msgid "'%s' is ambiguous (on x off)" +#~ msgstr "Неоднозначное значение «%s» (%s x %s)" + +#~ msgid "'%s' not allowed for %s=%s" +#~ msgstr "«%s» не может использоваться для «%s=%s»" + +#~ msgid "filename" +#~ msgstr "имя файла" + +#~ msgid "/path/to/state.file" +#~ msgstr "/путь/к/state.file" + +#~ msgid "State file %s parsing failed: (%d) %s\n" +#~ msgstr "Сбой при разборе файла состояния %s: (%d) %s\n" + +#~ msgid "/path/to/config.file" +#~ msgstr "/путь/к/config.file" + +#~ msgid "/path/to/config/dir" +#~ msgstr "/путь/к/каталогу" + +#~ msgid "plugin1,plugin2" +#~ msgstr "модуль1,модуль2" + +#~ msgid "Bingo!" +#~ msgstr "Бинго!" + +#, fuzzy +#~| msgid "Wired connection %d" +#~ msgid "ibft: read connection '%s'" +#~ msgstr "Проводное соединение %d" + #~ msgid "invalid prefix '%s'; <1-32> allowed" #~ msgstr "недопустимый префикс «%s» (допускается <1-32>)" @@ -9013,9 +8990,6 @@ msgstr "Система" #~ "\n" #~ "Очищает свойство и присваивает ему исходное значение.\n" -#~ msgid "Error: '%s' setting not present\n" -#~ msgstr "Ошибка. Параметр «%s» не определен.\n" - #~ msgid "" #~ ">>> Command-line editing is not available. Consider installing a line " #~ "editing library to enable the feature. <<<\n" |