diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/apparmor-parser.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/apparmor-parser.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/apparmor-parser.po 2020-01-23 16:52:11.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/apparmor-parser.po 2020-07-08 13:54:13.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 11:40+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:26+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: ../parser_include.c:113 ../parser_include.c:111 msgid "Error: Out of memory.\n" diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/apparmor-utils.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/apparmor-utils.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/apparmor-utils.po 2020-01-23 16:52:08.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/apparmor-utils.po 2020-07-08 13:54:10.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 11:40+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:27+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ru\n" #: ../aa-genprof:56 diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/apport.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/apport.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/apport.po 2020-01-23 16:52:15.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/apport.po 2020-07-08 13:54:17.000000000 +0000 @@ -7,728 +7,554 @@ msgstr "" "Project-Id-Version: apport\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-11-19 19:02+0000\n" +"POT-Creation-Date: 2020-05-21 13:29+0000\n" "PO-Revision-Date: 2018-07-18 11:19+0000\n" "Last-Translator: Aleksey Kabanov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 11:31+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:17+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ru\n" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:144 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:144 -#: ../apport/ui.py:144 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:144 -msgid "This package does not seem to be installed correctly" -msgstr "Возможно, этот пакет установлен неправильно" +#: ../gtk/apport-gtk.desktop.in.h:1 ../kde/apport-kde.desktop.in.h:1 +#: ../kde/apport-kde-mime.desktop.in.h:1 +msgid "Report a problem..." +msgstr "Сообщить о неполадке..." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:149 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:149 -#: ../apport/ui.py:149 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:149 -#, python-format +#: ../gtk/apport-gtk.desktop.in.h:2 ../kde/apport-kde.desktop.in.h:2 +#: ../kde/apport-kde-mime.desktop.in.h:2 +msgid "Report a malfunction to the developers" +msgstr "Сообщить о недоработке разработчикам" + +#: ../debian/tmp/usr/share/apport/kernel_oops.py:29 ../data/kernel_oops.py:29 +msgid "Your system might become unstable now and might need to be restarted." +msgstr "Система может стать нестабильной, возможно потребуется перезагрузка." + +#: ../kde/apport-kde-mimelnk.desktop.in.h:1 +msgid "Apport crash file" +msgstr "Файл отчета Apport" + +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:67 +#: ../data/apportcheckresume.py:67 msgid "" -"This is not an official %s package. Please remove any third party package " -"and try again." +"This occurred during a previous suspend, and prevented the system from " +"resuming properly." msgstr "" -"Этот пакет не является официальным пакетом %s. Пожалуйста, удалите все " -"сторонние пакеты и попробуйте снова." +"Это произошло во время предыдущего ждущего режима, что не даёт системе " +"правильно выйти из него." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:166 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:166 -#: ../apport/ui.py:166 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:166 -#, python-format +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:69 +#: ../data/apportcheckresume.py:69 msgid "" -"You have some obsolete package versions installed. Please upgrade the " -"following packages and check if the problem still occurs:\n" -"\n" -"%s" +"This occurred during a previous hibernation, and prevented the system from " +"resuming properly." msgstr "" -"В вашей системе установлены устаревшие версии некоторых пакетов. Обновите " -"следующие пакеты и проверьте, осталась ли проблема:\n" -"\n" -"%s" +"Это произошло во время предыдущего спящего режима, что не даёт системе " +"правильно выйти из него." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:303 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:303 -#: ../apport/ui.py:303 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:303 -msgid "unknown program" -msgstr "неизвестная программа" +#: ../debian/tmp/usr/share/apport/apportcheckresume.py:74 +#: ../data/apportcheckresume.py:74 +msgid "" +"The resume processing hung very near the end and will have appeared to have " +"completed normally." +msgstr "" +"Процесс создания отчёта завис очень близко к завершению; для нормального " +"завершения он должен был появиться." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:304 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:304 -#: ../apport/ui.py:304 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:304 -#, python-format -msgid "Sorry, the program \"%s\" closed unexpectedly" -msgstr "Извините, программа %s аварийно завершила свою работу" +#: ../debian/tmp/usr/bin/apport-retrace.py:34 ../bin/apport-retrace.py:34 +msgid "Do not put the new traces into the report, but write them to stdout." +msgstr "" +"Не добавлять новые трассировки в отчет, а посылать на стандартный вывод." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:306 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1427 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:306 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1427 -#: ../apport/ui.py:306 ../apport/ui.py:1427 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:306 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1427 -#, python-format -msgid "Problem in %s" -msgstr "Неполадка в %s" +#: ../debian/tmp/usr/bin/apport-retrace.py:36 ../bin/apport-retrace.py:36 +msgid "" +"Start an interactive gdb session with the report's core dump (-o ignored; " +"does not rewrite report)" +msgstr "" +"Запустить интерактивный сеанс gdb с дампом ядра из отчёта (-o игнорируется; " +"отчёт не перезаписывается)" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:307 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:307 -#: ../apport/ui.py:307 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:307 +#: ../debian/tmp/usr/bin/apport-retrace.py:38 ../bin/apport-retrace.py:38 msgid "" -"Your computer does not have enough free memory to automatically analyze the " -"problem and send a report to the developers." +"Write modified report to given file instead of changing the original report" msgstr "" -"В вашем компьютере недостаточно свободной памяти, чтобы автоматически " -"проанализировать неполадку и отправить отчет разработчикам." +"Сохранить измененный отчет в файл вместо изменения оригинального отчета" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:362 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:370 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:513 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:516 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:721 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1233 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1399 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1403 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:362 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:370 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:513 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:516 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:721 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1233 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1399 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1403 -#: ../apport/ui.py:362 ../apport/ui.py:370 ../apport/ui.py:513 -#: ../apport/ui.py:516 ../apport/ui.py:721 ../apport/ui.py:1233 -#: ../apport/ui.py:1399 ../apport/ui.py:1403 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:362 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:370 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:513 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:516 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:721 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1233 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1399 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1403 -msgid "Invalid problem report" -msgstr "Неверный отчёт об ошибке" +#: ../debian/tmp/usr/bin/apport-retrace.py:41 ../bin/apport-retrace.py:41 +msgid "Remove the core dump from the report after stack trace regeneration" +msgstr "Удалить дамп ядра из отчёта после восстановления трассировки стека" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:363 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:363 -#: ../apport/ui.py:363 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:363 -msgid "You are not allowed to access this problem report." -msgstr "У вас нет доступа к отчёту о неполадке." +#: ../debian/tmp/usr/bin/apport-retrace.py:43 ../bin/apport-retrace.py:43 +msgid "Override report's CoreFile" +msgstr "Заменить CoreFile в отчёте" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:366 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:366 -#: ../apport/ui.py:366 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:366 -msgid "Error" -msgstr "Ошибка" +#: ../debian/tmp/usr/bin/apport-retrace.py:45 ../bin/apport-retrace.py:45 +msgid "Override report's ExecutablePath" +msgstr "Заменить ExecutablePath в отчёте" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:367 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:367 -#: ../apport/ui.py:367 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:367 -msgid "There is not enough disk space available to process this report." -msgstr "Недостаточно места на диске для обработки этого отчёта." +#: ../debian/tmp/usr/bin/apport-retrace.py:47 ../bin/apport-retrace.py:47 +msgid "Override report's ProcMaps" +msgstr "Заменить ProcMaps в отчёте" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:461 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:461 -#: ../apport/ui.py:461 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:461 -msgid "No package specified" -msgstr "Не указан пакет" +#: ../debian/tmp/usr/bin/apport-retrace.py:49 ../bin/apport-retrace.py:49 +msgid "Rebuild report's Package information" +msgstr "Заново построить информацию о пакетах в отчёте" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:462 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:462 -#: ../apport/ui.py:462 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:462 +#: ../debian/tmp/usr/bin/apport-retrace.py:51 ../bin/apport-retrace.py:51 msgid "" -"You need to specify a package or a PID. See --help for more information." +"Build a temporary sandbox and download/install the necessary packages and " +"debug symbols in there; without this option it assumes that the necessary " +"packages and debug symbols are already installed in the system. The argument " +"points to the packaging system configuration base directory; if you specify " +"\"system\", it will use the system configuration files, but will then only " +"be able to retrace crashes that happened on the currently running release." msgstr "" -"Необходимо указать пакет или PID. Запустите программу с ключом --help для " -"получения дополнительной информации." - -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:491 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:491 -#: ../apport/ui.py:491 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:491 -msgid "Permission denied" -msgstr "В доступе отказано" +"Создать временную среду, затем загрузить/установить в неё необходимые пакеты " +"и отладочные символы; без этого параметра предполагается, что необходимые " +"пакеты и отладочные символы в системе уже установлены. Аргумент указывает на " +"базовую папку конфигурации системы пакетов; если вы указали \"system\", " +"будут использоваться системные файлы конфигурации, но только в случае " +"обнаружения аварийных ситуаций, произошедших в выпуске системы, работающем в " +"данный момент." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:492 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:492 -#: ../apport/ui.py:492 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:492 +#: ../debian/tmp/usr/bin/apport-retrace.py:53 ../bin/apport-retrace.py:53 msgid "" -"The specified process does not belong to you. Please run this program as the " -"process owner or as root." +"Build another temporary sandbox for installing gdb and its dependencies " +"using the same release as the report rather than whatever version of gdb you " +"have installed." msgstr "" -"Указанный процесс запущен другим пользователем. Запустите эту программу с " -"правами владельца процесса или администратора системы." - -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:405 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:494 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:405 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:494 -#: ../apport/ui.py:405 ../apport/ui.py:494 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:405 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:494 -msgid "Invalid PID" -msgstr "Неверный PID" - -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:495 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:495 -#: ../apport/ui.py:495 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:495 -msgid "The specified process ID does not belong to a program." -msgstr "Указанный PID принадлежит другому процессу." +"Создать ещё одну временную изолированную среду для установки gdb и его " +"зависимостей, используя вместо установленной у вас версии gdb выпуск, " +"совпадающий с отчётом." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:514 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:514 -#: ../apport/ui.py:514 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:514 -#, python-format -msgid "Symptom script %s did not determine an affected package" -msgstr "Симптоматический скрипт %s не может определить затронутый пакет" +#: ../debian/tmp/usr/bin/apport-retrace.py:55 ../bin/apport-retrace.py:55 +msgid "" +"Report download/install progress when installing packages into sandbox" +msgstr "" +"Сообщать о ходе выполнения загрузки/установки пакетов во временную среду" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:517 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:517 -#: ../apport/ui.py:517 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:517 -#, python-format -msgid "Package %s does not exist" -msgstr "Пакет %s не существует" +#: ../debian/tmp/usr/bin/apport-retrace.py:57 ../bin/apport-retrace.py:57 +msgid "Prepend timestamps to log messages, for batch operation" +msgstr "" +"Добавлять временные отметки до сообщений в журнале, для групповых операций" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:546 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:733 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:738 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:546 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:733 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:738 -#: ../apport/ui.py:546 ../apport/ui.py:733 ../apport/ui.py:738 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:546 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:733 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:738 -msgid "Cannot create report" -msgstr "Невозможно создать отчет" +#: ../debian/tmp/usr/bin/apport-retrace.py:59 ../bin/apport-retrace.py:59 +msgid "" +"Create and use third-party repositories from origins specified in reports" +msgstr "" +"Создавать и использовать сторонние репозитории из источников, указанных в " +"отчётах" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:561 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:607 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:623 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:561 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:607 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:623 -#: ../apport/ui.py:561 ../apport/ui.py:607 ../apport/ui.py:623 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:561 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:607 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:623 -msgid "Updating problem report" -msgstr "Обновление отчета о проблеме" +#: ../debian/tmp/usr/bin/apport-retrace.py:61 ../bin/apport-retrace.py:61 +msgid "Cache directory for packages downloaded in the sandbox" +msgstr "Папка для сохранения пакетов, загружаемых во временную среду" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:562 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:562 -#: ../apport/ui.py:562 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:562 +#: ../debian/tmp/usr/bin/apport-retrace.py:63 ../bin/apport-retrace.py:63 msgid "" -"You are not the reporter or subscriber of this problem report, or the report " -"is a duplicate or already closed.\n" -"\n" -"Please create a new report using \"apport-bug\"." +"Directory for unpacked packages. Future runs will assume that any already " +"downloaded package is also extracted to this sandbox." msgstr "" -"Вы не являетесь отправителем или получателем отчета об этой проблеме, " -"возможно отчет уже существует или уже был закрыт." +"Директория для распаковки пакетов. При последующих запусках все уже " +"загруженные пакеты будут распаковываться в это изолированное окружение." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:571 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:571 -#: ../apport/ui.py:571 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:571 +#: ../bin/apport-valgrind.py:66 ../debian/tmp/usr/bin/apport-retrace.py:65 +#: ../debian/tmp/usr/bin/apport-valgrind.py:66 ../bin/apport-retrace.py:65 msgid "" -"You are not the reporter of this problem report. It is much easier to mark a " -"bug as a duplicate of another than to move your comments and attachments to " -"a new bug.\n" -"\n" -"Subsequently, we recommend that you file a new bug report using \"apport-" -"bug\" and make a comment in this bug about the one you file.\n" -"\n" -"Do you really want to proceed?" +"Install an extra package into the sandbox (can be specified multiple times)" msgstr "" -"Вы не являетесь создателем данного отчета. Намного проще, отметить ошибку " -"как уже существующую, чем создавать свои комментарии и вкладывать их в новую " -"ошибку.\n" -"\n" -"Впоследствии, мы рекомендуем вам подать новое сообщение об ошибке " -"использовании \"ошибка apport\", и сделать замечание об этой ошибке в том же " -"файле.\n" -"\n" -"Вы действительно хотите продолжить?" - -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:608 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:624 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:608 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:624 -#: ../apport/ui.py:608 ../apport/ui.py:624 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:608 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:624 -msgid "No additional information collected." -msgstr "Дополнительная информация не была собрана." - -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:675 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:675 -#: ../apport/ui.py:675 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:675 -msgid "What kind of problem do you want to report?" -msgstr "О какой проблеме вы бы хотели сообщить?" +"Установить во временную среду дополнительный пакет (может указываться " +"несколько раз)" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:692 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:692 -#: ../apport/ui.py:692 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:692 -msgid "Unknown symptom" -msgstr "Неизвестный симптом" +#: ../debian/tmp/usr/bin/apport-retrace.py:67 ../bin/apport-retrace.py:67 +msgid "" +"Path to a file with the crash database authentication information. This is " +"used when specifying a crash ID to upload the retraced stack traces (only if " +"neither -g, -o, nor -s are specified)" +msgstr "" +"Путь к файлу с информацией о проверке подлинности базы сбоев. Используется " +"при указании ID сбоя для отправки трассировок стека (только когда -g, -o или " +"-s не указаны)" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:693 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:693 -#: ../apport/ui.py:693 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:693 -#, python-format -msgid "The symptom \"%s\" is not known." -msgstr "Симптом «%s» не известен" +#: ../debian/tmp/usr/bin/apport-retrace.py:69 ../bin/apport-retrace.py:69 +msgid "" +"Display retraced stack traces and ask for confirmation before sending them " +"to the crash database." +msgstr "" +"Отобразить трассировки и запросить подтверждение перед их отправкой в базу " +"данных сбоев." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:724 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:724 -#: ../apport/ui.py:724 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:724 +#: ../debian/tmp/usr/bin/apport-retrace.py:71 ../bin/apport-retrace.py:71 msgid "" -"After closing this message please click on an application window to report a " -"problem about it." +"Path to the duplicate sqlite database (default: no duplicate checking)" msgstr "" -"После закрытия этого сообщения, пожалуйста, щелкните по окну приложения, " -"чтобы сообщить о проблеме." +"Путь к дублирующей базе данных sqlite (по умолчанию: без проверки дубликатов)" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:734 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:739 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:734 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:739 -#: ../apport/ui.py:734 ../apport/ui.py:739 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:734 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:739 -msgid "xprop failed to determine process ID of the window" -msgstr "xprop не удалось определить ID процесса этого окна" +#: ../debian/tmp/usr/bin/apport-retrace.py:73 ../bin/apport-retrace.py:73 +msgid "Do not add StacktraceSource to the report." +msgstr "Не прилагать StacktraceSource к отчёту." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:753 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:753 -#: ../apport/ui.py:753 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:753 -msgid "%prog " -msgstr "%prog <номер отчета>" +#: ../debian/tmp/usr/bin/apport-retrace.py:82 ../bin/apport-retrace.py:82 +msgid "You cannot use -C without -S. Stopping." +msgstr "Нельзя использовать -C без -S. Остановка." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:755 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:755 -#: ../apport/ui.py:755 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:755 -msgid "Specify package name." -msgstr "Задайте имя пакета." +#. translators: don't translate y/n, apport currently only checks for "y" +#: ../debian/tmp/usr/bin/apport-retrace.py:115 ../bin/apport-retrace.py:115 +msgid "OK to send these as attachments? [y/n]" +msgstr "Отправить эти приложения? [y/n]" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:757 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:808 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:757 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:808 -#: ../apport/ui.py:757 ../apport/ui.py:808 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:757 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:808 -msgid "Add an extra tag to the report. Can be specified multiple times." -msgstr "" -"Добавить дополнительный тег в отчет. Может быть указан несколько раз." +#: ../bin/apport-valgrind.py:37 ../debian/tmp/usr/bin/apport-valgrind.py:37 +msgid "See man page for details." +msgstr "Смотрите подробности в man-странице." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:787 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:787 -#: ../apport/ui.py:787 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:787 -msgid "" -"%prog [options] [symptom|pid|package|program path|.apport/.crash file]" -msgstr "" -"%prog [параметры] [признак|pid|пакет|путь до программы|.apport/.crash файл]" +#: ../bin/apport-valgrind.py:43 ../debian/tmp/usr/bin/apport-valgrind.py:43 +msgid "specify the log file name produced by valgrind" +msgstr "укажите имя log-файла для valgrind" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:790 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:790 -#: ../apport/ui.py:790 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:790 +#: ../bin/apport-valgrind.py:46 ../debian/tmp/usr/bin/apport-valgrind.py:46 msgid "" -"Start in bug filing mode. Requires --package and an optional --pid, or just " -"a --pid. If neither is given, display a list of known symptoms. (Implied if " -"a single argument is given.)" +"reuse a previously created sandbox dir (SDIR) or, if it does not exist, " +"create it" msgstr "" -"Запуск в режиме отправки отчёта об ошибке. Требует параметр --package и " -"необязательный --pid, или только --pid. Если параметры не переданы, " -"отображает список известных симптомов. (Применяется, когда передан " -"единственный аргумент.)" - -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:792 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:792 -#: ../apport/ui.py:792 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:792 -msgid "Click a window as a target for filing a problem report." -msgstr "Щелкните по целевому окну для заполнения отчёта о проблеме." +"использовать ранее созданный каталог песочницы (SDIR) или создать его если " +"он не существует" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:794 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:794 -#: ../apport/ui.py:794 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:794 -msgid "Start in bug updating mode. Can take an optional --package." +#: ../bin/apport-valgrind.py:50 ../debian/tmp/usr/bin/apport-valgrind.py:50 +msgid "" +"do not create or reuse a sandbox directory for additional debug symbols " +"but rely only on installed debug symbols." msgstr "" -"Запустить в режиме обновления ошибки. Может принимать дополнительный ключ --" -"package." +"не создавать и не использовать каталог песочницы для дополнительных символов " +"отладки, а полагаться лишь на установленные символы отладки." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:796 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:796 -#: ../apport/ui.py:796 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:796 +#: ../bin/apport-valgrind.py:54 ../debian/tmp/usr/bin/apport-valgrind.py:54 msgid "" -"File a bug report about a symptom. (Implied if symptom name is given as only " -"argument.)" +"reuse a previously created cache dir (CDIR) or, if it does not exist, create " +"it" msgstr "" -"Отправить отчёт об ошибке с симптомом. (Применяется, когда название симптома " -"передано в качестве единственного параметра.)" +"использовать ранее созданный каталог кэша (CDIR) или создать его если он не " +"существует" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:798 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:798 -#: ../apport/ui.py:798 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:798 +#: ../bin/apport-valgrind.py:58 ../debian/tmp/usr/bin/apport-valgrind.py:58 msgid "" -"Specify package name in --file-bug mode. This is optional if a --pid is " -"specified. (Implied if package name is given as only argument.)" +"report download/install progress when installing packages into sandbox" msgstr "" -"Указать имя пакета в режиме --file-bug. Необязательно, если указан --pid. " -"(Применяется, когда имя пакета передано в качестве единственного параметра.)" +"показывать прогресс загрузки/установки во время установки пакетов в песочницу" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:800 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:800 -#: ../apport/ui.py:800 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:800 +#: ../bin/apport-valgrind.py:62 ../debian/tmp/usr/bin/apport-valgrind.py:62 msgid "" -"Specify a running program in --file-bug mode. If this is specified, the bug " -"report will contain more information. (Implied if pid is given as only " -"argument.)" +"the executable that is run under valgrind's memcheck tool for memory leak " +"detection" msgstr "" -"Указывает запущенную программу при работе в режиме --file-bug. При этом " -"отчет будет содержать больше информации. (Подразумевается, что pid — " -"единственный указанный аргумент.)" +"исполняемый файл, который запускается под контролем valgrind memcheck для " +"определения утечек памяти" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:802 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:802 -#: ../apport/ui.py:802 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:802 -msgid "The provided pid is a hanging application." -msgstr "Указанный идентификатор принадлежит процессу, который не отвечает." +#: ../bin/apport-valgrind.py:97 ../debian/tmp/usr/bin/apport-valgrind.py:97 +#, python-format +msgid "Error: %s is not an executable. Stopping." +msgstr "Ошибка: %s — не исполняемый файл. Остановка." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:804 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:804 -#: ../apport/ui.py:804 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:804 +#: ../debian/tmp/usr/bin/apport-unpack.py:22 ../bin/apport-unpack.py:22 #, python-format -msgid "" -"Report the crash from given .apport or .crash file instead of the pending " -"ones in %s. (Implied if file is given as only argument.)" -msgstr "" -"Отправить данные о сбое из заданного файла .apport или .crash вместо " -"ожидаемых в %s. (Применяется, когда файл передан в качестве единственного " -"параметра.)" +msgid "Usage: %s " +msgstr "Использование: %s <отчет> <папка назначения>" + +#: ../debian/tmp/usr/bin/apport-unpack.py:42 ../bin/apport-unpack.py:42 +msgid "Destination directory exists and is not empty." +msgstr "Папка назначения существует и не пуста." + +#: ../debian/tmp/usr/bin/apport-cli.py:80 ../bin/apport-cli.py:80 +msgid "Press any key to continue..." +msgstr "Чтобы продолжить, нажмите любую клавишу..." + +#: ../debian/tmp/usr/bin/apport-cli.py:87 ../bin/apport-cli.py:87 +msgid "What would you like to do? Your options are:" +msgstr "Что вы хотите сделать? Возможные варианты:" + +#: ../debian/tmp/usr/bin/apport-cli.py:100 ../bin/apport-cli.py:100 +#, python-format +msgid "Please choose (%s):" +msgstr "Пожалуйста, выберите (%s):" + +#: ../debian/tmp/usr/bin/apport-cli.py:164 ../bin/apport-cli.py:164 +#, python-format +msgid "(%i bytes)" +msgstr "(%i байт)" + +#: ../debian/tmp/usr/share/apport/apport-kde.py:363 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:146 +#: ../debian/tmp/usr/bin/apport-cli.py:166 ../kde/apport-kde.py:363 +#: ../gtk/apport-gtk.py:146 ../bin/apport-cli.py:166 +msgid "(binary data)" +msgstr "(двоичные данные)" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:806 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:806 -#: ../apport/ui.py:806 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:806 +#: ../debian/tmp/usr/share/apport/apport-kde.py:186 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:181 +#: ../debian/tmp/usr/bin/apport-cli.py:194 ../kde/apport-kde.py:186 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../gtk/apport-gtk.ui.h:6 +#: ../gtk/apport-gtk.py:181 ../bin/apport-cli.py:194 +msgid "Send problem report to the developers?" +msgstr "Отправить отчёт об ошибке разработчикам?" + +#: ../debian/tmp/usr/bin/apport-cli.py:195 ../bin/apport-cli.py:195 msgid "" -"In bug filing mode, save the collected information into a file instead of " -"reporting it. This file can then be reported later on from a different " -"machine." +"After the problem report has been sent, please fill out the form in the\n" +"automatically opened web browser." msgstr "" -"При работе в режиме отправки отчета, сохраняет информацию в файле вместо ее " -"отправки. Этот файл можно будет отправить позднее или с другого компьютера." +"После того, как отчёт будет отправлен, заполните форму\n" +"в автоматически открывшемся окне браузера." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:810 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:810 -#: ../apport/ui.py:810 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:810 -msgid "Print the Apport version number." -msgstr "Напечатать номер версии Apport." +#: ../debian/tmp/usr/bin/apport-cli.py:198 ../bin/apport-cli.py:198 +#, python-format +msgid "&Send report (%s)" +msgstr "&Отправить отчёт (%s)" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:961 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:961 -#: ../apport/ui.py:961 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:961 -msgid "" -"This will launch apport-retrace in a terminal window to examine the crash." +#: ../debian/tmp/usr/bin/apport-cli.py:202 ../bin/apport-cli.py:202 +msgid "&Examine locally" +msgstr "&Локальная проверка" + +#: ../debian/tmp/usr/bin/apport-cli.py:206 ../bin/apport-cli.py:206 +msgid "&View report" +msgstr "&Просмотреть отчёт" + +#: ../debian/tmp/usr/bin/apport-cli.py:207 ../bin/apport-cli.py:207 +msgid "&Keep report file for sending later or copying to somewhere else" msgstr "" -"Будет произведён запуск «apport-retrace» в окне терминала для выполнения " -"проверки аварийного завершения работы." +"&Сохранить файл отчёта для последующей отправки или копирования куда-либо" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:962 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:962 -#: ../apport/ui.py:962 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:962 -msgid "Run gdb session" -msgstr "Запустить сеанс gdb" +#: ../debian/tmp/usr/bin/apport-cli.py:208 ../bin/apport-cli.py:208 +msgid "Cancel and &ignore future crashes of this program version" +msgstr "Отменить и &игнорировать будущие сбои в этой версии программы" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:963 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:963 -#: ../apport/ui.py:963 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:963 -msgid "Run gdb session without downloading debug symbols" -msgstr "Запустить сеанс gdb, не выполняя загрузку отладочных символов" +#: ../debian/tmp/usr/bin/apport-cli.py:210 +#: ../debian/tmp/usr/bin/apport-cli.py:287 +#: ../debian/tmp/usr/bin/apport-cli.py:319 +#: ../debian/tmp/usr/bin/apport-cli.py:340 ../bin/apport-cli.py:210 +#: ../bin/apport-cli.py:287 ../bin/apport-cli.py:319 ../bin/apport-cli.py:340 +msgid "&Cancel" +msgstr "О&тменить" -#. TRANSLATORS: %s contains the crash report file name -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:965 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:965 -#: ../apport/ui.py:965 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:965 +#: ../debian/tmp/usr/bin/apport-cli.py:238 ../bin/apport-cli.py:238 +msgid "Problem report file:" +msgstr "Файл отчёта о проблеме:" + +#: ../debian/tmp/usr/bin/apport-cli.py:244 +#: ../debian/tmp/usr/bin/apport-cli.py:249 ../bin/apport-cli.py:244 +#: ../bin/apport-cli.py:249 +msgid "&Confirm" +msgstr "&Подтвердить" + +#: ../debian/tmp/usr/bin/apport-cli.py:248 ../bin/apport-cli.py:248 #, python-format -msgid "Update %s with fully symbolic stack trace" -msgstr "Обновить %s с полным отслеживанием символического стека" +msgid "Error: %s" +msgstr "Ошибка: %s" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1001 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1001 -#: ../apport/ui.py:1001 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1001 -msgid "Can't remember send report status settings" -msgstr "Не удаётся запомнить настройки статуса отправки отчёта" +#: ../debian/tmp/usr/share/apport/apport-kde.py:407 +#: ../debian/tmp/usr/bin/apport-cli.py:254 ../kde/apport-kde.py:407 +#: ../bin/apport-cli.py:254 +msgid "Collecting problem information" +msgstr "Сбор информации о проблеме" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1002 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1002 -#: ../apport/ui.py:1002 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1002 +#: ../debian/tmp/usr/bin/apport-cli.py:255 ../bin/apport-cli.py:255 msgid "" -"Saving crash reporting state failed. Can't set auto or never reporting mode." +"The collected information can be sent to the developers to improve the\n" +"application. This might take a few minutes." msgstr "" -"Не удалось сохранить состояние отчета о сбое. Не удается установить режим " -"авто или никогда." +"Собранная информация может быть направлена разработчикам\n" +"для улучшения приложения. Это может занять несколько минут." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1061 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1071 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1061 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1071 -#: ../apport/ui.py:1061 ../apport/ui.py:1071 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1061 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1071 -msgid "" -"This problem report applies to a program which is not installed any more." -msgstr "Этот отчет о проблеме относится к программе, которая не установлена." +#: ../debian/tmp/usr/share/apport/apport-kde.py:435 +#: ../debian/tmp/usr/bin/apport-cli.py:267 ../kde/apport-kde.py:435 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:17 ../gtk/apport-gtk.ui.h:17 +#: ../bin/apport-cli.py:267 +msgid "Uploading problem information" +msgstr "Передача информации о неполадке" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1086 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1086 -#: ../apport/ui.py:1086 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1086 -#, python-format +#: ../debian/tmp/usr/bin/apport-cli.py:268 ../bin/apport-cli.py:268 msgid "" -"The problem happened with the program %s which changed since the crash " -"occurred." +"The collected information is being sent to the bug tracking system.\n" +"This might take a few minutes." msgstr "" -"Неполадка произошла с программой %s, в которую были внесены изменения с " -"момента её аварийного завершения работы." +"Собранная информация направляется в систему отслеживания ошибок.\n" +"Это может занять несколько минут." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1133 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1190 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1405 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1133 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1190 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1405 -#: ../apport/ui.py:1133 ../apport/ui.py:1190 ../apport/ui.py:1405 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1133 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1190 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1405 -msgid "This problem report is damaged and cannot be processed." -msgstr "Этот отчёт о неполадке повреждён и не может быть обработан." +#: ../debian/tmp/usr/bin/apport-cli.py:318 ../bin/apport-cli.py:318 +msgid "&Done" +msgstr "&Готово" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1141 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1141 -#: ../apport/ui.py:1141 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1141 +#: ../debian/tmp/usr/bin/apport-cli.py:324 ../bin/apport-cli.py:324 +msgid "none" +msgstr "пусто" + +#: ../debian/tmp/usr/bin/apport-cli.py:325 ../bin/apport-cli.py:325 #, python-format -msgid "" -"This report is about a snap published by %s. Contact them via %s for help." -msgstr "" -"Этот отчёт о snap-пакете, который опубликован %s. Для получения справки, " -"свяжитесь с ними, используя %s." +msgid "Selected: %s. Multiple choices:" +msgstr "Выбрано: %s. Несколько вариантов:" + +#: ../debian/tmp/usr/bin/apport-cli.py:341 ../bin/apport-cli.py:341 +msgid "Choices:" +msgstr "Выбор:" + +#: ../debian/tmp/usr/bin/apport-cli.py:355 ../bin/apport-cli.py:355 +msgid "Path to file (Enter to cancel):" +msgstr "Путь к файлу (Enter — отмена):" + +#: ../debian/tmp/usr/bin/apport-cli.py:361 ../bin/apport-cli.py:361 +msgid "File does not exist." +msgstr "Файл не существует." + +#: ../debian/tmp/usr/bin/apport-cli.py:363 ../bin/apport-cli.py:363 +msgid "This is a directory." +msgstr "Это — директория." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1144 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1144 -#: ../apport/ui.py:1144 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1144 -#, python-format +#: ../debian/tmp/usr/bin/apport-cli.py:369 ../bin/apport-cli.py:369 +msgid "To continue, you must visit the following URL:" +msgstr "Чтобы продолжить, вы должны пройти по следующему адресу:" + +#: ../debian/tmp/usr/bin/apport-cli.py:371 ../bin/apport-cli.py:371 msgid "" -"This report is about a snap published by %s. No contact address has been " -"provided; visit the forum at https://forum.snapcraft.io/ for help." +"You can launch a browser now, or copy this URL into a browser on another " +"computer." msgstr "" -"Этот отчёт о snap-пакете, который опубликован %s. Адрес для связи не был " -"предоставлен. Для получения справки, посетите форум по адресу " -"https://forum.snapcraft.io/." +"Теперь вы можете открыть браузер или скопировать URL в браузер на другой " +"компьютер." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1148 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1148 -#: ../apport/ui.py:1148 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1148 -msgid "This report is about a package that is not installed." -msgstr "Это отчёт о пакете, который не установлен." +#: ../debian/tmp/usr/bin/apport-cli.py:373 ../bin/apport-cli.py:373 +msgid "Launch a browser now" +msgstr "Запустить браузер" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1152 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1152 -#: ../apport/ui.py:1152 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1152 -msgid "An error occurred while attempting to process this problem report:" -msgstr "Произошла ошибка при попытке обработать это сообщение о неполадке:" +#: ../debian/tmp/usr/bin/apport-cli.py:388 ../bin/apport-cli.py:388 +msgid "No pending crash reports. Try --help for more information." +msgstr "Нет ожидающих сообщений о сбоях. Попробуйте ключ --help." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1159 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1159 -#: ../apport/ui.py:1159 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1159 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:161 ../gtk/apport-gtk.py:161 #, python-format -msgid "" -"You are about to report a bug against the deb package, but you also a have " -"snap published by %s installed. You can contact them via %s for help. Do you " -"want to continue with the bug report against the deb?" -msgstr "" -"Вы собираетесь сообщить об ошибке deb-пакета, но у вас также установлен snap-" -"пакет, опубликованный %s. Можете обратиться к ним за помощью: %s. Продолжить " -"отправку отчёта об ошибке deb-пакета?" +msgid "Sorry, the application %s has stopped unexpectedly." +msgstr "Извините, приложение %s внезапно завершилось." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1161 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1161 -#: ../apport/ui.py:1161 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1161 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:164 ../gtk/apport-gtk.py:164 #, python-format -msgid "" -"You are about to report a bug against the deb package, but you also a have " -"snap published by %s installed. For the snap, no contact address has been " -"provided; visit the forum at https://forum.snapcraft.io/ for help. Do you " -"want to continue with the bug report against the deb?" -msgstr "" -"Вы собираетесь сообщить об ошибке deb-пакета, но у вас также установлен snap-" -"пакет, опубликованный %s. Для snap-пакета контактный адрес не указан. " -"Обратитесь за помощью на форум https://forum.snapcraft.io/. Продолжить " -"отправку отчёта об ошибке deb-пакета?" +msgid "Sorry, %s has closed unexpectedly." +msgstr "Извините, %s было непредвиденно закрыто." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1234 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1234 -#: ../apport/ui.py:1234 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1234 -msgid "Could not determine the package or source package name." -msgstr "Не удалось определить имя пакета или имя пакета с исходным кодом." +#: ../debian/tmp/usr/share/apport/apport-kde.py:200 +#: ../debian/tmp/usr/share/apport/apport-kde.py:238 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:169 ../kde/apport-kde.py:200 +#: ../kde/apport-kde.py:238 ../gtk/apport-gtk.py:169 +#, python-format +msgid "Sorry, %s has experienced an internal error." +msgstr "Извините, возникла внутренняя ошибка %s." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1252 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1252 -#: ../apport/ui.py:1252 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1252 -msgid "Unable to start web browser" -msgstr "Не удалось запустить веб-браузер" +#: ../debian/tmp/usr/share/apport/apport-kde.py:194 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:188 ../kde/apport-kde.py:194 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 ../gtk/apport-gtk.ui.h:14 +#: ../gtk/apport-gtk.py:188 +msgid "Send" +msgstr "Отправить" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1253 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1253 -#: ../apport/ui.py:1253 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1253 +#: ../debian/tmp/usr/share/apport/apport-kde.py:292 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:204 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:575 ../kde/apport-kde.py:292 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 ../gtk/apport-gtk.ui.h:11 +#: ../gtk/apport-gtk.py:204 ../gtk/apport-gtk.py:575 +msgid "Show Details" +msgstr "Показать подробности" + +#: ../debian/tmp/usr/share/apport/apport-kde.py:231 +#: ../debian/tmp/usr/share/apport/apport-kde.py:244 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:216 ../kde/apport-kde.py:231 +#: ../kde/apport-kde.py:244 ../gtk/apport-gtk.py:216 +msgid "Continue" +msgstr "Продолжить" + +#: ../debian/tmp/usr/share/apport/apport-gtk.py:239 ../gtk/apport-gtk.py:239 #, python-format -msgid "Unable to start web browser to open %s." -msgstr "Не удалось запустить веб-браузер, чтобы открыть %s." +msgid "The application %s has stopped responding." +msgstr "Приложение «%s» перестало отвечать." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1353 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1353 -#: ../apport/ui.py:1353 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1353 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:243 ../gtk/apport-gtk.py:243 #, python-format -msgid "Please enter your account information for the %s bug tracking system" -msgstr "" -"Пожалуйста, введите данные вашей учетной записи в системе учёта ошибок %s" +msgid "The program \"%s\" has stopped responding." +msgstr "Программа «%s» перестала отвечать." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1365 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1365 -#: ../apport/ui.py:1365 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1365 -msgid "Network problem" -msgstr "Неполадка с сетью" +#: ../debian/tmp/usr/share/apport/apport-kde.py:208 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:259 ../kde/apport-kde.py:208 +#: ../gtk/apport-gtk.py:259 +#, python-format +msgid "Package: %s" +msgstr "Пакет: %s" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1367 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1367 -#: ../apport/ui.py:1367 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1367 -msgid "" -"Cannot connect to crash database, please check your Internet connection." +#: ../debian/tmp/usr/share/apport/apport-kde.py:214 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:265 ../kde/apport-kde.py:214 +#: ../gtk/apport-gtk.py:265 +msgid "Sorry, a problem occurred while installing software." msgstr "" -"Не удается подключиться к базе данных по сбоям, пожалуйста, проверьте " -"подключение к Интернету." - -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1394 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1394 -#: ../apport/ui.py:1394 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1394 -msgid "Memory exhaustion" -msgstr "Недостаток памяти" +"Извините, обнаружена неполадка во время установки программного обеспечения." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1395 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1395 -#: ../apport/ui.py:1395 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1395 -msgid "Your system does not have enough memory to process this crash report." -msgstr "В системе недостаточно памяти для обработки этого отчёта об ошибке." +#: ../debian/tmp/usr/share/apport/apport-kde.py:220 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:274 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:289 ../kde/apport-kde.py:220 +#: ../gtk/apport-gtk.py:274 ../gtk/apport-gtk.py:289 +#, python-format +msgid "The application %s has experienced an internal error." +msgstr "В приложении %s произошла внутренняя ошибка." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1430 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1430 -#: ../apport/ui.py:1430 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1430 +#: ../debian/tmp/usr/share/apport/apport-kde.py:223 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:277 ../kde/apport-kde.py:223 +#: ../gtk/apport-gtk.py:277 #, python-format -msgid "" -"The problem cannot be reported:\n" -"\n" -"%s" +msgid "The application %s has closed unexpectedly." +msgstr "Приложение %s внезапно закрылось." + +#: ../debian/tmp/usr/share/apport/apport-kde.py:241 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:297 ../kde/apport-kde.py:241 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 ../gtk/apport-gtk.ui.h:7 +#: ../gtk/apport-gtk.py:297 +msgid "If you notice further problems, try restarting the computer." msgstr "" -"Не удаётся сообщить о неполадке:\n" -"\n" -"%s" +"При возникновении этой неполадки в дальнейшем попробуйте перезапустить " +"компьютер." -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1486 -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1493 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1486 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1493 -#: ../apport/ui.py:1486 ../apport/ui.py:1493 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1486 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1493 -msgid "Problem already known" -msgstr "О неполадке уже известно" +#: ../debian/tmp/usr/share/apport/apport-kde.py:245 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:299 ../kde/apport-kde.py:245 +#: ../gtk/apport-gtk.py:299 +msgid "Ignore future problems of this type" +msgstr "Игнорировать этот тип неполадок в дальнейшем" + +#: ../debian/tmp/usr/share/apport/apport-kde.py:289 +#: ../debian/tmp/usr/share/apport/apport-gtk.py:579 ../kde/apport-kde.py:289 +#: ../gtk/apport-gtk.py:579 +msgid "Hide Details" +msgstr "Скрыть подробности" + +#: ../apport/com.ubuntu.apport.policy.in.h:1 +msgid "Collect system information" +msgstr "Собрать сведения о системе" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1487 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1487 -#: ../apport/ui.py:1487 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1487 +#: ../apport/com.ubuntu.apport.policy.in.h:2 msgid "" -"This problem was already reported in the bug report displayed in the web " -"browser. Please check if you can add any further information that might be " -"helpful for the developers." +"Authentication is required to collect system information for this problem " +"report" msgstr "" -"Об этой неполадке уже известно. Существующий отчёт о ней открыт в вашем " -"браузере. Пожалуйста, проверьте, можете ли вы добавить в него иную полезную " -"информацию, которая могла бы помочь разработчикам." +"Чтобы отправить отчёт о неполадке и собрать сведения о системе, необходимо " +"выполнить аутентификацию" -#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1494 -#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1494 -#: ../apport/ui.py:1494 -#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1494 -msgid "This problem was already reported to developers. Thank you!" +#: ../apport/com.ubuntu.apport.policy.in.h:3 +msgid "System problem reports" +msgstr "Отчёты о системных ошибках" + +#: ../apport/com.ubuntu.apport.policy.in.h:4 +msgid "" +"Please enter your password to access problem reports of system programs" msgstr "" -"Сообщение о неисправности отправлено разработчикам. Спасибо за помощь!" +"Введите свой пароль для доступа к отчётам об ошибках в системных программах" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 ../gtk/apport-gtk.ui.h:1 -#: ../kde/apport-kde.py:469 ../kde/apport-kde.py:504 ../kde/apport-kde.py:524 #: ../debian/tmp/usr/share/apport/apport-kde.py:469 #: ../debian/tmp/usr/share/apport/apport-kde.py:504 -#: ../debian/tmp/usr/share/apport/apport-kde.py:524 +#: ../debian/tmp/usr/share/apport/apport-kde.py:524 ../kde/apport-kde.py:469 +#: ../kde/apport-kde.py:504 ../kde/apport-kde.py:524 +#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 ../gtk/apport-gtk.ui.h:1 msgid "Apport" msgstr "Apport" @@ -748,22 +574,6 @@ msgid "Sorry, an internal error happened." msgstr "Извините, возникла внутренняя ошибка." -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../gtk/apport-gtk.ui.h:6 -#: ../bin/apport-cli.py:194 ../kde/apport-kde.py:186 -#: ../debian/tmp/usr/share/apport/apport-kde.py:186 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:181 -#: ../debian/tmp/usr/bin/apport-cli.py:194 ../gtk/apport-gtk.py:181 -msgid "Send problem report to the developers?" -msgstr "Отправить отчёт об ошибке разработчикам?" - -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 ../gtk/apport-gtk.ui.h:7 -#: ../kde/apport-kde.py:241 ../debian/tmp/usr/share/apport/apport-kde.py:241 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:297 ../gtk/apport-gtk.py:297 -msgid "If you notice further problems, try restarting the computer." -msgstr "" -"При возникновении этой неполадки в дальнейшем попробуйте перезапустить " -"компьютер." - #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8 ../gtk/apport-gtk.ui.h:8 msgid "Remember this in future" msgstr "Запомнить на будущее" @@ -776,14 +586,6 @@ msgid "Relaunch this application" msgstr "Перезапустить это приложение" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 ../gtk/apport-gtk.ui.h:11 -#: ../kde/apport-kde.py:292 ../debian/tmp/usr/share/apport/apport-kde.py:292 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:204 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:575 ../gtk/apport-gtk.py:204 -#: ../gtk/apport-gtk.py:575 -msgid "Show Details" -msgstr "Показать подробности" - #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 ../gtk/apport-gtk.ui.h:12 msgid "_Examine locally" msgstr "_Локальная проверка" @@ -792,12 +594,6 @@ msgid "Don't send" msgstr "Не отправлять" -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 ../gtk/apport-gtk.ui.h:14 -#: ../kde/apport-kde.py:194 ../debian/tmp/usr/share/apport/apport-kde.py:194 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:188 ../gtk/apport-gtk.py:188 -msgid "Send" -msgstr "Отправить" - #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 ../gtk/apport-gtk.ui.h:15 msgid "Collecting problem information" msgstr "Сбор информации о неполадке" @@ -810,19 +606,12 @@ "Производится сбор информации, которая может помочь разработчикам исправить " "эту ошибку." -#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:17 ../gtk/apport-gtk.ui.h:17 -#: ../bin/apport-cli.py:267 ../kde/apport-kde.py:435 -#: ../debian/tmp/usr/share/apport/apport-kde.py:435 -#: ../debian/tmp/usr/bin/apport-cli.py:267 -msgid "Uploading problem information" -msgstr "Передача информации о неполадке" - #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:18 ../gtk/apport-gtk.ui.h:18 msgid "Uploading problem information" msgstr "Передача сведений о неполадке" +#: ../debian/tmp/usr/share/apport/apport-kde.py:436 ../kde/apport-kde.py:436 #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:19 ../gtk/apport-gtk.ui.h:19 -#: ../kde/apport-kde.py:436 ../debian/tmp/usr/share/apport/apport-kde.py:436 msgid "" "The collected information is being sent to the bug tracking system. This " "might take a few minutes." @@ -830,93 +619,29 @@ "Собранные данные пересылаются в систему учёта ошибок. Это может занять " "несколько минут." -#: ../kde/apport-kde.py:200 ../kde/apport-kde.py:238 -#: ../debian/tmp/usr/share/apport/apport-kde.py:200 -#: ../debian/tmp/usr/share/apport/apport-kde.py:238 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:169 ../gtk/apport-gtk.py:169 -#, python-format -msgid "Sorry, %s has experienced an internal error." -msgstr "Извините, возникла внутренняя ошибка %s." - -#: ../kde/apport-kde.py:208 ../debian/tmp/usr/share/apport/apport-kde.py:208 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:259 ../gtk/apport-gtk.py:259 -#, python-format -msgid "Package: %s" -msgstr "Пакет: %s" - -#: ../kde/apport-kde.py:214 ../debian/tmp/usr/share/apport/apport-kde.py:214 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:265 ../gtk/apport-gtk.py:265 -msgid "Sorry, a problem occurred while installing software." -msgstr "" -"Извините, обнаружена неполадка во время установки программного обеспечения." - -#: ../kde/apport-kde.py:220 ../debian/tmp/usr/share/apport/apport-kde.py:220 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:274 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:289 ../gtk/apport-gtk.py:274 -#: ../gtk/apport-gtk.py:289 -#, python-format -msgid "The application %s has experienced an internal error." -msgstr "В приложении %s произошла внутренняя ошибка." - -#: ../kde/apport-kde.py:223 ../debian/tmp/usr/share/apport/apport-kde.py:223 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:277 ../gtk/apport-gtk.py:277 -#, python-format -msgid "The application %s has closed unexpectedly." -msgstr "Приложение %s внезапно закрылось." - -#: ../kde/apport-kde.py:231 ../kde/apport-kde.py:244 -#: ../debian/tmp/usr/share/apport/apport-kde.py:231 -#: ../debian/tmp/usr/share/apport/apport-kde.py:244 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:216 ../gtk/apport-gtk.py:216 -msgid "Continue" -msgstr "Продолжить" - -#: ../kde/apport-kde.py:234 ../debian/tmp/usr/share/apport/apport-kde.py:234 +#: ../debian/tmp/usr/share/apport/apport-kde.py:234 ../kde/apport-kde.py:234 msgid "Leave Closed" msgstr "Оставить закрытым" -#: ../kde/apport-kde.py:235 ../kde/apport-kde.py:381 #: ../debian/tmp/usr/share/apport/apport-kde.py:235 -#: ../debian/tmp/usr/share/apport/apport-kde.py:381 +#: ../debian/tmp/usr/share/apport/apport-kde.py:381 ../kde/apport-kde.py:235 +#: ../kde/apport-kde.py:381 msgid "Relaunch" msgstr "Перезапустить" -#: ../kde/apport-kde.py:245 ../debian/tmp/usr/share/apport/apport-kde.py:245 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:299 ../gtk/apport-gtk.py:299 -msgid "Ignore future problems of this type" -msgstr "Игнорировать этот тип неполадок в дальнейшем" - -#: ../kde/apport-kde.py:289 ../debian/tmp/usr/share/apport/apport-kde.py:289 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:579 ../gtk/apport-gtk.py:579 -msgid "Hide Details" -msgstr "Скрыть подробности" - -#: ../kde/apport-kde.py:315 ../debian/tmp/usr/share/apport/apport-kde.py:315 +#: ../debian/tmp/usr/share/apport/apport-kde.py:315 ../kde/apport-kde.py:315 msgid "Username:" msgstr "Имя пользователя:" -#: ../kde/apport-kde.py:316 ../debian/tmp/usr/share/apport/apport-kde.py:316 +#: ../debian/tmp/usr/share/apport/apport-kde.py:316 ../kde/apport-kde.py:316 msgid "Password:" msgstr "Пароль:" -#: ../bin/apport-cli.py:166 ../kde/apport-kde.py:363 -#: ../debian/tmp/usr/share/apport/apport-kde.py:363 -#: ../debian/tmp/usr/share/apport/apport-gtk.py:146 -#: ../debian/tmp/usr/bin/apport-cli.py:166 ../gtk/apport-gtk.py:146 -msgid "(binary data)" -msgstr "(двоичные данные)" - -#: ../kde/apport-kde.py:406 ../debian/tmp/usr/share/apport/apport-kde.py:406 +#: ../debian/tmp/usr/share/apport/apport-kde.py:406 ../kde/apport-kde.py:406 msgid "Collecting Problem Information" msgstr "Сбор информации о неполадке" -#: ../bin/apport-cli.py:254 ../kde/apport-kde.py:407 -#: ../debian/tmp/usr/share/apport/apport-kde.py:407 -#: ../debian/tmp/usr/bin/apport-cli.py:254 -msgid "Collecting problem information" -msgstr "Сбор информации о проблеме" - -#: ../kde/apport-kde.py:408 ../debian/tmp/usr/share/apport/apport-kde.py:408 +#: ../debian/tmp/usr/share/apport/apport-kde.py:408 ../kde/apport-kde.py:408 msgid "" "The collected information can be sent to the developers to improve the " "application. This might take a few minutes." @@ -924,424 +649,538 @@ "Собранную информацию можно отправить разработчикам чтобы улучшить " "приложение. Это может занять несколько минут." -#: ../kde/apport-kde.py:434 ../debian/tmp/usr/share/apport/apport-kde.py:434 +#: ../debian/tmp/usr/share/apport/apport-kde.py:434 ../kde/apport-kde.py:434 msgid "Uploading Problem Information" msgstr "Передача информации о неполадке" -#: ../debian/tmp/usr/share/apport/kernel_oops.py:29 ../data/kernel_oops.py:29 -msgid "Your system might become unstable now and might need to be restarted." -msgstr "Система может стать нестабильной, возможно потребуется перезагрузка." - -#: ../bin/apport-cli.py:80 ../debian/tmp/usr/bin/apport-cli.py:80 -msgid "Press any key to continue..." -msgstr "Чтобы продолжить, нажмите любую клавишу..." - -#: ../bin/apport-cli.py:87 ../debian/tmp/usr/bin/apport-cli.py:87 -msgid "What would you like to do? Your options are:" -msgstr "Что вы хотите сделать? Возможные варианты:" +#: ../apport/ui.py:139 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:139 +msgid "This package does not seem to be installed correctly" +msgstr "Возможно, этот пакет установлен неправильно" -#: ../bin/apport-cli.py:100 ../debian/tmp/usr/bin/apport-cli.py:100 +#: ../apport/ui.py:144 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:144 #, python-format -msgid "Please choose (%s):" -msgstr "Пожалуйста, выберите (%s):" +msgid "" +"This is not an official %s package. Please remove any third party package " +"and try again." +msgstr "" +"Этот пакет не является официальным пакетом %s. Пожалуйста, удалите все " +"сторонние пакеты и попробуйте снова." -#: ../bin/apport-cli.py:164 ../debian/tmp/usr/bin/apport-cli.py:164 +#: ../apport/ui.py:163 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:163 #, python-format -msgid "(%i bytes)" -msgstr "(%i байт)" - -#: ../bin/apport-cli.py:195 ../debian/tmp/usr/bin/apport-cli.py:195 msgid "" -"After the problem report has been sent, please fill out the form in the\n" -"automatically opened web browser." +"You have some obsolete package versions installed. Please upgrade the " +"following packages and check if the problem still occurs:\n" +"\n" +"%s" msgstr "" -"После того, как отчёт будет отправлен, заполните форму\n" -"в автоматически открывшемся окне браузера." +"В вашей системе установлены устаревшие версии некоторых пакетов. Обновите " +"следующие пакеты и проверьте, осталась ли проблема:\n" +"\n" +"%s" -#: ../bin/apport-cli.py:198 ../debian/tmp/usr/bin/apport-cli.py:198 -#, python-format -msgid "&Send report (%s)" -msgstr "&Отправить отчёт (%s)" +#: ../apport/ui.py:300 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:300 +msgid "unknown program" +msgstr "неизвестная программа" -#: ../bin/apport-cli.py:202 ../debian/tmp/usr/bin/apport-cli.py:202 -msgid "&Examine locally" -msgstr "&Локальная проверка" +#: ../apport/ui.py:301 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:301 +#, python-format +msgid "Sorry, the program \"%s\" closed unexpectedly" +msgstr "Извините, программа %s аварийно завершила свою работу" -#: ../bin/apport-cli.py:206 ../debian/tmp/usr/bin/apport-cli.py:206 -msgid "&View report" -msgstr "&Просмотреть отчёт" +#: ../apport/ui.py:303 ../apport/ui.py:1448 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:303 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1448 +#, python-format +msgid "Problem in %s" +msgstr "Неполадка в %s" -#: ../bin/apport-cli.py:207 ../debian/tmp/usr/bin/apport-cli.py:207 -msgid "&Keep report file for sending later or copying to somewhere else" +#: ../apport/ui.py:304 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:304 +msgid "" +"Your computer does not have enough free memory to automatically analyze the " +"problem and send a report to the developers." msgstr "" -"&Сохранить файл отчёта для последующей отправки или копирования куда-либо" +"В вашем компьютере недостаточно свободной памяти, чтобы автоматически " +"проанализировать неполадку и отправить отчет разработчикам." -#: ../bin/apport-cli.py:208 ../debian/tmp/usr/bin/apport-cli.py:208 -msgid "Cancel and &ignore future crashes of this program version" -msgstr "Отменить и &игнорировать будущие сбои в этой версии программы" +#: ../apport/ui.py:359 ../apport/ui.py:367 ../apport/ui.py:510 +#: ../apport/ui.py:513 ../apport/ui.py:718 ../apport/ui.py:1254 +#: ../apport/ui.py:1420 ../apport/ui.py:1424 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:359 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:367 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:510 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:513 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:718 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1254 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1420 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1424 +msgid "Invalid problem report" +msgstr "Неверный отчёт об ошибке" -#: ../bin/apport-cli.py:210 ../bin/apport-cli.py:287 ../bin/apport-cli.py:319 -#: ../bin/apport-cli.py:340 ../debian/tmp/usr/bin/apport-cli.py:210 -#: ../debian/tmp/usr/bin/apport-cli.py:287 -#: ../debian/tmp/usr/bin/apport-cli.py:319 -#: ../debian/tmp/usr/bin/apport-cli.py:340 -msgid "&Cancel" -msgstr "О&тменить" +#: ../apport/ui.py:360 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:360 +msgid "You are not allowed to access this problem report." +msgstr "У вас нет доступа к отчёту о неполадке." -#: ../bin/apport-cli.py:238 ../debian/tmp/usr/bin/apport-cli.py:238 -msgid "Problem report file:" -msgstr "Файл отчёта о проблеме:" +#: ../apport/ui.py:363 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:363 +msgid "Error" +msgstr "Ошибка" -#: ../bin/apport-cli.py:244 ../bin/apport-cli.py:249 -#: ../debian/tmp/usr/bin/apport-cli.py:244 -#: ../debian/tmp/usr/bin/apport-cli.py:249 -msgid "&Confirm" -msgstr "&Подтвердить" +#: ../apport/ui.py:364 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:364 +msgid "There is not enough disk space available to process this report." +msgstr "Недостаточно места на диске для обработки этого отчёта." -#: ../bin/apport-cli.py:248 ../debian/tmp/usr/bin/apport-cli.py:248 -#, python-format -msgid "Error: %s" -msgstr "Ошибка: %s" +#: ../apport/ui.py:458 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:458 +msgid "No package specified" +msgstr "Не указан пакет" -#: ../bin/apport-cli.py:255 ../debian/tmp/usr/bin/apport-cli.py:255 +#: ../apport/ui.py:459 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:459 msgid "" -"The collected information can be sent to the developers to improve the\n" -"application. This might take a few minutes." +"You need to specify a package or a PID. See --help for more information." msgstr "" -"Собранная информация может быть направлена разработчикам\n" -"для улучшения приложения. Это может занять несколько минут." +"Необходимо указать пакет или PID. Запустите программу с ключом --help для " +"получения дополнительной информации." + +#: ../apport/ui.py:488 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:488 +msgid "Permission denied" +msgstr "В доступе отказано" -#: ../bin/apport-cli.py:268 ../debian/tmp/usr/bin/apport-cli.py:268 +#: ../apport/ui.py:489 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:489 msgid "" -"The collected information is being sent to the bug tracking system.\n" -"This might take a few minutes." +"The specified process does not belong to you. Please run this program as the " +"process owner or as root." msgstr "" -"Собранная информация направляется в систему отслеживания ошибок.\n" -"Это может занять несколько минут." +"Указанный процесс запущен другим пользователем. Запустите эту программу с " +"правами владельца процесса или администратора системы." -#: ../bin/apport-cli.py:318 ../debian/tmp/usr/bin/apport-cli.py:318 -msgid "&Done" -msgstr "&Готово" +#: ../apport/ui.py:402 ../apport/ui.py:491 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:402 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:491 +msgid "Invalid PID" +msgstr "Неверный PID" -#: ../bin/apport-cli.py:324 ../debian/tmp/usr/bin/apport-cli.py:324 -msgid "none" -msgstr "пусто" +#: ../apport/ui.py:492 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:492 +msgid "The specified process ID does not belong to a program." +msgstr "Указанный PID принадлежит другому процессу." -#: ../bin/apport-cli.py:325 ../debian/tmp/usr/bin/apport-cli.py:325 +#: ../apport/ui.py:511 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:511 #, python-format -msgid "Selected: %s. Multiple choices:" -msgstr "Выбрано: %s. Несколько вариантов:" - -#: ../bin/apport-cli.py:341 ../debian/tmp/usr/bin/apport-cli.py:341 -msgid "Choices:" -msgstr "Выбор:" +msgid "Symptom script %s did not determine an affected package" +msgstr "Симптоматический скрипт %s не может определить затронутый пакет" -#: ../bin/apport-cli.py:355 ../debian/tmp/usr/bin/apport-cli.py:355 -msgid "Path to file (Enter to cancel):" -msgstr "Путь к файлу (Enter — отмена):" +#: ../apport/ui.py:514 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:514 +#, python-format +msgid "Package %s does not exist" +msgstr "Пакет %s не существует" -#: ../bin/apport-cli.py:361 ../debian/tmp/usr/bin/apport-cli.py:361 -msgid "File does not exist." -msgstr "Файл не существует." +#: ../apport/ui.py:543 ../apport/ui.py:730 ../apport/ui.py:735 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:543 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:730 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:735 +msgid "Cannot create report" +msgstr "Невозможно создать отчет" -#: ../bin/apport-cli.py:363 ../debian/tmp/usr/bin/apport-cli.py:363 -msgid "This is a directory." -msgstr "Это — директория." +#: ../apport/ui.py:558 ../apport/ui.py:604 ../apport/ui.py:620 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:558 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:604 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:620 +msgid "Updating problem report" +msgstr "Обновление отчета о проблеме" -#: ../bin/apport-cli.py:369 ../debian/tmp/usr/bin/apport-cli.py:369 -msgid "To continue, you must visit the following URL:" -msgstr "Чтобы продолжить, вы должны пройти по следующему адресу:" +#: ../apport/ui.py:559 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:559 +msgid "" +"You are not the reporter or subscriber of this problem report, or the report " +"is a duplicate or already closed.\n" +"\n" +"Please create a new report using \"apport-bug\"." +msgstr "" +"Вы не являетесь отправителем или получателем отчета об этой проблеме, " +"возможно отчет уже существует или уже был закрыт." -#: ../bin/apport-cli.py:371 ../debian/tmp/usr/bin/apport-cli.py:371 +#: ../apport/ui.py:568 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:568 msgid "" -"You can launch a browser now, or copy this URL into a browser on another " -"computer." +"You are not the reporter of this problem report. It is much easier to mark a " +"bug as a duplicate of another than to move your comments and attachments to " +"a new bug.\n" +"\n" +"Subsequently, we recommend that you file a new bug report using \"apport-" +"bug\" and make a comment in this bug about the one you file.\n" +"\n" +"Do you really want to proceed?" msgstr "" -"Теперь вы можете открыть браузер или скопировать URL в браузер на другой " -"компьютер." +"Вы не являетесь создателем данного отчета. Намного проще, отметить ошибку " +"как уже существующую, чем создавать свои комментарии и вкладывать их в новую " +"ошибку.\n" +"\n" +"Впоследствии, мы рекомендуем вам подать новое сообщение об ошибке " +"использовании \"ошибка apport\", и сделать замечание об этой ошибке в том же " +"файле.\n" +"\n" +"Вы действительно хотите продолжить?" -#: ../bin/apport-cli.py:373 ../debian/tmp/usr/bin/apport-cli.py:373 -msgid "Launch a browser now" -msgstr "Запустить браузер" +#: ../apport/ui.py:605 ../apport/ui.py:621 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:605 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:621 +msgid "No additional information collected." +msgstr "Дополнительная информация не была собрана." -#: ../bin/apport-cli.py:388 ../debian/tmp/usr/bin/apport-cli.py:388 -msgid "No pending crash reports. Try --help for more information." -msgstr "Нет ожидающих сообщений о сбоях. Попробуйте ключ --help." +#: ../apport/ui.py:672 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:672 +msgid "What kind of problem do you want to report?" +msgstr "О какой проблеме вы бы хотели сообщить?" -#: ../gtk/apport-gtk.desktop.in.h:1 ../kde/apport-kde.desktop.in.h:1 -#: ../kde/apport-kde-mime.desktop.in.h:1 -msgid "Report a problem..." -msgstr "Сообщить о неполадке..." +#: ../apport/ui.py:689 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:689 +msgid "Unknown symptom" +msgstr "Неизвестный симптом" -#: ../gtk/apport-gtk.desktop.in.h:2 ../kde/apport-kde.desktop.in.h:2 -#: ../kde/apport-kde-mime.desktop.in.h:2 -msgid "Report a malfunction to the developers" -msgstr "Сообщить о недоработке разработчикам" +#: ../apport/ui.py:690 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:690 +#, python-format +msgid "The symptom \"%s\" is not known." +msgstr "Симптом «%s» не известен" -#: ../data/apportcheckresume.py:67 -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:67 +#: ../apport/ui.py:721 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:721 msgid "" -"This occurred during a previous suspend, and prevented the system from " -"resuming properly." +"After closing this message please click on an application window to report a " +"problem about it." msgstr "" -"Это произошло во время предыдущего ждущего режима, что не даёт системе " -"правильно выйти из него." +"После закрытия этого сообщения, пожалуйста, щелкните по окну приложения, " +"чтобы сообщить о проблеме." -#: ../data/apportcheckresume.py:69 -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:69 -msgid "" -"This occurred during a previous hibernation, and prevented the system from " -"resuming properly." +#: ../apport/ui.py:731 ../apport/ui.py:736 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:731 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:736 +msgid "xprop failed to determine process ID of the window" +msgstr "xprop не удалось определить ID процесса этого окна" + +#: ../apport/ui.py:750 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:750 +msgid "%prog " +msgstr "%prog <номер отчета>" + +#: ../apport/ui.py:752 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:752 +msgid "Specify package name." +msgstr "Задайте имя пакета." + +#: ../apport/ui.py:754 ../apport/ui.py:805 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:754 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:805 +msgid "Add an extra tag to the report. Can be specified multiple times." msgstr "" -"Это произошло во время предыдущего спящего режима, что не даёт системе " -"правильно выйти из него." +"Добавить дополнительный тег в отчет. Может быть указан несколько раз." -#: ../data/apportcheckresume.py:74 -#: ../debian/tmp/usr/share/apport/apportcheckresume.py:74 +#: ../apport/ui.py:784 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:784 msgid "" -"The resume processing hung very near the end and will have appeared to have " -"completed normally." +"%prog [options] [symptom|pid|package|program path|.apport/.crash file]" msgstr "" -"Процесс создания отчёта завис очень близко к завершению; для нормального " -"завершения он должен был появиться." - -#: ../debian/tmp/usr/share/apport/apport-gtk.py:161 ../gtk/apport-gtk.py:161 -#, python-format -msgid "Sorry, the application %s has stopped unexpectedly." -msgstr "Извините, приложение %s внезапно завершилось." - -#: ../debian/tmp/usr/share/apport/apport-gtk.py:164 ../gtk/apport-gtk.py:164 -#, python-format -msgid "Sorry, %s has closed unexpectedly." -msgstr "Извините, %s было непредвиденно закрыто." +"%prog [параметры] [признак|pid|пакет|путь до программы|.apport/.crash файл]" -#: ../debian/tmp/usr/share/apport/apport-gtk.py:239 ../gtk/apport-gtk.py:239 -#, python-format -msgid "The application %s has stopped responding." -msgstr "Приложение «%s» перестало отвечать." +#: ../apport/ui.py:787 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:787 +msgid "" +"Start in bug filing mode. Requires --package and an optional --pid, or just " +"a --pid. If neither is given, display a list of known symptoms. (Implied if " +"a single argument is given.)" +msgstr "" +"Запуск в режиме отправки отчёта об ошибке. Требует параметр --package и " +"необязательный --pid, или только --pid. Если параметры не переданы, " +"отображает список известных симптомов. (Применяется, когда передан " +"единственный аргумент.)" -#: ../debian/tmp/usr/share/apport/apport-gtk.py:243 ../gtk/apport-gtk.py:243 -#, python-format -msgid "The program \"%s\" has stopped responding." -msgstr "Программа «%s» перестала отвечать." +#: ../apport/ui.py:789 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:789 +msgid "Click a window as a target for filing a problem report." +msgstr "Щелкните по целевому окну для заполнения отчёта о проблеме." -#: ../apport/com.ubuntu.apport.policy.in.h:1 -msgid "Collect system information" -msgstr "Собрать сведения о системе" +#: ../apport/ui.py:791 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:791 +msgid "Start in bug updating mode. Can take an optional --package." +msgstr "" +"Запустить в режиме обновления ошибки. Может принимать дополнительный ключ --" +"package." -#: ../apport/com.ubuntu.apport.policy.in.h:2 +#: ../apport/ui.py:793 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:793 msgid "" -"Authentication is required to collect system information for this problem " -"report" +"File a bug report about a symptom. (Implied if symptom name is given as only " +"argument.)" msgstr "" -"Чтобы отправить отчёт о неполадке и собрать сведения о системе, необходимо " -"выполнить аутентификацию" +"Отправить отчёт об ошибке с симптомом. (Применяется, когда название симптома " +"передано в качестве единственного параметра.)" -#: ../apport/com.ubuntu.apport.policy.in.h:3 -msgid "System problem reports" -msgstr "Отчёты о системных ошибках" +#: ../apport/ui.py:795 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:795 +msgid "" +"Specify package name in --file-bug mode. This is optional if a --pid is " +"specified. (Implied if package name is given as only argument.)" +msgstr "" +"Указать имя пакета в режиме --file-bug. Необязательно, если указан --pid. " +"(Применяется, когда имя пакета передано в качестве единственного параметра.)" -#: ../apport/com.ubuntu.apport.policy.in.h:4 +#: ../apport/ui.py:797 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:797 msgid "" -"Please enter your password to access problem reports of system programs" +"Specify a running program in --file-bug mode. If this is specified, the bug " +"report will contain more information. (Implied if pid is given as only " +"argument.)" msgstr "" -"Введите свой пароль для доступа к отчётам об ошибках в системных программах" +"Указывает запущенную программу при работе в режиме --file-bug. При этом " +"отчет будет содержать больше информации. (Подразумевается, что pid — " +"единственный указанный аргумент.)" -#: ../bin/apport-retrace.py:34 ../debian/tmp/usr/bin/apport-retrace.py:34 -msgid "Do not put the new traces into the report, but write them to stdout." -msgstr "" -"Не добавлять новые трассировки в отчет, а посылать на стандартный вывод." +#: ../apport/ui.py:799 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:799 +msgid "The provided pid is a hanging application." +msgstr "Указанный идентификатор принадлежит процессу, который не отвечает." -#: ../bin/apport-retrace.py:36 ../debian/tmp/usr/bin/apport-retrace.py:36 +#: ../apport/ui.py:801 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:801 +#, python-format msgid "" -"Start an interactive gdb session with the report's core dump (-o ignored; " -"does not rewrite report)" +"Report the crash from given .apport or .crash file instead of the pending " +"ones in %s. (Implied if file is given as only argument.)" msgstr "" -"Запустить интерактивный сеанс gdb с дампом ядра из отчёта (-o игнорируется; " -"отчёт не перезаписывается)" +"Отправить данные о сбое из заданного файла .apport или .crash вместо " +"ожидаемых в %s. (Применяется, когда файл передан в качестве единственного " +"параметра.)" -#: ../bin/apport-retrace.py:38 ../debian/tmp/usr/bin/apport-retrace.py:38 +#: ../apport/ui.py:803 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:803 msgid "" -"Write modified report to given file instead of changing the original report" +"In bug filing mode, save the collected information into a file instead of " +"reporting it. This file can then be reported later on from a different " +"machine." msgstr "" -"Сохранить измененный отчет в файл вместо изменения оригинального отчета" +"При работе в режиме отправки отчета, сохраняет информацию в файле вместо ее " +"отправки. Этот файл можно будет отправить позднее или с другого компьютера." -#: ../bin/apport-retrace.py:41 ../debian/tmp/usr/bin/apport-retrace.py:41 -msgid "Remove the core dump from the report after stack trace regeneration" -msgstr "Удалить дамп ядра из отчёта после восстановления трассировки стека" +#: ../apport/ui.py:807 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:807 +msgid "Print the Apport version number." +msgstr "Напечатать номер версии Apport." -#: ../bin/apport-retrace.py:43 ../debian/tmp/usr/bin/apport-retrace.py:43 -msgid "Override report's CoreFile" -msgstr "Заменить CoreFile в отчёте" +#: ../apport/ui.py:958 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:958 +msgid "" +"This will launch apport-retrace in a terminal window to examine the crash." +msgstr "" +"Будет произведён запуск «apport-retrace» в окне терминала для выполнения " +"проверки аварийного завершения работы." -#: ../bin/apport-retrace.py:45 ../debian/tmp/usr/bin/apport-retrace.py:45 -msgid "Override report's ExecutablePath" -msgstr "Заменить ExecutablePath в отчёте" +#: ../apport/ui.py:959 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:959 +msgid "Run gdb session" +msgstr "Запустить сеанс gdb" -#: ../bin/apport-retrace.py:47 ../debian/tmp/usr/bin/apport-retrace.py:47 -msgid "Override report's ProcMaps" -msgstr "Заменить ProcMaps в отчёте" +#: ../apport/ui.py:960 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:960 +msgid "Run gdb session without downloading debug symbols" +msgstr "Запустить сеанс gdb, не выполняя загрузку отладочных символов" -#: ../bin/apport-retrace.py:49 ../debian/tmp/usr/bin/apport-retrace.py:49 -msgid "Rebuild report's Package information" -msgstr "Заново построить информацию о пакетах в отчёте" +#. TRANSLATORS: %s contains the crash report file name +#: ../apport/ui.py:962 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:962 +#, python-format +msgid "Update %s with fully symbolic stack trace" +msgstr "Обновить %s с полным отслеживанием символического стека" -#: ../bin/apport-retrace.py:51 ../debian/tmp/usr/bin/apport-retrace.py:51 -msgid "" -"Build a temporary sandbox and download/install the necessary packages and " -"debug symbols in there; without this option it assumes that the necessary " -"packages and debug symbols are already installed in the system. The argument " -"points to the packaging system configuration base directory; if you specify " -"\"system\", it will use the system configuration files, but will then only " -"be able to retrace crashes that happened on the currently running release." -msgstr "" -"Создать временную среду, затем загрузить/установить в неё необходимые пакеты " -"и отладочные символы; без этого параметра предполагается, что необходимые " -"пакеты и отладочные символы в системе уже установлены. Аргумент указывает на " -"базовую папку конфигурации системы пакетов; если вы указали \"system\", " -"будут использоваться системные файлы конфигурации, но только в случае " -"обнаружения аварийных ситуаций, произошедших в выпуске системы, работающем в " -"данный момент." +#: ../apport/ui.py:998 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:998 +msgid "Can't remember send report status settings" +msgstr "Не удаётся запомнить настройки статуса отправки отчёта" -#: ../bin/apport-retrace.py:53 ../debian/tmp/usr/bin/apport-retrace.py:53 +#: ../apport/ui.py:999 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:999 msgid "" -"Build another temporary sandbox for installing gdb and its dependencies " -"using the same release as the report rather than whatever version of gdb you " -"have installed." +"Saving crash reporting state failed. Can't set auto or never reporting mode." msgstr "" -"Создать ещё одну временную изолированную среду для установки gdb и его " -"зависимостей, используя вместо установленной у вас версии gdb выпуск, " -"совпадающий с отчётом." +"Не удалось сохранить состояние отчета о сбое. Не удается установить режим " +"авто или никогда." -#: ../bin/apport-retrace.py:55 ../debian/tmp/usr/bin/apport-retrace.py:55 +#: ../apport/ui.py:1058 ../apport/ui.py:1068 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1058 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1068 msgid "" -"Report download/install progress when installing packages into sandbox" -msgstr "" -"Сообщать о ходе выполнения загрузки/установки пакетов во временную среду" - -#: ../bin/apport-retrace.py:57 ../debian/tmp/usr/bin/apport-retrace.py:57 -msgid "Prepend timestamps to log messages, for batch operation" -msgstr "" -"Добавлять временные отметки до сообщений в журнале, для групповых операций" +"This problem report applies to a program which is not installed any more." +msgstr "Этот отчет о проблеме относится к программе, которая не установлена." -#: ../bin/apport-retrace.py:59 ../debian/tmp/usr/bin/apport-retrace.py:59 +#: ../apport/ui.py:1083 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1083 +#, python-format msgid "" -"Create and use third-party repositories from origins specified in reports" +"The problem happened with the program %s which changed since the crash " +"occurred." msgstr "" -"Создавать и использовать сторонние репозитории из источников, указанных в " -"отчётах" +"Неполадка произошла с программой %s, в которую были внесены изменения с " +"момента её аварийного завершения работы." -#: ../bin/apport-retrace.py:61 ../debian/tmp/usr/bin/apport-retrace.py:61 -msgid "Cache directory for packages downloaded in the sandbox" -msgstr "Папка для сохранения пакетов, загружаемых во временную среду" +#: ../apport/ui.py:1130 ../apport/ui.py:1211 ../apport/ui.py:1426 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1130 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1211 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1426 +msgid "This problem report is damaged and cannot be processed." +msgstr "Этот отчёт о неполадке повреждён и не может быть обработан." -#: ../bin/apport-retrace.py:63 ../debian/tmp/usr/bin/apport-retrace.py:63 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1141 +#: ../apport/ui.py:1141 +#, python-format msgid "" -"Directory for unpacked packages. Future runs will assume that any already " -"downloaded package is also extracted to this sandbox." +"This report is about a snap published by %s. Contact them via %s for help." msgstr "" -"Директория для распаковки пакетов. При последующих запусках все уже " -"загруженные пакеты будут распаковываться в это изолированное окружение." +"Этот отчёт о snap-пакете, который опубликован %s. Для получения справки, " +"свяжитесь с ними, используя %s." -#: ../bin/apport-retrace.py:65 ../bin/apport-valgrind.py:66 -#: ../debian/tmp/usr/bin/apport-retrace.py:65 -#: ../debian/tmp/usr/bin/apport-valgrind.py:66 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1144 +#: ../apport/ui.py:1144 +#, python-format msgid "" -"Install an extra package into the sandbox (can be specified multiple times)" +"This report is about a snap published by %s. No contact address has been " +"provided; visit the forum at https://forum.snapcraft.io/ for help." msgstr "" -"Установить во временную среду дополнительный пакет (может указываться " -"несколько раз)" +"Этот отчёт о snap-пакете, который опубликован %s. Адрес для связи не был " +"предоставлен. Для получения справки, посетите форум по адресу " +"https://forum.snapcraft.io/." -#: ../bin/apport-retrace.py:67 ../debian/tmp/usr/bin/apport-retrace.py:67 -msgid "" -"Path to a file with the crash database authentication information. This is " -"used when specifying a crash ID to upload the retraced stack traces (only if " -"neither -g, -o, nor -s are specified)" -msgstr "" -"Путь к файлу с информацией о проверке подлинности базы сбоев. Используется " -"при указании ID сбоя для отправки трассировок стека (только когда -g, -o или " -"-s не указаны)" +#: ../apport/ui.py:1135 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1135 +msgid "This report is about a package that is not installed." +msgstr "Это отчёт о пакете, который не установлен." + +#: ../apport/ui.py:1139 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1139 +msgid "An error occurred while attempting to process this problem report:" +msgstr "Произошла ошибка при попытке обработать это сообщение о неполадке:" -#: ../bin/apport-retrace.py:69 ../debian/tmp/usr/bin/apport-retrace.py:69 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1159 +#: ../apport/ui.py:1159 +#, python-format msgid "" -"Display retraced stack traces and ask for confirmation before sending them " -"to the crash database." +"You are about to report a bug against the deb package, but you also a have " +"snap published by %s installed. You can contact them via %s for help. Do you " +"want to continue with the bug report against the deb?" msgstr "" -"Отобразить трассировки и запросить подтверждение перед их отправкой в базу " -"данных сбоев." +"Вы собираетесь сообщить об ошибке deb-пакета, но у вас также установлен snap-" +"пакет, опубликованный %s. Можете обратиться к ним за помощью: %s. Продолжить " +"отправку отчёта об ошибке deb-пакета?" -#: ../bin/apport-retrace.py:71 ../debian/tmp/usr/bin/apport-retrace.py:71 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1161 +#: ../apport/ui.py:1161 +#, python-format msgid "" -"Path to the duplicate sqlite database (default: no duplicate checking)" +"You are about to report a bug against the deb package, but you also a have " +"snap published by %s installed. For the snap, no contact address has been " +"provided; visit the forum at https://forum.snapcraft.io/ for help. Do you " +"want to continue with the bug report against the deb?" msgstr "" -"Путь к дублирующей базе данных sqlite (по умолчанию: без проверки дубликатов)" +"Вы собираетесь сообщить об ошибке deb-пакета, но у вас также установлен snap-" +"пакет, опубликованный %s. Для snap-пакета контактный адрес не указан. " +"Обратитесь за помощью на форум https://forum.snapcraft.io/. Продолжить " +"отправку отчёта об ошибке deb-пакета?" -#: ../bin/apport-retrace.py:73 ../debian/tmp/usr/bin/apport-retrace.py:73 -msgid "Do not add StacktraceSource to the report." -msgstr "Не прилагать StacktraceSource к отчёту." +#: ../apport/ui.py:1255 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1255 +msgid "Could not determine the package or source package name." +msgstr "Не удалось определить имя пакета или имя пакета с исходным кодом." -#: ../bin/apport-retrace.py:82 ../debian/tmp/usr/bin/apport-retrace.py:82 -msgid "You cannot use -C without -S. Stopping." -msgstr "Нельзя использовать -C без -S. Остановка." +#: ../apport/ui.py:1273 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1273 +msgid "Unable to start web browser" +msgstr "Не удалось запустить веб-браузер" -#. translators: don't translate y/n, apport currently only checks for "y" -#: ../bin/apport-retrace.py:115 ../debian/tmp/usr/bin/apport-retrace.py:115 -msgid "OK to send these as attachments? [y/n]" -msgstr "Отправить эти приложения? [y/n]" +#: ../apport/ui.py:1274 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1274 +#, python-format +msgid "Unable to start web browser to open %s." +msgstr "Не удалось запустить веб-браузер, чтобы открыть %s." -#: ../bin/apport-valgrind.py:37 ../debian/tmp/usr/bin/apport-valgrind.py:37 -msgid "See man page for details." -msgstr "Смотрите подробности в man-странице." +#: ../apport/ui.py:1374 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1374 +#, python-format +msgid "Please enter your account information for the %s bug tracking system" +msgstr "" +"Пожалуйста, введите данные вашей учетной записи в системе учёта ошибок %s" -#: ../bin/apport-valgrind.py:43 ../debian/tmp/usr/bin/apport-valgrind.py:43 -msgid "specify the log file name produced by valgrind" -msgstr "укажите имя log-файла для valgrind" +#: ../apport/ui.py:1386 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1386 +msgid "Network problem" +msgstr "Неполадка с сетью" -#: ../bin/apport-valgrind.py:46 ../debian/tmp/usr/bin/apport-valgrind.py:46 +#: ../apport/ui.py:1388 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1388 msgid "" -"reuse a previously created sandbox dir (SDIR) or, if it does not exist, " -"create it" +"Cannot connect to crash database, please check your Internet connection." msgstr "" -"использовать ранее созданный каталог песочницы (SDIR) или создать его если " -"он не существует" +"Не удается подключиться к базе данных по сбоям, пожалуйста, проверьте " +"подключение к Интернету." -#: ../bin/apport-valgrind.py:50 ../debian/tmp/usr/bin/apport-valgrind.py:50 -msgid "" -"do not create or reuse a sandbox directory for additional debug symbols " -"but rely only on installed debug symbols." -msgstr "" -"не создавать и не использовать каталог песочницы для дополнительных символов " -"отладки, а полагаться лишь на установленные символы отладки." +#: ../apport/ui.py:1415 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1415 +msgid "Memory exhaustion" +msgstr "Недостаток памяти" -#: ../bin/apport-valgrind.py:54 ../debian/tmp/usr/bin/apport-valgrind.py:54 -msgid "" -"reuse a previously created cache dir (CDIR) or, if it does not exist, create " -"it" -msgstr "" -"использовать ранее созданный каталог кэша (CDIR) или создать его если он не " -"существует" +#: ../apport/ui.py:1416 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1416 +msgid "Your system does not have enough memory to process this crash report." +msgstr "В системе недостаточно памяти для обработки этого отчёта об ошибке." -#: ../bin/apport-valgrind.py:58 ../debian/tmp/usr/bin/apport-valgrind.py:58 +#: ../apport/ui.py:1451 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1451 +#, python-format msgid "" -"report download/install progress when installing packages into sandbox" +"The problem cannot be reported:\n" +"\n" +"%s" msgstr "" -"показывать прогресс загрузки/установки во время установки пакетов в песочницу" +"Не удаётся сообщить о неполадке:\n" +"\n" +"%s" -#: ../bin/apport-valgrind.py:62 ../debian/tmp/usr/bin/apport-valgrind.py:62 +#: ../apport/ui.py:1507 ../apport/ui.py:1514 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1507 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1514 +msgid "Problem already known" +msgstr "О неполадке уже известно" + +#: ../apport/ui.py:1508 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1508 msgid "" -"the executable that is run under valgrind's memcheck tool for memory leak " -"detection" +"This problem was already reported in the bug report displayed in the web " +"browser. Please check if you can add any further information that might be " +"helpful for the developers." msgstr "" -"исполняемый файл, который запускается под контролем valgrind memcheck для " -"определения утечек памяти" +"Об этой неполадке уже известно. Существующий отчёт о ней открыт в вашем " +"браузере. Пожалуйста, проверьте, можете ли вы добавить в него иную полезную " +"информацию, которая могла бы помочь разработчикам." -#: ../bin/apport-valgrind.py:97 ../debian/tmp/usr/bin/apport-valgrind.py:97 -#, python-format -msgid "Error: %s is not an executable. Stopping." -msgstr "Ошибка: %s — не исполняемый файл. Остановка." +#: ../apport/ui.py:1515 +#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1515 +msgid "This problem was already reported to developers. Thank you!" +msgstr "" +"Сообщение о неисправности отправлено разработчикам. Спасибо за помощь!" -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:186 -#: ../data/general-hooks/ubuntu.py:186 +#: ../data/general-hooks/ubuntu.py:195 +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:195 msgid "" "An Ubuntu package has a file conflict with a package that is not a genuine " "Ubuntu package." @@ -1349,13 +1188,13 @@ "Пакет Ubuntu конфликтует с пакетом, который не является подлинным пакетом " "Ubuntu." -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:194 -#: ../data/general-hooks/ubuntu.py:194 +#: ../data/general-hooks/ubuntu.py:203 +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:203 msgid "You have already encountered this package installation failure." msgstr "Ошибка с установкой этого пакета уже происходила." -#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:210 -#: ../data/general-hooks/ubuntu.py:210 +#: ../data/general-hooks/ubuntu.py:219 +#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:219 msgid "" "Your system was initially configured with grub version 2, but you have " "removed it from your system in favor of grub 1 without configuring it. To " @@ -1370,16 +1209,3 @@ "выполните команду:\n" "\n" " sudo apt-get install grub-pc\n" - -#: ../debian/tmp/usr/bin/apport-unpack.py:22 ../bin/apport-unpack.py:22 -#, python-format -msgid "Usage: %s " -msgstr "Использование: %s <отчет> <папка назначения>" - -#: ../debian/tmp/usr/bin/apport-unpack.py:42 ../bin/apport-unpack.py:42 -msgid "Destination directory exists and is not empty." -msgstr "Папка назначения существует и не пуста." - -#: ../kde/apport-kde-mimelnk.desktop.in.h:1 -msgid "Apport crash file" -msgstr "Файл отчета Apport" diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/appstream.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/appstream.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/appstream.po 2020-01-23 16:52:08.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/appstream.po 2020-07-08 13:54:11.000000000 +0000 @@ -16,8 +16,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 12:11+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:50+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ru\n" #: tools/appstream-cli.c:157 @@ -109,8 +109,8 @@ "AppStream is a cross-distribution specification to provide metadata about " "software components." msgstr "" -"AppStream — это кросс-платформенная спецификация предоставления метаданных о " -"программных компонентах." +"AppStream - это кросс-дистрибутивная спецификация для предоставления " +"метаданных о программных компонентах." #: src/as-pool.c:1786 #, c-format diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/apt.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/apt.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/apt.po 2020-01-23 16:52:14.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/apt.po 2020-07-08 13:54:17.000000000 +0000 @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: apt 1.8.0\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2019-09-05 12:01+0000\n" -"PO-Revision-Date: 2019-09-06 01:07+0000\n" +"POT-Creation-Date: 2020-05-13 13:17+0000\n" +"PO-Revision-Date: 2020-05-14 19:23+0000\n" "Last-Translator: Rootlexx \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -23,8 +23,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2020-01-23 10:31+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:30+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ru\n" #. TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update' @@ -222,7 +222,7 @@ msgid "This APT helper has Super Meep Powers." msgstr "В этой программе есть мышиная СУПЕРСИЛА." -#: apt-private/private-cmndline.cc:549 +#: apt-private/private-cmndline.cc:554 msgid "" "--force-yes is deprecated, use one of the options starting with --allow " "instead." @@ -233,7 +233,7 @@ #: apt-private/private-depends.cc:35 apt-private/private-download.cc:251 #: apt-private/private-show.cc:408 apt-private/private-show.cc:410 #: apt-private/private-show.cc:465 cmdline/apt-mark.cc:56 -#: cmdline/apt-mark.cc:102 cmdline/apt-mark.cc:298 +#: cmdline/apt-mark.cc:114 cmdline/apt-mark.cc:310 msgid "No packages found" msgstr "Не найдено ни одного пакета" @@ -412,7 +412,7 @@ msgid "Abort." msgstr "Прервано." -#: apt-private/private-install.cc:303 cmdline/apt-mark.cc:239 +#: apt-private/private-install.cc:303 cmdline/apt-mark.cc:251 msgid "Do you want to continue?" msgstr "Хотите продолжить?" @@ -541,7 +541,7 @@ msgstr "Уже установлен пакет %s самой новой версии (%s).\n" #: apt-private/private-install.cc:1010 cmdline/apt-get.cc:121 -#: cmdline/apt-mark.cc:78 +#: cmdline/apt-mark.cc:94 #, c-format msgid "%s set to manually installed.\n" msgstr "%s отмечен для ручной установки.\n" @@ -556,11 +556,11 @@ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Выбрана версия «%s» (%s) для «%s» из-за «%s»\n" -#: apt-private/private-list.cc:129 +#: apt-private/private-list.cc:130 msgid "Listing" msgstr "Вывод списка" -#: apt-private/private-list.cc:159 +#: apt-private/private-list.cc:160 #, c-format msgid "There is %i additional version. Please use the '-a' switch to see it" msgid_plural "" @@ -974,12 +974,12 @@ msgid "Package %s version %s has an unmet dep:\n" msgstr "Пакет %s версии %s имеет неудовлетворённую зависимость:\n" -#: apt-private/private-update.cc:33 +#: apt-private/private-update.cc:34 msgid "The update command takes no arguments" msgstr "Команде update не нужны аргументы" #. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list -#: apt-private/private-update.cc:116 +#: apt-private/private-update.cc:117 #, c-format msgid "" "Usage of %s should be preferred over embedding login information directly in " @@ -988,7 +988,7 @@ "Использование %s предпочтительнее, чем встраивание данных для входа " "непосредственно в запись %s для «%s»" -#: apt-private/private-update.cc:134 +#: apt-private/private-update.cc:135 #, c-format msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" msgid_plural "" @@ -1002,7 +1002,7 @@ "Может быть обновлено %i пакетов. Запустите «apt list --upgradable» для их " "показа.\n" -#: apt-private/private-update.cc:138 +#: apt-private/private-update.cc:139 msgid "All packages are up to date." msgstr "Все пакеты имеют последние версии." @@ -1206,12 +1206,12 @@ msgid "Couldn't find package %s" msgstr "Не удалось найти пакет %s" -#: cmdline/apt-get.cc:123 cmdline/apt-mark.cc:80 +#: cmdline/apt-get.cc:123 cmdline/apt-mark.cc:96 #, c-format msgid "%s set to automatically installed.\n" msgstr "%s помечен как автоматически установленный.\n" -#: cmdline/apt-get.cc:131 cmdline/apt-mark.cc:123 +#: cmdline/apt-get.cc:131 cmdline/apt-mark.cc:135 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." @@ -1308,24 +1308,24 @@ msgid "Download and display the changelog for the given package" msgstr "скачать и показать журнал изменений заданного пакета" -#: cmdline/apt-helper.cc:43 +#: cmdline/apt-helper.cc:44 msgid "Need one URL as argument" msgstr "В качестве аргумента требуется URL" -#: cmdline/apt-helper.cc:57 +#: cmdline/apt-helper.cc:58 msgid "Must specify at least one pair url/filename" msgstr "Укажите как минимум одну пару url/имя файла" -#: cmdline/apt-helper.cc:100 cmdline/apt-helper.cc:104 +#: cmdline/apt-helper.cc:101 cmdline/apt-helper.cc:105 msgid "Download Failed" msgstr "Ошибка при скачивании" -#: cmdline/apt-helper.cc:125 cmdline/apt-helper.cc:128 +#: cmdline/apt-helper.cc:126 cmdline/apt-helper.cc:129 #, c-format msgid "GetSrvRec failed for %s" msgstr "Ошибка GetSrvRec для %s" -#: cmdline/apt-helper.cc:263 +#: cmdline/apt-helper.cc:293 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] cat-file file ...\n" @@ -1342,86 +1342,86 @@ "которые используют, например, те же настройки прокси и систему\n" "получения, что и APT.\n" -#: cmdline/apt-helper.cc:275 +#: cmdline/apt-helper.cc:305 msgid "download the given uri to the target-path" msgstr "скачать файл по заданному uri в target-path" -#: cmdline/apt-helper.cc:276 +#: cmdline/apt-helper.cc:306 msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)" msgstr "найти запись типа SRV (например, _http._tcp.ftp.debian.org)" -#: cmdline/apt-helper.cc:277 +#: cmdline/apt-helper.cc:307 msgid "concatenate files, with automatic decompression" msgstr "объединить файлы, с автоматическим разжатием" -#: cmdline/apt-helper.cc:278 +#: cmdline/apt-helper.cc:308 msgid "detect proxy using apt.conf" msgstr "определить прокси с помощью apt.conf" -#: cmdline/apt-helper.cc:279 +#: cmdline/apt-helper.cc:309 msgid "wait for system to be online" msgstr "подождать, пока система не будет подключена к сети" -#: cmdline/apt-helper.cc:280 +#: cmdline/apt-helper.cc:310 msgid "drop privileges before running given command" msgstr "сбросить привилегии перед выполнением заданной команды" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:66 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "%s не может быть помечен, так как он не установлен.\n" -#: cmdline/apt-mark.cc:71 +#: cmdline/apt-mark.cc:72 #, c-format msgid "%s was already set to manually installed.\n" msgstr "%s уже помечен как установленный вручную.\n" -#: cmdline/apt-mark.cc:73 +#: cmdline/apt-mark.cc:74 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "%s уже помечен как установленный автоматически.\n" -#: cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:323 #, c-format msgid "%s was already set on hold.\n" msgstr "%s уже помечен как зафиксированный.\n" -#: cmdline/apt-mark.cc:313 +#: cmdline/apt-mark.cc:325 #, c-format msgid "%s was already not hold.\n" msgstr "%s уже помечен как незафиксированный.\n" -#: cmdline/apt-mark.cc:340 +#: cmdline/apt-mark.cc:352 msgid "Executing dpkg failed. Are you root?" msgstr "" "Выполнение dpkg завершилось с ошибкой. У вас есть права суперпользователя?" -#: cmdline/apt-mark.cc:343 +#: cmdline/apt-mark.cc:355 #, c-format msgid "%s set on hold.\n" msgstr "%s помечен как зафиксированный.\n" -#: cmdline/apt-mark.cc:345 +#: cmdline/apt-mark.cc:357 #, c-format msgid "Canceled hold on %s.\n" msgstr "Отмена фиксации для %s.\n" -#: cmdline/apt-mark.cc:347 +#: cmdline/apt-mark.cc:359 #, c-format msgid "Selected %s for purge.\n" msgstr "Выбран %s для вычистки.\n" -#: cmdline/apt-mark.cc:349 +#: cmdline/apt-mark.cc:361 #, c-format msgid "Selected %s for removal.\n" msgstr "Выбран %s для удаления.\n" -#: cmdline/apt-mark.cc:351 +#: cmdline/apt-mark.cc:363 #, c-format msgid "Selected %s for installation.\n" msgstr "Выбран %s для установки.\n" -#: cmdline/apt-mark.cc:403 +#: cmdline/apt-mark.cc:415 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -1437,27 +1437,27 @@ "может использоваться для изменения состояния выбора пакетов dpkg(1)\n" "и показа списка пакетов с определённой меткой или без неё.\n" -#: cmdline/apt-mark.cc:415 +#: cmdline/apt-mark.cc:427 msgid "Mark the given packages as automatically installed" msgstr "пометить указанные пакеты как установленные автоматически" -#: cmdline/apt-mark.cc:416 +#: cmdline/apt-mark.cc:428 msgid "Mark the given packages as manually installed" msgstr "пометить указанные пакеты как установленные вручную" -#: cmdline/apt-mark.cc:418 +#: cmdline/apt-mark.cc:430 msgid "Mark a package as held back" msgstr "пометить пакет как зафиксированный" -#: cmdline/apt-mark.cc:419 +#: cmdline/apt-mark.cc:431 msgid "Unset a package set as held back" msgstr "снять метку пакета, что он зафиксирован" -#: cmdline/apt-mark.cc:424 +#: cmdline/apt-mark.cc:436 msgid "Print the list of automatically installed packages" msgstr "вывести список автоматически установленных пакетов" -#: cmdline/apt-mark.cc:425 +#: cmdline/apt-mark.cc:437 msgid "Print the list of manually installed packages" msgstr "вывести список пакетов, установленных вручную" @@ -1598,8 +1598,8 @@ msgid "Connection failed" msgstr "Соединение разорвано" -#: methods/basehttp.cc:708 methods/ftp.cc:970 methods/http.cc:615 -#: methods/http.cc:874 +#: methods/basehttp.cc:708 methods/ftp.cc:970 methods/http.cc:619 +#: methods/http.cc:878 #, c-format msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?" msgstr "" @@ -1619,12 +1619,12 @@ msgid "Internal error" msgstr "Внутренняя ошибка" -#: methods/cdrom.cc:204 +#: methods/cdrom.cc:203 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Невозможно прочесть базу данных CD-ROM %s" -#: methods/cdrom.cc:213 +#: methods/cdrom.cc:212 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" @@ -1632,21 +1632,21 @@ "Используйте apt-cdrom, чтобы APT смог распознать данный CD-ROM. apt-get " "update не используется для добавления новых CD-ROM" -#: methods/cdrom.cc:223 +#: methods/cdrom.cc:222 msgid "Wrong CD-ROM" msgstr "Неверный CD-ROM" -#: methods/cdrom.cc:250 +#: methods/cdrom.cc:249 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" "Не удалось размонтировать CD-ROM в %s; возможно, он ещё используется." -#: methods/cdrom.cc:255 +#: methods/cdrom.cc:254 msgid "Disk not found." msgstr "Диск не найден." -#: methods/cdrom.cc:263 methods/file.cc:123 methods/rsh.cc:296 +#: methods/cdrom.cc:262 methods/file.cc:123 methods/rsh.cc:296 msgid "File not found" msgstr "Файл не найден" @@ -1673,7 +1673,7 @@ msgid "Connected to %s (%s)" msgstr "Соединено с %s (%s)" -#: methods/connect.cc:167 methods/connect.cc:576 methods/http.cc:317 +#: methods/connect.cc:167 methods/connect.cc:576 methods/http.cc:321 #, c-format msgid "Connecting to %s (%s)" msgstr "Соединение с %s (%s)" @@ -1866,7 +1866,7 @@ msgid "Unable to accept connection" msgstr "Невозможно принять соединение" -#: methods/ftp.cc:918 methods/http.cc:1015 methods/rsh.cc:334 +#: methods/ftp.cc:918 methods/http.cc:1033 methods/rsh.cc:334 msgid "Problem hashing file" msgstr "Проблема при хешировании файла" @@ -1951,31 +1951,31 @@ "Следующие подписи не могут быть проверены, так как недоступен открытый " "ключ:\n" -#: methods/http.cc:711 +#: methods/http.cc:715 msgid "Error writing to the file" msgstr "Ошибка записи в файл" -#: methods/http.cc:728 +#: methods/http.cc:732 msgid "Error reading from server. Remote end closed connection" msgstr "Ошибка чтения: удалённый сервер прервал соединение" -#: methods/http.cc:732 +#: methods/http.cc:736 msgid "Error reading from server" msgstr "Ошибка чтения с сервера" -#: methods/http.cc:769 +#: methods/http.cc:773 msgid "Error writing to file" msgstr "Ошибка записи в файл" -#: methods/http.cc:836 +#: methods/http.cc:840 msgid "Select failed" msgstr "Ошибка в select" -#: methods/http.cc:842 +#: methods/http.cc:846 msgid "Connection timed out" msgstr "Время ожидания для соединения истекло" -#: methods/http.cc:866 +#: methods/http.cc:870 msgid "Error writing to output file" msgstr "Ошибка записи в выходной файл" diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/apt.sh.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/apt.sh.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/apt.sh.po 2020-01-23 16:52:10.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/apt.sh.po 2020-07-08 13:54:13.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2019-09-05 12:01+0000\n" +"POT-Creation-Date: 2020-05-13 13:17+0000\n" "PO-Revision-Date: 2017-08-22 16:53+0000\n" "Last-Translator: Dmitriy Kulikov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 10:31+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:31+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: dselect/install:33 msgid "Bad default setting!" diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/apturl.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/apturl.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/apturl.po 2020-01-23 16:52:14.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/apturl.po 2020-07-08 13:54:16.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 11:45+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:30+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: ../apturl-gtk:49 ../apturl-kde:52 msgid "User requested interrupt." diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/apt-utils.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/apt-utils.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/apt-utils.po 2020-01-23 16:52:14.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/apt-utils.po 2020-07-08 13:54:16.000000000 +0000 @@ -14,15 +14,15 @@ msgstr "" "Project-Id-Version: apt 1.8.0\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2019-09-05 12:01+0000\n" -"PO-Revision-Date: 2019-09-12 16:13+0000\n" +"POT-Creation-Date: 2020-05-13 13:17+0000\n" +"PO-Revision-Date: 2020-05-14 19:24+0000\n" "Last-Translator: Rootlexx \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 10:31+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:31+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ru\n" #: cmdline/apt-dump-solver.cc:37 @@ -115,32 +115,32 @@ "но можно указать параметр -s, и будет выполняться сортировка пакетов\n" "с исходным кодом.\n" -#: ftparchive/apt-ftparchive.cc:199 ftparchive/apt-ftparchive.cc:376 +#: ftparchive/apt-ftparchive.cc:208 ftparchive/apt-ftparchive.cc:375 msgid "Package extension list is too long" msgstr "Список расширений пакетов слишком длинный" -#: ftparchive/apt-ftparchive.cc:201 ftparchive/apt-ftparchive.cc:213 -#: ftparchive/apt-ftparchive.cc:236 ftparchive/apt-ftparchive.cc:290 -#: ftparchive/apt-ftparchive.cc:300 ftparchive/apt-ftparchive.cc:322 +#: ftparchive/apt-ftparchive.cc:210 ftparchive/apt-ftparchive.cc:222 +#: ftparchive/apt-ftparchive.cc:245 ftparchive/apt-ftparchive.cc:294 +#: ftparchive/apt-ftparchive.cc:304 ftparchive/apt-ftparchive.cc:326 #, c-format msgid "Error processing directory %s" msgstr "Ошибка обработки каталога %s" -#: ftparchive/apt-ftparchive.cc:288 +#: ftparchive/apt-ftparchive.cc:292 msgid "Source extension list is too long" msgstr "Список расширений пакетов с исходным кодом слишком длинный" -#: ftparchive/apt-ftparchive.cc:402 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "" "Ошибка записи заголовка в полный перечень содержимого пакетов (Contents)" -#: ftparchive/apt-ftparchive.cc:432 +#: ftparchive/apt-ftparchive.cc:431 #, c-format msgid "Error processing contents %s" msgstr "Ошибка обработки полного перечня содержимого пакетов (Contents) %s" -#: ftparchive/apt-ftparchive.cc:627 +#: ftparchive/apt-ftparchive.cc:621 msgid "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -228,11 +228,11 @@ " -c=? использовать указанный файл настройки\n" " -o=? задать значение произвольному параметру настройки" -#: ftparchive/apt-ftparchive.cc:823 +#: ftparchive/apt-ftparchive.cc:817 msgid "No selections matched" msgstr "Совпадений не обнаружено" -#: ftparchive/apt-ftparchive.cc:903 +#: ftparchive/apt-ftparchive.cc:897 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "В группе пакетов «%s» отсутствуют некоторые файлы" diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/aspell.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/aspell.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/aspell.po 2020-01-23 16:52:11.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/aspell.po 2020-07-08 13:54:13.000000000 +0000 @@ -15,8 +15,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 10:32+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:31+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: common/info.cpp:232 msgid "a number between 0 and 1" diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/bash.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/bash.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/bash.po 2020-01-23 16:52:11.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/bash.po 2020-07-08 13:54:14.000000000 +0000 @@ -17,8 +17,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2020-01-23 10:32+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:31+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ru\n" #: arrayfunc.c:58 diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/bfd.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/bfd.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/bfd.po 2020-01-23 16:52:14.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/bfd.po 2020-07-08 13:54:16.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 10:53+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:47+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ru\n" "X-Bugs: Report translation errors to the Language-Team address.\n" diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/binutils.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/binutils.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/binutils.po 2020-01-23 16:52:07.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/binutils.po 2020-07-08 13:54:09.000000000 +0000 @@ -10,7 +10,7 @@ "Project-Id-Version: binutils 2.23.90\n" "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n" "POT-Creation-Date: 2018-01-13 13:44+0000\n" -"PO-Revision-Date: 2019-06-13 15:43+0000\n" +"PO-Revision-Date: 2020-04-22 13:16+0000\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -18,8 +18,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2020-01-23 10:35+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:33+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ru\n" "X-Bugs: Report translation errors to the Language-Team address.\n" @@ -451,7 +451,7 @@ "Невозможно преобразовать существующую полупустую библиотеку %s в обычный " "формат" -#: ar.c:1033 ar.c:1130 ar.c:1446 objcopy.c:3549 +#: ar.c:1033 ar.c:1130 ar.c:1446 objcopy.c:3551 #, c-format msgid "internal stat error on %s" msgstr "внутренняя ошибка stat на %s" @@ -461,7 +461,7 @@ msgid "%s is not a valid archive" msgstr "%s не является верным архивом" -#: objcopy.c:3511 +#: objcopy.c:3513 #, c-format msgid "illegal pathname found in archive member: %s" msgstr "в элементе архива найден некорректный путь: %s" @@ -1864,7 +1864,7 @@ msgid "Encoded size of 0 is too small to read\n" msgstr "Кодированный размер 0 слишком мал для чтения\n" -#: dwarf.c:387 dwarf.c:401 +#: dwarf.c:369 dwarf.c:383 #, c-format msgid "" "Internal error: %s:%d: LEB value (%s) too large for containing variable\n" @@ -1906,7 +1906,7 @@ "Конец последовательности\n" "\n" -#: dwarf.c:563 +#: dwarf.c:539 #, c-format msgid "Length (%d) of DW_LNE_set_address op is too long\n" msgstr "Длина (%d) операции DW_LNE_set_address слишком велика\n" @@ -2097,15 +2097,15 @@ msgid "(Unknown location op 0x%x)" msgstr "(Неизвестное размещение операции 0x%x)" -#: dwarf.c:1721 +#: dwarf.c:1696 msgid "" msgstr "<переход по ссылке невозможен>" -#: dwarf.c:1724 +#: dwarf.c:1699 msgid "" msgstr "<невозможно загрузить раздельный строковый раздел>" -#: dwarf.c:1732 +#: dwarf.c:1707 #, c-format msgid "DW_FORM_GNU_strp_alt offset too big: %s\n" msgstr "Смещение DW_FORM_GNU_strp_alt слишком большое: %s\n" @@ -2312,12 +2312,12 @@ msgid "(out of class)" msgstr "(вне класса)" -#: dwarf.c:2582 +#: dwarf.c:2538 #, c-format msgid "(label)" msgstr "(метка)" -#: dwarf.c:2583 +#: dwarf.c:2539 #, c-format msgid "(range)" msgstr "(диапазон)" @@ -2577,17 +2577,17 @@ msgid "Line length %s extends beyond end of section\n" msgstr "Длина строки %s выходит за границу раздела\n" -#: dwarf.c:3443 +#: dwarf.c:3418 #, c-format msgid "Corrupt %s format table entry\n" msgstr "Поврежденный элемент %s таблица форматов\n" -#: dwarf.c:3452 +#: dwarf.c:3427 #, c-format msgid "Corrupt %s list\n" msgstr "Пвреждён список %s\n" -#: dwarf.c:3458 +#: dwarf.c:3433 #, c-format msgid "" "\n" @@ -2596,7 +2596,7 @@ "\n" " Таблица %s пуста.\n" -#: dwarf.c:3462 +#: dwarf.c:3437 #, c-format msgid "" "\n" @@ -2640,7 +2640,7 @@ msgid "\t(Unknown format content type %s)" msgstr "\t(неизвестный тип формата содержимого %s)" -#: dwarf.c:3531 +#: dwarf.c:3506 #, c-format msgid "Corrupt %s entries list\n" msgstr "Повреждены элементы списка %s\n" @@ -2728,11 +2728,11 @@ msgstr[1] " Код операции %d содержит %d аргумента\n" msgstr[2] " Код операции %d содержит %d аргументов\n" -#: dwarf.c:3639 +#: dwarf.c:3614 msgid "Directory" msgstr "Каталог" -#: dwarf.c:3641 +#: dwarf.c:3616 msgid "File name" msgstr "Имя файла" @@ -2932,7 +2932,7 @@ msgid "CU: %s/%s:\n" msgstr "CU: %s/%s:\n" -#: dwarf.c:4325 +#: dwarf.c:4300 #, c-format msgid "" "File name Line number Starting address " @@ -2940,7 +2940,7 @@ msgstr "" "Имя файла Номер строки Начальный адрес Вид\n" -#: dwarf.c:4900 +#: dwarf.c:4416 #, c-format msgid "UNKNOWN (%u): length %d\n" msgstr "НЕИЗВЕСТНЫЙ (%u): длина %d\n" @@ -3626,7 +3626,7 @@ msgstr "" "Вероятно, повреждён размер сегмента: %d; вместо него используется 4\n" -#: dwarf.c:7751 +#: dwarf.c:7642 #, c-format msgid "Corrupt augmentation data length: 0x%s\n" msgstr "Повреждена длина дополняющих данных: 0x%s\n" @@ -3954,7 +3954,7 @@ msgid "Section %s is too small to contain a CU/TU header\n" msgstr "Раздел %s слишком мал, чтобы вместить заголовок CU/TU\n" -#: dwarf.c:9224 +#: dwarf.c:9085 #, c-format msgid "Section %s is too small for %d slot\n" msgid_plural "Section %s is too small for %d slots\n" @@ -3962,22 +3962,22 @@ msgstr[1] "Раздел %s слишком мал для %d слотов\n" msgstr[2] "Раздел %s слишком мал для %d слотов\n" -#: dwarf.c:9235 +#: dwarf.c:9096 #, c-format msgid " Version: %d\n" msgstr " Версия: %d\n" -#: dwarf.c:9237 +#: dwarf.c:9098 #, c-format msgid " Number of columns: %d\n" msgstr " Количество столбцов: %d\n" -#: dwarf.c:9238 +#: dwarf.c:9099 #, c-format msgid " Number of used entries: %d\n" msgstr " Кол-во исп. элементов: %d\n" -#: dwarf.c:9239 +#: dwarf.c:9100 #, c-format msgid "" " Number of slots: %d\n" @@ -3986,7 +3986,7 @@ " Количество слотов: %d\n" "\n" -#: dwarf.c:9244 +#: dwarf.c:9105 #, c-format msgid "Section %s too small for %d hash table entries\n" msgstr "Раздел %s слишком мал для %d элементов таблицы хешей\n" @@ -4005,7 +4005,7 @@ msgid "Section %s too small for shndx pool\n" msgstr "Раздел %s слишком мал для пула shndx\n" -#: dwarf.c:9320 +#: dwarf.c:9181 #, c-format msgid "Overlarge number of columns: %x\n" msgstr "Превышение количества столбцов: %x\n" @@ -4156,7 +4156,7 @@ "%s: найден отдельный объектный файл отладки: %s\n" "\n" -#: dwarf.c:10024 +#: dwarf.c:9869 #, c-format msgid "The %s section contains a link to a dwo file:\n" msgstr "Раздел %s содержит ссылку на файл dwo:\n" @@ -5270,7 +5270,7 @@ " -U --disable-deterministic-archives\n" " выключить поведение -D (по умолчанию)\n" -#: objcopy.c:559 +#: objcopy.c:551 #, c-format msgid "" " -j --only-section Only copy section into the output\n" @@ -5607,7 +5607,7 @@ "изменения/доступа\n" " в вывод\n" -#: objcopy.c:708 +#: objcopy.c:686 #, c-format msgid "" " -R --remove-section= Also remove section from the " @@ -5701,7 +5701,7 @@ msgid "cannot open '%s': %s" msgstr "не удаётся открыть «%s»: %s" -#: objcopy.c:1093 objcopy.c:4971 +#: objcopy.c:1093 objcopy.c:4973 #, c-format msgid "%s: fread failed" msgstr "%s: ошибка fread" @@ -5776,45 +5776,45 @@ msgid "copy from `%s' [unknown] to `%s' [unknown]\n" msgstr "копирование из «%s» [неизв.] в «%s» [неизв.]\n" -#: objcopy.c:2178 +#: objcopy.c:2180 msgid "corrupt GNU build attribute note: wrong note type" msgstr "повреждённый атрибут заметки сборки GNU: некорректный тип заметки" -#: objcopy.c:2184 +#: objcopy.c:2186 msgid "corrupt GNU build attribute note: note too big" msgstr "повреждённый атрибут заметки сборки GNU: слишком большая заметка" -#: objcopy.c:2190 +#: objcopy.c:2192 msgid "corrupt GNU build attribute note: name too small" msgstr "повреждённый атрибут заметки сборки GNU: слишком короткое имя" -#: objcopy.c:2213 +#: objcopy.c:2215 msgid "corrupt GNU build attribute note: unsupported version" msgstr "повреждённый атрибут заметки сборки GNU: неподдерживаемая версия" -#: objcopy.c:2262 +#: objcopy.c:2264 msgid "corrupt GNU build attribute note: bad description size" msgstr "" "повреждённый атрибут заметки сборки GNU: некорректный размер описания" -#: objcopy.c:2293 +#: objcopy.c:2295 msgid "corrupt GNU build attribute note: name not NUL terminated" msgstr "повреждённый атрибут заметки сборки GNU: имя не заканчивается NUL" -#: objcopy.c:2305 +#: objcopy.c:2307 msgid "corrupt GNU build attribute notes: excess data at end" msgstr "повреждённый атрибут заметки сборки GNU: излишек данных в конце" -#: objcopy.c:2312 +#: objcopy.c:2314 msgid "bad GNU build attribute notes: no known versions detected" msgstr "" "повреждённый атрибут заметки сборки GNU: не обнаружено известных версий" -#: objcopy.c:2326 +#: objcopy.c:2328 msgid "bad GNU build attribute notes: multiple different versions" msgstr "повреждённый атрибут заметки сборки GNU: несколько разных версий" -#: objcopy.c:2180 +#: objcopy.c:2167 msgid "bad GNU build attribute notes: first note not version note" msgstr "" "повреждённый атрибут заметки сборки GNU: первая заметка не является версией " @@ -5822,204 +5822,204 @@ #. PR 17636: Call non-fatal so that we return to our parent who #. may need to tidy temporary files. -#: objcopy.c:2581 +#: objcopy.c:2583 msgid "Unable to change endianness of input file(s)" msgstr "Не удаётся изменить порядок байт входного файла" -#: objcopy.c:2593 +#: objcopy.c:2595 #, c-format msgid "error: the input file '%s' has no sections" msgstr "ошибка: входной файл «%s» не содержит разделов" -#: objcopy.c:2603 +#: objcopy.c:2605 #, c-format msgid "" "--compress-debug-sections=[zlib|zlib-gnu|zlib-gabi] is unsupported on `%s'" msgstr "" "--compress-debug-sections=[zlib|zlib-gnu|zlib-gabi] не поддерживается на «%s»" -#: objcopy.c:2610 +#: objcopy.c:2612 #, c-format msgid "--elf-stt-common=[yes|no] is unsupported on `%s'" msgstr "--elf-stt-common=[yes|no] не поддерживается на «%s»" -#: objcopy.c:2617 +#: objcopy.c:2619 #, c-format msgid "copy from `%s' [%s] to `%s' [%s]\n" msgstr "копирование из «%s» [%s] в «%s» [%s]\n" -#: objcopy.c:2665 +#: objcopy.c:2667 #, c-format msgid "Input file `%s' ignores binary architecture parameter." msgstr "Для входного файла «%s» игнорируется параметр двоичной архитектуры." -#: objcopy.c:2681 +#: objcopy.c:2683 #, c-format msgid "Unable to recognise the format of the input file `%s'" msgstr "Невозможно определить формат входного файла «%s»" -#: objcopy.c:2684 +#: objcopy.c:2686 #, c-format msgid "Output file cannot represent architecture `%s'" msgstr "Выходной файл не может предоставить архитектуру «%s»" -#: objcopy.c:2747 +#: objcopy.c:2749 #, c-format msgid "warning: file alignment (0x%s) > section alignment (0x%s)" msgstr "" "предупреждение: выравнивание файла (0x%s) > выравнивания раздела (0x%s)" -#: objcopy.c:2813 +#: objcopy.c:2815 #, c-format msgid "can't add section '%s'" msgstr "не удалось добавить раздел «%s»" -#: objcopy.c:2827 +#: objcopy.c:2829 #, c-format msgid "can't create section `%s'" msgstr "не удалось создать раздел «%s»" -#: objcopy.c:2875 +#: objcopy.c:2877 #, c-format msgid "error: %s not found, can't be updated" msgstr "ошибка: %s не найден, невозможно обновить" -#: objcopy.c:2908 +#: objcopy.c:2910 msgid "warning: note section is empty" msgstr "предупреждение: раздел note пуст" -#: objcopy.c:2917 +#: objcopy.c:2919 msgid "warning: could not load note section" msgstr "предупреждение: невозможно загрузить раздел note" -#: objcopy.c:2933 +#: objcopy.c:2935 msgid "warning: failed to set merged notes size" msgstr "предупреждение: не удалось задать объединённый размер заметок" -#: objcopy.c:2956 +#: objcopy.c:2958 #, c-format msgid "can't dump section '%s' - it does not exist" msgstr "невозможно сделать дамп раздела «%s» — он не существует" -#: objcopy.c:2964 +#: objcopy.c:2966 msgid "can't dump section - it has no contents" msgstr "невозможно сделать дамп раздела — в нём нет содержимого" -#: objcopy.c:2972 +#: objcopy.c:2974 msgid "can't dump section - it is empty" msgstr "невозможно сделать дамп раздела «%s» — он пуст" -#: objcopy.c:2981 +#: objcopy.c:2983 msgid "could not open section dump file" msgstr "не удалось открыть файл раздела дампа" -#: objcopy.c:2990 +#: objcopy.c:2992 #, c-format msgid "error writing section contents to %s (error: %s)" msgstr "ошибка записи содержимого раздела в %s (ошибка: %s)" -#: objcopy.c:3000 +#: objcopy.c:3002 msgid "could not retrieve section contents" msgstr "не удалось получить содержимое раздела" -#: objcopy.c:3014 +#: objcopy.c:3016 #, c-format msgid "%s: debuglink section already exists" msgstr "%s: раздел debuglink уже существует" -#: objcopy.c:3026 +#: objcopy.c:3028 #, c-format msgid "cannot create debug link section `%s'" msgstr "не удалось создать отладочный раздел ссылок «%s»" -#: objcopy.c:3118 +#: objcopy.c:3120 msgid "Can't fill gap after section" msgstr "Не удалось заполнить промежуток после раздела" -#: objcopy.c:3141 +#: objcopy.c:3143 msgid "can't add padding" msgstr "не удалось добавить заполнение" -#: objcopy.c:3314 +#: objcopy.c:3316 msgid "error: failed to copy merged notes into output" msgstr "ошибка: не удалось скопировать объединённые заметки в вывод" -#: objcopy.c:3170 +#: objcopy.c:3095 msgid "could not find any mergeable note sections" msgstr "не удалось найти разделы с объединяемыми заметками" -#: objcopy.c:3340 +#: objcopy.c:3342 #, c-format msgid "cannot fill debug link section `%s'" msgstr "не удалось заполнить отладочный раздел ссылок «%s»" -#: objcopy.c:3402 +#: objcopy.c:3404 msgid "error copying private BFD data" msgstr "ошибка копирования частных данных BFD" -#: objcopy.c:3413 +#: objcopy.c:3415 #, c-format msgid "this target does not support %lu alternative machine codes" msgstr "эта цель не поддерживает альтернативные машинные коды %lu" -#: objcopy.c:3417 +#: objcopy.c:3419 msgid "treating that number as an absolute e_machine value instead" msgstr "считается, что число является абсолютным значением e_machine" -#: objcopy.c:3421 +#: objcopy.c:3423 msgid "ignoring the alternative value" msgstr "игнорируется альтернативное значение" -#: objcopy.c:3474 objcopy.c:3529 +#: objcopy.c:3476 objcopy.c:3531 #, c-format msgid "cannot create tempdir for archive copying (error: %s)" msgstr "" "невозможно создать временный каталог для копирования архива (ошибка: %s)" -#: objcopy.c:3562 +#: objcopy.c:3564 msgid "Unable to recognise the format of file" msgstr "Невозможно определить формат файла" -#: objcopy.c:3695 +#: objcopy.c:3697 #, c-format msgid "error: the input file '%s' is empty" msgstr "ошибка: входной файл «%s» пуст" -#: objcopy.c:3871 +#: objcopy.c:3873 #, c-format msgid "Multiple renames of section %s" msgstr "Многократные переименования раздела %s" -#: objcopy.c:3917 +#: objcopy.c:3919 msgid "error in private header data" msgstr "ошибка в заголовке частных данных" -#: objcopy.c:4001 +#: objcopy.c:4003 msgid "failed to create output section" msgstr "не удалось создать выходной раздел" -#: objcopy.c:4016 +#: objcopy.c:4018 msgid "failed to set size" msgstr "не удалось задать размер" -#: objcopy.c:4035 +#: objcopy.c:4037 msgid "failed to set vma" msgstr "не удалось задать vma" -#: objcopy.c:4065 +#: objcopy.c:4067 msgid "failed to set alignment" msgstr "не удалось задать выравнивание" -#: objcopy.c:4097 +#: objcopy.c:4099 msgid "failed to copy private data" msgstr "не удалось скопировать частные данные" -#: objcopy.c:4254 +#: objcopy.c:4256 msgid "relocation count is negative" msgstr "отрицательное значение счётчика перемещений" #. User must pad the section up in order to do this. -#: objcopy.c:4351 +#: objcopy.c:4353 #, c-format msgid "" "cannot reverse bytes: length of section %s must be evenly divisible by %d" @@ -6027,146 +6027,146 @@ "невозможно перевернуть байты: длина раздела %s должна без остатка делиться " "на %d" -#: objcopy.c:4560 +#: objcopy.c:4562 msgid "can't create debugging section" msgstr "невозможно создать отладочный раздел" -#: objcopy.c:4574 +#: objcopy.c:4576 msgid "can't set debugging section contents" msgstr "невозможно задать содержимое отладочного раздела" -#: objcopy.c:4583 +#: objcopy.c:4585 #, c-format msgid "don't know how to write debugging information for %s" msgstr "неизвестно, как записать отладочную информацию для %s" -#: objcopy.c:4768 +#: objcopy.c:4770 msgid "could not create temporary file to hold stripped copy" msgstr "невозможно создать временный файл для хранения урезанной копии" -#: objcopy.c:4840 +#: objcopy.c:4842 #, c-format msgid "%s: bad version in PE subsystem" msgstr "%s: неверная версия в подсистеме PE" -#: objcopy.c:4870 +#: objcopy.c:4872 #, c-format msgid "unknown PE subsystem: %s" msgstr "неизвестная подсистема PE: %s" -#: objcopy.c:4924 objcopy.c:5194 objcopy.c:5274 objcopy.c:5415 objcopy.c:5447 -#: objcopy.c:5510 objcopy.c:5514 objcopy.c:5534 +#: objcopy.c:4926 objcopy.c:5196 objcopy.c:5276 objcopy.c:5417 objcopy.c:5449 +#: objcopy.c:5512 objcopy.c:5516 objcopy.c:5536 #, c-format msgid "bad format for %s" msgstr "плохой формат для %s" -#: objcopy.c:4953 +#: objcopy.c:4955 #, c-format msgid "cannot open: %s: %s" msgstr "невозможно открыть: %s: %s" -#: objcopy.c:5006 +#: objcopy.c:5008 msgid "byte number must be non-negative" msgstr "номер байта должен быть неотрицательным" -#: objcopy.c:5012 +#: objcopy.c:5014 #, c-format msgid "architecture %s unknown" msgstr "архитектура %s неизвестна" -#: objcopy.c:5020 +#: objcopy.c:5022 msgid "interleave must be positive" msgstr "чередование должно быть положительным" -#: objcopy.c:5029 +#: objcopy.c:5031 msgid "interleave width must be positive" msgstr "ширина чередования должна быть положительной" -#: objcopy.c:5347 +#: objcopy.c:5349 #, c-format msgid "unrecognized --compress-debug-sections type `%s'" msgstr "нераспознанный тип --compress-debug-sections «%s»" -#: objcopy.c:5368 +#: objcopy.c:5370 #, c-format msgid "unrecognized --elf-stt-common= option `%s'" msgstr "нераспознанный параметр --elf-stt-common= «%s»" -#: objcopy.c:5384 +#: objcopy.c:5386 #, c-format msgid "Warning: truncating gap-fill from 0x%s to 0x%x" msgstr "Предупреждение: обрезается заполнение промежутка от 0x%s до 0x%x" -#: objcopy.c:5589 +#: objcopy.c:5591 #, c-format msgid "unknown long section names option '%s'" msgstr "неизвестный параметр длинных имён раздела «%s»" # -#: objcopy.c:5612 +#: objcopy.c:5614 msgid "unable to parse alternative machine code" msgstr "невозможно проанализировать альтернативный код машины" # -#: objcopy.c:5661 +#: objcopy.c:5663 msgid "number of bytes to reverse must be positive and even" msgstr "" "количество байтов для переворачивания должно быть положительным и чётным" -#: objcopy.c:5664 +#: objcopy.c:5666 #, c-format msgid "Warning: ignoring previous --reverse-bytes value of %d" msgstr "Предупреждение: игнорируется значение %d предыдущего --reverse-bytes" -#: objcopy.c:5679 +#: objcopy.c:5681 #, c-format msgid "%s: invalid reserve value for --heap" msgstr "%s: неверное обратное значение для --heap" -#: objcopy.c:5685 +#: objcopy.c:5687 #, c-format msgid "%s: invalid commit value for --heap" msgstr "%s: неверное фиксированное значение для --heap" -#: objcopy.c:5710 +#: objcopy.c:5712 #, c-format msgid "%s: invalid reserve value for --stack" msgstr "%s: неверное обратное значение для --stack" -#: objcopy.c:5716 +#: objcopy.c:5718 #, c-format msgid "%s: invalid commit value for --stack" msgstr "%s: неверное фиксированное значение для --stack" -#: objcopy.c:5754 +#: objcopy.c:5756 msgid "interleave start byte must be set with --byte" msgstr "должен быть задан начальный байт чередования с помощью --byte" -#: objcopy.c:5757 +#: objcopy.c:5759 msgid "byte number must be less than interleave" msgstr "номер байта должен быть меньше чередования" -#: objcopy.c:5760 +#: objcopy.c:5762 msgid "interleave width must be less than or equal to interleave - byte`" msgstr "ширина чередования должна быть меньше или равна чередованию - byte`" -#: objcopy.c:5789 +#: objcopy.c:5791 #, c-format msgid "unknown input EFI target: %s" msgstr "неизвестная входная цель EFI: %s" -#: objcopy.c:5820 +#: objcopy.c:5822 #, c-format msgid "unknown output EFI target: %s" msgstr "неизвестная выходная цель EFI: %s" -#: objcopy.c:5833 +#: objcopy.c:5835 #, c-format msgid "warning: could not locate '%s'. System error message: %s" msgstr "" "предупреждение: невозможно найти «%s». Системное сообщение об ошибке: %s" -#: objcopy.c:5845 +#: objcopy.c:5847 #, c-format msgid "" "warning: could not create temporary file whilst copying '%s', (error: %s)" @@ -6174,7 +6174,7 @@ "предупреждение: не удаётся создать временный файл во время копирования «%s», " "(ошибка: %s)" -#: objcopy.c:5878 objcopy.c:5892 +#: objcopy.c:5880 objcopy.c:5894 #, c-format msgid "%s %s%c0x%s never used" msgstr "%s %s%c0x%s никогда не используется" @@ -6366,7 +6366,7 @@ " --prefix=ПРЕФИКС добавить ПРЕФИКС к абсолютному пути для -S\n" " --prefix-strip=УРОВЕНЬ удалить начальные имена каталогов для -S\n" -#: objdump.c:271 +#: objdump.c:264 #, c-format msgid "" " --dwarf-depth=N Do not display DIEs at depth N or greater\n" @@ -7847,12 +7847,12 @@ msgid " Data: %s\n" msgstr " Данные: %s\n" -#: readelf.c:4761 +#: readelf.c:4697 #, c-format msgid " Version: %d %s\n" msgstr " Версия: %d %s\n" -#: readelf.c:4766 +#: readelf.c:4702 #, c-format msgid "" msgstr "<неизвестный: %lx>" @@ -7915,32 +7915,32 @@ msgid " Flags: 0x%lx%s\n" msgstr " Флаги: 0x%lx%s\n" -#: readelf.c:4790 +#: readelf.c:4726 #, c-format msgid " Size of this header: %ld (bytes)\n" msgstr " Размер этого заголовка: %ld (байт)\n" -#: readelf.c:4792 +#: readelf.c:4728 #, c-format msgid " Size of program headers: %ld (bytes)\n" msgstr " Размер заголовков программы: %ld (байт)\n" -#: readelf.c:4794 +#: readelf.c:4730 #, c-format msgid " Number of program headers: %ld" msgstr " Число заголовков программы: %ld" -#: readelf.c:4801 +#: readelf.c:4737 #, c-format msgid " Size of section headers: %ld (bytes)\n" msgstr " Размер заголовков раздела: %ld (байт)\n" -#: readelf.c:4803 +#: readelf.c:4739 #, c-format msgid " Number of section headers: %ld" msgstr " Число заголовков раздела: %ld" -#: readelf.c:4808 +#: readelf.c:4744 #, c-format msgid " Section header string table index: %ld" msgstr " Индекс табл. строк загол. раздела: %ld" @@ -8195,7 +8195,7 @@ msgid "symbols" msgstr "символы" -#: readelf.c:5488 readelf.c:5601 +#: readelf.c:5424 readelf.c:5537 msgid "symbol table section indicies" msgstr "индексы раздела таблицы символов" @@ -8527,7 +8527,7 @@ "раздел [%5u] уже находится в разделе групп [%5u] > максимальный раздел " "[%5u]\n" -#: readelf.c:6846 +#: readelf.c:6782 msgid "" "Further error messages about overlarge group section indicies suppressed\n" msgstr "" @@ -8734,7 +8734,7 @@ msgid " at offset 0x%lx contains %lu entries:\n" msgstr " со смещением 0x%lx содержит %lu пунктов:\n" -#: readelf.c:8030 +#: readelf.c:7966 #, c-format msgid "Skipping unexpected relocation type %s\n" msgstr "Пропускается неожиданный тип перемещения %s\n" @@ -9143,7 +9143,7 @@ "\n" "Раздел определения версии «%s» содержит %u элементов:\n" -#: readelf.c:10449 +#: readelf.c:10277 #, c-format msgid " Addr: 0x" msgstr " Адрес: 0x" @@ -9309,7 +9309,7 @@ "\n" "Раздел символов версии «%s» содержит %lu элементов:\n" -#: readelf.c:10741 +#: readelf.c:10569 #, c-format msgid " Addr: " msgstr " Адрес: " @@ -9479,7 +9479,7 @@ msgid "histogram chain is corrupt\n" msgstr "Цепочка гистограммы повреждена\n" -#: readelf.c:11743 +#: readelf.c:11552 #, c-format msgid "" "\n" @@ -9572,7 +9572,7 @@ msgid "Out of memory allocating space for histogram counts\n" msgstr "Не хватает памяти для выделения под счётчики гистограмм\n" -#: readelf.c:11980 +#: readelf.c:11789 #, c-format msgid "" "\n" @@ -9750,7 +9750,7 @@ msgid "section '%s' has unsupported compress type: %d\n" msgstr "раздел «%s» имеет неподдерживаемый тип сжатия: %d\n" -#: readelf.c:13341 readelf.c:13488 readelf.c:13663 +#: readelf.c:13183 readelf.c:13330 readelf.c:13505 #, c-format msgid "compressed section '%s' is corrupted\n" msgstr "cжатый раздел «%s» повреждён\n" @@ -10635,7 +10635,7 @@ msgid "NT_PPC_TM_CVMX (ppc checkpointed Altivec registers)" msgstr "NT_PPC_TM_CVMX (сохранённые регистры Altivec ppc)" -#: readelf.c:16683 +#: readelf.c:16521 msgid "NT_PPC_TM_VSX (ppc checkpointed VSX registers)" msgstr "NT_PPC_TM_VSX (сохранённые регистры общего назначения ppc VSX)" @@ -11155,12 +11155,12 @@ msgid " Module version : %s\n" msgstr " Версия модуля : %s\n" -#: readelf.c:17946 +#: readelf.c:17363 #, c-format msgid " Invalid size\n" msgstr " Неверный размер\n" -#: readelf.c:17949 +#: readelf.c:17366 #, c-format msgid " Language: %s\n" msgstr " Язык: %s\n" @@ -11204,27 +11204,27 @@ msgid " Header flags: 0x%08x\n" msgstr " Флаги заголовка: 0x%08x\n" -#: readelf.c:17981 +#: readelf.c:17398 #, c-format msgid " Image id : %s\n" msgstr " id образа : %s\n" -#: readelf.c:17985 +#: readelf.c:17402 #, c-format msgid " Image name: %s\n" msgstr " Имя образа: %s\n" -#: readelf.c:17988 +#: readelf.c:17405 #, c-format msgid " Global symbol table name: %s\n" msgstr " Имя глобальной таблицы символов: %s\n" -#: readelf.c:17991 +#: readelf.c:17408 #, c-format msgid " Image id: %s\n" msgstr " id образа: %s\n" -#: readelf.c:17994 +#: readelf.c:17411 #, c-format msgid " Linker id: %s\n" msgstr " id компоновщика: %s\n" @@ -11377,7 +11377,7 @@ msgid "Corrupt note: alignment %ld, expecting 4 or 8\n" msgstr "Повреждённая заметка: выравнивание %ld, ожидается 4 или 8\n" -#: readelf.c:18656 +#: readelf.c:18040 #, c-format msgid " %-20s %10s\tDescription\n" msgstr " %-20s %10s\tОписание\n" @@ -12172,7 +12172,7 @@ msgid "const/volatile indicator missing" msgstr "отсутствует индикатор постоянной/переменной" -#: stabs.c:3043 +#: stabs.c:2938 #, c-format msgid "No mangling for \"%s\"\n" msgstr "Нет кодирования для \"%s\"\n" diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/cpio.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/cpio.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/cpio.po 2020-01-23 16:52:09.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/cpio.po 2020-07-08 13:54:11.000000000 +0000 @@ -18,8 +18,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2020-01-23 10:41+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:37+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ru\n" #: gnu/argmatch.c:134 diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/cpplib.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/cpplib.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/cpplib.po 2020-01-23 16:52:18.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/cpplib.po 2020-07-08 13:54:20.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 12:16+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:53+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ru\n" "X-Bugs: Report translation errors to the Language-Team address.\n" diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/cryptsetup.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/cryptsetup.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/cryptsetup.po 2020-01-23 16:52:12.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/cryptsetup.po 2020-07-08 13:54:15.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 11:15+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:04+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: lib/libdevmapper.c:331 msgid "Cannot initialize device-mapper, running as non-root user.\n" @@ -61,7 +61,7 @@ msgid "Requested sector_size option is not supported.\n" msgstr "" -#: lib/random.c:80 +#: lib/random.c:75 msgid "" "System is out of entropy while generating volume key.\n" "Please move mouse or type some text in another window to gather some random " @@ -71,7 +71,7 @@ "Подвигайте мышь или наберите любой текст в другом окне, чтобы собрать " "случайные события.\n" -#: lib/random.c:84 +#: lib/random.c:79 #, c-format msgid "Generating key (%d%% done).\n" msgstr "Генерация ключа (%d%% завершено).\n" @@ -168,7 +168,7 @@ msgid "UUID is not supported for this crypt type.\n" msgstr "UUID не поддерживается для этого типа шифрования.\n" -#: src/cryptsetup.c:3787 +#: src/cryptsetup.c:3866 msgid "Unsupported encryption sector size.\n" msgstr "" @@ -271,7 +271,7 @@ msgid "Device %s size is not aligned to requested sector size (%u bytes).\n" msgstr "" -#: lib/setup.c:2817 +#: lib/setup.c:2882 msgid "Do you really want to change UUID of device?" msgstr "Вы действительно хотите изменить UUID устройства?" @@ -422,7 +422,7 @@ msgid "Kernel keyring is not supported by the kernel.\n" msgstr "" -#: lib/setup.c:5767 lib/luks2/luks2_reencrypt.c:2933 +#: lib/setup.c:5992 lib/luks2/luks2_reencrypt.c:2952 #, c-format msgid "Failed to read passphrase from keyring (error %d)." msgstr "" @@ -569,7 +569,7 @@ "missing).\n" msgstr "" -#: lib/utils_device_locking.c:110 +#: lib/utils_device_locking.c:109 #, c-format msgid "WARNING: Locking directory %s/%s is missing!\n" msgstr "" @@ -675,12 +675,12 @@ "Смещение данных или размер ключа не совпадают на устройстве и в резервной " "копии, восстановление не удалось.\n" -#: lib/luks1/keymanage.c:326 +#: lib/luks1/keymanage.c:325 #, c-format msgid "Device %s %s%s" msgstr "Устройство %s %s%s" -#: lib/luks1/keymanage.c:327 +#: lib/luks1/keymanage.c:326 msgid "" "does not contain LUKS header. Replacing header can destroy data on that " "device." @@ -688,7 +688,7 @@ "не содержит заголовка LUKS. Перемещение заголовка может уничтожить данные на " "этом устройстве." -#: lib/luks1/keymanage.c:328 +#: lib/luks1/keymanage.c:327 msgid "" "already contains LUKS header. Replacing header will destroy existing " "keyslots." @@ -696,7 +696,7 @@ "уже содержит заголовок LUKS. Перемещение заголовка уничтожит существующие " "ключевые слоты." -#: lib/luks1/keymanage.c:329 lib/luks2/luks2_json_metadata.c:1225 +#: lib/luks1/keymanage.c:328 lib/luks2/luks2_json_metadata.c:1224 msgid "" "\n" "WARNING: real device header has different UUID than backup!" @@ -891,7 +891,7 @@ msgid "Kernel doesn't support TCRYPT compatible mapping.\n" msgstr "" -#: lib/tcrypt/tcrypt.c:1084 +#: lib/tcrypt/tcrypt.c:1093 msgid "This function is not supported without TCRYPT header load." msgstr "" @@ -1050,31 +1050,31 @@ "failed.\n" msgstr "" -#: lib/luks2/luks2_json_metadata.c:1222 +#: lib/luks2/luks2_json_metadata.c:1221 #, c-format msgid "Device %s %s%s%s%s" msgstr "Устройство %s %s%s%s%s" -#: lib/luks2/luks2_json_metadata.c:1223 +#: lib/luks2/luks2_json_metadata.c:1222 msgid "" "does not contain LUKS2 header. Replacing header can destroy data on that " "device." msgstr "" -#: lib/luks2/luks2_json_metadata.c:1224 +#: lib/luks2/luks2_json_metadata.c:1223 msgid "" "already contains LUKS2 header. Replacing header will destroy existing " "keyslots." msgstr "" -#: lib/luks2/luks2_json_metadata.c:1226 +#: lib/luks2/luks2_json_metadata.c:1225 msgid "" "\n" "WARNING: unknown LUKS2 requirements detected in real device header!\n" "Replacing header with backup may corrupt the data on that device!" msgstr "" -#: lib/luks2/luks2_json_metadata.c:1228 +#: lib/luks2/luks2_json_metadata.c:1227 msgid "" "\n" "WARNING: Unfinished offline reencryption detected on the device!\n" @@ -1148,13 +1148,13 @@ msgid "No known cipher specification pattern detected.\n" msgstr "" -#: src/cryptsetup.c:253 +#: src/cryptsetup.c:259 msgid "" "WARNING: The --hash parameter is being ignored in plain mode with keyfile " "specified.\n" msgstr "" -#: src/cryptsetup.c:261 +#: src/cryptsetup.c:267 msgid "" "WARNING: The --keyfile-size option is being ignored, the read size is the " "same as the encryption key size.\n" @@ -1164,7 +1164,7 @@ msgid "Option --key-file is required.\n" msgstr "Требуется параметр --key-file.\n" -#: src/cryptsetup.c:428 +#: src/cryptsetup.c:434 msgid "Enter VeraCrypt PIM: " msgstr "" @@ -1184,7 +1184,7 @@ msgid "No device header detected with this passphrase.\n" msgstr "" -#: src/cryptsetup.c:528 src/cryptsetup.c:1940 +#: src/cryptsetup.c:576 msgid "" "Header dump with volume key is sensitive information\n" "which allows access to encrypted partition without passphrase.\n" @@ -1194,7 +1194,7 @@ "обеспечивающей доступ к зашифрованному разделу без парольной фразы.\n" "Этот дамп следует всегда хранить зашифрованным в надёжном месте." -#: src/cryptsetup.c:607 +#: src/cryptsetup.c:673 #, c-format msgid "Device %s is still active and scheduled for deferred removal.\n" msgstr "" @@ -1209,7 +1209,7 @@ msgid "Result of benchmark is not reliable.\n" msgstr "" -#: src/cryptsetup.c:885 +#: src/cryptsetup.c:951 msgid "# Tests are approximate using memory only (no storage IO).\n" msgstr "" @@ -1222,7 +1222,7 @@ msgid "Cipher %s is not available.\n" msgstr "" -#: src/cryptsetup.c:952 +#: src/cryptsetup.c:1003 msgid "N/A" msgstr "Н/Д" @@ -1236,17 +1236,17 @@ msgid "Cannot read %d bytes from keyfile %s.\n" msgstr "Не удалось прочитать %d байт из ключевого файла %s.\n" -#: src/cryptsetup.c:1089 +#: src/cryptsetup.c:1141 msgid "Really try to repair LUKS device header?" msgstr "Действительно попробовать восстановить заголовок устройства LUKS?" -#: src/cryptsetup.c:307 src/cryptsetup.c:1038 src/cryptsetup.c:1090 -#: src/cryptsetup.c:1189 src/cryptsetup.c:1262 src/cryptsetup.c:1913 -#: src/cryptsetup.c:2545 src/cryptsetup.c:2668 src/integritysetup.c:232 +#: src/cryptsetup.c:313 src/cryptsetup.c:1090 src/cryptsetup.c:1142 +#: src/cryptsetup.c:1246 src/cryptsetup.c:1319 src/cryptsetup.c:1974 +#: src/cryptsetup.c:2682 src/cryptsetup.c:2805 src/integritysetup.c:233 msgid "Operation aborted.\n" msgstr "Операция прервана.\n" -#: src/cryptsetup.c:1108 src/integritysetup.c:145 +#: src/cryptsetup.c:1160 src/integritysetup.c:146 msgid "" "Wiping device to initialize integrity checksum.\n" "You can interrupt this by pressing CTRL+c (rest of not wiped device will " @@ -1263,7 +1263,7 @@ msgid "Cannot create header file %s.\n" msgstr "" -#: src/cryptsetup.c:1256 src/integritysetup.c:226 +#: src/cryptsetup.c:1313 src/integritysetup.c:227 #, c-format msgid "This will overwrite data on %s irrevocably." msgstr "Данные на %s будут перезаписаны без возможности восстановления." @@ -1309,22 +1309,22 @@ msgid "Keyslot %d is not active.\n" msgstr "" -#: src/cryptsetup.c:1520 src/cryptsetup.c:1581 +#: src/cryptsetup.c:1581 src/cryptsetup.c:1642 msgid "" "This is the last keyslot. Device will become unusable after purging this key." msgstr "" "Это последний слот ключа. Устройство станет нечитаемым после освобождения " "этого ключа." -#: src/cryptsetup.c:1521 +#: src/cryptsetup.c:1582 msgid "Enter any remaining passphrase: " msgstr "" -#: src/cryptsetup.c:1522 src/cryptsetup.c:1583 +#: src/cryptsetup.c:1583 src/cryptsetup.c:1644 msgid "Operation aborted, the keyslot was NOT wiped.\n" msgstr "" -#: src/cryptsetup.c:1560 +#: src/cryptsetup.c:1621 msgid "Enter passphrase to be deleted: " msgstr "Введите удаляемую парольную фразу: " @@ -1333,20 +1333,20 @@ msgid "Key slot %d selected for deletion.\n" msgstr "Слот ключа %d выбран для удаления.\n" -#: src/cryptsetup.c:1641 src/cryptsetup.c:1715 src/cryptsetup.c:1749 +#: src/cryptsetup.c:1702 src/cryptsetup.c:1776 src/cryptsetup.c:1810 msgid "Enter new passphrase for key slot: " msgstr "Введите новый пароль для ключевого слота: " -#: src/cryptsetup.c:1732 src/cryptsetup_reencrypt.c:1327 +#: src/cryptsetup.c:1793 src/cryptsetup_reencrypt.c:1343 #, c-format msgid "Enter any existing passphrase: " msgstr "Введите любую существующую парольную фразу: " -#: src/cryptsetup.c:1800 +#: src/cryptsetup.c:1861 msgid "Enter passphrase to be changed: " msgstr "Введите изменяемую парольную фразу: " -#: src/cryptsetup.c:1816 src/cryptsetup_reencrypt.c:1313 +#: src/cryptsetup.c:1877 src/cryptsetup_reencrypt.c:1329 msgid "Enter new passphrase: " msgstr "Введите новую парольную фразу: " @@ -1367,14 +1367,14 @@ msgid "Command requires device and mapped name as arguments.\n" msgstr "" -#: src/cryptsetup.c:2199 +#: src/cryptsetup.c:2336 #, c-format msgid "" "This operation will erase all keyslots on device %s.\n" "Device will become unusable after this operation." msgstr "" -#: src/cryptsetup.c:2206 +#: src/cryptsetup.c:2343 msgid "Operation aborted, keyslots were NOT wiped.\n" msgstr "" @@ -1387,12 +1387,12 @@ msgid "Device is already %s type.\n" msgstr "" -#: src/cryptsetup.c:2266 +#: src/cryptsetup.c:2403 #, c-format msgid "This operation will convert %s to %s format.\n" msgstr "" -#: src/cryptsetup.c:2272 +#: src/cryptsetup.c:2409 msgid "Operation aborted, device was NOT converted.\n" msgstr "" @@ -1438,7 +1438,7 @@ msgid "Failed to remove token %d.\n" msgstr "" -#: src/cryptsetup.c:3209 +#: src/cryptsetup.c:3346 msgid " [--type ] []" msgstr "<устройство> [--type <тип>] [<имя>]" @@ -1446,101 +1446,101 @@ msgid "open device as mapping " msgstr "" -#: src/cryptsetup.c:3210 src/cryptsetup.c:3211 src/cryptsetup.c:3212 -#: src/veritysetup.c:359 src/veritysetup.c:360 src/integritysetup.c:471 -#: src/integritysetup.c:472 +#: src/cryptsetup.c:3347 src/cryptsetup.c:3348 src/cryptsetup.c:3349 +#: src/veritysetup.c:395 src/veritysetup.c:396 src/integritysetup.c:481 +#: src/integritysetup.c:482 msgid "" msgstr "<имя>" -#: src/cryptsetup.c:3210 src/veritysetup.c:359 src/integritysetup.c:471 +#: src/cryptsetup.c:3347 src/veritysetup.c:395 src/integritysetup.c:481 msgid "close device (remove mapping)" msgstr "" -#: src/cryptsetup.c:3211 +#: src/cryptsetup.c:3348 msgid "resize active device" msgstr "изменить размер активного устройства" -#: src/cryptsetup.c:3212 +#: src/cryptsetup.c:3349 msgid "show device status" msgstr "показать состояние устройства" -#: src/cryptsetup.c:3213 +#: src/cryptsetup.c:3350 msgid "[--cipher ]" msgstr "" -#: src/cryptsetup.c:3213 +#: src/cryptsetup.c:3350 msgid "benchmark cipher" msgstr "" -#: src/cryptsetup.c:3214 src/cryptsetup.c:3215 src/cryptsetup.c:3216 -#: src/cryptsetup.c:3217 src/cryptsetup.c:3218 src/cryptsetup.c:3225 -#: src/cryptsetup.c:3226 src/cryptsetup.c:3227 src/cryptsetup.c:3228 -#: src/cryptsetup.c:3229 src/cryptsetup.c:3230 src/cryptsetup.c:3231 -#: src/cryptsetup.c:3232 +#: src/cryptsetup.c:3351 src/cryptsetup.c:3352 src/cryptsetup.c:3353 +#: src/cryptsetup.c:3354 src/cryptsetup.c:3355 src/cryptsetup.c:3362 +#: src/cryptsetup.c:3363 src/cryptsetup.c:3364 src/cryptsetup.c:3365 +#: src/cryptsetup.c:3366 src/cryptsetup.c:3367 src/cryptsetup.c:3368 +#: src/cryptsetup.c:3369 src/cryptsetup.c:3370 msgid "" msgstr "<устройство>" -#: src/cryptsetup.c:3214 +#: src/cryptsetup.c:3351 msgid "try to repair on-disk metadata" msgstr "" -#: src/cryptsetup.c:3216 +#: src/cryptsetup.c:3353 msgid "erase all keyslots (remove encryption key)" msgstr "" -#: src/cryptsetup.c:3217 +#: src/cryptsetup.c:3354 msgid "convert LUKS from/to LUKS2 format" msgstr "" -#: src/cryptsetup.c:3218 +#: src/cryptsetup.c:3355 msgid "set permanent configuration options for LUKS2" msgstr "" -#: src/cryptsetup.c:3219 src/cryptsetup.c:3220 +#: src/cryptsetup.c:3356 src/cryptsetup.c:3357 msgid " []" msgstr "<устройство> [<новый файл ключа>]" -#: src/cryptsetup.c:3219 +#: src/cryptsetup.c:3356 msgid "formats a LUKS device" msgstr "форматирует устройство LUKS" -#: src/cryptsetup.c:3220 +#: src/cryptsetup.c:3357 msgid "add key to LUKS device" msgstr "добавить ключ к устройству LUKS" -#: src/cryptsetup.c:3221 src/cryptsetup.c:3222 src/cryptsetup.c:3223 +#: src/cryptsetup.c:3358 src/cryptsetup.c:3359 src/cryptsetup.c:3360 msgid " []" msgstr "<устройство> [<файл-ключ>]" -#: src/cryptsetup.c:3221 +#: src/cryptsetup.c:3358 msgid "removes supplied key or key file from LUKS device" msgstr "" -#: src/cryptsetup.c:3222 +#: src/cryptsetup.c:3359 msgid "changes supplied key or key file of LUKS device" msgstr "" -#: src/cryptsetup.c:3224 +#: src/cryptsetup.c:3361 msgid " " msgstr "<устройство> <слот ключа>" -#: src/cryptsetup.c:3224 +#: src/cryptsetup.c:3361 msgid "wipes key with number from LUKS device" msgstr "стирает ключ с номером <слот ключа> с устройства LUKS" -#: src/cryptsetup.c:3225 +#: src/cryptsetup.c:3362 msgid "print UUID of LUKS device" msgstr "напечатать UUID устройства LUKS" -#: src/cryptsetup.c:3226 +#: src/cryptsetup.c:3363 msgid "tests for LUKS partition header" msgstr "проверить <устройство> на наличие заголовка раздела LUKS" -#: src/cryptsetup.c:3227 +#: src/cryptsetup.c:3364 msgid "dump LUKS partition information" msgstr "выгрузить в дамп информацию о разделе LUKS" -#: src/cryptsetup.c:3228 +#: src/cryptsetup.c:3365 msgid "dump TCRYPT device information" msgstr "выгрузить в дамп информацию об устройстве TCRYPT" @@ -1552,11 +1552,11 @@ msgid "Resume suspended LUKS device." msgstr "" -#: src/cryptsetup.c:3231 +#: src/cryptsetup.c:3369 msgid "Backup LUKS device header and keyslots" msgstr "Сделать резервную копию заголовка и ключевых слотов устройства LUKS" -#: src/cryptsetup.c:3232 +#: src/cryptsetup.c:3370 msgid "Restore LUKS device header and keyslots" msgstr "Восстановить заголовок и ключевые слоты устройства LUKS" @@ -1568,7 +1568,7 @@ msgid "Add or remove keyring token" msgstr "" -#: src/cryptsetup.c:3251 src/veritysetup.c:376 src/integritysetup.c:488 +#: src/cryptsetup.c:3389 src/veritysetup.c:412 src/integritysetup.c:498 msgid "" "\n" " is one of:\n" @@ -1584,7 +1584,7 @@ "\tclose: remove (plainClose), luksClose, loopaesClose, tcryptClose\n" msgstr "" -#: src/cryptsetup.c:3261 +#: src/cryptsetup.c:3399 #, c-format msgid "" "\n" @@ -1622,50 +1622,50 @@ "\tLUKS1: %s, Key: %d bits, LUKS header hashing: %s, RNG: %s\n" msgstr "" -#: src/cryptsetup.c:3309 src/veritysetup.c:532 src/integritysetup.c:630 +#: src/cryptsetup.c:3447 src/veritysetup.c:569 src/integritysetup.c:642 #, c-format msgid "%s: requires %s as arguments" msgstr "%s требует %s в качестве аргумента" -#: src/cryptsetup.c:3347 src/veritysetup.c:421 src/integritysetup.c:527 -#: src/cryptsetup_reencrypt.c:1591 +#: src/cryptsetup.c:3480 src/veritysetup.c:457 src/integritysetup.c:536 +#: src/cryptsetup_reencrypt.c:1607 msgid "Show this help message" msgstr "Показать это сообщение" -#: src/cryptsetup.c:3348 src/veritysetup.c:422 src/integritysetup.c:528 -#: src/cryptsetup_reencrypt.c:1592 +#: src/cryptsetup.c:3481 src/veritysetup.c:458 src/integritysetup.c:537 +#: src/cryptsetup_reencrypt.c:1608 msgid "Display brief usage" msgstr "Показать краткие инструкции" -#: src/cryptsetup.c:3353 src/veritysetup.c:427 src/integritysetup.c:533 -#: src/cryptsetup_reencrypt.c:1597 +#: src/cryptsetup.c:3486 src/veritysetup.c:463 src/integritysetup.c:542 +#: src/cryptsetup_reencrypt.c:1613 msgid "Help options:" msgstr "Опции справки:" -#: src/cryptsetup.c:3349 src/veritysetup.c:423 src/integritysetup.c:529 -#: src/cryptsetup_reencrypt.c:1593 +#: src/cryptsetup.c:3482 src/veritysetup.c:459 src/integritysetup.c:538 +#: src/cryptsetup_reencrypt.c:1609 msgid "Print package version" msgstr "Показать версию пакета" -#: src/cryptsetup.c:3354 src/veritysetup.c:428 src/integritysetup.c:534 -#: src/cryptsetup_reencrypt.c:1598 +#: src/cryptsetup.c:3487 src/veritysetup.c:464 src/integritysetup.c:543 +#: src/cryptsetup_reencrypt.c:1614 msgid "Shows more detailed error messages" msgstr "Показывает детализированные сообщения об ошибках" -#: src/cryptsetup.c:3355 src/veritysetup.c:429 src/integritysetup.c:535 -#: src/cryptsetup_reencrypt.c:1599 +#: src/cryptsetup.c:3488 src/veritysetup.c:465 src/integritysetup.c:544 +#: src/cryptsetup_reencrypt.c:1615 msgid "Show debug messages" msgstr "Показывать отладочные сообщения" -#: src/cryptsetup.c:3357 src/cryptsetup_reencrypt.c:1601 +#: src/cryptsetup.c:3490 src/cryptsetup_reencrypt.c:1617 msgid "The cipher used to encrypt the disk (see /proc/crypto)" msgstr "Шифр, используемый для шифрования диска (смотри /proc/crypto)" -#: src/cryptsetup.c:3358 src/cryptsetup_reencrypt.c:1603 +#: src/cryptsetup.c:3491 src/cryptsetup_reencrypt.c:1619 msgid "The hash used to create the encryption key from the passphrase" msgstr "Хеш, исползуемый для создания ключа шифрования из ключевой фразы" -#: src/cryptsetup.c:3359 +#: src/cryptsetup.c:3492 msgid "Verifies the passphrase by asking for it twice" msgstr "Проверяет правильность ключевой фразы, запрашивая ее дважды" @@ -1673,7 +1673,7 @@ msgid "Read the key from a file." msgstr "Читать ключ из файла." -#: src/cryptsetup.c:3361 +#: src/cryptsetup.c:3494 msgid "Read the volume (master) key from file." msgstr "" @@ -1681,92 +1681,92 @@ msgid "Dump volume (master) key instead of keyslots info." msgstr "" -#: src/cryptsetup.c:3363 src/cryptsetup_reencrypt.c:1602 +#: src/cryptsetup.c:3496 src/cryptsetup_reencrypt.c:1618 msgid "The size of the encryption key" msgstr "Размер ключа шифрования" -#: src/cryptsetup.c:3363 src/cryptsetup.c:3422 src/integritysetup.c:553 -#: src/integritysetup.c:557 src/integritysetup.c:561 -#: src/cryptsetup_reencrypt.c:1602 +#: src/cryptsetup.c:3496 src/cryptsetup.c:3557 src/integritysetup.c:562 +#: src/integritysetup.c:566 src/integritysetup.c:570 +#: src/cryptsetup_reencrypt.c:1618 msgid "BITS" msgstr "БИТ" -#: src/cryptsetup.c:3364 src/cryptsetup_reencrypt.c:1618 +#: src/cryptsetup.c:3497 src/cryptsetup_reencrypt.c:1634 msgid "Limits the read from keyfile" msgstr "Ограничивает чтение из ключевого файла" -#: src/cryptsetup.c:3364 src/cryptsetup.c:3365 src/cryptsetup.c:3366 -#: src/cryptsetup.c:3367 src/cryptsetup.c:3370 src/cryptsetup.c:3419 -#: src/cryptsetup.c:3420 src/cryptsetup.c:3428 src/cryptsetup.c:3429 -#: src/veritysetup.c:432 src/veritysetup.c:433 src/veritysetup.c:434 -#: src/veritysetup.c:437 src/veritysetup.c:438 src/integritysetup.c:542 -#: src/integritysetup.c:548 src/integritysetup.c:549 -#: src/cryptsetup_reencrypt.c:1617 src/cryptsetup_reencrypt.c:1618 -#: src/cryptsetup_reencrypt.c:1619 src/cryptsetup_reencrypt.c:1620 +#: src/cryptsetup.c:3497 src/cryptsetup.c:3498 src/cryptsetup.c:3499 +#: src/cryptsetup.c:3500 src/cryptsetup.c:3503 src/cryptsetup.c:3554 +#: src/cryptsetup.c:3555 src/cryptsetup.c:3563 src/cryptsetup.c:3564 +#: src/veritysetup.c:468 src/veritysetup.c:469 src/veritysetup.c:470 +#: src/veritysetup.c:473 src/veritysetup.c:474 src/integritysetup.c:551 +#: src/integritysetup.c:557 src/integritysetup.c:558 +#: src/cryptsetup_reencrypt.c:1633 src/cryptsetup_reencrypt.c:1634 +#: src/cryptsetup_reencrypt.c:1635 src/cryptsetup_reencrypt.c:1636 msgid "bytes" msgstr "" -#: src/cryptsetup.c:3365 src/cryptsetup_reencrypt.c:1617 +#: src/cryptsetup.c:3498 src/cryptsetup_reencrypt.c:1633 msgid "Number of bytes to skip in keyfile" msgstr "Количество пропускаемых байтов в ключевом файле" -#: src/cryptsetup.c:3366 +#: src/cryptsetup.c:3499 msgid "Limits the read from newly added keyfile" msgstr "" -#: src/cryptsetup.c:3367 +#: src/cryptsetup.c:3500 msgid "Number of bytes to skip in newly added keyfile" msgstr "" -#: src/cryptsetup.c:3368 +#: src/cryptsetup.c:3501 msgid "Slot number for new key (default is first free)" msgstr "Номер слота для нового ключа (по-умолчанию первый свободный)" -#: src/cryptsetup.c:3369 +#: src/cryptsetup.c:3502 msgid "The size of the device" msgstr "Размер устройства" -#: src/cryptsetup.c:3369 src/cryptsetup.c:3371 src/cryptsetup.c:3372 -#: src/cryptsetup.c:3378 src/integritysetup.c:543 src/integritysetup.c:550 +#: src/cryptsetup.c:3502 src/cryptsetup.c:3504 src/cryptsetup.c:3505 +#: src/cryptsetup.c:3511 src/integritysetup.c:552 src/integritysetup.c:559 msgid "SECTORS" msgstr "СЕКТОРОВ" -#: src/cryptsetup.c:3371 +#: src/cryptsetup.c:3504 msgid "The start offset in the backend device" msgstr "Начальное смещение в бэкенд-устройстве" -#: src/cryptsetup.c:3372 +#: src/cryptsetup.c:3505 msgid "How many sectors of the encrypted data to skip at the beginning" msgstr "Сколько секторов зашифрованных данных пропустить сначала" -#: src/cryptsetup.c:3373 +#: src/cryptsetup.c:3506 msgid "Create a readonly mapping" msgstr "Создать назначение в режиме \"Только для чтения\"" -#: src/cryptsetup.c:3374 src/integritysetup.c:536 -#: src/cryptsetup_reencrypt.c:1608 +#: src/cryptsetup.c:3507 src/integritysetup.c:545 +#: src/cryptsetup_reencrypt.c:1624 msgid "Do not ask for confirmation" msgstr "Не запрашивать подтверждения" -#: src/cryptsetup.c:3375 +#: src/cryptsetup.c:3508 msgid "Timeout for interactive passphrase prompt (in seconds)" msgstr "Таймаут интерактивного запроса ключевой фразы (секунд)" -#: src/cryptsetup.c:3375 src/cryptsetup.c:3376 src/integritysetup.c:537 -#: src/cryptsetup_reencrypt.c:1609 +#: src/cryptsetup.c:3508 src/cryptsetup.c:3509 src/integritysetup.c:546 +#: src/cryptsetup_reencrypt.c:1625 msgid "secs" msgstr "сек" -#: src/cryptsetup.c:3376 src/integritysetup.c:537 -#: src/cryptsetup_reencrypt.c:1609 +#: src/cryptsetup.c:3509 src/integritysetup.c:546 +#: src/cryptsetup_reencrypt.c:1625 msgid "Progress line update (in seconds)" msgstr "" -#: src/cryptsetup.c:3377 src/cryptsetup_reencrypt.c:1610 +#: src/cryptsetup.c:3510 src/cryptsetup_reencrypt.c:1626 msgid "How often the input of the passphrase can be retried" msgstr "Как часто можно повторять попытку ввода ключевой фразы" -#: src/cryptsetup.c:3378 +#: src/cryptsetup.c:3511 msgid "Align payload at sector boundaries - for luksFormat" msgstr "Выравнивать нагрузку по границам секторов — для luksFormat" @@ -1846,11 +1846,11 @@ msgid "Device removal is deferred until the last user closes it." msgstr "" -#: src/cryptsetup.c:3399 +#: src/cryptsetup.c:3532 msgid "PBKDF iteration time for LUKS (in ms)" msgstr "" -#: src/cryptsetup.c:3399 src/cryptsetup_reencrypt.c:1607 +#: src/cryptsetup.c:3532 src/cryptsetup_reencrypt.c:1623 msgid "msecs" msgstr "мсек" @@ -1858,11 +1858,11 @@ msgid "PBKDF algorithm (for LUKS2) (argon2i/argon2id/pbkdf2)." msgstr "" -#: src/cryptsetup.c:3401 src/cryptsetup_reencrypt.c:1626 +#: src/cryptsetup.c:3534 src/cryptsetup_reencrypt.c:1642 msgid "PBKDF memory cost limit" msgstr "" -#: src/cryptsetup.c:3401 src/cryptsetup_reencrypt.c:1626 +#: src/cryptsetup.c:3534 src/cryptsetup_reencrypt.c:1642 msgid "kilobytes" msgstr "" @@ -1870,11 +1870,11 @@ msgid "PBKDF parallel cost " msgstr "" -#: src/cryptsetup.c:3402 src/cryptsetup_reencrypt.c:1627 +#: src/cryptsetup.c:3535 src/cryptsetup_reencrypt.c:1643 msgid "threads" msgstr "" -#: src/cryptsetup.c:3403 src/cryptsetup_reencrypt.c:1628 +#: src/cryptsetup.c:3536 src/cryptsetup_reencrypt.c:1644 msgid "PBKDF iterations cost (forced, disables benchmark)" msgstr "" @@ -1882,15 +1882,15 @@ msgid "Keyslot priority (ignore/normal/prefer)" msgstr "" -#: src/cryptsetup.c:3405 +#: src/cryptsetup.c:3538 msgid "Disable locking of on-disk metadata" msgstr "" -#: src/cryptsetup.c:3406 +#: src/cryptsetup.c:3539 msgid "Disable loading volume keys via kernel keyring" msgstr "" -#: src/cryptsetup.c:3407 +#: src/cryptsetup.c:3540 msgid "Data integrity algorithm (LUKS2 only)" msgstr "" @@ -1898,23 +1898,23 @@ msgid "Disable journal for integrity device." msgstr "" -#: src/cryptsetup.c:3409 src/integritysetup.c:538 +#: src/cryptsetup.c:3542 src/integritysetup.c:547 msgid "Do not wipe device after format" msgstr "" -#: src/cryptsetup.c:3410 +#: src/cryptsetup.c:3544 msgid "Do not ask for passphrase if activation by token fails" msgstr "" -#: src/cryptsetup.c:3411 +#: src/cryptsetup.c:3545 msgid "Token number (default: any)" msgstr "" -#: src/cryptsetup.c:3412 +#: src/cryptsetup.c:3546 msgid "Key description" msgstr "" -#: src/cryptsetup.c:3413 +#: src/cryptsetup.c:3547 msgid "Encryption sector size (default: 512 bytes)" msgstr "" @@ -1930,35 +1930,35 @@ msgid "Set subsystem label for the LUKS2 device." msgstr "" -#: src/cryptsetup.c:3448 src/veritysetup.c:462 src/integritysetup.c:583 +#: src/cryptsetup.c:3583 src/veritysetup.c:499 src/integritysetup.c:595 msgid "[OPTION...] " msgstr "" -#: src/cryptsetup.c:3499 src/veritysetup.c:496 src/integritysetup.c:594 +#: src/cryptsetup.c:3634 src/veritysetup.c:533 src/integritysetup.c:606 msgid "Argument missing." msgstr "Аргумент <действие> отсутствует." -#: src/cryptsetup.c:3562 src/veritysetup.c:527 src/integritysetup.c:625 +#: src/cryptsetup.c:3703 src/veritysetup.c:564 src/integritysetup.c:637 msgid "Unknown action." msgstr "Неизвестное действие." -#: src/cryptsetup.c:3582 +#: src/cryptsetup.c:3661 msgid "Option --deferred is allowed only for close command.\n" msgstr "" -#: src/cryptsetup.c:3587 +#: src/cryptsetup.c:3666 msgid "Option --shared is allowed only for open of plain device.\n" msgstr "" -#: src/cryptsetup.c:3592 +#: src/cryptsetup.c:3671 msgid "Option --allow-discards is allowed only for open operation.\n" msgstr "Опция --allow-discards разрешена только для действия open.\n" -#: src/cryptsetup.c:3597 +#: src/cryptsetup.c:3676 msgid "Option --persistent is allowed only for open operation.\n" msgstr "" -#: src/cryptsetup.c:3607 +#: src/cryptsetup.c:3686 msgid "Option --persistent is not allowed with --test-passphrase.\n" msgstr "" @@ -1971,17 +1971,17 @@ "Чтобы ограничить чтение из ключевого файла, используйте --keyfile-" "size=(количество байтов)." -#: src/cryptsetup.c:3623 +#: src/cryptsetup.c:3702 msgid "Option --integrity is allowed only for luksFormat (LUKS2).\n" msgstr "" -#: src/cryptsetup.c:3628 +#: src/cryptsetup.c:3707 msgid "" "Option --integrity-no-wipe can be used only for format action with integrity " "extension.\n" msgstr "" -#: src/cryptsetup.c:3634 +#: src/cryptsetup.c:3713 msgid "" "Options --label and --subsystem are allowed only for luksFormat and config " "LUKS2 operations.\n" @@ -1993,12 +1993,12 @@ "devices.\n" msgstr "" -#: src/cryptsetup.c:3645 src/cryptsetup_reencrypt.c:1692 +#: src/cryptsetup.c:3781 src/cryptsetup_reencrypt.c:1708 msgid "Key size must be a multiple of 8 bits" msgstr "Размер ключа должен быть кратным 8-ми битному" -#: src/cryptsetup.c:3651 src/cryptsetup_reencrypt.c:1378 -#: src/cryptsetup_reencrypt.c:1697 +#: src/cryptsetup.c:3787 src/cryptsetup_reencrypt.c:1394 +#: src/cryptsetup_reencrypt.c:1713 msgid "Key slot is invalid." msgstr "" @@ -2007,33 +2007,33 @@ "Option --key-file takes precedence over specified key file argument.\n" msgstr "" -#: src/cryptsetup.c:3665 src/veritysetup.c:539 src/integritysetup.c:649 -#: src/cryptsetup_reencrypt.c:1671 +#: src/cryptsetup.c:3801 src/veritysetup.c:576 src/integritysetup.c:663 +#: src/cryptsetup_reencrypt.c:1687 msgid "Negative number for option not permitted." msgstr "Нельзя использовать для опции отрицательные числа." -#: src/cryptsetup.c:3669 +#: src/cryptsetup.c:3805 msgid "Only one --key-file argument is allowed." msgstr "" -#: src/cryptsetup.c:3673 src/cryptsetup_reencrypt.c:1663 -#: src/cryptsetup_reencrypt.c:1701 +#: src/cryptsetup.c:3809 src/cryptsetup_reencrypt.c:1679 +#: src/cryptsetup_reencrypt.c:1717 msgid "Only one of --use-[u]random options is allowed." msgstr "Можно использовать лишь одну из опций --use-[u]random." -#: src/cryptsetup.c:3677 +#: src/cryptsetup.c:3813 msgid "Option --use-[u]random is allowed only for luksFormat." msgstr "Опция --use-[u]random разрешена только для luksFormat." -#: src/cryptsetup.c:3681 +#: src/cryptsetup.c:3817 msgid "Option --uuid is allowed only for luksFormat and luksUUID." msgstr "Опция --uuid разрешена только для luksFormat и luksUUID." -#: src/cryptsetup.c:3685 +#: src/cryptsetup.c:3821 msgid "Option --align-payload is allowed only for luksFormat." msgstr "Опция --align-payload разрешена только для luksFormat." -#: src/cryptsetup.c:3708 +#: src/cryptsetup.c:3787 msgid "" "Option --skip is supported only for open of plain and loopaes devices.\n" msgstr "" @@ -2043,65 +2043,65 @@ "Option --offset is supported only for open of plain and loopaes devices.\n" msgstr "" -#: src/cryptsetup.c:3721 +#: src/cryptsetup.c:3800 msgid "" "Option --tcrypt-hidden, --tcrypt-system or --tcrypt-backup is supported only " "for TCRYPT device.\n" msgstr "" -#: src/cryptsetup.c:3726 +#: src/cryptsetup.c:3805 msgid "Option --tcrypt-hidden cannot be combined with --allow-discards.\n" msgstr "" -#: src/cryptsetup.c:3731 +#: src/cryptsetup.c:3810 msgid "Option --veracrypt is supported only for TCRYPT device type.\n" msgstr "" -#: src/cryptsetup.c:3737 +#: src/cryptsetup.c:3816 msgid "Invalid argument for parameter --veracrypt-pim supplied.\n" msgstr "" -#: src/cryptsetup.c:3741 +#: src/cryptsetup.c:3820 msgid "" "Option --veracrypt-pim is supported only for VeraCrypt compatible devices.\n" msgstr "" -#: src/cryptsetup.c:3749 +#: src/cryptsetup.c:3828 msgid "" "Option --veracrypt-query-pim is supported only for VeraCrypt compatible " "devices.\n" msgstr "" -#: src/cryptsetup.c:3753 +#: src/cryptsetup.c:3832 msgid "" "The options --veracrypt-pim and --veracrypt-query-pim are mutually " "exclusive.\n" msgstr "" -#: src/cryptsetup.c:3760 +#: src/cryptsetup.c:3839 msgid "Option --priority can be only ignore/normal/prefer.\n" msgstr "" -#: src/cryptsetup.c:3765 +#: src/cryptsetup.c:3844 msgid "Keyslot specification is required.\n" msgstr "" -#: src/cryptsetup.c:3770 src/cryptsetup_reencrypt.c:1677 +#: src/cryptsetup.c:3849 src/cryptsetup_reencrypt.c:1686 msgid "" "Password-based key derivation function (PBKDF) can be only pbkdf2 or " "argon2i/argon2id.\n" msgstr "" -#: src/cryptsetup.c:3775 src/cryptsetup_reencrypt.c:1682 +#: src/cryptsetup.c:3854 src/cryptsetup_reencrypt.c:1691 msgid "" "PBKDF forced iterations cannot be combined with iteration time option.\n" msgstr "" -#: src/cryptsetup.c:3781 +#: src/cryptsetup.c:3860 msgid "Sector size option is not supported for this command.\n" msgstr "" -#: src/cryptsetup.c:3813 +#: src/cryptsetup.c:3892 msgid "Cannot disable metadata locking.\n" msgstr "" @@ -2123,27 +2123,27 @@ msgid "Invalid root hash string specified.\n" msgstr "" -#: src/veritysetup.c:356 +#: src/veritysetup.c:392 msgid " " msgstr "" -#: src/veritysetup.c:356 src/integritysetup.c:469 +#: src/veritysetup.c:392 src/integritysetup.c:479 msgid "format device" msgstr "" -#: src/veritysetup.c:357 +#: src/veritysetup.c:393 msgid " " msgstr "" -#: src/veritysetup.c:357 +#: src/veritysetup.c:393 msgid "verify device" msgstr "" -#: src/veritysetup.c:358 +#: src/veritysetup.c:394 msgid " " msgstr "" -#: src/cryptsetup.c:3209 src/veritysetup.c:358 src/integritysetup.c:470 +#: src/cryptsetup.c:3346 src/veritysetup.c:394 src/integritysetup.c:480 msgid "open device as " msgstr "" @@ -2151,19 +2151,19 @@ msgid "close device (deactivate and remove mapping)" msgstr "" -#: src/veritysetup.c:360 src/integritysetup.c:472 +#: src/veritysetup.c:396 src/integritysetup.c:482 msgid "show active device status" msgstr "" -#: src/veritysetup.c:361 +#: src/veritysetup.c:397 msgid "" msgstr "" -#: src/veritysetup.c:361 src/integritysetup.c:473 +#: src/veritysetup.c:397 src/integritysetup.c:483 msgid "show on-disk information" msgstr "" -#: src/veritysetup.c:380 +#: src/veritysetup.c:416 #, c-format msgid "" "\n" @@ -2173,7 +2173,7 @@ " hash of the root node on \n" msgstr "" -#: src/veritysetup.c:387 +#: src/veritysetup.c:423 #, c-format msgid "" "\n" @@ -2182,108 +2182,108 @@ "Hash format: %u\n" msgstr "" -#: src/veritysetup.c:430 +#: src/veritysetup.c:466 msgid "Do not use verity superblock" msgstr "" -#: src/veritysetup.c:431 +#: src/veritysetup.c:467 msgid "Format type (1 - normal, 0 - original Chrome OS)" msgstr "" -#: src/veritysetup.c:431 +#: src/veritysetup.c:467 msgid "number" msgstr "" -#: src/veritysetup.c:432 +#: src/veritysetup.c:468 msgid "Block size on the data device" msgstr "" -#: src/veritysetup.c:433 +#: src/veritysetup.c:469 msgid "Block size on the hash device" msgstr "" -#: src/veritysetup.c:434 +#: src/veritysetup.c:470 msgid "FEC parity bytes" msgstr "" -#: src/veritysetup.c:435 +#: src/veritysetup.c:471 msgid "The number of blocks in the data file" msgstr "Количество блоков в файле данных" -#: src/veritysetup.c:435 +#: src/veritysetup.c:471 msgid "blocks" msgstr "" -#: src/veritysetup.c:436 +#: src/veritysetup.c:472 msgid "Path to device with error correction data" msgstr "" -#: src/veritysetup.c:436 src/integritysetup.c:540 +#: src/veritysetup.c:472 src/integritysetup.c:549 msgid "path" msgstr "" -#: src/veritysetup.c:437 +#: src/veritysetup.c:473 msgid "Starting offset on the hash device" msgstr "" -#: src/veritysetup.c:438 +#: src/veritysetup.c:474 msgid "Starting offset on the FEC device" msgstr "" -#: src/veritysetup.c:439 +#: src/veritysetup.c:475 msgid "Hash algorithm" msgstr "" -#: src/veritysetup.c:439 +#: src/veritysetup.c:475 msgid "string" msgstr "" -#: src/veritysetup.c:440 +#: src/veritysetup.c:476 msgid "Salt" msgstr "" -#: src/veritysetup.c:440 +#: src/veritysetup.c:476 msgid "hex string" msgstr "" -#: src/veritysetup.c:442 +#: src/veritysetup.c:479 msgid "Restart kernel if corruption is detected" msgstr "" -#: src/veritysetup.c:443 +#: src/veritysetup.c:480 msgid "Ignore corruption, log it only" msgstr "" -#: src/veritysetup.c:444 +#: src/veritysetup.c:481 msgid "Do not verify zeroed blocks" msgstr "" -#: src/veritysetup.c:545 +#: src/veritysetup.c:582 msgid "" "Option --ignore-corruption, --restart-on-corruption or --ignore-zero-blocks " "is allowed only for open operation.\n" msgstr "" -#: src/veritysetup.c:550 +#: src/veritysetup.c:592 msgid "" "Option --ignore-corruption and --restart-on-corruption cannot be used " "together.\n" msgstr "" -#: src/integritysetup.c:250 +#: src/integritysetup.c:254 #, c-format msgid "Formatted with tag size %u, internal integrity %s.\n" msgstr "" -#: src/integritysetup.c:469 src/integritysetup.c:473 +#: src/integritysetup.c:479 src/integritysetup.c:483 msgid "" msgstr "" -#: src/integritysetup.c:470 +#: src/integritysetup.c:480 msgid " " msgstr "" -#: src/integritysetup.c:492 +#: src/integritysetup.c:502 #, c-format msgid "" "\n" @@ -2299,27 +2299,27 @@ "\tTag size: %u bytes, Checksum algorithm: %s\n" msgstr "" -#: src/integritysetup.c:542 +#: src/integritysetup.c:551 msgid "Journal size" msgstr "" -#: src/integritysetup.c:543 +#: src/integritysetup.c:552 msgid "Interleave sectors" msgstr "" -#: src/integritysetup.c:544 +#: src/integritysetup.c:553 msgid "Journal watermark" msgstr "" -#: src/integritysetup.c:544 +#: src/integritysetup.c:553 msgid "percent" msgstr "" -#: src/integritysetup.c:545 +#: src/integritysetup.c:554 msgid "Journal commit time" msgstr "" -#: src/integritysetup.c:545 src/integritysetup.c:547 +#: src/integritysetup.c:554 src/integritysetup.c:556 msgid "ms" msgstr "" @@ -2327,11 +2327,11 @@ msgid "Tag size per-sector" msgstr "" -#: src/integritysetup.c:549 +#: src/integritysetup.c:558 msgid "Sector size" msgstr "" -#: src/integritysetup.c:550 +#: src/integritysetup.c:559 msgid "Buffers size" msgstr "" @@ -2339,7 +2339,7 @@ msgid "Data integrity algorithm (default " msgstr "" -#: src/integritysetup.c:553 +#: src/integritysetup.c:562 msgid "The size of the data integrity key" msgstr "" @@ -2347,11 +2347,11 @@ msgid "Read the integrity key from a file." msgstr "" -#: src/integritysetup.c:556 +#: src/integritysetup.c:565 msgid "Journal integrity algorithm" msgstr "" -#: src/integritysetup.c:557 +#: src/integritysetup.c:566 msgid "The size of the journal integrity key" msgstr "" @@ -2359,11 +2359,11 @@ msgid "Read the journal integrity key from a file." msgstr "" -#: src/integritysetup.c:560 +#: src/integritysetup.c:569 msgid "Journal encryption algorithm" msgstr "" -#: src/integritysetup.c:561 +#: src/integritysetup.c:570 msgid "The size of the journal encryption key" msgstr "" @@ -2375,41 +2375,41 @@ msgid "Recovery mode (no journal, no tag checking)." msgstr "" -#: src/integritysetup.c:655 +#: src/integritysetup.c:656 msgid "" "Options --journal-size, --interleave-sectors, --sector-size, --tag-size and -" "-no-wipe can be used only for format action.\n" msgstr "" -#: src/integritysetup.c:661 +#: src/integritysetup.c:675 msgid "Invalid journal size specification." msgstr "" -#: src/integritysetup.c:666 +#: src/integritysetup.c:680 msgid "Both key file and key size options must be specified." msgstr "" -#: src/integritysetup.c:669 +#: src/integritysetup.c:683 msgid "Integrity algorithm must be specified if integrity key is used." msgstr "" -#: src/integritysetup.c:674 +#: src/integritysetup.c:688 msgid "" "Both journal integrity key file and key size options must be specified." msgstr "" -#: src/integritysetup.c:677 +#: src/integritysetup.c:691 msgid "" "Journal integrity algorithm must be specified if journal integrity key is " "used." msgstr "" -#: src/integritysetup.c:682 +#: src/integritysetup.c:696 msgid "" "Both journal encryption key file and key size options must be specified." msgstr "" -#: src/integritysetup.c:685 +#: src/integritysetup.c:699 msgid "" "Journal encryption algorithm must be specified if journal encryption key is " "used." @@ -2460,7 +2460,7 @@ msgid "Cannot read reencryption log file.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:396 +#: src/cryptsetup_reencrypt.c:403 #, c-format msgid "Log file %s exists, resuming reencryption.\n" msgstr "" @@ -2559,7 +2559,7 @@ "active.\n" msgstr "" -#: src/cryptsetup.c:2959 +#: src/cryptsetup.c:3096 #, c-format msgid "Enter passphrase for key slot %u: " msgstr "Введите парольную фразу для слота ключа %u: " @@ -2583,11 +2583,11 @@ msgid "Changed pbkdf parameters in keyslot %i.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:1600 +#: src/cryptsetup_reencrypt.c:1616 msgid "Reencryption block size" msgstr "" -#: src/cryptsetup_reencrypt.c:1600 +#: src/cryptsetup_reencrypt.c:1616 msgid "MiB" msgstr "МиБ" @@ -2595,7 +2595,7 @@ msgid "Do not change key, no data area reencryption." msgstr "" -#: src/cryptsetup_reencrypt.c:1607 +#: src/cryptsetup_reencrypt.c:1623 msgid "PBKDF2 iteration time for LUKS (in ms)" msgstr "Время итерации PBKDF2 для LUKS (мсек)" @@ -2615,11 +2615,11 @@ msgid "Use only this slot (others will be disabled)." msgstr "" -#: src/cryptsetup.c:3428 src/cryptsetup_reencrypt.c:1619 +#: src/cryptsetup.c:3563 src/cryptsetup_reencrypt.c:1635 msgid "Reduce data device size (move data offset). DANGEROUS!" msgstr "" -#: src/cryptsetup.c:3370 src/cryptsetup_reencrypt.c:1620 +#: src/cryptsetup.c:3503 src/cryptsetup_reencrypt.c:1636 msgid "Use only specified device size (ignore rest of device). DANGEROUS!" msgstr "" @@ -2639,7 +2639,7 @@ msgid "Type of LUKS metadata (luks1 or luks2)." msgstr "" -#: src/cryptsetup_reencrypt.c:1643 +#: src/cryptsetup_reencrypt.c:1659 msgid "[OPTION...] " msgstr "" @@ -2648,37 +2648,37 @@ msgid "Reencryption will change: %s%s%s%s%s%s.\n" msgstr "" -#: src/cryptsetup_reencrypt.c:1652 +#: src/cryptsetup_reencrypt.c:1668 msgid "volume key" msgstr "" -#: src/cryptsetup_reencrypt.c:1654 +#: src/cryptsetup_reencrypt.c:1670 msgid "set hash to " msgstr "" -#: src/cryptsetup_reencrypt.c:1655 +#: src/cryptsetup_reencrypt.c:1671 msgid ", set cipher to " msgstr "" -#: src/cryptsetup_reencrypt.c:1659 +#: src/cryptsetup_reencrypt.c:1675 msgid "Argument required." msgstr "Требуется аргумент." -#: src/cryptsetup_reencrypt.c:1687 +#: src/cryptsetup_reencrypt.c:1703 msgid "" "Only values between 1 MiB and 64 MiB allowed for reencryption block size." msgstr "" -#: src/cryptsetup.c:3831 src/cryptsetup_reencrypt.c:1706 -#: src/cryptsetup_reencrypt.c:1711 +#: src/cryptsetup.c:3978 src/cryptsetup_reencrypt.c:1722 +#: src/cryptsetup_reencrypt.c:1727 msgid "Invalid device size specification." msgstr "" -#: src/cryptsetup_reencrypt.c:1714 +#: src/cryptsetup_reencrypt.c:1730 msgid "Maximum device reduce size is 64 MiB." msgstr "" -#: src/cryptsetup.c:3837 src/cryptsetup_reencrypt.c:1717 +#: src/cryptsetup.c:3984 src/cryptsetup_reencrypt.c:1733 msgid "Reduce size must be multiple of 512 bytes sector." msgstr "" @@ -2686,25 +2686,25 @@ msgid "Option --new must be used together with --reduce-device-size." msgstr "Опция --new должна использоваться совместно с --reduce-device-size." -#: src/cryptsetup_reencrypt.c:1725 +#: src/cryptsetup_reencrypt.c:1741 msgid "" "Option --keep-key can be used only with --hash, --iter-time or --pbkdf-force-" "iterations." msgstr "" -#: src/cryptsetup_reencrypt.c:1729 +#: src/cryptsetup_reencrypt.c:1745 msgid "Option --new cannot be used together with --decrypt." msgstr "" -#: src/cryptsetup_reencrypt.c:1733 +#: src/cryptsetup_reencrypt.c:1749 msgid "Option --decrypt is incompatible with specified parameters." msgstr "" -#: src/cryptsetup_reencrypt.c:1737 +#: src/cryptsetup_reencrypt.c:1753 msgid "Option --uuid is allowed only together with --decrypt." msgstr "" -#: src/cryptsetup_reencrypt.c:1741 +#: src/cryptsetup_reencrypt.c:1757 msgid "Invalid luks type. Use one of these: 'luks', 'luks1' or 'luks2'." msgstr "" diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/cups.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/cups.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/cups.po 2020-01-23 16:52:08.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/cups.po 2020-07-08 13:54:10.000000000 +0000 @@ -3,14 +3,14 @@ "Project-Id-Version: CUPS 2.0\n" "Report-Msgid-Bugs-To: https://github.com/apple/cups/issues\n" "POT-Creation-Date: 2018-03-19 18:36-0400\n" -"PO-Revision-Date: 2019-05-16 11:39+0000\n" -"Last-Translator: Brian Murray \n" +"PO-Revision-Date: 2020-04-27 17:15+0000\n" +"Last-Translator: Marc Deslauriers \n" "Language-Team: PuppyRus Linux Team\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 11:53+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:37+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: Russian\n" #: systemv/lpstat.c:1871 systemv/lpstat.c:1990 @@ -1087,33 +1087,33 @@ msgid " Warning: obsolete DSC version %.1f in file." msgstr " WARNING: устаревшая версия DSC %.1f в файле." -#: test/ippfind.c:2845 +#: test/ippfind.c:2794 msgid " ! expression Unary NOT of expression." msgstr " ! expression Логическое NOT для выражения." -#: test/ippfind.c:2844 +#: test/ippfind.c:2793 msgid " ( expressions ) Group expressions." msgstr " ( expressions ) Группа выражений." -#: systemv/cupsctl.c:244 +#: systemv/cupsctl.c:203 msgid " --[no-]debug-logging Turn debug logging on/off." msgstr " --[no-]debug-logging Вкл./откл. ведение журнала." -#: systemv/cupsctl.c:246 +#: systemv/cupsctl.c:205 msgid " --[no-]remote-admin Turn remote administration on/off." msgstr " --[no-]remote-admin Вкл./откл. удаленное администрирование." -#: systemv/cupsctl.c:248 +#: systemv/cupsctl.c:207 msgid " --[no-]remote-any Allow/prevent access from the Internet." msgstr "" " --[no-]remote-any Разрешается/запрещается доступ из Интернет." -#: systemv/cupsctl.c:250 +#: systemv/cupsctl.c:209 msgid " --[no-]share-printers Turn printer sharing on/off." msgstr "" " --[no-]share-printers Вкл./откл. совместное использование принтеров." -#: systemv/cupsctl.c:252 +#: systemv/cupsctl.c:211 msgid " --[no-]user-cancel-any Allow/prevent users to cancel any job." msgstr "" " --[no-]user-cancel-any Пользователям разрешается/запрещается отменять " @@ -1127,11 +1127,11 @@ msgid " --crlf End lines with CR + LF (Windows)." msgstr " --crlf Строки заканчиваются на CR + LF (Windows)." -#: test/ippfind.c:2826 +#: test/ippfind.c:2775 msgid " --domain regex Match domain to regular expression." msgstr " --domain regex Искать домен по регулярному выражению." -#: test/ippfind.c:2827 +#: test/ippfind.c:2776 msgid "" " --exec utility [argument ...] ;\n" " Execute program if true." @@ -1139,7 +1139,7 @@ " --exec utility [argument ...] ;\n" " Выполнить программу." -#: test/ippfind.c:2847 +#: test/ippfind.c:2796 msgid " --false Always false." msgstr " --false Всегда Ложь." @@ -1147,11 +1147,11 @@ msgid " --help Show help." msgstr " --help Показать справку." -#: test/ippfind.c:2809 +#: test/ippfind.c:2758 msgid " --help Show this help." msgstr " --help Показать эту справку." -#: test/ippfind.c:2829 +#: test/ippfind.c:2778 msgid " --host regex Match hostname to regular expression." msgstr " --host regex Найти hostname по регулярному выражению." @@ -1164,46 +1164,46 @@ msgstr "" " --list-filters Список фильтров которые должны использоваться." -#: test/ippfind.c:2831 +#: test/ippfind.c:2780 msgid " --local True if service is local." msgstr " --local \"Истина\" если сервис локальный." -#: test/ippfind.c:2830 +#: test/ippfind.c:2779 msgid " --ls List attributes." msgstr " --ls Список атрибутов." -#: test/ippfind.c:2832 +#: test/ippfind.c:2781 msgid " --name regex Match service name to regular expression." msgstr " --name regex Найти имя по регулярному выражению." -#: test/ippfind.c:2846 +#: test/ippfind.c:2795 msgid " --not expression Unary NOT of expression." msgstr " --not expression Логическое NOT для выражения." -#: test/ippfind.c:2833 +#: test/ippfind.c:2782 msgid " --path regex Match resource path to regular expression." msgstr "" " --path regex Найти путь к ресурсу по регулярному выражению." -#: test/ippfind.c:2834 +#: test/ippfind.c:2783 msgid " --port number[-number] Match port to number or range." msgstr "" " --port number[-number] Найти номер порта по номеру или диапазону портов." -#: test/ippfind.c:2835 +#: test/ippfind.c:2784 msgid " --print Print URI if true." msgstr " --print Печать URI при соответствии." -#: test/ippfind.c:2836 +#: test/ippfind.c:2785 msgid " --print-name Print service name if true." msgstr " --print-name Печать имени сервиса если соответствует." -#: test/ippfind.c:2837 +#: test/ippfind.c:2786 msgid " --quiet Quietly report match via exit code." msgstr "" " --quiet Кратко уведомлять о совпадении через код выхода." -#: test/ippfind.c:2838 +#: test/ippfind.c:2787 msgid " --remote True if service is remote." msgstr " --remote \"Истина\" если сервис удаленный." @@ -1215,23 +1215,23 @@ " --stop-after-include-error\n" " Останавливать проверку после ошибки INCLUDE." -#: test/ippfind.c:2848 +#: test/ippfind.c:2797 msgid " --true Always true." msgstr " --true Всегда Истина." -#: test/ippfind.c:2839 +#: test/ippfind.c:2788 msgid " --txt key True if the TXT record contains the key." msgstr " --txt key \"Истина\" если TXT запись содержит key." -#: test/ippfind.c:2840 +#: test/ippfind.c:2789 msgid " --txt-* regex Match TXT record key to regular expression." msgstr " --txt-* regex Найти запись TXT по регулярному выражению." -#: test/ippfind.c:2841 +#: test/ippfind.c:2790 msgid " --uri regex Match URI to regular expression." msgstr " --uri regex Найти URI по регулярному выражению." -#: test/ippfind.c:2810 +#: test/ippfind.c:2759 msgid " --version Show program version." msgstr " --version Показать версию программы." @@ -1239,11 +1239,11 @@ msgid " --version Show version." msgstr " --version Показать версию." -#: test/ippfind.c:2803 test/ipptool.c:5068 +#: test/ippfind.c:2752 test/ipptool.c:5068 msgid " -4 Connect using IPv4." msgstr " -4 Соединение используя IPv4." -#: test/ippfind.c:2804 test/ipptool.c:5069 +#: test/ippfind.c:2753 test/ipptool.c:5069 msgid " -6 Connect using IPv6." msgstr " -6 Соединение используя IPv6." @@ -1261,7 +1261,7 @@ msgid " -D name=value Set named variable to value." msgstr " -D name=value Определение переменной." -#: systemv/cupsaddsmb.c:277 systemv/cupsctl.c:239 +#: systemv/cupsaddsmb.c:277 systemv/cupsctl.c:198 msgid " -E Encrypt the connection." msgstr " -E Подключение к серверу шифруется." @@ -1270,7 +1270,7 @@ " -E Test with encryption using HTTP Upgrade to TLS." msgstr "" -#: scheduler/main.c:2100 +#: scheduler/main.c:2104 msgid "" " -F Run in the foreground but detach from console." msgstr "" @@ -1310,7 +1310,7 @@ msgid " -P filename.ppd Set PPD file." msgstr " -P filename.ppd Задать PPD-файл." -#: test/ippfind.c:2813 +#: test/ippfind.c:2762 msgid " -P number[-number] Match port to number or range." msgstr "" " -P number[-number] Найти номер порта по номеру или диапазону портов." @@ -1323,7 +1323,7 @@ msgid " -S Test with encryption using HTTPS." msgstr "" -#: test/ippfind.c:2805 +#: test/ippfind.c:2754 msgid " -T seconds Set the browse timeout in seconds." msgstr " -T seconds Задать время ожидания в секундах." @@ -1336,7 +1336,7 @@ msgid " -U username Specify username." msgstr " -U username Указание имени пользователя." -#: test/ippfind.c:2807 test/ipptool.c:5078 +#: test/ippfind.c:2756 test/ipptool.c:5078 msgid " -V version Set default IPP version." msgstr " -V version Задать версию IPP по умолчанию." @@ -1368,7 +1368,7 @@ msgid " -c cups-files.conf Set cups-files.conf file to use." msgstr " -c cups-files.conf Использовать заданный cups-files.conf" -#: scheduler/main.c:2098 +#: scheduler/main.c:2102 msgid " -c cupsd.conf Set cupsd.conf file to use." msgstr " -c cupsd.conf Использовать заданный cupsd.conf" @@ -1385,7 +1385,7 @@ msgid " -d printer Use the named printer." msgstr " -d printer Использовать заданный принтер." -#: test/ippfind.c:2814 +#: test/ippfind.c:2763 msgid " -d regex Match domain to regular expression." msgstr " -d regex Искать домен по регулярному выражению." @@ -1393,7 +1393,7 @@ msgid " -e Use every filter from the PPD file." msgstr " -e Использовать каждый фильтр из PPD-файла." -#: scheduler/main.c:2099 +#: scheduler/main.c:2103 msgid " -f Run in the foreground." msgstr " -f Запускать с высоким приоритетом." @@ -1401,7 +1401,7 @@ msgid " -f filename Set default request filename." msgstr " -f filename Задать имя файла по умолчанию." -#: scheduler/main.c:2101 +#: scheduler/main.c:2105 msgid " -h Show this usage message." msgstr " -h Show this usage message." @@ -1409,11 +1409,11 @@ msgid " -h Validate HTTP response headers." msgstr "" -#: test/ippfind.c:2815 +#: test/ippfind.c:2764 msgid " -h regex Match hostname to regular expression." msgstr " -h regex Найти hostname по регулярному выражению." -#: systemv/cupsaddsmb.c:282 systemv/cupsctl.c:241 +#: systemv/cupsaddsmb.c:282 systemv/cupsctl.c:200 msgid " -h server[:port] Specify server address." msgstr " -h server[:port] Задать адрес и порт сервера." @@ -1438,7 +1438,7 @@ " -j job-id[,N] Из указанного задания выбирается файл N (по " "умолчанию файл 1)." -#: test/ippfind.c:2816 +#: test/ippfind.c:2765 msgid " -l List attributes." msgstr " -l Список атрибутов." @@ -1446,7 +1446,7 @@ msgid " -l Produce plain text output." msgstr " -l Вывод в формате простого текста." -#: scheduler/main.c:2103 +#: scheduler/main.c:2107 msgid " -l Run cupsd on demand." msgstr " -l Запускать cupsd по запросу." @@ -1476,7 +1476,7 @@ msgstr "" " -n count Повтор последнего файла заданное число раз." -#: test/ippfind.c:2817 +#: test/ippfind.c:2766 msgid " -n regex Match service name to regular expression." msgstr " -n regex Найти имя по регулярному выражению." @@ -1495,7 +1495,7 @@ msgid " -o name=value Set option(s)." msgstr " -o name=value Задать параметры." -#: test/ippfind.c:2818 +#: test/ippfind.c:2767 msgid " -p Print URI if true." msgstr " -p Печать URI при соответствии." @@ -1503,7 +1503,7 @@ msgid " -p filename.ppd Set PPD file." msgstr " -p filename.ppd Задать PPD-файл." -#: test/ippfind.c:2819 +#: test/ippfind.c:2768 msgid " -q Quietly report match via exit code." msgstr "" " -q Кратко уведомлять о совпадении через код выхода." @@ -1512,7 +1512,7 @@ msgid " -q Run silently." msgstr " -q Команда выполняется в «тихом» режиме." -#: test/ippfind.c:2820 +#: test/ippfind.c:2769 msgid " -r True if service is remote." msgstr " -r \"Истина\" если сервис удаленный." @@ -1520,11 +1520,11 @@ msgid " -r Use 'relaxed' open mode." msgstr " -r Используется открытый режим." -#: test/ippfind.c:2821 +#: test/ippfind.c:2770 msgid " -s Print service name if true." msgstr " -s Печать имени сервиса если соответствует." -#: scheduler/main.c:2105 +#: scheduler/main.c:2109 msgid " -s cups-files.conf Set cups-files.conf file to use." msgstr "" @@ -1536,11 +1536,11 @@ msgid " -t Test PPDs instead of generating them." msgstr " -t Тест PPDs вместо его создания." -#: scheduler/main.c:2106 +#: scheduler/main.c:2110 msgid " -t Test the configuration file." msgstr " -t Проверка файла конфигурации." -#: test/ippfind.c:2822 +#: test/ippfind.c:2771 msgid " -t key True if the TXT record contains the key." msgstr " -t key \"Истина\" если TXT запись содержит key." @@ -1552,7 +1552,7 @@ msgid " -u Remove the PPD file when finished." msgstr " -u Удалить PPD-файл после завершения." -#: test/ippfind.c:2823 +#: test/ippfind.c:2772 msgid " -u regex Match URI to regular expression." msgstr " -u regex Найти URI по регулярному выражению." @@ -1564,7 +1564,7 @@ msgid " -vv Be very verbose." msgstr " -vv Очень подробный вывод лога." -#: test/ippfind.c:2824 +#: test/ippfind.c:2773 msgid "" " -x utility [argument ...] ;\n" " Execute program if true." @@ -1576,11 +1576,11 @@ msgid " -z Compress PPD files using GNU zip." msgstr " -z Сжимать PPD-файл используя GNU zip." -#: test/ippfind.c:2867 +#: test/ippfind.c:2816 msgid " IPPFIND_SERVICE_DOMAIN Domain name" msgstr " IPPFIND_SERVICE_DOMAIN Имя домена" -#: test/ippfind.c:2868 +#: test/ippfind.c:2817 msgid "" " IPPFIND_SERVICE_HOSTNAME\n" " Fully-qualified domain name" @@ -1588,31 +1588,31 @@ " IPPFIND_SERVICE_HOSTNAME\n" " Полный путь с учетом домена" -#: test/ippfind.c:2870 +#: test/ippfind.c:2819 msgid " IPPFIND_SERVICE_NAME Service instance name" msgstr " IPPFIND_SERVICE_NAME Имя сервиса" -#: test/ippfind.c:2871 +#: test/ippfind.c:2820 msgid " IPPFIND_SERVICE_PORT Port number" msgstr " IPPFIND_SERVICE_PORT Номер порта" -#: test/ippfind.c:2872 +#: test/ippfind.c:2821 msgid " IPPFIND_SERVICE_REGTYPE DNS-SD registration type" msgstr " IPPFIND_SERVICE_REGTYPE Тип регистрации DNS-SD" -#: test/ippfind.c:2873 +#: test/ippfind.c:2822 msgid " IPPFIND_SERVICE_SCHEME URI scheme" msgstr " IPPFIND_SERVICE_SCHEME Схема URI" -#: test/ippfind.c:2874 +#: test/ippfind.c:2823 msgid " IPPFIND_SERVICE_URI URI" msgstr " IPPFIND_SERVICE_URI URI" -#: test/ippfind.c:2875 +#: test/ippfind.c:2824 msgid " IPPFIND_TXT_* Value of TXT record key" msgstr " IPPFIND_TXT_* Значение TXT записи key" -#: test/ippfind.c:2850 +#: test/ippfind.c:2799 msgid "" " expression --and expression\n" " Logical AND." @@ -1620,7 +1620,7 @@ " expression --and expression\n" " Логическое И." -#: test/ippfind.c:2852 +#: test/ippfind.c:2801 msgid "" " expression --or expression\n" " Logical OR." @@ -1628,43 +1628,43 @@ " expression --or expression\n" " Логическое ИЛИ." -#: test/ippfind.c:2849 +#: test/ippfind.c:2798 msgid " expression expression Logical AND." msgstr " expression expression Логическое И." -#: test/ippfind.c:2857 +#: test/ippfind.c:2806 msgid " {service_domain} Domain name" msgstr " {service_domain} Имя домена" -#: test/ippfind.c:2858 +#: test/ippfind.c:2807 msgid " {service_hostname} Fully-qualified domain name" msgstr " {service_hostname} Полный путь с учетом домена" -#: test/ippfind.c:2859 +#: test/ippfind.c:2808 msgid " {service_name} Service instance name" msgstr " {service_name} Имя сервиса" -#: test/ippfind.c:2860 +#: test/ippfind.c:2809 msgid " {service_port} Port number" msgstr " {service_port} Номер порта" -#: test/ippfind.c:2861 +#: test/ippfind.c:2810 msgid " {service_regtype} DNS-SD registration type" msgstr " {service_regtype} Тип регистрации DNS-SD" -#: test/ippfind.c:2862 +#: test/ippfind.c:2811 msgid " {service_scheme} URI scheme" msgstr " {service_scheme} Схема URI" -#: test/ippfind.c:2863 +#: test/ippfind.c:2812 msgid " {service_uri} URI" msgstr " {service_uri} URI" -#: test/ippfind.c:2864 +#: test/ippfind.c:2813 msgid " {txt_*} Value of TXT record key" msgstr " {txt_*} Значение TXT записи key" -#: test/ippfind.c:2856 +#: test/ippfind.c:2805 msgid " {} URI" msgstr " {} URI" @@ -1752,7 +1752,7 @@ "\"%s\": Bad attribute name - invalid character (RFC 8011 section 5.1.4)." msgstr "" -#: cups/ipp.c:4777 +#: cups/ipp.c:4876 #, c-format msgid "\"%s\": Bad boolen value %d (RFC 8011 section 5.1.21)." msgstr "" @@ -2001,7 +2001,7 @@ msgstr "%s готов и печатает" #: filter/rastertoepson.c:999 filter/rastertohp.c:668 -#: filter/rastertolabel.c:1120 +#: filter/rastertolabel.c:1121 #, c-format msgid "%s job-id user title copies options [file]" msgstr "%s задание пользователь название копий параметры [файл]" @@ -2404,12 +2404,12 @@ msgid "%s: Unknown option \"%c\"." msgstr "%s: Неизвестный параметр \"%c\"." -#: tools/ippeveprinter.c:381 tools/ippeveprinter.c:566 tools/ippfind.c:627 +#: tools/ippeveprinter.c:414 tools/ippeveprinter.c:604 tools/ippfind.c:627 #, c-format msgid "%s: Unknown option \"%s\"." msgstr "%s: Неизвестный параметр \"%s\"." -#: tools/ippeveprinter.c:555 tools/ippfind.c:919 tools/ipptool.c:606 +#: tools/ippeveprinter.c:593 tools/ippfind.c:919 tools/ipptool.c:606 #, c-format msgid "%s: Unknown option \"-%c\"." msgstr "%s: Неизвестный параметр \"-%c\"." @@ -2448,159 +2448,159 @@ msgid "%s: Warning - mode option ignored." msgstr "%s: Внимание - параметр режима пропущен." -#: ppdc/sample.c:305 +#: ppdc/sample.c:308 msgid "-1" msgstr "-1" -#: ppdc/sample.c:296 +#: ppdc/sample.c:299 msgid "-10" msgstr "-10" -#: ppdc/sample.c:388 +#: ppdc/sample.c:391 msgid "-100" msgstr "-100" -#: ppdc/sample.c:387 +#: ppdc/sample.c:390 msgid "-105" msgstr "-105" -#: ppdc/sample.c:295 +#: ppdc/sample.c:298 msgid "-11" msgstr "-11" -#: ppdc/sample.c:386 +#: ppdc/sample.c:389 msgid "-110" msgstr "-110" -#: ppdc/sample.c:385 +#: ppdc/sample.c:388 msgid "-115" msgstr "-115" -#: ppdc/sample.c:294 +#: ppdc/sample.c:297 msgid "-12" msgstr "-12" -#: ppdc/sample.c:384 +#: ppdc/sample.c:387 msgid "-120" msgstr "-120" -#: ppdc/sample.c:293 +#: ppdc/sample.c:296 msgid "-13" msgstr "-13" -#: ppdc/sample.c:292 +#: ppdc/sample.c:295 msgid "-14" msgstr "-14" -#: ppdc/sample.c:291 +#: ppdc/sample.c:294 msgid "-15" msgstr "-15" -#: ppdc/sample.c:304 +#: ppdc/sample.c:307 msgid "-2" msgstr "-2" -#: ppdc/sample.c:404 +#: ppdc/sample.c:407 msgid "-20" msgstr "-20" -#: ppdc/sample.c:403 +#: ppdc/sample.c:406 msgid "-25" msgstr "-25" -#: ppdc/sample.c:303 +#: ppdc/sample.c:306 msgid "-3" msgstr "-3" -#: ppdc/sample.c:402 +#: ppdc/sample.c:405 msgid "-30" msgstr "-30" -#: ppdc/sample.c:401 +#: ppdc/sample.c:404 msgid "-35" msgstr "-35" -#: ppdc/sample.c:302 +#: ppdc/sample.c:305 msgid "-4" msgstr "-4" -#: ppdc/sample.c:400 +#: ppdc/sample.c:403 msgid "-40" msgstr "-40" -#: ppdc/sample.c:399 +#: ppdc/sample.c:402 msgid "-45" msgstr "-45" -#: ppdc/sample.c:301 +#: ppdc/sample.c:304 msgid "-5" msgstr "-5" -#: ppdc/sample.c:398 +#: ppdc/sample.c:401 msgid "-50" msgstr "-50" -#: ppdc/sample.c:397 +#: ppdc/sample.c:400 msgid "-55" msgstr "-55" -#: ppdc/sample.c:300 +#: ppdc/sample.c:303 msgid "-6" msgstr "-6" -#: ppdc/sample.c:396 +#: ppdc/sample.c:399 msgid "-60" msgstr "-60" -#: ppdc/sample.c:395 +#: ppdc/sample.c:398 msgid "-65" msgstr "-65" -#: ppdc/sample.c:299 +#: ppdc/sample.c:302 msgid "-7" msgstr "-7" -#: ppdc/sample.c:394 +#: ppdc/sample.c:397 msgid "-70" msgstr "-70" -#: ppdc/sample.c:393 +#: ppdc/sample.c:396 msgid "-75" msgstr "-75" -#: ppdc/sample.c:298 +#: ppdc/sample.c:301 msgid "-8" msgstr "-8" -#: ppdc/sample.c:392 +#: ppdc/sample.c:395 msgid "-80" msgstr "-80" -#: ppdc/sample.c:391 +#: ppdc/sample.c:394 msgid "-85" msgstr "-85" -#: ppdc/sample.c:297 +#: ppdc/sample.c:300 msgid "-9" msgstr "-9" -#: ppdc/sample.c:390 +#: ppdc/sample.c:393 msgid "-90" msgstr "-90" -#: ppdc/sample.c:389 +#: ppdc/sample.c:392 msgid "-95" msgstr "-95" -#: ppdc/sample.c:306 +#: ppdc/sample.c:309 msgid "0" msgstr "0" -#: ppdc/sample.c:307 +#: ppdc/sample.c:310 msgid "1" msgstr "1" -#: ppdc/sample.c:379 +#: ppdc/sample.c:382 msgid "1 inch/sec." msgstr "1 дюйм/с" @@ -2612,7 +2612,7 @@ msgid "1.25x2.25\"" msgstr "1,25x2,25\"" -#: ppdc/sample.c:427 +#: ppdc/sample.c:430 msgid "1.5 inch/sec." msgstr "1,5 дюйма/с" @@ -2632,11 +2632,11 @@ msgid "1.50x2.00\"" msgstr "1,50x2,00\"" -#: ppdc/sample.c:316 +#: ppdc/sample.c:319 msgid "10" msgstr "10" -#: ppdc/sample.c:438 +#: ppdc/sample.c:441 msgid "10 inches/sec." msgstr "10 дюймов/с" @@ -2652,39 +2652,39 @@ msgid "10 x 14" msgstr "10 x 14" -#: ppdc/sample.c:418 +#: ppdc/sample.c:421 msgid "100" msgstr "100" -#: ppdc/sample.c:329 +#: ppdc/sample.c:332 msgid "100 mm/sec." msgstr "100 мм/с" -#: ppdc/sample.c:419 +#: ppdc/sample.c:422 msgid "105" msgstr "105" -#: ppdc/sample.c:317 +#: ppdc/sample.c:320 msgid "11" msgstr "11" -#: ppdc/sample.c:439 +#: ppdc/sample.c:442 msgid "11 inches/sec." msgstr "11 дюймов/с" -#: ppdc/sample.c:420 +#: ppdc/sample.c:423 msgid "110" msgstr "110" -#: ppdc/sample.c:421 +#: ppdc/sample.c:424 msgid "115" msgstr "115" -#: ppdc/sample.c:318 +#: ppdc/sample.c:321 msgid "12" msgstr "12" -#: ppdc/sample.c:440 +#: ppdc/sample.c:443 msgid "12 inches/sec." msgstr "12 дюймов/с" @@ -2692,39 +2692,39 @@ msgid "12 x 11" msgstr "12 x 11" -#: ppdc/sample.c:422 +#: ppdc/sample.c:425 msgid "120" msgstr "120" -#: ppdc/sample.c:330 +#: ppdc/sample.c:333 msgid "120 mm/sec." msgstr "120 мм/с" -#: ppdc/sample.c:243 +#: ppdc/sample.c:247 msgid "120x60dpi" msgstr "120x60dpi" -#: ppdc/sample.c:249 +#: ppdc/sample.c:253 msgid "120x72dpi" msgstr "120x72dpi" -#: ppdc/sample.c:319 +#: ppdc/sample.c:322 msgid "13" msgstr "13" -#: ppdc/sample.c:232 +#: ppdc/sample.c:233 msgid "136dpi" msgstr "136dpi" -#: ppdc/sample.c:320 +#: ppdc/sample.c:323 msgid "14" msgstr "14" -#: ppdc/sample.c:321 +#: ppdc/sample.c:324 msgid "15" msgstr "15" -#: ppdc/sample.c:323 +#: ppdc/sample.c:326 msgid "15 mm/sec." msgstr "15 мм/с" @@ -2732,59 +2732,59 @@ msgid "15 x 11" msgstr "15 x 11" -#: ppdc/sample.c:331 +#: ppdc/sample.c:334 msgid "150 mm/sec." msgstr "150 мм/с" -#: ppdc/sample.c:278 +#: ppdc/sample.c:281 msgid "150dpi" msgstr "150dpi" -#: ppdc/sample.c:363 +#: ppdc/sample.c:366 msgid "16" msgstr "16" -#: ppdc/sample.c:364 +#: ppdc/sample.c:367 msgid "17" msgstr "17" -#: ppdc/sample.c:365 +#: ppdc/sample.c:368 msgid "18" msgstr "18" -#: ppdc/sample.c:244 +#: ppdc/sample.c:248 msgid "180dpi" msgstr "180dpi" -#: ppdc/sample.c:366 +#: ppdc/sample.c:369 msgid "19" msgstr "19" -#: ppdc/sample.c:308 +#: ppdc/sample.c:311 msgid "2" msgstr "2" -#: ppdc/sample.c:380 +#: ppdc/sample.c:383 msgid "2 inches/sec." msgstr "2 дюйма/с" -#: cups/ppd-cache.c:2996 +#: cups/ppd-cache.c:3012 msgid "2-Hole Punch (Landscape)" msgstr "" -#: cups/ppd-cache.c:2997 +#: cups/ppd-cache.c:3013 msgid "2-Hole Punch (Portrait)" msgstr "" -#: cups/ppd-cache.c:2995 +#: cups/ppd-cache.c:3011 msgid "2-Hole Punch (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:2994 +#: cups/ppd-cache.c:3010 msgid "2-Hole Punch (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3872 ppdc/sample.c:262 +#: cups/ppd-cache.c:3872 ppdc/sample.c:265 msgid "2-Sided Printing" msgstr "двусторонняя печать" @@ -2828,107 +2828,107 @@ msgid "2.25x1.25\"" msgstr "2,25x1,25\"" -#: ppdc/sample.c:188 +#: ppdc/sample.c:189 msgid "2.25x4.00\"" msgstr "2,25x4,00\"" -#: ppdc/sample.c:189 +#: ppdc/sample.c:190 msgid "2.25x5.50\"" msgstr "2,25x5,50\"" -#: ppdc/sample.c:190 +#: ppdc/sample.c:191 msgid "2.38x5.50\"" msgstr "2,38x5,50\"" -#: ppdc/sample.c:428 +#: ppdc/sample.c:431 msgid "2.5 inches/sec." msgstr "2,5 дюйма/с" -#: ppdc/sample.c:191 +#: ppdc/sample.c:192 msgid "2.50x1.00\"" msgstr "2,50x1,00\"" -#: ppdc/sample.c:192 +#: ppdc/sample.c:193 msgid "2.50x2.00\"" msgstr "2,50x2,00\"" -#: ppdc/sample.c:193 +#: ppdc/sample.c:194 msgid "2.75x1.25\"" msgstr "2,75x1,25\"" -#: ppdc/sample.c:194 +#: ppdc/sample.c:195 msgid "2.9 x 1\"" msgstr "2,9 x 1\"" -#: ppdc/sample.c:367 +#: ppdc/sample.c:370 msgid "20" msgstr "20" -#: ppdc/sample.c:324 +#: ppdc/sample.c:327 msgid "20 mm/sec." msgstr "20 мм/с" -#: ppdc/sample.c:332 +#: ppdc/sample.c:335 msgid "200 mm/sec." msgstr "200 мм/с" -#: ppdc/sample.c:233 +#: ppdc/sample.c:234 msgid "203dpi" msgstr "203dpi" -#: ppdc/sample.c:368 +#: ppdc/sample.c:371 msgid "21" msgstr "21" -#: ppdc/sample.c:369 +#: ppdc/sample.c:372 msgid "22" msgstr "22" -#: ppdc/sample.c:370 +#: ppdc/sample.c:373 msgid "23" msgstr "23" -#: ppdc/sample.c:371 +#: ppdc/sample.c:374 msgid "24" msgstr "24" -#: ppdc/sample.c:241 +#: ppdc/sample.c:245 msgid "24-Pin Series" msgstr "Тип 24-Pin" -#: ppdc/sample.c:250 +#: ppdc/sample.c:254 msgid "240x72dpi" msgstr "240x72dpi" -#: ppdc/sample.c:372 +#: ppdc/sample.c:375 msgid "25" msgstr "25" -#: ppdc/sample.c:333 +#: ppdc/sample.c:336 msgid "250 mm/sec." msgstr "250 мм/с" -#: ppdc/sample.c:373 +#: ppdc/sample.c:376 msgid "26" msgstr "26" -#: ppdc/sample.c:374 +#: ppdc/sample.c:377 msgid "27" msgstr "27" -#: ppdc/sample.c:375 +#: ppdc/sample.c:378 msgid "28" msgstr "28" -#: ppdc/sample.c:376 +#: ppdc/sample.c:379 msgid "29" msgstr "29" -#: ppdc/sample.c:309 +#: ppdc/sample.c:312 msgid "3" msgstr "3" -#: ppdc/sample.c:381 +#: ppdc/sample.c:384 msgid "3 inches/sec." msgstr "3 дюйма/с" @@ -2936,59 +2936,59 @@ msgid "3 x 5" msgstr "3 x 5" -#: cups/ppd-cache.c:3007 +#: cups/ppd-cache.c:3023 msgid "3-Hole Punch (Landscape)" msgstr "" -#: cups/ppd-cache.c:3005 +#: cups/ppd-cache.c:3021 msgid "3-Hole Punch (Portrait)" msgstr "" -#: cups/ppd-cache.c:3004 +#: cups/ppd-cache.c:3020 msgid "3-Hole Punch (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:3006 +#: cups/ppd-cache.c:3022 msgid "3-Hole Punch (Reverse Portrait)" msgstr "" -#: ppdc/sample.c:195 +#: ppdc/sample.c:196 msgid "3.00x1.00\"" msgstr "3,00x1,00\"" -#: ppdc/sample.c:196 +#: ppdc/sample.c:197 msgid "3.00x1.25\"" msgstr "3,00x1,25\"" -#: ppdc/sample.c:197 +#: ppdc/sample.c:198 msgid "3.00x2.00\"" msgstr "3,00x2,00\"" -#: ppdc/sample.c:198 +#: ppdc/sample.c:199 msgid "3.00x3.00\"" msgstr "3,00x3,00\"" -#: ppdc/sample.c:199 +#: ppdc/sample.c:200 msgid "3.00x5.00\"" msgstr "3,00x5,00\"" -#: ppdc/sample.c:200 +#: ppdc/sample.c:201 msgid "3.25x2.00\"" msgstr "3,25x2,00\"" -#: ppdc/sample.c:201 +#: ppdc/sample.c:202 msgid "3.25x5.00\"" msgstr "3,25x5,00\"" -#: ppdc/sample.c:202 +#: ppdc/sample.c:203 msgid "3.25x5.50\"" msgstr "3,25x5,50\"" -#: ppdc/sample.c:203 +#: ppdc/sample.c:204 msgid "3.25x5.83\"" msgstr "3,25x5,83\"" -#: ppdc/sample.c:204 +#: ppdc/sample.c:205 msgid "3.25x7.83\"" msgstr "3,25x7,83\"" @@ -3000,115 +3000,115 @@ msgid "3.5\" Disk" msgstr "Диск 3.5\"" -#: ppdc/sample.c:205 +#: ppdc/sample.c:206 msgid "3.50x1.00\"" msgstr "3,50x1,00\"" -#: ppdc/sample.c:377 +#: ppdc/sample.c:380 msgid "30" msgstr "30" -#: ppdc/sample.c:325 +#: ppdc/sample.c:328 msgid "30 mm/sec." msgstr "30 мм/с" -#: ppdc/sample.c:334 +#: ppdc/sample.c:337 msgid "300 mm/sec." msgstr "300 мм/с" -#: ppdc/sample.c:234 +#: ppdc/sample.c:235 msgid "300dpi" msgstr "300dpi" -#: ppdc/sample.c:405 +#: ppdc/sample.c:408 msgid "35" msgstr "35" -#: ppdc/sample.c:246 +#: ppdc/sample.c:250 msgid "360dpi" msgstr "360dpi" -#: ppdc/sample.c:245 +#: ppdc/sample.c:249 msgid "360x180dpi" msgstr "360x180dpi" -#: ppdc/sample.c:310 +#: ppdc/sample.c:313 msgid "4" msgstr "4" -#: ppdc/sample.c:382 +#: ppdc/sample.c:385 msgid "4 inches/sec." msgstr "4 дюйма/с" -#: cups/ppd-cache.c:3001 +#: cups/ppd-cache.c:3017 msgid "4-Hole Punch (Landscape)" msgstr "" -#: cups/ppd-cache.c:2999 +#: cups/ppd-cache.c:3015 msgid "4-Hole Punch (Portrait)" msgstr "" -#: cups/ppd-cache.c:2998 +#: cups/ppd-cache.c:3014 msgid "4-Hole Punch (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:3000 +#: cups/ppd-cache.c:3016 msgid "4-Hole Punch (Reverse Portrait)" msgstr "" -#: ppdc/sample.c:206 +#: ppdc/sample.c:207 msgid "4.00x1.00\"" msgstr "4,00x1,00\"" -#: ppdc/sample.c:214 +#: ppdc/sample.c:215 msgid "4.00x13.00\"" msgstr "4,00x13,00\"" -#: ppdc/sample.c:207 +#: ppdc/sample.c:208 msgid "4.00x2.00\"" msgstr "4,00x2,00\"" -#: ppdc/sample.c:208 +#: ppdc/sample.c:209 msgid "4.00x2.50\"" msgstr "4,00x2,50\"" -#: ppdc/sample.c:209 +#: ppdc/sample.c:210 msgid "4.00x3.00\"" msgstr "4,00x3,00\"" -#: ppdc/sample.c:210 +#: ppdc/sample.c:211 msgid "4.00x4.00\"" msgstr "4,00x4,00\"" -#: ppdc/sample.c:211 +#: ppdc/sample.c:212 msgid "4.00x5.00\"" msgstr "4,00x5,00\"" -#: ppdc/sample.c:212 +#: ppdc/sample.c:213 msgid "4.00x6.00\"" msgstr "4,00x6,00\"" -#: ppdc/sample.c:213 +#: ppdc/sample.c:214 msgid "4.00x6.50\"" msgstr "4,00x6,50\"" -#: ppdc/sample.c:406 +#: ppdc/sample.c:409 msgid "40" msgstr "40" -#: ppdc/sample.c:326 +#: ppdc/sample.c:329 msgid "40 mm/sec." msgstr "40 мм/с" -#: ppdc/sample.c:407 +#: ppdc/sample.c:410 msgid "45" msgstr "45" -#: ppdc/sample.c:311 +#: ppdc/sample.c:314 msgid "5" msgstr "5" -#: ppdc/sample.c:432 +#: ppdc/sample.c:435 msgid "5 inches/sec." msgstr "5 дюймов/с" @@ -3116,79 +3116,79 @@ msgid "5 x 7" msgstr "5 x 7" -#: ppdc/sample.c:408 +#: ppdc/sample.c:411 msgid "50" msgstr "50" -#: ppdc/sample.c:409 +#: ppdc/sample.c:412 msgid "55" msgstr "55" -#: ppdc/sample.c:312 +#: ppdc/sample.c:315 msgid "6" msgstr "6" -#: ppdc/sample.c:433 +#: ppdc/sample.c:436 msgid "6 inches/sec." msgstr "6 дюймов/с" -#: ppdc/sample.c:215 +#: ppdc/sample.c:216 msgid "6.00x1.00\"" msgstr "6,00x1,00\"" -#: ppdc/sample.c:216 +#: ppdc/sample.c:217 msgid "6.00x2.00\"" msgstr "6,00x2,00\"" -#: ppdc/sample.c:217 +#: ppdc/sample.c:218 msgid "6.00x3.00\"" msgstr "6,00x3,00\"" -#: ppdc/sample.c:218 +#: ppdc/sample.c:219 msgid "6.00x4.00\"" msgstr "6,00x4,00\"" -#: ppdc/sample.c:219 +#: ppdc/sample.c:220 msgid "6.00x5.00\"" msgstr "6,00x5,00\"" -#: ppdc/sample.c:220 +#: ppdc/sample.c:221 msgid "6.00x6.00\"" msgstr "6,00x6,00\"" -#: ppdc/sample.c:221 +#: ppdc/sample.c:222 msgid "6.00x6.50\"" msgstr "6,00x6,50\"" -#: ppdc/sample.c:410 +#: ppdc/sample.c:413 msgid "60" msgstr "60" -#: ppdc/sample.c:327 +#: ppdc/sample.c:330 msgid "60 mm/sec." msgstr "60 мм/с" -#: ppdc/sample.c:253 +#: ppdc/sample.c:257 msgid "600dpi" msgstr "600dpi" -#: ppdc/sample.c:242 +#: ppdc/sample.c:246 msgid "60dpi" msgstr "60dpi" -#: ppdc/sample.c:248 +#: ppdc/sample.c:252 msgid "60x72dpi" msgstr "60x72dpi" -#: ppdc/sample.c:411 +#: ppdc/sample.c:414 msgid "65" msgstr "65" -#: ppdc/sample.c:313 +#: ppdc/sample.c:316 msgid "7" msgstr "7" -#: ppdc/sample.c:435 +#: ppdc/sample.c:438 msgid "7 inches/sec." msgstr "7 дюймов/с" @@ -3196,19 +3196,19 @@ msgid "7 x 9" msgstr "7 x 9" -#: ppdc/sample.c:412 +#: ppdc/sample.c:415 msgid "70" msgstr "70" -#: ppdc/sample.c:413 +#: ppdc/sample.c:416 msgid "75" msgstr "75" -#: ppdc/sample.c:314 +#: ppdc/sample.c:317 msgid "8" msgstr "8" -#: ppdc/sample.c:436 +#: ppdc/sample.c:439 msgid "8 inches/sec." msgstr "8 дюймов/с" @@ -3216,51 +3216,51 @@ msgid "8 x 10" msgstr "8 x 10" -#: ppdc/sample.c:222 +#: ppdc/sample.c:223 msgid "8.00x1.00\"" msgstr "8,00x1,00\"" -#: ppdc/sample.c:223 +#: ppdc/sample.c:224 msgid "8.00x2.00\"" msgstr "8,00x2,00\"" -#: ppdc/sample.c:224 +#: ppdc/sample.c:225 msgid "8.00x3.00\"" msgstr "8,00x3,00\"" -#: ppdc/sample.c:225 +#: ppdc/sample.c:226 msgid "8.00x4.00\"" msgstr "8,00x4,00\"" -#: ppdc/sample.c:226 +#: ppdc/sample.c:227 msgid "8.00x5.00\"" msgstr "8,00x5,00\"" -#: ppdc/sample.c:227 +#: ppdc/sample.c:228 msgid "8.00x6.00\"" msgstr "8,00x6,00\"" -#: ppdc/sample.c:228 +#: ppdc/sample.c:229 msgid "8.00x6.50\"" msgstr "8,00x6,50\"" -#: ppdc/sample.c:414 +#: ppdc/sample.c:417 msgid "80" msgstr "80" -#: ppdc/sample.c:328 +#: ppdc/sample.c:331 msgid "80 mm/sec." msgstr "80 мм/с" -#: ppdc/sample.c:415 +#: ppdc/sample.c:418 msgid "85" msgstr "85" -#: ppdc/sample.c:315 +#: ppdc/sample.c:318 msgid "9" msgstr "9" -#: ppdc/sample.c:437 +#: ppdc/sample.c:440 msgid "9 inches/sec." msgstr "9 дюймов/с" @@ -3272,15 +3272,15 @@ msgid "9 x 12" msgstr "9 x 12" -#: ppdc/sample.c:247 +#: ppdc/sample.c:251 msgid "9-Pin Series" msgstr "Тип 9-Pin" -#: ppdc/sample.c:416 +#: ppdc/sample.c:419 msgid "90" msgstr "90" -#: ppdc/sample.c:417 +#: ppdc/sample.c:420 msgid "95" msgstr "95" @@ -3288,11 +3288,11 @@ msgid "?Invalid help command unknown." msgstr "" -#: cgi-bin/admin.c:2353 +#: cgi-bin/admin.c:2352 msgid "A Samba password is required to export printer drivers" msgstr "Для экспорта драйверов принтера требуется пароль Samba" -#: cgi-bin/admin.c:2349 +#: cgi-bin/admin.c:2348 msgid "A Samba username is required to export printer drivers" msgstr "Для экспорта драйверов принтера требуется имя пользователя Samba" @@ -3446,11 +3446,11 @@ msgid "Accept Jobs" msgstr "Принять задания" -#: cups/http-support.c:1494 +#: cups/http-support.c:1499 msgid "Accepted" msgstr "Принято" -#: cups/ppd-cache.c:2977 +#: cups/ppd-cache.c:2993 msgid "Accordian Fold" msgstr "" @@ -3475,23 +3475,23 @@ msgid "Administration" msgstr "Администрирование" -#: cups/ppd-cache.c:3485 +#: cups/ppd-cache.c:3472 msgid "Advanced Photo Paper" msgstr "" -#: cups/ppd-cache.c:3398 +#: cups/ppd-cache.c:3386 msgid "Alternate" msgstr "" -#: cups/ppd-cache.c:3406 +#: cups/ppd-cache.c:3394 msgid "Alternate Roll" msgstr "" -#: cups/ppd-cache.c:3479 +#: cups/ppd-cache.c:3466 msgid "Aluminum" msgstr "" -#: ppdc/sample.c:424 +#: ppdc/sample.c:427 msgid "Always" msgstr "Всегда" @@ -3499,23 +3499,23 @@ msgid "AppSocket/HP JetDirect" msgstr "AppSocket/HP JetDirect" -#: ppdc/sample.c:445 +#: ppdc/sample.c:448 msgid "Applicator" msgstr "Исполнительное устройство" -#: cups/ppd-cache.c:3513 +#: cups/ppd-cache.c:3500 msgid "Archival Envelope" msgstr "" -#: cups/ppd-cache.c:3525 +#: cups/ppd-cache.c:3512 msgid "Archival Fabric" msgstr "" -#: cups/ppd-cache.c:3602 +#: cups/ppd-cache.c:3589 msgid "Archival Paper" msgstr "" -#: cups/ppd-cache.c:3574 +#: cups/ppd-cache.c:3561 msgid "Archival Photo Paper" msgstr "" @@ -3539,7 +3539,7 @@ msgid "Attribute groups are out of order (%x < %x)." msgstr "Атрибут группы не в диапазоне (%x < %x)" -#: cups/ppd-cache.c:3396 cups/ppd-cache.c:3480 cups/ppd-cache.c:3803 +#: cups/ppd-cache.c:3384 cups/ppd-cache.c:3467 cups/ppd-cache.c:3771 msgid "Automatic" msgstr "" @@ -3591,7 +3591,7 @@ msgid "B9" msgstr "B9" -#: cups/ppd-cache.c:3481 +#: cups/ppd-cache.c:3468 msgid "Back Print Film" msgstr "" @@ -3633,7 +3633,7 @@ msgid "Bad PPD file." msgstr "Недопустимый файл PPD." -#: cups/http-support.c:1512 +#: cups/http-support.c:1517 msgid "Bad Request" msgstr "Неверный запрос" @@ -3645,7 +3645,7 @@ msgid "Bad UIConstraints" msgstr "Неверное значение UIConstraints" -#: cups/hash.c:48 cups/http-support.c:1606 +#: cups/hash.c:49 cups/http-support.c:1611 msgid "Bad arguments to function" msgstr "Неверные аргументы для функции" @@ -3658,7 +3658,7 @@ msgid "Bad custom parameter" msgstr "Неверный индивидуальный параметр" -#: cups/http-support.c:1746 scheduler/ipp.c:2365 +#: cups/http-support.c:1751 scheduler/ipp.c:2365 #, c-format msgid "Bad device-uri \"%s\"." msgstr "Неверное значение device-uri \"%s\"." @@ -3682,7 +3682,7 @@ msgid "Bad filename buffer" msgstr "Ошибка в буфере filename" -#: cups/http-support.c:1615 +#: cups/http-support.c:1620 msgid "Bad hostname/address in URI" msgstr "Неверный hostname/address в URI" @@ -3745,7 +3745,7 @@ msgid "Bad page-ranges values %d-%d." msgstr "Неверные значения page-ranges %d-%d." -#: cups/http-support.c:1612 +#: cups/http-support.c:1617 msgid "Bad port number in URI" msgstr "Неверный номер порта в URI" @@ -3778,19 +3778,19 @@ msgid "Bad requesting-user-name value: %s" msgstr "" -#: cups/http-support.c:1609 +#: cups/http-support.c:1614 msgid "Bad resource in URI" msgstr "Недопустимый ресурс в URI" -#: cups/http-support.c:1621 +#: cups/http-support.c:1626 msgid "Bad scheme in URI" msgstr "Недопустимая схема в URI" -#: cgi-bin/admin.c:1469 +#: cgi-bin/admin.c:1468 msgid "Bad subscription ID" msgstr "Неверный ID подписки" -#: cups/http-support.c:1618 +#: cups/http-support.c:1623 msgid "Bad username in URI" msgstr "Неверное имя пользователя в URI" @@ -3798,11 +3798,11 @@ msgid "Bad value string" msgstr "Неверная строка значений" -#: cups/http-support.c:1624 +#: cups/http-support.c:1629 msgid "Bad/empty URI" msgstr "Неверный или пустой URI" -#: cups/ppd-cache.c:2962 +#: cups/ppd-cache.c:2978 msgid "Bale" msgstr "" @@ -3810,39 +3810,39 @@ msgid "Banners" msgstr "Баннеры" -#: cups/ppd-cache.c:2963 +#: cups/ppd-cache.c:2979 msgid "Bind" msgstr "" -#: cups/ppd-cache.c:2967 +#: cups/ppd-cache.c:2983 msgid "Bind (Landscape)" msgstr "" -#: cups/ppd-cache.c:2965 +#: cups/ppd-cache.c:2981 msgid "Bind (Portrait)" msgstr "" -#: cups/ppd-cache.c:2964 +#: cups/ppd-cache.c:2980 msgid "Bind (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:2966 +#: cups/ppd-cache.c:2982 msgid "Bind (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3514 +#: cups/ppd-cache.c:3501 msgid "Bond Envelope" msgstr "" -#: ppdc/sample.c:282 +#: ppdc/sample.c:285 msgid "Bond Paper" msgstr "Документная бумага" -#: cups/ppd-cache.c:4152 +#: cups/ppd-cache.c:4277 msgid "Booklet" msgstr "" -#: cups/ppd-cache.c:2968 +#: cups/ppd-cache.c:2984 msgid "Booklet Maker" msgstr "" @@ -3851,11 +3851,11 @@ msgid "Boolean expected for waiteof option \"%s\"." msgstr "Параметр waiteof \"%s\" должен иметь двоичное значение" -#: cups/ppd-cache.c:3409 +#: cups/ppd-cache.c:3397 msgid "Bottom" msgstr "" -#: cups/ppd-cache.c:3804 +#: cups/ppd-cache.c:3772 msgid "Bottom Tray" msgstr "Нижний лоток" @@ -3863,15 +3863,15 @@ msgid "Buffer overflow detected, aborting." msgstr "Обнаружено переполнение буфера, прерывание." -#: cups/ppd-cache.c:3484 +#: cups/ppd-cache.c:3471 msgid "CD" msgstr "Компакт-диск" -#: ppdc/sample.c:277 +#: ppdc/sample.c:280 msgid "CMYK" msgstr "CMYK" -#: ppdc/sample.c:358 +#: ppdc/sample.c:361 msgid "CPCL Label Printer" msgstr "Принтер для печати этикеток CPCL" @@ -3879,11 +3879,11 @@ msgid "Cancel Jobs" msgstr "Отменить задания" -#: cgi-bin/admin.c:1470 cgi-bin/admin.c:1509 cgi-bin/admin.c:1519 +#: cgi-bin/admin.c:1469 cgi-bin/admin.c:1508 cgi-bin/admin.c:1518 msgid "Cancel RSS Subscription" msgstr "Отменить подписку на RSS" -#: backend/ipp.c:2287 +#: backend/ipp.c:2295 msgid "Canceling print job." msgstr "Отмена задания печати." @@ -3895,23 +3895,23 @@ msgid "Cannot share a remote Kerberized printer." msgstr "" -#: cups/ppd-cache.c:3482 +#: cups/ppd-cache.c:3469 msgid "Cardboard" msgstr "Упаковочный картон" -#: cups/ppd-cache.c:3483 +#: cups/ppd-cache.c:3470 msgid "Cardstock" msgstr "" -#: ppdc/sample.c:271 +#: ppdc/sample.c:274 msgid "Cassette" msgstr "Лоток" -#: cups/ppd-cache.c:3413 +#: cups/ppd-cache.c:3401 msgid "Center" msgstr "" -#: cups/ppd-cache.c:3805 +#: cups/ppd-cache.c:3773 msgid "Center Tray" msgstr "Центральный лоток" @@ -3937,27 +3937,27 @@ msgid "Close-Job doesn't support the job-uri attribute." msgstr "Close-Job не подерживает атрибут job-uri" -#: cups/ppd-cache.c:2969 +#: cups/ppd-cache.c:2985 msgid "Coat" msgstr "" -#: cups/ppd-cache.c:3515 +#: cups/ppd-cache.c:3502 msgid "Coated Envelope" msgstr "" -#: cups/ppd-cache.c:3603 +#: cups/ppd-cache.c:3590 msgid "Coated Paper" msgstr "Мелованная бумага" -#: cups/ppd-cache.c:3790 ppdc/sample.c:276 +#: cups/ppd-cache.c:3790 ppdc/sample.c:279 msgid "Color" msgstr "Цвет" -#: cups/ppd-cache.c:3751 ppdc/sample.c:274 +#: cups/ppd-cache.c:3751 ppdc/sample.c:277 msgid "Color Mode" msgstr "Цветной режим" -#: cups/ppd-cache.c:3550 +#: cups/ppd-cache.c:3537 msgid "Colored Labels" msgstr "" @@ -3975,59 +3975,59 @@ msgid "Community name uses indefinite length" msgstr "Для имени сообщества длина не установлена" -#: backend/ipp.c:865 backend/lpd.c:929 backend/socket.c:375 +#: backend/ipp.c:864 backend/lpd.c:933 backend/socket.c:375 msgid "Connected to printer." msgstr "Подключен к принтеру." -#: backend/ipp.c:701 backend/lpd.c:753 backend/socket.c:295 +#: backend/ipp.c:700 backend/lpd.c:757 backend/socket.c:295 msgid "Connecting to printer." msgstr "Подключение к принтеру" -#: cups/http-support.c:1482 +#: cups/http-support.c:1487 msgid "Continue" msgstr "Продолжить" -#: ppdc/sample.c:360 +#: ppdc/sample.c:363 msgid "Continuous" msgstr "Непрерывно" -#: cups/ppd-cache.c:3499 +#: cups/ppd-cache.c:3486 msgid "Continuous Long" msgstr "" -#: cups/ppd-cache.c:3500 +#: cups/ppd-cache.c:3487 msgid "Continuous Short" msgstr "" -#: backend/lpd.c:1078 backend/lpd.c:1210 +#: backend/lpd.c:1082 backend/lpd.c:1214 msgid "Control file sent successfully." msgstr "Контрольный файл успешно отправлен." -#: backend/ipp.c:1396 backend/lpd.c:445 +#: backend/ipp.c:1395 backend/lpd.c:449 msgid "Copying print data." msgstr "Копирование данных печати." -#: cups/ppd-cache.c:3516 +#: cups/ppd-cache.c:3503 msgid "Cotton Envelope" msgstr "" -#: cups/ppd-cache.c:3604 +#: cups/ppd-cache.c:3591 msgid "Cotton Paper" msgstr "" -#: cups/ppd-cache.c:2970 +#: cups/ppd-cache.c:2986 msgid "Cover" msgstr "" -#: cups/http-support.c:1491 +#: cups/http-support.c:1496 msgid "Created" msgstr "Создано" -#: cups/tls-darwin.c:748 cups/tls-gnutls.c:582 +#: cups/tls-darwin.c:723 cups/tls-gnutls.c:582 msgid "Credentials do not validate against site CA certificate." msgstr "" -#: cups/tls-darwin.c:759 cups/tls-gnutls.c:599 +#: cups/tls-darwin.c:734 cups/tls-gnutls.c:599 msgid "Credentials have expired." msgstr "Срок действия учётных данных истёк." @@ -4035,39 +4035,39 @@ msgid "Custom" msgstr "Индивидуальный" -#: ppdc/sample.c:354 +#: ppdc/sample.c:357 msgid "CustominCutInterval" msgstr "CustominCutInterval" -#: ppdc/sample.c:352 +#: ppdc/sample.c:355 msgid "CustominTearInterval" msgstr "CustominTearInterval" -#: ppdc/sample.c:338 +#: cups/ppd-cache.c:4312 ppdc/sample.c:341 msgid "Cut" msgstr "Обрезать" -#: cups/ppd-cache.c:3026 +#: cups/ppd-cache.c:3042 msgid "Cut Media" msgstr "" -#: ppdc/sample.c:446 +#: ppdc/sample.c:449 msgid "Cutter" msgstr "Резак" -#: cups/ppd-cache.c:3509 +#: cups/ppd-cache.c:3496 msgid "DVD" msgstr "DVD" -#: ppdc/sample.c:239 +#: ppdc/sample.c:243 msgid "Dark" msgstr "Темный" -#: ppdc/sample.c:235 +#: ppdc/sample.c:239 msgid "Darkness" msgstr "Затемненность" -#: backend/lpd.c:1163 +#: backend/lpd.c:1167 msgid "Data file sent successfully." msgstr "Файл данных успешно отправлен." @@ -4083,7 +4083,7 @@ msgid "Delete Printer" msgstr "Удалить принтер" -#: ppdc/sample.c:273 +#: ppdc/sample.c:276 msgid "DeskJet Series" msgstr "Серия DeskJet" @@ -4103,7 +4103,7 @@ " location = %s" msgstr "" -#: ppdc/sample.c:431 +#: ppdc/sample.c:434 msgid "Direct Thermal Media" msgstr "Носитель для термопечати" @@ -4132,11 +4132,11 @@ msgid "Directory \"%s\" permissions OK (0%o/uid=%d/gid=%d)." msgstr "Каталог \"%s\" доступ OK (0%o/uid=%d/gid=%d)." -#: ppdc/sample.c:340 +#: ppdc/sample.c:343 msgid "Disabled" msgstr "Отключено" -#: cups/ppd-cache.c:3402 +#: cups/ppd-cache.c:3390 msgid "Disc" msgstr "" @@ -4145,40 +4145,40 @@ msgid "Document #%d does not exist in job #%d." msgstr "Документ #%d не существует в задании #%d." -#: cups/ppd-cache.c:2978 +#: cups/ppd-cache.c:2994 msgid "Double Gate Fold" msgstr "" -#: cups/ppd-cache.c:3019 +#: cups/ppd-cache.c:3035 msgid "Double Staple (Landscape)" msgstr "" -#: cups/ppd-cache.c:3017 +#: cups/ppd-cache.c:3033 msgid "Double Staple (Portrait)" msgstr "" -#: cups/ppd-cache.c:3016 +#: cups/ppd-cache.c:3032 msgid "Double Staple (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:3018 +#: cups/ppd-cache.c:3034 msgid "Double Staple (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3507 +#: cups/ppd-cache.c:3494 msgid "Double Wall Cardboard" msgstr "" -#: cups/ppd-cache.c:4283 cups/ppd-cache.c:4285 cups/ppd-cache.c:4348 -#: cups/ppd-cache.c:4385 +#: cups/ppd-cache.c:4471 cups/ppd-cache.c:4473 cups/ppd-cache.c:4536 +#: cups/ppd-cache.c:4573 msgid "Draft" msgstr "" -#: cups/ppd-cache.c:3508 +#: cups/ppd-cache.c:3495 msgid "Dry Film" msgstr "" -#: ppdc/sample.c:267 +#: ppdc/sample.c:270 msgid "Duplexer" msgstr "Дуплексер" @@ -4186,11 +4186,11 @@ msgid "Dymo" msgstr "Dymo" -#: ppdc/sample.c:426 +#: ppdc/sample.c:429 msgid "EPL1 Label Printer" msgstr "Принтер для печати этикеток EPL1" -#: ppdc/sample.c:429 +#: ppdc/sample.c:432 msgid "EPL2 Label Printer" msgstr "Принтер для печати этикеток EPL2" @@ -4200,7 +4200,7 @@ msgid "Edit Configuration File" msgstr "Редактировать файл конфигурации" -#: cups/ppd-cache.c:3510 +#: cups/ppd-cache.c:3497 msgid "Embossing Foil" msgstr "" @@ -4212,7 +4212,7 @@ msgid "Encryption is not supported." msgstr "Шифрование не поддерживается." -#: cups/ppd-cache.c:3511 +#: cups/ppd-cache.c:3498 msgid "End Board" msgstr "" @@ -4221,7 +4221,7 @@ msgid "Ending Banner" msgstr "Конечный баннер" -#: cups/ppd-cache.c:2979 +#: cups/ppd-cache.c:2995 msgid "Engineering Z Fold" msgstr "" @@ -4239,7 +4239,7 @@ "получить доступ к этой странице. Если используется проверка подлинности " "Kerberos, необходимо также иметь действительный билет Kerberos." -#: cups/ppd-cache.c:3401 cups/ppd-cache.c:3512 +#: cups/ppd-cache.c:3389 cups/ppd-cache.c:3499 msgid "Envelope" msgstr "" @@ -4331,7 +4331,7 @@ msgid "Envelope DL" msgstr "Конверт DL" -#: ppdc/sample.c:261 +#: ppdc/sample.c:264 msgid "Envelope Feed" msgstr "Подача конвертов" @@ -4459,7 +4459,7 @@ msgid "Environment Variables:" msgstr "Переменные среды:" -#: ppdc/sample.c:240 +#: ppdc/sample.c:244 msgid "Epson" msgstr "Epson" @@ -4488,51 +4488,51 @@ msgid "European Fanfold Legal" msgstr "" -#: ppdc/sample.c:350 +#: ppdc/sample.c:353 msgid "Every 10 Labels" msgstr "Каждые 10 этикеток" -#: ppdc/sample.c:342 +#: ppdc/sample.c:345 msgid "Every 2 Labels" msgstr "Каждые 2 этикетки" -#: ppdc/sample.c:343 +#: ppdc/sample.c:346 msgid "Every 3 Labels" msgstr "Каждые 3 этикетки" -#: ppdc/sample.c:344 +#: ppdc/sample.c:347 msgid "Every 4 Labels" msgstr "Каждые 4 этикетки" -#: ppdc/sample.c:345 +#: ppdc/sample.c:348 msgid "Every 5 Labels" msgstr "Каждые 5 этикеток" -#: ppdc/sample.c:346 +#: ppdc/sample.c:349 msgid "Every 6 Labels" msgstr "Каждые 6 этикеток" -#: ppdc/sample.c:347 +#: ppdc/sample.c:350 msgid "Every 7 Labels" msgstr "Каждые 7 этикеток" -#: ppdc/sample.c:348 +#: ppdc/sample.c:351 msgid "Every 8 Labels" msgstr "Каждые 8 этикеток" -#: ppdc/sample.c:349 +#: ppdc/sample.c:352 msgid "Every 9 Labels" msgstr "Каждые 9 этикеток" -#: ppdc/sample.c:341 +#: ppdc/sample.c:344 msgid "Every Label" msgstr "Каждая этикетка" -#: cups/ppd-cache.c:3490 +#: cups/ppd-cache.c:3477 msgid "Everyday Glossy Photo Paper" msgstr "" -#: cups/ppd-cache.c:3491 +#: cups/ppd-cache.c:3478 msgid "Everyday Matte Paper" msgstr "" @@ -4540,11 +4540,11 @@ msgid "Executive" msgstr "Executive" -#: cups/http-support.c:1540 +#: cups/http-support.c:1545 msgid "Expectation Failed" msgstr "Сбой ожидания" -#: cgi-bin/admin.c:2341 cgi-bin/admin.c:2360 +#: cgi-bin/admin.c:2340 cgi-bin/admin.c:2359 msgid "Export Printers to Samba" msgstr "Экспортировать принтеры в Samba" @@ -4552,7 +4552,7 @@ msgid "Expressions:" msgstr "Выражение:" -#: cups/ppd-cache.c:3492 +#: cups/ppd-cache.c:3479 msgid "Extra Heavyweight Paper" msgstr "" @@ -4566,15 +4566,15 @@ msgid "FAIL" msgstr "FAIL" -#: cups/ppd-cache.c:3524 +#: cups/ppd-cache.c:3511 msgid "Fabric" msgstr "" -#: cups/ppd-cache.c:3806 +#: cups/ppd-cache.c:3774 msgid "Face Down" msgstr "Лицом вниз" -#: cups/ppd-cache.c:3807 +#: cups/ppd-cache.c:3775 msgid "Face Up" msgstr "Лицом вверх" @@ -4620,37 +4620,37 @@ "URI-адреса файлового устройства отключены! Чтобы включить их, используйте " "параметр FileDevice в \"%s/cups-files.conf\"." -#: cups/ppd-cache.c:3531 +#: cups/ppd-cache.c:3518 msgid "Film" msgstr "" -#: cups/ppd-cache.c:3517 +#: cups/ppd-cache.c:3504 msgid "Fine Envelope" msgstr "" #: filter/rastertoepson.c:1131 filter/rastertohp.c:802 -#: filter/rastertolabel.c:1259 +#: filter/rastertolabel.c:1260 #, c-format msgid "Finished page %d." msgstr "Последняя страница %d." -#: cups/ppd-cache.c:3532 +#: cups/ppd-cache.c:3519 msgid "Flexo Base" msgstr "" -#: cups/ppd-cache.c:3533 +#: cups/ppd-cache.c:3520 msgid "Flexo Photo Polymer" msgstr "" -#: cups/ppd-cache.c:3534 +#: cups/ppd-cache.c:3521 msgid "Flute" msgstr "" -#: cups/ppd-cache.c:3535 +#: cups/ppd-cache.c:3522 msgid "Foil" msgstr "" -#: cups/ppd-cache.c:4061 +#: cups/ppd-cache.c:4134 msgid "Fold" msgstr "" @@ -4658,19 +4658,19 @@ msgid "Folio" msgstr "Фолио" -#: cups/http-support.c:1519 +#: cups/http-support.c:1524 msgid "Forbidden" msgstr "Запрещено" -#: cups/http-support.c:1503 +#: cups/http-support.c:1508 msgid "Found" msgstr "" -#: cups/ppd-cache.c:3536 +#: cups/ppd-cache.c:3523 msgid "Full Cut Tabs" msgstr "" -#: cups/ppd-cache.c:2980 +#: cups/ppd-cache.c:2996 msgid "Gate Fold" msgstr "" @@ -4678,7 +4678,7 @@ msgid "General" msgstr "Основные" -#: ppdc/sample.c:251 +#: ppdc/sample.c:255 msgid "Generic" msgstr "Общее" @@ -4686,47 +4686,47 @@ msgid "Get-Response-PDU uses indefinite length" msgstr "Для Get-Response-PDU длина не установлена" -#: cups/ppd-cache.c:3537 +#: cups/ppd-cache.c:3524 msgid "Glass" msgstr "" -#: cups/ppd-cache.c:3538 +#: cups/ppd-cache.c:3525 msgid "Glass Colored" msgstr "" -#: cups/ppd-cache.c:3539 +#: cups/ppd-cache.c:3526 msgid "Glass Opaque" msgstr "" -#: cups/ppd-cache.c:3540 +#: cups/ppd-cache.c:3527 msgid "Glass Surfaced" msgstr "" -#: cups/ppd-cache.c:3541 +#: cups/ppd-cache.c:3528 msgid "Glass Textured" msgstr "" -#: cups/ppd-cache.c:3486 +#: cups/ppd-cache.c:3473 msgid "Glossy Brochure Paper" msgstr "" -#: cups/ppd-cache.c:3526 +#: cups/ppd-cache.c:3513 msgid "Glossy Fabric" msgstr "" -#: cups/ppd-cache.c:3551 +#: cups/ppd-cache.c:3538 msgid "Glossy Labels" msgstr "" -#: cups/ppd-cache.c:3502 +#: cups/ppd-cache.c:3489 msgid "Glossy Optical Disc" msgstr "" -#: ppdc/sample.c:285 +#: ppdc/sample.c:288 msgid "Glossy Paper" msgstr "Глянцевая бумага" -#: cups/ppd-cache.c:3576 +#: cups/ppd-cache.c:3563 msgid "Glossy Photo Paper" msgstr "Глянцевая фотобумага" @@ -4737,27 +4737,27 @@ msgid "Got a printer-uri attribute but no job-id." msgstr "Получен атрибут printer-uri, но не job-id" -#: cups/ppd-cache.c:3542 +#: cups/ppd-cache.c:3529 msgid "Gravure Cylinder" msgstr "" -#: cups/ppd-cache.c:3767 cups/ppd-cache.c:3778 ppdc/sample.c:275 +#: cups/ppd-cache.c:3767 cups/ppd-cache.c:3778 ppdc/sample.c:278 msgid "Grayscale" msgstr "Оттенки серого" -#: ppdc/sample.c:272 +#: ppdc/sample.c:275 msgid "HP" msgstr "HP" -#: cups/ppd-cache.c:3404 +#: cups/ppd-cache.c:3392 msgid "Hagaki" msgstr "" -#: cups/ppd-cache.c:2981 +#: cups/ppd-cache.c:2997 msgid "Half Fold" msgstr "" -#: cups/ppd-cache.c:2982 +#: cups/ppd-cache.c:2998 msgid "Half Z Fold" msgstr "" @@ -4765,19 +4765,19 @@ msgid "Hanging Folder" msgstr "Папка подвесного хранения" -#: cups/hash.c:292 +#: cups/hash.c:289 msgid "Hash buffer too small." msgstr "" -#: cups/ppd-cache.c:3607 +#: cups/ppd-cache.c:3594 msgid "Heavyweight Coated Paper" msgstr "" -#: cups/ppd-cache.c:3518 +#: cups/ppd-cache.c:3505 msgid "Heavyweight Envelope" msgstr "" -#: cups/ppd-cache.c:3606 +#: cups/ppd-cache.c:3593 msgid "Heavyweight Paper" msgstr "" @@ -4785,23 +4785,23 @@ msgid "Help file not in index." msgstr "Файл справки не проиндексирован." -#: cups/ppd-cache.c:4290 cups/ppd-cache.c:4359 cups/ppd-cache.c:4390 +#: cups/ppd-cache.c:4478 cups/ppd-cache.c:4547 cups/ppd-cache.c:4578 msgid "High" msgstr "" -#: cups/ppd-cache.c:3527 +#: cups/ppd-cache.c:3514 msgid "High Gloss Fabric" msgstr "" -#: cups/ppd-cache.c:3552 +#: cups/ppd-cache.c:3539 msgid "High Gloss Labels" msgstr "" -#: cups/ppd-cache.c:3503 +#: cups/ppd-cache.c:3490 msgid "High Gloss Optical Disc" msgstr "" -#: cups/ppd-cache.c:3577 +#: cups/ppd-cache.c:3564 msgid "High Gloss Photo Paper" msgstr "" @@ -4921,43 +4921,43 @@ msgid "Illegal whitespace character" msgstr "Недействительный символ пробела" -#: cups/ppd-cache.c:3543 +#: cups/ppd-cache.c:3530 msgid "Image Setter Paper" msgstr "" -#: cups/ppd-cache.c:3544 +#: cups/ppd-cache.c:3531 msgid "Imaging Cylinder" msgstr "" -#: cups/ppd-cache.c:3519 +#: cups/ppd-cache.c:3506 msgid "Inkjet Envelope" msgstr "" -#: cups/ppd-cache.c:3553 +#: cups/ppd-cache.c:3540 msgid "Inkjet Labels" msgstr "" -#: cups/ppd-cache.c:3608 +#: cups/ppd-cache.c:3595 msgid "Inkjet Paper" msgstr "" -#: ppdc/sample.c:266 +#: ppdc/sample.c:269 msgid "Installable Options" msgstr "Параметры, разрешенные к установке" -#: ppdc/sample.c:269 +#: ppdc/sample.c:272 msgid "Installed" msgstr "Установлено" -#: ppdc/sample.c:288 +#: ppdc/sample.c:291 msgid "IntelliBar Label Printer" msgstr "Принтер для печати этикеток IntelliBar" -#: ppdc/sample.c:287 +#: ppdc/sample.c:290 msgid "Intellitech" msgstr "Intellitech" -#: cups/http-support.c:1546 +#: cups/http-support.c:1551 msgid "Internal Server Error" msgstr "Внутренняя Ошибка сервера" @@ -4973,7 +4973,7 @@ msgid "Internet Postage 3-Part" msgstr "Наклейки Internet Postage 3-Part" -#: backend/ipp.c:319 +#: backend/ipp.c:318 msgid "Internet Printing Protocol" msgstr "Протокол интернет-печати" @@ -5140,31 +5140,31 @@ msgid "Jobs" msgstr "Задания" -#: cups/ppd-cache.c:2989 +#: cups/ppd-cache.c:3005 msgid "Jog" msgstr "" -#: backend/lpd.c:162 +#: backend/lpd.c:166 msgid "LPD/LPR Host or Printer" msgstr "Хост или принтер LPD/LPR" -#: ppdc/sample.c:230 +#: ppdc/sample.c:231 msgid "Label Printer" msgstr "Принтер для печати этикеток" -#: ppdc/sample.c:441 +#: ppdc/sample.c:444 msgid "Label Top" msgstr "Верхний край этикетки" -#: cups/ppd-cache.c:3549 +#: cups/ppd-cache.c:3536 msgid "Labels" msgstr "" -#: cups/ppd-cache.c:2990 +#: cups/ppd-cache.c:3006 msgid "Laminate" msgstr "" -#: cups/ppd-cache.c:3559 +#: cups/ppd-cache.c:3546 msgid "Laminating Foil" msgstr "" @@ -5177,31 +5177,31 @@ msgid "Large Address" msgstr "Полный адрес" -#: cups/ppd-cache.c:3399 +#: cups/ppd-cache.c:3387 msgid "Large Capacity" msgstr "" -#: cups/ppd-cache.c:3808 +#: cups/ppd-cache.c:3776 msgid "Large Capacity Tray" msgstr "Лоток повышенной вместимости" -#: ppdc/sample.c:286 +#: ppdc/sample.c:289 msgid "LaserJet Series PCL 4/5" msgstr "Серия LaserJet, PCL 4/5" -#: cups/ppd-cache.c:3411 +#: cups/ppd-cache.c:3399 msgid "Left" msgstr "" -#: cups/ppd-cache.c:2983 +#: cups/ppd-cache.c:2999 msgid "Left Gate Fold" msgstr "" -#: cups/ppd-cache.c:3809 +#: cups/ppd-cache.c:3777 msgid "Left Tray" msgstr "" -#: cups/ppd-cache.c:2984 +#: cups/ppd-cache.c:3000 msgid "Letter Fold" msgstr "" @@ -5213,19 +5213,19 @@ msgid "Letter Oversize Long Edge" msgstr "" -#: cups/ppd-cache.c:3560 cups/ppd-cache.c:3609 +#: cups/ppd-cache.c:3547 cups/ppd-cache.c:3596 msgid "Letterhead" msgstr "" -#: ppdc/sample.c:236 +#: ppdc/sample.c:240 msgid "Light" msgstr "Светлый" -#: cups/ppd-cache.c:3520 +#: cups/ppd-cache.c:3507 msgid "Lightweight Envelope" msgstr "" -#: cups/ppd-cache.c:3610 +#: cups/ppd-cache.c:3597 msgid "Lightweight Paper" msgstr "" @@ -5245,91 +5245,91 @@ msgid "Local printer created." msgstr "" -#: cups/ppd-cache.c:3872 ppdc/sample.c:264 +#: cups/ppd-cache.c:3872 ppdc/sample.c:267 msgid "Long-Edge (Portrait)" msgstr "По длинной стороне (книжная)" -#: cups/http-support.c:1870 +#: cups/http-support.c:1875 msgid "Looking for printer." msgstr "Поиск принтера." -#: cups/ppd-cache.c:3810 +#: cups/ppd-cache.c:3778 msgid "Mailbox 1" msgstr "" -#: cups/ppd-cache.c:3819 +#: cups/ppd-cache.c:3787 msgid "Mailbox 10" msgstr "" -#: cups/ppd-cache.c:3811 +#: cups/ppd-cache.c:3779 msgid "Mailbox 2" msgstr "" -#: cups/ppd-cache.c:3812 +#: cups/ppd-cache.c:3780 msgid "Mailbox 3" msgstr "" -#: cups/ppd-cache.c:3813 +#: cups/ppd-cache.c:3781 msgid "Mailbox 4" msgstr "" -#: cups/ppd-cache.c:3814 +#: cups/ppd-cache.c:3782 msgid "Mailbox 5" msgstr "" -#: cups/ppd-cache.c:3815 +#: cups/ppd-cache.c:3783 msgid "Mailbox 6" msgstr "" -#: cups/ppd-cache.c:3816 +#: cups/ppd-cache.c:3784 msgid "Mailbox 7" msgstr "" -#: cups/ppd-cache.c:3817 +#: cups/ppd-cache.c:3785 msgid "Mailbox 8" msgstr "" -#: cups/ppd-cache.c:3818 +#: cups/ppd-cache.c:3786 msgid "Mailbox 9" msgstr "" -#: cups/ppd-cache.c:3397 +#: cups/ppd-cache.c:3385 msgid "Main" msgstr "" -#: cups/ppd-cache.c:3405 +#: ppdc/sample.c:237 msgid "Main Roll" msgstr "" -#: cups/ppd-cache.c:3400 +#: cups/ppd-cache.c:3388 msgid "Manual" msgstr "" -#: ppdc/sample.c:260 +#: ppdc/sample.c:263 msgid "Manual Feed" msgstr "Ручная подача" -#: cups/ppd-cache.c:3487 +#: cups/ppd-cache.c:3474 msgid "Matte Brochure Paper" msgstr "" -#: cups/ppd-cache.c:3488 +#: cups/ppd-cache.c:3475 msgid "Matte Cover Paper" msgstr "" -#: cups/ppd-cache.c:3528 +#: cups/ppd-cache.c:3515 msgid "Matte Fabric" msgstr "" -#: cups/ppd-cache.c:3554 +#: cups/ppd-cache.c:3541 msgid "Matte Labels" msgstr "" -#: cups/ppd-cache.c:3504 +#: cups/ppd-cache.c:3491 msgid "Matte Optical Disc" msgstr "" -#: cups/ppd-cache.c:3578 +#: cups/ppd-cache.c:3565 msgid "Matte Photo Paper" msgstr "" @@ -5337,19 +5337,19 @@ msgid "Media Size" msgstr "Размер бумаги" -#: cups/ppd.c:808 cups/ppd.c:1345 ppdc/sample.c:254 +#: cups/ppd.c:808 cups/ppd.c:1345 ppdc/sample.c:236 msgid "Media Source" msgstr "Источник бумаги" -#: ppdc/sample.c:359 +#: ppdc/sample.c:362 msgid "Media Tracking" msgstr "Контроль подачи бумаги" -#: cups/ppd.c:806 cups/ppd.c:1343 ppdc/sample.c:280 +#: cups/ppd.c:806 cups/ppd.c:1343 ppdc/sample.c:283 msgid "Media Type" msgstr "Тип бумаги" -#: ppdc/sample.c:237 +#: ppdc/sample.c:241 msgid "Medium" msgstr "Средний" @@ -5357,35 +5357,35 @@ msgid "Memory allocation error" msgstr "Ошибка выделения памяти" -#: cups/ppd-cache.c:3561 +#: cups/ppd-cache.c:3548 msgid "Metal" msgstr "" -#: cups/ppd-cache.c:3562 +#: cups/ppd-cache.c:3549 msgid "Metal Glossy" msgstr "" -#: cups/ppd-cache.c:3563 +#: cups/ppd-cache.c:3550 msgid "Metal High Gloss" msgstr "" -#: cups/ppd-cache.c:3564 +#: cups/ppd-cache.c:3551 msgid "Metal Matte" msgstr "" -#: cups/ppd-cache.c:3565 +#: cups/ppd-cache.c:3552 msgid "Metal Satin" msgstr "" -#: cups/ppd-cache.c:3566 +#: cups/ppd-cache.c:3553 msgid "Metal Semi Gloss" msgstr "" -#: cups/ppd-cache.c:3494 +#: cups/ppd-cache.c:3481 msgid "Mid-Weight Paper" msgstr "" -#: cups/ppd-cache.c:3408 cups/ppd-cache.c:3820 +#: cups/ppd-cache.c:3396 cups/ppd-cache.c:3788 msgid "Middle" msgstr "" @@ -5449,11 +5449,11 @@ msgid "Missing required attributes." msgstr "Отсутствуют обязательные атрибуты." -#: cups/http-support.c:1636 +#: cups/http-support.c:1641 msgid "Missing resource in URI" msgstr "Отсутствует resource в URI" -#: cups/http-support.c:1630 +#: cups/http-support.c:1635 msgid "Missing scheme in URI" msgstr "Отсутствует scheme в URI" @@ -5499,7 +5499,7 @@ msgid "Modify Printer" msgstr "Изменить принтер" -#: cups/ppd-cache.c:3567 +#: cups/ppd-cache.c:3554 msgid "Mounting Tape" msgstr "Монтажная лента" @@ -5511,43 +5511,43 @@ msgid "Move Job" msgstr "Переместить задание" -#: cups/http-support.c:1500 +#: cups/http-support.c:1505 msgid "Moved Permanently" msgstr "Перемещено окончательно" -#: cups/ppd-cache.c:3568 +#: cups/ppd-cache.c:3555 msgid "Multi Layer" msgstr "" -#: cups/ppd-cache.c:3569 +#: cups/ppd-cache.c:3556 msgid "Multi Part Form" msgstr "" -#: cups/ppd-cache.c:3011 +#: cups/ppd-cache.c:3027 msgid "Multi-Hole Punch (Landscape)" msgstr "" -#: cups/ppd-cache.c:3009 +#: cups/ppd-cache.c:3025 msgid "Multi-Hole Punch (Portrait)" msgstr "" -#: cups/ppd-cache.c:3008 +#: cups/ppd-cache.c:3024 msgid "Multi-Hole Punch (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:3010 +#: cups/ppd-cache.c:3026 msgid "Multi-Hole Punch (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3415 +#: cups/ppd-cache.c:3403 msgid "Multipurpose" msgstr "" -#: cups/ppd-cache.c:3493 +#: cups/ppd-cache.c:3480 msgid "Multipurpose Paper" msgstr "" -#: cups/ppd-cache.c:3821 +#: cups/ppd-cache.c:3789 msgid "My Mailbox" msgstr "" @@ -5563,15 +5563,15 @@ msgid "Nested classes are not allowed." msgstr "Вложенные группы не допускаются." -#: ppdc/sample.c:425 +#: ppdc/sample.c:428 msgid "Never" msgstr "Никогда" -#: cups/tls-darwin.c:690 cups/tls-gnutls.c:524 +#: cups/tls-darwin.c:665 cups/tls-gnutls.c:524 msgid "New credentials are not valid for name." msgstr "" -#: cups/tls-darwin.c:680 cups/tls-gnutls.c:514 +#: cups/tls-darwin.c:655 cups/tls-gnutls.c:514 msgid "New credentials are older than stored credentials." msgstr "" @@ -5579,7 +5579,7 @@ msgid "No" msgstr "Нет" -#: cups/http-support.c:1497 +#: cups/http-support.c:1502 msgid "No Content" msgstr "Нет содержимого" @@ -5620,7 +5620,7 @@ msgid "No authentication information provided." msgstr "Нет информации для проверки подлинности." -#: cups/tls-darwin.c:630 cups/tls-gnutls.c:461 +#: cups/tls-darwin.c:605 cups/tls-gnutls.c:461 msgid "No common name specified." msgstr "" @@ -5662,7 +5662,7 @@ msgstr "Нет имени OID" #: filter/rastertoepson.c:1161 filter/rastertohp.c:833 -#: filter/rastertolabel.c:1288 +#: filter/rastertolabel.c:1289 msgid "No pages were found." msgstr "Страницы не были найдены." @@ -5698,7 +5698,7 @@ msgid "No request-id" msgstr "Нет идентификатора request-id" -#: cups/tls-darwin.c:710 cups/tls-gnutls.c:544 +#: cups/tls-darwin.c:685 cups/tls-gnutls.c:544 msgid "No stored credentials, not valid for name." msgstr "" @@ -5718,41 +5718,41 @@ msgid "No version number" msgstr "Нет номера версии" -#: ppdc/sample.c:362 +#: ppdc/sample.c:365 msgid "Non-continuous (Mark sensing)" msgstr "С прерыванием (Mark sensing)" -#: ppdc/sample.c:361 +#: ppdc/sample.c:364 msgid "Non-continuous (Web sensing)" msgstr "С прерыванием (Web sensing)" -#: cups/ppd-cache.c:4014 cups/ppd-cache.c:4064 cups/ppd-cache.c:4114 -#: cups/ppd-cache.c:4174 +#: cups/ppd-cache.c:4059 cups/ppd-cache.c:4137 cups/ppd-cache.c:4225 +#: cups/ppd-cache.c:4315 cups/ppd-cache.c:4362 msgid "None" msgstr "" -#: cups/ppd-cache.c:4287 cups/ppd-cache.c:4353 cups/ppd-cache.c:4387 -#: ppdc/sample.c:238 +#: cups/ppd-cache.c:4475 cups/ppd-cache.c:4541 cups/ppd-cache.c:4575 +#: ppdc/sample.c:242 msgid "Normal" msgstr "Нормальный" -#: cups/http-support.c:1522 +#: cups/http-support.c:1527 msgid "Not Found" msgstr "Не найден" -#: cups/http-support.c:1534 +#: cups/http-support.c:1539 msgid "Not Implemented" msgstr "Не реализовано" -#: ppdc/sample.c:268 +#: ppdc/sample.c:271 msgid "Not Installed" msgstr "Не установлено" -#: cups/http-support.c:1509 +#: cups/http-support.c:1514 msgid "Not Modified" msgstr "Не изменено" -#: cups/http-support.c:1537 +#: cups/http-support.c:1542 msgid "Not Supported" msgstr "Не поддерживается" @@ -5772,19 +5772,19 @@ "Примечание: данная программа проверяет только комментарии DSC, а не сам " "PostScript." -#: cups/http-support.c:1488 cups/http-support.c:1627 cups/ppd.c:283 +#: cups/http-support.c:1493 cups/http-support.c:1632 cups/ppd.c:283 msgid "OK" msgstr "ОК" -#: cups/ppd-cache.c:3872 ppdc/sample.c:263 +#: cups/ppd-cache.c:3872 ppdc/sample.c:266 msgid "Off (1-Sided)" msgstr "Выкл. (1-сторонняя печать)" -#: cups/ppd-cache.c:3489 +#: cups/ppd-cache.c:3476 msgid "Office Recycled Paper" msgstr "" -#: ppdc/sample.c:356 +#: ppdc/sample.c:359 msgid "Oki" msgstr "Oki" @@ -5813,7 +5813,7 @@ msgid "Operation Policy" msgstr "Политика операций" -#: cups/ppd-cache.c:3501 +#: cups/ppd-cache.c:3488 msgid "Optical Disc" msgstr "Оптический диск" @@ -5827,17 +5827,17 @@ msgstr "Доп.устройства" #: berkeley/lpq.c:642 berkeley/lpr.c:431 berkeley/lprm.c:232 -#: scheduler/cupsfilter.c:1476 scheduler/main.c:2133 systemv/cancel.c:401 +#: scheduler/cupsfilter.c:1476 scheduler/main.c:2135 systemv/cancel.c:401 #: systemv/cupsaccept.c:243 systemv/cupsctl.c:232 systemv/cupstestppd.c:3857 #: systemv/lp.c:750 systemv/lpadmin.c:1620 systemv/lpinfo.c:497 #: systemv/lpmove.c:216 systemv/lpoptions.c:538 systemv/lpstat.c:2044 -#: tools/ippeveprinter.c:7664 tools/ippfind.c:2765 tools/ipptool.c:4307 +#: tools/ippeveprinter.c:7922 tools/ippfind.c:2765 tools/ipptool.c:4307 #: ppdc/ppdc.cxx:426 ppdc/ppdhtml.cxx:173 ppdc/ppdi.cxx:119 #: ppdc/ppdmerge.cxx:356 ppdc/ppdpo.cxx:243 msgid "Options:" msgstr "Параметры:" -#: cups/ppd-cache.c:3570 +#: cups/ppd-cache.c:3557 msgid "Other" msgstr "Прочее" @@ -5869,7 +5869,7 @@ msgid "PASS" msgstr "PASS" -#: ppdc/sample.c:252 +#: ppdc/sample.c:256 msgid "PCL Laser Printer" msgstr "Лазерный принтер PCL" @@ -5905,7 +5905,7 @@ msgid "Packet does not start with SEQUENCE" msgstr "Нет индикатора SEQUENCE в начале пакета" -#: cups/ppd-cache.c:3571 +#: cups/ppd-cache.c:3558 msgid "Paper" msgstr "Бумага" @@ -5925,15 +5925,15 @@ msgid "Paper tray is missing." msgstr "Лоток с бумагой отсутствует." -#: cups/ppd-cache.c:2985 +#: cups/ppd-cache.c:3001 msgid "Parallel Fold" msgstr "" -#: ppdc/sample.c:355 +#: ppdc/sample.c:358 msgid "ParamCustominCutInterval" msgstr "ParamCustominCutInterval" -#: ppdc/sample.c:353 +#: ppdc/sample.c:356 msgid "ParamCustominTearInterval" msgstr "ParamCustominTearInterval" @@ -5955,11 +5955,11 @@ msgid "Pause Printer" msgstr "Приостановить принтер" -#: ppdc/sample.c:443 +#: ppdc/sample.c:446 msgid "Peel-Off" msgstr "Съемный слой" -#: cups/ppd-cache.c:3555 +#: cups/ppd-cache.c:3542 msgid "Permanent Labels" msgstr "" @@ -5967,7 +5967,7 @@ msgid "Photo" msgstr "Фото" -#: cups/ppd-cache.c:3575 +#: cups/ppd-cache.c:3562 msgid "Photo Film" msgstr "" @@ -5975,59 +5975,59 @@ msgid "Photo Labels" msgstr "Фотоэтикетки" -#: cups/ppd-cache.c:3572 cups/ppd-cache.c:3573 +#: cups/ppd-cache.c:3559 cups/ppd-cache.c:3560 msgid "Photo Paper" msgstr "Фотобумага" -#: cups/ppd-cache.c:3545 cups/ppd-cache.c:3547 +#: cups/ppd-cache.c:3532 cups/ppd-cache.c:3534 msgid "Photo Paper Plus Glossy II" msgstr "" -#: cups/ppd-cache.c:3546 cups/ppd-cache.c:3548 +#: cups/ppd-cache.c:3533 cups/ppd-cache.c:3535 msgid "Photo Paper Pro Platinum" msgstr "" -#: cups/ppd-cache.c:3521 +#: cups/ppd-cache.c:3508 msgid "Plain Envelope" msgstr "" -#: ppdc/sample.c:281 +#: ppdc/sample.c:284 msgid "Plain Paper" msgstr "Обычная бумага" -#: cups/ppd-cache.c:3581 +#: cups/ppd-cache.c:3568 msgid "Plastic" msgstr "Пластик" -#: cups/ppd-cache.c:3582 +#: cups/ppd-cache.c:3569 msgid "Plastic Archival" msgstr "" -#: cups/ppd-cache.c:3583 +#: cups/ppd-cache.c:3570 msgid "Plastic Colored" msgstr "" -#: cups/ppd-cache.c:3584 +#: cups/ppd-cache.c:3571 msgid "Plastic Glossy" msgstr "" -#: cups/ppd-cache.c:3585 +#: cups/ppd-cache.c:3572 msgid "Plastic High Gloss" msgstr "" -#: cups/ppd-cache.c:3586 +#: cups/ppd-cache.c:3573 msgid "Plastic Matte" msgstr "" -#: cups/ppd-cache.c:3587 +#: cups/ppd-cache.c:3574 msgid "Plastic Satin" msgstr "" -#: cups/ppd-cache.c:3588 +#: cups/ppd-cache.c:3575 msgid "Plastic Semi Gloss" msgstr "" -#: cups/ppd-cache.c:3589 +#: cups/ppd-cache.c:3576 msgid "Plate" msgstr "" @@ -6035,7 +6035,7 @@ msgid "Policies" msgstr "Политики" -#: cups/ppd-cache.c:3590 +#: cups/ppd-cache.c:3577 msgid "Polyester" msgstr "" @@ -6043,7 +6043,7 @@ msgid "Port Monitor" msgstr "Мониторинг порта" -#: ppdc/sample.c:270 +#: ppdc/sample.c:273 msgid "PostScript Printer" msgstr "Принтер PostScript" @@ -6063,39 +6063,39 @@ msgid "Postcard Long Edge" msgstr "Открытка Long Edge" -#: cups/ppd-cache.c:2986 +#: cups/ppd-cache.c:3002 msgid "Poster Fold" msgstr "" -#: cups/ppd-cache.c:3591 +#: cups/ppd-cache.c:3578 msgid "Pre Cut Tabs" msgstr "" -#: cups/ppd-cache.c:3495 +#: cups/ppd-cache.c:3482 msgid "Premium Inkjet Paper" msgstr "" -#: cups/ppd-cache.c:3496 +#: cups/ppd-cache.c:3483 msgid "Premium Photo Glossy Paper" msgstr "" -#: cups/ppd-cache.c:3497 +#: cups/ppd-cache.c:3484 msgid "Premium Presentation Matte Paper" msgstr "" -#: backend/ipp.c:973 backend/ipp.c:981 +#: backend/ipp.c:972 backend/ipp.c:980 msgid "Preparing to print." msgstr "Подготовка к печати." -#: cups/ppd-cache.c:3522 +#: cups/ppd-cache.c:3509 msgid "Preprinted Envelope" msgstr "" -#: cups/ppd-cache.c:3611 +#: cups/ppd-cache.c:3598 msgid "Preprinted Paper" msgstr "" -#: ppdc/sample.c:290 +#: ppdc/sample.c:293 msgid "Print Density" msgstr "Плотность печати" @@ -6103,15 +6103,15 @@ msgid "Print Job:" msgstr "Задание печати:" -#: ppdc/sample.c:335 +#: ppdc/sample.c:338 msgid "Print Mode" msgstr "Режим печати" -#: cups/ppd-cache.c:4281 cups/ppd-cache.c:4343 cups/ppd-cache.c:4383 +#: cups/ppd-cache.c:4469 cups/ppd-cache.c:4531 cups/ppd-cache.c:4571 msgid "Print Quality" msgstr "Качество печати" -#: ppdc/sample.c:378 +#: ppdc/sample.c:381 msgid "Print Rate" msgstr "Скорость печати" @@ -6119,7 +6119,7 @@ msgid "Print Self-Test Page" msgstr "Напечатать пробную страницу" -#: ppdc/sample.c:322 +#: ppdc/sample.c:325 msgid "Print Speed" msgstr "Скорость печати" @@ -6127,11 +6127,11 @@ msgid "Print Test Page" msgstr "Напечатать пробную страницу" -#: ppdc/sample.c:351 +#: ppdc/sample.c:354 msgid "Print and Cut" msgstr "Напечатать и обрезать" -#: ppdc/sample.c:339 +#: ppdc/sample.c:342 msgid "Print and Tear" msgstr "Напечатать и оборвать" @@ -6139,15 +6139,15 @@ msgid "Print file sent." msgstr "Файл печати отправлен." -#: backend/ipp.c:2261 +#: backend/ipp.c:2269 msgid "Print job canceled at printer." msgstr "Задание отменено на принтере." -#: backend/ipp.c:2253 +#: backend/ipp.c:2261 msgid "Print job too large." msgstr "Задание слишком большое." -#: backend/ipp.c:1721 +#: backend/ipp.c:1722 msgid "Print job was not accepted." msgstr "Задание не принято." @@ -6160,7 +6160,7 @@ msgid "Printer Added" msgstr "Принтер добавлен" -#: ppdc/sample.c:255 +#: ppdc/sample.c:258 msgid "Printer Default" msgstr "Принтер выбран по умолчанию" @@ -6176,19 +6176,19 @@ msgid "Printer Paused" msgstr "Принтер приостановлен" -#: ppdc/sample.c:289 +#: ppdc/sample.c:292 msgid "Printer Settings" msgstr "Параметры принтера" -#: backend/ipp.c:2256 +#: backend/ipp.c:2264 msgid "Printer cannot print supplied content." msgstr "Принтер не может распечатать содержимое." -#: backend/ipp.c:2259 +#: backend/ipp.c:2267 msgid "Printer cannot print with supplied options." msgstr "Принтер не может печатать с данными параметрами." -#: cups/ppd-cache.c:4556 +#: cups/ppd-cache.c:4744 msgid "Printer does not support required IPP attributes or document formats." msgstr "" @@ -6201,16 +6201,16 @@ msgstr "Принтеры" #: filter/rastertoepson.c:1107 filter/rastertohp.c:774 -#: filter/rastertolabel.c:1235 +#: filter/rastertolabel.c:1236 #, c-format msgid "Printing page %d, %u%% complete." msgstr "Печать страницы %d, %u%% завершена." -#: cups/ppd-cache.c:4111 +#: cups/ppd-cache.c:4222 msgid "Punch" msgstr "" -#: cups/ppd-cache.c:3612 +#: cups/ppd-cache.c:3599 msgid "Punched Paper" msgstr "" @@ -6227,11 +6227,11 @@ msgstr "" "Ранг Владелец Задание Файл(ы) Общий размер" -#: cups/ppd-cache.c:3414 +#: cups/ppd-cache.c:3402 msgid "Rear" msgstr "" -#: cups/ppd-cache.c:3822 +#: cups/ppd-cache.c:3790 msgid "Rear Tray" msgstr "Задний лоток" @@ -6239,25 +6239,25 @@ msgid "Reject Jobs" msgstr "Отклонить задания" -#: backend/lpd.c:1074 backend/lpd.c:1206 +#: backend/lpd.c:1078 backend/lpd.c:1210 #, c-format msgid "Remote host did not accept control file (%d)." msgstr "Удаленный хост не принял контрольный файл (%d)." -#: backend/lpd.c:1159 +#: backend/lpd.c:1163 #, c-format msgid "Remote host did not accept data file (%d)." msgstr "Удаленный хост не принял файл данных (%d)." -#: ppdc/sample.c:423 +#: ppdc/sample.c:426 msgid "Reprint After Error" msgstr "Повторить печать после ошибки" -#: cups/http-support.c:1525 +#: cups/http-support.c:1530 msgid "Request Entity Too Large" msgstr "Слишком большое содержимое запроса" -#: cups/ppd.c:812 cups/ppd.c:1349 ppdc/sample.c:231 +#: cups/ppd.c:812 cups/ppd.c:1349 ppdc/sample.c:232 msgid "Resolution" msgstr "Разрешение" @@ -6273,63 +6273,63 @@ msgid "Return Address" msgstr "Обратный адрес" -#: ppdc/sample.c:444 +#: ppdc/sample.c:447 msgid "Rewind" msgstr "Вернуться в начало" -#: cups/ppd-cache.c:3412 +#: cups/ppd-cache.c:3400 msgid "Right" msgstr "" -#: cups/ppd-cache.c:2987 +#: cups/ppd-cache.c:3003 msgid "Right Gate Fold" msgstr "" -#: cups/ppd-cache.c:3823 +#: cups/ppd-cache.c:3791 msgid "Right Tray" msgstr "" -#: cups/ppd-cache.c:3592 +#: cups/ppd-cache.c:3579 msgid "Roll" msgstr "" -#: cups/ppd-cache.c:3436 +#: cups/ppd-cache.c:3424 msgid "Roll 1" msgstr "" -#: cups/ppd-cache.c:3445 +#: cups/ppd-cache.c:3433 msgid "Roll 10" msgstr "" -#: cups/ppd-cache.c:3437 +#: cups/ppd-cache.c:3425 msgid "Roll 2" msgstr "" -#: cups/ppd-cache.c:3438 +#: cups/ppd-cache.c:3426 msgid "Roll 3" msgstr "" -#: cups/ppd-cache.c:3439 +#: cups/ppd-cache.c:3427 msgid "Roll 4" msgstr "" -#: cups/ppd-cache.c:3440 +#: cups/ppd-cache.c:3428 msgid "Roll 5" msgstr "" -#: cups/ppd-cache.c:3441 +#: cups/ppd-cache.c:3429 msgid "Roll 6" msgstr "" -#: cups/ppd-cache.c:3442 +#: cups/ppd-cache.c:3430 msgid "Roll 7" msgstr "" -#: cups/ppd-cache.c:3443 +#: cups/ppd-cache.c:3431 msgid "Roll 8" msgstr "" -#: cups/ppd-cache.c:3444 +#: cups/ppd-cache.c:3432 msgid "Roll 9" msgstr "" @@ -6342,39 +6342,39 @@ msgid "SEQUENCE uses indefinite length" msgstr "Для SEQUENCE длина не установлена" -#: cups/http-support.c:1549 +#: cups/http-support.c:1554 msgid "SSL/TLS Negotiation Error" msgstr "SSL/TLS Negotiation Error" -#: cups/ppd-cache.c:3012 +#: cups/ppd-cache.c:3028 msgid "Saddle Stitch" msgstr "" -#: cups/ppd-cache.c:3556 +#: cups/ppd-cache.c:3543 msgid "Satin Labels" msgstr "" -#: cups/ppd-cache.c:3505 +#: cups/ppd-cache.c:3492 msgid "Satin Optical Disc" msgstr "" -#: cups/ppd-cache.c:3579 +#: cups/ppd-cache.c:3566 msgid "Satin Photo Paper" msgstr "" -#: cups/ppd-cache.c:3593 +#: cups/ppd-cache.c:3580 msgid "Screen" msgstr "" -#: cups/ppd-cache.c:3594 +#: cups/ppd-cache.c:3581 msgid "Screen Paged" msgstr "" -#: cups/ppd-cache.c:3557 +#: cups/ppd-cache.c:3544 msgid "Security Labels" msgstr "" -#: cups/http-support.c:1506 +#: cups/http-support.c:1511 msgid "See Other" msgstr "Посмотреть другие" @@ -6382,31 +6382,31 @@ msgid "See remote printer." msgstr "" -#: cups/ppd-cache.c:3595 +#: cups/ppd-cache.c:3582 msgid "Self Adhesive" msgstr "" -#: cups/ppd-cache.c:3596 +#: cups/ppd-cache.c:3583 msgid "Self Adhesive Film" msgstr "" -#: cups/tls-darwin.c:765 cups/tls-gnutls.c:606 +#: cups/tls-darwin.c:740 cups/tls-gnutls.c:606 msgid "Self-signed credentials are blocked." msgstr "" -#: cups/ppd-cache.c:3529 +#: cups/ppd-cache.c:3516 msgid "Semi-Gloss Fabric" msgstr "" -#: cups/ppd-cache.c:3558 +#: cups/ppd-cache.c:3545 msgid "Semi-Gloss Labels" msgstr "" -#: cups/ppd-cache.c:3506 +#: cups/ppd-cache.c:3493 msgid "Semi-Gloss Optical Disc" msgstr "" -#: cups/ppd-cache.c:3580 +#: cups/ppd-cache.c:3567 msgid "Semi-Gloss Photo Paper" msgstr "" @@ -6430,11 +6430,11 @@ msgid "Server Stopped" msgstr "Сервер остановлен" -#: cups/tls-darwin.c:1275 cups/tls-gnutls.c:1298 +#: cups/tls-darwin.c:1250 cups/tls-gnutls.c:1299 msgid "Server credentials not set." msgstr "Учетные данные сервера не заданы." -#: cups/http-support.c:1543 +#: cups/http-support.c:1548 msgid "Service Unavailable" msgstr "Служба недоступна" @@ -6463,140 +6463,140 @@ msgid "Shipping Address" msgstr "Адрес доставки" -#: cups/ppd-cache.c:3872 ppdc/sample.c:265 +#: cups/ppd-cache.c:3872 ppdc/sample.c:268 msgid "Short-Edge (Landscape)" msgstr "По короткой стороне (альбомная)" -#: cups/ppd-cache.c:3597 +#: cups/ppd-cache.c:3584 msgid "Shrink Foil" msgstr "" -#: cups/ppd-cache.c:3410 +#: cups/ppd-cache.c:3398 msgid "Side" msgstr "" -#: cups/ppd-cache.c:3824 +#: cups/ppd-cache.c:3792 msgid "Side Tray" msgstr "Боковой лоток" -#: cups/ppd-cache.c:3598 +#: cups/ppd-cache.c:3585 msgid "Single Face" msgstr "" -#: cups/ppd-cache.c:3003 +#: cups/ppd-cache.c:3019 msgid "Single Punch (Landscape)" msgstr "" -#: cups/ppd-cache.c:3002 +#: cups/ppd-cache.c:3018 msgid "Single Punch (Portrait)" msgstr "" -#: cups/ppd-cache.c:2992 +#: cups/ppd-cache.c:3008 msgid "Single Punch (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:2993 +#: cups/ppd-cache.c:3009 msgid "Single Punch (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3021 +#: cups/ppd-cache.c:3037 msgid "Single Staple (Landscape)" msgstr "" -#: cups/ppd-cache.c:3020 +#: cups/ppd-cache.c:3036 msgid "Single Staple (Portrait)" msgstr "" -#: cups/ppd-cache.c:3014 +#: cups/ppd-cache.c:3030 msgid "Single Staple (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:3015 +#: cups/ppd-cache.c:3031 msgid "Single Staple (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3599 +#: cups/ppd-cache.c:3586 msgid "Single Wall Cardboard" msgstr "" -#: cups/ppd-cache.c:3600 +#: cups/ppd-cache.c:3587 msgid "Sleeve" msgstr "" -#: ppdc/sample.c:283 +#: ppdc/sample.c:286 msgid "Special Paper" msgstr "Особая бумага" -#: backend/lpd.c:1115 +#: backend/lpd.c:1119 #, c-format msgid "Spooling job, %.0f%% complete." msgstr "Постановка в очередь, %.0f%% завершено." -#: cups/ppd-cache.c:3825 +#: cups/ppd-cache.c:3793 msgid "Stacker 1" msgstr "" -#: cups/ppd-cache.c:3834 +#: cups/ppd-cache.c:3802 msgid "Stacker 10" msgstr "" -#: cups/ppd-cache.c:3826 +#: cups/ppd-cache.c:3794 msgid "Stacker 2" msgstr "" -#: cups/ppd-cache.c:3827 +#: cups/ppd-cache.c:3795 msgid "Stacker 3" msgstr "" -#: cups/ppd-cache.c:3828 +#: cups/ppd-cache.c:3796 msgid "Stacker 4" msgstr "" -#: cups/ppd-cache.c:3829 +#: cups/ppd-cache.c:3797 msgid "Stacker 5" msgstr "" -#: cups/ppd-cache.c:3830 +#: cups/ppd-cache.c:3798 msgid "Stacker 6" msgstr "" -#: cups/ppd-cache.c:3831 +#: cups/ppd-cache.c:3799 msgid "Stacker 7" msgstr "" -#: cups/ppd-cache.c:3832 +#: cups/ppd-cache.c:3800 msgid "Stacker 8" msgstr "" -#: cups/ppd-cache.c:3833 +#: cups/ppd-cache.c:3801 msgid "Stacker 9" msgstr "" -#: ppdc/sample.c:336 +#: ppdc/sample.c:339 msgid "Standard" msgstr "Стандартный" -#: cups/ppd-cache.c:4011 +#: cups/ppd-cache.c:4056 msgid "Staple" msgstr "" -#: cups/ppd-cache.c:2971 +#: cups/ppd-cache.c:2987 msgid "Staple Edge" msgstr "" -#: cups/ppd-cache.c:2975 +#: cups/ppd-cache.c:2991 msgid "Staple Edge (Landscape)" msgstr "" -#: cups/ppd-cache.c:2973 +#: cups/ppd-cache.c:2989 msgid "Staple Edge (Portrait)" msgstr "" -#: cups/ppd-cache.c:2972 +#: cups/ppd-cache.c:2988 msgid "Staple Edge (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:2974 +#: cups/ppd-cache.c:2990 msgid "Staple Edge (Reverse Portrait)" msgstr "" @@ -6606,7 +6606,7 @@ msgstr "Стартовый баннер" #: filter/rastertoepson.c:1083 filter/rastertohp.c:750 -#: filter/rastertolabel.c:1211 +#: filter/rastertolabel.c:1212 #, c-format msgid "Starting page %d." msgstr "Главная страница %d." @@ -6637,11 +6637,11 @@ msgid "Super B/A3" msgstr "Super B/A3" -#: cups/http-support.c:1485 +#: cups/http-support.c:1490 msgid "Switching Protocols" msgstr "Протоколы переключения" -#: cups/ppd-cache.c:3613 +#: cups/ppd-cache.c:3600 msgid "Tab Stock" msgstr "" @@ -6657,15 +6657,15 @@ msgid "Tabloid Oversize Long Edge" msgstr "" -#: ppdc/sample.c:337 +#: ppdc/sample.c:340 msgid "Tear" msgstr "Оборвать" -#: ppdc/sample.c:442 +#: ppdc/sample.c:445 msgid "Tear-Off" msgstr "Место отрыва" -#: ppdc/sample.c:383 +#: ppdc/sample.c:386 msgid "Tear-Off Adjust Position" msgstr "Откорректировать положение места отрыва" @@ -6703,7 +6703,7 @@ msgstr "Не удалось открыть PPD-файл \"%s\": %s" #: filter/rastertoepson.c:1052 filter/rastertohp.c:721 -#: filter/rastertolabel.c:1175 +#: filter/rastertolabel.c:1176 msgid "The PPD file could not be opened." msgstr "Не удалось открыть PPD-файл." @@ -6751,17 +6751,17 @@ msgid "The optical photoconductor will need to be replaced soon." msgstr "Оптический фоторегистратор нуждается в замене в ближайшее время." -#: backend/ipp.c:993 +#: backend/ipp.c:992 msgid "" "The printer configuration is incorrect or the printer no longer exists." msgstr "Неправильная конфигурация принтера, или принтер больше не доступен." -#: backend/lpd.c:678 backend/lpd.c:1067 backend/lpd.c:1149 backend/lpd.c:1199 +#: backend/lpd.c:682 backend/lpd.c:1071 backend/lpd.c:1153 backend/lpd.c:1203 msgid "The printer did not respond." msgstr "Принтер не отвечает." -#: backend/ipp.c:766 backend/ipp.c:956 backend/ipp.c:1070 backend/ipp.c:1523 -#: backend/ipp.c:1693 backend/lpd.c:886 backend/socket.c:354 +#: backend/ipp.c:765 backend/ipp.c:955 backend/ipp.c:1069 backend/ipp.c:1524 +#: backend/ipp.c:1694 backend/lpd.c:890 backend/socket.c:354 #: backend/usb-unix.c:117 backend/usb-unix.c:407 backend/usb-unix.c:490 msgid "The printer is in use." msgstr "Принтер используется." @@ -6778,8 +6778,8 @@ msgid "The printer is not connected." msgstr "Принтер не подключен." -#: backend/ipp.c:744 backend/ipp.c:777 backend/ipp.c:952 backend/lpd.c:865 -#: backend/lpd.c:906 backend/socket.c:333 backend/socket.c:366 +#: backend/ipp.c:743 backend/ipp.c:776 backend/ipp.c:951 backend/lpd.c:869 +#: backend/lpd.c:910 backend/socket.c:333 backend/socket.c:366 msgid "The printer is not responding." msgstr "Принтер не отвечает." @@ -6795,7 +6795,7 @@ msgid "The printer is offline." msgstr "Принтер выключен." -#: backend/ipp.c:760 backend/lpd.c:880 backend/socket.c:348 +#: backend/ipp.c:759 backend/lpd.c:884 backend/socket.c:348 msgid "The printer is unreachable at this time." msgstr "В настоящее время принтер недоступен." @@ -6807,7 +6807,7 @@ msgid "The printer may be out of toner." msgstr "Возможно в принтере закончился тонер." -#: backend/ipp.c:753 backend/lpd.c:873 backend/socket.c:341 +#: backend/ipp.c:752 backend/lpd.c:877 backend/socket.c:341 msgid "The printer may not exist or is unavailable at this time." msgstr "Возможно принтер недоступен в настоящее время." @@ -6904,7 +6904,7 @@ msgid "There was an unrecoverable USB error." msgstr "Обнаружена ошибка USB." -#: ppdc/sample.c:430 +#: ppdc/sample.c:433 msgid "Thermal Transfer Media" msgstr "Носитель для печати методом термопереноса" @@ -6922,140 +6922,140 @@ msgid "Too many printer-state-reasons values (%d > %d)." msgstr "Слишком много значений printer-state-reasons (%d > %d)" -#: cups/ppd-cache.c:3407 +#: cups/ppd-cache.c:3395 msgid "Top" msgstr "" -#: cups/ppd-cache.c:3835 +#: cups/ppd-cache.c:3803 msgid "Top Tray" msgstr "Верхний лоток" -#: cups/ppd-cache.c:3614 +#: cups/ppd-cache.c:3601 msgid "Tractor" msgstr "" -#: cups/ppd-cache.c:3615 +#: cups/ppd-cache.c:3602 msgid "Transfer" msgstr "" -#: ppdc/sample.c:284 +#: ppdc/sample.c:287 msgid "Transparency" msgstr "Прозрачность" -#: ppdc/sample.c:279 +#: ppdc/sample.c:282 msgid "Tray" msgstr "Лоток" -#: ppdc/sample.c:256 +#: ppdc/sample.c:259 msgid "Tray 1" msgstr "Лоток 1" -#: cups/ppd-cache.c:3425 cups/ppd-cache.c:3845 +#: cups/ppd-cache.c:3413 cups/ppd-cache.c:3813 msgid "Tray 10" msgstr "Лоток 10" -#: cups/ppd-cache.c:3426 +#: cups/ppd-cache.c:3414 msgid "Tray 11" msgstr "Лоток 11" -#: cups/ppd-cache.c:3427 +#: cups/ppd-cache.c:3415 msgid "Tray 12" msgstr "Лоток 12" -#: cups/ppd-cache.c:3428 +#: cups/ppd-cache.c:3416 msgid "Tray 13" msgstr "Лоток 13" -#: cups/ppd-cache.c:3429 +#: cups/ppd-cache.c:3417 msgid "Tray 14" msgstr "Лоток 14" -#: cups/ppd-cache.c:3430 +#: cups/ppd-cache.c:3418 msgid "Tray 15" msgstr "Лоток 15" -#: cups/ppd-cache.c:3431 +#: cups/ppd-cache.c:3419 msgid "Tray 16" msgstr "Лоток 16" -#: cups/ppd-cache.c:3432 +#: cups/ppd-cache.c:3420 msgid "Tray 17" msgstr "Лоток 17" -#: cups/ppd-cache.c:3433 +#: cups/ppd-cache.c:3421 msgid "Tray 18" msgstr "Лоток 18" -#: cups/ppd-cache.c:3434 +#: cups/ppd-cache.c:3422 msgid "Tray 19" msgstr "Лоток 19" -#: ppdc/sample.c:257 +#: ppdc/sample.c:260 msgid "Tray 2" msgstr "Лоток 2" -#: cups/ppd-cache.c:3435 +#: cups/ppd-cache.c:3423 msgid "Tray 20" msgstr "Лоток 20" -#: ppdc/sample.c:258 +#: ppdc/sample.c:261 msgid "Tray 3" msgstr "Лоток 3" -#: ppdc/sample.c:259 +#: ppdc/sample.c:262 msgid "Tray 4" msgstr "Лоток 4" -#: cups/ppd-cache.c:3420 cups/ppd-cache.c:3840 +#: cups/ppd-cache.c:3408 cups/ppd-cache.c:3808 msgid "Tray 5" msgstr "Лоток 5" -#: cups/ppd-cache.c:3421 cups/ppd-cache.c:3841 +#: cups/ppd-cache.c:3409 cups/ppd-cache.c:3809 msgid "Tray 6" msgstr "Лоток 6" -#: cups/ppd-cache.c:3422 cups/ppd-cache.c:3842 +#: cups/ppd-cache.c:3410 cups/ppd-cache.c:3810 msgid "Tray 7" msgstr "Лоток 7" -#: cups/ppd-cache.c:3423 cups/ppd-cache.c:3843 +#: cups/ppd-cache.c:3411 cups/ppd-cache.c:3811 msgid "Tray 8" msgstr "Лоток 8" -#: cups/ppd-cache.c:3424 cups/ppd-cache.c:3844 +#: cups/ppd-cache.c:3412 cups/ppd-cache.c:3812 msgid "Tray 9" msgstr "Лоток 9" -#: cups/ppd-cache.c:3025 +#: cups/ppd-cache.c:3041 msgid "Triple Staple (Landscape)" msgstr "" -#: cups/ppd-cache.c:3023 +#: cups/ppd-cache.c:3039 msgid "Triple Staple (Portrait)" msgstr "" -#: cups/ppd-cache.c:3022 +#: cups/ppd-cache.c:3038 msgid "Triple Staple (Reverse Landscape)" msgstr "" -#: cups/ppd-cache.c:3024 +#: cups/ppd-cache.c:3040 msgid "Triple Staple (Reverse Portrait)" msgstr "" -#: cups/ppd-cache.c:3617 +#: cups/ppd-cache.c:3604 msgid "Triple Wall Cardboard" msgstr "" -#: cups/tls-darwin.c:670 cups/tls-darwin.c:752 cups/tls-gnutls.c:504 +#: cups/tls-darwin.c:645 cups/tls-darwin.c:727 cups/tls-gnutls.c:504 #: cups/tls-gnutls.c:586 msgid "Trust on first use is disabled." msgstr "" -#: cups/http-support.c:1528 +#: cups/http-support.c:1533 msgid "URI Too Long" msgstr "Слишком длинный адрес URI" -#: cups/http-support.c:1603 +#: cups/http-support.c:1608 msgid "URI too large" msgstr "Слишком большой адрес URI" @@ -7111,7 +7111,7 @@ msgid "Unable to add class" msgstr "Не удается добавить группу" -#: backend/ipp.c:1880 +#: backend/ipp.c:1887 msgid "Unable to add document to print job." msgstr "Не удается добавить документ в задание печати." @@ -7136,11 +7136,11 @@ msgid "Unable to allocate memory for pages array" msgstr "Не удается выделить память для страниц" -#: cgi-bin/admin.c:1510 +#: cgi-bin/admin.c:1509 msgid "Unable to cancel RSS subscription" msgstr "Не удается отменить подписку RSS" -#: backend/ipp.c:2165 backend/ipp.c:2696 +#: backend/ipp.c:2173 backend/ipp.c:2704 msgid "Unable to cancel print job." msgstr "Не удается отменить задание печати." @@ -7174,7 +7174,7 @@ msgid "Unable to connect to host." msgstr "Не удаётся подключиться к хосту." -#: backend/ipp.c:723 backend/ipp.c:1275 backend/lpd.c:846 backend/socket.c:314 +#: backend/ipp.c:722 backend/ipp.c:1274 backend/lpd.c:850 backend/socket.c:314 #: backend/usb-unix.c:103 msgid "Unable to contact printer, queuing on next printer in class." msgstr "" @@ -7216,7 +7216,7 @@ msgid "Unable to copy Windows 9x printer driver files (%d)." msgstr "Не удается копировать файлы драйвера принтера Windows 9x (%d)" -#: cups/tls-darwin.c:636 cups/tls-gnutls.c:467 +#: cups/tls-darwin.c:611 cups/tls-gnutls.c:467 msgid "Unable to create credentials from array." msgstr "" @@ -7228,7 +7228,7 @@ msgid "Unable to create printer." msgstr "Не удалось создать принтер." -#: cups/tls-darwin.c:1566 cups/tls-gnutls.c:1510 +#: cups/tls-darwin.c:1541 cups/tls-gnutls.c:1511 msgid "Unable to create server credentials." msgstr "Не удается создать учетные данные сервера." @@ -7252,30 +7252,30 @@ msgid "Unable to edit cupsd.conf files larger than 1MB" msgstr "Невозможно редактировать файлы cupsd.conf больше 1 МБ" -#: cups/tls-darwin.c:1754 +#: cups/tls-darwin.c:1729 msgid "" "Unable to establish a secure connection to host (certificate chain invalid)." msgstr "" "Не удается установить защищенное соединение (неправильная цепочка " "сертификатов)." -#: cups/tls-darwin.c:1744 +#: cups/tls-darwin.c:1719 msgid "" "Unable to establish a secure connection to host (certificate not yet valid)." msgstr "" "Не удается установить защищенное соединение (недействительный сертификат)." -#: cups/tls-darwin.c:1739 +#: cups/tls-darwin.c:1714 msgid "" "Unable to establish a secure connection to host (expired certificate)." msgstr "Не удается установить защищенное соединение (сертификат просрочен)." -#: cups/tls-darwin.c:1749 +#: cups/tls-darwin.c:1724 msgid "Unable to establish a secure connection to host (host name mismatch)." msgstr "" "Не удается установить защищенное соединение (несовпадение имени хоста)." -#: cups/tls-darwin.c:1759 +#: cups/tls-darwin.c:1734 msgid "" "Unable to establish a secure connection to host (peer dropped connection " "before responding)." @@ -7283,13 +7283,13 @@ "Не удается установить защищенное соединение (соединение разорвано удаленной " "стороной.)" -#: cups/tls-darwin.c:1734 +#: cups/tls-darwin.c:1709 msgid "" "Unable to establish a secure connection to host (self-signed certificate)." msgstr "" "Не удается установить защищенное соединение (самоподписанный сертификат)." -#: cups/tls-darwin.c:1729 +#: cups/tls-darwin.c:1704 msgid "" "Unable to establish a secure connection to host (untrusted certificate)." msgstr "Не удается установить защищенное соединение (ненадежный сертификат)." @@ -7302,15 +7302,15 @@ msgid "Unable to find destination for job" msgstr "Не удается найти назначение для задания" -#: cups/http-support.c:2094 +#: cups/http-support.c:2099 msgid "Unable to find printer." msgstr "Не удается найти принтер." -#: cups/tls-darwin.c:1579 +#: cups/tls-darwin.c:1554 msgid "Unable to find server credentials." msgstr "Не удается найти учетные данные сервера." -#: backend/ipp.c:3359 +#: backend/ipp.c:3367 msgid "Unable to get backend exit status." msgstr "Не удается получить код завершения от backend." @@ -7338,7 +7338,7 @@ msgid "Unable to get printer status" msgstr "Не удается получить статус принтера" -#: backend/ipp.c:1017 +#: backend/ipp.c:1016 msgid "Unable to get printer status." msgstr "Не удается получить статус принтера." @@ -7361,7 +7361,7 @@ msgid "Unable to locate printer \"%s\"." msgstr "Принтер \"%s\" не найден" -#: backend/dnssd.c:752 backend/ipp.c:336 backend/lpd.c:181 +#: backend/dnssd.c:752 backend/ipp.c:335 backend/lpd.c:185 #: backend/socket.c:155 msgid "Unable to locate printer." msgstr "Принтер не найден" @@ -7403,14 +7403,14 @@ msgid "Unable to open help file." msgstr "Не удается открыть файл справки." -#: backend/ipp.c:377 backend/ipp.c:1620 backend/ipp.c:1833 backend/lpd.c:469 +#: backend/ipp.c:376 backend/ipp.c:1621 backend/ipp.c:1834 backend/lpd.c:473 #: backend/socket.c:142 backend/usb.c:224 filter/gziptoany.c:65 #: filter/pstops.c:262 msgid "Unable to open print file" msgstr "Не удается открыть файл печати" #: filter/rastertoepson.c:1012 filter/rastertohp.c:681 -#: filter/rastertolabel.c:1133 +#: filter/rastertolabel.c:1134 msgid "Unable to open raster file" msgstr "Не удается открыть растровый файл" @@ -7427,7 +7427,7 @@ msgid "Unable to rename job document file." msgstr "" -#: cups/dest.c:3265 +#: cups/dest.c:3252 msgid "Unable to resolve printer-uri." msgstr "Не удается определить printer-uri" @@ -7461,7 +7461,7 @@ msgid "Unable to set server default" msgstr "Не удается назначить сервер используемым по умолчанию" -#: backend/ipp.c:3218 backend/ipp.c:3295 backend/ipp.c:3303 +#: backend/ipp.c:3226 backend/ipp.c:3303 backend/ipp.c:3311 msgid "Unable to start backend process." msgstr "Не удается запустить фоновый процесс" @@ -7482,7 +7482,7 @@ msgid "Unable to write uncompressed print data: %s" msgstr "Не удается записать несжатые данные печати: %s" -#: cups/http-support.c:1516 +#: cups/http-support.c:1521 msgid "Unauthorized" msgstr "В доступе отказано" @@ -7490,7 +7490,7 @@ msgid "Units" msgstr "Единицы" -#: cups/http-support.c:1556 cups/http-support.c:1640 cups/ppd.c:313 +#: cups/http-support.c:1561 cups/http-support.c:1645 cups/ppd.c:313 msgid "Unknown" msgstr "Неизвестный" @@ -7499,22 +7499,22 @@ msgid "Unknown choice \"%s\" for option \"%s\"." msgstr "Неизвестный выбор \"%s\" для параметра \"%s\"." -#: backend/ipp.c:519 +#: backend/ipp.c:518 #, c-format msgid "Unknown encryption option value: \"%s\"." msgstr "Неизвестное значение \"%s\" параметра шифрования." -#: backend/lpd.c:327 +#: backend/lpd.c:331 #, c-format msgid "Unknown file order: \"%s\"." msgstr "Неизвестный порядок файлов \"%s\"." -#: backend/lpd.c:298 +#: backend/lpd.c:302 #, c-format msgid "Unknown format character: \"%c\"." msgstr "Символ неизвестного формата \"%c\"." -#: cups/hash.c:278 +#: cups/hash.c:279 msgid "Unknown hash algorithm." msgstr "" @@ -7522,7 +7522,7 @@ msgid "Unknown media size name." msgstr "Неизвестное имя размера бумаги." -#: backend/ipp.c:583 +#: backend/ipp.c:582 #, c-format msgid "Unknown option \"%s\" with value \"%s\"." msgstr "Неизвестный параметр \"%s\" со значением \"%s\"." @@ -7532,7 +7532,7 @@ msgid "Unknown option \"%s\"." msgstr "Неизвестный параметр \"%s\"." -#: backend/lpd.c:313 +#: backend/lpd.c:317 #, c-format msgid "Unknown print mode: \"%s\"." msgstr "Неизвестный режим печати: \"%s\"." @@ -7555,7 +7555,7 @@ msgid "Unknown request version." msgstr "Неизвестный запрос версии." -#: cups/http-support.c:1633 +#: cups/http-support.c:1638 msgid "Unknown scheme in URI" msgstr "Неизвестный scheme в URI" @@ -7563,7 +7563,7 @@ msgid "Unknown service name." msgstr "Неизвестное имя сервиса." -#: backend/ipp.c:548 +#: backend/ipp.c:547 #, c-format msgid "Unknown version option value: \"%s\"." msgstr "Неизвестное значение параметра версии \"%s\"." @@ -7644,11 +7644,11 @@ msgid "Unsupported value type" msgstr "Неподдерживаемый тип значения" -#: cups/http-support.c:1531 +#: cups/http-support.c:1536 msgid "Upgrade Required" msgstr "Требуется обновление" -#: systemv/lpadmin.c:664 +#: systemv/lpadmin.c:662 msgid "" "Usage:\n" "\n" @@ -7668,7 +7668,7 @@ " [-P ppd-file] [-o name=value]\n" " [-u allow:user,user] [-u deny:user,user]" -#: backend/dnssd.c:192 backend/ipp.c:325 backend/lpd.c:168 +#: backend/dnssd.c:192 backend/ipp.c:324 backend/lpd.c:172 #: backend/socket.c:119 backend/usb.c:170 filter/commandtops.c:57 #: filter/gziptoany.c:38 filter/pstops.c:223 monitor/bcp.c:48 #: monitor/tbcp.c:47 @@ -7685,7 +7685,7 @@ msgstr "" "Использование: cupsctl [опции] [параметр=значение ... параметрN=значениеN]" -#: scheduler/main.c:2132 +#: scheduler/main.c:2134 msgid "Usage: cupsd [options]" msgstr "Использование: cupsd [опции]" @@ -7725,7 +7725,7 @@ msgid "Usage: lpmove job/src dest" msgstr "" -#: systemv/lpoptions.c:536 +#: systemv/lpoptions.c:523 msgid "" "Usage: lpoptions [-h server] [-E] -d printer\n" " lpoptions [-h server] [-E] [-p printer] -l\n" @@ -7778,7 +7778,7 @@ msgid "VarBind uses indefinite length" msgstr "Для VarBind длина не установлена" -#: cups/ppd-cache.c:3605 +#: cups/ppd-cache.c:3592 msgid "Vellum Paper" msgstr "" @@ -7786,7 +7786,7 @@ msgid "Version uses indefinite length" msgstr "Для Version длина не установлена" -#: backend/ipp.c:2000 +#: backend/ipp.c:2009 msgid "Waiting for job to complete." msgstr "Ожидание выполнения задания." @@ -7802,19 +7802,19 @@ msgid "Warning, no Windows 2000 printer drivers are installed." msgstr "Внимание, драйверы принтера Windows 2000 не установлены" -#: cups/ppd-cache.c:3530 +#: cups/ppd-cache.c:3517 msgid "Waterproof Fabric" msgstr "" -#: cups/http-support.c:1552 +#: cups/http-support.c:1557 msgid "Web Interface is Disabled" msgstr "Web интерфейс отключен" -#: cups/ppd-cache.c:3618 +#: cups/ppd-cache.c:3605 msgid "Wet Film" msgstr "" -#: cups/ppd-cache.c:3523 +#: cups/ppd-cache.c:3510 msgid "Windowed Envelope" msgstr "" @@ -7822,7 +7822,7 @@ msgid "Yes" msgstr "Да" -#: scheduler/client.c:2248 +#: scheduler/client.c:2236 #, c-format msgid "" "You must access this page using the URL https://%s:%d%s." -#: cups/ppd-cache.c:2988 +#: cups/ppd-cache.c:3004 msgid "Z Fold" msgstr "" -#: ppdc/sample.c:434 +#: ppdc/sample.c:437 msgid "ZPL Label Printer" msgstr "Принтер для печати этикеток ZPL" -#: ppdc/sample.c:357 +#: ppdc/sample.c:360 msgid "Zebra" msgstr "Zebra" @@ -8256,7 +8256,7 @@ msgid "lpadmin: Unable to open PPD \"%s\": %s on line %d." msgstr "" -#: systemv/lpadmin.c:1473 +#: systemv/lpadmin.c:1458 #, c-format msgid "lpadmin: Unable to open PPD file \"%s\" - %s" msgstr "lpadmin: Не удается открыть PPD-файл \"%s\" - %s" @@ -8957,7 +8957,7 @@ msgid "scheduler is running" msgstr "планировщик запущен" -#: cups/adminutil.c:1384 +#: cups/adminutil.c:1380 #, c-format msgid "stat of %s failed: %s" msgstr "не удалось установить %s: %s" @@ -10373,447 +10373,447 @@ msgstr "Trim After Pages" #. TRANSLATORS: Finishings -#: locale/ipp-strings.c:580 +#: locale/ipp-strings.c:584 msgid "finishings" msgstr "Finishings" #. TRANSLATORS: Finishings -#: locale/ipp-strings.c:582 +#: locale/ipp-strings.c:586 msgid "finishings-col" msgstr "Finishings" #. TRANSLATORS: Fold -#: locale/ipp-strings.c:584 +#: locale/ipp-strings.c:588 msgid "finishings.10" msgstr "Fold" #. TRANSLATORS: Z Fold -#: locale/ipp-strings.c:586 +#: locale/ipp-strings.c:590 msgid "finishings.100" msgstr "Fold Z" #. TRANSLATORS: Engineering Z Fold -#: locale/ipp-strings.c:588 +#: locale/ipp-strings.c:592 msgid "finishings.101" msgstr "Fold Engineering Z" #. TRANSLATORS: Trim -#: locale/ipp-strings.c:590 +#: locale/ipp-strings.c:594 msgid "finishings.11" msgstr "Trim" #. TRANSLATORS: Bale -#: locale/ipp-strings.c:592 +#: locale/ipp-strings.c:596 msgid "finishings.12" msgstr "Bale" #. TRANSLATORS: Booklet Maker -#: locale/ipp-strings.c:594 +#: locale/ipp-strings.c:598 msgid "finishings.13" msgstr "Booklet Maker" #. TRANSLATORS: Jog Offset -#: locale/ipp-strings.c:596 +#: locale/ipp-strings.c:600 msgid "finishings.14" msgstr "Jog Offset" #. TRANSLATORS: Coat -#: locale/ipp-strings.c:598 +#: locale/ipp-strings.c:602 msgid "finishings.15" msgstr "Coat" #. TRANSLATORS: Laminate -#: locale/ipp-strings.c:600 +#: locale/ipp-strings.c:604 msgid "finishings.16" msgstr "Laminate" #. TRANSLATORS: Staple Top Left -#: locale/ipp-strings.c:602 +#: locale/ipp-strings.c:606 msgid "finishings.20" msgstr "Staple Top Left" #. TRANSLATORS: Staple Bottom Left -#: locale/ipp-strings.c:604 +#: locale/ipp-strings.c:608 msgid "finishings.21" msgstr "Staple Bottom Left" #. TRANSLATORS: Staple Top Right -#: locale/ipp-strings.c:606 +#: locale/ipp-strings.c:610 msgid "finishings.22" msgstr "Staple Top Right" #. TRANSLATORS: Staple Bottom Right -#: locale/ipp-strings.c:608 +#: locale/ipp-strings.c:612 msgid "finishings.23" msgstr "Staple Bottom Right" #. TRANSLATORS: Edge Stitch Left -#: locale/ipp-strings.c:610 +#: locale/ipp-strings.c:614 msgid "finishings.24" msgstr "Edge Stitch Left" #. TRANSLATORS: Edge Stitch Top -#: locale/ipp-strings.c:612 +#: locale/ipp-strings.c:616 msgid "finishings.25" msgstr "Edge Stitch Top" #. TRANSLATORS: Edge Stitch Right -#: locale/ipp-strings.c:614 +#: locale/ipp-strings.c:618 msgid "finishings.26" msgstr "Edge Stitch Right" #. TRANSLATORS: Edge Stitch Bottom -#: locale/ipp-strings.c:616 +#: locale/ipp-strings.c:620 msgid "finishings.27" msgstr "Edge Stitch Bottom" #. TRANSLATORS: 2 Staples on Left -#: locale/ipp-strings.c:618 +#: locale/ipp-strings.c:622 msgid "finishings.28" msgstr "Staple Dual Left" #. TRANSLATORS: 2 Staples on Top -#: locale/ipp-strings.c:620 +#: locale/ipp-strings.c:624 msgid "finishings.29" msgstr "Staple Dual Top" #. TRANSLATORS: None -#: locale/ipp-strings.c:622 +#: locale/ipp-strings.c:626 msgid "finishings.3" msgstr "None" #. TRANSLATORS: 2 Staples on Right -#: locale/ipp-strings.c:624 +#: locale/ipp-strings.c:628 msgid "finishings.30" msgstr "Staple Dual Right" #. TRANSLATORS: 2 Staples on Bottom -#: locale/ipp-strings.c:626 +#: locale/ipp-strings.c:630 msgid "finishings.31" msgstr "Staple Dual Bottom" #. TRANSLATORS: 3 Staples on Left -#: locale/ipp-strings.c:628 +#: locale/ipp-strings.c:632 msgid "finishings.32" msgstr "Staple Triple Left" #. TRANSLATORS: 3 Staples on Top -#: locale/ipp-strings.c:630 +#: locale/ipp-strings.c:634 msgid "finishings.33" msgstr "Staple Triple Top" #. TRANSLATORS: 3 Staples on Right -#: locale/ipp-strings.c:632 +#: locale/ipp-strings.c:636 msgid "finishings.34" msgstr "Staple Triple Right" #. TRANSLATORS: 3 Staples on Bottom -#: locale/ipp-strings.c:634 +#: locale/ipp-strings.c:638 msgid "finishings.35" msgstr "Staple Triple Bottom" #. TRANSLATORS: Staple -#: locale/ipp-strings.c:636 +#: locale/ipp-strings.c:640 msgid "finishings.4" msgstr "Staple" #. TRANSLATORS: Punch -#: locale/ipp-strings.c:638 +#: locale/ipp-strings.c:642 msgid "finishings.5" msgstr "Punch" #. TRANSLATORS: Bind Left -#: locale/ipp-strings.c:640 +#: locale/ipp-strings.c:644 msgid "finishings.50" msgstr "Bind Left" #. TRANSLATORS: Bind Top -#: locale/ipp-strings.c:642 +#: locale/ipp-strings.c:646 msgid "finishings.51" msgstr "Bind Top" #. TRANSLATORS: Bind Right -#: locale/ipp-strings.c:644 +#: locale/ipp-strings.c:648 msgid "finishings.52" msgstr "Bind Right" #. TRANSLATORS: Bind Bottom -#: locale/ipp-strings.c:646 +#: locale/ipp-strings.c:650 msgid "finishings.53" msgstr "Bind Bottom" #. TRANSLATORS: Cover -#: locale/ipp-strings.c:648 +#: locale/ipp-strings.c:652 msgid "finishings.6" msgstr "Cover" #. TRANSLATORS: Trim Pages -#: locale/ipp-strings.c:650 +#: locale/ipp-strings.c:654 msgid "finishings.60" msgstr "Trim After Pages" #. TRANSLATORS: Trim Documents -#: locale/ipp-strings.c:652 +#: locale/ipp-strings.c:656 msgid "finishings.61" msgstr "Trim After Documents" #. TRANSLATORS: Trim Copies -#: locale/ipp-strings.c:654 +#: locale/ipp-strings.c:658 msgid "finishings.62" msgstr "Trim After Copies" #. TRANSLATORS: Trim Job -#: locale/ipp-strings.c:656 +#: locale/ipp-strings.c:660 msgid "finishings.63" msgstr "Trim After Job" #. TRANSLATORS: Bind -#: locale/ipp-strings.c:658 +#: locale/ipp-strings.c:662 msgid "finishings.7" msgstr "Bind" #. TRANSLATORS: Punch Top Left -#: locale/ipp-strings.c:660 +#: locale/ipp-strings.c:664 msgid "finishings.70" msgstr "Punch Top Left" #. TRANSLATORS: Punch Bottom Left -#: locale/ipp-strings.c:662 +#: locale/ipp-strings.c:666 msgid "finishings.71" msgstr "Punch Bottom Left" #. TRANSLATORS: Punch Top Right -#: locale/ipp-strings.c:664 +#: locale/ipp-strings.c:668 msgid "finishings.72" msgstr "Punch Top Right" #. TRANSLATORS: Punch Bottom Right -#: locale/ipp-strings.c:666 +#: locale/ipp-strings.c:670 msgid "finishings.73" msgstr "Punch Bottom Right" #. TRANSLATORS: 2-hole Punch Left -#: locale/ipp-strings.c:668 +#: locale/ipp-strings.c:672 msgid "finishings.74" msgstr "Punch Dual Left" #. TRANSLATORS: 2-hole Punch Top -#: locale/ipp-strings.c:670 +#: locale/ipp-strings.c:674 msgid "finishings.75" msgstr "Punch Dual Top" #. TRANSLATORS: 2-hole Punch Right -#: locale/ipp-strings.c:672 +#: locale/ipp-strings.c:676 msgid "finishings.76" msgstr "Punch Dual Right" #. TRANSLATORS: 2-hole Punch Bottom -#: locale/ipp-strings.c:674 +#: locale/ipp-strings.c:678 msgid "finishings.77" msgstr "Punch Dual Bottom" #. TRANSLATORS: 3-hole Punch Left -#: locale/ipp-strings.c:676 +#: locale/ipp-strings.c:680 msgid "finishings.78" msgstr "Punch Triple Left" #. TRANSLATORS: 3-hole Punch Top -#: locale/ipp-strings.c:678 +#: locale/ipp-strings.c:682 msgid "finishings.79" msgstr "Punch Triple Top" #. TRANSLATORS: Saddle Stitch -#: locale/ipp-strings.c:680 +#: locale/ipp-strings.c:684 msgid "finishings.8" msgstr "Saddle Stitch" #. TRANSLATORS: 3-hole Punch Right -#: locale/ipp-strings.c:682 +#: locale/ipp-strings.c:686 msgid "finishings.80" msgstr "Punch Triple Right" #. TRANSLATORS: 3-hole Punch Bottom -#: locale/ipp-strings.c:684 +#: locale/ipp-strings.c:688 msgid "finishings.81" msgstr "Punch Triple Bottom" #. TRANSLATORS: 4-hole Punch Left -#: locale/ipp-strings.c:686 +#: locale/ipp-strings.c:690 msgid "finishings.82" msgstr "Punch Quad Left" #. TRANSLATORS: 4-hole Punch Top -#: locale/ipp-strings.c:688 +#: locale/ipp-strings.c:692 msgid "finishings.83" msgstr "Punch Quad Top" #. TRANSLATORS: 4-hole Punch Right -#: locale/ipp-strings.c:690 +#: locale/ipp-strings.c:694 msgid "finishings.84" msgstr "Punch Quad Right" #. TRANSLATORS: 4-hole Punch Bottom -#: locale/ipp-strings.c:692 +#: locale/ipp-strings.c:696 msgid "finishings.85" msgstr "Punch Quad Bottom" #. TRANSLATORS: Multi-hole Punch Left -#: locale/ipp-strings.c:694 +#: locale/ipp-strings.c:698 msgid "finishings.86" msgstr "Punch Multiple Left" #. TRANSLATORS: Multi-hole Punch Top -#: locale/ipp-strings.c:696 +#: locale/ipp-strings.c:700 msgid "finishings.87" msgstr "Punch Multiple Top" #. TRANSLATORS: Multi-hole Punch Right -#: locale/ipp-strings.c:698 +#: locale/ipp-strings.c:702 msgid "finishings.88" msgstr "Punch Multiple Right" #. TRANSLATORS: Multi-hole Punch Bottom -#: locale/ipp-strings.c:700 +#: locale/ipp-strings.c:704 msgid "finishings.89" msgstr "Punch Multiple Bottom" #. TRANSLATORS: Edge Stitch -#: locale/ipp-strings.c:702 +#: locale/ipp-strings.c:706 msgid "finishings.9" msgstr "Edge Stitch" #. TRANSLATORS: Accordion Fold -#: locale/ipp-strings.c:704 +#: locale/ipp-strings.c:708 msgid "finishings.90" msgstr "Fold Accordion" #. TRANSLATORS: Double Gate Fold -#: locale/ipp-strings.c:706 +#: locale/ipp-strings.c:710 msgid "finishings.91" msgstr "Fold Double Gate" #. TRANSLATORS: Gate Fold -#: locale/ipp-strings.c:708 +#: locale/ipp-strings.c:712 msgid "finishings.92" msgstr "Fold Gate" #. TRANSLATORS: Half Fold -#: locale/ipp-strings.c:710 +#: locale/ipp-strings.c:714 msgid "finishings.93" msgstr "Fold Half" #. TRANSLATORS: Half Z Fold -#: locale/ipp-strings.c:712 +#: locale/ipp-strings.c:716 msgid "finishings.94" msgstr "Fold Half Z" #. TRANSLATORS: Left Gate Fold -#: locale/ipp-strings.c:714 +#: locale/ipp-strings.c:718 msgid "finishings.95" msgstr "Fold Left Gate" #. TRANSLATORS: Letter Fold -#: locale/ipp-strings.c:716 +#: locale/ipp-strings.c:720 msgid "finishings.96" msgstr "Fold Letter" #. TRANSLATORS: Parallel Fold -#: locale/ipp-strings.c:718 +#: locale/ipp-strings.c:722 msgid "finishings.97" msgstr "Fold Parallel" #. TRANSLATORS: Poster Fold -#: locale/ipp-strings.c:720 +#: locale/ipp-strings.c:724 msgid "finishings.98" msgstr "Fold Poster" #. TRANSLATORS: Right Gate Fold -#: locale/ipp-strings.c:722 +#: locale/ipp-strings.c:726 msgid "finishings.99" msgstr "Fold Right Gate" #. TRANSLATORS: Fold -#: locale/ipp-strings.c:724 +#: locale/ipp-strings.c:728 msgid "folding" msgstr "Fold" #. TRANSLATORS: Fold Direction -#: locale/ipp-strings.c:726 +#: locale/ipp-strings.c:730 msgid "folding-direction" msgstr "Folding Direction" #. TRANSLATORS: Inward -#: locale/ipp-strings.c:728 +#: locale/ipp-strings.c:732 msgid "folding-direction.inward" msgstr "Inward" #. TRANSLATORS: Outward -#: locale/ipp-strings.c:730 +#: locale/ipp-strings.c:734 msgid "folding-direction.outward" msgstr "Outward" #. TRANSLATORS: Fold Position -#: locale/ipp-strings.c:732 +#: locale/ipp-strings.c:736 msgid "folding-offset" msgstr "Fold Position" #. TRANSLATORS: Fold Edge -#: locale/ipp-strings.c:734 +#: locale/ipp-strings.c:738 msgid "folding-reference-edge" msgstr "Folding Reference Edge" #. TRANSLATORS: Bottom -#: locale/ipp-strings.c:736 +#: locale/ipp-strings.c:740 msgid "folding-reference-edge.bottom" msgstr "Bottom" #. TRANSLATORS: Left -#: locale/ipp-strings.c:738 +#: locale/ipp-strings.c:742 msgid "folding-reference-edge.left" msgstr "Left" #. TRANSLATORS: Right -#: locale/ipp-strings.c:740 +#: locale/ipp-strings.c:744 msgid "folding-reference-edge.right" msgstr "Right" #. TRANSLATORS: Top -#: locale/ipp-strings.c:742 +#: locale/ipp-strings.c:746 msgid "folding-reference-edge.top" msgstr "Top" #. TRANSLATORS: Font Name -#: locale/ipp-strings.c:744 +#: locale/ipp-strings.c:748 msgid "font-name-requested" msgstr "Font Name" #. TRANSLATORS: Font Size -#: locale/ipp-strings.c:746 +#: locale/ipp-strings.c:750 msgid "font-size-requested" msgstr "Font Size" #. TRANSLATORS: Force Front Side -#: locale/ipp-strings.c:748 +#: locale/ipp-strings.c:752 msgid "force-front-side" msgstr "Force Front Side" #. TRANSLATORS: From Name -#: locale/ipp-strings.c:750 +#: locale/ipp-strings.c:754 msgid "from-name" msgstr "From Name" #. TRANSLATORS: Imposition Template -#: locale/ipp-strings.c:752 +#: locale/ipp-strings.c:756 msgid "imposition-template" msgstr "Imposition Template" #. TRANSLATORS: None -#: locale/ipp-strings.c:754 +#: locale/ipp-strings.c:758 msgid "imposition-template.none" msgstr "None" #. TRANSLATORS: Signature -#: locale/ipp-strings.c:756 +#: locale/ipp-strings.c:760 msgid "imposition-template.signature" msgstr "Signature" @@ -10959,72 +10959,72 @@ msgstr "Platen" #. TRANSLATORS: Insert Page Number -#: locale/ipp-strings.c:758 +#: locale/ipp-strings.c:762 msgid "insert-after-page-number" msgstr "Insert Page Number" #. TRANSLATORS: Insert Count -#: locale/ipp-strings.c:760 +#: locale/ipp-strings.c:764 msgid "insert-count" msgstr "Insert Count" #. TRANSLATORS: Insert Sheet -#: locale/ipp-strings.c:762 +#: locale/ipp-strings.c:766 msgid "insert-sheet" msgstr "Insert Sheet" #. TRANSLATORS: Job Account ID -#: locale/ipp-strings.c:764 +#: locale/ipp-strings.c:768 msgid "job-account-id" msgstr "Job Account ID" #. TRANSLATORS: Job Account Type -#: locale/ipp-strings.c:766 +#: locale/ipp-strings.c:770 msgid "job-account-type" msgstr "Job Account Type" #. TRANSLATORS: General -#: locale/ipp-strings.c:768 +#: locale/ipp-strings.c:772 msgid "job-account-type.general" msgstr "General" #. TRANSLATORS: Group -#: locale/ipp-strings.c:770 +#: locale/ipp-strings.c:774 msgid "job-account-type.group" msgstr "Group" #. TRANSLATORS: None -#: locale/ipp-strings.c:772 +#: locale/ipp-strings.c:776 msgid "job-account-type.none" msgstr "None" #. TRANSLATORS: Job Accounting Output Bin -#: locale/ipp-strings.c:774 +#: locale/ipp-strings.c:778 msgid "job-accounting-output-bin" msgstr "Job Accounting Output Bin" #. TRANSLATORS: Job Accounting Sheets -#: locale/ipp-strings.c:776 +#: locale/ipp-strings.c:780 msgid "job-accounting-sheets" msgstr "Job Accounting Sheets" #. TRANSLATORS: Type of Job Accounting Sheets -#: locale/ipp-strings.c:778 +#: locale/ipp-strings.c:782 msgid "job-accounting-sheets-type" msgstr "Job Accounting Sheets Type" #. TRANSLATORS: None -#: locale/ipp-strings.c:780 +#: locale/ipp-strings.c:784 msgid "job-accounting-sheets-type.none" msgstr "None" #. TRANSLATORS: Standard -#: locale/ipp-strings.c:782 +#: locale/ipp-strings.c:786 msgid "job-accounting-sheets-type.standard" msgstr "Standard" #. TRANSLATORS: Job Accounting User ID -#: locale/ipp-strings.c:784 +#: locale/ipp-strings.c:788 msgid "job-accounting-user-id" msgstr "Job Accounting User ID" @@ -11041,8258 +11041,8292 @@ msgstr "Uncollated Documents" #. TRANSLATORS: Copies -#: locale/ipp-strings.c:788 +#: locale/ipp-strings.c:792 msgid "job-copies" msgstr "Job Copies" #. TRANSLATORS: Back Cover -#: locale/ipp-strings.c:790 +#: locale/ipp-strings.c:794 msgid "job-cover-back" msgstr "Job Cover Back" #. TRANSLATORS: Front Cover -#: locale/ipp-strings.c:792 +#: locale/ipp-strings.c:796 msgid "job-cover-front" msgstr "Job Cover Front" #. TRANSLATORS: Delay Output Until -#: locale/ipp-strings.c:794 +#: locale/ipp-strings.c:798 msgid "job-delay-output-until" msgstr "Job Delay Output Until" #. TRANSLATORS: Delay Output Until -#: locale/ipp-strings.c:796 +#: locale/ipp-strings.c:800 msgid "job-delay-output-until-time" msgstr "Job Delay Output Until Time" #. TRANSLATORS: Daytime -#: locale/ipp-strings.c:798 +#: locale/ipp-strings.c:802 msgid "job-delay-output-until.day-time" msgstr "Day Time" #. TRANSLATORS: Evening -#: locale/ipp-strings.c:800 +#: locale/ipp-strings.c:804 msgid "job-delay-output-until.evening" msgstr "Evening" #. TRANSLATORS: Released -#: locale/ipp-strings.c:802 +#: locale/ipp-strings.c:806 msgid "job-delay-output-until.indefinite" msgstr "Indefinite" #. TRANSLATORS: Night -#: locale/ipp-strings.c:804 +#: locale/ipp-strings.c:808 msgid "job-delay-output-until.night" msgstr "Night" #. TRANSLATORS: No Delay -#: locale/ipp-strings.c:806 +#: locale/ipp-strings.c:810 msgid "job-delay-output-until.no-delay-output" msgstr "No Delay Output" #. TRANSLATORS: Second Shift -#: locale/ipp-strings.c:808 +#: locale/ipp-strings.c:812 msgid "job-delay-output-until.second-shift" msgstr "Second Shift" #. TRANSLATORS: Third Shift -#: locale/ipp-strings.c:810 +#: locale/ipp-strings.c:814 msgid "job-delay-output-until.third-shift" msgstr "Third Shift" #. TRANSLATORS: Weekend -#: locale/ipp-strings.c:812 +#: locale/ipp-strings.c:816 msgid "job-delay-output-until.weekend" msgstr "Weekend" #. TRANSLATORS: On Error -#: locale/ipp-strings.c:814 +#: locale/ipp-strings.c:818 msgid "job-error-action" msgstr "Job Error Action" #. TRANSLATORS: Abort Job -#: locale/ipp-strings.c:816 +#: locale/ipp-strings.c:820 msgid "job-error-action.abort-job" msgstr "Abort Job" #. TRANSLATORS: Cancel Job -#: locale/ipp-strings.c:818 +#: locale/ipp-strings.c:822 msgid "job-error-action.cancel-job" msgstr "Cancel Job" #. TRANSLATORS: Continue Job -#: locale/ipp-strings.c:820 +#: locale/ipp-strings.c:824 msgid "job-error-action.continue-job" msgstr "Continue Job" #. TRANSLATORS: Suspend Job -#: locale/ipp-strings.c:822 +#: locale/ipp-strings.c:826 msgid "job-error-action.suspend-job" msgstr "Suspend Job" #. TRANSLATORS: Print Error Sheet -#: locale/ipp-strings.c:824 +#: locale/ipp-strings.c:828 msgid "job-error-sheet" msgstr "Job Error Sheet" #. TRANSLATORS: Type of Error Sheet -#: locale/ipp-strings.c:826 +#: locale/ipp-strings.c:830 msgid "job-error-sheet-type" msgstr "Job Error Sheet Type" #. TRANSLATORS: None -#: locale/ipp-strings.c:828 +#: locale/ipp-strings.c:832 msgid "job-error-sheet-type.none" msgstr "None" #. TRANSLATORS: Standard -#: locale/ipp-strings.c:830 +#: locale/ipp-strings.c:834 msgid "job-error-sheet-type.standard" msgstr "Standard" #. TRANSLATORS: Print Error Sheet -#: locale/ipp-strings.c:832 +#: locale/ipp-strings.c:836 msgid "job-error-sheet-when" msgstr "Job Error Sheet When" #. TRANSLATORS: Always -#: locale/ipp-strings.c:834 +#: locale/ipp-strings.c:838 msgid "job-error-sheet-when.always" msgstr "Always" #. TRANSLATORS: On Error -#: locale/ipp-strings.c:836 +#: locale/ipp-strings.c:840 msgid "job-error-sheet-when.on-error" msgstr "On Error" #. TRANSLATORS: Job Finishings -#: locale/ipp-strings.c:838 +#: locale/ipp-strings.c:842 msgid "job-finishings" msgstr "Job Finishings" #. TRANSLATORS: Hold Until -#: locale/ipp-strings.c:840 +#: locale/ipp-strings.c:844 msgid "job-hold-until" msgstr "Hold Until" #. TRANSLATORS: Hold Until -#: locale/ipp-strings.c:842 +#: locale/ipp-strings.c:846 msgid "job-hold-until-time" msgstr "Job Hold Until Time" #. TRANSLATORS: Daytime -#: locale/ipp-strings.c:844 +#: locale/ipp-strings.c:848 msgid "job-hold-until.day-time" msgstr "Day Time" #. TRANSLATORS: Evening -#: locale/ipp-strings.c:846 +#: locale/ipp-strings.c:850 msgid "job-hold-until.evening" msgstr "Evening" #. TRANSLATORS: Released -#: locale/ipp-strings.c:848 +#: locale/ipp-strings.c:852 msgid "job-hold-until.indefinite" msgstr "Released" #. TRANSLATORS: Night -#: locale/ipp-strings.c:850 +#: locale/ipp-strings.c:854 msgid "job-hold-until.night" msgstr "Night" #. TRANSLATORS: No Hold -#: locale/ipp-strings.c:852 +#: locale/ipp-strings.c:856 msgid "job-hold-until.no-hold" msgstr "No Hold" #. TRANSLATORS: Second Shift -#: locale/ipp-strings.c:854 +#: locale/ipp-strings.c:858 msgid "job-hold-until.second-shift" msgstr "Second Shift" #. TRANSLATORS: Third Shift -#: locale/ipp-strings.c:856 +#: locale/ipp-strings.c:860 msgid "job-hold-until.third-shift" msgstr "Third Shift" #. TRANSLATORS: Weekend -#: locale/ipp-strings.c:858 +#: locale/ipp-strings.c:862 msgid "job-hold-until.weekend" msgstr "Weekend" #. TRANSLATORS: Job Mandatory Attributes -#: locale/ipp-strings.c:860 +#: locale/ipp-strings.c:864 msgid "job-mandatory-attributes" msgstr "Job Mandatory Attributes" #. TRANSLATORS: Title -#: locale/ipp-strings.c:862 +#: locale/ipp-strings.c:866 msgid "job-name" msgstr "Job Name" #. TRANSLATORS: Job Phone Number -#: locale/ipp-strings.c:868 +#: locale/ipp-strings.c:872 msgid "job-phone-number" msgstr "Job Phone Number" #. TRANSLATORS: Job Priority -#: locale/ipp-strings.c:870 +#: locale/ipp-strings.c:874 msgid "job-priority" msgstr "Job Priority" #. TRANSLATORS: Job Recipient Name -#: locale/ipp-strings.c:894 +#: locale/ipp-strings.c:898 msgid "job-recipient-name" msgstr "Job Recipient Name" #. TRANSLATORS: Job Save Disposition -#: locale/ipp-strings.c:912 +#: locale/ipp-strings.c:916 msgid "job-save-disposition" msgstr "Job Save Disposition" #. TRANSLATORS: Job Sheet Message -#: locale/ipp-strings.c:914 +#: locale/ipp-strings.c:918 msgid "job-sheet-message" msgstr "Job Sheet Message" #. TRANSLATORS: Banner Page -#: locale/ipp-strings.c:916 +#: locale/ipp-strings.c:920 msgid "job-sheets" msgstr "Banner Page" #. TRANSLATORS: Banner Page -#: locale/ipp-strings.c:918 +#: locale/ipp-strings.c:922 msgid "job-sheets-col" msgstr "Banner Page" #. TRANSLATORS: First Page in Document -#: locale/ipp-strings.c:920 +#: locale/ipp-strings.c:924 msgid "job-sheets.first-print-stream-page" msgstr "First Print Stream Page" #. TRANSLATORS: Start and End Sheets -#: locale/ipp-strings.c:922 +#: locale/ipp-strings.c:926 msgid "job-sheets.job-both-sheet" msgstr "Start and End Sheets" #. TRANSLATORS: End Sheet -#: locale/ipp-strings.c:924 +#: locale/ipp-strings.c:928 msgid "job-sheets.job-end-sheet" msgstr "End Sheet" #. TRANSLATORS: Start Sheet -#: locale/ipp-strings.c:926 +#: locale/ipp-strings.c:930 msgid "job-sheets.job-start-sheet" msgstr "Start Sheet" #. TRANSLATORS: None -#: locale/ipp-strings.c:928 +#: locale/ipp-strings.c:932 msgid "job-sheets.none" msgstr "None" #. TRANSLATORS: Standard -#: locale/ipp-strings.c:930 +#: locale/ipp-strings.c:934 msgid "job-sheets.standard" msgstr "Standard" #. TRANSLATORS: Job State -#: locale/ipp-strings.c:932 +#: locale/ipp-strings.c:936 msgid "job-state" msgstr "Job State" #. TRANSLATORS: Job State Message -#: locale/ipp-strings.c:934 +#: locale/ipp-strings.c:938 msgid "job-state-message" msgstr "Job State Message" #. TRANSLATORS: Detailed Job State -#: locale/ipp-strings.c:936 +#: locale/ipp-strings.c:940 msgid "job-state-reasons" msgstr "Detailed Job State" #. TRANSLATORS: Stopping -#: locale/ipp-strings.c:938 +#: locale/ipp-strings.c:942 msgid "job-state-reasons.aborted-by-system" msgstr "Aborted By System" #. TRANSLATORS: Account Authorization Failed -#: locale/ipp-strings.c:940 +#: locale/ipp-strings.c:944 msgid "job-state-reasons.account-authorization-failed" msgstr "Account Authorization Failed" #. TRANSLATORS: Account Closed -#: locale/ipp-strings.c:942 +#: locale/ipp-strings.c:946 msgid "job-state-reasons.account-closed" msgstr "Account Closed" #. TRANSLATORS: Account Info Needed -#: locale/ipp-strings.c:944 +#: locale/ipp-strings.c:948 msgid "job-state-reasons.account-info-needed" msgstr "Account Info Needed" #. TRANSLATORS: Account Limit Reached -#: locale/ipp-strings.c:946 +#: locale/ipp-strings.c:950 msgid "job-state-reasons.account-limit-reached" msgstr "Account Limit Reached" #. TRANSLATORS: Decompression error -#: locale/ipp-strings.c:948 +#: locale/ipp-strings.c:952 msgid "job-state-reasons.compression-error" msgstr "Compression Error" #. TRANSLATORS: Conflicting Attributes -#: locale/ipp-strings.c:950 +#: locale/ipp-strings.c:954 msgid "job-state-reasons.conflicting-attributes" msgstr "Conflicting Attributes" #. TRANSLATORS: Connected To Destination -#: locale/ipp-strings.c:952 +#: locale/ipp-strings.c:956 msgid "job-state-reasons.connected-to-destination" msgstr "Connected To Destination" #. TRANSLATORS: Connecting To Destination -#: locale/ipp-strings.c:954 +#: locale/ipp-strings.c:958 msgid "job-state-reasons.connecting-to-destination" msgstr "Connecting To Destination" #. TRANSLATORS: Destination Uri Failed -#: locale/ipp-strings.c:956 +#: locale/ipp-strings.c:960 msgid "job-state-reasons.destination-uri-failed" msgstr "Destination Uri Failed" #. TRANSLATORS: Digital Signature Did Not Verify -#: locale/ipp-strings.c:958 +#: locale/ipp-strings.c:962 msgid "job-state-reasons.digital-signature-did-not-verify" msgstr "Digital Signature Did Not Verify" #. TRANSLATORS: Digital Signature Type Not Supported -#: locale/ipp-strings.c:960 +#: locale/ipp-strings.c:964 msgid "job-state-reasons.digital-signature-type-not-supported" msgstr "Digital Signature Type Not Supported" #. TRANSLATORS: Document Access Error -#: locale/ipp-strings.c:962 +#: locale/ipp-strings.c:966 msgid "job-state-reasons.document-access-error" msgstr "Document Access Error" #. TRANSLATORS: Document Format Error -#: locale/ipp-strings.c:964 +#: locale/ipp-strings.c:968 msgid "job-state-reasons.document-format-error" msgstr "Document Format Error" #. TRANSLATORS: Document Password Error -#: locale/ipp-strings.c:966 +#: locale/ipp-strings.c:970 msgid "job-state-reasons.document-password-error" msgstr "Document Password Error" #. TRANSLATORS: Document Permission Error -#: locale/ipp-strings.c:968 +#: locale/ipp-strings.c:972 msgid "job-state-reasons.document-permission-error" msgstr "Document Permission Error" #. TRANSLATORS: Document Security Error -#: locale/ipp-strings.c:970 +#: locale/ipp-strings.c:974 msgid "job-state-reasons.document-security-error" msgstr "Document Security Error" #. TRANSLATORS: Document Unprintable Error -#: locale/ipp-strings.c:972 +#: locale/ipp-strings.c:976 msgid "job-state-reasons.document-unprintable-error" msgstr "Document Unprintable Error" #. TRANSLATORS: Errors Detected -#: locale/ipp-strings.c:974 +#: locale/ipp-strings.c:978 msgid "job-state-reasons.errors-detected" msgstr "Errors Detected" #. TRANSLATORS: Canceled at printer -#: locale/ipp-strings.c:976 +#: locale/ipp-strings.c:980 msgid "job-state-reasons.job-canceled-at-device" msgstr "Job Canceled At Device" #. TRANSLATORS: Canceled by operator -#: locale/ipp-strings.c:978 +#: locale/ipp-strings.c:982 msgid "job-state-reasons.job-canceled-by-operator" msgstr "Job Canceled By Operator" #. TRANSLATORS: Canceled by user -#: locale/ipp-strings.c:980 +#: locale/ipp-strings.c:984 msgid "job-state-reasons.job-canceled-by-user" msgstr "Job Canceled By User" #. TRANSLATORS: -#: locale/ipp-strings.c:982 +#: locale/ipp-strings.c:986 msgid "job-state-reasons.job-completed-successfully" msgstr "Job Completed Successfully" #. TRANSLATORS: Completed with errors -#: locale/ipp-strings.c:984 +#: locale/ipp-strings.c:988 msgid "job-state-reasons.job-completed-with-errors" msgstr "Job Completed With Errors" #. TRANSLATORS: Completed with warnings -#: locale/ipp-strings.c:986 +#: locale/ipp-strings.c:990 msgid "job-state-reasons.job-completed-with-warnings" msgstr "Job Completed With Warnings" #. TRANSLATORS: Insufficient data -#: locale/ipp-strings.c:988 +#: locale/ipp-strings.c:992 msgid "job-state-reasons.job-data-insufficient" msgstr "Job Data Insufficient" #. TRANSLATORS: Job Delay Output Until Specified -#: locale/ipp-strings.c:990 +#: locale/ipp-strings.c:994 msgid "job-state-reasons.job-delay-output-until-specified" msgstr "Job Delay Output Until Specified" #. TRANSLATORS: Job Digital Signature Wait -#: locale/ipp-strings.c:992 +#: locale/ipp-strings.c:996 msgid "job-state-reasons.job-digital-signature-wait" msgstr "Job Digital Signature Wait" #. TRANSLATORS: Job Fetchable -#: locale/ipp-strings.c:994 +#: locale/ipp-strings.c:998 msgid "job-state-reasons.job-fetchable" msgstr "Job Fetchable" #. TRANSLATORS: Job Held For Review -#: locale/ipp-strings.c:996 +#: locale/ipp-strings.c:1000 msgid "job-state-reasons.job-held-for-review" msgstr "Job Held For Review" #. TRANSLATORS: Job held -#: locale/ipp-strings.c:998 +#: locale/ipp-strings.c:1002 msgid "job-state-reasons.job-hold-until-specified" msgstr "Job Hold Until Specified" #. TRANSLATORS: Incoming -#: locale/ipp-strings.c:1000 +#: locale/ipp-strings.c:1004 msgid "job-state-reasons.job-incoming" msgstr "Job Incoming" #. TRANSLATORS: Interpreting -#: locale/ipp-strings.c:1002 +#: locale/ipp-strings.c:1006 msgid "job-state-reasons.job-interpreting" msgstr "Job Interpreting" #. TRANSLATORS: Outgoing -#: locale/ipp-strings.c:1004 +#: locale/ipp-strings.c:1008 msgid "job-state-reasons.job-outgoing" msgstr "Job Outgoing" #. TRANSLATORS: Job Password Wait -#: locale/ipp-strings.c:1006 +#: locale/ipp-strings.c:1010 msgid "job-state-reasons.job-password-wait" msgstr "Job Password Wait" #. TRANSLATORS: Job Printed Successfully -#: locale/ipp-strings.c:1008 +#: locale/ipp-strings.c:1012 msgid "job-state-reasons.job-printed-successfully" msgstr "Job Printed Successfully" #. TRANSLATORS: Job Printed With Errors -#: locale/ipp-strings.c:1010 +#: locale/ipp-strings.c:1014 msgid "job-state-reasons.job-printed-with-errors" msgstr "Job Printed With Errors" #. TRANSLATORS: Job Printed With Warnings -#: locale/ipp-strings.c:1012 +#: locale/ipp-strings.c:1016 msgid "job-state-reasons.job-printed-with-warnings" msgstr "Job Printed With Warnings" #. TRANSLATORS: Printing -#: locale/ipp-strings.c:1014 +#: locale/ipp-strings.c:1018 msgid "job-state-reasons.job-printing" msgstr "Job Printing" #. TRANSLATORS: Preparing to print -#: locale/ipp-strings.c:1016 +#: locale/ipp-strings.c:1020 msgid "job-state-reasons.job-queued" msgstr "Job Queued" #. TRANSLATORS: Processing document -#: locale/ipp-strings.c:1018 +#: locale/ipp-strings.c:1022 msgid "job-state-reasons.job-queued-for-marker" msgstr "Job Queued For Marker" #. TRANSLATORS: Job Release Wait -#: locale/ipp-strings.c:1020 +#: locale/ipp-strings.c:1024 msgid "job-state-reasons.job-release-wait" msgstr "Job Release Wait" #. TRANSLATORS: Restartable -#: locale/ipp-strings.c:1022 +#: locale/ipp-strings.c:1026 msgid "job-state-reasons.job-restartable" msgstr "Job Restartable" #. TRANSLATORS: Job Resuming -#: locale/ipp-strings.c:1024 +#: locale/ipp-strings.c:1028 msgid "job-state-reasons.job-resuming" msgstr "Job Resuming" #. TRANSLATORS: Job Saved Successfully -#: locale/ipp-strings.c:1026 +#: locale/ipp-strings.c:1030 msgid "job-state-reasons.job-saved-successfully" msgstr "Job Saved Successfully" #. TRANSLATORS: Job Saved With Errors -#: locale/ipp-strings.c:1028 +#: locale/ipp-strings.c:1032 msgid "job-state-reasons.job-saved-with-errors" msgstr "Job Saved With Errors" #. TRANSLATORS: Job Saved With Warnings -#: locale/ipp-strings.c:1030 +#: locale/ipp-strings.c:1034 msgid "job-state-reasons.job-saved-with-warnings" msgstr "Job Saved With Warnings" #. TRANSLATORS: Job Saving -#: locale/ipp-strings.c:1032 +#: locale/ipp-strings.c:1036 msgid "job-state-reasons.job-saving" msgstr "Job Saving" #. TRANSLATORS: Job Spooling -#: locale/ipp-strings.c:1034 +#: locale/ipp-strings.c:1038 msgid "job-state-reasons.job-spooling" msgstr "Job Spooling" #. TRANSLATORS: Job Streaming -#: locale/ipp-strings.c:1036 +#: locale/ipp-strings.c:1040 msgid "job-state-reasons.job-streaming" msgstr "Job Streaming" #. TRANSLATORS: Suspended -#: locale/ipp-strings.c:1038 +#: locale/ipp-strings.c:1042 msgid "job-state-reasons.job-suspended" msgstr "Job Suspended" #. TRANSLATORS: Job Suspended By Operator -#: locale/ipp-strings.c:1040 +#: locale/ipp-strings.c:1044 msgid "job-state-reasons.job-suspended-by-operator" msgstr "Job Suspended By Operator" #. TRANSLATORS: Job Suspended By System -#: locale/ipp-strings.c:1042 +#: locale/ipp-strings.c:1046 msgid "job-state-reasons.job-suspended-by-system" msgstr "Job Suspended By System" #. TRANSLATORS: Job Suspended By User -#: locale/ipp-strings.c:1044 +#: locale/ipp-strings.c:1048 msgid "job-state-reasons.job-suspended-by-user" msgstr "Job Suspended By User" #. TRANSLATORS: Job Suspending -#: locale/ipp-strings.c:1046 +#: locale/ipp-strings.c:1050 msgid "job-state-reasons.job-suspending" msgstr "Job Suspending" #. TRANSLATORS: Job Transferring -#: locale/ipp-strings.c:1048 +#: locale/ipp-strings.c:1052 msgid "job-state-reasons.job-transferring" msgstr "Job Transferring" #. TRANSLATORS: Transforming -#: locale/ipp-strings.c:1050 +#: locale/ipp-strings.c:1054 msgid "job-state-reasons.job-transforming" msgstr "Job Transforming" #. TRANSLATORS: None -#: locale/ipp-strings.c:1052 +#: locale/ipp-strings.c:1056 msgid "job-state-reasons.none" msgstr "None" #. TRANSLATORS: Printer offline -#: locale/ipp-strings.c:1054 +#: locale/ipp-strings.c:1058 msgid "job-state-reasons.printer-stopped" msgstr "Printer Stopped" #. TRANSLATORS: Printer partially stopped -#: locale/ipp-strings.c:1056 +#: locale/ipp-strings.c:1060 msgid "job-state-reasons.printer-stopped-partly" msgstr "Printer Stopped Partly" #. TRANSLATORS: Stopping -#: locale/ipp-strings.c:1058 +#: locale/ipp-strings.c:1062 msgid "job-state-reasons.processing-to-stop-point" msgstr "Processing To Stop Point" #. TRANSLATORS: Ready -#: locale/ipp-strings.c:1060 +#: locale/ipp-strings.c:1064 msgid "job-state-reasons.queued-in-device" msgstr "Queued In Device" #. TRANSLATORS: Resources Are Not Ready -#: locale/ipp-strings.c:1062 +#: locale/ipp-strings.c:1066 msgid "job-state-reasons.resources-are-not-ready" msgstr "Resources Are Not Ready" #. TRANSLATORS: Resources Are Not Supported -#: locale/ipp-strings.c:1064 +#: locale/ipp-strings.c:1068 msgid "job-state-reasons.resources-are-not-supported" msgstr "Resources Are Not Supported" #. TRANSLATORS: Service offline -#: locale/ipp-strings.c:1066 +#: locale/ipp-strings.c:1070 msgid "job-state-reasons.service-off-line" msgstr "Service Off Line" #. TRANSLATORS: Submission Interrupted -#: locale/ipp-strings.c:1068 +#: locale/ipp-strings.c:1072 msgid "job-state-reasons.submission-interrupted" msgstr "Submission Interrupted" #. TRANSLATORS: Unsupported Attributes Or Values -#: locale/ipp-strings.c:1070 +#: locale/ipp-strings.c:1074 msgid "job-state-reasons.unsupported-attributes-or-values" msgstr "Unsupported Attributes Or Values" #. TRANSLATORS: Unsupported Compression -#: locale/ipp-strings.c:1072 +#: locale/ipp-strings.c:1076 msgid "job-state-reasons.unsupported-compression" msgstr "Unsupported Compression" #. TRANSLATORS: Unsupported Document Format -#: locale/ipp-strings.c:1074 +#: locale/ipp-strings.c:1078 msgid "job-state-reasons.unsupported-document-format" msgstr "Unsupported Document Format" #. TRANSLATORS: Waiting For User Action -#: locale/ipp-strings.c:1076 +#: locale/ipp-strings.c:1080 msgid "job-state-reasons.waiting-for-user-action" msgstr "Waiting For User Action" #. TRANSLATORS: Warnings Detected -#: locale/ipp-strings.c:1078 +#: locale/ipp-strings.c:1082 msgid "job-state-reasons.warnings-detected" msgstr "Warnings Detected" #. TRANSLATORS: Pending -#: locale/ipp-strings.c:1080 +#: locale/ipp-strings.c:1084 msgid "job-state.3" msgstr "Pending" #. TRANSLATORS: Held -#: locale/ipp-strings.c:1082 +#: locale/ipp-strings.c:1086 msgid "job-state.4" msgstr "Pending Held" #. TRANSLATORS: Processing -#: locale/ipp-strings.c:1084 +#: locale/ipp-strings.c:1088 msgid "job-state.5" msgstr "Processing" #. TRANSLATORS: Stopped -#: locale/ipp-strings.c:1086 +#: locale/ipp-strings.c:1090 msgid "job-state.6" msgstr "Processing Stopped" #. TRANSLATORS: Canceled -#: locale/ipp-strings.c:1088 +#: locale/ipp-strings.c:1092 msgid "job-state.7" msgstr "Canceled" #. TRANSLATORS: Aborted -#: locale/ipp-strings.c:1090 +#: locale/ipp-strings.c:1094 msgid "job-state.8" msgstr "Aborted" #. TRANSLATORS: Completed -#: locale/ipp-strings.c:1092 +#: locale/ipp-strings.c:1096 msgid "job-state.9" msgstr "Completed" #. TRANSLATORS: Laminate Pages -#: locale/ipp-strings.c:1094 +#: locale/ipp-strings.c:1098 msgid "laminating" msgstr "Laminate Pages" #. TRANSLATORS: Laminate -#: locale/ipp-strings.c:1096 +#: locale/ipp-strings.c:1100 msgid "laminating-sides" msgstr "Laminating Sides" #. TRANSLATORS: Back Only -#: locale/ipp-strings.c:1098 +#: locale/ipp-strings.c:1102 msgid "laminating-sides.back" msgstr "Back" #. TRANSLATORS: Front and Back -#: locale/ipp-strings.c:1100 +#: locale/ipp-strings.c:1104 msgid "laminating-sides.both" msgstr "Both" #. TRANSLATORS: Front Only -#: locale/ipp-strings.c:1102 +#: locale/ipp-strings.c:1106 msgid "laminating-sides.front" msgstr "Front" #. TRANSLATORS: Type of Lamination -#: locale/ipp-strings.c:1104 +#: locale/ipp-strings.c:1108 msgid "laminating-type" msgstr "Laminating Type" #. TRANSLATORS: Archival -#: locale/ipp-strings.c:1106 +#: locale/ipp-strings.c:1110 msgid "laminating-type.archival" msgstr "Archival" #. TRANSLATORS: Glossy -#: locale/ipp-strings.c:1108 +#: locale/ipp-strings.c:1112 msgid "laminating-type.glossy" msgstr "Glossy" #. TRANSLATORS: High Gloss -#: locale/ipp-strings.c:1110 +#: locale/ipp-strings.c:1114 msgid "laminating-type.high-gloss" msgstr "High Gloss" #. TRANSLATORS: Matte -#: locale/ipp-strings.c:1112 +#: locale/ipp-strings.c:1116 msgid "laminating-type.matte" msgstr "Matte" #. TRANSLATORS: Semi-gloss -#: locale/ipp-strings.c:1114 +#: locale/ipp-strings.c:1118 msgid "laminating-type.semi-gloss" msgstr "Semi-Gloss" #. TRANSLATORS: Translucent -#: locale/ipp-strings.c:1116 +#: locale/ipp-strings.c:1120 msgid "laminating-type.translucent" msgstr "Translucent" #. TRANSLATORS: Logo -#: locale/ipp-strings.c:1118 +#: locale/ipp-strings.c:1122 msgid "logo" msgstr "Logo" #. TRANSLATORS: Amount of Material -#: locale/ipp-strings.c:1120 +#: locale/ipp-strings.c:1124 msgid "material-amount" msgstr "Amount of Material" #. TRANSLATORS: Amount Units -#: locale/ipp-strings.c:1122 +#: locale/ipp-strings.c:1126 msgid "material-amount-units" msgstr "Material Amount Units" #. TRANSLATORS: Grams -#: locale/ipp-strings.c:1124 +#: locale/ipp-strings.c:1128 msgid "material-amount-units.g" msgstr "G" #. TRANSLATORS: Kilograms -#: locale/ipp-strings.c:1126 +#: locale/ipp-strings.c:1130 msgid "material-amount-units.kg" msgstr "Kg" #. TRANSLATORS: Liters -#: locale/ipp-strings.c:1128 +#: locale/ipp-strings.c:1132 msgid "material-amount-units.l" msgstr "L" #. TRANSLATORS: Meters -#: locale/ipp-strings.c:1130 +#: locale/ipp-strings.c:1134 msgid "material-amount-units.m" msgstr "M" #. TRANSLATORS: Milliliters -#: locale/ipp-strings.c:1132 +#: locale/ipp-strings.c:1136 msgid "material-amount-units.ml" msgstr "Ml" #. TRANSLATORS: Millimeters -#: locale/ipp-strings.c:1134 +#: locale/ipp-strings.c:1138 msgid "material-amount-units.mm" msgstr "Mm" #. TRANSLATORS: Material Color -#: locale/ipp-strings.c:1136 +#: locale/ipp-strings.c:1140 msgid "material-color" msgstr "Material Color" #. TRANSLATORS: Material Diameter -#: locale/ipp-strings.c:1138 +#: locale/ipp-strings.c:1142 msgid "material-diameter" msgstr "Material Diameter" #. TRANSLATORS: Material Diameter Tolerance -#: locale/ipp-strings.c:1140 +#: locale/ipp-strings.c:1144 msgid "material-diameter-tolerance" msgstr "Material Diameter Tolerance" #. TRANSLATORS: Material Fill Density -#: locale/ipp-strings.c:1142 +#: locale/ipp-strings.c:1146 msgid "material-fill-density" msgstr "Material Fill Density" #. TRANSLATORS: Material Name -#: locale/ipp-strings.c:1144 +#: locale/ipp-strings.c:1148 msgid "material-name" msgstr "Material Name" #. TRANSLATORS: Use Material For -#: locale/ipp-strings.c:1148 +#: locale/ipp-strings.c:1152 msgid "material-purpose" msgstr "Material Purpose" #. TRANSLATORS: Everything -#: locale/ipp-strings.c:1150 +#: locale/ipp-strings.c:1154 msgid "material-purpose.all" msgstr "All" #. TRANSLATORS: Base -#: locale/ipp-strings.c:1152 +#: locale/ipp-strings.c:1156 msgid "material-purpose.base" msgstr "Base" #. TRANSLATORS: In-fill -#: locale/ipp-strings.c:1154 +#: locale/ipp-strings.c:1158 msgid "material-purpose.in-fill" msgstr "In Fill" #. TRANSLATORS: Shell -#: locale/ipp-strings.c:1156 +#: locale/ipp-strings.c:1160 msgid "material-purpose.shell" msgstr "Shell" #. TRANSLATORS: Supports -#: locale/ipp-strings.c:1158 +#: locale/ipp-strings.c:1162 msgid "material-purpose.support" msgstr "Support" #. TRANSLATORS: Feed Rate -#: locale/ipp-strings.c:1160 +#: locale/ipp-strings.c:1164 msgid "material-rate" msgstr "Feed Rate" #. TRANSLATORS: Feed Rate Units -#: locale/ipp-strings.c:1162 +#: locale/ipp-strings.c:1166 msgid "material-rate-units" msgstr "Material Rate Units" #. TRANSLATORS: Milligrams per second -#: locale/ipp-strings.c:1164 +#: locale/ipp-strings.c:1168 msgid "material-rate-units.mg_second" msgstr "Mg Second" #. TRANSLATORS: Milliliters per second -#: locale/ipp-strings.c:1166 +#: locale/ipp-strings.c:1170 msgid "material-rate-units.ml_second" msgstr "Ml Second" #. TRANSLATORS: Millimeters per second -#: locale/ipp-strings.c:1168 +#: locale/ipp-strings.c:1172 msgid "material-rate-units.mm_second" msgstr "Mm Second" #. TRANSLATORS: Material Shell Thickness -#: locale/ipp-strings.c:1172 +#: locale/ipp-strings.c:1176 msgid "material-shell-thickness" msgstr "Material Shell Thickness" #. TRANSLATORS: Material Temperature -#: locale/ipp-strings.c:1174 +#: locale/ipp-strings.c:1178 msgid "material-temperature" msgstr "Material Temperature" #. TRANSLATORS: Material Type -#: locale/ipp-strings.c:1176 +#: locale/ipp-strings.c:1180 msgid "material-type" msgstr "Material Type" #. TRANSLATORS: ABS -#: locale/ipp-strings.c:1178 +#: locale/ipp-strings.c:1182 msgid "material-type.abs" msgstr "Abs" #. TRANSLATORS: Carbon Fiber ABS -#: locale/ipp-strings.c:1180 +#: locale/ipp-strings.c:1184 msgid "material-type.abs-carbon-fiber" msgstr "Abs Carbon Fiber" #. TRANSLATORS: Carbon Nanotube ABS -#: locale/ipp-strings.c:1182 +#: locale/ipp-strings.c:1186 msgid "material-type.abs-carbon-nanotube" msgstr "Abs Carbon Nanotube" #. TRANSLATORS: Chocolate -#: locale/ipp-strings.c:1184 +#: locale/ipp-strings.c:1188 msgid "material-type.chocolate" msgstr "Chocolate" #. TRANSLATORS: Gold -#: locale/ipp-strings.c:1186 +#: locale/ipp-strings.c:1190 msgid "material-type.gold" msgstr "Gold" #. TRANSLATORS: Nylon -#: locale/ipp-strings.c:1188 +#: locale/ipp-strings.c:1192 msgid "material-type.nylon" msgstr "Nylon" #. TRANSLATORS: Pet -#: locale/ipp-strings.c:1190 +#: locale/ipp-strings.c:1194 msgid "material-type.pet" msgstr "Pet" #. TRANSLATORS: Photopolymer -#: locale/ipp-strings.c:1192 +#: locale/ipp-strings.c:1196 msgid "material-type.photopolymer" msgstr "Photopolymer" #. TRANSLATORS: PLA -#: locale/ipp-strings.c:1194 +#: locale/ipp-strings.c:1198 msgid "material-type.pla" msgstr "Pla" #. TRANSLATORS: Conductive PLA -#: locale/ipp-strings.c:1196 +#: locale/ipp-strings.c:1200 msgid "material-type.pla-conductive" msgstr "Pla Conductive" #. TRANSLATORS: Flexible PLA -#: locale/ipp-strings.c:1200 +#: locale/ipp-strings.c:1204 msgid "material-type.pla-flexible" msgstr "Pla Flexible" #. TRANSLATORS: Magnetic PLA -#: locale/ipp-strings.c:1202 +#: locale/ipp-strings.c:1206 msgid "material-type.pla-magnetic" msgstr "Pla Magnetic" #. TRANSLATORS: Steel PLA -#: locale/ipp-strings.c:1204 +#: locale/ipp-strings.c:1208 msgid "material-type.pla-steel" msgstr "Pla Steel" #. TRANSLATORS: Stone PLA -#: locale/ipp-strings.c:1206 +#: locale/ipp-strings.c:1210 msgid "material-type.pla-stone" msgstr "Pla Stone" #. TRANSLATORS: Wood PLA -#: locale/ipp-strings.c:1208 +#: locale/ipp-strings.c:1212 msgid "material-type.pla-wood" msgstr "Pla Wood" #. TRANSLATORS: Polycarbonate -#: locale/ipp-strings.c:1210 +#: locale/ipp-strings.c:1214 msgid "material-type.polycarbonate" msgstr "Polycarbonate" #. TRANSLATORS: Dissolvable PVA -#: locale/ipp-strings.c:1212 +#: locale/ipp-strings.c:1216 msgid "material-type.pva-dissolvable" msgstr "Dissolvable PVA" #. TRANSLATORS: Silver -#: locale/ipp-strings.c:1214 +#: locale/ipp-strings.c:1218 msgid "material-type.silver" msgstr "Silver" #. TRANSLATORS: Titanium -#: locale/ipp-strings.c:1216 +#: locale/ipp-strings.c:1220 msgid "material-type.titanium" msgstr "Titanium" #. TRANSLATORS: Wax -#: locale/ipp-strings.c:1218 +#: locale/ipp-strings.c:1222 msgid "material-type.wax" msgstr "Wax" #. TRANSLATORS: Materials -#: locale/ipp-strings.c:1220 +#: locale/ipp-strings.c:1224 msgid "materials-col" msgstr "Materials" #. TRANSLATORS: Media -#: locale/ipp-strings.c:1222 +#: locale/ipp-strings.c:1226 msgid "media" msgstr "Media" #. TRANSLATORS: Back Coating of Media -#: locale/ipp-strings.c:1224 +#: locale/ipp-strings.c:1228 msgid "media-back-coating" msgstr "Media Back Coating" #. TRANSLATORS: Glossy -#: locale/ipp-strings.c:1226 +#: locale/ipp-strings.c:1230 msgid "media-back-coating.glossy" msgstr "Glossy" #. TRANSLATORS: High Gloss -#: locale/ipp-strings.c:1228 +#: locale/ipp-strings.c:1232 msgid "media-back-coating.high-gloss" msgstr "High Gloss" #. TRANSLATORS: Matte -#: locale/ipp-strings.c:1230 +#: locale/ipp-strings.c:1234 msgid "media-back-coating.matte" msgstr "Matte" #. TRANSLATORS: None -#: locale/ipp-strings.c:1232 +#: locale/ipp-strings.c:1236 msgid "media-back-coating.none" msgstr "None" #. TRANSLATORS: Satin -#: locale/ipp-strings.c:1234 +#: locale/ipp-strings.c:1238 msgid "media-back-coating.satin" msgstr "Satin" #. TRANSLATORS: Semi-gloss -#: locale/ipp-strings.c:1236 +#: locale/ipp-strings.c:1240 msgid "media-back-coating.semi-gloss" msgstr "Semi-Gloss" #. TRANSLATORS: Media Bottom Margin -#: locale/ipp-strings.c:1238 +#: locale/ipp-strings.c:1242 msgid "media-bottom-margin" msgstr "Media Bottom Margin" #. TRANSLATORS: Media -#: locale/ipp-strings.c:1240 +#: locale/ipp-strings.c:1244 msgid "media-col" msgstr "Media" #. TRANSLATORS: Media Color -#: locale/ipp-strings.c:1242 +#: locale/ipp-strings.c:1246 msgid "media-color" msgstr "Media Color" #. TRANSLATORS: Black -#: locale/ipp-strings.c:1244 +#: locale/ipp-strings.c:1248 msgid "media-color.black" msgstr "Black" #. TRANSLATORS: Blue -#: locale/ipp-strings.c:1246 +#: locale/ipp-strings.c:1250 msgid "media-color.blue" msgstr "Blue" #. TRANSLATORS: Brown -#: locale/ipp-strings.c:1248 +#: locale/ipp-strings.c:1252 msgid "media-color.brown" msgstr "Brown" #. TRANSLATORS: Buff -#: locale/ipp-strings.c:1250 +#: locale/ipp-strings.c:1254 msgid "media-color.buff" msgstr "Buff" #. TRANSLATORS: Clear Black -#: locale/ipp-strings.c:1252 +#: locale/ipp-strings.c:1256 msgid "media-color.clear-black" msgstr "Clear Black" #. TRANSLATORS: Clear Blue -#: locale/ipp-strings.c:1254 +#: locale/ipp-strings.c:1258 msgid "media-color.clear-blue" msgstr "Clear Blue" #. TRANSLATORS: Clear Brown -#: locale/ipp-strings.c:1256 +#: locale/ipp-strings.c:1260 msgid "media-color.clear-brown" msgstr "Clear Brown" #. TRANSLATORS: Clear Buff -#: locale/ipp-strings.c:1258 +#: locale/ipp-strings.c:1262 msgid "media-color.clear-buff" msgstr "Clear Buff" #. TRANSLATORS: Clear Cyan -#: locale/ipp-strings.c:1260 +#: locale/ipp-strings.c:1264 msgid "media-color.clear-cyan" msgstr "Clear Cyan" #. TRANSLATORS: Clear Gold -#: locale/ipp-strings.c:1262 +#: locale/ipp-strings.c:1266 msgid "media-color.clear-gold" msgstr "Clear Gold" #. TRANSLATORS: Clear Goldenrod -#: locale/ipp-strings.c:1264 +#: locale/ipp-strings.c:1268 msgid "media-color.clear-goldenrod" msgstr "Clear Goldenrod" #. TRANSLATORS: Clear Gray -#: locale/ipp-strings.c:1266 +#: locale/ipp-strings.c:1270 msgid "media-color.clear-gray" msgstr "Clear Gray" #. TRANSLATORS: Clear Green -#: locale/ipp-strings.c:1268 +#: locale/ipp-strings.c:1272 msgid "media-color.clear-green" msgstr "Clear Green" #. TRANSLATORS: Clear Ivory -#: locale/ipp-strings.c:1270 +#: locale/ipp-strings.c:1274 msgid "media-color.clear-ivory" msgstr "Clear Ivory" #. TRANSLATORS: Clear Magenta -#: locale/ipp-strings.c:1272 +#: locale/ipp-strings.c:1276 msgid "media-color.clear-magenta" msgstr "Clear Magenta" #. TRANSLATORS: Clear Multi Color -#: locale/ipp-strings.c:1274 +#: locale/ipp-strings.c:1278 msgid "media-color.clear-multi-color" msgstr "Clear Multi Color" #. TRANSLATORS: Clear Mustard -#: locale/ipp-strings.c:1276 +#: locale/ipp-strings.c:1280 msgid "media-color.clear-mustard" msgstr "Clear Mustard" #. TRANSLATORS: Clear Orange -#: locale/ipp-strings.c:1278 +#: locale/ipp-strings.c:1282 msgid "media-color.clear-orange" msgstr "Clear Orange" #. TRANSLATORS: Clear Pink -#: locale/ipp-strings.c:1280 +#: locale/ipp-strings.c:1284 msgid "media-color.clear-pink" msgstr "Clear Pink" #. TRANSLATORS: Clear Red -#: locale/ipp-strings.c:1282 +#: locale/ipp-strings.c:1286 msgid "media-color.clear-red" msgstr "Clear Red" #. TRANSLATORS: Clear Silver -#: locale/ipp-strings.c:1284 +#: locale/ipp-strings.c:1288 msgid "media-color.clear-silver" msgstr "Clear Silver" #. TRANSLATORS: Clear Turquoise -#: locale/ipp-strings.c:1286 +#: locale/ipp-strings.c:1290 msgid "media-color.clear-turquoise" msgstr "Clear Turquoise" #. TRANSLATORS: Clear Violet -#: locale/ipp-strings.c:1288 +#: locale/ipp-strings.c:1292 msgid "media-color.clear-violet" msgstr "Clear Violet" #. TRANSLATORS: Clear White -#: locale/ipp-strings.c:1290 +#: locale/ipp-strings.c:1294 msgid "media-color.clear-white" msgstr "Clear White" #. TRANSLATORS: Clear Yellow -#: locale/ipp-strings.c:1292 +#: locale/ipp-strings.c:1296 msgid "media-color.clear-yellow" msgstr "Clear Yellow" #. TRANSLATORS: Cyan -#: locale/ipp-strings.c:1294 +#: locale/ipp-strings.c:1298 msgid "media-color.cyan" msgstr "Cyan" #. TRANSLATORS: Dark Blue -#: locale/ipp-strings.c:1296 +#: locale/ipp-strings.c:1300 msgid "media-color.dark-blue" msgstr "Dark Blue" #. TRANSLATORS: Dark Brown -#: locale/ipp-strings.c:1298 +#: locale/ipp-strings.c:1302 msgid "media-color.dark-brown" msgstr "Dark Brown" #. TRANSLATORS: Dark Buff -#: locale/ipp-strings.c:1300 +#: locale/ipp-strings.c:1304 msgid "media-color.dark-buff" msgstr "Dark Buff" #. TRANSLATORS: Dark Cyan -#: locale/ipp-strings.c:1302 +#: locale/ipp-strings.c:1306 msgid "media-color.dark-cyan" msgstr "Dark Cyan" #. TRANSLATORS: Dark Gold -#: locale/ipp-strings.c:1304 +#: locale/ipp-strings.c:1308 msgid "media-color.dark-gold" msgstr "Dark Gold" #. TRANSLATORS: Dark Goldenrod -#: locale/ipp-strings.c:1306 +#: locale/ipp-strings.c:1310 msgid "media-color.dark-goldenrod" msgstr "Dark Goldenrod" #. TRANSLATORS: Dark Gray -#: locale/ipp-strings.c:1308 +#: locale/ipp-strings.c:1312 msgid "media-color.dark-gray" msgstr "Dark Gray" #. TRANSLATORS: Dark Green -#: locale/ipp-strings.c:1310 +#: locale/ipp-strings.c:1314 msgid "media-color.dark-green" msgstr "Dark Green" #. TRANSLATORS: Dark Ivory -#: locale/ipp-strings.c:1312 +#: locale/ipp-strings.c:1316 msgid "media-color.dark-ivory" msgstr "Dark Ivory" #. TRANSLATORS: Dark Magenta -#: locale/ipp-strings.c:1314 +#: locale/ipp-strings.c:1318 msgid "media-color.dark-magenta" msgstr "Dark Magenta" #. TRANSLATORS: Dark Mustard -#: locale/ipp-strings.c:1316 +#: locale/ipp-strings.c:1320 msgid "media-color.dark-mustard" msgstr "Dark Mustard" #. TRANSLATORS: Dark Orange -#: locale/ipp-strings.c:1318 +#: locale/ipp-strings.c:1322 msgid "media-color.dark-orange" msgstr "Dark Orange" #. TRANSLATORS: Dark Pink -#: locale/ipp-strings.c:1320 +#: locale/ipp-strings.c:1324 msgid "media-color.dark-pink" msgstr "Dark Pink" #. TRANSLATORS: Dark Red -#: locale/ipp-strings.c:1322 +#: locale/ipp-strings.c:1326 msgid "media-color.dark-red" msgstr "Dark Red" #. TRANSLATORS: Dark Silver -#: locale/ipp-strings.c:1324 +#: locale/ipp-strings.c:1328 msgid "media-color.dark-silver" msgstr "Dark Silver" #. TRANSLATORS: Dark Turquoise -#: locale/ipp-strings.c:1326 +#: locale/ipp-strings.c:1330 msgid "media-color.dark-turquoise" msgstr "Dark Turquoise" #. TRANSLATORS: Dark Violet -#: locale/ipp-strings.c:1328 +#: locale/ipp-strings.c:1332 msgid "media-color.dark-violet" msgstr "Dark Violet" #. TRANSLATORS: Dark Yellow -#: locale/ipp-strings.c:1330 +#: locale/ipp-strings.c:1334 msgid "media-color.dark-yellow" msgstr "Dark Yellow" #. TRANSLATORS: Gold -#: locale/ipp-strings.c:1332 +#: locale/ipp-strings.c:1336 msgid "media-color.gold" msgstr "Gold" #. TRANSLATORS: Goldenrod -#: locale/ipp-strings.c:1334 +#: locale/ipp-strings.c:1338 msgid "media-color.goldenrod" msgstr "Goldenrod" #. TRANSLATORS: Gray -#: locale/ipp-strings.c:1336 +#: locale/ipp-strings.c:1340 msgid "media-color.gray" msgstr "Gray" #. TRANSLATORS: Green -#: locale/ipp-strings.c:1338 +#: locale/ipp-strings.c:1342 msgid "media-color.green" msgstr "Green" #. TRANSLATORS: Ivory -#: locale/ipp-strings.c:1340 +#: locale/ipp-strings.c:1344 msgid "media-color.ivory" msgstr "Ivory" #. TRANSLATORS: Light Black -#: locale/ipp-strings.c:1342 +#: locale/ipp-strings.c:1346 msgid "media-color.light-black" msgstr "Light Black" #. TRANSLATORS: Light Blue -#: locale/ipp-strings.c:1344 +#: locale/ipp-strings.c:1348 msgid "media-color.light-blue" msgstr "Light Blue" #. TRANSLATORS: Light Brown -#: locale/ipp-strings.c:1346 +#: locale/ipp-strings.c:1350 msgid "media-color.light-brown" msgstr "Light Brown" #. TRANSLATORS: Light Buff -#: locale/ipp-strings.c:1348 +#: locale/ipp-strings.c:1352 msgid "media-color.light-buff" msgstr "Light Buff" #. TRANSLATORS: Light Cyan -#: locale/ipp-strings.c:1350 +#: locale/ipp-strings.c:1354 msgid "media-color.light-cyan" msgstr "Light Cyan" #. TRANSLATORS: Light Gold -#: locale/ipp-strings.c:1352 +#: locale/ipp-strings.c:1356 msgid "media-color.light-gold" msgstr "Light Gold" #. TRANSLATORS: Light Goldenrod -#: locale/ipp-strings.c:1354 +#: locale/ipp-strings.c:1358 msgid "media-color.light-goldenrod" msgstr "Light Goldenrod" #. TRANSLATORS: Light Gray -#: locale/ipp-strings.c:1356 +#: locale/ipp-strings.c:1360 msgid "media-color.light-gray" msgstr "Light Gray" #. TRANSLATORS: Light Green -#: locale/ipp-strings.c:1358 +#: locale/ipp-strings.c:1362 msgid "media-color.light-green" msgstr "Light Green" #. TRANSLATORS: Light Ivory -#: locale/ipp-strings.c:1360 +#: locale/ipp-strings.c:1364 msgid "media-color.light-ivory" msgstr "Light Ivory" #. TRANSLATORS: Light Magenta -#: locale/ipp-strings.c:1362 +#: locale/ipp-strings.c:1366 msgid "media-color.light-magenta" msgstr "Light Magenta" #. TRANSLATORS: Light Mustard -#: locale/ipp-strings.c:1364 +#: locale/ipp-strings.c:1368 msgid "media-color.light-mustard" msgstr "Light Mustard" #. TRANSLATORS: Light Orange -#: locale/ipp-strings.c:1366 +#: locale/ipp-strings.c:1370 msgid "media-color.light-orange" msgstr "Light Orange" #. TRANSLATORS: Light Pink -#: locale/ipp-strings.c:1368 +#: locale/ipp-strings.c:1372 msgid "media-color.light-pink" msgstr "Light Pink" #. TRANSLATORS: Light Red -#: locale/ipp-strings.c:1370 +#: locale/ipp-strings.c:1374 msgid "media-color.light-red" msgstr "Light Red" #. TRANSLATORS: Light Silver -#: locale/ipp-strings.c:1372 +#: locale/ipp-strings.c:1376 msgid "media-color.light-silver" msgstr "Light Silver" #. TRANSLATORS: Light Turquoise -#: locale/ipp-strings.c:1374 +#: locale/ipp-strings.c:1378 msgid "media-color.light-turquoise" msgstr "Light Turquoise" #. TRANSLATORS: Light Violet -#: locale/ipp-strings.c:1376 +#: locale/ipp-strings.c:1380 msgid "media-color.light-violet" msgstr "Light Violet" #. TRANSLATORS: Light Yellow -#: locale/ipp-strings.c:1378 +#: locale/ipp-strings.c:1382 msgid "media-color.light-yellow" msgstr "Light Yellow" #. TRANSLATORS: Magenta -#: locale/ipp-strings.c:1380 +#: locale/ipp-strings.c:1384 msgid "media-color.magenta" msgstr "Magenta" #. TRANSLATORS: Multi-color -#: locale/ipp-strings.c:1382 +#: locale/ipp-strings.c:1386 msgid "media-color.multi-color" msgstr "Multi-Color" #. TRANSLATORS: Mustard -#: locale/ipp-strings.c:1384 +#: locale/ipp-strings.c:1388 msgid "media-color.mustard" msgstr "Mustard" #. TRANSLATORS: No Color -#: locale/ipp-strings.c:1386 +#: locale/ipp-strings.c:1390 msgid "media-color.no-color" msgstr "No Color" #. TRANSLATORS: Orange -#: locale/ipp-strings.c:1388 +#: locale/ipp-strings.c:1392 msgid "media-color.orange" msgstr "Orange" #. TRANSLATORS: Pink -#: locale/ipp-strings.c:1390 +#: locale/ipp-strings.c:1394 msgid "media-color.pink" msgstr "Pink" #. TRANSLATORS: Red -#: locale/ipp-strings.c:1392 +#: locale/ipp-strings.c:1396 msgid "media-color.red" msgstr "Red" #. TRANSLATORS: Silver -#: locale/ipp-strings.c:1394 +#: locale/ipp-strings.c:1398 msgid "media-color.silver" msgstr "Silver" #. TRANSLATORS: Turquoise -#: locale/ipp-strings.c:1396 +#: locale/ipp-strings.c:1400 msgid "media-color.turquoise" msgstr "Turquoise" #. TRANSLATORS: Violet -#: locale/ipp-strings.c:1398 +#: locale/ipp-strings.c:1402 msgid "media-color.violet" msgstr "Violet" #. TRANSLATORS: White -#: locale/ipp-strings.c:1400 +#: locale/ipp-strings.c:1404 msgid "media-color.white" msgstr "White" #. TRANSLATORS: Yellow -#: locale/ipp-strings.c:1402 +#: locale/ipp-strings.c:1406 msgid "media-color.yellow" msgstr "Yellow" #. TRANSLATORS: Front Coating of Media -#: locale/ipp-strings.c:1404 +#: locale/ipp-strings.c:1408 msgid "media-front-coating" msgstr "Media Front Coating" #. TRANSLATORS: Media Grain -#: locale/ipp-strings.c:1406 +#: locale/ipp-strings.c:1410 msgid "media-grain" msgstr "Media Grain" #. TRANSLATORS: Cross-Feed Direction -#: locale/ipp-strings.c:1408 +#: locale/ipp-strings.c:1412 msgid "media-grain.x-direction" msgstr "Cross-Feed Direction" #. TRANSLATORS: Feed Direction -#: locale/ipp-strings.c:1410 +#: locale/ipp-strings.c:1414 msgid "media-grain.y-direction" msgstr "Feed Direction" #. TRANSLATORS: Media Hole Count -#: locale/ipp-strings.c:1412 +#: locale/ipp-strings.c:1416 msgid "media-hole-count" msgstr "Media Hole Count" #. TRANSLATORS: Media Info -#: locale/ipp-strings.c:1414 +#: locale/ipp-strings.c:1418 msgid "media-info" msgstr "Media Info" #. TRANSLATORS: Force Media -#: locale/ipp-strings.c:1416 +#: locale/ipp-strings.c:1420 msgid "media-input-tray-check" msgstr "Media Input Tray Check" #. TRANSLATORS: Media Left Margin -#: locale/ipp-strings.c:1418 +#: locale/ipp-strings.c:1422 msgid "media-left-margin" msgstr "Media Left Margin" #. TRANSLATORS: Pre-printed Media -#: locale/ipp-strings.c:1420 +#: locale/ipp-strings.c:1424 msgid "media-pre-printed" msgstr "Media Preprinted" #. TRANSLATORS: Blank -#: locale/ipp-strings.c:1422 +#: locale/ipp-strings.c:1426 msgid "media-pre-printed.blank" msgstr "Blank" #. TRANSLATORS: Letterhead -#: locale/ipp-strings.c:1424 +#: locale/ipp-strings.c:1428 msgid "media-pre-printed.letter-head" msgstr "Letterhead" #. TRANSLATORS: Pre-printed -#: locale/ipp-strings.c:1426 +#: locale/ipp-strings.c:1430 msgid "media-pre-printed.pre-printed" msgstr "Preprinted" #. TRANSLATORS: Recycled Media -#: locale/ipp-strings.c:1428 +#: locale/ipp-strings.c:1432 msgid "media-recycled" msgstr "Media Recycled" #. TRANSLATORS: None -#: locale/ipp-strings.c:1430 +#: locale/ipp-strings.c:1434 msgid "media-recycled.none" msgstr "None" #. TRANSLATORS: Standard -#: locale/ipp-strings.c:1432 +#: locale/ipp-strings.c:1436 msgid "media-recycled.standard" msgstr "Standard" #. TRANSLATORS: Media Right Margin -#: locale/ipp-strings.c:1434 +#: locale/ipp-strings.c:1438 msgid "media-right-margin" msgstr "Media Right Margin" #. TRANSLATORS: Media Dimensions -#: locale/ipp-strings.c:1436 +#: locale/ipp-strings.c:1440 msgid "media-size" msgstr "Media Dimensions" #. TRANSLATORS: Media Name -#: locale/ipp-strings.c:1438 +#: locale/ipp-strings.c:1442 msgid "media-size-name" msgstr "Media Name" #. TRANSLATORS: Media Source -#: locale/ipp-strings.c:1440 +#: locale/ipp-strings.c:1444 msgid "media-source" msgstr "Media Source" #. TRANSLATORS: Alternate -#: locale/ipp-strings.c:1442 +#: locale/ipp-strings.c:1446 msgid "media-source.alternate" msgstr "Alternate" #. TRANSLATORS: Alternate Roll -#: locale/ipp-strings.c:1444 +#: locale/ipp-strings.c:1448 msgid "media-source.alternate-roll" msgstr "Alternate Roll" #. TRANSLATORS: Automatic -#: locale/ipp-strings.c:1446 +#: locale/ipp-strings.c:1450 msgid "media-source.auto" msgstr "Automatic" #. TRANSLATORS: Bottom -#: locale/ipp-strings.c:1448 +#: locale/ipp-strings.c:1452 msgid "media-source.bottom" msgstr "Bottom" #. TRANSLATORS: By-pass Tray -#: locale/ipp-strings.c:1450 +#: locale/ipp-strings.c:1454 msgid "media-source.by-pass-tray" msgstr "By Pass Tray" #. TRANSLATORS: Center -#: locale/ipp-strings.c:1452 +#: locale/ipp-strings.c:1456 msgid "media-source.center" msgstr "Center" #. TRANSLATORS: Disc -#: locale/ipp-strings.c:1454 +#: locale/ipp-strings.c:1458 msgid "media-source.disc" msgstr "Disc" #. TRANSLATORS: Envelope -#: locale/ipp-strings.c:1456 +#: locale/ipp-strings.c:1460 msgid "media-source.envelope" msgstr "Envelope" #. TRANSLATORS: Hagaki -#: locale/ipp-strings.c:1458 +#: locale/ipp-strings.c:1462 msgid "media-source.hagaki" msgstr "Hagaki" #. TRANSLATORS: Large Capacity -#: locale/ipp-strings.c:1460 +#: locale/ipp-strings.c:1464 msgid "media-source.large-capacity" msgstr "Large Capacity" #. TRANSLATORS: Left -#: locale/ipp-strings.c:1462 +#: locale/ipp-strings.c:1466 msgid "media-source.left" msgstr "Left" #. TRANSLATORS: Main -#: locale/ipp-strings.c:1464 +#: locale/ipp-strings.c:1468 msgid "media-source.main" msgstr "Main" #. TRANSLATORS: Main Roll -#: locale/ipp-strings.c:1466 +#: locale/ipp-strings.c:1470 msgid "media-source.main-roll" msgstr "Main Roll" #. TRANSLATORS: Manual -#: locale/ipp-strings.c:1468 +#: locale/ipp-strings.c:1472 msgid "media-source.manual" msgstr "Manual" #. TRANSLATORS: Middle -#: locale/ipp-strings.c:1470 +#: locale/ipp-strings.c:1474 msgid "media-source.middle" msgstr "Middle" #. TRANSLATORS: Photo -#: locale/ipp-strings.c:1472 +#: locale/ipp-strings.c:1476 msgid "media-source.photo" msgstr "Photo" #. TRANSLATORS: Rear -#: locale/ipp-strings.c:1474 +#: locale/ipp-strings.c:1478 msgid "media-source.rear" msgstr "Rear" #. TRANSLATORS: Right -#: locale/ipp-strings.c:1476 +#: locale/ipp-strings.c:1480 msgid "media-source.right" msgstr "Right" #. TRANSLATORS: Roll 1 -#: locale/ipp-strings.c:1478 +#: locale/ipp-strings.c:1482 msgid "media-source.roll-1" msgstr "Roll 1" #. TRANSLATORS: Roll 10 -#: locale/ipp-strings.c:1480 +#: locale/ipp-strings.c:1484 msgid "media-source.roll-10" msgstr "Roll 10" #. TRANSLATORS: Roll 2 -#: locale/ipp-strings.c:1482 +#: locale/ipp-strings.c:1486 msgid "media-source.roll-2" msgstr "Roll 2" #. TRANSLATORS: Roll 3 -#: locale/ipp-strings.c:1484 +#: locale/ipp-strings.c:1488 msgid "media-source.roll-3" msgstr "Roll 3" #. TRANSLATORS: Roll 4 -#: locale/ipp-strings.c:1486 +#: locale/ipp-strings.c:1490 msgid "media-source.roll-4" msgstr "Roll 4" #. TRANSLATORS: Roll 5 -#: locale/ipp-strings.c:1488 +#: locale/ipp-strings.c:1492 msgid "media-source.roll-5" msgstr "Roll 5" #. TRANSLATORS: Roll 6 -#: locale/ipp-strings.c:1490 +#: locale/ipp-strings.c:1494 msgid "media-source.roll-6" msgstr "Roll 6" #. TRANSLATORS: Roll 7 -#: locale/ipp-strings.c:1492 +#: locale/ipp-strings.c:1496 msgid "media-source.roll-7" msgstr "Roll 7" #. TRANSLATORS: Roll 8 -#: locale/ipp-strings.c:1494 +#: locale/ipp-strings.c:1498 msgid "media-source.roll-8" msgstr "Roll 8" #. TRANSLATORS: Roll 9 -#: locale/ipp-strings.c:1496 +#: locale/ipp-strings.c:1500 msgid "media-source.roll-9" msgstr "Roll 9" #. TRANSLATORS: Side -#: locale/ipp-strings.c:1498 +#: locale/ipp-strings.c:1502 msgid "media-source.side" msgstr "Side" #. TRANSLATORS: Top -#: locale/ipp-strings.c:1500 +#: locale/ipp-strings.c:1504 msgid "media-source.top" msgstr "Top" #. TRANSLATORS: Tray 1 -#: locale/ipp-strings.c:1502 +#: locale/ipp-strings.c:1506 msgid "media-source.tray-1" msgstr "Tray 1" #. TRANSLATORS: Tray 10 -#: locale/ipp-strings.c:1504 +#: locale/ipp-strings.c:1508 msgid "media-source.tray-10" msgstr "Tray 10" #. TRANSLATORS: Tray 11 -#: locale/ipp-strings.c:1506 +#: locale/ipp-strings.c:1510 msgid "media-source.tray-11" msgstr "Tray 11" #. TRANSLATORS: Tray 12 -#: locale/ipp-strings.c:1508 +#: locale/ipp-strings.c:1512 msgid "media-source.tray-12" msgstr "Tray 12" #. TRANSLATORS: Tray 13 -#: locale/ipp-strings.c:1510 +#: locale/ipp-strings.c:1514 msgid "media-source.tray-13" msgstr "Tray 13" #. TRANSLATORS: Tray 14 -#: locale/ipp-strings.c:1512 +#: locale/ipp-strings.c:1516 msgid "media-source.tray-14" msgstr "Tray 14" #. TRANSLATORS: Tray 15 -#: locale/ipp-strings.c:1514 +#: locale/ipp-strings.c:1518 msgid "media-source.tray-15" msgstr "Tray 15" #. TRANSLATORS: Tray 16 -#: locale/ipp-strings.c:1516 +#: locale/ipp-strings.c:1520 msgid "media-source.tray-16" msgstr "Tray 16" #. TRANSLATORS: Tray 17 -#: locale/ipp-strings.c:1518 +#: locale/ipp-strings.c:1522 msgid "media-source.tray-17" msgstr "Tray 17" #. TRANSLATORS: Tray 18 -#: locale/ipp-strings.c:1520 +#: locale/ipp-strings.c:1524 msgid "media-source.tray-18" msgstr "Tray 18" #. TRANSLATORS: Tray 19 -#: locale/ipp-strings.c:1522 +#: locale/ipp-strings.c:1526 msgid "media-source.tray-19" msgstr "Tray 19" #. TRANSLATORS: Tray 2 -#: locale/ipp-strings.c:1524 +#: locale/ipp-strings.c:1528 msgid "media-source.tray-2" msgstr "Tray 2" #. TRANSLATORS: Tray 20 -#: locale/ipp-strings.c:1526 +#: locale/ipp-strings.c:1530 msgid "media-source.tray-20" msgstr "Tray 20" #. TRANSLATORS: Tray 3 -#: locale/ipp-strings.c:1528 +#: locale/ipp-strings.c:1532 msgid "media-source.tray-3" msgstr "Tray 3" #. TRANSLATORS: Tray 4 -#: locale/ipp-strings.c:1530 +#: locale/ipp-strings.c:1534 msgid "media-source.tray-4" msgstr "Tray 4" #. TRANSLATORS: Tray 5 -#: locale/ipp-strings.c:1532 +#: locale/ipp-strings.c:1536 msgid "media-source.tray-5" msgstr "Tray 5" #. TRANSLATORS: Tray 6 -#: locale/ipp-strings.c:1534 +#: locale/ipp-strings.c:1538 msgid "media-source.tray-6" msgstr "Tray 6" #. TRANSLATORS: Tray 7 -#: locale/ipp-strings.c:1536 +#: locale/ipp-strings.c:1540 msgid "media-source.tray-7" msgstr "Tray 7" #. TRANSLATORS: Tray 8 -#: locale/ipp-strings.c:1538 +#: locale/ipp-strings.c:1542 msgid "media-source.tray-8" msgstr "Tray 8" #. TRANSLATORS: Tray 9 -#: locale/ipp-strings.c:1540 +#: locale/ipp-strings.c:1544 msgid "media-source.tray-9" msgstr "Tray 9" #. TRANSLATORS: Media Thickness -#: locale/ipp-strings.c:1542 +#: locale/ipp-strings.c:1546 msgid "media-thickness" msgstr "Media Thickness" #. TRANSLATORS: Media Tooth (Texture) -#: locale/ipp-strings.c:1544 +#: locale/ipp-strings.c:1548 msgid "media-tooth" msgstr "Media Tooth" #. TRANSLATORS: Antique -#: locale/ipp-strings.c:1546 +#: locale/ipp-strings.c:1550 msgid "media-tooth.antique" msgstr "Antique" #. TRANSLATORS: Extra Smooth -#: locale/ipp-strings.c:1548 +#: locale/ipp-strings.c:1552 msgid "media-tooth.calendared" msgstr "Calendared" #. TRANSLATORS: Coarse -#: locale/ipp-strings.c:1550 +#: locale/ipp-strings.c:1554 msgid "media-tooth.coarse" msgstr "Coarse" #. TRANSLATORS: Fine -#: locale/ipp-strings.c:1552 +#: locale/ipp-strings.c:1556 msgid "media-tooth.fine" msgstr "Fine" #. TRANSLATORS: Linen -#: locale/ipp-strings.c:1554 +#: locale/ipp-strings.c:1558 msgid "media-tooth.linen" msgstr "Linen" #. TRANSLATORS: Medium -#: locale/ipp-strings.c:1556 +#: locale/ipp-strings.c:1560 msgid "media-tooth.medium" msgstr "Medium" #. TRANSLATORS: Smooth -#: locale/ipp-strings.c:1558 +#: locale/ipp-strings.c:1562 msgid "media-tooth.smooth" msgstr "Smooth" #. TRANSLATORS: Stipple -#: locale/ipp-strings.c:1560 +#: locale/ipp-strings.c:1564 msgid "media-tooth.stipple" msgstr "Stipple" #. TRANSLATORS: Rough -#: locale/ipp-strings.c:1562 +#: locale/ipp-strings.c:1566 msgid "media-tooth.uncalendared" msgstr "Uncalendared" #. TRANSLATORS: Vellum -#: locale/ipp-strings.c:1564 +#: locale/ipp-strings.c:1568 msgid "media-tooth.vellum" msgstr "Vellum" #. TRANSLATORS: Media Top Margin -#: locale/ipp-strings.c:1566 +#: locale/ipp-strings.c:1570 msgid "media-top-margin" msgstr "Media Top Margin" #. TRANSLATORS: Media Type -#: locale/ipp-strings.c:1568 +#: locale/ipp-strings.c:1572 msgid "media-type" msgstr "Media Type" #. TRANSLATORS: Aluminum -#: locale/ipp-strings.c:1570 +#: locale/ipp-strings.c:1574 msgid "media-type.aluminum" msgstr "Aluminum" #. TRANSLATORS: Automatic -#: locale/ipp-strings.c:1572 +#: locale/ipp-strings.c:1576 msgid "media-type.auto" msgstr "Automatic" #. TRANSLATORS: Back Print Film -#: locale/ipp-strings.c:1574 +#: locale/ipp-strings.c:1578 msgid "media-type.back-print-film" msgstr "Back Print Film" #. TRANSLATORS: Cardboard -#: locale/ipp-strings.c:1576 +#: locale/ipp-strings.c:1580 msgid "media-type.cardboard" msgstr "Cardboard" #. TRANSLATORS: Cardstock -#: locale/ipp-strings.c:1578 +#: locale/ipp-strings.c:1582 msgid "media-type.cardstock" msgstr "Cardstock" #. TRANSLATORS: CD -#: locale/ipp-strings.c:1580 +#: locale/ipp-strings.c:1584 msgid "media-type.cd" msgstr "CD" +#. TRANSLATORS: Photo Advanced Paper +#: locale/ipp-strings.c:1586 msgid "media-type.com.hp.advanced-photo" msgstr "Advanced Photo Paper" +#. TRANSLATORS: Brochure Glossy Paper +#: locale/ipp-strings.c:1588 msgid "media-type.com.hp.brochure-glossy" msgstr "Glossy Brochure Paper" +#. TRANSLATORS: Brochure Matte Paper +#: locale/ipp-strings.c:1590 msgid "media-type.com.hp.brochure-matte" msgstr "Matte Brochure Paper" +#. TRANSLATORS: Matte Coverstock +#: locale/ipp-strings.c:1592 msgid "media-type.com.hp.cover-matte" msgstr "Matte Cover Paper" +#. TRANSLATORS: EcoSMART Lite Paper +#: locale/ipp-strings.c:1594 msgid "media-type.com.hp.ecosmart-lite" msgstr "Office Recycled Paper" +#. TRANSLATORS: Everyday Glossy Paper +#: locale/ipp-strings.c:1596 msgid "media-type.com.hp.everyday-glossy" msgstr "Everyday Glossy Photo Paper" +#. TRANSLATORS: Everyday Matte Paper +#: locale/ipp-strings.c:1598 msgid "media-type.com.hp.everyday-matte" msgstr "Everyday Matte Paper" +#. TRANSLATORS: Extra Heavyweight Paper +#: locale/ipp-strings.c:1600 msgid "media-type.com.hp.extra-heavy" msgstr "Extra Heavyweight Paper" +#. TRANSLATORS: Intermediate Paper +#: locale/ipp-strings.c:1602 msgid "media-type.com.hp.intermediate" msgstr "Multipurpose Paper" +#. TRANSLATORS: Mid-Weight Paper +#: locale/ipp-strings.c:1604 msgid "media-type.com.hp.mid-weight" msgstr "Mid-Weight Paper" +#. TRANSLATORS: Inkjet Premium Paper +#: locale/ipp-strings.c:1606 msgid "media-type.com.hp.premium-inkjet" msgstr "Premium Inkjet Paper" +#. TRANSLATORS: Photo Premium Paper +#: locale/ipp-strings.c:1608 msgid "media-type.com.hp.premium-photo" msgstr "Premium Photo Glossy Paper" +#. TRANSLATORS: Premium Matte Presentation Paper +#: locale/ipp-strings.c:1610 msgid "media-type.com.hp.premium-presentation-matte" msgstr "Premium Presentation Matte Paper" #. TRANSLATORS: Continuous -#: locale/ipp-strings.c:1582 +#: locale/ipp-strings.c:1612 msgid "media-type.continuous" msgstr "Continuous" #. TRANSLATORS: Continuous Long -#: locale/ipp-strings.c:1584 +#: locale/ipp-strings.c:1614 msgid "media-type.continuous-long" msgstr "Continuous Long" #. TRANSLATORS: Continuous Short -#: locale/ipp-strings.c:1586 +#: locale/ipp-strings.c:1616 msgid "media-type.continuous-short" msgstr "Continuous Short" #. TRANSLATORS: Corrugated Board -#: locale/ipp-strings.c:1588 +#: locale/ipp-strings.c:1618 msgid "media-type.corrugated-board" msgstr "Corrugated Board" #. TRANSLATORS: Optical Disc -#: locale/ipp-strings.c:1590 +#: locale/ipp-strings.c:1620 msgid "media-type.disc" msgstr "Optical Disc" #. TRANSLATORS: Glossy Optical Disc -#: locale/ipp-strings.c:1592 +#: locale/ipp-strings.c:1622 msgid "media-type.disc-glossy" msgstr "Glossy Optical Disc" #. TRANSLATORS: High Gloss Optical Disc -#: locale/ipp-strings.c:1594 +#: locale/ipp-strings.c:1624 msgid "media-type.disc-high-gloss" msgstr "High Gloss Optical Disc" #. TRANSLATORS: Matte Optical Disc -#: locale/ipp-strings.c:1596 +#: locale/ipp-strings.c:1626 msgid "media-type.disc-matte" msgstr "Matte Optical Disc" #. TRANSLATORS: Satin Optical Disc -#: locale/ipp-strings.c:1598 +#: locale/ipp-strings.c:1628 msgid "media-type.disc-satin" msgstr "Satin Optical Disc" #. TRANSLATORS: Semi-Gloss Optical Disc -#: locale/ipp-strings.c:1600 +#: locale/ipp-strings.c:1630 msgid "media-type.disc-semi-gloss" msgstr "Semi-Gloss Optical Disc" #. TRANSLATORS: Double Wall -#: locale/ipp-strings.c:1602 +#: locale/ipp-strings.c:1632 msgid "media-type.double-wall" msgstr "Double Wall" #. TRANSLATORS: Dry Film -#: locale/ipp-strings.c:1604 +#: locale/ipp-strings.c:1634 msgid "media-type.dry-film" msgstr "Dry Film" #. TRANSLATORS: DVD -#: locale/ipp-strings.c:1606 +#: locale/ipp-strings.c:1636 msgid "media-type.dvd" msgstr "DVD" #. TRANSLATORS: Embossing Foil -#: locale/ipp-strings.c:1608 +#: locale/ipp-strings.c:1638 msgid "media-type.embossing-foil" msgstr "Embossing Foil" #. TRANSLATORS: End Board -#: locale/ipp-strings.c:1610 +#: locale/ipp-strings.c:1640 msgid "media-type.end-board" msgstr "End Board" #. TRANSLATORS: Envelope -#: locale/ipp-strings.c:1612 +#: locale/ipp-strings.c:1642 msgid "media-type.envelope" msgstr "Envelope" #. TRANSLATORS: Archival Envelope -#: locale/ipp-strings.c:1614 +#: locale/ipp-strings.c:1644 msgid "media-type.envelope-archival" msgstr "Archival Envelope" #. TRANSLATORS: Bond Envelope -#: locale/ipp-strings.c:1616 +#: locale/ipp-strings.c:1646 msgid "media-type.envelope-bond" msgstr "Bond Envelope" #. TRANSLATORS: Coated Envelope -#: locale/ipp-strings.c:1618 +#: locale/ipp-strings.c:1648 msgid "media-type.envelope-coated" msgstr "Coated Envelope" #. TRANSLATORS: Cotton Envelope -#: locale/ipp-strings.c:1620 +#: locale/ipp-strings.c:1650 msgid "media-type.envelope-cotton" msgstr "Cotton Envelope" #. TRANSLATORS: Fine Envelope -#: locale/ipp-strings.c:1622 +#: locale/ipp-strings.c:1652 msgid "media-type.envelope-fine" msgstr "Fine Envelope" #. TRANSLATORS: Heavyweight Envelope -#: locale/ipp-strings.c:1624 +#: locale/ipp-strings.c:1654 msgid "media-type.envelope-heavyweight" msgstr "Heavyweight Envelope" #. TRANSLATORS: Inkjet Envelope -#: locale/ipp-strings.c:1626 +#: locale/ipp-strings.c:1656 msgid "media-type.envelope-inkjet" msgstr "Inkjet Envelope" #. TRANSLATORS: Lightweight Envelope -#: locale/ipp-strings.c:1628 +#: locale/ipp-strings.c:1658 msgid "media-type.envelope-lightweight" msgstr "Lightweight Envelope" #. TRANSLATORS: Plain Envelope -#: locale/ipp-strings.c:1630 +#: locale/ipp-strings.c:1660 msgid "media-type.envelope-plain" msgstr "Plain Envelope" #. TRANSLATORS: Preprinted Envelope -#: locale/ipp-strings.c:1632 +#: locale/ipp-strings.c:1662 msgid "media-type.envelope-preprinted" msgstr "Preprinted Envelope" #. TRANSLATORS: Windowed Envelope -#: locale/ipp-strings.c:1634 +#: locale/ipp-strings.c:1664 msgid "media-type.envelope-window" msgstr "Windowed Envelope" #. TRANSLATORS: Fabric -#: locale/ipp-strings.c:1636 +#: locale/ipp-strings.c:1666 msgid "media-type.fabric" msgstr "Fabric" #. TRANSLATORS: Archival Fabric -#: locale/ipp-strings.c:1638 +#: locale/ipp-strings.c:1668 msgid "media-type.fabric-archival" msgstr "Archival Fabric" #. TRANSLATORS: Glossy Fabric -#: locale/ipp-strings.c:1640 +#: locale/ipp-strings.c:1670 msgid "media-type.fabric-glossy" msgstr "Glossy Fabric" #. TRANSLATORS: High Gloss Fabric -#: locale/ipp-strings.c:1642 +#: locale/ipp-strings.c:1672 msgid "media-type.fabric-high-gloss" msgstr "High Gloss Fabric" #. TRANSLATORS: Matte Fabric -#: locale/ipp-strings.c:1644 +#: locale/ipp-strings.c:1674 msgid "media-type.fabric-matte" msgstr "Matte Fabric" #. TRANSLATORS: Semi-Gloss Fabric -#: locale/ipp-strings.c:1646 +#: locale/ipp-strings.c:1676 msgid "media-type.fabric-semi-gloss" msgstr "Semi-Gloss Fabric" #. TRANSLATORS: Waterproof Fabric -#: locale/ipp-strings.c:1648 +#: locale/ipp-strings.c:1678 msgid "media-type.fabric-waterproof" msgstr "Waterproof Fabric" #. TRANSLATORS: Film -#: locale/ipp-strings.c:1650 +#: locale/ipp-strings.c:1680 msgid "media-type.film" msgstr "Film" #. TRANSLATORS: Flexo Base -#: locale/ipp-strings.c:1652 +#: locale/ipp-strings.c:1682 msgid "media-type.flexo-base" msgstr "Flexo Base" #. TRANSLATORS: Flexo Photo Polymer -#: locale/ipp-strings.c:1654 +#: locale/ipp-strings.c:1684 msgid "media-type.flexo-photo-polymer" msgstr "Flexo Photo Polymer" #. TRANSLATORS: Flute -#: locale/ipp-strings.c:1656 +#: locale/ipp-strings.c:1686 msgid "media-type.flute" msgstr "Flute" #. TRANSLATORS: Foil -#: locale/ipp-strings.c:1658 +#: locale/ipp-strings.c:1688 msgid "media-type.foil" msgstr "Foil" #. TRANSLATORS: Full Cut Tabs -#: locale/ipp-strings.c:1660 +#: locale/ipp-strings.c:1690 msgid "media-type.full-cut-tabs" msgstr "Full Cut Tabs" #. TRANSLATORS: Glass -#: locale/ipp-strings.c:1662 +#: locale/ipp-strings.c:1692 msgid "media-type.glass" msgstr "Glass" #. TRANSLATORS: Glass Colored -#: locale/ipp-strings.c:1664 +#: locale/ipp-strings.c:1694 msgid "media-type.glass-colored" msgstr "Glass Colored" #. TRANSLATORS: Glass Opaque -#: locale/ipp-strings.c:1666 +#: locale/ipp-strings.c:1696 msgid "media-type.glass-opaque" msgstr "Glass Opaque" #. TRANSLATORS: Glass Surfaced -#: locale/ipp-strings.c:1668 +#: locale/ipp-strings.c:1698 msgid "media-type.glass-surfaced" msgstr "Glass Surfaced" #. TRANSLATORS: Glass Textured -#: locale/ipp-strings.c:1670 +#: locale/ipp-strings.c:1700 msgid "media-type.glass-textured" msgstr "Glass Textured" #. TRANSLATORS: Gravure Cylinder -#: locale/ipp-strings.c:1672 +#: locale/ipp-strings.c:1702 msgid "media-type.gravure-cylinder" msgstr "Gravure Cylinder" #. TRANSLATORS: Image Setter Paper -#: locale/ipp-strings.c:1674 +#: locale/ipp-strings.c:1704 msgid "media-type.image-setter-paper" msgstr "Image Setter Paper" #. TRANSLATORS: Imaging Cylinder -#: locale/ipp-strings.c:1676 +#: locale/ipp-strings.c:1706 msgid "media-type.imaging-cylinder" msgstr "Imaging Cylinder" +#. TRANSLATORS: Photo Paper Plus Glossy II +#: locale/ipp-strings.c:1712 msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii" msgstr "Photo Paper Plus Glossy II" +#. TRANSLATORS: Photo Paper Pro Platinum +#: locale/ipp-strings.c:1714 msgid "media-type.jp.co.canon_photo-paper-pro-platinum" msgstr "Photo Paper Pro Platinum" +#. TRANSLATORS: Photo Paper Plus Glossy II +#: locale/ipp-strings.c:1708 msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii" msgstr "Photo Paper Plus Glossy II" +#. TRANSLATORS: Photo Paper Pro Platinum +#: locale/ipp-strings.c:1710 msgid "media-type.jp.co.canon-photo-paper-pro-platinum" msgstr "Photo Paper Pro Platinum" #. TRANSLATORS: Labels -#: locale/ipp-strings.c:1678 +#: locale/ipp-strings.c:1716 msgid "media-type.labels" msgstr "Labels" #. TRANSLATORS: Colored Labels -#: locale/ipp-strings.c:1680 +#: locale/ipp-strings.c:1718 msgid "media-type.labels-colored" msgstr "Colored Labels" #. TRANSLATORS: Glossy Labels -#: locale/ipp-strings.c:1682 +#: locale/ipp-strings.c:1720 msgid "media-type.labels-glossy" msgstr "Glossy Labels" #. TRANSLATORS: High Gloss Labels -#: locale/ipp-strings.c:1684 +#: locale/ipp-strings.c:1722 msgid "media-type.labels-high-gloss" msgstr "High Gloss Labels" #. TRANSLATORS: Inkjet Labels -#: locale/ipp-strings.c:1686 +#: locale/ipp-strings.c:1724 msgid "media-type.labels-inkjet" msgstr "Inkjet Labels" #. TRANSLATORS: Matte Labels -#: locale/ipp-strings.c:1688 +#: locale/ipp-strings.c:1726 msgid "media-type.labels-matte" msgstr "Matte Labels" #. TRANSLATORS: Permanent Labels -#: locale/ipp-strings.c:1690 +#: locale/ipp-strings.c:1728 msgid "media-type.labels-permanent" msgstr "Permanent Labels" #. TRANSLATORS: Satin Labels -#: locale/ipp-strings.c:1692 +#: locale/ipp-strings.c:1730 msgid "media-type.labels-satin" msgstr "Satin Labels" #. TRANSLATORS: Security Labels -#: locale/ipp-strings.c:1694 +#: locale/ipp-strings.c:1732 msgid "media-type.labels-security" msgstr "Security Labels" #. TRANSLATORS: Semi-Gloss Labels -#: locale/ipp-strings.c:1696 +#: locale/ipp-strings.c:1734 msgid "media-type.labels-semi-gloss" msgstr "Semi-Gloss Labels" #. TRANSLATORS: Laminating Foil -#: locale/ipp-strings.c:1698 +#: locale/ipp-strings.c:1736 msgid "media-type.laminating-foil" msgstr "Laminating Foil" #. TRANSLATORS: Letterhead -#: locale/ipp-strings.c:1700 +#: locale/ipp-strings.c:1738 msgid "media-type.letterhead" msgstr "Letterhead" #. TRANSLATORS: Metal -#: locale/ipp-strings.c:1702 +#: locale/ipp-strings.c:1740 msgid "media-type.metal" msgstr "Metal" #. TRANSLATORS: Metal Glossy -#: locale/ipp-strings.c:1704 +#: locale/ipp-strings.c:1742 msgid "media-type.metal-glossy" msgstr "Metal Glossy" #. TRANSLATORS: Metal High Gloss -#: locale/ipp-strings.c:1706 +#: locale/ipp-strings.c:1744 msgid "media-type.metal-high-gloss" msgstr "Metal High Gloss" #. TRANSLATORS: Metal Matte -#: locale/ipp-strings.c:1708 +#: locale/ipp-strings.c:1746 msgid "media-type.metal-matte" msgstr "Metal Matte" #. TRANSLATORS: Metal Satin -#: locale/ipp-strings.c:1710 +#: locale/ipp-strings.c:1748 msgid "media-type.metal-satin" msgstr "Metal Satin" #. TRANSLATORS: Metal Semi Gloss -#: locale/ipp-strings.c:1712 +#: locale/ipp-strings.c:1750 msgid "media-type.metal-semi-gloss" msgstr "Metal Semi Gloss" #. TRANSLATORS: Mounting Tape -#: locale/ipp-strings.c:1714 +#: locale/ipp-strings.c:1752 msgid "media-type.mounting-tape" msgstr "Mounting Tape" #. TRANSLATORS: Multi Layer -#: locale/ipp-strings.c:1716 +#: locale/ipp-strings.c:1754 msgid "media-type.multi-layer" msgstr "Multi Layer" #. TRANSLATORS: Multi Part Form -#: locale/ipp-strings.c:1718 +#: locale/ipp-strings.c:1756 msgid "media-type.multi-part-form" msgstr "Multi Part Form" #. TRANSLATORS: Other -#: locale/ipp-strings.c:1720 +#: locale/ipp-strings.c:1758 msgid "media-type.other" msgstr "Other" #. TRANSLATORS: Paper -#: locale/ipp-strings.c:1722 +#: locale/ipp-strings.c:1760 msgid "media-type.paper" msgstr "Paper" #. TRANSLATORS: Photo Paper -#: locale/ipp-strings.c:1724 +#: locale/ipp-strings.c:1762 msgid "media-type.photographic" msgstr "Photo Paper" #. TRANSLATORS: Photographic Archival -#: locale/ipp-strings.c:1726 +#: locale/ipp-strings.c:1764 msgid "media-type.photographic-archival" msgstr "Photographic Archival" #. TRANSLATORS: Photo Film -#: locale/ipp-strings.c:1728 +#: locale/ipp-strings.c:1766 msgid "media-type.photographic-film" msgstr "Photo Film" #. TRANSLATORS: Glossy Photo Paper -#: locale/ipp-strings.c:1730 +#: locale/ipp-strings.c:1768 msgid "media-type.photographic-glossy" msgstr "Glossy Photo Paper" #. TRANSLATORS: High Gloss Photo Paper -#: locale/ipp-strings.c:1732 +#: locale/ipp-strings.c:1770 msgid "media-type.photographic-high-gloss" msgstr "High Gloss Photo Paper" #. TRANSLATORS: Matte Photo Paper -#: locale/ipp-strings.c:1734 +#: locale/ipp-strings.c:1772 msgid "media-type.photographic-matte" msgstr "Matte Photo Paper" #. TRANSLATORS: Satin Photo Paper -#: locale/ipp-strings.c:1736 +#: locale/ipp-strings.c:1774 msgid "media-type.photographic-satin" msgstr "Satin Photo Paper" #. TRANSLATORS: Semi-Gloss Photo Paper -#: locale/ipp-strings.c:1738 +#: locale/ipp-strings.c:1776 msgid "media-type.photographic-semi-gloss" msgstr "Semi-Gloss Photo Paper" #. TRANSLATORS: Plastic -#: locale/ipp-strings.c:1740 +#: locale/ipp-strings.c:1778 msgid "media-type.plastic" msgstr "Plastic" #. TRANSLATORS: Plastic Archival -#: locale/ipp-strings.c:1742 +#: locale/ipp-strings.c:1780 msgid "media-type.plastic-archival" msgstr "Plastic Archival" #. TRANSLATORS: Plastic Colored -#: locale/ipp-strings.c:1744 +#: locale/ipp-strings.c:1782 msgid "media-type.plastic-colored" msgstr "Plastic Colored" #. TRANSLATORS: Plastic Glossy -#: locale/ipp-strings.c:1746 +#: locale/ipp-strings.c:1784 msgid "media-type.plastic-glossy" msgstr "Plastic Glossy" #. TRANSLATORS: Plastic High Gloss -#: locale/ipp-strings.c:1748 +#: locale/ipp-strings.c:1786 msgid "media-type.plastic-high-gloss" msgstr "Plastic High Gloss" #. TRANSLATORS: Plastic Matte -#: locale/ipp-strings.c:1750 +#: locale/ipp-strings.c:1788 msgid "media-type.plastic-matte" msgstr "Plastic Matte" #. TRANSLATORS: Plastic Satin -#: locale/ipp-strings.c:1752 +#: locale/ipp-strings.c:1790 msgid "media-type.plastic-satin" msgstr "Plastic Satin" #. TRANSLATORS: Plastic Semi Gloss -#: locale/ipp-strings.c:1754 +#: locale/ipp-strings.c:1792 msgid "media-type.plastic-semi-gloss" msgstr "Plastic Semi Gloss" #. TRANSLATORS: Plate -#: locale/ipp-strings.c:1756 +#: locale/ipp-strings.c:1794 msgid "media-type.plate" msgstr "Plate" #. TRANSLATORS: Polyester -#: locale/ipp-strings.c:1758 +#: locale/ipp-strings.c:1796 msgid "media-type.polyester" msgstr "Polyester" #. TRANSLATORS: Pre Cut Tabs -#: locale/ipp-strings.c:1760 +#: locale/ipp-strings.c:1798 msgid "media-type.pre-cut-tabs" msgstr "Pre Cut Tabs" #. TRANSLATORS: Roll -#: locale/ipp-strings.c:1762 +#: locale/ipp-strings.c:1800 msgid "media-type.roll" msgstr "Roll" #. TRANSLATORS: Screen -#: locale/ipp-strings.c:1764 +#: locale/ipp-strings.c:1802 msgid "media-type.screen" msgstr "Screen" #. TRANSLATORS: Screen Paged -#: locale/ipp-strings.c:1766 +#: locale/ipp-strings.c:1804 msgid "media-type.screen-paged" msgstr "Screen Paged" #. TRANSLATORS: Self Adhesive -#: locale/ipp-strings.c:1768 +#: locale/ipp-strings.c:1806 msgid "media-type.self-adhesive" msgstr "Self Adhesive" #. TRANSLATORS: Self Adhesive Film -#: locale/ipp-strings.c:1770 +#: locale/ipp-strings.c:1808 msgid "media-type.self-adhesive-film" msgstr "Self Adhesive Film" #. TRANSLATORS: Shrink Foil -#: locale/ipp-strings.c:1772 +#: locale/ipp-strings.c:1810 msgid "media-type.shrink-foil" msgstr "Shrink Foil" #. TRANSLATORS: Single Face -#: locale/ipp-strings.c:1774 +#: locale/ipp-strings.c:1812 msgid "media-type.single-face" msgstr "Single Face" #. TRANSLATORS: Single Wall -#: locale/ipp-strings.c:1776 +#: locale/ipp-strings.c:1814 msgid "media-type.single-wall" msgstr "Single Wall" #. TRANSLATORS: Sleeve -#: locale/ipp-strings.c:1778 +#: locale/ipp-strings.c:1816 msgid "media-type.sleeve" msgstr "Sleeve" #. TRANSLATORS: Stationery -#: locale/ipp-strings.c:1780 +#: locale/ipp-strings.c:1818 msgid "media-type.stationery" msgstr "Stationery" #. TRANSLATORS: Stationery Archival -#: locale/ipp-strings.c:1782 +#: locale/ipp-strings.c:1820 msgid "media-type.stationery-archival" msgstr "Stationery Archival" #. TRANSLATORS: Coated Paper -#: locale/ipp-strings.c:1784 +#: locale/ipp-strings.c:1822 msgid "media-type.stationery-coated" msgstr "Coated Paper" #. TRANSLATORS: Stationery Cotton -#: locale/ipp-strings.c:1786 +#: locale/ipp-strings.c:1824 msgid "media-type.stationery-cotton" msgstr "Stationery Cotton" #. TRANSLATORS: Vellum Paper -#: locale/ipp-strings.c:1788 +#: locale/ipp-strings.c:1826 msgid "media-type.stationery-fine" msgstr "Vellum Paper" #. TRANSLATORS: Heavyweight Paper -#: locale/ipp-strings.c:1790 +#: locale/ipp-strings.c:1828 msgid "media-type.stationery-heavyweight" msgstr "Heavyweight Paper" #. TRANSLATORS: Stationery Heavyweight Coated -#: locale/ipp-strings.c:1792 +#: locale/ipp-strings.c:1830 msgid "media-type.stationery-heavyweight-coated" msgstr "Stationery Heavyweight Coated" #. TRANSLATORS: Stationery Inkjet Paper -#: locale/ipp-strings.c:1794 +#: locale/ipp-strings.c:1832 msgid "media-type.stationery-inkjet" msgstr "Stationery Inkjet Paper" #. TRANSLATORS: Letterhead -#: locale/ipp-strings.c:1796 +#: locale/ipp-strings.c:1834 msgid "media-type.stationery-letterhead" msgstr "Letterhead" #. TRANSLATORS: Lightweight Paper -#: locale/ipp-strings.c:1798 +#: locale/ipp-strings.c:1836 msgid "media-type.stationery-lightweight" msgstr "Lightweight Paper" #. TRANSLATORS: Preprinted Paper -#: locale/ipp-strings.c:1800 +#: locale/ipp-strings.c:1838 msgid "media-type.stationery-preprinted" msgstr "Preprinted Paper" #. TRANSLATORS: Punched Paper -#: locale/ipp-strings.c:1802 +#: locale/ipp-strings.c:1840 msgid "media-type.stationery-prepunched" msgstr "Punched Paper" #. TRANSLATORS: Tab Stock -#: locale/ipp-strings.c:1804 +#: locale/ipp-strings.c:1842 msgid "media-type.tab-stock" msgstr "Tab Stock" #. TRANSLATORS: Tractor -#: locale/ipp-strings.c:1806 +#: locale/ipp-strings.c:1844 msgid "media-type.tractor" msgstr "Tractor" #. TRANSLATORS: Transfer -#: locale/ipp-strings.c:1808 +#: locale/ipp-strings.c:1846 msgid "media-type.transfer" msgstr "Transfer" #. TRANSLATORS: Transparency -#: locale/ipp-strings.c:1810 +#: locale/ipp-strings.c:1848 msgid "media-type.transparency" msgstr "Transparency" #. TRANSLATORS: Triple Wall -#: locale/ipp-strings.c:1812 +#: locale/ipp-strings.c:1850 msgid "media-type.triple-wall" msgstr "Triple Wall" #. TRANSLATORS: Wet Film -#: locale/ipp-strings.c:1814 +#: locale/ipp-strings.c:1852 msgid "media-type.wet-film" msgstr "Wet Film" #. TRANSLATORS: Media Weight (grams per m²) -#: locale/ipp-strings.c:1816 +#: locale/ipp-strings.c:1854 msgid "media-weight-metric" msgstr "Media Weight (grams per m²)" #. TRANSLATORS: 28 x 40″ -#: locale/ipp-strings.c:1818 +#: locale/ipp-strings.c:1856 msgid "media.asme_f_28x40in" msgstr "28 x 40\"" #. TRANSLATORS: A4 or US Letter -#: locale/ipp-strings.c:1820 +#: locale/ipp-strings.c:1858 msgid "media.choice_iso_a4_210x297mm_na_letter_8.5x11in" msgstr "A4 or US Letter" #. TRANSLATORS: 2a0 -#: locale/ipp-strings.c:1822 +#: locale/ipp-strings.c:1860 msgid "media.iso_2a0_1189x1682mm" msgstr "2a0" #. TRANSLATORS: A0 -#: locale/ipp-strings.c:1824 +#: locale/ipp-strings.c:1862 msgid "media.iso_a0_841x1189mm" msgstr "A0" #. TRANSLATORS: A0x3 -#: locale/ipp-strings.c:1826 +#: locale/ipp-strings.c:1864 msgid "media.iso_a0x3_1189x2523mm" msgstr "A0x3" #. TRANSLATORS: A10 -#: locale/ipp-strings.c:1828 +#: locale/ipp-strings.c:1866 msgid "media.iso_a10_26x37mm" msgstr "A10" #. TRANSLATORS: A1 -#: locale/ipp-strings.c:1830 +#: locale/ipp-strings.c:1868 msgid "media.iso_a1_594x841mm" msgstr "A1" #. TRANSLATORS: A1x3 -#: locale/ipp-strings.c:1832 +#: locale/ipp-strings.c:1870 msgid "media.iso_a1x3_841x1783mm" msgstr "A1x3" #. TRANSLATORS: A1x4 -#: locale/ipp-strings.c:1834 +#: locale/ipp-strings.c:1872 msgid "media.iso_a1x4_841x2378mm" msgstr "A1x4" #. TRANSLATORS: A2 -#: locale/ipp-strings.c:1836 +#: locale/ipp-strings.c:1874 msgid "media.iso_a2_420x594mm" msgstr "A2" #. TRANSLATORS: A2x3 -#: locale/ipp-strings.c:1838 +#: locale/ipp-strings.c:1876 msgid "media.iso_a2x3_594x1261mm" msgstr "A2x3" #. TRANSLATORS: A2x4 -#: locale/ipp-strings.c:1840 +#: locale/ipp-strings.c:1878 msgid "media.iso_a2x4_594x1682mm" msgstr "A2x4" #. TRANSLATORS: A2x5 -#: locale/ipp-strings.c:1842 +#: locale/ipp-strings.c:1880 msgid "media.iso_a2x5_594x2102mm" msgstr "A2x5" #. TRANSLATORS: A3 (Extra) -#: locale/ipp-strings.c:1844 +#: locale/ipp-strings.c:1882 msgid "media.iso_a3-extra_322x445mm" msgstr "A3 (Extra)" #. TRANSLATORS: A3 -#: locale/ipp-strings.c:1846 +#: locale/ipp-strings.c:1884 msgid "media.iso_a3_297x420mm" msgstr "A3" #. TRANSLATORS: A3x3 -#: locale/ipp-strings.c:1848 +#: locale/ipp-strings.c:1886 msgid "media.iso_a3x3_420x891mm" msgstr "A3x3" #. TRANSLATORS: A3x4 -#: locale/ipp-strings.c:1850 +#: locale/ipp-strings.c:1888 msgid "media.iso_a3x4_420x1189mm" msgstr "A3x4" #. TRANSLATORS: A3x5 -#: locale/ipp-strings.c:1852 +#: locale/ipp-strings.c:1890 msgid "media.iso_a3x5_420x1486mm" msgstr "A3x5" #. TRANSLATORS: A3x6 -#: locale/ipp-strings.c:1854 +#: locale/ipp-strings.c:1892 msgid "media.iso_a3x6_420x1783mm" msgstr "A3x6" #. TRANSLATORS: A3x7 -#: locale/ipp-strings.c:1856 +#: locale/ipp-strings.c:1894 msgid "media.iso_a3x7_420x2080mm" msgstr "A3x7" #. TRANSLATORS: A4 (Extra) -#: locale/ipp-strings.c:1858 +#: locale/ipp-strings.c:1896 msgid "media.iso_a4-extra_235.5x322.3mm" msgstr "A4 (Extra)" #. TRANSLATORS: A4 (Tab) -#: locale/ipp-strings.c:1860 +#: locale/ipp-strings.c:1898 msgid "media.iso_a4-tab_225x297mm" msgstr "A4 (Tab)" #. TRANSLATORS: A4 -#: locale/ipp-strings.c:1862 +#: locale/ipp-strings.c:1900 msgid "media.iso_a4_210x297mm" msgstr "A4" #. TRANSLATORS: A4x3 -#: locale/ipp-strings.c:1864 +#: locale/ipp-strings.c:1902 msgid "media.iso_a4x3_297x630mm" msgstr "A4x3" #. TRANSLATORS: A4x4 -#: locale/ipp-strings.c:1866 +#: locale/ipp-strings.c:1904 msgid "media.iso_a4x4_297x841mm" msgstr "A4x4" #. TRANSLATORS: A4x5 -#: locale/ipp-strings.c:1868 +#: locale/ipp-strings.c:1906 msgid "media.iso_a4x5_297x1051mm" msgstr "A4x5" #. TRANSLATORS: A4x6 -#: locale/ipp-strings.c:1870 +#: locale/ipp-strings.c:1908 msgid "media.iso_a4x6_297x1261mm" msgstr "A4x6" #. TRANSLATORS: A4x7 -#: locale/ipp-strings.c:1872 +#: locale/ipp-strings.c:1910 msgid "media.iso_a4x7_297x1471mm" msgstr "A4x7" #. TRANSLATORS: A4x8 -#: locale/ipp-strings.c:1874 +#: locale/ipp-strings.c:1912 msgid "media.iso_a4x8_297x1682mm" msgstr "A4x8" #. TRANSLATORS: A4x9 -#: locale/ipp-strings.c:1876 +#: locale/ipp-strings.c:1914 msgid "media.iso_a4x9_297x1892mm" msgstr "A4x9" #. TRANSLATORS: A5 (Extra) -#: locale/ipp-strings.c:1878 +#: locale/ipp-strings.c:1916 msgid "media.iso_a5-extra_174x235mm" msgstr "A5 (Extra)" #. TRANSLATORS: A5 -#: locale/ipp-strings.c:1880 +#: locale/ipp-strings.c:1918 msgid "media.iso_a5_148x210mm" msgstr "A5" #. TRANSLATORS: A6 -#: locale/ipp-strings.c:1882 +#: locale/ipp-strings.c:1920 msgid "media.iso_a6_105x148mm" msgstr "A6" #. TRANSLATORS: A7 -#: locale/ipp-strings.c:1884 +#: locale/ipp-strings.c:1922 msgid "media.iso_a7_74x105mm" msgstr "A7" #. TRANSLATORS: A8 -#: locale/ipp-strings.c:1886 +#: locale/ipp-strings.c:1924 msgid "media.iso_a8_52x74mm" msgstr "A8" #. TRANSLATORS: A9 -#: locale/ipp-strings.c:1888 +#: locale/ipp-strings.c:1926 msgid "media.iso_a9_37x52mm" msgstr "A9" #. TRANSLATORS: B0 -#: locale/ipp-strings.c:1890 +#: locale/ipp-strings.c:1928 msgid "media.iso_b0_1000x1414mm" msgstr "B0" #. TRANSLATORS: B10 -#: locale/ipp-strings.c:1892 +#: locale/ipp-strings.c:1930 msgid "media.iso_b10_31x44mm" msgstr "B10" #. TRANSLATORS: B1 -#: locale/ipp-strings.c:1894 +#: locale/ipp-strings.c:1932 msgid "media.iso_b1_707x1000mm" msgstr "B1" #. TRANSLATORS: B2 -#: locale/ipp-strings.c:1896 +#: locale/ipp-strings.c:1934 msgid "media.iso_b2_500x707mm" msgstr "B2" #. TRANSLATORS: B3 -#: locale/ipp-strings.c:1898 +#: locale/ipp-strings.c:1936 msgid "media.iso_b3_353x500mm" msgstr "B3" #. TRANSLATORS: B4 -#: locale/ipp-strings.c:1900 +#: locale/ipp-strings.c:1938 msgid "media.iso_b4_250x353mm" msgstr "B4" #. TRANSLATORS: B5 (Extra) -#: locale/ipp-strings.c:1902 +#: locale/ipp-strings.c:1940 msgid "media.iso_b5-extra_201x276mm" msgstr "B5 (Extra)" #. TRANSLATORS: Envelope B5 -#: locale/ipp-strings.c:1904 +#: locale/ipp-strings.c:1942 msgid "media.iso_b5_176x250mm" msgstr "B5 Envelope" #. TRANSLATORS: B6 -#: locale/ipp-strings.c:1906 +#: locale/ipp-strings.c:1944 msgid "media.iso_b6_125x176mm" msgstr "B6" #. TRANSLATORS: Envelope B6/C4 -#: locale/ipp-strings.c:1908 +#: locale/ipp-strings.c:1946 msgid "media.iso_b6c4_125x324mm" msgstr "B6/C4 Envelope" #. TRANSLATORS: B7 -#: locale/ipp-strings.c:1910 +#: locale/ipp-strings.c:1948 msgid "media.iso_b7_88x125mm" msgstr "B7" #. TRANSLATORS: B8 -#: locale/ipp-strings.c:1912 +#: locale/ipp-strings.c:1950 msgid "media.iso_b8_62x88mm" msgstr "B8" #. TRANSLATORS: B9 -#: locale/ipp-strings.c:1914 +#: locale/ipp-strings.c:1952 msgid "media.iso_b9_44x62mm" msgstr "B9" #. TRANSLATORS: CEnvelope 0 -#: locale/ipp-strings.c:1916 +#: locale/ipp-strings.c:1954 msgid "media.iso_c0_917x1297mm" msgstr "C0 Envelope" #. TRANSLATORS: CEnvelope 10 -#: locale/ipp-strings.c:1918 +#: locale/ipp-strings.c:1956 msgid "media.iso_c10_28x40mm" msgstr "C10 Envelope" #. TRANSLATORS: CEnvelope 1 -#: locale/ipp-strings.c:1920 +#: locale/ipp-strings.c:1958 msgid "media.iso_c1_648x917mm" msgstr "C1 Envelope" #. TRANSLATORS: CEnvelope 2 -#: locale/ipp-strings.c:1922 +#: locale/ipp-strings.c:1960 msgid "media.iso_c2_458x648mm" msgstr "C2 Envelope" #. TRANSLATORS: CEnvelope 3 -#: locale/ipp-strings.c:1924 +#: locale/ipp-strings.c:1962 msgid "media.iso_c3_324x458mm" msgstr "C3 Envelope" #. TRANSLATORS: CEnvelope 4 -#: locale/ipp-strings.c:1926 +#: locale/ipp-strings.c:1964 msgid "media.iso_c4_229x324mm" msgstr "C4 Envelope" #. TRANSLATORS: CEnvelope 5 -#: locale/ipp-strings.c:1928 +#: locale/ipp-strings.c:1966 msgid "media.iso_c5_162x229mm" msgstr "C5 Envelope" #. TRANSLATORS: CEnvelope 6 -#: locale/ipp-strings.c:1930 +#: locale/ipp-strings.c:1968 msgid "media.iso_c6_114x162mm" msgstr "C6 Envelope" #. TRANSLATORS: CEnvelope 6c5 -#: locale/ipp-strings.c:1932 +#: locale/ipp-strings.c:1970 msgid "media.iso_c6c5_114x229mm" msgstr "C6c5 Envelope" #. TRANSLATORS: CEnvelope 7 -#: locale/ipp-strings.c:1934 +#: locale/ipp-strings.c:1972 msgid "media.iso_c7_81x114mm" msgstr "C7 Envelope" #. TRANSLATORS: CEnvelope 7c6 -#: locale/ipp-strings.c:1936 +#: locale/ipp-strings.c:1974 msgid "media.iso_c7c6_81x162mm" msgstr "C7c6 Envelope" #. TRANSLATORS: CEnvelope 8 -#: locale/ipp-strings.c:1938 +#: locale/ipp-strings.c:1976 msgid "media.iso_c8_57x81mm" msgstr "C8 Envelope" #. TRANSLATORS: CEnvelope 9 -#: locale/ipp-strings.c:1940 +#: locale/ipp-strings.c:1978 msgid "media.iso_c9_40x57mm" msgstr "C9 Envelope" #. TRANSLATORS: Envelope DL -#: locale/ipp-strings.c:1942 +#: locale/ipp-strings.c:1980 msgid "media.iso_dl_110x220mm" msgstr "DL Envelope" #. TRANSLATORS: ISO RA0 -#: locale/ipp-strings.c:1948 +#: locale/ipp-strings.c:1986 msgid "media.iso_ra0_860x1220mm" msgstr "Ra0" #. TRANSLATORS: ISO RA1 -#: locale/ipp-strings.c:1950 +#: locale/ipp-strings.c:1988 msgid "media.iso_ra1_610x860mm" msgstr "Ra1" #. TRANSLATORS: ISO RA2 -#: locale/ipp-strings.c:1952 +#: locale/ipp-strings.c:1990 msgid "media.iso_ra2_430x610mm" msgstr "Ra2" #. TRANSLATORS: ISO RA3 -#: locale/ipp-strings.c:1954 +#: locale/ipp-strings.c:1992 msgid "media.iso_ra3_305x430mm" msgstr "Ra3" #. TRANSLATORS: ISO RA4 -#: locale/ipp-strings.c:1956 +#: locale/ipp-strings.c:1994 msgid "media.iso_ra4_215x305mm" msgstr "Ra4" #. TRANSLATORS: ISO SRA0 -#: locale/ipp-strings.c:1958 +#: locale/ipp-strings.c:1996 msgid "media.iso_sra0_900x1280mm" msgstr "Sra0" #. TRANSLATORS: ISO SRA1 -#: locale/ipp-strings.c:1960 +#: locale/ipp-strings.c:1998 msgid "media.iso_sra1_640x900mm" msgstr "Sra1" #. TRANSLATORS: ISO SRA2 -#: locale/ipp-strings.c:1962 +#: locale/ipp-strings.c:2000 msgid "media.iso_sra2_450x640mm" msgstr "Sra2" #. TRANSLATORS: ISO SRA3 -#: locale/ipp-strings.c:1964 +#: locale/ipp-strings.c:2002 msgid "media.iso_sra3_320x450mm" msgstr "Sra3" #. TRANSLATORS: ISO SRA4 -#: locale/ipp-strings.c:1966 +#: locale/ipp-strings.c:2004 msgid "media.iso_sra4_225x320mm" msgstr "Sra4" #. TRANSLATORS: JIS B0 -#: locale/ipp-strings.c:1968 +#: locale/ipp-strings.c:2006 msgid "media.jis_b0_1030x1456mm" msgstr "JIS B0" #. TRANSLATORS: JIS B10 -#: locale/ipp-strings.c:1970 +#: locale/ipp-strings.c:2008 msgid "media.jis_b10_32x45mm" msgstr "JIS B10" #. TRANSLATORS: JIS B1 -#: locale/ipp-strings.c:1972 +#: locale/ipp-strings.c:2010 msgid "media.jis_b1_728x1030mm" msgstr "JIS B1" #. TRANSLATORS: JIS B2 -#: locale/ipp-strings.c:1974 +#: locale/ipp-strings.c:2012 msgid "media.jis_b2_515x728mm" msgstr "JIS B2" #. TRANSLATORS: JIS B3 -#: locale/ipp-strings.c:1976 +#: locale/ipp-strings.c:2014 msgid "media.jis_b3_364x515mm" msgstr "JIS B3" #. TRANSLATORS: JIS B4 -#: locale/ipp-strings.c:1978 +#: locale/ipp-strings.c:2016 msgid "media.jis_b4_257x364mm" msgstr "JIS B4" #. TRANSLATORS: JIS B5 -#: locale/ipp-strings.c:1980 +#: locale/ipp-strings.c:2018 msgid "media.jis_b5_182x257mm" msgstr "JIS B5" #. TRANSLATORS: JIS B6 -#: locale/ipp-strings.c:1982 +#: locale/ipp-strings.c:2020 msgid "media.jis_b6_128x182mm" msgstr "JIS B6" #. TRANSLATORS: JIS B7 -#: locale/ipp-strings.c:1984 +#: locale/ipp-strings.c:2022 msgid "media.jis_b7_91x128mm" msgstr "JIS B7" #. TRANSLATORS: JIS B8 -#: locale/ipp-strings.c:1986 +#: locale/ipp-strings.c:2024 msgid "media.jis_b8_64x91mm" msgstr "JIS B8" #. TRANSLATORS: JIS B9 -#: locale/ipp-strings.c:1988 +#: locale/ipp-strings.c:2026 msgid "media.jis_b9_45x64mm" msgstr "JIS B9" #. TRANSLATORS: JIS Executive -#: locale/ipp-strings.c:1990 +#: locale/ipp-strings.c:2028 msgid "media.jis_exec_216x330mm" msgstr "JIS Executive" #. TRANSLATORS: Envelope Chou 2 -#: locale/ipp-strings.c:1992 +#: locale/ipp-strings.c:2030 msgid "media.jpn_chou2_111.1x146mm" msgstr "Chou 2 Envelope" #. TRANSLATORS: Envelope Chou 3 -#: locale/ipp-strings.c:1994 +#: locale/ipp-strings.c:2032 msgid "media.jpn_chou3_120x235mm" msgstr "Chou 3 Envelope" #. TRANSLATORS: Envelope Chou 4 -#: locale/ipp-strings.c:1998 +#: locale/ipp-strings.c:2036 msgid "media.jpn_chou4_90x205mm" msgstr "Chou 4 Envelope" #. TRANSLATORS: Hagaki -#: locale/ipp-strings.c:2000 +#: locale/ipp-strings.c:2038 msgid "media.jpn_hagaki_100x148mm" msgstr "Hagaki" #. TRANSLATORS: Envelope Kahu -#: locale/ipp-strings.c:2002 +#: locale/ipp-strings.c:2040 msgid "media.jpn_kahu_240x322.1mm" msgstr "Kahu Envelope" #. TRANSLATORS: Envelope Kahu 2 -#: locale/ipp-strings.c:2006 +#: locale/ipp-strings.c:2044 msgid "media.jpn_kaku2_240x332mm" msgstr "Kahu 2 Envelope" #. TRANSLATORS: 216 x 277mm -#: locale/ipp-strings.c:2008 +#: locale/ipp-strings.c:2046 msgid "media.jpn_kaku3_216x277mm" msgstr "216 x 277mme" #. TRANSLATORS: 197 x 267mm -#: locale/ipp-strings.c:2010 +#: locale/ipp-strings.c:2048 msgid "media.jpn_kaku4_197x267mm" msgstr "197 x 267mme" #. TRANSLATORS: 190 x 240mm -#: locale/ipp-strings.c:2012 +#: locale/ipp-strings.c:2050 msgid "media.jpn_kaku5_190x240mm" msgstr "190 x 240mme" #. TRANSLATORS: 142 x 205mm -#: locale/ipp-strings.c:2014 +#: locale/ipp-strings.c:2052 msgid "media.jpn_kaku7_142x205mm" msgstr "142 x 205mme" #. TRANSLATORS: 119 x 197mm -#: locale/ipp-strings.c:2016 +#: locale/ipp-strings.c:2054 msgid "media.jpn_kaku8_119x197mm" msgstr "119 x 197mme" #. TRANSLATORS: Oufuku Reply Postcard -#: locale/ipp-strings.c:2018 +#: locale/ipp-strings.c:2056 msgid "media.jpn_oufuku_148x200mm" msgstr "Oufuku Reply Postcard" #. TRANSLATORS: Envelope You 4 -#: locale/ipp-strings.c:2020 +#: locale/ipp-strings.c:2058 msgid "media.jpn_you4_105x235mm" msgstr "You 4 Envelope" #. TRANSLATORS: 10 x 11″ -#: locale/ipp-strings.c:2022 +#: locale/ipp-strings.c:2060 msgid "media.na_10x11_10x11in" msgstr "10 x 11\"" #. TRANSLATORS: 10 x 13″ -#: locale/ipp-strings.c:2024 +#: locale/ipp-strings.c:2062 msgid "media.na_10x13_10x13in" msgstr "10 x 13\"" #. TRANSLATORS: 10 x 14″ -#: locale/ipp-strings.c:2026 +#: locale/ipp-strings.c:2064 msgid "media.na_10x14_10x14in" msgstr "10 x 14\"" #. TRANSLATORS: 10 x 15″ -#: locale/ipp-strings.c:2028 +#: locale/ipp-strings.c:2066 msgid "media.na_10x15_10x15in" msgstr "10 x 15\"" #. TRANSLATORS: 11 x 12″ -#: locale/ipp-strings.c:2030 +#: locale/ipp-strings.c:2068 msgid "media.na_11x12_11x12in" msgstr "11 x 12\"" #. TRANSLATORS: 11 x 15″ -#: locale/ipp-strings.c:2032 +#: locale/ipp-strings.c:2070 msgid "media.na_11x15_11x15in" msgstr "11 x 15\"" #. TRANSLATORS: 12 x 19″ -#: locale/ipp-strings.c:2034 +#: locale/ipp-strings.c:2072 msgid "media.na_12x19_12x19in" msgstr "12 x 19\"" #. TRANSLATORS: 5 x 7″ -#: locale/ipp-strings.c:2036 +#: locale/ipp-strings.c:2074 msgid "media.na_5x7_5x7in" msgstr "5 x 7\"" #. TRANSLATORS: 6 x 9″ -#: locale/ipp-strings.c:2038 +#: locale/ipp-strings.c:2076 msgid "media.na_6x9_6x9in" msgstr "6 x 9\"" #. TRANSLATORS: 7 x 9″ -#: locale/ipp-strings.c:2040 +#: locale/ipp-strings.c:2078 msgid "media.na_7x9_7x9in" msgstr "7 x 9\"" #. TRANSLATORS: 9 x 11″ -#: locale/ipp-strings.c:2042 +#: locale/ipp-strings.c:2080 msgid "media.na_9x11_9x11in" msgstr "9 x 11\"" #. TRANSLATORS: Envelope A2 -#: locale/ipp-strings.c:2044 +#: locale/ipp-strings.c:2082 msgid "media.na_a2_4.375x5.75in" msgstr "A2 Envelope" #. TRANSLATORS: 9 x 12″ -#: locale/ipp-strings.c:2046 +#: locale/ipp-strings.c:2084 msgid "media.na_arch-a_9x12in" msgstr "9 x 12\"" #. TRANSLATORS: 12 x 18″ -#: locale/ipp-strings.c:2048 +#: locale/ipp-strings.c:2086 msgid "media.na_arch-b_12x18in" msgstr "12 x 18\"" #. TRANSLATORS: 18 x 24″ -#: locale/ipp-strings.c:2050 +#: locale/ipp-strings.c:2088 msgid "media.na_arch-c_18x24in" msgstr "18 x 24\"" #. TRANSLATORS: 24 x 36″ -#: locale/ipp-strings.c:2052 +#: locale/ipp-strings.c:2090 msgid "media.na_arch-d_24x36in" msgstr "24 x 36\"" #. TRANSLATORS: 26 x 38″ -#: locale/ipp-strings.c:2054 +#: locale/ipp-strings.c:2092 msgid "media.na_arch-e2_26x38in" msgstr "26 x 38\"" #. TRANSLATORS: 27 x 39″ -#: locale/ipp-strings.c:2056 +#: locale/ipp-strings.c:2094 msgid "media.na_arch-e3_27x39in" msgstr "27 x 39\"" #. TRANSLATORS: 36 x 48″ -#: locale/ipp-strings.c:2058 +#: locale/ipp-strings.c:2096 msgid "media.na_arch-e_36x48in" msgstr "36 x 48\"" #. TRANSLATORS: 12 x 19.17″ -#: locale/ipp-strings.c:2060 +#: locale/ipp-strings.c:2098 msgid "media.na_b-plus_12x19.17in" msgstr "12 x 19.17\"" #. TRANSLATORS: Envelope C5 -#: locale/ipp-strings.c:2062 +#: locale/ipp-strings.c:2100 msgid "media.na_c5_6.5x9.5in" msgstr "C5 Envelope" #. TRANSLATORS: 17 x 22″ -#: locale/ipp-strings.c:2064 +#: locale/ipp-strings.c:2102 msgid "media.na_c_17x22in" msgstr "17 x 22\"" #. TRANSLATORS: 22 x 34″ -#: locale/ipp-strings.c:2066 +#: locale/ipp-strings.c:2104 msgid "media.na_d_22x34in" msgstr "22 x 34\"" #. TRANSLATORS: 34 x 44″ -#: locale/ipp-strings.c:2068 +#: locale/ipp-strings.c:2106 msgid "media.na_e_34x44in" msgstr "34 x 44\"" #. TRANSLATORS: 11 x 14″ -#: locale/ipp-strings.c:2070 +#: locale/ipp-strings.c:2108 msgid "media.na_edp_11x14in" msgstr "11 x 14\"" #. TRANSLATORS: 12 x 14″ -#: locale/ipp-strings.c:2072 +#: locale/ipp-strings.c:2110 msgid "media.na_eur-edp_12x14in" msgstr "12 x 14\"" #. TRANSLATORS: Executive -#: locale/ipp-strings.c:2074 +#: locale/ipp-strings.c:2112 msgid "media.na_executive_7.25x10.5in" msgstr "Executive" #. TRANSLATORS: 44 x 68″ -#: locale/ipp-strings.c:2076 +#: locale/ipp-strings.c:2114 msgid "media.na_f_44x68in" msgstr "44 x 68\"" #. TRANSLATORS: European Fanfold -#: locale/ipp-strings.c:2078 +#: locale/ipp-strings.c:2116 msgid "media.na_fanfold-eur_8.5x12in" msgstr "European Fanfold" #. TRANSLATORS: US Fanfold -#: locale/ipp-strings.c:2080 +#: locale/ipp-strings.c:2118 msgid "media.na_fanfold-us_11x14.875in" msgstr "US Fanfold" #. TRANSLATORS: Foolscap -#: locale/ipp-strings.c:2082 +#: locale/ipp-strings.c:2120 msgid "media.na_foolscap_8.5x13in" msgstr "Foolscap" #. TRANSLATORS: 8 x 13″ -#: locale/ipp-strings.c:2084 +#: locale/ipp-strings.c:2122 msgid "media.na_govt-legal_8x13in" msgstr "8 x 13\"" #. TRANSLATORS: 8 x 10″ -#: locale/ipp-strings.c:2086 +#: locale/ipp-strings.c:2124 msgid "media.na_govt-letter_8x10in" msgstr "8 x 10\"" #. TRANSLATORS: 3 x 5″ -#: locale/ipp-strings.c:2088 +#: locale/ipp-strings.c:2126 msgid "media.na_index-3x5_3x5in" msgstr "3 x 5\"" #. TRANSLATORS: 6 x 8″ -#: locale/ipp-strings.c:2090 +#: locale/ipp-strings.c:2128 msgid "media.na_index-4x6-ext_6x8in" msgstr "6 x 8\"" #. TRANSLATORS: 4 x 6″ -#: locale/ipp-strings.c:2092 +#: locale/ipp-strings.c:2130 msgid "media.na_index-4x6_4x6in" msgstr "4 x 6\"" #. TRANSLATORS: 5 x 8″ -#: locale/ipp-strings.c:2094 +#: locale/ipp-strings.c:2132 msgid "media.na_index-5x8_5x8in" msgstr "5 x 8\"" #. TRANSLATORS: Statement -#: locale/ipp-strings.c:2096 +#: locale/ipp-strings.c:2134 msgid "media.na_invoice_5.5x8.5in" msgstr "Statement" #. TRANSLATORS: 11 x 17″ -#: locale/ipp-strings.c:2098 +#: locale/ipp-strings.c:2136 msgid "media.na_ledger_11x17in" msgstr "11 x 17\"" #. TRANSLATORS: US Legal (Extra) -#: locale/ipp-strings.c:2100 +#: locale/ipp-strings.c:2138 msgid "media.na_legal-extra_9.5x15in" msgstr "US Legal (Extra)" #. TRANSLATORS: US Legal -#: locale/ipp-strings.c:2102 +#: locale/ipp-strings.c:2140 msgid "media.na_legal_8.5x14in" msgstr "US Legal" #. TRANSLATORS: US Letter (Extra) -#: locale/ipp-strings.c:2104 +#: locale/ipp-strings.c:2142 msgid "media.na_letter-extra_9.5x12in" msgstr "US Letter (Extra)" #. TRANSLATORS: US Letter (Plus) -#: locale/ipp-strings.c:2106 +#: locale/ipp-strings.c:2144 msgid "media.na_letter-plus_8.5x12.69in" msgstr "US Letter (Plus)" #. TRANSLATORS: US Letter -#: locale/ipp-strings.c:2108 +#: locale/ipp-strings.c:2146 msgid "media.na_letter_8.5x11in" msgstr "US Letter" #. TRANSLATORS: Envelope Monarch -#: locale/ipp-strings.c:2110 +#: locale/ipp-strings.c:2148 msgid "media.na_monarch_3.875x7.5in" msgstr "Monarch Envelope" #. TRANSLATORS: Envelope #10 -#: locale/ipp-strings.c:2112 +#: locale/ipp-strings.c:2150 msgid "media.na_number-10_4.125x9.5in" msgstr "#10 Envelope" #. TRANSLATORS: Envelope #11 -#: locale/ipp-strings.c:2114 +#: locale/ipp-strings.c:2152 msgid "media.na_number-11_4.5x10.375in" msgstr "#11 Envelope" #. TRANSLATORS: Envelope #12 -#: locale/ipp-strings.c:2116 +#: locale/ipp-strings.c:2154 msgid "media.na_number-12_4.75x11in" msgstr "#12 Envelope" #. TRANSLATORS: Envelope #14 -#: locale/ipp-strings.c:2118 +#: locale/ipp-strings.c:2156 msgid "media.na_number-14_5x11.5in" msgstr "#14 Envelope" #. TRANSLATORS: Envelope #9 -#: locale/ipp-strings.c:2120 +#: locale/ipp-strings.c:2158 msgid "media.na_number-9_3.875x8.875in" msgstr "#9 Envelope" #. TRANSLATORS: 8.5 x 13.4″ -#: locale/ipp-strings.c:2122 +#: locale/ipp-strings.c:2160 msgid "media.na_oficio_8.5x13.4in" msgstr "8.5 x 13.4\"" #. TRANSLATORS: Envelope Personal -#: locale/ipp-strings.c:2124 +#: locale/ipp-strings.c:2162 msgid "media.na_personal_3.625x6.5in" msgstr "Personal Envelope" #. TRANSLATORS: Quarto -#: locale/ipp-strings.c:2126 +#: locale/ipp-strings.c:2164 msgid "media.na_quarto_8.5x10.83in" msgstr "Quarto" #. TRANSLATORS: 8.94 x 14″ -#: locale/ipp-strings.c:2128 +#: locale/ipp-strings.c:2166 msgid "media.na_super-a_8.94x14in" msgstr "8.94 x 14\"" #. TRANSLATORS: 13 x 19″ -#: locale/ipp-strings.c:2130 +#: locale/ipp-strings.c:2168 msgid "media.na_super-b_13x19in" msgstr "13 x 19\"" #. TRANSLATORS: 30 x 42″ -#: locale/ipp-strings.c:2132 +#: locale/ipp-strings.c:2170 msgid "media.na_wide-format_30x42in" msgstr "30 x 42\"" #. TRANSLATORS: 12 x 16″ -#: locale/ipp-strings.c:2134 +#: locale/ipp-strings.c:2172 msgid "media.oe_12x16_12x16in" msgstr "12 x 16\"" #. TRANSLATORS: 14 x 17″ -#: locale/ipp-strings.c:2136 +#: locale/ipp-strings.c:2174 msgid "media.oe_14x17_14x17in" msgstr "14 x 17\"" #. TRANSLATORS: 18 x 22″ -#: locale/ipp-strings.c:2138 +#: locale/ipp-strings.c:2176 msgid "media.oe_18x22_18x22in" msgstr "18 x 22\"" #. TRANSLATORS: 17 x 24″ -#: locale/ipp-strings.c:2140 +#: locale/ipp-strings.c:2178 msgid "media.oe_a2plus_17x24in" msgstr "17 x 24\"" #. TRANSLATORS: 10 x 12″ -#: locale/ipp-strings.c:2144 +#: locale/ipp-strings.c:2182 msgid "media.oe_photo-10r_10x12in" msgstr "10 x 12\"" #. TRANSLATORS: 20 x 24″ -#: locale/ipp-strings.c:2146 +#: locale/ipp-strings.c:2184 msgid "media.oe_photo-20r_20x24in" msgstr "20 x 24\"" #. TRANSLATORS: 3.5 x 5″ -#: locale/ipp-strings.c:2148 +#: locale/ipp-strings.c:2186 msgid "media.oe_photo-l_3.5x5in" msgstr "3.5 x 5\"" #. TRANSLATORS: 10 x 15″ -#: locale/ipp-strings.c:2150 +#: locale/ipp-strings.c:2188 msgid "media.oe_photo-s10r_10x15in" msgstr "10 x 15\"" #. TRANSLATORS: 184 x 260mm -#: locale/ipp-strings.c:2156 +#: locale/ipp-strings.c:2194 msgid "media.om_16k_184x260mm" msgstr "184 x 260mm" #. TRANSLATORS: 195 x 270mm -#: locale/ipp-strings.c:2158 +#: locale/ipp-strings.c:2196 msgid "media.om_16k_195x270mm" msgstr "195 x 270mm" #. TRANSLATORS: 275 x 395mm -#: locale/ipp-strings.c:2166 +#: locale/ipp-strings.c:2204 msgid "media.om_dai-pa-kai_275x395mm" msgstr "275 x 395mm" #. TRANSLATORS: Folio -#: locale/ipp-strings.c:2170 +#: locale/ipp-strings.c:2208 msgid "media.om_folio-sp_215x315mm" msgstr "Folio" #. TRANSLATORS: Folio (Special) -#: locale/ipp-strings.c:2172 +#: locale/ipp-strings.c:2210 msgid "media.om_folio_210x330mm" msgstr "Folio (Special)" #. TRANSLATORS: Envelope Invitation -#: locale/ipp-strings.c:2174 +#: locale/ipp-strings.c:2212 msgid "media.om_invite_220x220mm" msgstr "Invitation Envelope" #. TRANSLATORS: Envelope Italian -#: locale/ipp-strings.c:2176 +#: locale/ipp-strings.c:2214 msgid "media.om_italian_110x230mm" msgstr "Italian Envelope" #. TRANSLATORS: 198 x 275mm -#: locale/ipp-strings.c:2178 +#: locale/ipp-strings.c:2216 msgid "media.om_juuro-ku-kai_198x275mm" msgstr "198 x 275mm" #. TRANSLATORS: 200 x 300 -#: locale/ipp-strings.c:2180 +#: locale/ipp-strings.c:2218 msgid "media.om_large-photo_200x300" msgstr "200 x 300mm" #. TRANSLATORS: 130 x 180mm -#: locale/ipp-strings.c:2182 +#: locale/ipp-strings.c:2220 msgid "media.om_medium-photo_130x180mm" msgstr "130 x 180mm" #. TRANSLATORS: 267 x 389mm -#: locale/ipp-strings.c:2184 +#: locale/ipp-strings.c:2222 msgid "media.om_pa-kai_267x389mm" msgstr "267 x 389mm" #. TRANSLATORS: Envelope Postfix -#: locale/ipp-strings.c:2186 +#: locale/ipp-strings.c:2224 msgid "media.om_postfix_114x229mm" msgstr "Postfix Envelope" #. TRANSLATORS: 100 x 150mm -#: locale/ipp-strings.c:2188 +#: locale/ipp-strings.c:2226 msgid "media.om_small-photo_100x150mm" msgstr "100 x 150mm" #. TRANSLATORS: 100 x 200mm -#: locale/ipp-strings.c:2192 +#: locale/ipp-strings.c:2230 msgid "media.om_wide-photo_100x200mm" msgstr "100 x 200mm" #. TRANSLATORS: Envelope Chinese #10 -#: locale/ipp-strings.c:2194 +#: locale/ipp-strings.c:2232 msgid "media.prc_10_324x458mm" msgstr "Chinese #10 Envelope" #. TRANSLATORS: Chinese 16k -#: locale/ipp-strings.c:2196 +#: locale/ipp-strings.c:2234 msgid "media.prc_16k_146x215mm" msgstr "Chinese 16k" #. TRANSLATORS: Envelope Chinese #1 -#: locale/ipp-strings.c:2198 +#: locale/ipp-strings.c:2236 msgid "media.prc_1_102x165mm" msgstr "Chinese #1 Envelope" #. TRANSLATORS: Envelope Chinese #2 -#: locale/ipp-strings.c:2200 +#: locale/ipp-strings.c:2238 msgid "media.prc_2_102x176mm" msgstr "Chinese #2 Envelope" #. TRANSLATORS: Chinese 32k -#: locale/ipp-strings.c:2202 +#: locale/ipp-strings.c:2240 msgid "media.prc_32k_97x151mm" msgstr "Chinese 32k" #. TRANSLATORS: Envelope Chinese #3 -#: locale/ipp-strings.c:2204 +#: locale/ipp-strings.c:2242 msgid "media.prc_3_125x176mm" msgstr "Chinese #3 Envelope" #. TRANSLATORS: Envelope Chinese #4 -#: locale/ipp-strings.c:2206 +#: locale/ipp-strings.c:2244 msgid "media.prc_4_110x208mm" msgstr "Chinese #4 Envelope" #. TRANSLATORS: Envelope Chinese #5 -#: locale/ipp-strings.c:2208 +#: locale/ipp-strings.c:2246 msgid "media.prc_5_110x220mm" msgstr "Chinese #5 Envelope" #. TRANSLATORS: Envelope Chinese #6 -#: locale/ipp-strings.c:2210 +#: locale/ipp-strings.c:2248 msgid "media.prc_6_120x320mm" msgstr "Chinese #6 Envelope" #. TRANSLATORS: Envelope Chinese #7 -#: locale/ipp-strings.c:2212 +#: locale/ipp-strings.c:2250 msgid "media.prc_7_160x230mm" msgstr "Chinese #7 Envelope" #. TRANSLATORS: Envelope Chinese #8 -#: locale/ipp-strings.c:2214 +#: locale/ipp-strings.c:2252 msgid "media.prc_8_120x309mm" msgstr "Chinese #8 Envelope" #. TRANSLATORS: ROC 16k -#: locale/ipp-strings.c:2216 +#: locale/ipp-strings.c:2254 msgid "media.roc_16k_7.75x10.75in" msgstr "ROC 16k" #. TRANSLATORS: ROC 8k -#: locale/ipp-strings.c:2218 +#: locale/ipp-strings.c:2256 msgid "media.roc_8k_10.75x15.5in" msgstr "ROC 8k" #. TRANSLATORS: Multiple Document Handling -#: locale/ipp-strings.c:2220 +#: locale/ipp-strings.c:2258 msgid "multiple-document-handling" msgstr "Multiple Document Handling" #. TRANSLATORS: Separate Documents Collated Copies -#: locale/ipp-strings.c:2222 +#: locale/ipp-strings.c:2260 msgid "multiple-document-handling.separate-documents-collated-copies" msgstr "Separate Documents Collated Copies" #. TRANSLATORS: Separate Documents Uncollated Copies -#: locale/ipp-strings.c:2224 +#: locale/ipp-strings.c:2262 msgid "multiple-document-handling.separate-documents-uncollated-copies" msgstr "Separate Documents Uncollated Copies" #. TRANSLATORS: Single Document -#: locale/ipp-strings.c:2226 +#: locale/ipp-strings.c:2264 msgid "multiple-document-handling.single-document" msgstr "Single Document" #. TRANSLATORS: Single Document New Sheet -#: locale/ipp-strings.c:2228 +#: locale/ipp-strings.c:2266 msgid "multiple-document-handling.single-document-new-sheet" msgstr "Single Document New Sheet" #. TRANSLATORS: Multiple Object Handling -#: locale/ipp-strings.c:2230 +#: locale/ipp-strings.c:2268 msgid "multiple-object-handling" msgstr "Multiple Object Handling" #. TRANSLATORS: Automatic -#: locale/ipp-strings.c:2234 +#: locale/ipp-strings.c:2272 msgid "multiple-object-handling.auto" msgstr "Automatic" #. TRANSLATORS: Best Fit -#: locale/ipp-strings.c:2236 +#: locale/ipp-strings.c:2274 msgid "multiple-object-handling.best-fit" msgstr "Best Fit" #. TRANSLATORS: Best Quality -#: locale/ipp-strings.c:2238 +#: locale/ipp-strings.c:2276 msgid "multiple-object-handling.best-quality" msgstr "Best Quality" #. TRANSLATORS: Best Speed -#: locale/ipp-strings.c:2240 +#: locale/ipp-strings.c:2278 msgid "multiple-object-handling.best-speed" msgstr "Best Speed" #. TRANSLATORS: One At A Time -#: locale/ipp-strings.c:2242 +#: locale/ipp-strings.c:2280 msgid "multiple-object-handling.one-at-a-time" msgstr "One At A Time" #. TRANSLATORS: On Timeout -#: locale/ipp-strings.c:2244 +#: locale/ipp-strings.c:2282 msgid "multiple-operation-time-out-action" msgstr "Multiple Operation Time Out Action" #. TRANSLATORS: Abort Job -#: locale/ipp-strings.c:2246 +#: locale/ipp-strings.c:2284 msgid "multiple-operation-time-out-action.abort-job" msgstr "Abort Job" #. TRANSLATORS: Hold Job -#: locale/ipp-strings.c:2248 +#: locale/ipp-strings.c:2286 msgid "multiple-operation-time-out-action.hold-job" msgstr "Hold Job" #. TRANSLATORS: Process Job -#: locale/ipp-strings.c:2250 +#: locale/ipp-strings.c:2288 msgid "multiple-operation-time-out-action.process-job" msgstr "Process Job" #. TRANSLATORS: Noise Removal -#: locale/ipp-strings.c:2252 +#: locale/ipp-strings.c:2290 msgid "noise-removal" msgstr "Noise Removal" #. TRANSLATORS: Notify Attributes -#: locale/ipp-strings.c:2254 +#: locale/ipp-strings.c:2292 msgid "notify-attributes" msgstr "Notify Attributes" #. TRANSLATORS: Notify Charset -#: locale/ipp-strings.c:2256 +#: locale/ipp-strings.c:2294 msgid "notify-charset" msgstr "Notify Charset" #. TRANSLATORS: Notify Events -#: locale/ipp-strings.c:2258 +#: locale/ipp-strings.c:2296 msgid "notify-events" msgstr "Notify Events" #. TRANSLATORS: Document Completed -#: locale/ipp-strings.c:2260 +#: locale/ipp-strings.c:2298 msgid "notify-events.document-completed" msgstr "Document Completed" #. TRANSLATORS: Document Config Changed -#: locale/ipp-strings.c:2262 +#: locale/ipp-strings.c:2300 msgid "notify-events.document-config-changed" msgstr "Document Config Changed" #. TRANSLATORS: Document Created -#: locale/ipp-strings.c:2264 +#: locale/ipp-strings.c:2302 msgid "notify-events.document-created" msgstr "Document Created" #. TRANSLATORS: Document Fetchable -#: locale/ipp-strings.c:2266 +#: locale/ipp-strings.c:2304 msgid "notify-events.document-fetchable" msgstr "Document Fetchable" #. TRANSLATORS: Document State Changed -#: locale/ipp-strings.c:2268 +#: locale/ipp-strings.c:2306 msgid "notify-events.document-state-changed" msgstr "Document State Changed" #. TRANSLATORS: Document Stopped -#: locale/ipp-strings.c:2270 +#: locale/ipp-strings.c:2308 msgid "notify-events.document-stopped" msgstr "Document Stopped" #. TRANSLATORS: Job Completed -#: locale/ipp-strings.c:2272 +#: locale/ipp-strings.c:2310 msgid "notify-events.job-completed" msgstr "Job Completed" #. TRANSLATORS: Job Config Changed -#: locale/ipp-strings.c:2274 +#: locale/ipp-strings.c:2312 msgid "notify-events.job-config-changed" msgstr "Job Config Changed" #. TRANSLATORS: Job Created -#: locale/ipp-strings.c:2276 +#: locale/ipp-strings.c:2314 msgid "notify-events.job-created" msgstr "Job Created" #. TRANSLATORS: Job Fetchable -#: locale/ipp-strings.c:2278 +#: locale/ipp-strings.c:2316 msgid "notify-events.job-fetchable" msgstr "Job Fetchable" #. TRANSLATORS: Job Progress -#: locale/ipp-strings.c:2280 +#: locale/ipp-strings.c:2318 msgid "notify-events.job-progress" msgstr "Job Progress" #. TRANSLATORS: Job State Changed -#: locale/ipp-strings.c:2282 +#: locale/ipp-strings.c:2320 msgid "notify-events.job-state-changed" msgstr "Job State Changed" #. TRANSLATORS: Job Stopped -#: locale/ipp-strings.c:2284 +#: locale/ipp-strings.c:2322 msgid "notify-events.job-stopped" msgstr "Job Stopped" #. TRANSLATORS: None -#: locale/ipp-strings.c:2286 +#: locale/ipp-strings.c:2324 msgid "notify-events.none" msgstr "None" #. TRANSLATORS: Printer Config Changed -#: locale/ipp-strings.c:2288 +#: locale/ipp-strings.c:2326 msgid "notify-events.printer-config-changed" msgstr "Printer Config Changed" #. TRANSLATORS: Printer Finishings Changed -#: locale/ipp-strings.c:2290 +#: locale/ipp-strings.c:2328 msgid "notify-events.printer-finishings-changed" msgstr "Printer Finishings Changed" #. TRANSLATORS: Printer Media Changed -#: locale/ipp-strings.c:2292 +#: locale/ipp-strings.c:2330 msgid "notify-events.printer-media-changed" msgstr "Printer Media Changed" #. TRANSLATORS: Printer Queue Order Changed -#: locale/ipp-strings.c:2294 +#: locale/ipp-strings.c:2332 msgid "notify-events.printer-queue-order-changed" msgstr "Printer Queue Order Changed" #. TRANSLATORS: Printer Restarted -#: locale/ipp-strings.c:2296 +#: locale/ipp-strings.c:2334 msgid "notify-events.printer-restarted" msgstr "Printer Restarted" #. TRANSLATORS: Printer Shutdown -#: locale/ipp-strings.c:2298 +#: locale/ipp-strings.c:2336 msgid "notify-events.printer-shutdown" msgstr "Printer Shutdown" #. TRANSLATORS: Printer State Changed -#: locale/ipp-strings.c:2300 +#: locale/ipp-strings.c:2338 msgid "notify-events.printer-state-changed" msgstr "Printer State Changed" #. TRANSLATORS: Printer Stopped -#: locale/ipp-strings.c:2302 +#: locale/ipp-strings.c:2340 msgid "notify-events.printer-stopped" msgstr "Printer Stopped" #. TRANSLATORS: Notify Get Interval -#: locale/ipp-strings.c:2304 +#: locale/ipp-strings.c:2342 msgid "notify-get-interval" msgstr "Notify Get Interval" #. TRANSLATORS: Notify Lease Duration -#: locale/ipp-strings.c:2306 +#: locale/ipp-strings.c:2344 msgid "notify-lease-duration" msgstr "Notify Lease Duration" #. TRANSLATORS: Notify Natural Language -#: locale/ipp-strings.c:2308 +#: locale/ipp-strings.c:2346 msgid "notify-natural-language" msgstr "Notify Natural Language" #. TRANSLATORS: Notify Pull Method -#: locale/ipp-strings.c:2310 +#: locale/ipp-strings.c:2348 msgid "notify-pull-method" msgstr "Notify Pull Method" #. TRANSLATORS: Notify Recipient -#: locale/ipp-strings.c:2312 +#: locale/ipp-strings.c:2350 msgid "notify-recipient-uri" msgstr "Notify Recipient" #. TRANSLATORS: Notify Sequence Numbers -#: locale/ipp-strings.c:2314 +#: locale/ipp-strings.c:2352 msgid "notify-sequence-numbers" msgstr "Notify Sequence Numbers" #. TRANSLATORS: Notify Subscription Ids -#: locale/ipp-strings.c:2316 +#: locale/ipp-strings.c:2354 msgid "notify-subscription-ids" msgstr "Notify Subscription Ids" #. TRANSLATORS: Notify Time Interval -#: locale/ipp-strings.c:2318 +#: locale/ipp-strings.c:2356 msgid "notify-time-interval" msgstr "Notify Time Interval" #. TRANSLATORS: Notify User Data -#: locale/ipp-strings.c:2320 +#: locale/ipp-strings.c:2358 msgid "notify-user-data" msgstr "Notify User Data" #. TRANSLATORS: Notify Wait -#: locale/ipp-strings.c:2322 +#: locale/ipp-strings.c:2360 msgid "notify-wait" msgstr "Notify Wait" #. TRANSLATORS: Number Of Retries -#: locale/ipp-strings.c:2324 +#: locale/ipp-strings.c:2362 msgid "number-of-retries" msgstr "Number Of Retries" #. TRANSLATORS: Number-Up -#: locale/ipp-strings.c:2326 +#: locale/ipp-strings.c:2364 msgid "number-up" msgstr "Number-Up" #. TRANSLATORS: Object Offset -#: locale/ipp-strings.c:2328 +#: locale/ipp-strings.c:2366 msgid "object-offset" msgstr "Object Offset" #. TRANSLATORS: Object Size -#: locale/ipp-strings.c:2330 +#: locale/ipp-strings.c:2368 msgid "object-size" msgstr "Object Size" #. TRANSLATORS: Organization Name -#: locale/ipp-strings.c:2332 +#: locale/ipp-strings.c:2370 msgid "organization-name" msgstr "Organization Name" #. TRANSLATORS: Orientation -#: locale/ipp-strings.c:2334 +#: locale/ipp-strings.c:2372 msgid "orientation-requested" msgstr "Orientation" #. TRANSLATORS: Portrait -#: locale/ipp-strings.c:2336 +#: locale/ipp-strings.c:2374 msgid "orientation-requested.3" msgstr "Portrait" #. TRANSLATORS: Landscape -#: locale/ipp-strings.c:2338 +#: locale/ipp-strings.c:2376 msgid "orientation-requested.4" msgstr "Landscape" #. TRANSLATORS: Reverse Landscape -#: locale/ipp-strings.c:2340 +#: locale/ipp-strings.c:2378 msgid "orientation-requested.5" msgstr "Reverse Landscape" #. TRANSLATORS: Reverse Portrait -#: locale/ipp-strings.c:2342 +#: locale/ipp-strings.c:2380 msgid "orientation-requested.6" msgstr "Reverse Portrait" #. TRANSLATORS: None -#: locale/ipp-strings.c:2344 +#: locale/ipp-strings.c:2382 msgid "orientation-requested.7" msgstr "None" #. TRANSLATORS: Scanned Image Options -#: locale/ipp-strings.c:2346 +#: locale/ipp-strings.c:2384 msgid "output-attributes" msgstr "Output Attributes" #. TRANSLATORS: Output Tray -#: locale/ipp-strings.c:2348 +#: locale/ipp-strings.c:2386 msgid "output-bin" msgstr "Output Bin" #. TRANSLATORS: Automatic -#: locale/ipp-strings.c:2350 +#: locale/ipp-strings.c:2388 msgid "output-bin.auto" msgstr "Automatic" #. TRANSLATORS: Bottom -#: locale/ipp-strings.c:2352 +#: locale/ipp-strings.c:2390 msgid "output-bin.bottom" msgstr "Bottom" #. TRANSLATORS: Center -#: locale/ipp-strings.c:2354 +#: locale/ipp-strings.c:2392 msgid "output-bin.center" msgstr "Center" #. TRANSLATORS: Face Down -#: locale/ipp-strings.c:2356 +#: locale/ipp-strings.c:2394 msgid "output-bin.face-down" msgstr "Face Down" #. TRANSLATORS: Face Up -#: locale/ipp-strings.c:2358 +#: locale/ipp-strings.c:2396 msgid "output-bin.face-up" msgstr "Face Up" #. TRANSLATORS: Large Capacity -#: locale/ipp-strings.c:2360 +#: locale/ipp-strings.c:2398 msgid "output-bin.large-capacity" msgstr "Large Capacity" #. TRANSLATORS: Left -#: locale/ipp-strings.c:2362 +#: locale/ipp-strings.c:2400 msgid "output-bin.left" msgstr "Left" #. TRANSLATORS: Mailbox 1 -#: locale/ipp-strings.c:2364 +#: locale/ipp-strings.c:2402 msgid "output-bin.mailbox-1" msgstr "Mailbox 1" #. TRANSLATORS: Mailbox 10 -#: locale/ipp-strings.c:2366 +#: locale/ipp-strings.c:2404 msgid "output-bin.mailbox-10" msgstr "Mailbox 10" #. TRANSLATORS: Mailbox 2 -#: locale/ipp-strings.c:2368 +#: locale/ipp-strings.c:2406 msgid "output-bin.mailbox-2" msgstr "Mailbox 2" #. TRANSLATORS: Mailbox 3 -#: locale/ipp-strings.c:2370 +#: locale/ipp-strings.c:2408 msgid "output-bin.mailbox-3" msgstr "Mailbox 3" #. TRANSLATORS: Mailbox 4 -#: locale/ipp-strings.c:2372 +#: locale/ipp-strings.c:2410 msgid "output-bin.mailbox-4" msgstr "Mailbox 4" #. TRANSLATORS: Mailbox 5 -#: locale/ipp-strings.c:2374 +#: locale/ipp-strings.c:2412 msgid "output-bin.mailbox-5" msgstr "Mailbox 5" #. TRANSLATORS: Mailbox 6 -#: locale/ipp-strings.c:2376 +#: locale/ipp-strings.c:2414 msgid "output-bin.mailbox-6" msgstr "Mailbox 6" #. TRANSLATORS: Mailbox 7 -#: locale/ipp-strings.c:2378 +#: locale/ipp-strings.c:2416 msgid "output-bin.mailbox-7" msgstr "Mailbox 7" #. TRANSLATORS: Mailbox 8 -#: locale/ipp-strings.c:2380 +#: locale/ipp-strings.c:2418 msgid "output-bin.mailbox-8" msgstr "Mailbox 8" #. TRANSLATORS: Mailbox 9 -#: locale/ipp-strings.c:2382 +#: locale/ipp-strings.c:2420 msgid "output-bin.mailbox-9" msgstr "Mailbox 9" #. TRANSLATORS: Middle -#: locale/ipp-strings.c:2384 +#: locale/ipp-strings.c:2422 msgid "output-bin.middle" msgstr "Middle" #. TRANSLATORS: My Mailbox -#: locale/ipp-strings.c:2386 +#: locale/ipp-strings.c:2424 msgid "output-bin.my-mailbox" msgstr "My Mailbox" #. TRANSLATORS: Rear -#: locale/ipp-strings.c:2388 +#: locale/ipp-strings.c:2426 msgid "output-bin.rear" msgstr "Rear" #. TRANSLATORS: Right -#: locale/ipp-strings.c:2390 +#: locale/ipp-strings.c:2428 msgid "output-bin.right" msgstr "Right" #. TRANSLATORS: Side -#: locale/ipp-strings.c:2392 +#: locale/ipp-strings.c:2430 msgid "output-bin.side" msgstr "Side" #. TRANSLATORS: Stacker 1 -#: locale/ipp-strings.c:2394 +#: locale/ipp-strings.c:2432 msgid "output-bin.stacker-1" msgstr "Stacker 1" #. TRANSLATORS: Stacker 10 -#: locale/ipp-strings.c:2396 +#: locale/ipp-strings.c:2434 msgid "output-bin.stacker-10" msgstr "Stacker 10" #. TRANSLATORS: Stacker 2 -#: locale/ipp-strings.c:2398 +#: locale/ipp-strings.c:2436 msgid "output-bin.stacker-2" msgstr "Stacker 2" #. TRANSLATORS: Stacker 3 -#: locale/ipp-strings.c:2400 +#: locale/ipp-strings.c:2438 msgid "output-bin.stacker-3" msgstr "Stacker 3" #. TRANSLATORS: Stacker 4 -#: locale/ipp-strings.c:2402 +#: locale/ipp-strings.c:2440 msgid "output-bin.stacker-4" msgstr "Stacker 4" #. TRANSLATORS: Stacker 5 -#: locale/ipp-strings.c:2404 +#: locale/ipp-strings.c:2442 msgid "output-bin.stacker-5" msgstr "Stacker 5" #. TRANSLATORS: Stacker 6 -#: locale/ipp-strings.c:2406 +#: locale/ipp-strings.c:2444 msgid "output-bin.stacker-6" msgstr "Stacker 6" #. TRANSLATORS: Stacker 7 -#: locale/ipp-strings.c:2408 +#: locale/ipp-strings.c:2446 msgid "output-bin.stacker-7" msgstr "Stacker 7" #. TRANSLATORS: Stacker 8 -#: locale/ipp-strings.c:2410 +#: locale/ipp-strings.c:2448 msgid "output-bin.stacker-8" msgstr "Stacker 8" #. TRANSLATORS: Stacker 9 -#: locale/ipp-strings.c:2412 +#: locale/ipp-strings.c:2450 msgid "output-bin.stacker-9" msgstr "Stacker 9" #. TRANSLATORS: Top -#: locale/ipp-strings.c:2414 +#: locale/ipp-strings.c:2452 msgid "output-bin.top" msgstr "Top" #. TRANSLATORS: Tray 1 -#: locale/ipp-strings.c:2416 +#: locale/ipp-strings.c:2454 msgid "output-bin.tray-1" msgstr "Tray 1" #. TRANSLATORS: Tray 10 -#: locale/ipp-strings.c:2418 +#: locale/ipp-strings.c:2456 msgid "output-bin.tray-10" msgstr "Tray 10" #. TRANSLATORS: Tray 2 -#: locale/ipp-strings.c:2420 +#: locale/ipp-strings.c:2458 msgid "output-bin.tray-2" msgstr "Tray 2" #. TRANSLATORS: Tray 3 -#: locale/ipp-strings.c:2422 +#: locale/ipp-strings.c:2460 msgid "output-bin.tray-3" msgstr "Tray 3" #. TRANSLATORS: Tray 4 -#: locale/ipp-strings.c:2424 +#: locale/ipp-strings.c:2462 msgid "output-bin.tray-4" msgstr "Tray 4" #. TRANSLATORS: Tray 5 -#: locale/ipp-strings.c:2426 +#: locale/ipp-strings.c:2464 msgid "output-bin.tray-5" msgstr "Tray 5" #. TRANSLATORS: Tray 6 -#: locale/ipp-strings.c:2428 +#: locale/ipp-strings.c:2466 msgid "output-bin.tray-6" msgstr "Tray 6" #. TRANSLATORS: Tray 7 -#: locale/ipp-strings.c:2430 +#: locale/ipp-strings.c:2468 msgid "output-bin.tray-7" msgstr "Tray 7" #. TRANSLATORS: Tray 8 -#: locale/ipp-strings.c:2432 +#: locale/ipp-strings.c:2470 msgid "output-bin.tray-8" msgstr "Tray 8" #. TRANSLATORS: Tray 9 -#: locale/ipp-strings.c:2434 +#: locale/ipp-strings.c:2472 msgid "output-bin.tray-9" msgstr "Tray 9" #. TRANSLATORS: Scanned Image Quality -#: locale/ipp-strings.c:2436 +#: locale/ipp-strings.c:2474 msgid "output-compression-quality-factor" msgstr "Scanned Image Quality" #. TRANSLATORS: Page Delivery -#: locale/ipp-strings.c:2438 +#: locale/ipp-strings.c:2476 msgid "page-delivery" msgstr "Page Delivery" #. TRANSLATORS: Reverse Order Face-down -#: locale/ipp-strings.c:2440 +#: locale/ipp-strings.c:2478 msgid "page-delivery.reverse-order-face-down" msgstr "Reverse Order Face Down" #. TRANSLATORS: Reverse Order Face-up -#: locale/ipp-strings.c:2442 +#: locale/ipp-strings.c:2480 msgid "page-delivery.reverse-order-face-up" msgstr "Reverse Order Face Up" #. TRANSLATORS: Same Order Face-down -#: locale/ipp-strings.c:2444 +#: locale/ipp-strings.c:2482 msgid "page-delivery.same-order-face-down" msgstr "Same Order Face Down" #. TRANSLATORS: Same Order Face-up -#: locale/ipp-strings.c:2446 +#: locale/ipp-strings.c:2484 msgid "page-delivery.same-order-face-up" msgstr "Same Order Face Up" #. TRANSLATORS: System Specified -#: locale/ipp-strings.c:2448 +#: locale/ipp-strings.c:2486 msgid "page-delivery.system-specified" msgstr "System Specified" #. TRANSLATORS: Page Order Received -#: locale/ipp-strings.c:2450 +#: locale/ipp-strings.c:2488 msgid "page-order-received" msgstr "Page Order Received" #. TRANSLATORS: 1 To N -#: locale/ipp-strings.c:2452 +#: locale/ipp-strings.c:2490 msgid "page-order-received.1-to-n-order" msgstr "1 To N Order" #. TRANSLATORS: N To 1 -#: locale/ipp-strings.c:2454 +#: locale/ipp-strings.c:2492 msgid "page-order-received.n-to-1-order" msgstr "N To 1 Order" #. TRANSLATORS: Page Ranges -#: locale/ipp-strings.c:2456 +#: locale/ipp-strings.c:2494 msgid "page-ranges" msgstr "Page Ranges" #. TRANSLATORS: Pages -#: locale/ipp-strings.c:2458 +#: locale/ipp-strings.c:2496 msgid "pages" msgstr "Pages" #. TRANSLATORS: Pages Per Subset -#: locale/ipp-strings.c:2460 +#: locale/ipp-strings.c:2498 msgid "pages-per-subset" msgstr "Pages Per Subset" #. TRANSLATORS: Platform Shape -#: locale/ipp-strings.c:2472 +#: locale/ipp-strings.c:2510 msgid "platform-shape" msgstr "Platform Shape" #. TRANSLATORS: Round -#: locale/ipp-strings.c:2474 +#: locale/ipp-strings.c:2512 msgid "platform-shape.ellipse" msgstr "Round" #. TRANSLATORS: Rectangle -#: locale/ipp-strings.c:2476 +#: locale/ipp-strings.c:2514 msgid "platform-shape.rectangle" msgstr "Rectangle" #. TRANSLATORS: Platform Temperature -#: locale/ipp-strings.c:2478 +#: locale/ipp-strings.c:2516 msgid "platform-temperature" msgstr "Platform Temperature" #. TRANSLATORS: Post-dial String -#: locale/ipp-strings.c:2480 +#: locale/ipp-strings.c:2518 msgid "post-dial-string" msgstr "Post-dial String" #. TRANSLATORS: Pre-dial String -#: locale/ipp-strings.c:2482 +#: locale/ipp-strings.c:2520 msgid "pre-dial-string" msgstr "Pre-dial String" #. TRANSLATORS: Number-Up Layout -#: locale/ipp-strings.c:2484 +#: locale/ipp-strings.c:2522 msgid "presentation-direction-number-up" msgstr "Number-Up Layout" #. TRANSLATORS: Top-bottom, Right-left -#: locale/ipp-strings.c:2486 +#: locale/ipp-strings.c:2524 msgid "presentation-direction-number-up.tobottom-toleft" msgstr "Top-Bottom, Right-Left" #. TRANSLATORS: Top-bottom, Left-right -#: locale/ipp-strings.c:2488 +#: locale/ipp-strings.c:2526 msgid "presentation-direction-number-up.tobottom-toright" msgstr "Top-Bottom, Left-Right" #. TRANSLATORS: Right-left, Top-bottom -#: locale/ipp-strings.c:2490 +#: locale/ipp-strings.c:2528 msgid "presentation-direction-number-up.toleft-tobottom" msgstr "Right-Left, Top-Bottom" #. TRANSLATORS: Right-left, Bottom-top -#: locale/ipp-strings.c:2492 +#: locale/ipp-strings.c:2530 msgid "presentation-direction-number-up.toleft-totop" msgstr "Right-Left, Bottom-Top" #. TRANSLATORS: Left-right, Top-bottom -#: locale/ipp-strings.c:2494 +#: locale/ipp-strings.c:2532 msgid "presentation-direction-number-up.toright-tobottom" msgstr "Left-Right, Top-Bottom" #. TRANSLATORS: Left-right, Bottom-top -#: locale/ipp-strings.c:2496 +#: locale/ipp-strings.c:2534 msgid "presentation-direction-number-up.toright-totop" msgstr "Left-Right, Bottom-Top" #. TRANSLATORS: Bottom-top, Right-left -#: locale/ipp-strings.c:2498 +#: locale/ipp-strings.c:2536 msgid "presentation-direction-number-up.totop-toleft" msgstr "Bottom-Top, Right-Left" #. TRANSLATORS: Bottom-top, Left-right -#: locale/ipp-strings.c:2500 +#: locale/ipp-strings.c:2538 msgid "presentation-direction-number-up.totop-toright" msgstr "Bottom-Top, Left-Right" #. TRANSLATORS: Print Accuracy -#: locale/ipp-strings.c:2502 +#: locale/ipp-strings.c:2540 msgid "print-accuracy" msgstr "Print Accuracy" #. TRANSLATORS: Print Base -#: locale/ipp-strings.c:2504 +#: locale/ipp-strings.c:2542 msgid "print-base" msgstr "Print Base" #. TRANSLATORS: Brim -#: locale/ipp-strings.c:2508 +#: locale/ipp-strings.c:2546 msgid "print-base.brim" msgstr "Brim" #. TRANSLATORS: None -#: locale/ipp-strings.c:2510 +#: locale/ipp-strings.c:2548 msgid "print-base.none" msgstr "None" #. TRANSLATORS: Raft -#: locale/ipp-strings.c:2512 +#: locale/ipp-strings.c:2550 msgid "print-base.raft" msgstr "Raft" #. TRANSLATORS: Skirt -#: locale/ipp-strings.c:2514 +#: locale/ipp-strings.c:2552 msgid "print-base.skirt" msgstr "Skirt" #. TRANSLATORS: Standard -#: locale/ipp-strings.c:2516 +#: locale/ipp-strings.c:2554 msgid "print-base.standard" msgstr "Standard" #. TRANSLATORS: Print Color Mode -#: locale/ipp-strings.c:2518 +#: locale/ipp-strings.c:2556 msgid "print-color-mode" msgstr "Print Color Mode" #. TRANSLATORS: Automatic -#: locale/ipp-strings.c:2520 +#: locale/ipp-strings.c:2558 msgid "print-color-mode.auto" msgstr "Automatic" #. TRANSLATORS: Text -#: locale/ipp-strings.c:2524 +#: locale/ipp-strings.c:2562 msgid "print-color-mode.bi-level" msgstr "Bi-Level" #. TRANSLATORS: Color -#: locale/ipp-strings.c:2526 +#: locale/ipp-strings.c:2564 msgid "print-color-mode.color" msgstr "Color" #. TRANSLATORS: Highlight -#: locale/ipp-strings.c:2528 +#: locale/ipp-strings.c:2566 msgid "print-color-mode.highlight" msgstr "Highlight" #. TRANSLATORS: Monochrome -#: locale/ipp-strings.c:2530 +#: locale/ipp-strings.c:2568 msgid "print-color-mode.monochrome" msgstr "Monochrome" #. TRANSLATORS: Process Text -#: locale/ipp-strings.c:2532 +#: locale/ipp-strings.c:2570 msgid "print-color-mode.process-bi-level" msgstr "Process Bi-Level" #. TRANSLATORS: Process Monochrome -#: locale/ipp-strings.c:2534 +#: locale/ipp-strings.c:2572 msgid "print-color-mode.process-monochrome" msgstr "Process Monochrome" #. TRANSLATORS: Print Optimization -#: locale/ipp-strings.c:2536 +#: locale/ipp-strings.c:2574 msgid "print-content-optimize" msgstr "Print Optimization" #. TRANSLATORS: Automatic -#: locale/ipp-strings.c:2540 +#: locale/ipp-strings.c:2578 msgid "print-content-optimize.auto" msgstr "Automatic" #. TRANSLATORS: Graphics -#: locale/ipp-strings.c:2542 +#: locale/ipp-strings.c:2580 msgid "print-content-optimize.graphic" msgstr "Graphics" #. TRANSLATORS: Photo -#: locale/ipp-strings.c:2546 +#: locale/ipp-strings.c:2584 msgid "print-content-optimize.photo" msgstr "Photo" #. TRANSLATORS: Text -#: locale/ipp-strings.c:2548 +#: locale/ipp-strings.c:2586 msgid "print-content-optimize.text" msgstr "Text" #. TRANSLATORS: Text and Graphics -#: locale/ipp-strings.c:2550 +#: locale/ipp-strings.c:2588 msgid "print-content-optimize.text-and-graphic" msgstr "Text And Graphics" #. TRANSLATORS: Print Objects -#: locale/ipp-strings.c:2554 +#: locale/ipp-strings.c:2592 msgid "print-objects" msgstr "Print Objects" #. TRANSLATORS: Print Quality -#: locale/ipp-strings.c:2556 +#: locale/ipp-strings.c:2594 msgid "print-quality" msgstr "Print Quality" #. TRANSLATORS: Draft -#: locale/ipp-strings.c:2558 +#: locale/ipp-strings.c:2596 msgid "print-quality.3" msgstr "Draft" #. TRANSLATORS: Normal -#: locale/ipp-strings.c:2560 +#: locale/ipp-strings.c:2598 msgid "print-quality.4" msgstr "Normal" #. TRANSLATORS: High -#: locale/ipp-strings.c:2562 +#: locale/ipp-strings.c:2600 msgid "print-quality.5" msgstr "High" #. TRANSLATORS: Print Rendering Intent -#: locale/ipp-strings.c:2564 +#: locale/ipp-strings.c:2602 msgid "print-rendering-intent" msgstr "Print Rendering Intent" #. TRANSLATORS: Absolute -#: locale/ipp-strings.c:2566 +#: locale/ipp-strings.c:2604 msgid "print-rendering-intent.absolute" msgstr "Absolute" #. TRANSLATORS: Automatic -#: locale/ipp-strings.c:2568 +#: locale/ipp-strings.c:2606 msgid "print-rendering-intent.auto" msgstr "Automatic" #. TRANSLATORS: Perceptual -#: locale/ipp-strings.c:2570 +#: locale/ipp-strings.c:2608 msgid "print-rendering-intent.perceptual" msgstr "Perceptual" #. TRANSLATORS: Relative -#: locale/ipp-strings.c:2572 +#: locale/ipp-strings.c:2610 msgid "print-rendering-intent.relative" msgstr "Relative" #. TRANSLATORS: Relative w/Black Point Compensation -#: locale/ipp-strings.c:2574 +#: locale/ipp-strings.c:2612 msgid "print-rendering-intent.relative-bpc" msgstr "Relative w/Black Point Compensation" #. TRANSLATORS: Saturation -#: locale/ipp-strings.c:2576 +#: locale/ipp-strings.c:2614 msgid "print-rendering-intent.saturation" msgstr "Saturation" #. TRANSLATORS: Print Scaling -#: locale/ipp-strings.c:2578 +#: locale/ipp-strings.c:2616 msgid "print-scaling" msgstr "Print Scaling" #. TRANSLATORS: Automatic -#: locale/ipp-strings.c:2580 +#: locale/ipp-strings.c:2618 msgid "print-scaling.auto" msgstr "Automatic" #. TRANSLATORS: Auto-fit -#: locale/ipp-strings.c:2582 +#: locale/ipp-strings.c:2620 msgid "print-scaling.auto-fit" msgstr "Auto Fit" #. TRANSLATORS: Fill -#: locale/ipp-strings.c:2584 +#: locale/ipp-strings.c:2622 msgid "print-scaling.fill" msgstr "Fill" #. TRANSLATORS: Fit -#: locale/ipp-strings.c:2586 +#: locale/ipp-strings.c:2624 msgid "print-scaling.fit" msgstr "Fit" #. TRANSLATORS: None -#: locale/ipp-strings.c:2588 +#: locale/ipp-strings.c:2626 msgid "print-scaling.none" msgstr "None" #. TRANSLATORS: Print Supports -#: locale/ipp-strings.c:2590 +#: locale/ipp-strings.c:2628 msgid "print-supports" msgstr "Print Supports" #. TRANSLATORS: With Specified Material -#: locale/ipp-strings.c:2594 +#: locale/ipp-strings.c:2632 msgid "print-supports.material" msgstr "Material" #. TRANSLATORS: None -#: locale/ipp-strings.c:2596 +#: locale/ipp-strings.c:2634 msgid "print-supports.none" msgstr "None" #. TRANSLATORS: Standard -#: locale/ipp-strings.c:2598 +#: locale/ipp-strings.c:2636 msgid "print-supports.standard" msgstr "Standard" #. TRANSLATORS: Message From Operator -#: locale/ipp-strings.c:2620 +#: locale/ipp-strings.c:2658 msgid "printer-message-from-operator" msgstr "Printer Message From Operator" #. TRANSLATORS: Print Resolution -#: locale/ipp-strings.c:2622 +#: locale/ipp-strings.c:2660 msgid "printer-resolution" msgstr "Printer Resolution" #. TRANSLATORS: Printer State -#: locale/ipp-strings.c:2624 +#: locale/ipp-strings.c:2662 msgid "printer-state" msgstr "Printer State" #. TRANSLATORS: Detailed Printer State -#: locale/ipp-strings.c:2626 +#: locale/ipp-strings.c:2664 msgid "printer-state-reasons" msgstr "Detailed Printer State" #. TRANSLATORS: Old Alerts Have Been Removed -#: locale/ipp-strings.c:2628 +#: locale/ipp-strings.c:2666 msgid "printer-state-reasons.alert-removal-of-binary-change-entry" msgstr "Alert Removal Of Binary Change Entry" #. TRANSLATORS: Bander Added -#: locale/ipp-strings.c:2630 +#: locale/ipp-strings.c:2668 msgid "printer-state-reasons.bander-added" msgstr "Bander Added" #. TRANSLATORS: Bander Almost Empty -#: locale/ipp-strings.c:2632 +#: locale/ipp-strings.c:2670 msgid "printer-state-reasons.bander-almost-empty" msgstr "Bander Almost Empty" #. TRANSLATORS: Bander Almost Full -#: locale/ipp-strings.c:2634 +#: locale/ipp-strings.c:2672 msgid "printer-state-reasons.bander-almost-full" msgstr "Bander Almost Full" #. TRANSLATORS: Bander At Limit -#: locale/ipp-strings.c:2636 +#: locale/ipp-strings.c:2674 msgid "printer-state-reasons.bander-at-limit" msgstr "Bander At Limit" #. TRANSLATORS: Bander Closed -#: locale/ipp-strings.c:2638 +#: locale/ipp-strings.c:2676 msgid "printer-state-reasons.bander-closed" msgstr "Bander Closed" #. TRANSLATORS: Bander Configuration Change -#: locale/ipp-strings.c:2640 +#: locale/ipp-strings.c:2678 msgid "printer-state-reasons.bander-configuration-change" msgstr "Bander Configuration Change" #. TRANSLATORS: Bander Cover Closed -#: locale/ipp-strings.c:2642 +#: locale/ipp-strings.c:2680 msgid "printer-state-reasons.bander-cover-closed" msgstr "Bander Cover Closed" #. TRANSLATORS: Bander Cover Open -#: locale/ipp-strings.c:2644 +#: locale/ipp-strings.c:2682 msgid "printer-state-reasons.bander-cover-open" msgstr "Bander Cover Open" #. TRANSLATORS: Bander Empty -#: locale/ipp-strings.c:2646 +#: locale/ipp-strings.c:2684 msgid "printer-state-reasons.bander-empty" msgstr "Bander Empty" #. TRANSLATORS: Bander Full -#: locale/ipp-strings.c:2648 +#: locale/ipp-strings.c:2686 msgid "printer-state-reasons.bander-full" msgstr "Bander Full" #. TRANSLATORS: Bander Interlock Closed -#: locale/ipp-strings.c:2650 +#: locale/ipp-strings.c:2688 msgid "printer-state-reasons.bander-interlock-closed" msgstr "Bander Interlock Closed" #. TRANSLATORS: Bander Interlock Open -#: locale/ipp-strings.c:2652 +#: locale/ipp-strings.c:2690 msgid "printer-state-reasons.bander-interlock-open" msgstr "Bander Interlock Open" #. TRANSLATORS: Bander Jam -#: locale/ipp-strings.c:2654 +#: locale/ipp-strings.c:2692 msgid "printer-state-reasons.bander-jam" msgstr "Bander Jam" #. TRANSLATORS: Bander Life Almost Over -#: locale/ipp-strings.c:2656 +#: locale/ipp-strings.c:2694 msgid "printer-state-reasons.bander-life-almost-over" msgstr "Bander Life Almost Over" #. TRANSLATORS: Bander Life Over -#: locale/ipp-strings.c:2658 +#: locale/ipp-strings.c:2696 msgid "printer-state-reasons.bander-life-over" msgstr "Bander Life Over" #. TRANSLATORS: Bander Memory Exhausted -#: locale/ipp-strings.c:2660 +#: locale/ipp-strings.c:2698 msgid "printer-state-reasons.bander-memory-exhausted" msgstr "Bander Memory Exhausted" #. TRANSLATORS: Bander Missing -#: locale/ipp-strings.c:2662 +#: locale/ipp-strings.c:2700 msgid "printer-state-reasons.bander-missing" msgstr "Bander Missing" #. TRANSLATORS: Bander Motor Failure -#: locale/ipp-strings.c:2664 +#: locale/ipp-strings.c:2702 msgid "printer-state-reasons.bander-motor-failure" msgstr "Bander Motor Failure" #. TRANSLATORS: Bander Near Limit -#: locale/ipp-strings.c:2666 +#: locale/ipp-strings.c:2704 msgid "printer-state-reasons.bander-near-limit" msgstr "Bander Near Limit" #. TRANSLATORS: Bander Offline -#: locale/ipp-strings.c:2668 +#: locale/ipp-strings.c:2706 msgid "printer-state-reasons.bander-offline" msgstr "Bander Offline" #. TRANSLATORS: Bander Opened -#: locale/ipp-strings.c:2670 +#: locale/ipp-strings.c:2708 msgid "printer-state-reasons.bander-opened" msgstr "Bander Opened" #. TRANSLATORS: Bander Over Temperature -#: locale/ipp-strings.c:2672 +#: locale/ipp-strings.c:2710 msgid "printer-state-reasons.bander-over-temperature" msgstr "Bander Over Temperature" #. TRANSLATORS: Bander Power Saver -#: locale/ipp-strings.c:2674 +#: locale/ipp-strings.c:2712 msgid "printer-state-reasons.bander-power-saver" msgstr "Bander Power Saver" #. TRANSLATORS: Bander Recoverable Failure -#: locale/ipp-strings.c:2676 +#: locale/ipp-strings.c:2714 msgid "printer-state-reasons.bander-recoverable-failure" msgstr "Bander Recoverable Failure" #. TRANSLATORS: Bander Recoverable Storage -#: locale/ipp-strings.c:2678 +#: locale/ipp-strings.c:2716 msgid "printer-state-reasons.bander-recoverable-storage" msgstr "Bander Recoverable Storage" #. TRANSLATORS: Bander Removed -#: locale/ipp-strings.c:2680 +#: locale/ipp-strings.c:2718 msgid "printer-state-reasons.bander-removed" msgstr "Bander Removed" #. TRANSLATORS: Bander Resource Added -#: locale/ipp-strings.c:2682 +#: locale/ipp-strings.c:2720 msgid "printer-state-reasons.bander-resource-added" msgstr "Bander Resource Added" #. TRANSLATORS: Bander Resource Removed -#: locale/ipp-strings.c:2684 +#: locale/ipp-strings.c:2722 msgid "printer-state-reasons.bander-resource-removed" msgstr "Bander Resource Removed" #. TRANSLATORS: Bander Thermistor Failure -#: locale/ipp-strings.c:2686 +#: locale/ipp-strings.c:2724 msgid "printer-state-reasons.bander-thermistor-failure" msgstr "Bander Thermistor Failure" #. TRANSLATORS: Bander Timing Failure -#: locale/ipp-strings.c:2688 +#: locale/ipp-strings.c:2726 msgid "printer-state-reasons.bander-timing-failure" msgstr "Bander Timing Failure" #. TRANSLATORS: Bander Turned Off -#: locale/ipp-strings.c:2690 +#: locale/ipp-strings.c:2728 msgid "printer-state-reasons.bander-turned-off" msgstr "Bander Turned Off" #. TRANSLATORS: Bander Turned On -#: locale/ipp-strings.c:2692 +#: locale/ipp-strings.c:2730 msgid "printer-state-reasons.bander-turned-on" msgstr "Bander Turned On" #. TRANSLATORS: Bander Under Temperature -#: locale/ipp-strings.c:2694 +#: locale/ipp-strings.c:2732 msgid "printer-state-reasons.bander-under-temperature" msgstr "Bander Under Temperature" #. TRANSLATORS: Bander Unrecoverable Failure -#: locale/ipp-strings.c:2696 +#: locale/ipp-strings.c:2734 msgid "printer-state-reasons.bander-unrecoverable-failure" msgstr "Bander Unrecoverable Failure" #. TRANSLATORS: Bander Unrecoverable Storage Error -#: locale/ipp-strings.c:2698 +#: locale/ipp-strings.c:2736 msgid "printer-state-reasons.bander-unrecoverable-storage-error" msgstr "Bander Unrecoverable Storage Error" #. TRANSLATORS: Bander Warming Up -#: locale/ipp-strings.c:2700 +#: locale/ipp-strings.c:2738 msgid "printer-state-reasons.bander-warming-up" msgstr "Bander Warming Up" #. TRANSLATORS: Binder Added -#: locale/ipp-strings.c:2702 +#: locale/ipp-strings.c:2740 msgid "printer-state-reasons.binder-added" msgstr "Binder Added" #. TRANSLATORS: Binder Almost Empty -#: locale/ipp-strings.c:2704 +#: locale/ipp-strings.c:2742 msgid "printer-state-reasons.binder-almost-empty" msgstr "Binder Almost Empty" #. TRANSLATORS: Binder Almost Full -#: locale/ipp-strings.c:2706 +#: locale/ipp-strings.c:2744 msgid "printer-state-reasons.binder-almost-full" msgstr "Binder Almost Full" #. TRANSLATORS: Binder At Limit -#: locale/ipp-strings.c:2708 +#: locale/ipp-strings.c:2746 msgid "printer-state-reasons.binder-at-limit" msgstr "Binder At Limit" #. TRANSLATORS: Binder Closed -#: locale/ipp-strings.c:2710 +#: locale/ipp-strings.c:2748 msgid "printer-state-reasons.binder-closed" msgstr "Binder Closed" #. TRANSLATORS: Binder Configuration Change -#: locale/ipp-strings.c:2712 +#: locale/ipp-strings.c:2750 msgid "printer-state-reasons.binder-configuration-change" msgstr "Binder Configuration Change" #. TRANSLATORS: Binder Cover Closed -#: locale/ipp-strings.c:2714 +#: locale/ipp-strings.c:2752 msgid "printer-state-reasons.binder-cover-closed" msgstr "Binder Cover Closed" #. TRANSLATORS: Binder Cover Open -#: locale/ipp-strings.c:2716 +#: locale/ipp-strings.c:2754 msgid "printer-state-reasons.binder-cover-open" msgstr "Binder Cover Open" #. TRANSLATORS: Binder Empty -#: locale/ipp-strings.c:2718 +#: locale/ipp-strings.c:2756 msgid "printer-state-reasons.binder-empty" msgstr "Binder Empty" #. TRANSLATORS: Binder Full -#: locale/ipp-strings.c:2720 +#: locale/ipp-strings.c:2758 msgid "printer-state-reasons.binder-full" msgstr "Binder Full" #. TRANSLATORS: Binder Interlock Closed -#: locale/ipp-strings.c:2722 +#: locale/ipp-strings.c:2760 msgid "printer-state-reasons.binder-interlock-closed" msgstr "Binder Interlock Closed" #. TRANSLATORS: Binder Interlock Open -#: locale/ipp-strings.c:2724 +#: locale/ipp-strings.c:2762 msgid "printer-state-reasons.binder-interlock-open" msgstr "Binder Interlock Open" #. TRANSLATORS: Binder Jam -#: locale/ipp-strings.c:2726 +#: locale/ipp-strings.c:2764 msgid "printer-state-reasons.binder-jam" msgstr "Binder Jam" #. TRANSLATORS: Binder Life Almost Over -#: locale/ipp-strings.c:2728 +#: locale/ipp-strings.c:2766 msgid "printer-state-reasons.binder-life-almost-over" msgstr "Binder Life Almost Over" #. TRANSLATORS: Binder Life Over -#: locale/ipp-strings.c:2730 +#: locale/ipp-strings.c:2768 msgid "printer-state-reasons.binder-life-over" msgstr "Binder Life Over" #. TRANSLATORS: Binder Memory Exhausted -#: locale/ipp-strings.c:2732 +#: locale/ipp-strings.c:2770 msgid "printer-state-reasons.binder-memory-exhausted" msgstr "Binder Memory Exhausted" #. TRANSLATORS: Binder Missing -#: locale/ipp-strings.c:2734 +#: locale/ipp-strings.c:2772 msgid "printer-state-reasons.binder-missing" msgstr "Binder Missing" #. TRANSLATORS: Binder Motor Failure -#: locale/ipp-strings.c:2736 +#: locale/ipp-strings.c:2774 msgid "printer-state-reasons.binder-motor-failure" msgstr "Binder Motor Failure" #. TRANSLATORS: Binder Near Limit -#: locale/ipp-strings.c:2738 +#: locale/ipp-strings.c:2776 msgid "printer-state-reasons.binder-near-limit" msgstr "Binder Near Limit" #. TRANSLATORS: Binder Offline -#: locale/ipp-strings.c:2740 +#: locale/ipp-strings.c:2778 msgid "printer-state-reasons.binder-offline" msgstr "Binder Offline" #. TRANSLATORS: Binder Opened -#: locale/ipp-strings.c:2742 +#: locale/ipp-strings.c:2780 msgid "printer-state-reasons.binder-opened" msgstr "Binder Opened" #. TRANSLATORS: Binder Over Temperature -#: locale/ipp-strings.c:2744 +#: locale/ipp-strings.c:2782 msgid "printer-state-reasons.binder-over-temperature" msgstr "Binder Over Temperature" #. TRANSLATORS: Binder Power Saver -#: locale/ipp-strings.c:2746 +#: locale/ipp-strings.c:2784 msgid "printer-state-reasons.binder-power-saver" msgstr "Binder Power Saver" #. TRANSLATORS: Binder Recoverable Failure -#: locale/ipp-strings.c:2748 +#: locale/ipp-strings.c:2786 msgid "printer-state-reasons.binder-recoverable-failure" msgstr "Binder Recoverable Failure" #. TRANSLATORS: Binder Recoverable Storage -#: locale/ipp-strings.c:2750 +#: locale/ipp-strings.c:2788 msgid "printer-state-reasons.binder-recoverable-storage" msgstr "Binder Recoverable Storage" #. TRANSLATORS: Binder Removed -#: locale/ipp-strings.c:2752 +#: locale/ipp-strings.c:2790 msgid "printer-state-reasons.binder-removed" msgstr "Binder Removed" #. TRANSLATORS: Binder Resource Added -#: locale/ipp-strings.c:2754 +#: locale/ipp-strings.c:2792 msgid "printer-state-reasons.binder-resource-added" msgstr "Binder Resource Added" #. TRANSLATORS: Binder Resource Removed -#: locale/ipp-strings.c:2756 +#: locale/ipp-strings.c:2794 msgid "printer-state-reasons.binder-resource-removed" msgstr "Binder Resource Removed" #. TRANSLATORS: Binder Thermistor Failure -#: locale/ipp-strings.c:2758 +#: locale/ipp-strings.c:2796 msgid "printer-state-reasons.binder-thermistor-failure" msgstr "Binder Thermistor Failure" #. TRANSLATORS: Binder Timing Failure -#: locale/ipp-strings.c:2760 +#: locale/ipp-strings.c:2798 msgid "printer-state-reasons.binder-timing-failure" msgstr "Binder Timing Failure" #. TRANSLATORS: Binder Turned Off -#: locale/ipp-strings.c:2762 +#: locale/ipp-strings.c:2800 msgid "printer-state-reasons.binder-turned-off" msgstr "Binder Turned Off" #. TRANSLATORS: Binder Turned On -#: locale/ipp-strings.c:2764 +#: locale/ipp-strings.c:2802 msgid "printer-state-reasons.binder-turned-on" msgstr "Binder Turned On" #. TRANSLATORS: Binder Under Temperature -#: locale/ipp-strings.c:2766 +#: locale/ipp-strings.c:2804 msgid "printer-state-reasons.binder-under-temperature" msgstr "Binder Under Temperature" #. TRANSLATORS: Binder Unrecoverable Failure -#: locale/ipp-strings.c:2768 +#: locale/ipp-strings.c:2806 msgid "printer-state-reasons.binder-unrecoverable-failure" msgstr "Binder Unrecoverable Failure" #. TRANSLATORS: Binder Unrecoverable Storage Error -#: locale/ipp-strings.c:2770 +#: locale/ipp-strings.c:2808 msgid "printer-state-reasons.binder-unrecoverable-storage-error" msgstr "Binder Unrecoverable Storage Error" #. TRANSLATORS: Binder Warming Up -#: locale/ipp-strings.c:2772 +#: locale/ipp-strings.c:2810 msgid "printer-state-reasons.binder-warming-up" msgstr "Binder Warming Up" #. TRANSLATORS: Camera Failure -#: locale/ipp-strings.c:2774 +#: locale/ipp-strings.c:2812 msgid "printer-state-reasons.camera-failure" msgstr "Camera Failure" #. TRANSLATORS: Chamber Cooling -#: locale/ipp-strings.c:2776 +#: locale/ipp-strings.c:2814 msgid "printer-state-reasons.chamber-cooling" msgstr "Chamber Cooling" #. TRANSLATORS: Chamber Heating -#: locale/ipp-strings.c:2780 +#: locale/ipp-strings.c:2818 msgid "printer-state-reasons.chamber-heating" msgstr "Chamber Heating" #. TRANSLATORS: Chamber Temperature High -#: locale/ipp-strings.c:2782 +#: locale/ipp-strings.c:2820 msgid "printer-state-reasons.chamber-temperature-high" msgstr "Chamber Temperature High" #. TRANSLATORS: Chamber Temperature Low -#: locale/ipp-strings.c:2784 +#: locale/ipp-strings.c:2822 msgid "printer-state-reasons.chamber-temperature-low" msgstr "Chamber Temperature Low" #. TRANSLATORS: Cleaner Life Almost Over -#: locale/ipp-strings.c:2786 +#: locale/ipp-strings.c:2824 msgid "printer-state-reasons.cleaner-life-almost-over" msgstr "Cleaner Life Almost Over" #. TRANSLATORS: Cleaner Life Over -#: locale/ipp-strings.c:2788 +#: locale/ipp-strings.c:2826 msgid "printer-state-reasons.cleaner-life-over" msgstr "Cleaner Life Over" #. TRANSLATORS: Configuration Change -#: locale/ipp-strings.c:2790 +#: locale/ipp-strings.c:2828 msgid "printer-state-reasons.configuration-change" msgstr "Configuration Change" #. TRANSLATORS: Connecting To Device -#: locale/ipp-strings.c:2792 +#: locale/ipp-strings.c:2830 msgid "printer-state-reasons.connecting-to-device" msgstr "Connecting To Device" #. TRANSLATORS: Cover Open -#: locale/ipp-strings.c:2794 +#: locale/ipp-strings.c:2832 msgid "printer-state-reasons.cover-open" msgstr "Cover Open" #. TRANSLATORS: Deactivated -#: locale/ipp-strings.c:2796 +#: locale/ipp-strings.c:2834 msgid "printer-state-reasons.deactivated" msgstr "Deactivated" #. TRANSLATORS: Developer Empty -#: locale/ipp-strings.c:2798 +#: locale/ipp-strings.c:2836 msgid "printer-state-reasons.developer-empty" msgstr "Developer Empty" #. TRANSLATORS: Developer Low -#: locale/ipp-strings.c:2800 +#: locale/ipp-strings.c:2838 msgid "printer-state-reasons.developer-low" msgstr "Developer Low" #. TRANSLATORS: Die Cutter Added -#: locale/ipp-strings.c:2802 +#: locale/ipp-strings.c:2840 msgid "printer-state-reasons.die-cutter-added" msgstr "Die Cutter Added" #. TRANSLATORS: Die Cutter Almost Empty -#: locale/ipp-strings.c:2804 +#: locale/ipp-strings.c:2842 msgid "printer-state-reasons.die-cutter-almost-empty" msgstr "Die Cutter Almost Empty" #. TRANSLATORS: Die Cutter Almost Full -#: locale/ipp-strings.c:2806 +#: locale/ipp-strings.c:2844 msgid "printer-state-reasons.die-cutter-almost-full" msgstr "Die Cutter Almost Full" #. TRANSLATORS: Die Cutter At Limit -#: locale/ipp-strings.c:2808 +#: locale/ipp-strings.c:2846 msgid "printer-state-reasons.die-cutter-at-limit" msgstr "Die Cutter At Limit" #. TRANSLATORS: Die Cutter Closed -#: locale/ipp-strings.c:2810 +#: locale/ipp-strings.c:2848 msgid "printer-state-reasons.die-cutter-closed" msgstr "Die Cutter Closed" #. TRANSLATORS: Die Cutter Configuration Change -#: locale/ipp-strings.c:2812 +#: locale/ipp-strings.c:2850 msgid "printer-state-reasons.die-cutter-configuration-change" msgstr "Die Cutter Configuration Change" #. TRANSLATORS: Die Cutter Cover Closed -#: locale/ipp-strings.c:2814 +#: locale/ipp-strings.c:2852 msgid "printer-state-reasons.die-cutter-cover-closed" msgstr "Die Cutter Cover Closed" #. TRANSLATORS: Die Cutter Cover Open -#: locale/ipp-strings.c:2816 +#: locale/ipp-strings.c:2854 msgid "printer-state-reasons.die-cutter-cover-open" msgstr "Die Cutter Cover Open" #. TRANSLATORS: Die Cutter Empty -#: locale/ipp-strings.c:2818 +#: locale/ipp-strings.c:2856 msgid "printer-state-reasons.die-cutter-empty" msgstr "Die Cutter Empty" #. TRANSLATORS: Die Cutter Full -#: locale/ipp-strings.c:2820 +#: locale/ipp-strings.c:2858 msgid "printer-state-reasons.die-cutter-full" msgstr "Die Cutter Full" #. TRANSLATORS: Die Cutter Interlock Closed -#: locale/ipp-strings.c:2822 +#: locale/ipp-strings.c:2860 msgid "printer-state-reasons.die-cutter-interlock-closed" msgstr "Die Cutter Interlock Closed" #. TRANSLATORS: Die Cutter Interlock Open -#: locale/ipp-strings.c:2824 +#: locale/ipp-strings.c:2862 msgid "printer-state-reasons.die-cutter-interlock-open" msgstr "Die Cutter Interlock Open" #. TRANSLATORS: Die Cutter Jam -#: locale/ipp-strings.c:2826 +#: locale/ipp-strings.c:2864 msgid "printer-state-reasons.die-cutter-jam" msgstr "Die Cutter Jam" #. TRANSLATORS: Die Cutter Life Almost Over -#: locale/ipp-strings.c:2828 +#: locale/ipp-strings.c:2866 msgid "printer-state-reasons.die-cutter-life-almost-over" msgstr "Die Cutter Life Almost Over" #. TRANSLATORS: Die Cutter Life Over -#: locale/ipp-strings.c:2830 +#: locale/ipp-strings.c:2868 msgid "printer-state-reasons.die-cutter-life-over" msgstr "Die Cutter Life Over" #. TRANSLATORS: Die Cutter Memory Exhausted -#: locale/ipp-strings.c:2832 +#: locale/ipp-strings.c:2870 msgid "printer-state-reasons.die-cutter-memory-exhausted" msgstr "Die Cutter Memory Exhausted" #. TRANSLATORS: Die Cutter Missing -#: locale/ipp-strings.c:2834 +#: locale/ipp-strings.c:2872 msgid "printer-state-reasons.die-cutter-missing" msgstr "Die Cutter Missing" #. TRANSLATORS: Die Cutter Motor Failure -#: locale/ipp-strings.c:2836 +#: locale/ipp-strings.c:2874 msgid "printer-state-reasons.die-cutter-motor-failure" msgstr "Die Cutter Motor Failure" #. TRANSLATORS: Die Cutter Near Limit -#: locale/ipp-strings.c:2838 +#: locale/ipp-strings.c:2876 msgid "printer-state-reasons.die-cutter-near-limit" msgstr "Die Cutter Near Limit" #. TRANSLATORS: Die Cutter Offline -#: locale/ipp-strings.c:2840 +#: locale/ipp-strings.c:2878 msgid "printer-state-reasons.die-cutter-offline" msgstr "Die Cutter Offline" #. TRANSLATORS: Die Cutter Opened -#: locale/ipp-strings.c:2842 +#: locale/ipp-strings.c:2880 msgid "printer-state-reasons.die-cutter-opened" msgstr "Die Cutter Opened" #. TRANSLATORS: Die Cutter Over Temperature -#: locale/ipp-strings.c:2844 +#: locale/ipp-strings.c:2882 msgid "printer-state-reasons.die-cutter-over-temperature" msgstr "Die Cutter Over Temperature" #. TRANSLATORS: Die Cutter Power Saver -#: locale/ipp-strings.c:2846 +#: locale/ipp-strings.c:2884 msgid "printer-state-reasons.die-cutter-power-saver" msgstr "Die Cutter Power Saver" #. TRANSLATORS: Die Cutter Recoverable Failure -#: locale/ipp-strings.c:2848 +#: locale/ipp-strings.c:2886 msgid "printer-state-reasons.die-cutter-recoverable-failure" msgstr "Die Cutter Recoverable Failure" #. TRANSLATORS: Die Cutter Recoverable Storage -#: locale/ipp-strings.c:2850 +#: locale/ipp-strings.c:2888 msgid "printer-state-reasons.die-cutter-recoverable-storage" msgstr "Die Cutter Recoverable Storage" #. TRANSLATORS: Die Cutter Removed -#: locale/ipp-strings.c:2852 +#: locale/ipp-strings.c:2890 msgid "printer-state-reasons.die-cutter-removed" msgstr "Die Cutter Removed" #. TRANSLATORS: Die Cutter Resource Added -#: locale/ipp-strings.c:2854 +#: locale/ipp-strings.c:2892 msgid "printer-state-reasons.die-cutter-resource-added" msgstr "Die Cutter Resource Added" #. TRANSLATORS: Die Cutter Resource Removed -#: locale/ipp-strings.c:2856 +#: locale/ipp-strings.c:2894 msgid "printer-state-reasons.die-cutter-resource-removed" msgstr "Die Cutter Resource Removed" #. TRANSLATORS: Die Cutter Thermistor Failure -#: locale/ipp-strings.c:2858 +#: locale/ipp-strings.c:2896 msgid "printer-state-reasons.die-cutter-thermistor-failure" msgstr "Die Cutter Thermistor Failure" #. TRANSLATORS: Die Cutter Timing Failure -#: locale/ipp-strings.c:2860 +#: locale/ipp-strings.c:2898 msgid "printer-state-reasons.die-cutter-timing-failure" msgstr "Die Cutter Timing Failure" #. TRANSLATORS: Die Cutter Turned Off -#: locale/ipp-strings.c:2862 +#: locale/ipp-strings.c:2900 msgid "printer-state-reasons.die-cutter-turned-off" msgstr "Die Cutter Turned Off" #. TRANSLATORS: Die Cutter Turned On -#: locale/ipp-strings.c:2864 +#: locale/ipp-strings.c:2902 msgid "printer-state-reasons.die-cutter-turned-on" msgstr "Die Cutter Turned On" #. TRANSLATORS: Die Cutter Under Temperature -#: locale/ipp-strings.c:2866 +#: locale/ipp-strings.c:2904 msgid "printer-state-reasons.die-cutter-under-temperature" msgstr "Die Cutter Under Temperature" #. TRANSLATORS: Die Cutter Unrecoverable Failure -#: locale/ipp-strings.c:2868 +#: locale/ipp-strings.c:2906 msgid "printer-state-reasons.die-cutter-unrecoverable-failure" msgstr "Die Cutter Unrecoverable Failure" #. TRANSLATORS: Die Cutter Unrecoverable Storage Error -#: locale/ipp-strings.c:2870 +#: locale/ipp-strings.c:2908 msgid "printer-state-reasons.die-cutter-unrecoverable-storage-error" msgstr "Die Cutter Unrecoverable Storage Error" #. TRANSLATORS: Die Cutter Warming Up -#: locale/ipp-strings.c:2872 +#: locale/ipp-strings.c:2910 msgid "printer-state-reasons.die-cutter-warming-up" msgstr "Die Cutter Warming Up" #. TRANSLATORS: Door Open -#: locale/ipp-strings.c:2874 +#: locale/ipp-strings.c:2912 msgid "printer-state-reasons.door-open" msgstr "Door Open" #. TRANSLATORS: Extruder Cooling -#: locale/ipp-strings.c:2876 +#: locale/ipp-strings.c:2914 msgid "printer-state-reasons.extruder-cooling" msgstr "Extruder Cooling" #. TRANSLATORS: Extruder Failure -#: locale/ipp-strings.c:2878 +#: locale/ipp-strings.c:2916 msgid "printer-state-reasons.extruder-failure" msgstr "Extruder Failure" #. TRANSLATORS: Extruder Heating -#: locale/ipp-strings.c:2880 +#: locale/ipp-strings.c:2918 msgid "printer-state-reasons.extruder-heating" msgstr "Extruder Heating" #. TRANSLATORS: Extruder Jam -#: locale/ipp-strings.c:2882 +#: locale/ipp-strings.c:2920 msgid "printer-state-reasons.extruder-jam" msgstr "Extruder Jam" #. TRANSLATORS: Extruder Temperature High -#: locale/ipp-strings.c:2884 +#: locale/ipp-strings.c:2922 msgid "printer-state-reasons.extruder-temperature-high" msgstr "Extruder Temperature High" #. TRANSLATORS: Extruder Temperature Low -#: locale/ipp-strings.c:2886 +#: locale/ipp-strings.c:2924 msgid "printer-state-reasons.extruder-temperature-low" msgstr "Extruder Temperature Low" #. TRANSLATORS: Fan Failure -#: locale/ipp-strings.c:2888 +#: locale/ipp-strings.c:2926 msgid "printer-state-reasons.fan-failure" msgstr "Fan Failure" #. TRANSLATORS: Folder Added -#: locale/ipp-strings.c:2900 +#: locale/ipp-strings.c:2938 msgid "printer-state-reasons.folder-added" msgstr "Folder Added" #. TRANSLATORS: Folder Almost Empty -#: locale/ipp-strings.c:2902 +#: locale/ipp-strings.c:2940 msgid "printer-state-reasons.folder-almost-empty" msgstr "Folder Almost Empty" #. TRANSLATORS: Folder Almost Full -#: locale/ipp-strings.c:2904 +#: locale/ipp-strings.c:2942 msgid "printer-state-reasons.folder-almost-full" msgstr "Folder Almost Full" #. TRANSLATORS: Folder At Limit -#: locale/ipp-strings.c:2906 +#: locale/ipp-strings.c:2944 msgid "printer-state-reasons.folder-at-limit" msgstr "Folder At Limit" #. TRANSLATORS: Folder Closed -#: locale/ipp-strings.c:2908 +#: locale/ipp-strings.c:2946 msgid "printer-state-reasons.folder-closed" msgstr "Folder Closed" #. TRANSLATORS: Folder Configuration Change -#: locale/ipp-strings.c:2910 +#: locale/ipp-strings.c:2948 msgid "printer-state-reasons.folder-configuration-change" msgstr "Folder Configuration Change" #. TRANSLATORS: Folder Cover Closed -#: locale/ipp-strings.c:2912 +#: locale/ipp-strings.c:2950 msgid "printer-state-reasons.folder-cover-closed" msgstr "Folder Cover Closed" #. TRANSLATORS: Folder Cover Open -#: locale/ipp-strings.c:2914 +#: locale/ipp-strings.c:2952 msgid "printer-state-reasons.folder-cover-open" msgstr "Folder Cover Open" #. TRANSLATORS: Folder Empty -#: locale/ipp-strings.c:2916 +#: locale/ipp-strings.c:2954 msgid "printer-state-reasons.folder-empty" msgstr "Folder Empty" #. TRANSLATORS: Folder Full -#: locale/ipp-strings.c:2918 +#: locale/ipp-strings.c:2956 msgid "printer-state-reasons.folder-full" msgstr "Folder Full" #. TRANSLATORS: Folder Interlock Closed -#: locale/ipp-strings.c:2920 +#: locale/ipp-strings.c:2958 msgid "printer-state-reasons.folder-interlock-closed" msgstr "Folder Interlock Closed" #. TRANSLATORS: Folder Interlock Open -#: locale/ipp-strings.c:2922 +#: locale/ipp-strings.c:2960 msgid "printer-state-reasons.folder-interlock-open" msgstr "Folder Interlock Open" #. TRANSLATORS: Folder Jam -#: locale/ipp-strings.c:2924 +#: locale/ipp-strings.c:2962 msgid "printer-state-reasons.folder-jam" msgstr "Folder Jam" #. TRANSLATORS: Folder Life Almost Over -#: locale/ipp-strings.c:2926 +#: locale/ipp-strings.c:2964 msgid "printer-state-reasons.folder-life-almost-over" msgstr "Folder Life Almost Over" #. TRANSLATORS: Folder Life Over -#: locale/ipp-strings.c:2928 +#: locale/ipp-strings.c:2966 msgid "printer-state-reasons.folder-life-over" msgstr "Folder Life Over" #. TRANSLATORS: Folder Memory Exhausted -#: locale/ipp-strings.c:2930 +#: locale/ipp-strings.c:2968 msgid "printer-state-reasons.folder-memory-exhausted" msgstr "Folder Memory Exhausted" #. TRANSLATORS: Folder Missing -#: locale/ipp-strings.c:2932 +#: locale/ipp-strings.c:2970 msgid "printer-state-reasons.folder-missing" msgstr "Folder Missing" #. TRANSLATORS: Folder Motor Failure -#: locale/ipp-strings.c:2934 +#: locale/ipp-strings.c:2972 msgid "printer-state-reasons.folder-motor-failure" msgstr "Folder Motor Failure" #. TRANSLATORS: Folder Near Limit -#: locale/ipp-strings.c:2936 +#: locale/ipp-strings.c:2974 msgid "printer-state-reasons.folder-near-limit" msgstr "Folder Near Limit" #. TRANSLATORS: Folder Offline -#: locale/ipp-strings.c:2938 +#: locale/ipp-strings.c:2976 msgid "printer-state-reasons.folder-offline" msgstr "Folder Offline" #. TRANSLATORS: Folder Opened -#: locale/ipp-strings.c:2940 +#: locale/ipp-strings.c:2978 msgid "printer-state-reasons.folder-opened" msgstr "Folder Opened" #. TRANSLATORS: Folder Over Temperature -#: locale/ipp-strings.c:2942 +#: locale/ipp-strings.c:2980 msgid "printer-state-reasons.folder-over-temperature" msgstr "Folder Over Temperature" #. TRANSLATORS: Folder Power Saver -#: locale/ipp-strings.c:2944 +#: locale/ipp-strings.c:2982 msgid "printer-state-reasons.folder-power-saver" msgstr "Folder Power Saver" #. TRANSLATORS: Folder Recoverable Failure -#: locale/ipp-strings.c:2946 +#: locale/ipp-strings.c:2984 msgid "printer-state-reasons.folder-recoverable-failure" msgstr "Folder Recoverable Failure" #. TRANSLATORS: Folder Recoverable Storage -#: locale/ipp-strings.c:2948 +#: locale/ipp-strings.c:2986 msgid "printer-state-reasons.folder-recoverable-storage" msgstr "Folder Recoverable Storage" #. TRANSLATORS: Folder Removed -#: locale/ipp-strings.c:2950 +#: locale/ipp-strings.c:2988 msgid "printer-state-reasons.folder-removed" msgstr "Folder Removed" #. TRANSLATORS: Folder Resource Added -#: locale/ipp-strings.c:2952 +#: locale/ipp-strings.c:2990 msgid "printer-state-reasons.folder-resource-added" msgstr "Folder Resource Added" #. TRANSLATORS: Folder Resource Removed -#: locale/ipp-strings.c:2954 +#: locale/ipp-strings.c:2992 msgid "printer-state-reasons.folder-resource-removed" msgstr "Folder Resource Removed" #. TRANSLATORS: Folder Thermistor Failure -#: locale/ipp-strings.c:2956 +#: locale/ipp-strings.c:2994 msgid "printer-state-reasons.folder-thermistor-failure" msgstr "Folder Thermistor Failure" #. TRANSLATORS: Folder Timing Failure -#: locale/ipp-strings.c:2958 +#: locale/ipp-strings.c:2996 msgid "printer-state-reasons.folder-timing-failure" msgstr "Folder Timing Failure" #. TRANSLATORS: Folder Turned Off -#: locale/ipp-strings.c:2960 +#: locale/ipp-strings.c:2998 msgid "printer-state-reasons.folder-turned-off" msgstr "Folder Turned Off" #. TRANSLATORS: Folder Turned On -#: locale/ipp-strings.c:2962 +#: locale/ipp-strings.c:3000 msgid "printer-state-reasons.folder-turned-on" msgstr "Folder Turned On" #. TRANSLATORS: Folder Under Temperature -#: locale/ipp-strings.c:2964 +#: locale/ipp-strings.c:3002 msgid "printer-state-reasons.folder-under-temperature" msgstr "Folder Under Temperature" #. TRANSLATORS: Folder Unrecoverable Failure -#: locale/ipp-strings.c:2966 +#: locale/ipp-strings.c:3004 msgid "printer-state-reasons.folder-unrecoverable-failure" msgstr "Folder Unrecoverable Failure" #. TRANSLATORS: Folder Unrecoverable Storage Error -#: locale/ipp-strings.c:2968 +#: locale/ipp-strings.c:3006 msgid "printer-state-reasons.folder-unrecoverable-storage-error" msgstr "Folder Unrecoverable Storage Error" #. TRANSLATORS: Folder Warming Up -#: locale/ipp-strings.c:2970 +#: locale/ipp-strings.c:3008 msgid "printer-state-reasons.folder-warming-up" msgstr "Folder Warming Up" #. TRANSLATORS: Fuser temperature high -#: locale/ipp-strings.c:2972 +#: locale/ipp-strings.c:3010 msgid "printer-state-reasons.fuser-over-temp" msgstr "Fuser Over Temp" #. TRANSLATORS: Fuser temperature low -#: locale/ipp-strings.c:2974 +#: locale/ipp-strings.c:3012 msgid "printer-state-reasons.fuser-under-temp" msgstr "Fuser Under Temp" #. TRANSLATORS: Hold New Jobs -#: locale/ipp-strings.c:2976 +#: locale/ipp-strings.c:3014 msgid "printer-state-reasons.hold-new-jobs" msgstr "Hold New Jobs" #. TRANSLATORS: Identify Printer -#: locale/ipp-strings.c:2978 +#: locale/ipp-strings.c:3016 msgid "printer-state-reasons.identify-printer-requested" msgstr "Identify Printer" #. TRANSLATORS: Imprinter Added -#: locale/ipp-strings.c:2980 +#: locale/ipp-strings.c:3018 msgid "printer-state-reasons.imprinter-added" msgstr "Imprinter Added" #. TRANSLATORS: Imprinter Almost Empty -#: locale/ipp-strings.c:2982 +#: locale/ipp-strings.c:3020 msgid "printer-state-reasons.imprinter-almost-empty" msgstr "Imprinter Almost Empty" #. TRANSLATORS: Imprinter Almost Full -#: locale/ipp-strings.c:2984 +#: locale/ipp-strings.c:3022 msgid "printer-state-reasons.imprinter-almost-full" msgstr "Imprinter Almost Full" #. TRANSLATORS: Imprinter At Limit -#: locale/ipp-strings.c:2986 +#: locale/ipp-strings.c:3024 msgid "printer-state-reasons.imprinter-at-limit" msgstr "Imprinter At Limit" #. TRANSLATORS: Imprinter Closed -#: locale/ipp-strings.c:2988 +#: locale/ipp-strings.c:3026 msgid "printer-state-reasons.imprinter-closed" msgstr "Imprinter Closed" #. TRANSLATORS: Imprinter Configuration Change -#: locale/ipp-strings.c:2990 +#: locale/ipp-strings.c:3028 msgid "printer-state-reasons.imprinter-configuration-change" msgstr "Imprinter Configuration Change" #. TRANSLATORS: Imprinter Cover Closed -#: locale/ipp-strings.c:2992 +#: locale/ipp-strings.c:3030 msgid "printer-state-reasons.imprinter-cover-closed" msgstr "Imprinter Cover Closed" #. TRANSLATORS: Imprinter Cover Open -#: locale/ipp-strings.c:2994 +#: locale/ipp-strings.c:3032 msgid "printer-state-reasons.imprinter-cover-open" msgstr "Imprinter Cover Open" #. TRANSLATORS: Imprinter Empty -#: locale/ipp-strings.c:2996 +#: locale/ipp-strings.c:3034 msgid "printer-state-reasons.imprinter-empty" msgstr "Imprinter Empty" #. TRANSLATORS: Imprinter Full -#: locale/ipp-strings.c:2998 +#: locale/ipp-strings.c:3036 msgid "printer-state-reasons.imprinter-full" msgstr "Imprinter Full" #. TRANSLATORS: Imprinter Interlock Closed -#: locale/ipp-strings.c:3000 +#: locale/ipp-strings.c:3038 msgid "printer-state-reasons.imprinter-interlock-closed" msgstr "Imprinter Interlock Closed" #. TRANSLATORS: Imprinter Interlock Open -#: locale/ipp-strings.c:3002 +#: locale/ipp-strings.c:3040 msgid "printer-state-reasons.imprinter-interlock-open" msgstr "Imprinter Interlock Open" #. TRANSLATORS: Imprinter Jam -#: locale/ipp-strings.c:3004 +#: locale/ipp-strings.c:3042 msgid "printer-state-reasons.imprinter-jam" msgstr "Imprinter Jam" #. TRANSLATORS: Imprinter Life Almost Over -#: locale/ipp-strings.c:3006 +#: locale/ipp-strings.c:3044 msgid "printer-state-reasons.imprinter-life-almost-over" msgstr "Imprinter Life Almost Over" #. TRANSLATORS: Imprinter Life Over -#: locale/ipp-strings.c:3008 +#: locale/ipp-strings.c:3046 msgid "printer-state-reasons.imprinter-life-over" msgstr "Imprinter Life Over" #. TRANSLATORS: Imprinter Memory Exhausted -#: locale/ipp-strings.c:3010 +#: locale/ipp-strings.c:3048 msgid "printer-state-reasons.imprinter-memory-exhausted" msgstr "Imprinter Memory Exhausted" #. TRANSLATORS: Imprinter Missing -#: locale/ipp-strings.c:3012 +#: locale/ipp-strings.c:3050 msgid "printer-state-reasons.imprinter-missing" msgstr "Imprinter Missing" #. TRANSLATORS: Imprinter Motor Failure -#: locale/ipp-strings.c:3014 +#: locale/ipp-strings.c:3052 msgid "printer-state-reasons.imprinter-motor-failure" msgstr "Imprinter Motor Failure" #. TRANSLATORS: Imprinter Near Limit -#: locale/ipp-strings.c:3016 +#: locale/ipp-strings.c:3054 msgid "printer-state-reasons.imprinter-near-limit" msgstr "Imprinter Near Limit" #. TRANSLATORS: Imprinter Offline -#: locale/ipp-strings.c:3018 +#: locale/ipp-strings.c:3056 msgid "printer-state-reasons.imprinter-offline" msgstr "Imprinter Offline" #. TRANSLATORS: Imprinter Opened -#: locale/ipp-strings.c:3020 +#: locale/ipp-strings.c:3058 msgid "printer-state-reasons.imprinter-opened" msgstr "Imprinter Opened" #. TRANSLATORS: Imprinter Over Temperature -#: locale/ipp-strings.c:3022 +#: locale/ipp-strings.c:3060 msgid "printer-state-reasons.imprinter-over-temperature" msgstr "Imprinter Over Temperature" #. TRANSLATORS: Imprinter Power Saver -#: locale/ipp-strings.c:3024 +#: locale/ipp-strings.c:3062 msgid "printer-state-reasons.imprinter-power-saver" msgstr "Imprinter Power Saver" #. TRANSLATORS: Imprinter Recoverable Failure -#: locale/ipp-strings.c:3026 +#: locale/ipp-strings.c:3064 msgid "printer-state-reasons.imprinter-recoverable-failure" msgstr "Imprinter Recoverable Failure" #. TRANSLATORS: Imprinter Recoverable Storage -#: locale/ipp-strings.c:3028 +#: locale/ipp-strings.c:3066 msgid "printer-state-reasons.imprinter-recoverable-storage" msgstr "Imprinter Recoverable Storage" #. TRANSLATORS: Imprinter Removed -#: locale/ipp-strings.c:3030 +#: locale/ipp-strings.c:3068 msgid "printer-state-reasons.imprinter-removed" msgstr "Imprinter Removed" #. TRANSLATORS: Imprinter Resource Added -#: locale/ipp-strings.c:3032 +#: locale/ipp-strings.c:3070 msgid "printer-state-reasons.imprinter-resource-added" msgstr "Imprinter Resource Added" #. TRANSLATORS: Imprinter Resource Removed -#: locale/ipp-strings.c:3034 +#: locale/ipp-strings.c:3072 msgid "printer-state-reasons.imprinter-resource-removed" msgstr "Imprinter Resource Removed" #. TRANSLATORS: Imprinter Thermistor Failure -#: locale/ipp-strings.c:3036 +#: locale/ipp-strings.c:3074 msgid "printer-state-reasons.imprinter-thermistor-failure" msgstr "Imprinter Thermistor Failure" #. TRANSLATORS: Imprinter Timing Failure -#: locale/ipp-strings.c:3038 +#: locale/ipp-strings.c:3076 msgid "printer-state-reasons.imprinter-timing-failure" msgstr "Imprinter Timing Failure" #. TRANSLATORS: Imprinter Turned Off -#: locale/ipp-strings.c:3040 +#: locale/ipp-strings.c:3078 msgid "printer-state-reasons.imprinter-turned-off" msgstr "Imprinter Turned Off" #. TRANSLATORS: Imprinter Turned On -#: locale/ipp-strings.c:3042 +#: locale/ipp-strings.c:3080 msgid "printer-state-reasons.imprinter-turned-on" msgstr "Imprinter Turned On" #. TRANSLATORS: Imprinter Under Temperature -#: locale/ipp-strings.c:3044 +#: locale/ipp-strings.c:3082 msgid "printer-state-reasons.imprinter-under-temperature" msgstr "Imprinter Under Temperature" #. TRANSLATORS: Imprinter Unrecoverable Failure -#: locale/ipp-strings.c:3046 +#: locale/ipp-strings.c:3084 msgid "printer-state-reasons.imprinter-unrecoverable-failure" msgstr "Imprinter Unrecoverable Failure" #. TRANSLATORS: Imprinter Unrecoverable Storage Error -#: locale/ipp-strings.c:3048 +#: locale/ipp-strings.c:3086 msgid "printer-state-reasons.imprinter-unrecoverable-storage-error" msgstr "Imprinter Unrecoverable Storage Error" #. TRANSLATORS: Imprinter Warming Up -#: locale/ipp-strings.c:3050 +#: locale/ipp-strings.c:3088 msgid "printer-state-reasons.imprinter-warming-up" msgstr "Imprinter Warming Up" #. TRANSLATORS: Input Cannot Feed Size Selected -#: locale/ipp-strings.c:3052 +#: locale/ipp-strings.c:3090 msgid "printer-state-reasons.input-cannot-feed-size-selected" msgstr "Input Cannot Feed Size Selected" #. TRANSLATORS: Input Manual Input Request -#: locale/ipp-strings.c:3054 +#: locale/ipp-strings.c:3092 msgid "printer-state-reasons.input-manual-input-request" msgstr "Input Manual Input Request" #. TRANSLATORS: Input Media Color Change -#: locale/ipp-strings.c:3056 +#: locale/ipp-strings.c:3094 msgid "printer-state-reasons.input-media-color-change" msgstr "Input Media Color Change" #. TRANSLATORS: Input Media Form Parts Change -#: locale/ipp-strings.c:3058 +#: locale/ipp-strings.c:3096 msgid "printer-state-reasons.input-media-form-parts-change" msgstr "Input Media Form Parts Change" #. TRANSLATORS: Input Media Size Change -#: locale/ipp-strings.c:3060 +#: locale/ipp-strings.c:3098 msgid "printer-state-reasons.input-media-size-change" msgstr "Input Media Size Change" #. TRANSLATORS: Input Media Type Change -#: locale/ipp-strings.c:3068 +#: locale/ipp-strings.c:3106 msgid "printer-state-reasons.input-media-type-change" msgstr "Input Media Type Change" #. TRANSLATORS: Input Media Weight Change -#: locale/ipp-strings.c:3070 +#: locale/ipp-strings.c:3108 msgid "printer-state-reasons.input-media-weight-change" msgstr "Input Media Weight Change" #. TRANSLATORS: Input Tray Elevation Failure -#: locale/ipp-strings.c:3080 +#: locale/ipp-strings.c:3118 msgid "printer-state-reasons.input-tray-elevation-failure" msgstr "Input Tray Elevation Failure" #. TRANSLATORS: Paper tray is missing -#: locale/ipp-strings.c:3082 +#: locale/ipp-strings.c:3120 msgid "printer-state-reasons.input-tray-missing" msgstr "Input Tray Missing" #. TRANSLATORS: Input Tray Position Failure -#: locale/ipp-strings.c:3084 +#: locale/ipp-strings.c:3122 msgid "printer-state-reasons.input-tray-position-failure" msgstr "Input Tray Position Failure" #. TRANSLATORS: Inserter Added -#: locale/ipp-strings.c:3086 +#: locale/ipp-strings.c:3124 msgid "printer-state-reasons.inserter-added" msgstr "Inserter Added" #. TRANSLATORS: Inserter Almost Empty -#: locale/ipp-strings.c:3088 +#: locale/ipp-strings.c:3126 msgid "printer-state-reasons.inserter-almost-empty" msgstr "Inserter Almost Empty" #. TRANSLATORS: Inserter Almost Full -#: locale/ipp-strings.c:3090 +#: locale/ipp-strings.c:3128 msgid "printer-state-reasons.inserter-almost-full" msgstr "Inserter Almost Full" #. TRANSLATORS: Inserter At Limit -#: locale/ipp-strings.c:3092 +#: locale/ipp-strings.c:3130 msgid "printer-state-reasons.inserter-at-limit" msgstr "Inserter At Limit" #. TRANSLATORS: Inserter Closed -#: locale/ipp-strings.c:3094 +#: locale/ipp-strings.c:3132 msgid "printer-state-reasons.inserter-closed" msgstr "Inserter Closed" #. TRANSLATORS: Inserter Configuration Change -#: locale/ipp-strings.c:3096 +#: locale/ipp-strings.c:3134 msgid "printer-state-reasons.inserter-configuration-change" msgstr "Inserter Configuration Change" #. TRANSLATORS: Inserter Cover Closed -#: locale/ipp-strings.c:3098 +#: locale/ipp-strings.c:3136 msgid "printer-state-reasons.inserter-cover-closed" msgstr "Inserter Cover Closed" #. TRANSLATORS: Inserter Cover Open -#: locale/ipp-strings.c:3100 +#: locale/ipp-strings.c:3138 msgid "printer-state-reasons.inserter-cover-open" msgstr "Inserter Cover Open" #. TRANSLATORS: Inserter Empty -#: locale/ipp-strings.c:3102 +#: locale/ipp-strings.c:3140 msgid "printer-state-reasons.inserter-empty" msgstr "Inserter Empty" #. TRANSLATORS: Inserter Full -#: locale/ipp-strings.c:3104 +#: locale/ipp-strings.c:3142 msgid "printer-state-reasons.inserter-full" msgstr "Inserter Full" #. TRANSLATORS: Inserter Interlock Closed -#: locale/ipp-strings.c:3106 +#: locale/ipp-strings.c:3144 msgid "printer-state-reasons.inserter-interlock-closed" msgstr "Inserter Interlock Closed" #. TRANSLATORS: Inserter Interlock Open -#: locale/ipp-strings.c:3108 +#: locale/ipp-strings.c:3146 msgid "printer-state-reasons.inserter-interlock-open" msgstr "Inserter Interlock Open" #. TRANSLATORS: Inserter Jam -#: locale/ipp-strings.c:3110 +#: locale/ipp-strings.c:3148 msgid "printer-state-reasons.inserter-jam" msgstr "Inserter Jam" #. TRANSLATORS: Inserter Life Almost Over -#: locale/ipp-strings.c:3112 +#: locale/ipp-strings.c:3150 msgid "printer-state-reasons.inserter-life-almost-over" msgstr "Inserter Life Almost Over" #. TRANSLATORS: Inserter Life Over -#: locale/ipp-strings.c:3114 +#: locale/ipp-strings.c:3152 msgid "printer-state-reasons.inserter-life-over" msgstr "Inserter Life Over" #. TRANSLATORS: Inserter Memory Exhausted -#: locale/ipp-strings.c:3116 +#: locale/ipp-strings.c:3154 msgid "printer-state-reasons.inserter-memory-exhausted" msgstr "Inserter Memory Exhausted" #. TRANSLATORS: Inserter Missing -#: locale/ipp-strings.c:3118 +#: locale/ipp-strings.c:3156 msgid "printer-state-reasons.inserter-missing" msgstr "Inserter Missing" #. TRANSLATORS: Inserter Motor Failure -#: locale/ipp-strings.c:3120 +#: locale/ipp-strings.c:3158 msgid "printer-state-reasons.inserter-motor-failure" msgstr "Inserter Motor Failure" #. TRANSLATORS: Inserter Near Limit -#: locale/ipp-strings.c:3122 +#: locale/ipp-strings.c:3160 msgid "printer-state-reasons.inserter-near-limit" msgstr "Inserter Near Limit" #. TRANSLATORS: Inserter Offline -#: locale/ipp-strings.c:3124 +#: locale/ipp-strings.c:3162 msgid "printer-state-reasons.inserter-offline" msgstr "Inserter Offline" #. TRANSLATORS: Inserter Opened -#: locale/ipp-strings.c:3126 +#: locale/ipp-strings.c:3164 msgid "printer-state-reasons.inserter-opened" msgstr "Inserter Opened" #. TRANSLATORS: Inserter Over Temperature -#: locale/ipp-strings.c:3128 +#: locale/ipp-strings.c:3166 msgid "printer-state-reasons.inserter-over-temperature" msgstr "Inserter Over Temperature" #. TRANSLATORS: Inserter Power Saver -#: locale/ipp-strings.c:3130 +#: locale/ipp-strings.c:3168 msgid "printer-state-reasons.inserter-power-saver" msgstr "Inserter Power Saver" #. TRANSLATORS: Inserter Recoverable Failure -#: locale/ipp-strings.c:3132 +#: locale/ipp-strings.c:3170 msgid "printer-state-reasons.inserter-recoverable-failure" msgstr "Inserter Recoverable Failure" #. TRANSLATORS: Inserter Recoverable Storage -#: locale/ipp-strings.c:3134 +#: locale/ipp-strings.c:3172 msgid "printer-state-reasons.inserter-recoverable-storage" msgstr "Inserter Recoverable Storage" #. TRANSLATORS: Inserter Removed -#: locale/ipp-strings.c:3136 +#: locale/ipp-strings.c:3174 msgid "printer-state-reasons.inserter-removed" msgstr "Inserter Removed" #. TRANSLATORS: Inserter Resource Added -#: locale/ipp-strings.c:3138 +#: locale/ipp-strings.c:3176 msgid "printer-state-reasons.inserter-resource-added" msgstr "Inserter Resource Added" #. TRANSLATORS: Inserter Resource Removed -#: locale/ipp-strings.c:3140 +#: locale/ipp-strings.c:3178 msgid "printer-state-reasons.inserter-resource-removed" msgstr "Inserter Resource Removed" #. TRANSLATORS: Inserter Thermistor Failure -#: locale/ipp-strings.c:3142 +#: locale/ipp-strings.c:3180 msgid "printer-state-reasons.inserter-thermistor-failure" msgstr "Inserter Thermistor Failure" #. TRANSLATORS: Inserter Timing Failure -#: locale/ipp-strings.c:3144 +#: locale/ipp-strings.c:3182 msgid "printer-state-reasons.inserter-timing-failure" msgstr "Inserter Timing Failure" #. TRANSLATORS: Inserter Turned Off -#: locale/ipp-strings.c:3146 +#: locale/ipp-strings.c:3184 msgid "printer-state-reasons.inserter-turned-off" msgstr "Inserter Turned Off" #. TRANSLATORS: Inserter Turned On -#: locale/ipp-strings.c:3148 +#: locale/ipp-strings.c:3186 msgid "printer-state-reasons.inserter-turned-on" msgstr "Inserter Turned On" #. TRANSLATORS: Inserter Under Temperature -#: locale/ipp-strings.c:3150 +#: locale/ipp-strings.c:3188 msgid "printer-state-reasons.inserter-under-temperature" msgstr "Inserter Under Temperature" #. TRANSLATORS: Inserter Unrecoverable Failure -#: locale/ipp-strings.c:3152 +#: locale/ipp-strings.c:3190 msgid "printer-state-reasons.inserter-unrecoverable-failure" msgstr "Inserter Unrecoverable Failure" #. TRANSLATORS: Inserter Unrecoverable Storage Error -#: locale/ipp-strings.c:3154 +#: locale/ipp-strings.c:3192 msgid "printer-state-reasons.inserter-unrecoverable-storage-error" msgstr "Inserter Unrecoverable Storage Error" #. TRANSLATORS: Inserter Warming Up -#: locale/ipp-strings.c:3156 +#: locale/ipp-strings.c:3194 msgid "printer-state-reasons.inserter-warming-up" msgstr "Inserter Warming Up" #. TRANSLATORS: Interlock Closed -#: locale/ipp-strings.c:3158 +#: locale/ipp-strings.c:3196 msgid "printer-state-reasons.interlock-closed" msgstr "Interlock Closed" #. TRANSLATORS: Interlock Open -#: locale/ipp-strings.c:3160 +#: locale/ipp-strings.c:3198 msgid "printer-state-reasons.interlock-open" msgstr "Interlock Open" #. TRANSLATORS: Interpreter Cartridge Added -#: locale/ipp-strings.c:3162 +#: locale/ipp-strings.c:3200 msgid "printer-state-reasons.interpreter-cartridge-added" msgstr "Interpreter Cartridge Added" #. TRANSLATORS: Interpreter Cartridge Removed -#: locale/ipp-strings.c:3164 +#: locale/ipp-strings.c:3202 msgid "printer-state-reasons.interpreter-cartridge-deleted" msgstr "Interpreter Cartridge Deleted" #. TRANSLATORS: Interpreter Complex Page Encountered -#: locale/ipp-strings.c:3166 +#: locale/ipp-strings.c:3204 msgid "printer-state-reasons.interpreter-complex-page-encountered" msgstr "Interpreter Complex Page Encountered" #. TRANSLATORS: Interpreter Memory Decrease -#: locale/ipp-strings.c:3168 +#: locale/ipp-strings.c:3206 msgid "printer-state-reasons.interpreter-memory-decrease" msgstr "Interpreter Memory Decrease" #. TRANSLATORS: Interpreter Memory Increase -#: locale/ipp-strings.c:3170 +#: locale/ipp-strings.c:3208 msgid "printer-state-reasons.interpreter-memory-increase" msgstr "Interpreter Memory Increase" #. TRANSLATORS: Interpreter Resource Added -#: locale/ipp-strings.c:3172 +#: locale/ipp-strings.c:3210 msgid "printer-state-reasons.interpreter-resource-added" msgstr "Interpreter Resource Added" #. TRANSLATORS: Interpreter Resource Deleted -#: locale/ipp-strings.c:3174 +#: locale/ipp-strings.c:3212 msgid "printer-state-reasons.interpreter-resource-deleted" msgstr "Interpreter Resource Deleted" #. TRANSLATORS: Printer resource unavailable -#: locale/ipp-strings.c:3176 +#: locale/ipp-strings.c:3214 msgid "printer-state-reasons.interpreter-resource-unavailable" msgstr "Interpreter Resource Unavailable" #. TRANSLATORS: Lamp At End of Life -#: locale/ipp-strings.c:3178 +#: locale/ipp-strings.c:3216 msgid "printer-state-reasons.lamp-at-eol" msgstr "Lamp At Eol" #. TRANSLATORS: Lamp Failure -#: locale/ipp-strings.c:3180 +#: locale/ipp-strings.c:3218 msgid "printer-state-reasons.lamp-failure" msgstr "Lamp Failure" #. TRANSLATORS: Lamp Near End of Life -#: locale/ipp-strings.c:3182 +#: locale/ipp-strings.c:3220 msgid "printer-state-reasons.lamp-near-eol" msgstr "Lamp Near Eol" #. TRANSLATORS: Laser At End of Life -#: locale/ipp-strings.c:3184 +#: locale/ipp-strings.c:3222 msgid "printer-state-reasons.laser-at-eol" msgstr "Laser At Eol" #. TRANSLATORS: Laser Failure -#: locale/ipp-strings.c:3186 +#: locale/ipp-strings.c:3224 msgid "printer-state-reasons.laser-failure" msgstr "Laser Failure" #. TRANSLATORS: Laser Near End of Life -#: locale/ipp-strings.c:3188 +#: locale/ipp-strings.c:3226 msgid "printer-state-reasons.laser-near-eol" msgstr "Laser Near Eol" #. TRANSLATORS: Envelope Maker Added -#: locale/ipp-strings.c:3190 +#: locale/ipp-strings.c:3228 msgid "printer-state-reasons.make-envelope-added" msgstr "Make Envelope Added" #. TRANSLATORS: Envelope Maker Almost Empty -#: locale/ipp-strings.c:3192 +#: locale/ipp-strings.c:3230 msgid "printer-state-reasons.make-envelope-almost-empty" msgstr "Make Envelope Almost Empty" #. TRANSLATORS: Envelope Maker Almost Full -#: locale/ipp-strings.c:3194 +#: locale/ipp-strings.c:3232 msgid "printer-state-reasons.make-envelope-almost-full" msgstr "Make Envelope Almost Full" #. TRANSLATORS: Envelope Maker At Limit -#: locale/ipp-strings.c:3196 +#: locale/ipp-strings.c:3234 msgid "printer-state-reasons.make-envelope-at-limit" msgstr "Make Envelope At Limit" #. TRANSLATORS: Envelope Maker Closed -#: locale/ipp-strings.c:3198 +#: locale/ipp-strings.c:3236 msgid "printer-state-reasons.make-envelope-closed" msgstr "Make Envelope Closed" #. TRANSLATORS: Envelope Maker Configuration Change -#: locale/ipp-strings.c:3200 +#: locale/ipp-strings.c:3238 msgid "printer-state-reasons.make-envelope-configuration-change" msgstr "Make Envelope Configuration Change" #. TRANSLATORS: Envelope Maker Cover Closed -#: locale/ipp-strings.c:3202 +#: locale/ipp-strings.c:3240 msgid "printer-state-reasons.make-envelope-cover-closed" msgstr "Make Envelope Cover Closed" #. TRANSLATORS: Envelope Maker Cover Open -#: locale/ipp-strings.c:3204 +#: locale/ipp-strings.c:3242 msgid "printer-state-reasons.make-envelope-cover-open" msgstr "Make Envelope Cover Open" #. TRANSLATORS: Envelope Maker Empty -#: locale/ipp-strings.c:3206 +#: locale/ipp-strings.c:3244 msgid "printer-state-reasons.make-envelope-empty" msgstr "Make Envelope Empty" #. TRANSLATORS: Envelope Maker Full -#: locale/ipp-strings.c:3208 +#: locale/ipp-strings.c:3246 msgid "printer-state-reasons.make-envelope-full" msgstr "Make Envelope Full" #. TRANSLATORS: Envelope Maker Interlock Closed -#: locale/ipp-strings.c:3210 +#: locale/ipp-strings.c:3248 msgid "printer-state-reasons.make-envelope-interlock-closed" msgstr "Make Envelope Interlock Closed" #. TRANSLATORS: Envelope Maker Interlock Open -#: locale/ipp-strings.c:3212 +#: locale/ipp-strings.c:3250 msgid "printer-state-reasons.make-envelope-interlock-open" msgstr "Make Envelope Interlock Open" #. TRANSLATORS: Envelope Maker Jam -#: locale/ipp-strings.c:3214 +#: locale/ipp-strings.c:3252 msgid "printer-state-reasons.make-envelope-jam" msgstr "Make Envelope Jam" #. TRANSLATORS: Envelope Maker Life Almost Over -#: locale/ipp-strings.c:3216 +#: locale/ipp-strings.c:3254 msgid "printer-state-reasons.make-envelope-life-almost-over" msgstr "Make Envelope Life Almost Over" #. TRANSLATORS: Envelope Maker Life Over -#: locale/ipp-strings.c:3218 +#: locale/ipp-strings.c:3256 msgid "printer-state-reasons.make-envelope-life-over" msgstr "Make Envelope Life Over" #. TRANSLATORS: Envelope Maker Memory Exhausted -#: locale/ipp-strings.c:3220 +#: locale/ipp-strings.c:3258 msgid "printer-state-reasons.make-envelope-memory-exhausted" msgstr "Make Envelope Memory Exhausted" #. TRANSLATORS: Envelope Maker Missing -#: locale/ipp-strings.c:3222 +#: locale/ipp-strings.c:3260 msgid "printer-state-reasons.make-envelope-missing" msgstr "Make Envelope Missing" #. TRANSLATORS: Envelope Maker Motor Failure -#: locale/ipp-strings.c:3224 +#: locale/ipp-strings.c:3262 msgid "printer-state-reasons.make-envelope-motor-failure" msgstr "Make Envelope Motor Failure" #. TRANSLATORS: Envelope Maker Near Limit -#: locale/ipp-strings.c:3226 +#: locale/ipp-strings.c:3264 msgid "printer-state-reasons.make-envelope-near-limit" msgstr "Make Envelope Near Limit" #. TRANSLATORS: Envelope Maker Offline -#: locale/ipp-strings.c:3228 +#: locale/ipp-strings.c:3266 msgid "printer-state-reasons.make-envelope-offline" msgstr "Make Envelope Offline" #. TRANSLATORS: Envelope Maker Opened -#: locale/ipp-strings.c:3230 +#: locale/ipp-strings.c:3268 msgid "printer-state-reasons.make-envelope-opened" msgstr "Make Envelope Opened" #. TRANSLATORS: Envelope Maker Over Temperature -#: locale/ipp-strings.c:3232 +#: locale/ipp-strings.c:3270 msgid "printer-state-reasons.make-envelope-over-temperature" msgstr "Make Envelope Over Temperature" #. TRANSLATORS: Envelope Maker Power Saver -#: locale/ipp-strings.c:3234 +#: locale/ipp-strings.c:3272 msgid "printer-state-reasons.make-envelope-power-saver" msgstr "Make Envelope Power Saver" #. TRANSLATORS: Envelope Maker Recoverable Failure -#: locale/ipp-strings.c:3236 +#: locale/ipp-strings.c:3274 msgid "printer-state-reasons.make-envelope-recoverable-failure" msgstr "Make Envelope Recoverable Failure" #. TRANSLATORS: Envelope Maker Recoverable Storage -#: locale/ipp-strings.c:3238 +#: locale/ipp-strings.c:3276 msgid "printer-state-reasons.make-envelope-recoverable-storage" msgstr "Make Envelope Recoverable Storage" #. TRANSLATORS: Envelope Maker Removed -#: locale/ipp-strings.c:3240 +#: locale/ipp-strings.c:3278 msgid "printer-state-reasons.make-envelope-removed" msgstr "Make Envelope Removed" #. TRANSLATORS: Envelope Maker Resource Added -#: locale/ipp-strings.c:3242 +#: locale/ipp-strings.c:3280 msgid "printer-state-reasons.make-envelope-resource-added" msgstr "Make Envelope Resource Added" #. TRANSLATORS: Envelope Maker Resource Removed -#: locale/ipp-strings.c:3244 +#: locale/ipp-strings.c:3282 msgid "printer-state-reasons.make-envelope-resource-removed" msgstr "Make Envelope Resource Removed" #. TRANSLATORS: Envelope Maker Thermistor Failure -#: locale/ipp-strings.c:3246 +#: locale/ipp-strings.c:3284 msgid "printer-state-reasons.make-envelope-thermistor-failure" msgstr "Make Envelope Thermistor Failure" #. TRANSLATORS: Envelope Maker Timing Failure -#: locale/ipp-strings.c:3248 +#: locale/ipp-strings.c:3286 msgid "printer-state-reasons.make-envelope-timing-failure" msgstr "Make Envelope Timing Failure" #. TRANSLATORS: Envelope Maker Turned Off -#: locale/ipp-strings.c:3250 +#: locale/ipp-strings.c:3288 msgid "printer-state-reasons.make-envelope-turned-off" msgstr "Make Envelope Turned Off" #. TRANSLATORS: Envelope Maker Turned On -#: locale/ipp-strings.c:3252 +#: locale/ipp-strings.c:3290 msgid "printer-state-reasons.make-envelope-turned-on" msgstr "Make Envelope Turned On" #. TRANSLATORS: Envelope Maker Under Temperature -#: locale/ipp-strings.c:3254 +#: locale/ipp-strings.c:3292 msgid "printer-state-reasons.make-envelope-under-temperature" msgstr "Make Envelope Under Temperature" #. TRANSLATORS: Envelope Maker Unrecoverable Failure -#: locale/ipp-strings.c:3256 +#: locale/ipp-strings.c:3294 msgid "printer-state-reasons.make-envelope-unrecoverable-failure" msgstr "Make Envelope Unrecoverable Failure" #. TRANSLATORS: Envelope Maker Unrecoverable Storage Error -#: locale/ipp-strings.c:3258 +#: locale/ipp-strings.c:3296 msgid "printer-state-reasons.make-envelope-unrecoverable-storage-error" msgstr "Make Envelope Unrecoverable Storage Error" #. TRANSLATORS: Envelope Maker Warming Up -#: locale/ipp-strings.c:3260 +#: locale/ipp-strings.c:3298 msgid "printer-state-reasons.make-envelope-warming-up" msgstr "Make Envelope Warming Up" #. TRANSLATORS: Marker Adjusting Print Quality -#: locale/ipp-strings.c:3262 +#: locale/ipp-strings.c:3300 msgid "printer-state-reasons.marker-adjusting-print-quality" msgstr "Marker Adjusting Print Quality" #. TRANSLATORS: Marker Developer Almost Empty -#: locale/ipp-strings.c:3266 +#: locale/ipp-strings.c:3304 msgid "printer-state-reasons.marker-developer-almost-empty" msgstr "Marker Developer Almost Empty" #. TRANSLATORS: Marker Developer Empty -#: locale/ipp-strings.c:3268 +#: locale/ipp-strings.c:3306 msgid "printer-state-reasons.marker-developer-empty" msgstr "Marker Developer Empty" #. TRANSLATORS: Marker Fuser Thermistor Failure -#: locale/ipp-strings.c:3274 +#: locale/ipp-strings.c:3312 msgid "printer-state-reasons.marker-fuser-thermistor-failure" msgstr "Marker Fuser Thermistor Failure" #. TRANSLATORS: Marker Fuser Timing Failure -#: locale/ipp-strings.c:3276 +#: locale/ipp-strings.c:3314 msgid "printer-state-reasons.marker-fuser-timing-failure" msgstr "Marker Fuser Timing Failure" #. TRANSLATORS: Marker Ink Almost Empty -#: locale/ipp-strings.c:3278 +#: locale/ipp-strings.c:3316 msgid "printer-state-reasons.marker-ink-almost-empty" msgstr "Marker Ink Almost Empty" #. TRANSLATORS: Marker Ink Empty -#: locale/ipp-strings.c:3280 +#: locale/ipp-strings.c:3318 msgid "printer-state-reasons.marker-ink-empty" msgstr "Marker Ink Empty" #. TRANSLATORS: Marker Print Ribbon Almost Empty -#: locale/ipp-strings.c:3286 +#: locale/ipp-strings.c:3324 msgid "printer-state-reasons.marker-print-ribbon-almost-empty" msgstr "Marker Print Ribbon Almost Empty" #. TRANSLATORS: Marker Print Ribbon Empty -#: locale/ipp-strings.c:3288 +#: locale/ipp-strings.c:3326 msgid "printer-state-reasons.marker-print-ribbon-empty" msgstr "Marker Print Ribbon Empty" #. TRANSLATORS: Ink/toner empty -#: locale/ipp-strings.c:3294 +#: locale/ipp-strings.c:3332 msgid "printer-state-reasons.marker-supply-empty" msgstr "Marker Supply Empty" #. TRANSLATORS: Ink/toner low -#: locale/ipp-strings.c:3296 +#: locale/ipp-strings.c:3334 msgid "printer-state-reasons.marker-supply-low" msgstr "Marker Supply Low" #. TRANSLATORS: Marker Toner Cartridge Missing -#: locale/ipp-strings.c:3300 +#: locale/ipp-strings.c:3338 msgid "printer-state-reasons.marker-toner-cartridge-missing" msgstr "Marker Toner Cartridge Missing" #. TRANSLATORS: Ink/toner waste bin almost full -#: locale/ipp-strings.c:3304 +#: locale/ipp-strings.c:3342 msgid "printer-state-reasons.marker-waste-almost-full" msgstr "Marker Waste Almost Full" #. TRANSLATORS: Ink/toner waste bin full -#: locale/ipp-strings.c:3306 +#: locale/ipp-strings.c:3344 msgid "printer-state-reasons.marker-waste-full" msgstr "Marker Waste Full" #. TRANSLATORS: Marker Waste Ink Receptacle Almost Full -#: locale/ipp-strings.c:3308 +#: locale/ipp-strings.c:3346 msgid "printer-state-reasons.marker-waste-ink-receptacle-almost-full" msgstr "Marker Waste Ink Receptacle Almost Full" #. TRANSLATORS: Marker Waste Ink Receptacle Full -#: locale/ipp-strings.c:3310 +#: locale/ipp-strings.c:3348 msgid "printer-state-reasons.marker-waste-ink-receptacle-full" msgstr "Marker Waste Ink Receptacle Full" #. TRANSLATORS: Marker Waste Toner Receptacle Almost Full -#: locale/ipp-strings.c:3316 +#: locale/ipp-strings.c:3354 msgid "printer-state-reasons.marker-waste-toner-receptacle-almost-full" msgstr "Marker Waste Toner Receptacle Almost Full" #. TRANSLATORS: Marker Waste Toner Receptacle Full -#: locale/ipp-strings.c:3318 +#: locale/ipp-strings.c:3356 msgid "printer-state-reasons.marker-waste-toner-receptacle-full" msgstr "Marker Waste Toner Receptacle Full" #. TRANSLATORS: Material Empty -#: locale/ipp-strings.c:3322 +#: locale/ipp-strings.c:3360 msgid "printer-state-reasons.material-empty" msgstr "Material Empty" #. TRANSLATORS: Material Low -#: locale/ipp-strings.c:3324 +#: locale/ipp-strings.c:3362 msgid "printer-state-reasons.material-low" msgstr "Material Low" #. TRANSLATORS: Material Needed -#: locale/ipp-strings.c:3326 +#: locale/ipp-strings.c:3364 msgid "printer-state-reasons.material-needed" msgstr "Material Needed" #. TRANSLATORS: Paper tray is empty -#: locale/ipp-strings.c:3330 +#: locale/ipp-strings.c:3368 msgid "printer-state-reasons.media-empty" msgstr "Media Empty" #. TRANSLATORS: Paper jam -#: locale/ipp-strings.c:3332 +#: locale/ipp-strings.c:3370 msgid "printer-state-reasons.media-jam" msgstr "Media Jam" #. TRANSLATORS: Paper tray is almost empty -#: locale/ipp-strings.c:3334 +#: locale/ipp-strings.c:3372 msgid "printer-state-reasons.media-low" msgstr "Media Low" #. TRANSLATORS: Load paper -#: locale/ipp-strings.c:3336 +#: locale/ipp-strings.c:3374 msgid "printer-state-reasons.media-needed" msgstr "Media Needed" #. TRANSLATORS: Media Path Cannot Do 2-Sided Printing -#: locale/ipp-strings.c:3338 +#: locale/ipp-strings.c:3376 msgid "printer-state-reasons.media-path-cannot-duplex-media-selected" msgstr "Media Path Cannot Duplex Media Selected" #. TRANSLATORS: Media Path Media Tray Almost Full -#: locale/ipp-strings.c:3352 +#: locale/ipp-strings.c:3390 msgid "printer-state-reasons.media-path-media-tray-almost-full" msgstr "Media Path Media Tray Almost Full" #. TRANSLATORS: Media Path Media Tray Full -#: locale/ipp-strings.c:3354 +#: locale/ipp-strings.c:3392 msgid "printer-state-reasons.media-path-media-tray-full" msgstr "Media Path Media Tray Full" #. TRANSLATORS: Media Path Media Tray Missing -#: locale/ipp-strings.c:3356 +#: locale/ipp-strings.c:3394 msgid "printer-state-reasons.media-path-media-tray-missing" msgstr "Media Path Media Tray Missing" #. TRANSLATORS: Motor Failure -#: locale/ipp-strings.c:3372 +#: locale/ipp-strings.c:3410 msgid "printer-state-reasons.motor-failure" msgstr "Motor Failure" #. TRANSLATORS: Printer going offline -#: locale/ipp-strings.c:3374 +#: locale/ipp-strings.c:3412 msgid "printer-state-reasons.moving-to-paused" msgstr "Moving To Paused" #. TRANSLATORS: None -#: locale/ipp-strings.c:3376 +#: locale/ipp-strings.c:3414 msgid "printer-state-reasons.none" msgstr "None" #. TRANSLATORS: Optical Photoconductor Life Over -#: locale/ipp-strings.c:3378 +#: locale/ipp-strings.c:3416 msgid "printer-state-reasons.opc-life-over" msgstr "Opc Life Over" #. TRANSLATORS: OPC almost at end-of-life -#: locale/ipp-strings.c:3380 +#: locale/ipp-strings.c:3418 msgid "printer-state-reasons.opc-near-eol" msgstr "Opc Near Eol" #. TRANSLATORS: Check the printer for errors -#: locale/ipp-strings.c:3382 +#: locale/ipp-strings.c:3420 msgid "printer-state-reasons.other" msgstr "Other" #. TRANSLATORS: Output bin is almost full -#: locale/ipp-strings.c:3384 +#: locale/ipp-strings.c:3422 msgid "printer-state-reasons.output-area-almost-full" msgstr "Output Area Almost Full" #. TRANSLATORS: Output bin is full -#: locale/ipp-strings.c:3386 +#: locale/ipp-strings.c:3424 msgid "printer-state-reasons.output-area-full" msgstr "Output Area Full" #. TRANSLATORS: Output Mailbox Select Failure -#: locale/ipp-strings.c:3388 +#: locale/ipp-strings.c:3426 msgid "printer-state-reasons.output-mailbox-select-failure" msgstr "Output Mailbox Select Failure" #. TRANSLATORS: Output tray is missing -#: locale/ipp-strings.c:3396 +#: locale/ipp-strings.c:3434 msgid "printer-state-reasons.output-tray-missing" msgstr "Output Tray Missing" #. TRANSLATORS: Paused -#: locale/ipp-strings.c:3398 +#: locale/ipp-strings.c:3436 msgid "printer-state-reasons.paused" msgstr "Paused" #. TRANSLATORS: Perforater Added -#: locale/ipp-strings.c:3400 +#: locale/ipp-strings.c:3438 msgid "printer-state-reasons.perforater-added" msgstr "Perforater Added" #. TRANSLATORS: Perforater Almost Empty -#: locale/ipp-strings.c:3402 +#: locale/ipp-strings.c:3440 msgid "printer-state-reasons.perforater-almost-empty" msgstr "Perforater Almost Empty" #. TRANSLATORS: Perforater Almost Full -#: locale/ipp-strings.c:3404 +#: locale/ipp-strings.c:3442 msgid "printer-state-reasons.perforater-almost-full" msgstr "Perforater Almost Full" #. TRANSLATORS: Perforater At Limit -#: locale/ipp-strings.c:3406 +#: locale/ipp-strings.c:3444 msgid "printer-state-reasons.perforater-at-limit" msgstr "Perforater At Limit" #. TRANSLATORS: Perforater Closed -#: locale/ipp-strings.c:3408 +#: locale/ipp-strings.c:3446 msgid "printer-state-reasons.perforater-closed" msgstr "Perforater Closed" #. TRANSLATORS: Perforater Configuration Change -#: locale/ipp-strings.c:3410 +#: locale/ipp-strings.c:3448 msgid "printer-state-reasons.perforater-configuration-change" msgstr "Perforater Configuration Change" #. TRANSLATORS: Perforater Cover Closed -#: locale/ipp-strings.c:3412 +#: locale/ipp-strings.c:3450 msgid "printer-state-reasons.perforater-cover-closed" msgstr "Perforater Cover Closed" #. TRANSLATORS: Perforater Cover Open -#: locale/ipp-strings.c:3414 +#: locale/ipp-strings.c:3452 msgid "printer-state-reasons.perforater-cover-open" msgstr "Perforater Cover Open" #. TRANSLATORS: Perforater Empty -#: locale/ipp-strings.c:3416 +#: locale/ipp-strings.c:3454 msgid "printer-state-reasons.perforater-empty" msgstr "Perforater Empty" #. TRANSLATORS: Perforater Full -#: locale/ipp-strings.c:3418 +#: locale/ipp-strings.c:3456 msgid "printer-state-reasons.perforater-full" msgstr "Perforater Full" #. TRANSLATORS: Perforater Interlock Closed -#: locale/ipp-strings.c:3420 +#: locale/ipp-strings.c:3458 msgid "printer-state-reasons.perforater-interlock-closed" msgstr "Perforater Interlock Closed" #. TRANSLATORS: Perforater Interlock Open -#: locale/ipp-strings.c:3422 +#: locale/ipp-strings.c:3460 msgid "printer-state-reasons.perforater-interlock-open" msgstr "Perforater Interlock Open" #. TRANSLATORS: Perforater Jam -#: locale/ipp-strings.c:3424 +#: locale/ipp-strings.c:3462 msgid "printer-state-reasons.perforater-jam" msgstr "Perforater Jam" #. TRANSLATORS: Perforater Life Almost Over -#: locale/ipp-strings.c:3426 +#: locale/ipp-strings.c:3464 msgid "printer-state-reasons.perforater-life-almost-over" msgstr "Perforater Life Almost Over" #. TRANSLATORS: Perforater Life Over -#: locale/ipp-strings.c:3428 +#: locale/ipp-strings.c:3466 msgid "printer-state-reasons.perforater-life-over" msgstr "Perforater Life Over" #. TRANSLATORS: Perforater Memory Exhausted -#: locale/ipp-strings.c:3430 +#: locale/ipp-strings.c:3468 msgid "printer-state-reasons.perforater-memory-exhausted" msgstr "Perforater Memory Exhausted" #. TRANSLATORS: Perforater Missing -#: locale/ipp-strings.c:3432 +#: locale/ipp-strings.c:3470 msgid "printer-state-reasons.perforater-missing" msgstr "Perforater Missing" #. TRANSLATORS: Perforater Motor Failure -#: locale/ipp-strings.c:3434 +#: locale/ipp-strings.c:3472 msgid "printer-state-reasons.perforater-motor-failure" msgstr "Perforater Motor Failure" #. TRANSLATORS: Perforater Near Limit -#: locale/ipp-strings.c:3436 +#: locale/ipp-strings.c:3474 msgid "printer-state-reasons.perforater-near-limit" msgstr "Perforater Near Limit" #. TRANSLATORS: Perforater Offline -#: locale/ipp-strings.c:3438 +#: locale/ipp-strings.c:3476 msgid "printer-state-reasons.perforater-offline" msgstr "Perforater Offline" #. TRANSLATORS: Perforater Opened -#: locale/ipp-strings.c:3440 +#: locale/ipp-strings.c:3478 msgid "printer-state-reasons.perforater-opened" msgstr "Perforater Opened" #. TRANSLATORS: Perforater Over Temperature -#: locale/ipp-strings.c:3442 +#: locale/ipp-strings.c:3480 msgid "printer-state-reasons.perforater-over-temperature" msgstr "Perforater Over Temperature" #. TRANSLATORS: Perforater Power Saver -#: locale/ipp-strings.c:3444 +#: locale/ipp-strings.c:3482 msgid "printer-state-reasons.perforater-power-saver" msgstr "Perforater Power Saver" #. TRANSLATORS: Perforater Recoverable Failure -#: locale/ipp-strings.c:3446 +#: locale/ipp-strings.c:3484 msgid "printer-state-reasons.perforater-recoverable-failure" msgstr "Perforater Recoverable Failure" #. TRANSLATORS: Perforater Recoverable Storage -#: locale/ipp-strings.c:3448 +#: locale/ipp-strings.c:3486 msgid "printer-state-reasons.perforater-recoverable-storage" msgstr "Perforater Recoverable Storage" #. TRANSLATORS: Perforater Removed -#: locale/ipp-strings.c:3450 +#: locale/ipp-strings.c:3488 msgid "printer-state-reasons.perforater-removed" msgstr "Perforater Removed" #. TRANSLATORS: Perforater Resource Added -#: locale/ipp-strings.c:3452 +#: locale/ipp-strings.c:3490 msgid "printer-state-reasons.perforater-resource-added" msgstr "Perforater Resource Added" #. TRANSLATORS: Perforater Resource Removed -#: locale/ipp-strings.c:3454 +#: locale/ipp-strings.c:3492 msgid "printer-state-reasons.perforater-resource-removed" msgstr "Perforater Resource Removed" #. TRANSLATORS: Perforater Thermistor Failure -#: locale/ipp-strings.c:3456 +#: locale/ipp-strings.c:3494 msgid "printer-state-reasons.perforater-thermistor-failure" msgstr "Perforater Thermistor Failure" #. TRANSLATORS: Perforater Timing Failure -#: locale/ipp-strings.c:3458 +#: locale/ipp-strings.c:3496 msgid "printer-state-reasons.perforater-timing-failure" msgstr "Perforater Timing Failure" #. TRANSLATORS: Perforater Turned Off -#: locale/ipp-strings.c:3460 +#: locale/ipp-strings.c:3498 msgid "printer-state-reasons.perforater-turned-off" msgstr "Perforater Turned Off" #. TRANSLATORS: Perforater Turned On -#: locale/ipp-strings.c:3462 +#: locale/ipp-strings.c:3500 msgid "printer-state-reasons.perforater-turned-on" msgstr "Perforater Turned On" #. TRANSLATORS: Perforater Under Temperature -#: locale/ipp-strings.c:3464 +#: locale/ipp-strings.c:3502 msgid "printer-state-reasons.perforater-under-temperature" msgstr "Perforater Under Temperature" #. TRANSLATORS: Perforater Unrecoverable Failure -#: locale/ipp-strings.c:3466 +#: locale/ipp-strings.c:3504 msgid "printer-state-reasons.perforater-unrecoverable-failure" msgstr "Perforater Unrecoverable Failure" #. TRANSLATORS: Perforater Unrecoverable Storage Error -#: locale/ipp-strings.c:3468 +#: locale/ipp-strings.c:3506 msgid "printer-state-reasons.perforater-unrecoverable-storage-error" msgstr "Perforater Unrecoverable Storage Error" #. TRANSLATORS: Perforater Warming Up -#: locale/ipp-strings.c:3470 +#: locale/ipp-strings.c:3508 msgid "printer-state-reasons.perforater-warming-up" msgstr "Perforater Warming Up" #. TRANSLATORS: Power Down -#: locale/ipp-strings.c:3482 +#: locale/ipp-strings.c:3520 msgid "printer-state-reasons.power-down" msgstr "Power Down" #. TRANSLATORS: Power Up -#: locale/ipp-strings.c:3484 +#: locale/ipp-strings.c:3522 msgid "printer-state-reasons.power-up" msgstr "Power Up" #. TRANSLATORS: Printer Reset Manually -#: locale/ipp-strings.c:3486 +#: locale/ipp-strings.c:3524 msgid "printer-state-reasons.printer-manual-reset" msgstr "Printer Manual Reset" #. TRANSLATORS: Printer Reset Remotely -#: locale/ipp-strings.c:3488 +#: locale/ipp-strings.c:3526 msgid "printer-state-reasons.printer-nms-reset" msgstr "Printer Nms Reset" #. TRANSLATORS: Printer Ready To Print -#: locale/ipp-strings.c:3490 +#: locale/ipp-strings.c:3528 msgid "printer-state-reasons.printer-ready-to-print" msgstr "Printer Ready To Print" #. TRANSLATORS: Puncher Added -#: locale/ipp-strings.c:3492 +#: locale/ipp-strings.c:3530 msgid "printer-state-reasons.puncher-added" msgstr "Puncher Added" #. TRANSLATORS: Puncher Almost Empty -#: locale/ipp-strings.c:3494 +#: locale/ipp-strings.c:3532 msgid "printer-state-reasons.puncher-almost-empty" msgstr "Puncher Almost Empty" #. TRANSLATORS: Puncher Almost Full -#: locale/ipp-strings.c:3496 +#: locale/ipp-strings.c:3534 msgid "printer-state-reasons.puncher-almost-full" msgstr "Puncher Almost Full" #. TRANSLATORS: Puncher At Limit -#: locale/ipp-strings.c:3498 +#: locale/ipp-strings.c:3536 msgid "printer-state-reasons.puncher-at-limit" msgstr "Puncher At Limit" #. TRANSLATORS: Puncher Closed -#: locale/ipp-strings.c:3500 +#: locale/ipp-strings.c:3538 msgid "printer-state-reasons.puncher-closed" msgstr "Puncher Closed" #. TRANSLATORS: Puncher Configuration Change -#: locale/ipp-strings.c:3502 +#: locale/ipp-strings.c:3540 msgid "printer-state-reasons.puncher-configuration-change" msgstr "Puncher Configuration Change" #. TRANSLATORS: Puncher Cover Closed -#: locale/ipp-strings.c:3504 +#: locale/ipp-strings.c:3542 msgid "printer-state-reasons.puncher-cover-closed" msgstr "Puncher Cover Closed" #. TRANSLATORS: Puncher Cover Open -#: locale/ipp-strings.c:3506 +#: locale/ipp-strings.c:3544 msgid "printer-state-reasons.puncher-cover-open" msgstr "Puncher Cover Open" #. TRANSLATORS: Puncher Empty -#: locale/ipp-strings.c:3508 +#: locale/ipp-strings.c:3546 msgid "printer-state-reasons.puncher-empty" msgstr "Puncher Empty" #. TRANSLATORS: Puncher Full -#: locale/ipp-strings.c:3510 +#: locale/ipp-strings.c:3548 msgid "printer-state-reasons.puncher-full" msgstr "Puncher Full" #. TRANSLATORS: Puncher Interlock Closed -#: locale/ipp-strings.c:3512 +#: locale/ipp-strings.c:3550 msgid "printer-state-reasons.puncher-interlock-closed" msgstr "Puncher Interlock Closed" #. TRANSLATORS: Puncher Interlock Open -#: locale/ipp-strings.c:3514 +#: locale/ipp-strings.c:3552 msgid "printer-state-reasons.puncher-interlock-open" msgstr "Puncher Interlock Open" #. TRANSLATORS: Puncher Jam -#: locale/ipp-strings.c:3516 +#: locale/ipp-strings.c:3554 msgid "printer-state-reasons.puncher-jam" msgstr "Puncher Jam" #. TRANSLATORS: Puncher Life Almost Over -#: locale/ipp-strings.c:3518 +#: locale/ipp-strings.c:3556 msgid "printer-state-reasons.puncher-life-almost-over" msgstr "Puncher Life Almost Over" #. TRANSLATORS: Puncher Life Over -#: locale/ipp-strings.c:3520 +#: locale/ipp-strings.c:3558 msgid "printer-state-reasons.puncher-life-over" msgstr "Puncher Life Over" #. TRANSLATORS: Puncher Memory Exhausted -#: locale/ipp-strings.c:3522 +#: locale/ipp-strings.c:3560 msgid "printer-state-reasons.puncher-memory-exhausted" msgstr "Puncher Memory Exhausted" #. TRANSLATORS: Puncher Missing -#: locale/ipp-strings.c:3524 +#: locale/ipp-strings.c:3562 msgid "printer-state-reasons.puncher-missing" msgstr "Puncher Missing" #. TRANSLATORS: Puncher Motor Failure -#: locale/ipp-strings.c:3526 +#: locale/ipp-strings.c:3564 msgid "printer-state-reasons.puncher-motor-failure" msgstr "Puncher Motor Failure" #. TRANSLATORS: Puncher Near Limit -#: locale/ipp-strings.c:3528 +#: locale/ipp-strings.c:3566 msgid "printer-state-reasons.puncher-near-limit" msgstr "Puncher Near Limit" #. TRANSLATORS: Puncher Offline -#: locale/ipp-strings.c:3530 +#: locale/ipp-strings.c:3568 msgid "printer-state-reasons.puncher-offline" msgstr "Puncher Offline" #. TRANSLATORS: Puncher Opened -#: locale/ipp-strings.c:3532 +#: locale/ipp-strings.c:3570 msgid "printer-state-reasons.puncher-opened" msgstr "Puncher Opened" #. TRANSLATORS: Puncher Over Temperature -#: locale/ipp-strings.c:3534 +#: locale/ipp-strings.c:3572 msgid "printer-state-reasons.puncher-over-temperature" msgstr "Puncher Over Temperature" #. TRANSLATORS: Puncher Power Saver -#: locale/ipp-strings.c:3536 +#: locale/ipp-strings.c:3574 msgid "printer-state-reasons.puncher-power-saver" msgstr "Puncher Power Saver" #. TRANSLATORS: Puncher Recoverable Failure -#: locale/ipp-strings.c:3538 +#: locale/ipp-strings.c:3576 msgid "printer-state-reasons.puncher-recoverable-failure" msgstr "Puncher Recoverable Failure" #. TRANSLATORS: Puncher Recoverable Storage -#: locale/ipp-strings.c:3540 +#: locale/ipp-strings.c:3578 msgid "printer-state-reasons.puncher-recoverable-storage" msgstr "Puncher Recoverable Storage" #. TRANSLATORS: Puncher Removed -#: locale/ipp-strings.c:3542 +#: locale/ipp-strings.c:3580 msgid "printer-state-reasons.puncher-removed" msgstr "Puncher Removed" #. TRANSLATORS: Puncher Resource Added -#: locale/ipp-strings.c:3544 +#: locale/ipp-strings.c:3582 msgid "printer-state-reasons.puncher-resource-added" msgstr "Puncher Resource Added" #. TRANSLATORS: Puncher Resource Removed -#: locale/ipp-strings.c:3546 +#: locale/ipp-strings.c:3584 msgid "printer-state-reasons.puncher-resource-removed" msgstr "Puncher Resource Removed" #. TRANSLATORS: Puncher Thermistor Failure -#: locale/ipp-strings.c:3548 +#: locale/ipp-strings.c:3586 msgid "printer-state-reasons.puncher-thermistor-failure" msgstr "Puncher Thermistor Failure" #. TRANSLATORS: Puncher Timing Failure -#: locale/ipp-strings.c:3550 +#: locale/ipp-strings.c:3588 msgid "printer-state-reasons.puncher-timing-failure" msgstr "Puncher Timing Failure" #. TRANSLATORS: Puncher Turned Off -#: locale/ipp-strings.c:3552 +#: locale/ipp-strings.c:3590 msgid "printer-state-reasons.puncher-turned-off" msgstr "Puncher Turned Off" #. TRANSLATORS: Puncher Turned On -#: locale/ipp-strings.c:3554 +#: locale/ipp-strings.c:3592 msgid "printer-state-reasons.puncher-turned-on" msgstr "Puncher Turned On" #. TRANSLATORS: Puncher Under Temperature -#: locale/ipp-strings.c:3556 +#: locale/ipp-strings.c:3594 msgid "printer-state-reasons.puncher-under-temperature" msgstr "Puncher Under Temperature" #. TRANSLATORS: Puncher Unrecoverable Failure -#: locale/ipp-strings.c:3558 +#: locale/ipp-strings.c:3596 msgid "printer-state-reasons.puncher-unrecoverable-failure" msgstr "Puncher Unrecoverable Failure" #. TRANSLATORS: Puncher Unrecoverable Storage Error -#: locale/ipp-strings.c:3560 +#: locale/ipp-strings.c:3598 msgid "printer-state-reasons.puncher-unrecoverable-storage-error" msgstr "Puncher Unrecoverable Storage Error" #. TRANSLATORS: Puncher Warming Up -#: locale/ipp-strings.c:3562 +#: locale/ipp-strings.c:3600 msgid "printer-state-reasons.puncher-warming-up" msgstr "Puncher Warming Up" #. TRANSLATORS: Separation Cutter Added -#: locale/ipp-strings.c:3564 +#: locale/ipp-strings.c:3602 msgid "printer-state-reasons.separation-cutter-added" msgstr "Separation Cutter Added" #. TRANSLATORS: Separation Cutter Almost Empty -#: locale/ipp-strings.c:3566 +#: locale/ipp-strings.c:3604 msgid "printer-state-reasons.separation-cutter-almost-empty" msgstr "Separation Cutter Almost Empty" #. TRANSLATORS: Separation Cutter Almost Full -#: locale/ipp-strings.c:3568 +#: locale/ipp-strings.c:3606 msgid "printer-state-reasons.separation-cutter-almost-full" msgstr "Separation Cutter Almost Full" #. TRANSLATORS: Separation Cutter At Limit -#: locale/ipp-strings.c:3570 +#: locale/ipp-strings.c:3608 msgid "printer-state-reasons.separation-cutter-at-limit" msgstr "Separation Cutter At Limit" #. TRANSLATORS: Separation Cutter Closed -#: locale/ipp-strings.c:3572 +#: locale/ipp-strings.c:3610 msgid "printer-state-reasons.separation-cutter-closed" msgstr "Separation Cutter Closed" #. TRANSLATORS: Separation Cutter Configuration Change -#: locale/ipp-strings.c:3574 +#: locale/ipp-strings.c:3612 msgid "printer-state-reasons.separation-cutter-configuration-change" msgstr "Separation Cutter Configuration Change" #. TRANSLATORS: Separation Cutter Cover Closed -#: locale/ipp-strings.c:3576 +#: locale/ipp-strings.c:3614 msgid "printer-state-reasons.separation-cutter-cover-closed" msgstr "Separation Cutter Cover Closed" #. TRANSLATORS: Separation Cutter Cover Open -#: locale/ipp-strings.c:3578 +#: locale/ipp-strings.c:3616 msgid "printer-state-reasons.separation-cutter-cover-open" msgstr "Separation Cutter Cover Open" #. TRANSLATORS: Separation Cutter Empty -#: locale/ipp-strings.c:3580 +#: locale/ipp-strings.c:3618 msgid "printer-state-reasons.separation-cutter-empty" msgstr "Separation Cutter Empty" #. TRANSLATORS: Separation Cutter Full -#: locale/ipp-strings.c:3582 +#: locale/ipp-strings.c:3620 msgid "printer-state-reasons.separation-cutter-full" msgstr "Separation Cutter Full" #. TRANSLATORS: Separation Cutter Interlock Closed -#: locale/ipp-strings.c:3584 +#: locale/ipp-strings.c:3622 msgid "printer-state-reasons.separation-cutter-interlock-closed" msgstr "Separation Cutter Interlock Closed" #. TRANSLATORS: Separation Cutter Interlock Open -#: locale/ipp-strings.c:3586 +#: locale/ipp-strings.c:3624 msgid "printer-state-reasons.separation-cutter-interlock-open" msgstr "Separation Cutter Interlock Open" #. TRANSLATORS: Separation Cutter Jam -#: locale/ipp-strings.c:3588 +#: locale/ipp-strings.c:3626 msgid "printer-state-reasons.separation-cutter-jam" msgstr "Separation Cutter Jam" #. TRANSLATORS: Separation Cutter Life Almost Over -#: locale/ipp-strings.c:3590 +#: locale/ipp-strings.c:3628 msgid "printer-state-reasons.separation-cutter-life-almost-over" msgstr "Separation Cutter Life Almost Over" #. TRANSLATORS: Separation Cutter Life Over -#: locale/ipp-strings.c:3592 +#: locale/ipp-strings.c:3630 msgid "printer-state-reasons.separation-cutter-life-over" msgstr "Separation Cutter Life Over" #. TRANSLATORS: Separation Cutter Memory Exhausted -#: locale/ipp-strings.c:3594 +#: locale/ipp-strings.c:3632 msgid "printer-state-reasons.separation-cutter-memory-exhausted" msgstr "Separation Cutter Memory Exhausted" #. TRANSLATORS: Separation Cutter Missing -#: locale/ipp-strings.c:3596 +#: locale/ipp-strings.c:3634 msgid "printer-state-reasons.separation-cutter-missing" msgstr "Separation Cutter Missing" #. TRANSLATORS: Separation Cutter Motor Failure -#: locale/ipp-strings.c:3598 +#: locale/ipp-strings.c:3636 msgid "printer-state-reasons.separation-cutter-motor-failure" msgstr "Separation Cutter Motor Failure" #. TRANSLATORS: Separation Cutter Near Limit -#: locale/ipp-strings.c:3600 +#: locale/ipp-strings.c:3638 msgid "printer-state-reasons.separation-cutter-near-limit" msgstr "Separation Cutter Near Limit" #. TRANSLATORS: Separation Cutter Offline -#: locale/ipp-strings.c:3602 +#: locale/ipp-strings.c:3640 msgid "printer-state-reasons.separation-cutter-offline" msgstr "Separation Cutter Offline" #. TRANSLATORS: Separation Cutter Opened -#: locale/ipp-strings.c:3604 +#: locale/ipp-strings.c:3642 msgid "printer-state-reasons.separation-cutter-opened" msgstr "Separation Cutter Opened" #. TRANSLATORS: Separation Cutter Over Temperature -#: locale/ipp-strings.c:3606 +#: locale/ipp-strings.c:3644 msgid "printer-state-reasons.separation-cutter-over-temperature" msgstr "Separation Cutter Over Temperature" #. TRANSLATORS: Separation Cutter Power Saver -#: locale/ipp-strings.c:3608 +#: locale/ipp-strings.c:3646 msgid "printer-state-reasons.separation-cutter-power-saver" msgstr "Separation Cutter Power Saver" #. TRANSLATORS: Separation Cutter Recoverable Failure -#: locale/ipp-strings.c:3610 +#: locale/ipp-strings.c:3648 msgid "printer-state-reasons.separation-cutter-recoverable-failure" msgstr "Separation Cutter Recoverable Failure" #. TRANSLATORS: Separation Cutter Recoverable Storage -#: locale/ipp-strings.c:3612 +#: locale/ipp-strings.c:3650 msgid "printer-state-reasons.separation-cutter-recoverable-storage" msgstr "Separation Cutter Recoverable Storage" #. TRANSLATORS: Separation Cutter Removed -#: locale/ipp-strings.c:3614 +#: locale/ipp-strings.c:3652 msgid "printer-state-reasons.separation-cutter-removed" msgstr "Separation Cutter Removed" #. TRANSLATORS: Separation Cutter Resource Added -#: locale/ipp-strings.c:3616 +#: locale/ipp-strings.c:3654 msgid "printer-state-reasons.separation-cutter-resource-added" msgstr "Separation Cutter Resource Added" #. TRANSLATORS: Separation Cutter Resource Removed -#: locale/ipp-strings.c:3618 +#: locale/ipp-strings.c:3656 msgid "printer-state-reasons.separation-cutter-resource-removed" msgstr "Separation Cutter Resource Removed" #. TRANSLATORS: Separation Cutter Thermistor Failure -#: locale/ipp-strings.c:3620 +#: locale/ipp-strings.c:3658 msgid "printer-state-reasons.separation-cutter-thermistor-failure" msgstr "Separation Cutter Thermistor Failure" #. TRANSLATORS: Separation Cutter Timing Failure -#: locale/ipp-strings.c:3622 +#: locale/ipp-strings.c:3660 msgid "printer-state-reasons.separation-cutter-timing-failure" msgstr "Separation Cutter Timing Failure" #. TRANSLATORS: Separation Cutter Turned Off -#: locale/ipp-strings.c:3624 +#: locale/ipp-strings.c:3662 msgid "printer-state-reasons.separation-cutter-turned-off" msgstr "Separation Cutter Turned Off" #. TRANSLATORS: Separation Cutter Turned On -#: locale/ipp-strings.c:3626 +#: locale/ipp-strings.c:3664 msgid "printer-state-reasons.separation-cutter-turned-on" msgstr "Separation Cutter Turned On" #. TRANSLATORS: Separation Cutter Under Temperature -#: locale/ipp-strings.c:3628 +#: locale/ipp-strings.c:3666 msgid "printer-state-reasons.separation-cutter-under-temperature" msgstr "Separation Cutter Under Temperature" #. TRANSLATORS: Separation Cutter Unrecoverable Failure -#: locale/ipp-strings.c:3630 +#: locale/ipp-strings.c:3668 msgid "printer-state-reasons.separation-cutter-unrecoverable-failure" msgstr "Separation Cutter Unrecoverable Failure" #. TRANSLATORS: Separation Cutter Unrecoverable Storage Error -#: locale/ipp-strings.c:3632 +#: locale/ipp-strings.c:3670 msgid "printer-state-reasons.separation-cutter-unrecoverable-storage-error" msgstr "Separation Cutter Unrecoverable Storage Error" #. TRANSLATORS: Separation Cutter Warming Up -#: locale/ipp-strings.c:3634 +#: locale/ipp-strings.c:3672 msgid "printer-state-reasons.separation-cutter-warming-up" msgstr "Separation Cutter Warming Up" #. TRANSLATORS: Sheet Rotator Added -#: locale/ipp-strings.c:3636 +#: locale/ipp-strings.c:3674 msgid "printer-state-reasons.sheet-rotator-added" msgstr "Sheet Rotator Added" #. TRANSLATORS: Sheet Rotator Almost Empty -#: locale/ipp-strings.c:3638 +#: locale/ipp-strings.c:3676 msgid "printer-state-reasons.sheet-rotator-almost-empty" msgstr "Sheet Rotator Almost Empty" #. TRANSLATORS: Sheet Rotator Almost Full -#: locale/ipp-strings.c:3640 +#: locale/ipp-strings.c:3678 msgid "printer-state-reasons.sheet-rotator-almost-full" msgstr "Sheet Rotator Almost Full" #. TRANSLATORS: Sheet Rotator At Limit -#: locale/ipp-strings.c:3642 +#: locale/ipp-strings.c:3680 msgid "printer-state-reasons.sheet-rotator-at-limit" msgstr "Sheet Rotator At Limit" #. TRANSLATORS: Sheet Rotator Closed -#: locale/ipp-strings.c:3644 +#: locale/ipp-strings.c:3682 msgid "printer-state-reasons.sheet-rotator-closed" msgstr "Sheet Rotator Closed" #. TRANSLATORS: Sheet Rotator Configuration Change -#: locale/ipp-strings.c:3646 +#: locale/ipp-strings.c:3684 msgid "printer-state-reasons.sheet-rotator-configuration-change" msgstr "Sheet Rotator Configuration Change" #. TRANSLATORS: Sheet Rotator Cover Closed -#: locale/ipp-strings.c:3648 +#: locale/ipp-strings.c:3686 msgid "printer-state-reasons.sheet-rotator-cover-closed" msgstr "Sheet Rotator Cover Closed" #. TRANSLATORS: Sheet Rotator Cover Open -#: locale/ipp-strings.c:3650 +#: locale/ipp-strings.c:3688 msgid "printer-state-reasons.sheet-rotator-cover-open" msgstr "Sheet Rotator Cover Open" #. TRANSLATORS: Sheet Rotator Empty -#: locale/ipp-strings.c:3652 +#: locale/ipp-strings.c:3690 msgid "printer-state-reasons.sheet-rotator-empty" msgstr "Sheet Rotator Empty" #. TRANSLATORS: Sheet Rotator Full -#: locale/ipp-strings.c:3654 +#: locale/ipp-strings.c:3692 msgid "printer-state-reasons.sheet-rotator-full" msgstr "Sheet Rotator Full" #. TRANSLATORS: Sheet Rotator Interlock Closed -#: locale/ipp-strings.c:3656 +#: locale/ipp-strings.c:3694 msgid "printer-state-reasons.sheet-rotator-interlock-closed" msgstr "Sheet Rotator Interlock Closed" #. TRANSLATORS: Sheet Rotator Interlock Open -#: locale/ipp-strings.c:3658 +#: locale/ipp-strings.c:3696 msgid "printer-state-reasons.sheet-rotator-interlock-open" msgstr "Sheet Rotator Interlock Open" #. TRANSLATORS: Sheet Rotator Jam -#: locale/ipp-strings.c:3660 +#: locale/ipp-strings.c:3698 msgid "printer-state-reasons.sheet-rotator-jam" msgstr "Sheet Rotator Jam" #. TRANSLATORS: Sheet Rotator Life Almost Over -#: locale/ipp-strings.c:3662 +#: locale/ipp-strings.c:3700 msgid "printer-state-reasons.sheet-rotator-life-almost-over" msgstr "Sheet Rotator Life Almost Over" #. TRANSLATORS: Sheet Rotator Life Over -#: locale/ipp-strings.c:3664 +#: locale/ipp-strings.c:3702 msgid "printer-state-reasons.sheet-rotator-life-over" msgstr "Sheet Rotator Life Over" #. TRANSLATORS: Sheet Rotator Memory Exhausted -#: locale/ipp-strings.c:3666 +#: locale/ipp-strings.c:3704 msgid "printer-state-reasons.sheet-rotator-memory-exhausted" msgstr "Sheet Rotator Memory Exhausted" #. TRANSLATORS: Sheet Rotator Missing -#: locale/ipp-strings.c:3668 +#: locale/ipp-strings.c:3706 msgid "printer-state-reasons.sheet-rotator-missing" msgstr "Sheet Rotator Missing" #. TRANSLATORS: Sheet Rotator Motor Failure -#: locale/ipp-strings.c:3670 +#: locale/ipp-strings.c:3708 msgid "printer-state-reasons.sheet-rotator-motor-failure" msgstr "Sheet Rotator Motor Failure" #. TRANSLATORS: Sheet Rotator Near Limit -#: locale/ipp-strings.c:3672 +#: locale/ipp-strings.c:3710 msgid "printer-state-reasons.sheet-rotator-near-limit" msgstr "Sheet Rotator Near Limit" #. TRANSLATORS: Sheet Rotator Offline -#: locale/ipp-strings.c:3674 +#: locale/ipp-strings.c:3712 msgid "printer-state-reasons.sheet-rotator-offline" msgstr "Sheet Rotator Offline" #. TRANSLATORS: Sheet Rotator Opened -#: locale/ipp-strings.c:3676 +#: locale/ipp-strings.c:3714 msgid "printer-state-reasons.sheet-rotator-opened" msgstr "Sheet Rotator Opened" #. TRANSLATORS: Sheet Rotator Over Temperature -#: locale/ipp-strings.c:3678 +#: locale/ipp-strings.c:3716 msgid "printer-state-reasons.sheet-rotator-over-temperature" msgstr "Sheet Rotator Over Temperature" #. TRANSLATORS: Sheet Rotator Power Saver -#: locale/ipp-strings.c:3680 +#: locale/ipp-strings.c:3718 msgid "printer-state-reasons.sheet-rotator-power-saver" msgstr "Sheet Rotator Power Saver" #. TRANSLATORS: Sheet Rotator Recoverable Failure -#: locale/ipp-strings.c:3682 +#: locale/ipp-strings.c:3720 msgid "printer-state-reasons.sheet-rotator-recoverable-failure" msgstr "Sheet Rotator Recoverable Failure" #. TRANSLATORS: Sheet Rotator Recoverable Storage -#: locale/ipp-strings.c:3684 +#: locale/ipp-strings.c:3722 msgid "printer-state-reasons.sheet-rotator-recoverable-storage" msgstr "Sheet Rotator Recoverable Storage" #. TRANSLATORS: Sheet Rotator Removed -#: locale/ipp-strings.c:3686 +#: locale/ipp-strings.c:3724 msgid "printer-state-reasons.sheet-rotator-removed" msgstr "Sheet Rotator Removed" #. TRANSLATORS: Sheet Rotator Resource Added -#: locale/ipp-strings.c:3688 +#: locale/ipp-strings.c:3726 msgid "printer-state-reasons.sheet-rotator-resource-added" msgstr "Sheet Rotator Resource Added" #. TRANSLATORS: Sheet Rotator Resource Removed -#: locale/ipp-strings.c:3690 +#: locale/ipp-strings.c:3728 msgid "printer-state-reasons.sheet-rotator-resource-removed" msgstr "Sheet Rotator Resource Removed" #. TRANSLATORS: Sheet Rotator Thermistor Failure -#: locale/ipp-strings.c:3692 +#: locale/ipp-strings.c:3730 msgid "printer-state-reasons.sheet-rotator-thermistor-failure" msgstr "Sheet Rotator Thermistor Failure" #. TRANSLATORS: Sheet Rotator Timing Failure -#: locale/ipp-strings.c:3694 +#: locale/ipp-strings.c:3732 msgid "printer-state-reasons.sheet-rotator-timing-failure" msgstr "Sheet Rotator Timing Failure" #. TRANSLATORS: Sheet Rotator Turned Off -#: locale/ipp-strings.c:3696 +#: locale/ipp-strings.c:3734 msgid "printer-state-reasons.sheet-rotator-turned-off" msgstr "Sheet Rotator Turned Off" #. TRANSLATORS: Sheet Rotator Turned On -#: locale/ipp-strings.c:3698 +#: locale/ipp-strings.c:3736 msgid "printer-state-reasons.sheet-rotator-turned-on" msgstr "Sheet Rotator Turned On" #. TRANSLATORS: Sheet Rotator Under Temperature -#: locale/ipp-strings.c:3700 +#: locale/ipp-strings.c:3738 msgid "printer-state-reasons.sheet-rotator-under-temperature" msgstr "Sheet Rotator Under Temperature" #. TRANSLATORS: Sheet Rotator Unrecoverable Failure -#: locale/ipp-strings.c:3702 +#: locale/ipp-strings.c:3740 msgid "printer-state-reasons.sheet-rotator-unrecoverable-failure" msgstr "Sheet Rotator Unrecoverable Failure" #. TRANSLATORS: Sheet Rotator Unrecoverable Storage Error -#: locale/ipp-strings.c:3704 +#: locale/ipp-strings.c:3742 msgid "printer-state-reasons.sheet-rotator-unrecoverable-storage-error" msgstr "Sheet Rotator Unrecoverable Storage Error" #. TRANSLATORS: Sheet Rotator Warming Up -#: locale/ipp-strings.c:3706 +#: locale/ipp-strings.c:3744 msgid "printer-state-reasons.sheet-rotator-warming-up" msgstr "Sheet Rotator Warming Up" #. TRANSLATORS: Printer offline -#: locale/ipp-strings.c:3708 +#: locale/ipp-strings.c:3746 msgid "printer-state-reasons.shutdown" msgstr "Shutdown" #. TRANSLATORS: Slitter Added -#: locale/ipp-strings.c:3710 +#: locale/ipp-strings.c:3748 msgid "printer-state-reasons.slitter-added" msgstr "Slitter Added" #. TRANSLATORS: Slitter Almost Empty -#: locale/ipp-strings.c:3712 +#: locale/ipp-strings.c:3750 msgid "printer-state-reasons.slitter-almost-empty" msgstr "Slitter Almost Empty" #. TRANSLATORS: Slitter Almost Full -#: locale/ipp-strings.c:3714 +#: locale/ipp-strings.c:3752 msgid "printer-state-reasons.slitter-almost-full" msgstr "Slitter Almost Full" #. TRANSLATORS: Slitter At Limit -#: locale/ipp-strings.c:3716 +#: locale/ipp-strings.c:3754 msgid "printer-state-reasons.slitter-at-limit" msgstr "Slitter At Limit" #. TRANSLATORS: Slitter Closed -#: locale/ipp-strings.c:3718 +#: locale/ipp-strings.c:3756 msgid "printer-state-reasons.slitter-closed" msgstr "Slitter Closed" #. TRANSLATORS: Slitter Configuration Change -#: locale/ipp-strings.c:3720 +#: locale/ipp-strings.c:3758 msgid "printer-state-reasons.slitter-configuration-change" msgstr "Slitter Configuration Change" #. TRANSLATORS: Slitter Cover Closed -#: locale/ipp-strings.c:3722 +#: locale/ipp-strings.c:3760 msgid "printer-state-reasons.slitter-cover-closed" msgstr "Slitter Cover Closed" #. TRANSLATORS: Slitter Cover Open -#: locale/ipp-strings.c:3724 +#: locale/ipp-strings.c:3762 msgid "printer-state-reasons.slitter-cover-open" msgstr "Slitter Cover Open" #. TRANSLATORS: Slitter Empty -#: locale/ipp-strings.c:3726 +#: locale/ipp-strings.c:3764 msgid "printer-state-reasons.slitter-empty" msgstr "Slitter Empty" #. TRANSLATORS: Slitter Full -#: locale/ipp-strings.c:3728 +#: locale/ipp-strings.c:3766 msgid "printer-state-reasons.slitter-full" msgstr "Slitter Full" #. TRANSLATORS: Slitter Interlock Closed -#: locale/ipp-strings.c:3730 +#: locale/ipp-strings.c:3768 msgid "printer-state-reasons.slitter-interlock-closed" msgstr "Slitter Interlock Closed" #. TRANSLATORS: Slitter Interlock Open -#: locale/ipp-strings.c:3732 +#: locale/ipp-strings.c:3770 msgid "printer-state-reasons.slitter-interlock-open" msgstr "Slitter Interlock Open" #. TRANSLATORS: Slitter Jam -#: locale/ipp-strings.c:3734 +#: locale/ipp-strings.c:3772 msgid "printer-state-reasons.slitter-jam" msgstr "Slitter Jam" #. TRANSLATORS: Slitter Life Almost Over -#: locale/ipp-strings.c:3736 +#: locale/ipp-strings.c:3774 msgid "printer-state-reasons.slitter-life-almost-over" msgstr "Slitter Life Almost Over" #. TRANSLATORS: Slitter Life Over -#: locale/ipp-strings.c:3738 +#: locale/ipp-strings.c:3776 msgid "printer-state-reasons.slitter-life-over" msgstr "Slitter Life Over" #. TRANSLATORS: Slitter Memory Exhausted -#: locale/ipp-strings.c:3740 +#: locale/ipp-strings.c:3778 msgid "printer-state-reasons.slitter-memory-exhausted" msgstr "Slitter Memory Exhausted" #. TRANSLATORS: Slitter Missing -#: locale/ipp-strings.c:3742 +#: locale/ipp-strings.c:3780 msgid "printer-state-reasons.slitter-missing" msgstr "Slitter Missing" #. TRANSLATORS: Slitter Motor Failure -#: locale/ipp-strings.c:3744 +#: locale/ipp-strings.c:3782 msgid "printer-state-reasons.slitter-motor-failure" msgstr "Slitter Motor Failure" #. TRANSLATORS: Slitter Near Limit -#: locale/ipp-strings.c:3746 +#: locale/ipp-strings.c:3784 msgid "printer-state-reasons.slitter-near-limit" msgstr "Slitter Near Limit" #. TRANSLATORS: Slitter Offline -#: locale/ipp-strings.c:3748 +#: locale/ipp-strings.c:3786 msgid "printer-state-reasons.slitter-offline" msgstr "Slitter Offline" #. TRANSLATORS: Slitter Opened -#: locale/ipp-strings.c:3750 +#: locale/ipp-strings.c:3788 msgid "printer-state-reasons.slitter-opened" msgstr "Slitter Opened" #. TRANSLATORS: Slitter Over Temperature -#: locale/ipp-strings.c:3752 +#: locale/ipp-strings.c:3790 msgid "printer-state-reasons.slitter-over-temperature" msgstr "Slitter Over Temperature" #. TRANSLATORS: Slitter Power Saver -#: locale/ipp-strings.c:3754 +#: locale/ipp-strings.c:3792 msgid "printer-state-reasons.slitter-power-saver" msgstr "Slitter Power Saver" #. TRANSLATORS: Slitter Recoverable Failure -#: locale/ipp-strings.c:3756 +#: locale/ipp-strings.c:3794 msgid "printer-state-reasons.slitter-recoverable-failure" msgstr "Slitter Recoverable Failure" #. TRANSLATORS: Slitter Recoverable Storage -#: locale/ipp-strings.c:3758 +#: locale/ipp-strings.c:3796 msgid "printer-state-reasons.slitter-recoverable-storage" msgstr "Slitter Recoverable Storage" #. TRANSLATORS: Slitter Removed -#: locale/ipp-strings.c:3760 +#: locale/ipp-strings.c:3798 msgid "printer-state-reasons.slitter-removed" msgstr "Slitter Removed" #. TRANSLATORS: Slitter Resource Added -#: locale/ipp-strings.c:3762 +#: locale/ipp-strings.c:3800 msgid "printer-state-reasons.slitter-resource-added" msgstr "Slitter Resource Added" #. TRANSLATORS: Slitter Resource Removed -#: locale/ipp-strings.c:3764 +#: locale/ipp-strings.c:3802 msgid "printer-state-reasons.slitter-resource-removed" msgstr "Slitter Resource Removed" #. TRANSLATORS: Slitter Thermistor Failure -#: locale/ipp-strings.c:3766 +#: locale/ipp-strings.c:3804 msgid "printer-state-reasons.slitter-thermistor-failure" msgstr "Slitter Thermistor Failure" #. TRANSLATORS: Slitter Timing Failure -#: locale/ipp-strings.c:3768 +#: locale/ipp-strings.c:3806 msgid "printer-state-reasons.slitter-timing-failure" msgstr "Slitter Timing Failure" #. TRANSLATORS: Slitter Turned Off -#: locale/ipp-strings.c:3770 +#: locale/ipp-strings.c:3808 msgid "printer-state-reasons.slitter-turned-off" msgstr "Slitter Turned Off" #. TRANSLATORS: Slitter Turned On -#: locale/ipp-strings.c:3772 +#: locale/ipp-strings.c:3810 msgid "printer-state-reasons.slitter-turned-on" msgstr "Slitter Turned On" #. TRANSLATORS: Slitter Under Temperature -#: locale/ipp-strings.c:3774 +#: locale/ipp-strings.c:3812 msgid "printer-state-reasons.slitter-under-temperature" msgstr "Slitter Under Temperature" #. TRANSLATORS: Slitter Unrecoverable Failure -#: locale/ipp-strings.c:3776 +#: locale/ipp-strings.c:3814 msgid "printer-state-reasons.slitter-unrecoverable-failure" msgstr "Slitter Unrecoverable Failure" #. TRANSLATORS: Slitter Unrecoverable Storage Error -#: locale/ipp-strings.c:3778 +#: locale/ipp-strings.c:3816 msgid "printer-state-reasons.slitter-unrecoverable-storage-error" msgstr "Slitter Unrecoverable Storage Error" #. TRANSLATORS: Slitter Warming Up -#: locale/ipp-strings.c:3780 +#: locale/ipp-strings.c:3818 msgid "printer-state-reasons.slitter-warming-up" msgstr "Slitter Warming Up" #. TRANSLATORS: Spool Area Full -#: locale/ipp-strings.c:3782 +#: locale/ipp-strings.c:3820 msgid "printer-state-reasons.spool-area-full" msgstr "Spool Area Full" #. TRANSLATORS: Stacker Added -#: locale/ipp-strings.c:3784 +#: locale/ipp-strings.c:3822 msgid "printer-state-reasons.stacker-added" msgstr "Stacker Added" #. TRANSLATORS: Stacker Almost Empty -#: locale/ipp-strings.c:3786 +#: locale/ipp-strings.c:3824 msgid "printer-state-reasons.stacker-almost-empty" msgstr "Stacker Almost Empty" #. TRANSLATORS: Stacker Almost Full -#: locale/ipp-strings.c:3788 +#: locale/ipp-strings.c:3826 msgid "printer-state-reasons.stacker-almost-full" msgstr "Stacker Almost Full" #. TRANSLATORS: Stacker At Limit -#: locale/ipp-strings.c:3790 +#: locale/ipp-strings.c:3828 msgid "printer-state-reasons.stacker-at-limit" msgstr "Stacker At Limit" #. TRANSLATORS: Stacker Closed -#: locale/ipp-strings.c:3792 +#: locale/ipp-strings.c:3830 msgid "printer-state-reasons.stacker-closed" msgstr "Stacker Closed" #. TRANSLATORS: Stacker Configuration Change -#: locale/ipp-strings.c:3794 +#: locale/ipp-strings.c:3832 msgid "printer-state-reasons.stacker-configuration-change" msgstr "Stacker Configuration Change" #. TRANSLATORS: Stacker Cover Closed -#: locale/ipp-strings.c:3796 +#: locale/ipp-strings.c:3834 msgid "printer-state-reasons.stacker-cover-closed" msgstr "Stacker Cover Closed" #. TRANSLATORS: Stacker Cover Open -#: locale/ipp-strings.c:3798 +#: locale/ipp-strings.c:3836 msgid "printer-state-reasons.stacker-cover-open" msgstr "Stacker Cover Open" #. TRANSLATORS: Stacker Empty -#: locale/ipp-strings.c:3800 +#: locale/ipp-strings.c:3838 msgid "printer-state-reasons.stacker-empty" msgstr "Stacker Empty" #. TRANSLATORS: Stacker Full -#: locale/ipp-strings.c:3802 +#: locale/ipp-strings.c:3840 msgid "printer-state-reasons.stacker-full" msgstr "Stacker Full" #. TRANSLATORS: Stacker Interlock Closed -#: locale/ipp-strings.c:3804 +#: locale/ipp-strings.c:3842 msgid "printer-state-reasons.stacker-interlock-closed" msgstr "Stacker Interlock Closed" #. TRANSLATORS: Stacker Interlock Open -#: locale/ipp-strings.c:3806 +#: locale/ipp-strings.c:3844 msgid "printer-state-reasons.stacker-interlock-open" msgstr "Stacker Interlock Open" #. TRANSLATORS: Stacker Jam -#: locale/ipp-strings.c:3808 +#: locale/ipp-strings.c:3846 msgid "printer-state-reasons.stacker-jam" msgstr "Stacker Jam" #. TRANSLATORS: Stacker Life Almost Over -#: locale/ipp-strings.c:3810 +#: locale/ipp-strings.c:3848 msgid "printer-state-reasons.stacker-life-almost-over" msgstr "Stacker Life Almost Over" #. TRANSLATORS: Stacker Life Over -#: locale/ipp-strings.c:3812 +#: locale/ipp-strings.c:3850 msgid "printer-state-reasons.stacker-life-over" msgstr "Stacker Life Over" #. TRANSLATORS: Stacker Memory Exhausted -#: locale/ipp-strings.c:3814 +#: locale/ipp-strings.c:3852 msgid "printer-state-reasons.stacker-memory-exhausted" msgstr "Stacker Memory Exhausted" #. TRANSLATORS: Stacker Missing -#: locale/ipp-strings.c:3816 +#: locale/ipp-strings.c:3854 msgid "printer-state-reasons.stacker-missing" msgstr "Stacker Missing" #. TRANSLATORS: Stacker Motor Failure -#: locale/ipp-strings.c:3818 +#: locale/ipp-strings.c:3856 msgid "printer-state-reasons.stacker-motor-failure" msgstr "Stacker Motor Failure" #. TRANSLATORS: Stacker Near Limit -#: locale/ipp-strings.c:3820 +#: locale/ipp-strings.c:3858 msgid "printer-state-reasons.stacker-near-limit" msgstr "Stacker Near Limit" #. TRANSLATORS: Stacker Offline -#: locale/ipp-strings.c:3822 +#: locale/ipp-strings.c:3860 msgid "printer-state-reasons.stacker-offline" msgstr "Stacker Offline" #. TRANSLATORS: Stacker Opened -#: locale/ipp-strings.c:3824 +#: locale/ipp-strings.c:3862 msgid "printer-state-reasons.stacker-opened" msgstr "Stacker Opened" #. TRANSLATORS: Stacker Over Temperature -#: locale/ipp-strings.c:3826 +#: locale/ipp-strings.c:3864 msgid "printer-state-reasons.stacker-over-temperature" msgstr "Stacker Over Temperature" #. TRANSLATORS: Stacker Power Saver -#: locale/ipp-strings.c:3828 +#: locale/ipp-strings.c:3866 msgid "printer-state-reasons.stacker-power-saver" msgstr "Stacker Power Saver" #. TRANSLATORS: Stacker Recoverable Failure -#: locale/ipp-strings.c:3830 +#: locale/ipp-strings.c:3868 msgid "printer-state-reasons.stacker-recoverable-failure" msgstr "Stacker Recoverable Failure" #. TRANSLATORS: Stacker Recoverable Storage -#: locale/ipp-strings.c:3832 +#: locale/ipp-strings.c:3870 msgid "printer-state-reasons.stacker-recoverable-storage" msgstr "Stacker Recoverable Storage" #. TRANSLATORS: Stacker Removed -#: locale/ipp-strings.c:3834 +#: locale/ipp-strings.c:3872 msgid "printer-state-reasons.stacker-removed" msgstr "Stacker Removed" #. TRANSLATORS: Stacker Resource Added -#: locale/ipp-strings.c:3836 +#: locale/ipp-strings.c:3874 msgid "printer-state-reasons.stacker-resource-added" msgstr "Stacker Resource Added" #. TRANSLATORS: Stacker Resource Removed -#: locale/ipp-strings.c:3838 +#: locale/ipp-strings.c:3876 msgid "printer-state-reasons.stacker-resource-removed" msgstr "Stacker Resource Removed" #. TRANSLATORS: Stacker Thermistor Failure -#: locale/ipp-strings.c:3840 +#: locale/ipp-strings.c:3878 msgid "printer-state-reasons.stacker-thermistor-failure" msgstr "Stacker Thermistor Failure" #. TRANSLATORS: Stacker Timing Failure -#: locale/ipp-strings.c:3842 +#: locale/ipp-strings.c:3880 msgid "printer-state-reasons.stacker-timing-failure" msgstr "Stacker Timing Failure" #. TRANSLATORS: Stacker Turned Off -#: locale/ipp-strings.c:3844 +#: locale/ipp-strings.c:3882 msgid "printer-state-reasons.stacker-turned-off" msgstr "Stacker Turned Off" #. TRANSLATORS: Stacker Turned On -#: locale/ipp-strings.c:3846 +#: locale/ipp-strings.c:3884 msgid "printer-state-reasons.stacker-turned-on" msgstr "Stacker Turned On" #. TRANSLATORS: Stacker Under Temperature -#: locale/ipp-strings.c:3848 +#: locale/ipp-strings.c:3886 msgid "printer-state-reasons.stacker-under-temperature" msgstr "Stacker Under Temperature" #. TRANSLATORS: Stacker Unrecoverable Failure -#: locale/ipp-strings.c:3850 +#: locale/ipp-strings.c:3888 msgid "printer-state-reasons.stacker-unrecoverable-failure" msgstr "Stacker Unrecoverable Failure" #. TRANSLATORS: Stacker Unrecoverable Storage Error -#: locale/ipp-strings.c:3852 +#: locale/ipp-strings.c:3890 msgid "printer-state-reasons.stacker-unrecoverable-storage-error" msgstr "Stacker Unrecoverable Storage Error" #. TRANSLATORS: Stacker Warming Up -#: locale/ipp-strings.c:3854 +#: locale/ipp-strings.c:3892 msgid "printer-state-reasons.stacker-warming-up" msgstr "Stacker Warming Up" #. TRANSLATORS: Stapler Added -#: locale/ipp-strings.c:3856 +#: locale/ipp-strings.c:3894 msgid "printer-state-reasons.stapler-added" msgstr "Stapler Added" #. TRANSLATORS: Stapler Almost Empty -#: locale/ipp-strings.c:3858 +#: locale/ipp-strings.c:3896 msgid "printer-state-reasons.stapler-almost-empty" msgstr "Stapler Almost Empty" #. TRANSLATORS: Stapler Almost Full -#: locale/ipp-strings.c:3860 +#: locale/ipp-strings.c:3898 msgid "printer-state-reasons.stapler-almost-full" msgstr "Stapler Almost Full" #. TRANSLATORS: Stapler At Limit -#: locale/ipp-strings.c:3862 +#: locale/ipp-strings.c:3900 msgid "printer-state-reasons.stapler-at-limit" msgstr "Stapler At Limit" #. TRANSLATORS: Stapler Closed -#: locale/ipp-strings.c:3864 +#: locale/ipp-strings.c:3902 msgid "printer-state-reasons.stapler-closed" msgstr "Stapler Closed" #. TRANSLATORS: Stapler Configuration Change -#: locale/ipp-strings.c:3866 +#: locale/ipp-strings.c:3904 msgid "printer-state-reasons.stapler-configuration-change" msgstr "Stapler Configuration Change" #. TRANSLATORS: Stapler Cover Closed -#: locale/ipp-strings.c:3868 +#: locale/ipp-strings.c:3906 msgid "printer-state-reasons.stapler-cover-closed" msgstr "Stapler Cover Closed" #. TRANSLATORS: Stapler Cover Open -#: locale/ipp-strings.c:3870 +#: locale/ipp-strings.c:3908 msgid "printer-state-reasons.stapler-cover-open" msgstr "Stapler Cover Open" #. TRANSLATORS: Stapler Empty -#: locale/ipp-strings.c:3872 +#: locale/ipp-strings.c:3910 msgid "printer-state-reasons.stapler-empty" msgstr "Stapler Empty" #. TRANSLATORS: Stapler Full -#: locale/ipp-strings.c:3874 +#: locale/ipp-strings.c:3912 msgid "printer-state-reasons.stapler-full" msgstr "Stapler Full" #. TRANSLATORS: Stapler Interlock Closed -#: locale/ipp-strings.c:3876 +#: locale/ipp-strings.c:3914 msgid "printer-state-reasons.stapler-interlock-closed" msgstr "Stapler Interlock Closed" #. TRANSLATORS: Stapler Interlock Open -#: locale/ipp-strings.c:3878 +#: locale/ipp-strings.c:3916 msgid "printer-state-reasons.stapler-interlock-open" msgstr "Stapler Interlock Open" #. TRANSLATORS: Stapler Jam -#: locale/ipp-strings.c:3880 +#: locale/ipp-strings.c:3918 msgid "printer-state-reasons.stapler-jam" msgstr "Stapler Jam" #. TRANSLATORS: Stapler Life Almost Over -#: locale/ipp-strings.c:3882 +#: locale/ipp-strings.c:3920 msgid "printer-state-reasons.stapler-life-almost-over" msgstr "Stapler Life Almost Over" #. TRANSLATORS: Stapler Life Over -#: locale/ipp-strings.c:3884 +#: locale/ipp-strings.c:3922 msgid "printer-state-reasons.stapler-life-over" msgstr "Stapler Life Over" #. TRANSLATORS: Stapler Memory Exhausted -#: locale/ipp-strings.c:3886 +#: locale/ipp-strings.c:3924 msgid "printer-state-reasons.stapler-memory-exhausted" msgstr "Stapler Memory Exhausted" #. TRANSLATORS: Stapler Missing -#: locale/ipp-strings.c:3888 +#: locale/ipp-strings.c:3926 msgid "printer-state-reasons.stapler-missing" msgstr "Stapler Missing" #. TRANSLATORS: Stapler Motor Failure -#: locale/ipp-strings.c:3890 +#: locale/ipp-strings.c:3928 msgid "printer-state-reasons.stapler-motor-failure" msgstr "Stapler Motor Failure" #. TRANSLATORS: Stapler Near Limit -#: locale/ipp-strings.c:3892 +#: locale/ipp-strings.c:3930 msgid "printer-state-reasons.stapler-near-limit" msgstr "Stapler Near Limit" #. TRANSLATORS: Stapler Offline -#: locale/ipp-strings.c:3894 +#: locale/ipp-strings.c:3932 msgid "printer-state-reasons.stapler-offline" msgstr "Stapler Offline" #. TRANSLATORS: Stapler Opened -#: locale/ipp-strings.c:3896 +#: locale/ipp-strings.c:3934 msgid "printer-state-reasons.stapler-opened" msgstr "Stapler Opened" #. TRANSLATORS: Stapler Over Temperature -#: locale/ipp-strings.c:3898 +#: locale/ipp-strings.c:3936 msgid "printer-state-reasons.stapler-over-temperature" msgstr "Stapler Over Temperature" #. TRANSLATORS: Stapler Power Saver -#: locale/ipp-strings.c:3900 +#: locale/ipp-strings.c:3938 msgid "printer-state-reasons.stapler-power-saver" msgstr "Stapler Power Saver" #. TRANSLATORS: Stapler Recoverable Failure -#: locale/ipp-strings.c:3902 +#: locale/ipp-strings.c:3940 msgid "printer-state-reasons.stapler-recoverable-failure" msgstr "Stapler Recoverable Failure" #. TRANSLATORS: Stapler Recoverable Storage -#: locale/ipp-strings.c:3904 +#: locale/ipp-strings.c:3942 msgid "printer-state-reasons.stapler-recoverable-storage" msgstr "Stapler Recoverable Storage" #. TRANSLATORS: Stapler Removed -#: locale/ipp-strings.c:3906 +#: locale/ipp-strings.c:3944 msgid "printer-state-reasons.stapler-removed" msgstr "Stapler Removed" #. TRANSLATORS: Stapler Resource Added -#: locale/ipp-strings.c:3908 +#: locale/ipp-strings.c:3946 msgid "printer-state-reasons.stapler-resource-added" msgstr "Stapler Resource Added" #. TRANSLATORS: Stapler Resource Removed -#: locale/ipp-strings.c:3910 +#: locale/ipp-strings.c:3948 msgid "printer-state-reasons.stapler-resource-removed" msgstr "Stapler Resource Removed" #. TRANSLATORS: Stapler Thermistor Failure -#: locale/ipp-strings.c:3912 +#: locale/ipp-strings.c:3950 msgid "printer-state-reasons.stapler-thermistor-failure" msgstr "Stapler Thermistor Failure" #. TRANSLATORS: Stapler Timing Failure -#: locale/ipp-strings.c:3914 +#: locale/ipp-strings.c:3952 msgid "printer-state-reasons.stapler-timing-failure" msgstr "Stapler Timing Failure" #. TRANSLATORS: Stapler Turned Off -#: locale/ipp-strings.c:3916 +#: locale/ipp-strings.c:3954 msgid "printer-state-reasons.stapler-turned-off" msgstr "Stapler Turned Off" #. TRANSLATORS: Stapler Turned On -#: locale/ipp-strings.c:3918 +#: locale/ipp-strings.c:3956 msgid "printer-state-reasons.stapler-turned-on" msgstr "Stapler Turned On" #. TRANSLATORS: Stapler Under Temperature -#: locale/ipp-strings.c:3920 +#: locale/ipp-strings.c:3958 msgid "printer-state-reasons.stapler-under-temperature" msgstr "Stapler Under Temperature" #. TRANSLATORS: Stapler Unrecoverable Failure -#: locale/ipp-strings.c:3922 +#: locale/ipp-strings.c:3960 msgid "printer-state-reasons.stapler-unrecoverable-failure" msgstr "Stapler Unrecoverable Failure" #. TRANSLATORS: Stapler Unrecoverable Storage Error -#: locale/ipp-strings.c:3924 +#: locale/ipp-strings.c:3962 msgid "printer-state-reasons.stapler-unrecoverable-storage-error" msgstr "Stapler Unrecoverable Storage Error" #. TRANSLATORS: Stapler Warming Up -#: locale/ipp-strings.c:3926 +#: locale/ipp-strings.c:3964 msgid "printer-state-reasons.stapler-warming-up" msgstr "Stapler Warming Up" #. TRANSLATORS: Stitcher Added -#: locale/ipp-strings.c:3928 +#: locale/ipp-strings.c:3966 msgid "printer-state-reasons.stitcher-added" msgstr "Stitcher Added" #. TRANSLATORS: Stitcher Almost Empty -#: locale/ipp-strings.c:3930 +#: locale/ipp-strings.c:3968 msgid "printer-state-reasons.stitcher-almost-empty" msgstr "Stitcher Almost Empty" #. TRANSLATORS: Stitcher Almost Full -#: locale/ipp-strings.c:3932 +#: locale/ipp-strings.c:3970 msgid "printer-state-reasons.stitcher-almost-full" msgstr "Stitcher Almost Full" #. TRANSLATORS: Stitcher At Limit -#: locale/ipp-strings.c:3934 +#: locale/ipp-strings.c:3972 msgid "printer-state-reasons.stitcher-at-limit" msgstr "Stitcher At Limit" #. TRANSLATORS: Stitcher Closed -#: locale/ipp-strings.c:3936 +#: locale/ipp-strings.c:3974 msgid "printer-state-reasons.stitcher-closed" msgstr "Stitcher Closed" #. TRANSLATORS: Stitcher Configuration Change -#: locale/ipp-strings.c:3938 +#: locale/ipp-strings.c:3976 msgid "printer-state-reasons.stitcher-configuration-change" msgstr "Stitcher Configuration Change" #. TRANSLATORS: Stitcher Cover Closed -#: locale/ipp-strings.c:3940 +#: locale/ipp-strings.c:3978 msgid "printer-state-reasons.stitcher-cover-closed" msgstr "Stitcher Cover Closed" #. TRANSLATORS: Stitcher Cover Open -#: locale/ipp-strings.c:3942 +#: locale/ipp-strings.c:3980 msgid "printer-state-reasons.stitcher-cover-open" msgstr "Stitcher Cover Open" #. TRANSLATORS: Stitcher Empty -#: locale/ipp-strings.c:3944 +#: locale/ipp-strings.c:3982 msgid "printer-state-reasons.stitcher-empty" msgstr "Stitcher Empty" #. TRANSLATORS: Stitcher Full -#: locale/ipp-strings.c:3946 +#: locale/ipp-strings.c:3984 msgid "printer-state-reasons.stitcher-full" msgstr "Stitcher Full" #. TRANSLATORS: Stitcher Interlock Closed -#: locale/ipp-strings.c:3948 +#: locale/ipp-strings.c:3986 msgid "printer-state-reasons.stitcher-interlock-closed" msgstr "Stitcher Interlock Closed" #. TRANSLATORS: Stitcher Interlock Open -#: locale/ipp-strings.c:3950 +#: locale/ipp-strings.c:3988 msgid "printer-state-reasons.stitcher-interlock-open" msgstr "Stitcher Interlock Open" #. TRANSLATORS: Stitcher Jam -#: locale/ipp-strings.c:3952 +#: locale/ipp-strings.c:3990 msgid "printer-state-reasons.stitcher-jam" msgstr "Stitcher Jam" #. TRANSLATORS: Stitcher Life Almost Over -#: locale/ipp-strings.c:3954 +#: locale/ipp-strings.c:3992 msgid "printer-state-reasons.stitcher-life-almost-over" msgstr "Stitcher Life Almost Over" #. TRANSLATORS: Stitcher Life Over -#: locale/ipp-strings.c:3956 +#: locale/ipp-strings.c:3994 msgid "printer-state-reasons.stitcher-life-over" msgstr "Stitcher Life Over" #. TRANSLATORS: Stitcher Memory Exhausted -#: locale/ipp-strings.c:3958 +#: locale/ipp-strings.c:3996 msgid "printer-state-reasons.stitcher-memory-exhausted" msgstr "Stitcher Memory Exhausted" #. TRANSLATORS: Stitcher Missing -#: locale/ipp-strings.c:3960 +#: locale/ipp-strings.c:3998 msgid "printer-state-reasons.stitcher-missing" msgstr "Stitcher Missing" #. TRANSLATORS: Stitcher Motor Failure -#: locale/ipp-strings.c:3962 +#: locale/ipp-strings.c:4000 msgid "printer-state-reasons.stitcher-motor-failure" msgstr "Stitcher Motor Failure" #. TRANSLATORS: Stitcher Near Limit -#: locale/ipp-strings.c:3964 +#: locale/ipp-strings.c:4002 msgid "printer-state-reasons.stitcher-near-limit" msgstr "Stitcher Near Limit" #. TRANSLATORS: Stitcher Offline -#: locale/ipp-strings.c:3966 +#: locale/ipp-strings.c:4004 msgid "printer-state-reasons.stitcher-offline" msgstr "Stitcher Offline" #. TRANSLATORS: Stitcher Opened -#: locale/ipp-strings.c:3968 +#: locale/ipp-strings.c:4006 msgid "printer-state-reasons.stitcher-opened" msgstr "Stitcher Opened" #. TRANSLATORS: Stitcher Over Temperature -#: locale/ipp-strings.c:3970 +#: locale/ipp-strings.c:4008 msgid "printer-state-reasons.stitcher-over-temperature" msgstr "Stitcher Over Temperature" #. TRANSLATORS: Stitcher Power Saver -#: locale/ipp-strings.c:3972 +#: locale/ipp-strings.c:4010 msgid "printer-state-reasons.stitcher-power-saver" msgstr "Stitcher Power Saver" #. TRANSLATORS: Stitcher Recoverable Failure -#: locale/ipp-strings.c:3974 +#: locale/ipp-strings.c:4012 msgid "printer-state-reasons.stitcher-recoverable-failure" msgstr "Stitcher Recoverable Failure" #. TRANSLATORS: Stitcher Recoverable Storage -#: locale/ipp-strings.c:3976 +#: locale/ipp-strings.c:4014 msgid "printer-state-reasons.stitcher-recoverable-storage" msgstr "Stitcher Recoverable Storage" #. TRANSLATORS: Stitcher Removed -#: locale/ipp-strings.c:3978 +#: locale/ipp-strings.c:4016 msgid "printer-state-reasons.stitcher-removed" msgstr "Stitcher Removed" #. TRANSLATORS: Stitcher Resource Added -#: locale/ipp-strings.c:3980 +#: locale/ipp-strings.c:4018 msgid "printer-state-reasons.stitcher-resource-added" msgstr "Stitcher Resource Added" #. TRANSLATORS: Stitcher Resource Removed -#: locale/ipp-strings.c:3982 +#: locale/ipp-strings.c:4020 msgid "printer-state-reasons.stitcher-resource-removed" msgstr "Stitcher Resource Removed" #. TRANSLATORS: Stitcher Thermistor Failure -#: locale/ipp-strings.c:3984 +#: locale/ipp-strings.c:4022 msgid "printer-state-reasons.stitcher-thermistor-failure" msgstr "Stitcher Thermistor Failure" #. TRANSLATORS: Stitcher Timing Failure -#: locale/ipp-strings.c:3986 +#: locale/ipp-strings.c:4024 msgid "printer-state-reasons.stitcher-timing-failure" msgstr "Stitcher Timing Failure" #. TRANSLATORS: Stitcher Turned Off -#: locale/ipp-strings.c:3988 +#: locale/ipp-strings.c:4026 msgid "printer-state-reasons.stitcher-turned-off" msgstr "Stitcher Turned Off" #. TRANSLATORS: Stitcher Turned On -#: locale/ipp-strings.c:3990 +#: locale/ipp-strings.c:4028 msgid "printer-state-reasons.stitcher-turned-on" msgstr "Stitcher Turned On" #. TRANSLATORS: Stitcher Under Temperature -#: locale/ipp-strings.c:3992 +#: locale/ipp-strings.c:4030 msgid "printer-state-reasons.stitcher-under-temperature" msgstr "Stitcher Under Temperature" #. TRANSLATORS: Stitcher Unrecoverable Failure -#: locale/ipp-strings.c:3994 +#: locale/ipp-strings.c:4032 msgid "printer-state-reasons.stitcher-unrecoverable-failure" msgstr "Stitcher Unrecoverable Failure" #. TRANSLATORS: Stitcher Unrecoverable Storage Error -#: locale/ipp-strings.c:3996 +#: locale/ipp-strings.c:4034 msgid "printer-state-reasons.stitcher-unrecoverable-storage-error" msgstr "Stitcher Unrecoverable Storage Error" #. TRANSLATORS: Stitcher Warming Up -#: locale/ipp-strings.c:3998 +#: locale/ipp-strings.c:4036 msgid "printer-state-reasons.stitcher-warming-up" msgstr "Stitcher Warming Up" #. TRANSLATORS: Partially stopped -#: locale/ipp-strings.c:4000 +#: locale/ipp-strings.c:4038 msgid "printer-state-reasons.stopped-partly" msgstr "Stopped Partly" #. TRANSLATORS: Stopping -#: locale/ipp-strings.c:4002 +#: locale/ipp-strings.c:4040 msgid "printer-state-reasons.stopping" msgstr "Stopping" #. TRANSLATORS: Subunit Added -#: locale/ipp-strings.c:4004 +#: locale/ipp-strings.c:4042 msgid "printer-state-reasons.subunit-added" msgstr "Subunit Added" #. TRANSLATORS: Subunit Almost Empty -#: locale/ipp-strings.c:4006 +#: locale/ipp-strings.c:4044 msgid "printer-state-reasons.subunit-almost-empty" msgstr "Subunit Almost Empty" #. TRANSLATORS: Subunit Almost Full -#: locale/ipp-strings.c:4008 +#: locale/ipp-strings.c:4046 msgid "printer-state-reasons.subunit-almost-full" msgstr "Subunit Almost Full" #. TRANSLATORS: Subunit At Limit -#: locale/ipp-strings.c:4010 +#: locale/ipp-strings.c:4048 msgid "printer-state-reasons.subunit-at-limit" msgstr "Subunit At Limit" #. TRANSLATORS: Subunit Closed -#: locale/ipp-strings.c:4012 +#: locale/ipp-strings.c:4050 msgid "printer-state-reasons.subunit-closed" msgstr "Subunit Closed" #. TRANSLATORS: Subunit Empty -#: locale/ipp-strings.c:4016 +#: locale/ipp-strings.c:4054 msgid "printer-state-reasons.subunit-empty" msgstr "Subunit Empty" #. TRANSLATORS: Subunit Full -#: locale/ipp-strings.c:4018 +#: locale/ipp-strings.c:4056 msgid "printer-state-reasons.subunit-full" msgstr "Subunit Full" #. TRANSLATORS: Subunit Life Almost Over -#: locale/ipp-strings.c:4020 +#: locale/ipp-strings.c:4058 msgid "printer-state-reasons.subunit-life-almost-over" msgstr "Subunit Life Almost Over" #. TRANSLATORS: Subunit Life Over -#: locale/ipp-strings.c:4022 +#: locale/ipp-strings.c:4060 msgid "printer-state-reasons.subunit-life-over" msgstr "Subunit Life Over" #. TRANSLATORS: Subunit Memory Exhausted -#: locale/ipp-strings.c:4024 +#: locale/ipp-strings.c:4062 msgid "printer-state-reasons.subunit-memory-exhausted" msgstr "Subunit Memory Exhausted" #. TRANSLATORS: Subunit Missing -#: locale/ipp-strings.c:4026 +#: locale/ipp-strings.c:4064 msgid "printer-state-reasons.subunit-missing" msgstr "Subunit Missing" #. TRANSLATORS: Subunit Motor Failure -#: locale/ipp-strings.c:4028 +#: locale/ipp-strings.c:4066 msgid "printer-state-reasons.subunit-motor-failure" msgstr "Subunit Motor Failure" #. TRANSLATORS: Subunit Near Limit -#: locale/ipp-strings.c:4030 +#: locale/ipp-strings.c:4068 msgid "printer-state-reasons.subunit-near-limit" msgstr "Subunit Near Limit" #. TRANSLATORS: Subunit Offline -#: locale/ipp-strings.c:4032 +#: locale/ipp-strings.c:4070 msgid "printer-state-reasons.subunit-offline" msgstr "Subunit Offline" #. TRANSLATORS: Subunit Opened -#: locale/ipp-strings.c:4034 +#: locale/ipp-strings.c:4072 msgid "printer-state-reasons.subunit-opened" msgstr "Subunit Opened" #. TRANSLATORS: Subunit Over Temperature -#: locale/ipp-strings.c:4036 +#: locale/ipp-strings.c:4074 msgid "printer-state-reasons.subunit-over-temperature" msgstr "Subunit Over Temperature" #. TRANSLATORS: Subunit Power Saver -#: locale/ipp-strings.c:4038 +#: locale/ipp-strings.c:4076 msgid "printer-state-reasons.subunit-power-saver" msgstr "Subunit Power Saver" #. TRANSLATORS: Subunit Recoverable Failure -#: locale/ipp-strings.c:4040 +#: locale/ipp-strings.c:4078 msgid "printer-state-reasons.subunit-recoverable-failure" msgstr "Subunit Recoverable Failure" #. TRANSLATORS: Subunit Recoverable Storage -#: locale/ipp-strings.c:4042 +#: locale/ipp-strings.c:4080 msgid "printer-state-reasons.subunit-recoverable-storage" msgstr "Subunit Recoverable Storage" #. TRANSLATORS: Subunit Removed -#: locale/ipp-strings.c:4044 +#: locale/ipp-strings.c:4082 msgid "printer-state-reasons.subunit-removed" msgstr "Subunit Removed" #. TRANSLATORS: Subunit Resource Added -#: locale/ipp-strings.c:4046 +#: locale/ipp-strings.c:4084 msgid "printer-state-reasons.subunit-resource-added" msgstr "Subunit Resource Added" #. TRANSLATORS: Subunit Resource Removed -#: locale/ipp-strings.c:4048 +#: locale/ipp-strings.c:4086 msgid "printer-state-reasons.subunit-resource-removed" msgstr "Subunit Resource Removed" #. TRANSLATORS: Subunit Thermistor Failure -#: locale/ipp-strings.c:4050 +#: locale/ipp-strings.c:4088 msgid "printer-state-reasons.subunit-thermistor-failure" msgstr "Subunit Thermistor Failure" #. TRANSLATORS: Subunit Timing Failure -#: locale/ipp-strings.c:4052 +#: locale/ipp-strings.c:4090 msgid "printer-state-reasons.subunit-timing-Failure" msgstr "Subunit Timing Failure" #. TRANSLATORS: Subunit Turned Off -#: locale/ipp-strings.c:4054 +#: locale/ipp-strings.c:4092 msgid "printer-state-reasons.subunit-turned-off" msgstr "Subunit Turned Off" #. TRANSLATORS: Subunit Turned On -#: locale/ipp-strings.c:4056 +#: locale/ipp-strings.c:4094 msgid "printer-state-reasons.subunit-turned-on" msgstr "Subunit Turned On" #. TRANSLATORS: Subunit Under Temperature -#: locale/ipp-strings.c:4058 +#: locale/ipp-strings.c:4096 msgid "printer-state-reasons.subunit-under-temperature" msgstr "Subunit Under Temperature" #. TRANSLATORS: Subunit Unrecoverable Failure -#: locale/ipp-strings.c:4060 +#: locale/ipp-strings.c:4098 msgid "printer-state-reasons.subunit-unrecoverable-failure" msgstr "Subunit Unrecoverable Failure" #. TRANSLATORS: Subunit Unrecoverable Storage -#: locale/ipp-strings.c:4062 +#: locale/ipp-strings.c:4100 msgid "printer-state-reasons.subunit-unrecoverable-storage" msgstr "Subunit Unrecoverable Storage" #. TRANSLATORS: Subunit Warming Up -#: locale/ipp-strings.c:4064 +#: locale/ipp-strings.c:4102 msgid "printer-state-reasons.subunit-warming-up" msgstr "Subunit Warming Up" #. TRANSLATORS: Printer stopped responding -#: locale/ipp-strings.c:4066 +#: locale/ipp-strings.c:4104 msgid "printer-state-reasons.timed-out" msgstr "Timed Out" #. TRANSLATORS: Out of toner -#: locale/ipp-strings.c:4068 +#: locale/ipp-strings.c:4106 msgid "printer-state-reasons.toner-empty" msgstr "Toner Empty" #. TRANSLATORS: Toner low -#: locale/ipp-strings.c:4070 +#: locale/ipp-strings.c:4108 msgid "printer-state-reasons.toner-low" msgstr "Toner Low" #. TRANSLATORS: Trimmer Added -#: locale/ipp-strings.c:4072 +#: locale/ipp-strings.c:4110 msgid "printer-state-reasons.trimmer-added" msgstr "Trimmer Added" #. TRANSLATORS: Trimmer Almost Empty -#: locale/ipp-strings.c:4074 +#: locale/ipp-strings.c:4112 msgid "printer-state-reasons.trimmer-almost-empty" msgstr "Trimmer Almost Empty" #. TRANSLATORS: Trimmer Almost Full -#: locale/ipp-strings.c:4076 +#: locale/ipp-strings.c:4114 msgid "printer-state-reasons.trimmer-almost-full" msgstr "Trimmer Almost Full" #. TRANSLATORS: Trimmer At Limit -#: locale/ipp-strings.c:4078 +#: locale/ipp-strings.c:4116 msgid "printer-state-reasons.trimmer-at-limit" msgstr "Trimmer At Limit" #. TRANSLATORS: Trimmer Closed -#: locale/ipp-strings.c:4080 +#: locale/ipp-strings.c:4118 msgid "printer-state-reasons.trimmer-closed" msgstr "Trimmer Closed" #. TRANSLATORS: Trimmer Configuration Change -#: locale/ipp-strings.c:4082 +#: locale/ipp-strings.c:4120 msgid "printer-state-reasons.trimmer-configuration-change" msgstr "Trimmer Configuration Change" #. TRANSLATORS: Trimmer Cover Closed -#: locale/ipp-strings.c:4084 +#: locale/ipp-strings.c:4122 msgid "printer-state-reasons.trimmer-cover-closed" msgstr "Trimmer Cover Closed" #. TRANSLATORS: Trimmer Cover Open -#: locale/ipp-strings.c:4086 +#: locale/ipp-strings.c:4124 msgid "printer-state-reasons.trimmer-cover-open" msgstr "Trimmer Cover Open" #. TRANSLATORS: Trimmer Empty -#: locale/ipp-strings.c:4088 +#: locale/ipp-strings.c:4126 msgid "printer-state-reasons.trimmer-empty" msgstr "Trimmer Empty" #. TRANSLATORS: Trimmer Full -#: locale/ipp-strings.c:4090 +#: locale/ipp-strings.c:4128 msgid "printer-state-reasons.trimmer-full" msgstr "Trimmer Full" #. TRANSLATORS: Trimmer Interlock Closed -#: locale/ipp-strings.c:4092 +#: locale/ipp-strings.c:4130 msgid "printer-state-reasons.trimmer-interlock-closed" msgstr "Trimmer Interlock Closed" #. TRANSLATORS: Trimmer Interlock Open -#: locale/ipp-strings.c:4094 +#: locale/ipp-strings.c:4132 msgid "printer-state-reasons.trimmer-interlock-open" msgstr "Trimmer Interlock Open" #. TRANSLATORS: Trimmer Jam -#: locale/ipp-strings.c:4096 +#: locale/ipp-strings.c:4134 msgid "printer-state-reasons.trimmer-jam" msgstr "Trimmer Jam" #. TRANSLATORS: Trimmer Life Almost Over -#: locale/ipp-strings.c:4098 +#: locale/ipp-strings.c:4136 msgid "printer-state-reasons.trimmer-life-almost-over" msgstr "Trimmer Life Almost Over" #. TRANSLATORS: Trimmer Life Over -#: locale/ipp-strings.c:4100 +#: locale/ipp-strings.c:4138 msgid "printer-state-reasons.trimmer-life-over" msgstr "Trimmer Life Over" #. TRANSLATORS: Trimmer Memory Exhausted -#: locale/ipp-strings.c:4102 +#: locale/ipp-strings.c:4140 msgid "printer-state-reasons.trimmer-memory-exhausted" msgstr "Trimmer Memory Exhausted" #. TRANSLATORS: Trimmer Missing -#: locale/ipp-strings.c:4104 +#: locale/ipp-strings.c:4142 msgid "printer-state-reasons.trimmer-missing" msgstr "Trimmer Missing" #. TRANSLATORS: Trimmer Motor Failure -#: locale/ipp-strings.c:4106 +#: locale/ipp-strings.c:4144 msgid "printer-state-reasons.trimmer-motor-failure" msgstr "Trimmer Motor Failure" #. TRANSLATORS: Trimmer Near Limit -#: locale/ipp-strings.c:4108 +#: locale/ipp-strings.c:4146 msgid "printer-state-reasons.trimmer-near-limit" msgstr "Trimmer Near Limit" #. TRANSLATORS: Trimmer Offline -#: locale/ipp-strings.c:4110 +#: locale/ipp-strings.c:4148 msgid "printer-state-reasons.trimmer-offline" msgstr "Trimmer Offline" #. TRANSLATORS: Trimmer Opened -#: locale/ipp-strings.c:4112 +#: locale/ipp-strings.c:4150 msgid "printer-state-reasons.trimmer-opened" msgstr "Trimmer Opened" #. TRANSLATORS: Trimmer Over Temperature -#: locale/ipp-strings.c:4114 +#: locale/ipp-strings.c:4152 msgid "printer-state-reasons.trimmer-over-temperature" msgstr "Trimmer Over Temperature" #. TRANSLATORS: Trimmer Power Saver -#: locale/ipp-strings.c:4116 +#: locale/ipp-strings.c:4154 msgid "printer-state-reasons.trimmer-power-saver" msgstr "Trimmer Power Saver" #. TRANSLATORS: Trimmer Recoverable Failure -#: locale/ipp-strings.c:4118 +#: locale/ipp-strings.c:4156 msgid "printer-state-reasons.trimmer-recoverable-failure" msgstr "Trimmer Recoverable Failure" #. TRANSLATORS: Trimmer Recoverable Storage -#: locale/ipp-strings.c:4120 +#: locale/ipp-strings.c:4158 msgid "printer-state-reasons.trimmer-recoverable-storage" msgstr "Trimmer Recoverable Storage" #. TRANSLATORS: Trimmer Removed -#: locale/ipp-strings.c:4122 +#: locale/ipp-strings.c:4160 msgid "printer-state-reasons.trimmer-removed" msgstr "Trimmer Removed" #. TRANSLATORS: Trimmer Resource Added -#: locale/ipp-strings.c:4124 +#: locale/ipp-strings.c:4162 msgid "printer-state-reasons.trimmer-resource-added" msgstr "Trimmer Resource Added" #. TRANSLATORS: Trimmer Resource Removed -#: locale/ipp-strings.c:4126 +#: locale/ipp-strings.c:4164 msgid "printer-state-reasons.trimmer-resource-removed" msgstr "Trimmer Resource Removed" #. TRANSLATORS: Trimmer Thermistor Failure -#: locale/ipp-strings.c:4128 +#: locale/ipp-strings.c:4166 msgid "printer-state-reasons.trimmer-thermistor-failure" msgstr "Trimmer Thermistor Failure" #. TRANSLATORS: Trimmer Timing Failure -#: locale/ipp-strings.c:4130 +#: locale/ipp-strings.c:4168 msgid "printer-state-reasons.trimmer-timing-failure" msgstr "Trimmer Timing Failure" #. TRANSLATORS: Trimmer Turned Off -#: locale/ipp-strings.c:4132 +#: locale/ipp-strings.c:4170 msgid "printer-state-reasons.trimmer-turned-off" msgstr "Trimmer Turned Off" #. TRANSLATORS: Trimmer Turned On -#: locale/ipp-strings.c:4134 +#: locale/ipp-strings.c:4172 msgid "printer-state-reasons.trimmer-turned-on" msgstr "Trimmer Turned On" #. TRANSLATORS: Trimmer Under Temperature -#: locale/ipp-strings.c:4136 +#: locale/ipp-strings.c:4174 msgid "printer-state-reasons.trimmer-under-temperature" msgstr "Trimmer Under Temperature" #. TRANSLATORS: Trimmer Unrecoverable Failure -#: locale/ipp-strings.c:4138 +#: locale/ipp-strings.c:4176 msgid "printer-state-reasons.trimmer-unrecoverable-failure" msgstr "Trimmer Unrecoverable Failure" #. TRANSLATORS: Trimmer Unrecoverable Storage Error -#: locale/ipp-strings.c:4140 +#: locale/ipp-strings.c:4178 msgid "printer-state-reasons.trimmer-unrecoverable-storage-error" msgstr "Trimmer Unrecoverable Storage Error" #. TRANSLATORS: Trimmer Warming Up -#: locale/ipp-strings.c:4142 +#: locale/ipp-strings.c:4180 msgid "printer-state-reasons.trimmer-warming-up" msgstr "Trimmer Warming Up" #. TRANSLATORS: Unknown -#: locale/ipp-strings.c:4144 +#: locale/ipp-strings.c:4182 msgid "printer-state-reasons.unknown" msgstr "Unknown" #. TRANSLATORS: Wrapper Added -#: locale/ipp-strings.c:4146 +#: locale/ipp-strings.c:4184 msgid "printer-state-reasons.wrapper-added" msgstr "Wrapper Added" #. TRANSLATORS: Wrapper Almost Empty -#: locale/ipp-strings.c:4148 +#: locale/ipp-strings.c:4186 msgid "printer-state-reasons.wrapper-almost-empty" msgstr "Wrapper Almost Empty" #. TRANSLATORS: Wrapper Almost Full -#: locale/ipp-strings.c:4150 +#: locale/ipp-strings.c:4188 msgid "printer-state-reasons.wrapper-almost-full" msgstr "Wrapper Almost Full" #. TRANSLATORS: Wrapper At Limit -#: locale/ipp-strings.c:4152 +#: locale/ipp-strings.c:4190 msgid "printer-state-reasons.wrapper-at-limit" msgstr "Wrapper At Limit" #. TRANSLATORS: Wrapper Closed -#: locale/ipp-strings.c:4154 +#: locale/ipp-strings.c:4192 msgid "printer-state-reasons.wrapper-closed" msgstr "Wrapper Closed" #. TRANSLATORS: Wrapper Configuration Change -#: locale/ipp-strings.c:4156 +#: locale/ipp-strings.c:4194 msgid "printer-state-reasons.wrapper-configuration-change" msgstr "Wrapper Configuration Change" #. TRANSLATORS: Wrapper Cover Closed -#: locale/ipp-strings.c:4158 +#: locale/ipp-strings.c:4196 msgid "printer-state-reasons.wrapper-cover-closed" msgstr "Wrapper Cover Closed" #. TRANSLATORS: Wrapper Cover Open -#: locale/ipp-strings.c:4160 +#: locale/ipp-strings.c:4198 msgid "printer-state-reasons.wrapper-cover-open" msgstr "Wrapper Cover Open" #. TRANSLATORS: Wrapper Empty -#: locale/ipp-strings.c:4162 +#: locale/ipp-strings.c:4200 msgid "printer-state-reasons.wrapper-empty" msgstr "Wrapper Empty" #. TRANSLATORS: Wrapper Full -#: locale/ipp-strings.c:4164 +#: locale/ipp-strings.c:4202 msgid "printer-state-reasons.wrapper-full" msgstr "Wrapper Full" #. TRANSLATORS: Wrapper Interlock Closed -#: locale/ipp-strings.c:4166 +#: locale/ipp-strings.c:4204 msgid "printer-state-reasons.wrapper-interlock-closed" msgstr "Wrapper Interlock Closed" #. TRANSLATORS: Wrapper Interlock Open -#: locale/ipp-strings.c:4168 +#: locale/ipp-strings.c:4206 msgid "printer-state-reasons.wrapper-interlock-open" msgstr "Wrapper Interlock Open" #. TRANSLATORS: Wrapper Jam -#: locale/ipp-strings.c:4170 +#: locale/ipp-strings.c:4208 msgid "printer-state-reasons.wrapper-jam" msgstr "Wrapper Jam" #. TRANSLATORS: Wrapper Life Almost Over -#: locale/ipp-strings.c:4172 +#: locale/ipp-strings.c:4210 msgid "printer-state-reasons.wrapper-life-almost-over" msgstr "Wrapper Life Almost Over" #. TRANSLATORS: Wrapper Life Over -#: locale/ipp-strings.c:4174 +#: locale/ipp-strings.c:4212 msgid "printer-state-reasons.wrapper-life-over" msgstr "Wrapper Life Over" #. TRANSLATORS: Wrapper Memory Exhausted -#: locale/ipp-strings.c:4176 +#: locale/ipp-strings.c:4214 msgid "printer-state-reasons.wrapper-memory-exhausted" msgstr "Wrapper Memory Exhausted" #. TRANSLATORS: Wrapper Missing -#: locale/ipp-strings.c:4178 +#: locale/ipp-strings.c:4216 msgid "printer-state-reasons.wrapper-missing" msgstr "Wrapper Missing" #. TRANSLATORS: Wrapper Motor Failure -#: locale/ipp-strings.c:4180 +#: locale/ipp-strings.c:4218 msgid "printer-state-reasons.wrapper-motor-failure" msgstr "Wrapper Motor Failure" #. TRANSLATORS: Wrapper Near Limit -#: locale/ipp-strings.c:4182 +#: locale/ipp-strings.c:4220 msgid "printer-state-reasons.wrapper-near-limit" msgstr "Wrapper Near Limit" #. TRANSLATORS: Wrapper Offline -#: locale/ipp-strings.c:4184 +#: locale/ipp-strings.c:4222 msgid "printer-state-reasons.wrapper-offline" msgstr "Wrapper Offline" #. TRANSLATORS: Wrapper Opened -#: locale/ipp-strings.c:4186 +#: locale/ipp-strings.c:4224 msgid "printer-state-reasons.wrapper-opened" msgstr "Wrapper Opened" #. TRANSLATORS: Wrapper Over Temperature -#: locale/ipp-strings.c:4188 +#: locale/ipp-strings.c:4226 msgid "printer-state-reasons.wrapper-over-temperature" msgstr "Wrapper Over Temperature" #. TRANSLATORS: Wrapper Power Saver -#: locale/ipp-strings.c:4190 +#: locale/ipp-strings.c:4228 msgid "printer-state-reasons.wrapper-power-saver" msgstr "Wrapper Power Saver" #. TRANSLATORS: Wrapper Recoverable Failure -#: locale/ipp-strings.c:4192 +#: locale/ipp-strings.c:4230 msgid "printer-state-reasons.wrapper-recoverable-failure" msgstr "Wrapper Recoverable Failure" #. TRANSLATORS: Wrapper Recoverable Storage -#: locale/ipp-strings.c:4194 +#: locale/ipp-strings.c:4232 msgid "printer-state-reasons.wrapper-recoverable-storage" msgstr "Wrapper Recoverable Storage" #. TRANSLATORS: Wrapper Removed -#: locale/ipp-strings.c:4196 +#: locale/ipp-strings.c:4234 msgid "printer-state-reasons.wrapper-removed" msgstr "Wrapper Removed" #. TRANSLATORS: Wrapper Resource Added -#: locale/ipp-strings.c:4198 +#: locale/ipp-strings.c:4236 msgid "printer-state-reasons.wrapper-resource-added" msgstr "Wrapper Resource Added" #. TRANSLATORS: Wrapper Resource Removed -#: locale/ipp-strings.c:4200 +#: locale/ipp-strings.c:4238 msgid "printer-state-reasons.wrapper-resource-removed" msgstr "Wrapper Resource Removed" #. TRANSLATORS: Wrapper Thermistor Failure -#: locale/ipp-strings.c:4202 +#: locale/ipp-strings.c:4240 msgid "printer-state-reasons.wrapper-thermistor-failure" msgstr "Wrapper Thermistor Failure" #. TRANSLATORS: Wrapper Timing Failure -#: locale/ipp-strings.c:4204 +#: locale/ipp-strings.c:4242 msgid "printer-state-reasons.wrapper-timing-failure" msgstr "Wrapper Timing Failure" #. TRANSLATORS: Wrapper Turned Off -#: locale/ipp-strings.c:4206 +#: locale/ipp-strings.c:4244 msgid "printer-state-reasons.wrapper-turned-off" msgstr "Wrapper Turned Off" #. TRANSLATORS: Wrapper Turned On -#: locale/ipp-strings.c:4208 +#: locale/ipp-strings.c:4246 msgid "printer-state-reasons.wrapper-turned-on" msgstr "Wrapper Turned On" #. TRANSLATORS: Wrapper Under Temperature -#: locale/ipp-strings.c:4210 +#: locale/ipp-strings.c:4248 msgid "printer-state-reasons.wrapper-under-temperature" msgstr "Wrapper Under Temperature" #. TRANSLATORS: Wrapper Unrecoverable Failure -#: locale/ipp-strings.c:4212 +#: locale/ipp-strings.c:4250 msgid "printer-state-reasons.wrapper-unrecoverable-failure" msgstr "Wrapper Unrecoverable Failure" #. TRANSLATORS: Wrapper Unrecoverable Storage Error -#: locale/ipp-strings.c:4214 +#: locale/ipp-strings.c:4252 msgid "printer-state-reasons.wrapper-unrecoverable-storage-error" msgstr "Wrapper Unrecoverable Storage Error" #. TRANSLATORS: Wrapper Warming Up -#: locale/ipp-strings.c:4216 +#: locale/ipp-strings.c:4254 msgid "printer-state-reasons.wrapper-warming-up" msgstr "Wrapper Warming Up" #. TRANSLATORS: Idle -#: locale/ipp-strings.c:4218 +#: locale/ipp-strings.c:4256 msgid "printer-state.3" msgstr "Idle" #. TRANSLATORS: Processing -#: locale/ipp-strings.c:4220 +#: locale/ipp-strings.c:4258 msgid "printer-state.4" msgstr "Processing" #. TRANSLATORS: Stopped -#: locale/ipp-strings.c:4222 +#: locale/ipp-strings.c:4260 msgid "printer-state.5" msgstr "Stopped" #. TRANSLATORS: Printer Uptime -#: locale/ipp-strings.c:4224 +#: locale/ipp-strings.c:4262 msgid "printer-up-time" msgstr "Printer Uptime" #. TRANSLATORS: Proof Print -#: locale/ipp-strings.c:4226 +#: locale/ipp-strings.c:4264 msgid "proof-print" msgstr "Proof Print" #. TRANSLATORS: Proof Print Copies -#: locale/ipp-strings.c:4228 +#: locale/ipp-strings.c:4266 msgid "proof-print-copies" msgstr "Proof Print Copies" #. TRANSLATORS: Punching -#: locale/ipp-strings.c:4230 +#: locale/ipp-strings.c:4268 msgid "punching" msgstr "Punching" #. TRANSLATORS: Punching Locations -#: locale/ipp-strings.c:4232 +#: locale/ipp-strings.c:4270 msgid "punching-locations" msgstr "Punching Locations" #. TRANSLATORS: Punching Offset -#: locale/ipp-strings.c:4234 +#: locale/ipp-strings.c:4272 msgid "punching-offset" msgstr "Punching Offset" #. TRANSLATORS: Punch Edge -#: locale/ipp-strings.c:4236 +#: locale/ipp-strings.c:4274 msgid "punching-reference-edge" msgstr "Punching Reference Edge" #. TRANSLATORS: Bottom -#: locale/ipp-strings.c:4238 +#: locale/ipp-strings.c:4276 msgid "punching-reference-edge.bottom" msgstr "Bottom" #. TRANSLATORS: Left -#: locale/ipp-strings.c:4240 +#: locale/ipp-strings.c:4278 msgid "punching-reference-edge.left" msgstr "Left" #. TRANSLATORS: Right -#: locale/ipp-strings.c:4242 +#: locale/ipp-strings.c:4280 msgid "punching-reference-edge.right" msgstr "Right" #. TRANSLATORS: Top -#: locale/ipp-strings.c:4244 +#: locale/ipp-strings.c:4282 msgid "punching-reference-edge.top" msgstr "Top" #. TRANSLATORS: Requested Attributes -#: locale/ipp-strings.c:4246 +#: locale/ipp-strings.c:4284 msgid "requested-attributes" msgstr "Requested Attributes" #. TRANSLATORS: Retry Interval -#: locale/ipp-strings.c:4248 +#: locale/ipp-strings.c:4286 msgid "retry-interval" msgstr "Retry Interval" #. TRANSLATORS: Retry Timeout -#: locale/ipp-strings.c:4250 +#: locale/ipp-strings.c:4288 msgid "retry-time-out" msgstr "Retry Time Out" #. TRANSLATORS: Save Disposition -#: locale/ipp-strings.c:4252 +#: locale/ipp-strings.c:4290 msgid "save-disposition" msgstr "Save Disposition" #. TRANSLATORS: None -#: locale/ipp-strings.c:4254 +#: locale/ipp-strings.c:4292 msgid "save-disposition.none" msgstr "None" #. TRANSLATORS: Print and Save -#: locale/ipp-strings.c:4256 +#: locale/ipp-strings.c:4294 msgid "save-disposition.print-save" msgstr "Print Save" #. TRANSLATORS: Save Only -#: locale/ipp-strings.c:4258 +#: locale/ipp-strings.c:4296 msgid "save-disposition.save-only" msgstr "Save Only" #. TRANSLATORS: Save Document Format -#: locale/ipp-strings.c:4260 +#: locale/ipp-strings.c:4298 msgid "save-document-format" msgstr "Save Document Format" #. TRANSLATORS: Save Info -#: locale/ipp-strings.c:4262 +#: locale/ipp-strings.c:4300 msgid "save-info" msgstr "Save Info" #. TRANSLATORS: Save Location -#: locale/ipp-strings.c:4264 +#: locale/ipp-strings.c:4302 msgid "save-location" msgstr "Save Location" #. TRANSLATORS: Save Name -#: locale/ipp-strings.c:4266 +#: locale/ipp-strings.c:4304 msgid "save-name" msgstr "Save Name" #. TRANSLATORS: Separator Sheets -#: locale/ipp-strings.c:4268 +#: locale/ipp-strings.c:4306 msgid "separator-sheets" msgstr "Separator Sheets" #. TRANSLATORS: Type of Separator Sheets -#: locale/ipp-strings.c:4270 +#: locale/ipp-strings.c:4308 msgid "separator-sheets-type" msgstr "Separator Sheets Type" #. TRANSLATORS: Start and End Sheets -#: locale/ipp-strings.c:4272 +#: locale/ipp-strings.c:4310 msgid "separator-sheets-type.both-sheets" msgstr "Both Sheets" #. TRANSLATORS: End Sheet -#: locale/ipp-strings.c:4274 +#: locale/ipp-strings.c:4312 msgid "separator-sheets-type.end-sheet" msgstr "End Sheet" #. TRANSLATORS: None -#: locale/ipp-strings.c:4276 +#: locale/ipp-strings.c:4314 msgid "separator-sheets-type.none" msgstr "None" #. TRANSLATORS: Slip Sheets -#: locale/ipp-strings.c:4278 +#: locale/ipp-strings.c:4316 msgid "separator-sheets-type.slip-sheets" msgstr "Slip Sheets" #. TRANSLATORS: Start Sheet -#: locale/ipp-strings.c:4280 +#: locale/ipp-strings.c:4318 msgid "separator-sheets-type.start-sheet" msgstr "Start Sheet" @@ -19306,291 +19340,291 @@ msgstr "No" #. TRANSLATORS: 2-Sided Printing -#: locale/ipp-strings.c:4282 +#: locale/ipp-strings.c:4320 msgid "sides" msgstr "2-Sided Printing" #. TRANSLATORS: Off -#: locale/ipp-strings.c:4284 +#: locale/ipp-strings.c:4322 msgid "sides.one-sided" msgstr "Off" #. TRANSLATORS: On (Portrait) -#: locale/ipp-strings.c:4286 +#: locale/ipp-strings.c:4324 msgid "sides.two-sided-long-edge" msgstr "On (Portrait)" #. TRANSLATORS: On (Landscape) -#: locale/ipp-strings.c:4288 +#: locale/ipp-strings.c:4326 msgid "sides.two-sided-short-edge" msgstr "On (Landscape)" #. TRANSLATORS: Status Message -#: locale/ipp-strings.c:4290 +#: locale/ipp-strings.c:4328 msgid "status-message" msgstr "Status Message" #. TRANSLATORS: Staple -#: locale/ipp-strings.c:4292 +#: locale/ipp-strings.c:4330 msgid "stitching" msgstr "Staple" #. TRANSLATORS: Stitching Angle -#: locale/ipp-strings.c:4294 +#: locale/ipp-strings.c:4332 msgid "stitching-angle" msgstr "Stitching Angle" #. TRANSLATORS: Stitching Locations -#: locale/ipp-strings.c:4296 +#: locale/ipp-strings.c:4334 msgid "stitching-locations" msgstr "Stitching Locations" #. TRANSLATORS: Staple Method -#: locale/ipp-strings.c:4298 +#: locale/ipp-strings.c:4336 msgid "stitching-method" msgstr "Stitching Method" #. TRANSLATORS: Automatic -#: locale/ipp-strings.c:4300 +#: locale/ipp-strings.c:4338 msgid "stitching-method.auto" msgstr "Automatic" #. TRANSLATORS: Crimp -#: locale/ipp-strings.c:4302 +#: locale/ipp-strings.c:4340 msgid "stitching-method.crimp" msgstr "Crimp" #. TRANSLATORS: Wire -#: locale/ipp-strings.c:4304 +#: locale/ipp-strings.c:4342 msgid "stitching-method.wire" msgstr "Wire" #. TRANSLATORS: Stitching Offset -#: locale/ipp-strings.c:4306 +#: locale/ipp-strings.c:4344 msgid "stitching-offset" msgstr "Stitching Offset" #. TRANSLATORS: Staple Edge -#: locale/ipp-strings.c:4308 +#: locale/ipp-strings.c:4346 msgid "stitching-reference-edge" msgstr "Stitching Reference Edge" #. TRANSLATORS: Bottom -#: locale/ipp-strings.c:4310 +#: locale/ipp-strings.c:4348 msgid "stitching-reference-edge.bottom" msgstr "Bottom" #. TRANSLATORS: Left -#: locale/ipp-strings.c:4312 +#: locale/ipp-strings.c:4350 msgid "stitching-reference-edge.left" msgstr "Left" #. TRANSLATORS: Right -#: locale/ipp-strings.c:4314 +#: locale/ipp-strings.c:4352 msgid "stitching-reference-edge.right" msgstr "Right" #. TRANSLATORS: Top -#: locale/ipp-strings.c:4316 +#: locale/ipp-strings.c:4354 msgid "stitching-reference-edge.top" msgstr "Top" #. TRANSLATORS: Subject -#: locale/ipp-strings.c:4318 +#: locale/ipp-strings.c:4356 msgid "subject" msgstr "Subject" #. TRANSLATORS: T33 Subaddress -#: locale/ipp-strings.c:4342 +#: locale/ipp-strings.c:4380 msgid "t33-subaddress" msgstr "T33 Subaddress" #. TRANSLATORS: To Name -#: locale/ipp-strings.c:4344 +#: locale/ipp-strings.c:4382 msgid "to-name" msgstr "To Name" #. TRANSLATORS: Transmission Status -#: locale/ipp-strings.c:4346 +#: locale/ipp-strings.c:4384 msgid "transmission-status" msgstr "Transmission Status" #. TRANSLATORS: Pending -#: locale/ipp-strings.c:4348 +#: locale/ipp-strings.c:4386 msgid "transmission-status.3" msgstr "Pending" #. TRANSLATORS: Pending Retry -#: locale/ipp-strings.c:4350 +#: locale/ipp-strings.c:4388 msgid "transmission-status.4" msgstr "Pending Retry" #. TRANSLATORS: Processing -#: locale/ipp-strings.c:4352 +#: locale/ipp-strings.c:4390 msgid "transmission-status.5" msgstr "Processing" #. TRANSLATORS: Canceled -#: locale/ipp-strings.c:4354 +#: locale/ipp-strings.c:4392 msgid "transmission-status.7" msgstr "Canceled" #. TRANSLATORS: Aborted -#: locale/ipp-strings.c:4356 +#: locale/ipp-strings.c:4394 msgid "transmission-status.8" msgstr "Aborted" #. TRANSLATORS: Completed -#: locale/ipp-strings.c:4358 +#: locale/ipp-strings.c:4396 msgid "transmission-status.9" msgstr "Completed" #. TRANSLATORS: Cut -#: locale/ipp-strings.c:4360 +#: locale/ipp-strings.c:4398 msgid "trimming" msgstr "Cut" #. TRANSLATORS: Cut Position -#: locale/ipp-strings.c:4362 +#: locale/ipp-strings.c:4400 msgid "trimming-offset" msgstr "Cut Position" #. TRANSLATORS: Cut Edge -#: locale/ipp-strings.c:4364 +#: locale/ipp-strings.c:4402 msgid "trimming-reference-edge" msgstr "Trimming Reference Edge" #. TRANSLATORS: Bottom -#: locale/ipp-strings.c:4366 +#: locale/ipp-strings.c:4404 msgid "trimming-reference-edge.bottom" msgstr "Bottom" #. TRANSLATORS: Left -#: locale/ipp-strings.c:4368 +#: locale/ipp-strings.c:4406 msgid "trimming-reference-edge.left" msgstr "Left" #. TRANSLATORS: Right -#: locale/ipp-strings.c:4370 +#: locale/ipp-strings.c:4408 msgid "trimming-reference-edge.right" msgstr "Right" #. TRANSLATORS: Top -#: locale/ipp-strings.c:4372 +#: locale/ipp-strings.c:4410 msgid "trimming-reference-edge.top" msgstr "Top" #. TRANSLATORS: Type of Cut -#: locale/ipp-strings.c:4374 +#: locale/ipp-strings.c:4412 msgid "trimming-type" msgstr "Trimming Type" #. TRANSLATORS: Draw Line -#: locale/ipp-strings.c:4376 +#: locale/ipp-strings.c:4414 msgid "trimming-type.draw-line" msgstr "Draw Line" #. TRANSLATORS: Full -#: locale/ipp-strings.c:4378 +#: locale/ipp-strings.c:4416 msgid "trimming-type.full" msgstr "Full" #. TRANSLATORS: Partial -#: locale/ipp-strings.c:4380 +#: locale/ipp-strings.c:4418 msgid "trimming-type.partial" msgstr "Partial" #. TRANSLATORS: Perforate -#: locale/ipp-strings.c:4382 +#: locale/ipp-strings.c:4420 msgid "trimming-type.perforate" msgstr "Perforate" #. TRANSLATORS: Score -#: locale/ipp-strings.c:4384 +#: locale/ipp-strings.c:4422 msgid "trimming-type.score" msgstr "Score" #. TRANSLATORS: Tab -#: locale/ipp-strings.c:4386 +#: locale/ipp-strings.c:4424 msgid "trimming-type.tab" msgstr "Tab" #. TRANSLATORS: Cut After -#: locale/ipp-strings.c:4388 +#: locale/ipp-strings.c:4426 msgid "trimming-when" msgstr "Trimming When" #. TRANSLATORS: Every Document -#: locale/ipp-strings.c:4390 +#: locale/ipp-strings.c:4428 msgid "trimming-when.after-documents" msgstr "After Documents" #. TRANSLATORS: Job -#: locale/ipp-strings.c:4392 +#: locale/ipp-strings.c:4430 msgid "trimming-when.after-job" msgstr "After Job" #. TRANSLATORS: Every Set -#: locale/ipp-strings.c:4394 +#: locale/ipp-strings.c:4432 msgid "trimming-when.after-sets" msgstr "After Sets" #. TRANSLATORS: Every Page -#: locale/ipp-strings.c:4396 +#: locale/ipp-strings.c:4434 msgid "trimming-when.after-sheets" msgstr "After Sheets" #. TRANSLATORS: X Accuracy -#: locale/ipp-strings.c:4398 +#: locale/ipp-strings.c:4436 msgid "x-accuracy" msgstr "X Accuracy" #. TRANSLATORS: X Dimension -#: locale/ipp-strings.c:4400 +#: locale/ipp-strings.c:4438 msgid "x-dimension" msgstr "X Dimension" #. TRANSLATORS: X Offset -#: locale/ipp-strings.c:4402 +#: locale/ipp-strings.c:4440 msgid "x-offset" msgstr "X Offset" #. TRANSLATORS: X Origin -#: locale/ipp-strings.c:4404 +#: locale/ipp-strings.c:4442 msgid "x-origin" msgstr "X Origin" #. TRANSLATORS: Y Accuracy -#: locale/ipp-strings.c:4406 +#: locale/ipp-strings.c:4444 msgid "y-accuracy" msgstr "Y Accuracy" #. TRANSLATORS: Y Dimension -#: locale/ipp-strings.c:4408 +#: locale/ipp-strings.c:4446 msgid "y-dimension" msgstr "Y Dimension" #. TRANSLATORS: Y Offset -#: locale/ipp-strings.c:4410 +#: locale/ipp-strings.c:4448 msgid "y-offset" msgstr "Y Offset" #. TRANSLATORS: Y Origin -#: locale/ipp-strings.c:4412 +#: locale/ipp-strings.c:4450 msgid "y-origin" msgstr "Y Origin" #. TRANSLATORS: Z Accuracy -#: locale/ipp-strings.c:4414 +#: locale/ipp-strings.c:4452 msgid "z-accuracy" msgstr "Z Accuracy" #. TRANSLATORS: Z Dimension -#: locale/ipp-strings.c:4416 +#: locale/ipp-strings.c:4454 msgid "z-dimension" msgstr "Z Dimension" #. TRANSLATORS: Z Offset -#: locale/ipp-strings.c:4418 +#: locale/ipp-strings.c:4456 msgid "z-offset" msgstr "Z Offset" diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/debconf.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/debconf.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/debconf.po 2020-01-23 16:52:17.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/debconf.po 2020-07-08 13:54:19.000000000 +0000 @@ -15,8 +15,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 10:41+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:37+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ru\n" #: ../Debconf/AutoSelect.pm:88 diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/dpkg-dev.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/dpkg-dev.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/dpkg-dev.po 2020-01-23 16:52:16.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/dpkg-dev.po 2020-07-08 13:54:18.000000000 +0000 @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2020-01-23 10:44+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:39+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ru\n" #: scripts/dpkg-architecture.pl scripts/dpkg-buildflags.pl @@ -605,8 +605,9 @@ #: scripts/dpkg-gencontrol.pl scripts/dpkg-mergechangelogs.pl #: scripts/Dpkg/Compression/FileHandle.pm scripts/Dpkg/IPC.pm #: scripts/Dpkg/Interface/Storable.pm scripts/Dpkg/Source/Functions.pm -#: scripts/Dpkg/Source/Package.pm scripts/Dpkg/Source/Package/V2.pm -#: scripts/Dpkg/Source/Package/V3/Quilt.pm scripts/Dpkg/Source/Quilt.pm +#: scripts/Dpkg/Source/BinaryFiles.pm scripts/Dpkg/Source/Package.pm +#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Package/V3/Quilt.pm +#: scripts/Dpkg/Source/Quilt.pm #, perl-format msgid "cannot write %s" msgstr "не удалось записать %s" @@ -690,7 +691,7 @@ msgid "missing Priority for source files" msgstr "отсутствует Priority для файлов с исходным кодом" -#: scripts/dpkg-genchanges.pl scripts/dpkg-source.pl scripts/Dpkg/Vendor.pm +#: scripts/dpkg-genchanges.pl scripts/Dpkg/Vendor.pm #, perl-format msgid "%s is empty" msgstr "%s пуст" @@ -737,10 +738,10 @@ msgid "package %s in control file but not in files list" msgstr "пакет %s в управляющем файле, но его нет в файле со списком файлов" -#: scripts/dpkg-genchanges.pl scripts/dpkg-source.pl scripts/Dpkg/BuildFlags.pm -#: scripts/Dpkg/Compression/FileHandle.pm scripts/Dpkg/Interface/Storable.pm -#: scripts/Dpkg/Shlibs/Objdump.pm scripts/Dpkg/Source/Package/V2.pm -#: scripts/Dpkg/Source/Quilt.pm +#: scripts/Dpkg/BuildFlags.pm scripts/Dpkg/Compression/FileHandle.pm +#: scripts/Dpkg/File.pm scripts/Dpkg/Interface/Storable.pm +#: scripts/Dpkg/Shlibs/Objdump.pm scripts/Dpkg/Source/BinaryFiles.pm +#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Quilt.pm #, perl-format msgid "cannot read %s" msgstr "не удалось прочитать %s" @@ -1535,7 +1536,8 @@ "информационный файл разделяемой библиотеки «%s» строка %d: неправильная " "строка «%s»" -#: scripts/dpkg-shlibdeps.pl scripts/Dpkg/Checksums.pm +#: scripts/dpkg-shlibdeps.pl scripts/Dpkg/Changelog/Parse.pm +#: scripts/Dpkg/Checksums.pm #, perl-format msgid "cannot open file %s" msgstr "не удалось открыть файл %s" @@ -1583,7 +1585,7 @@ msgid "directory argument %s is not a directory" msgstr "значение параметра каталога %s не является каталогом" -#: scripts/dpkg-source.pl scripts/Dpkg/Source/Package/V2.pm +#: scripts/dpkg-source.pl scripts/Dpkg/Source/BinaryFiles.pm #: scripts/Dpkg/Source/Package/V3/Bzr.pm scripts/Dpkg/Source/Package/V3/Git.pm #, perl-format msgid "unable to chdir to '%s'" @@ -2965,12 +2967,12 @@ msgid "-b takes only one parameter with format '%s'" msgstr "значением параметра -b является только один аргумент в формате «%s»" -#: scripts/Dpkg/Source/Package/V2.pm +#: scripts/Dpkg/Source/BinaryFiles.pm #, perl-format msgid "unwanted binary file: %s" msgstr "нежелательный двоичный файл: %s" -#: scripts/Dpkg/Source/Package/V2.pm +#: scripts/Dpkg/Source/BinaryFiles.pm #, perl-format msgid "" "detected %d unwanted binary file (add it in debian/source/include-binaries " @@ -3060,7 +3062,7 @@ msgid "cannot find an editor" msgstr "не удалось найти редактор" -#: scripts/Dpkg/Source/Package/V2.pm +#: scripts/Dpkg/Source/BinaryFiles.pm #, perl-format msgid "adding %s to %s" msgstr "добавляется %s в %s" diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/dpkg.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/dpkg.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/dpkg.po 2020-01-23 16:52:18.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/dpkg.po 2020-07-08 13:54:21.000000000 +0000 @@ -18,8 +18,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2020-01-23 10:43+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:38+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ru\n" #: lib/dpkg/ar.c @@ -141,7 +141,8 @@ msgid "error creating new backup file '%s'" msgstr "ошибка при создании нового резервного файла '%s'" -#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c +#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c +#: src/remove.c #, c-format msgid "cannot remove '%.250s'" msgstr "не удалось удалить «%.250s»" @@ -1187,7 +1188,7 @@ msgid "rm command for cleanup" msgstr "команда rm для очистки" -#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c +#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c #, c-format msgid "ambiguous package name '%s' with more than one installed instance" msgstr "" @@ -1529,7 +1530,7 @@ msgid "error creating device '%.255s'" msgstr "ошибка создания устройства «%.255s»" -#: src/archives.c src/infodb-upgrade.c +#: lib/dpkg/db-ctrl-upgrade.c src/archives.c #, c-format msgid "error creating hard link '%.255s'" msgstr "ошибка создания жёсткой ссылки «%.255s»" @@ -1853,10 +1854,10 @@ msgid "archive '%s' is not a regular file" msgstr "" -#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c -#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c -#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c -#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c +#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c +#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c +#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c +#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c msgid "" msgstr "<стандартный вывод>" @@ -2607,15 +2608,15 @@ msgid "divert-to may not contain newlines" msgstr "divert-to не может содержать символов новой строки" -#: src/divertdb.c +#: lib/dpkg/db-fsys-divert.c msgid "failed to open diversions file" msgstr "не удалось открыть файл diversions" -#: src/divertdb.c +#: lib/dpkg/db-fsys-divert.c msgid "failed to fstat diversions file" msgstr "не удалось выполнить fstat на файл diversions" -#: src/divertdb.c +#: lib/dpkg/db-fsys-divert.c #, c-format msgid "conflicting diversions involving '%.250s' or '%.250s'" msgstr "конфликт файлов diversions из пакетов «%.250s» и «%.250s»" @@ -2921,27 +2922,27 @@ "Пакет %s зафиксирован и не будет обработан. Если вас это не устраивает, " "используйте --force-hold.\n" -#: src/errors.c +#: src/force.c msgid "overriding problem because --force enabled:" msgstr "проблема игнорируется, поскольку задан параметр --force:" -#: src/filesdb-hash.c +#: lib/dpkg/db-fsys-digest.c #, c-format msgid "control file '%s' for package '%s' is missing final newline" msgstr "" "в конце управляющего файла «%s» пакетом «%s» нет символа новой строки" -#: src/filesdb-hash.c +#: lib/dpkg/db-fsys-digest.c #, c-format msgid "control file '%s' for package '%s' is missing value" msgstr "" -#: src/filesdb-hash.c +#: lib/dpkg/db-fsys-digest.c #, c-format msgid "control file '%s' for package '%s' is missing value separator" msgstr "" -#: src/filesdb-hash.c +#: lib/dpkg/db-fsys-digest.c #, c-format msgid "control file '%s' for package '%s' contains empty filename" msgstr "в управляющем файле «%s» пакета «%s» содержится пустое имя файла" @@ -2976,7 +2977,7 @@ msgid "unable to open files list file for package '%.250s'" msgstr "не удалось открыть список файлов пакета «%.250s»" -#: src/filesdb.c +#: lib/dpkg/db-fsys-files.c #, c-format msgid "" "files list file for package '%.250s' missing; assuming package has no files " @@ -3000,13 +3001,13 @@ msgid "reading files list for package '%.250s'" msgstr "чтение списка файлов пакета «%.250s»" -#: src/filesdb.c +#: lib/dpkg/db-fsys-files.c #, c-format msgid "files list file for package '%.250s' is missing final newline" msgstr "" "в списке файлов пакета «%.250s» отсутствует завершающий символ новой строки" -#: src/filesdb.c +#: lib/dpkg/db-fsys-files.c #, c-format msgid "files list file for package '%.250s' contains empty filename" msgstr "список файлов пакета «%.250s» содержит пустое имя файла" @@ -3016,11 +3017,11 @@ msgid "error closing files list file for package '%.250s'" msgstr "ошибка при закрытии списка файлов пакета «%.250s»" -#: src/filesdb.c +#: lib/dpkg/db-fsys-files.c msgid "(Reading database ... " msgstr "(Чтение базы данных … " -#: src/filesdb.c +#: lib/dpkg/db-fsys-files.c #, c-format msgid "%d file or directory currently installed.)\n" msgid_plural "%d files and directories currently installed.)\n" @@ -3096,26 +3097,26 @@ "Замечание: В PATH суперпользователя обычно должны присутствовать " "/usr/local/sbin, /usr/sbin и /sbin" -#: src/infodb-access.c +#: lib/dpkg/db-ctrl-access.c #, c-format msgid "unable to check existence of '%.250s'" msgstr "не удалось проверить существование файла «%.250s»" -#: src/infodb-access.c src/infodb-upgrade.c +#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c msgid "cannot read info directory" msgstr "ошибка чтения информационного каталога" -#: src/infodb-format.c src/unpack.c +#: lib/dpkg/db-ctrl-format.c src/unpack.c #, c-format msgid "error trying to open %.250s" msgstr "ошибка при попытке открыть файл %.250s" -#: src/infodb-format.c +#: lib/dpkg/db-ctrl-format.c #, c-format msgid "corrupt info database format file '%s'" msgstr "повреждение информационного файла формата базы данных «%s»" -#: src/infodb-format.c +#: lib/dpkg/db-ctrl-format.c #, c-format msgid "" "info database format (%d) is bogus or too new; try getting a newer dpkg" @@ -3123,12 +3124,12 @@ "формат информационной базы данных (%d) поддельный или слишком новый; " "попробуйте обновить версию dpkg" -#: src/infodb-upgrade.c +#: lib/dpkg/db-ctrl-upgrade.c #, c-format msgid "info file %s/%s not associated to any package" msgstr "информационный файл %s/%s не связан ни с одним пакетом" -#: src/infodb-upgrade.c +#: lib/dpkg/db-ctrl-upgrade.c #, c-format msgid "error while writing '%s'" msgstr "ошибка во время записи «%s»" @@ -3348,68 +3349,68 @@ "Команды, отмеченные [*], выводят большое количество информации.\n" "Объедините их в конвейер с программами «less» или «more»!" -#: src/main.c +#: src/force.c msgid "Set all force options" msgstr "Установить все параметры игнорирования" -#: src/main.c +#: src/force.c msgid "Replace a package with a lower version" msgstr "Заменить пакет на пакеты с меньшей версией" -#: src/main.c +#: src/force.c msgid "Configure any package which may help this one" msgstr "Настроить любой пакет, который может помочь этому" -#: src/main.c +#: src/force.c msgid "Process incidental packages even when on hold" msgstr "Обработать несущественные пакеты, даже когда они зафиксированы" -#: src/main.c +#: src/force.c msgid "Try to (de)install things even when not root" msgstr "" "Попытаться выполнить установку/удаление даже не имея прав суперпользователя" -#: src/main.c +#: src/force.c msgid "PATH is missing important programs, problems likely" msgstr "В PATH отсутствуют важные программы, возможны проблемы" -#: src/main.c +#: src/force.c msgid "Install a package even if it fails authenticity check" msgstr "Установить пакет, даже если он не пройдёт аутентификацию" -#: src/main.c +#: src/force.c msgid "Process even packages with wrong versions" msgstr "Обрабатывать пакеты даже с ошибочными версиями" -#: src/main.c +#: src/force.c msgid "Overwrite a file from one package with another" msgstr "Перезаписывать файл из одного пакета файлом другого пакета" -#: src/main.c +#: src/force.c msgid "Overwrite a diverted file with an undiverted version" msgstr "Перезаписывать отклонённый файл его неотклонённой версией" -#: src/main.c +#: src/force.c msgid "Overwrite one package's directory with another's file" msgstr "Перезаписывать каталог из одного пакета файлом другого пакета" -#: src/main.c +#: src/force.c msgid "Do not perform safe I/O operations when unpacking" msgstr "Не выполнять безопасные операции ввода-вывода при распаковке" -#: src/main.c +#: src/force.c msgid "Do not chroot into maintainer script environment" msgstr "" -#: src/main.c +#: src/force.c msgid "Always use the new config files, don't prompt" msgstr "Всегда использовать новые файлы настроек ничего не предлагая" -#: src/main.c +#: src/force.c msgid "Always use the old config files, don't prompt" msgstr "Всегда использовать старые файлы настроек ничего не предлагая" -#: src/main.c +#: src/force.c msgid "" "Use the default option for new config files if one\n" "is available, don't prompt. If no default can be found,\n" @@ -3421,40 +3422,40 @@ "Если он не найден, то выдаётся запрос, если только\n" "не заданы параметры confold и" -#: src/main.c +#: src/force.c msgid "Always install missing config files" msgstr "Всегда устанавливать отсутствующие файлы настройки" -#: src/main.c +#: src/force.c msgid "Offer to replace config files with no new versions" msgstr "Предлагать замену файлов настройки на старые версии" -#: src/main.c +#: src/force.c msgid "Process even packages with wrong or no architecture" msgstr "Обрабатывать даже пакеты с неправильной или вовсе без архитектуры" -#: src/main.c +#: src/force.c msgid "Install even if it would break another package" msgstr "Устанавливать, даже если это сломает другой пакет" -#: src/main.c +#: src/force.c msgid "Allow installation of conflicting packages" msgstr "Разрешить установку конфликтующих пакетов" -#: src/main.c +#: src/force.c msgid "Turn all dependency problems into warnings" msgstr "Преобразовать все проблемы с зависимостями в предупреждения" -#: src/main.c +#: src/force.c msgid "Turn dependency version problems into warnings" msgstr "" "Преобразовать все проблемы с зависимостями из-за версий в предупреждения" -#: src/main.c +#: src/force.c msgid "Remove packages which require installation" msgstr "Удалить пакеты, требующие установки" -#: src/main.c +#: src/force.c msgid "Remove an essential package" msgstr "Удалить пакет первой необходимости" @@ -3589,7 +3590,7 @@ "невозможно удалить архитектуру «%s», которая в данный момент используется в " "базе данных" -#: src/main.c +#: src/force.c #, c-format msgid "" "%s forcing options - control behaviour when problems found:\n" @@ -3604,7 +3605,7 @@ " | --no-force-<ошибка>,…\n" " Возможные ошибки:\n" -#: src/main.c +#: src/force.c #, c-format msgid "" "\n" @@ -3615,12 +3616,12 @@ "ПРЕДУПРЕЖДЕНИЕ: Использование параметров, отмеченных [!], может серьёзно\n" "повредить систему. Параметры, отмеченные [*], задействованы по умолчанию.\n" -#: src/main.c +#: src/force.c #, c-format msgid "unknown force/refuse option '%.*s'" msgstr "недопустимый параметр игнорирования/обработки проблем «%.*s»" -#: src/main.c +#: src/force.c #, c-format msgid "obsolete force/refuse option '%s'" msgstr "" @@ -4330,43 +4331,43 @@ msgid "--update is useless for --remove" msgstr "--update бесполезен вместе с --remove" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c #, c-format msgid "invalid statoverride uid %s" msgstr "" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c #, c-format msgid "invalid statoverride gid %s" msgstr "" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c #, c-format msgid "invalid statoverride mode %s" msgstr "" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "failed to open statoverride file" msgstr "не удалось открыть файл statoverride" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "failed to fstat statoverride file" msgstr "не удалось выполнить fstat на файл statoverride" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c #, c-format msgid "reading statoverride file '%.250s'" msgstr "выполняется чтение файла statoverride «%.250s»" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "statoverride file is missing final newline" msgstr "в файле statoverride отсутствует завершающий символ новой строки" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "statoverride file contains empty line" msgstr "файл statoverride содержит пустую строку" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "syntax error in statoverride file" msgstr "синтаксическая ошибка в файле statoverride" @@ -4375,7 +4376,7 @@ msgid "unknown user '%s' in statoverride file" msgstr "неизвестный пользователь «%s» в файле statoverride" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c msgid "unexpected end of line in statoverride file" msgstr "неожиданный конец строки в файле statoverride" @@ -4384,7 +4385,7 @@ msgid "unknown group '%s' in statoverride file" msgstr "неизвестная группа «%s» в файле statoverride" -#: src/statdb.c +#: lib/dpkg/db-fsys-override.c #, c-format msgid "multiple statoverrides present for file '%.250s'" msgstr "для файла «%.250s» есть несколько statoverrides" diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/dselect.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/dselect.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/dselect.po 2020-01-23 16:52:18.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/dselect.po 2020-07-08 13:54:21.000000000 +0000 @@ -16,8 +16,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 10:44+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:39+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ru\n" #: dselect/basecmds.cc diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/duplicity.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/duplicity.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/duplicity.po 2020-01-23 16:52:19.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/duplicity.po 2020-07-08 13:54:21.000000000 +0000 @@ -16,50 +16,50 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2020-01-23 11:15+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:04+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" -#: ../duplicity/dup_main.py:121 +#: ../duplicity/dup_main.py:111 msgid "Reuse configured PASSPHRASE as SIGN_PASSPHRASE" msgstr "Повторное использование настроенного PASSPHRASE как SIGN_PASSPHRASE" -#: ../duplicity/dup_main.py:128 +#: ../duplicity/dup_main.py:118 msgid "Reuse configured SIGN_PASSPHRASE as PASSPHRASE" msgstr "Повторное использование настроенного SIGN_PASSPHRASE как PASSPHRASE" -#: ../duplicity/dup_main.py:167 +#: ../duplicity/dup_main.py:157 msgid "PASSPHRASE variable not set, asking user." msgstr "Переменная PASSPHRASE не назначена, выполняется запрос пользователя." -#: ../duplicity/dup_main.py:182 +#: ../duplicity/dup_main.py:172 msgid "GnuPG passphrase for signing key:" msgstr "Кодовая фраза GnuPG для подписывающего ключа:" -#: ../duplicity/dup_main.py:187 +#: ../duplicity/dup_main.py:177 msgid "GnuPG passphrase:" msgstr "Кодовая фраза GnuPG:" -#: ../duplicity/dup_main.py:192 +#: ../duplicity/dup_main.py:182 msgid "Retype passphrase for signing key to confirm: " msgstr "Введите повторно кодовую фразу для подписывающего ключа: " -#: ../duplicity/dup_main.py:194 +#: ../duplicity/dup_main.py:184 msgid "Retype passphrase to confirm: " msgstr "Введите кодовую фразу для подтверждения снова: " -#: ../duplicity/dup_main.py:197 +#: ../duplicity/dup_main.py:187 msgid "First and second passphrases do not match! Please try again." msgstr "" "Первая и вторая кодовая фраза не совпадают! Пожалуйста, повторите снова." -#: ../duplicity/dup_main.py:204 +#: ../duplicity/dup_main.py:194 msgid "" "Cannot use empty passphrase with symmetric encryption! Please try again." msgstr "" "Невозможно использовать пустую кодовую фразу с симметричным шифрованием! " "Пожалуйста, повторите снова." -#: ../duplicity/dup_main.py:261 +#: ../duplicity/dup_main.py:251 #, python-format msgid "" "File %s complete in backup set.\n" @@ -68,7 +68,7 @@ "Файл %s уже имеется в наборе резервного копирования.\n" "Продолжение перезапуска на файле %s." -#: ../duplicity/dup_main.py:270 +#: ../duplicity/dup_main.py:260 #, python-format msgid "" "File %s missing in backup set.\n" @@ -77,12 +77,12 @@ "Файл %s отсутствует в наборе резервного копирования.\n" "Продолжение перезапуска на файле %s." -#: ../duplicity/dup_main.py:319 +#: ../duplicity/dup_main.py:309 #, python-format msgid "File %s was corrupted during upload." msgstr "Файл %s был повреждён во время выгрузки." -#: ../duplicity/dup_main.py:359 +#: ../duplicity/dup_main.py:349 msgid "" "Restarting backup, but current encryption settings do not match original " "settings" @@ -90,17 +90,17 @@ "Перезапуск резервного копирования, но настройки текущего шифрования не " "соответствуют исходным настройкам" -#: ../duplicity/dup_main.py:382 +#: ../duplicity/dup_main.py:372 #, python-format msgid "Restarting after volume %s, file %s, block %s" msgstr "" -#: ../duplicity/dup_main.py:452 +#: ../duplicity/dup_main.py:442 #, python-format msgid "Processed volume %d" msgstr "" -#: ../duplicity/dup_main.py:602 +#: ../duplicity/dup_main.py:592 msgid "" "Fatal Error: Unable to start incremental backup. Old signatures not found " "and incremental specified" @@ -108,54 +108,54 @@ "Фатальная ошибка: Не удалось начать пошаговое резервное копирование. Старая " "сигнатура не найдена и указан пошаговый режим" -#: ../duplicity/dup_main.py:606 +#: ../duplicity/dup_main.py:596 msgid "No signatures found, switching to full backup." msgstr "Сигнатуры не найдены, переключение на полную резервную копию." -#: ../duplicity/dup_main.py:620 +#: ../duplicity/dup_main.py:610 msgid "Backup Statistics" msgstr "Статистика резервного копирования" -#: ../duplicity/dup_main.py:726 +#: ../duplicity/dup_main.py:716 #, python-format msgid "%s not found in archive - no files restored." msgstr "%s не найден в архиве, нет восстановленных файлов." -#: ../duplicity/dup_main.py:730 +#: ../duplicity/dup_main.py:720 msgid "No files found in archive - nothing restored." msgstr "Ничего не найдено в архиве - ничего не восстановлено." -#: ../duplicity/dup_main.py:763 +#: ../duplicity/dup_main.py:753 #, python-format msgid "Processed volume %d of %d" msgstr "Обработан том %d из %d" -#: ../duplicity/dup_main.py:797 +#: ../duplicity/dup_main.py:787 #, python-format msgid "Invalid data - %s hash mismatch for file:" msgstr "Недопустимые данные - %s hash не соответствует файлу:" -#: ../duplicity/dup_main.py:800 +#: ../duplicity/dup_main.py:790 #, python-format msgid "Calculated hash: %s" msgstr "Вычисленный хэш: %s" -#: ../duplicity/dup_main.py:801 +#: ../duplicity/dup_main.py:791 #, python-format msgid "Manifest hash: %s" msgstr "Хеш манифеста: %s" -#: ../duplicity/dup_main.py:844 +#: ../duplicity/dup_main.py:834 #, python-format msgid "Volume was signed by key %s, not %s" msgstr "Том был подписан ключом %s, а не %s" -#: ../duplicity/dup_main.py:876 +#: ../duplicity/dup_main.py:866 #, python-format msgid "Verify complete: %s, %s." msgstr "Проверка завершена: %s, %s." -#: ../duplicity/dup_main.py:877 +#: ../duplicity/dup_main.py:867 #, python-format msgid "%d file compared" msgid_plural "%d files compared" @@ -163,7 +163,7 @@ msgstr[1] "%d файла сравнены" msgstr[2] "%d файлов сравнено" -#: ../duplicity/dup_main.py:879 +#: ../duplicity/dup_main.py:869 #, python-format msgid "%d difference found" msgid_plural "%d differences found" @@ -171,38 +171,38 @@ msgstr[1] "%d отличия найдено" msgstr[2] "%d отличий найдено" -#: ../duplicity/dup_main.py:898 +#: ../duplicity/dup_main.py:888 msgid "No extraneous files found, nothing deleted in cleanup." msgstr "Посторонних файлов не найдено, при очистке ничего не удалено." -#: ../duplicity/dup_main.py:903 +#: ../duplicity/dup_main.py:893 msgid "Deleting this file from backend:" msgid_plural "Deleting these files from backend:" msgstr[0] "Удаляется следующий файл из заглушки:" msgstr[1] "Удаляются следующие файлы из заглушки:" msgstr[2] "Удаляются следующие файлы из заглушки:" -#: ../duplicity/dup_main.py:914 +#: ../duplicity/dup_main.py:904 msgid "Found the following file to delete:" msgid_plural "Found the following files to delete:" msgstr[0] "Найден файл для удаления:" msgstr[1] "Найдены файлы для удаления:" msgstr[2] "Найдены файлы для удаления:" -#: ../duplicity/dup_main.py:917 +#: ../duplicity/dup_main.py:907 msgid "Run duplicity again with the --force option to actually delete." msgstr "" "Запустите duplicity ещё раз с ключом --force чтобы удалить на самом деле." -#: ../duplicity/dup_main.py:960 +#: ../duplicity/dup_main.py:950 msgid "There are backup set(s) at time(s):" msgstr "Есть резервные копии за следующие даты:" -#: ../duplicity/dup_main.py:962 +#: ../duplicity/dup_main.py:952 msgid "Which can't be deleted because newer sets depend on them." msgstr "Какие не могут быть удалены из-за новых наборов зависящих от них." -#: ../duplicity/dup_main.py:966 +#: ../duplicity/dup_main.py:956 msgid "" "Current active backup chain is older than specified time. However, it will " "not be deleted. To remove all your backups, manually purge the repository." @@ -211,112 +211,112 @@ "менее, она не будет удалена. Чтобы удалить все резервные копии, вручную " "очистите хранилище." -#: ../duplicity/dup_main.py:979 +#: ../duplicity/dup_main.py:969 msgid "No old backup sets found, nothing deleted." msgstr "Старые резервные копии не найдены, ничего не удалено." -#: ../duplicity/dup_main.py:982 +#: ../duplicity/dup_main.py:972 msgid "Deleting backup chain at time:" msgid_plural "Deleting backup chains at times:" msgstr[0] "Удаление цепочки резервных копий по времени:" msgstr[1] "Удаление цепочек резервных копий по времени:" msgstr[2] "Удаление цепочек резервных копий по времени:" -#: ../duplicity/dup_main.py:994 +#: ../duplicity/dup_main.py:984 #, python-format msgid "Deleting any incremental signature chain rooted at %s" msgstr "" -#: ../duplicity/dup_main.py:996 +#: ../duplicity/dup_main.py:986 #, python-format msgid "Deleting any incremental backup chain rooted at %s" msgstr "" -#: ../duplicity/dup_main.py:999 +#: ../duplicity/dup_main.py:989 #, python-format msgid "Deleting complete signature chain %s" msgstr "Удаление всей цепочки подписей %s" -#: ../duplicity/dup_main.py:1001 +#: ../duplicity/dup_main.py:991 #, python-format msgid "Deleting complete backup chain %s" msgstr "Удаление полной цепочки резервных копий %s" -#: ../duplicity/dup_main.py:1007 +#: ../duplicity/dup_main.py:997 msgid "Found old backup chain at the following time:" msgid_plural "Found old backup chains at the following times:" msgstr[0] "Обнаружена цепочка резервных копий, выполненных:" msgstr[1] "Обнаружены цепочки резервных копий, выполненных:" msgstr[2] "Обнаружены цепочки резервных копий, выполненных:" -#: ../duplicity/dup_main.py:1011 +#: ../duplicity/dup_main.py:1001 msgid "Rerun command with --force option to actually delete." msgstr "Rerun command with --force option to actually delete." -#: ../duplicity/dup_main.py:1231 +#: ../duplicity/dup_main.py:1221 #, python-format msgid "Deleting local %s (not authoritative at backend)." msgstr "" "Удаление локального %s (недостаточно надёжный во внутреннем интерфейсе)." -#: ../duplicity/dup_main.py:1236 +#: ../duplicity/dup_main.py:1226 #, python-format msgid "Unable to delete %s: %s" msgstr "Невозможно удалить %s: %s" -#: ../duplicity/dup_main.py:1270 ../duplicity/dup_temp.py:271 +#: ../duplicity/dup_main.py:1260 ../duplicity/dup_temp.py:270 #, python-format msgid "Failed to read %s: %s" msgstr "Не удалось прочитать %s: %s" -#: ../duplicity/dup_main.py:1284 +#: ../duplicity/dup_main.py:1274 #, python-format msgid "Copying %s to local cache." msgstr "Копируется %s в локальный кэш." -#: ../duplicity/dup_main.py:1332 +#: ../duplicity/dup_main.py:1322 msgid "Local and Remote metadata are synchronized, no sync needed." msgstr "" "Локальные и удалённые метаданные синхронизированы, синхронизация не " "требуется." -#: ../duplicity/dup_main.py:1337 +#: ../duplicity/dup_main.py:1327 msgid "Synchronizing remote metadata to local cache..." msgstr "" "Синхронизация удалённых метаданных с локальными временными файлами..." -#: ../duplicity/dup_main.py:1350 +#: ../duplicity/dup_main.py:1340 msgid "Sync would copy the following from remote to local:" msgstr "Синхронизация скопирует это из удаленного места в локальное:" -#: ../duplicity/dup_main.py:1353 +#: ../duplicity/dup_main.py:1343 msgid "Sync would remove the following spurious local files:" msgstr "Синхронизация удалит следующие неизвестные файлы:" -#: ../duplicity/dup_main.py:1397 +#: ../duplicity/dup_main.py:1387 msgid "Unable to get free space on temp." msgstr "" "Не удалось узнать объем доступного пространства во временном каталоге." -#: ../duplicity/dup_main.py:1405 +#: ../duplicity/dup_main.py:1395 #, python-format msgid "Temp space has %d available, backup needs approx %d." msgstr "" "Во временно каталоге доступного %d, для резервного копирования нужно " "примерно %d." -#: ../duplicity/dup_main.py:1408 +#: ../duplicity/dup_main.py:1398 #, python-format msgid "Temp has %d available, backup will use approx %d." msgstr "" "Во временном каталоге доступно %d, для резервного копирования будет " "использовано примерно %d." -#: ../duplicity/dup_main.py:1416 +#: ../duplicity/dup_main.py:1406 msgid "Unable to get max open files." msgstr "Не удалось узнать максимальное количество открытых файлов." -#: ../duplicity/dup_main.py:1420 +#: ../duplicity/dup_main.py:1410 #, python-format msgid "" "Max open files of %s is too low, should be >= 1024.\n" @@ -326,7 +326,7 @@ "1024.\n" "Используйте 'ulimit -n 1024' или выше, чтобы исправить.\n" -#: ../duplicity/dup_main.py:1472 +#: ../duplicity/dup_main.py:1462 msgid "" "RESTART: The first volume failed to upload before termination.\n" " Restart is impossible...starting backup from beginning." @@ -334,7 +334,7 @@ "ПЕРЕЗАПУСК: Ошибка выгрузки первого тома перед завершением работы.\n" " Перезапуск невозможен...выполнение резервного копирования с начала." -#: ../duplicity/dup_main.py:1478 +#: ../duplicity/dup_main.py:1468 #, python-format msgid "" "RESTART: Volumes %d to %d failed to upload before termination.\n" @@ -343,7 +343,7 @@ "ПЕРЕЗАПУСК: Ошибка выгрузки томов %d дo %d перед завершением работы.\n" " Перезапуск резервного копирования в томе %d." -#: ../duplicity/dup_main.py:1485 +#: ../duplicity/dup_main.py:1475 #, python-format msgid "" "RESTART: Impossible backup state: manifest has %d vols, remote has %d vols.\n" @@ -357,7 +357,7 @@ "части\n" " резервной копии, затем запустит резервное копирования сначала." -#: ../duplicity/dup_main.py:1506 +#: ../duplicity/dup_main.py:1496 msgid "" "\n" "PYTHONOPTIMIZE in the environment causes duplicity to fail to\n" @@ -367,40 +367,40 @@ "See https://bugs.launchpad.net/duplicity/+bug/931175\n" msgstr "" -#: ../duplicity/dup_main.py:1529 +#: ../duplicity/dup_main.py:1519 #, python-format msgid "Acquiring lockfile %s" msgstr "" -#: ../duplicity/dup_main.py:1587 +#: ../duplicity/dup_main.py:1577 #, python-format msgid "Last %s backup left a partial set, restarting." msgstr "" "Последняя %s резервная копия оставила частичный набор, выполняется " "перезапуск." -#: ../duplicity/dup_main.py:1591 +#: ../duplicity/dup_main.py:1581 #, python-format msgid "Cleaning up previous partial %s backup set, restarting." msgstr "" "Очистка предыдущего частичного %s набора резервного копирования, выполняется " "перезапуск." -#: ../duplicity/dup_main.py:1603 +#: ../duplicity/dup_main.py:1593 msgid "Last full backup date:" msgstr "Время последней полной резервной копии:" -#: ../duplicity/dup_main.py:1605 +#: ../duplicity/dup_main.py:1595 msgid "Last full backup date: none" msgstr "Время последней полной резервной копии: нету" -#: ../duplicity/dup_main.py:1608 +#: ../duplicity/dup_main.py:1598 msgid "Last full backup is too old, forcing full backup" msgstr "" "Последняя полная резервная копия слишком старая, будет сделана полная " "резервная копия" -#: ../duplicity/dup_main.py:1657 +#: ../duplicity/dup_main.py:1647 msgid "" "When using symmetric encryption, the signing passphrase must equal the " "encryption passphrase." @@ -408,26 +408,26 @@ "При использовании симметричного шифрования кодовая фраза для подписи должна " "совпадать с кодовой фразой для шифрования." -#: ../bin/duplicity:120 +#: ../bin/duplicity:102 msgid "INT intercepted...exiting." msgstr "Перехват INT...выполняется выход." -#: ../bin/duplicity:128 +#: ../bin/duplicity:110 #, python-format msgid "GPG error detail: %s" msgstr "Подробности ошибки GPG: %s" -#: ../bin/duplicity:138 +#: ../bin/duplicity:120 #, python-format msgid "User error detail: %s" msgstr "Сведения ошибки пользователя: %s" -#: ../bin/duplicity:148 +#: ../bin/duplicity:130 #, python-format msgid "Backend error detail: %s" msgstr "Подробности об ошибке в заглушке: %s" -#: ../bin/rdiffdir:64 ../duplicity/commandline.py:236 +#: ../bin/rdiffdir:64 ../duplicity/commandline.py:235 #, python-format msgid "Error opening file %s" msgstr "Ошибка открытия файла %s" @@ -437,34 +437,34 @@ msgid "File %s already exists, will not overwrite." msgstr "Файл %s уже существует и не будет перезаписан." -#: ../duplicity/selection.py:121 +#: ../duplicity/selection.py:119 #, python-format msgid "Skipping socket %s" msgstr "Пропуск сокета %s" -#: ../duplicity/selection.py:125 +#: ../duplicity/selection.py:123 #, python-format msgid "Error initializing file %s" msgstr "Ошибка инициализации файла %s" -#: ../duplicity/selection.py:129 ../duplicity/selection.py:154 -#: ../duplicity/selection.py:458 +#: ../duplicity/selection.py:127 ../duplicity/selection.py:152 +#: ../duplicity/selection.py:452 #, python-format msgid "Error accessing possibly locked file %s" msgstr "Ошибка доступа к возможно заблокированному файлу %s" -#: ../duplicity/selection.py:169 +#: ../duplicity/selection.py:167 #, python-format msgid "Warning: base %s doesn't exist, continuing" msgstr "Внимание: база %s не существует, выполняется продолжение" -#: ../duplicity/selection.py:172 ../duplicity/selection.py:190 -#: ../duplicity/selection.py:193 +#: ../duplicity/selection.py:170 ../duplicity/selection.py:188 +#: ../duplicity/selection.py:191 #, python-format msgid "Selecting %s" msgstr "Выбор %s" -#: ../duplicity/selection.py:290 +#: ../duplicity/selection.py:288 #, python-format msgid "" "Fatal Error: The file specification\n" @@ -481,7 +481,7 @@ "Полезные спецификации файла начинаются с базового каталога или\n" "маски (например '**'), которая соответствует базовому каталогу." -#: ../duplicity/selection.py:299 +#: ../duplicity/selection.py:297 #, python-format msgid "" "Fatal Error while processing expression\n" @@ -490,7 +490,7 @@ "Критическая ошибка при обработке выражения\n" "%s" -#: ../duplicity/selection.py:308 +#: ../duplicity/selection.py:306 #, python-format msgid "" "Last selection expression:\n" @@ -506,12 +506,12 @@ "Выполнение выхода, так как возможно, что вероятно, это не то, что вы имели в " "виду." -#: ../duplicity/selection.py:364 +#: ../duplicity/selection.py:362 #, python-format msgid "Reading globbing filelist %s" msgstr "Чтение подстановочного списка файлов %s" -#: ../duplicity/selection.py:397 +#: ../duplicity/selection.py:395 #, python-format msgid "Error compiling regular expression %s" msgstr "Ошибка компилирования регулярного выражения %s" @@ -524,7 +524,7 @@ "Внимание: exclude-device-files не является первым выборщиком.\n" "возможно, это не то, что вы хотели" -#: ../duplicity/commandline.py:79 +#: ../duplicity/commandline.py:78 #, python-format msgid "" "Warning: Option %s is pending deprecation and will be removed in a future " @@ -535,7 +535,7 @@ "следующем выпуске.\n" "Настоятельно предлагаем использовать предложенные имена файлов." -#: ../duplicity/commandline.py:86 +#: ../duplicity/commandline.py:85 #, python-format msgid "" "Warning: Option %s is pending deprecation and will be removed in a future " @@ -544,7 +544,7 @@ "should be used instead." msgstr "" -#: ../duplicity/commandline.py:96 +#: ../duplicity/commandline.py:95 #, python-format msgid "" "Warning: Option %s is pending deprecation and will be removed in a future " @@ -554,68 +554,68 @@ "be used as a substitute." msgstr "" -#. Used in usage help to represent a Unix-style path name. Example: +#. TRANSL: Used in usage help to represent a Unix-style path name. Example: #. --archive-dir -#: ../duplicity/commandline.py:257 ../duplicity/commandline.py:267 -#: ../duplicity/commandline.py:288 ../duplicity/commandline.py:362 -#: ../duplicity/commandline.py:380 ../duplicity/commandline.py:612 -#: ../duplicity/commandline.py:645 ../duplicity/commandline.py:858 +#: ../duplicity/commandline.py:256 ../duplicity/commandline.py:266 +#: ../duplicity/commandline.py:287 ../duplicity/commandline.py:358 +#: ../duplicity/commandline.py:376 ../duplicity/commandline.py:608 +#: ../duplicity/commandline.py:641 ../duplicity/commandline.py:854 msgid "path" msgstr "путь" -#. Used in usage help to represent an ID for a GnuPG key. Example: +#. TRANSL: Used in usage help to represent an ID for a GnuPG key. Example: #. --encrypt-key -#. Used in usage help to represent an ID for a hidden GnuPG key. Example: +#. TRANSL: Used in usage help to represent an ID for a hidden GnuPG key. Example: #. --hidden-encrypt-key -#. Used in usage help to represent an ID for a GnuPG key. Example: +#. TRANSL: Used in usage help to represent an ID for a GnuPG key. Example: #. --encrypt-key -#: ../duplicity/commandline.py:283 ../duplicity/commandline.py:290 -#: ../duplicity/commandline.py:386 ../duplicity/commandline.py:596 -#: ../duplicity/commandline.py:831 +#: ../duplicity/commandline.py:282 ../duplicity/commandline.py:289 +#: ../duplicity/commandline.py:382 ../duplicity/commandline.py:592 +#: ../duplicity/commandline.py:827 msgid "gpg-key-id" msgstr "gpg-key-id" -#. Used in usage help to represent a "glob" style pattern for +#. TRANSL: Used in usage help to represent a "glob" style pattern for #. matching one or more files, as described in the documentation. #. Example: #. --exclude -#: ../duplicity/commandline.py:298 ../duplicity/commandline.py:411 -#: ../duplicity/commandline.py:881 +#: ../duplicity/commandline.py:297 ../duplicity/commandline.py:407 +#: ../duplicity/commandline.py:877 msgid "shell_pattern" msgstr "shell_pattern" -#. Used in usage help to represent the name of a file. Example: +#. TRANSL: Used in usage help to represent the name of a file. Example: #. --log-file -#: ../duplicity/commandline.py:304 ../duplicity/commandline.py:313 -#: ../duplicity/commandline.py:320 ../duplicity/commandline.py:413 -#: ../duplicity/commandline.py:420 ../duplicity/commandline.py:433 -#: ../duplicity/commandline.py:827 +#: ../duplicity/commandline.py:303 ../duplicity/commandline.py:312 +#: ../duplicity/commandline.py:319 ../duplicity/commandline.py:409 +#: ../duplicity/commandline.py:416 ../duplicity/commandline.py:429 +#: ../duplicity/commandline.py:823 msgid "filename" msgstr "имя файла" -#. Used in usage help to represent a regular expression (regexp). -#: ../duplicity/commandline.py:327 ../duplicity/commandline.py:424 +#. TRANSL: Used in usage help to represent a regular expression (regexp). +#: ../duplicity/commandline.py:326 ../duplicity/commandline.py:420 msgid "regular_expression" msgstr "regular_expression" -#. Used in usage help to represent a time spec for a previous +#. TRANSL: Used in usage help to represent a time spec for a previous #. point in time, as described in the documentation. Example: #. duplicity remove-older-than time [options] target_url -#: ../duplicity/commandline.py:331 ../duplicity/commandline.py:374 -#: ../duplicity/commandline.py:500 ../duplicity/commandline.py:913 +#: ../duplicity/commandline.py:330 ../duplicity/commandline.py:370 +#: ../duplicity/commandline.py:496 ../duplicity/commandline.py:909 msgid "time" msgstr "время" -#. Used in usage help. (Should be consistent with the "Options:" +#. TRANSL: Used in usage help. (Should be consistent with the "Options:" #. header.) Example: #. duplicity [full|incremental] [options] source_dir target_url -#: ../duplicity/commandline.py:382 ../duplicity/commandline.py:480 -#: ../duplicity/commandline.py:503 ../duplicity/commandline.py:604 -#: ../duplicity/commandline.py:846 +#: ../duplicity/commandline.py:378 ../duplicity/commandline.py:476 +#: ../duplicity/commandline.py:499 ../duplicity/commandline.py:600 +#: ../duplicity/commandline.py:842 msgid "options" msgstr "параметры" -#: ../duplicity/commandline.py:397 +#: ../duplicity/commandline.py:393 #, python-format msgid "" "Running in 'ignore errors' mode due to %s; please re-consider if this was " @@ -624,220 +624,220 @@ "Выполнение в режиме 'пропуска ошибок' в связи с %s; пожалуйста, пересмотрите " "решение, если это не было намерением" -#. Used in usage help to represent an imap mailbox -#: ../duplicity/commandline.py:409 +#. TRANSL: Used in usage help to represent an imap mailbox +#: ../duplicity/commandline.py:405 msgid "imap_mailbox" msgstr "imap_mailbox" -#: ../duplicity/commandline.py:427 +#: ../duplicity/commandline.py:423 msgid "file_descriptor" msgstr "file_descriptor" -#. Used in usage help to represent a desired number of +#. TRANSL: Used in usage help to represent a desired number of #. something. Example: #. --num-retries -#: ../duplicity/commandline.py:438 ../duplicity/commandline.py:460 -#: ../duplicity/commandline.py:477 ../duplicity/commandline.py:486 -#: ../duplicity/commandline.py:536 ../duplicity/commandline.py:541 -#: ../duplicity/commandline.py:545 ../duplicity/commandline.py:564 -#: ../duplicity/commandline.py:570 ../duplicity/commandline.py:574 -#: ../duplicity/commandline.py:640 ../duplicity/commandline.py:841 +#: ../duplicity/commandline.py:434 ../duplicity/commandline.py:456 +#: ../duplicity/commandline.py:473 ../duplicity/commandline.py:482 +#: ../duplicity/commandline.py:532 ../duplicity/commandline.py:537 +#: ../duplicity/commandline.py:541 ../duplicity/commandline.py:560 +#: ../duplicity/commandline.py:566 ../duplicity/commandline.py:570 +#: ../duplicity/commandline.py:636 ../duplicity/commandline.py:837 msgid "number" msgstr "количество" -#. Used in usage help (noun) -#: ../duplicity/commandline.py:441 +#. TRANSL: Used in usage help (noun) +#: ../duplicity/commandline.py:437 msgid "backup name" msgstr "название резервной копии" -#. noun -#: ../duplicity/commandline.py:580 ../duplicity/commandline.py:583 -#: ../duplicity/commandline.py:812 +#. TRANSL: noun +#: ../duplicity/commandline.py:576 ../duplicity/commandline.py:579 +#: ../duplicity/commandline.py:808 msgid "command" msgstr "команда" -#: ../duplicity/commandline.py:586 +#: ../duplicity/commandline.py:582 msgid "pyrax|cloudfiles" msgstr "" -#: ../duplicity/commandline.py:607 +#: ../duplicity/commandline.py:603 msgid "pem formatted bundle of certificate authorities" msgstr "" -#: ../duplicity/commandline.py:608 +#: ../duplicity/commandline.py:604 msgid "path to a folder with certificate authority files" msgstr "" -#. Used in usage help. Example: +#. TRANSL: Used in usage help. Example: #. --timeout -#. Used in usage help. Example: +#. TRANSL: Used in usage help. Example: #. --backend-retry-delay -#. Used in usage help. Example: +#. TRANSL: Used in usage help. Example: #. --timeout -#: ../duplicity/commandline.py:617 ../duplicity/commandline.py:651 -#: ../duplicity/commandline.py:875 +#: ../duplicity/commandline.py:613 ../duplicity/commandline.py:647 +#: ../duplicity/commandline.py:871 msgid "seconds" msgstr "секунды" -#. abbreviation for "character" (noun) -#: ../duplicity/commandline.py:623 ../duplicity/commandline.py:809 +#. TRANSL: abbreviation for "character" (noun) +#: ../duplicity/commandline.py:619 ../duplicity/commandline.py:805 msgid "char" msgstr "символ" -#: ../duplicity/commandline.py:775 +#: ../duplicity/commandline.py:771 #, python-format msgid "Using archive dir: %s" msgstr "Использование каталога архива: %s" -#: ../duplicity/commandline.py:776 +#: ../duplicity/commandline.py:772 #, python-format msgid "Using backup name: %s" msgstr "Использование наименования резервной копии: %s" -#: ../duplicity/commandline.py:783 +#: ../duplicity/commandline.py:779 #, python-format msgid "Command line error: %s" msgstr "Ошибка в командной строке: %s" -#: ../duplicity/commandline.py:784 +#: ../duplicity/commandline.py:780 msgid "Enter 'duplicity --help' for help screen." msgstr "Введите 'duplicity --help' для экрана справки." -#. Used in usage help to represent a Unix-style path name. Example: +#. TRANSL: Used in usage help to represent a Unix-style path name. Example: #. rsync://user[:password]@other_host[:port]//absolute_path -#: ../duplicity/commandline.py:797 +#: ../duplicity/commandline.py:793 msgid "absolute_path" msgstr "полный_путь" -#. Used in usage help. Example: +#. TRANSL: Used in usage help. Example: #. tahoe://alias/some_dir -#: ../duplicity/commandline.py:801 +#: ../duplicity/commandline.py:797 msgid "alias" msgstr "псевдоним" -#. Used in help to represent a "bucket name" for Amazon Web +#. TRANSL: Used in help to represent a "bucket name" for Amazon Web #. Services' Simple Storage Service (S3). Example: #. s3://other.host/bucket_name[/prefix] -#: ../duplicity/commandline.py:806 +#: ../duplicity/commandline.py:802 msgid "bucket_name" msgstr "bucket_name" -#. Used in usage help to represent the name of a container in +#. TRANSL: Used in usage help to represent the name of a container in #. Amazon Web Services' Cloudfront. Example: #. cf+http://container_name -#: ../duplicity/commandline.py:817 +#: ../duplicity/commandline.py:813 msgid "container_name" msgstr "container_name" -#. noun -#: ../duplicity/commandline.py:820 +#. TRANSL: noun +#: ../duplicity/commandline.py:816 msgid "count" msgstr "количество" -#. Used in usage help to represent the name of a file directory -#: ../duplicity/commandline.py:823 +#. TRANSL: Used in usage help to represent the name of a file directory +#: ../duplicity/commandline.py:819 msgid "directory" msgstr "каталог" -#. Used in usage help, e.g. to represent the name of a code +#. TRANSL: Used in usage help, e.g. to represent the name of a code #. module. Example: #. rsync://user[:password]@other.host[:port]::/module/some_dir -#: ../duplicity/commandline.py:836 +#: ../duplicity/commandline.py:832 msgid "module" msgstr "модуль" -#. Used in usage help to represent an internet hostname. Example: +#. TRANSL: Used in usage help to represent an internet hostname. Example: #. ftp://user[:password]@other.host[:port]/some_dir -#: ../duplicity/commandline.py:850 +#: ../duplicity/commandline.py:846 msgid "other.host" msgstr "other.host" -#. Used in usage help. Example: +#. TRANSL: Used in usage help. Example: #. ftp://user[:password]@other.host[:port]/some_dir -#: ../duplicity/commandline.py:854 +#: ../duplicity/commandline.py:850 msgid "password" msgstr "пароль" -#. Used in usage help to represent a TCP port number. Example: +#. TRANSL: Used in usage help to represent a TCP port number. Example: #. ftp://user[:password]@other.host[:port]/some_dir -#: ../duplicity/commandline.py:862 +#: ../duplicity/commandline.py:858 msgid "port" msgstr "порт" -#. Used in usage help. This represents a string to be used as a +#. TRANSL: Used in usage help. This represents a string to be used as a #. prefix to names for backup files created by Duplicity. Example: #. s3://other.host/bucket_name[/prefix] -#: ../duplicity/commandline.py:867 +#: ../duplicity/commandline.py:863 msgid "prefix" msgstr "префикс" -#. Used in usage help to represent a Unix-style path name. Example: +#. TRANSL: Used in usage help to represent a Unix-style path name. Example: #. rsync://user[:password]@other.host[:port]/relative_path -#: ../duplicity/commandline.py:871 +#: ../duplicity/commandline.py:867 msgid "relative_path" msgstr "относительный_путь" -#. Used in usage help to represent the name of a single file +#. TRANSL: Used in usage help to represent the name of a single file #. directory or a Unix-style path to a directory. Example: #. file:///some_dir -#: ../duplicity/commandline.py:886 +#: ../duplicity/commandline.py:882 msgid "some_dir" msgstr "некоторый_каталог" -#. Used in usage help to represent the name of a single file +#. TRANSL: Used in usage help to represent the name of a single file #. directory or a Unix-style path to a directory where files will be #. coming FROM. Example: #. duplicity [full|incremental] [options] source_dir target_url -#: ../duplicity/commandline.py:892 +#: ../duplicity/commandline.py:888 msgid "source_dir" msgstr "source_dir" -#. Used in usage help to represent a URL files will be coming +#. TRANSL: Used in usage help to represent a URL files will be coming #. FROM. Example: #. duplicity [restore] [options] source_url target_dir -#: ../duplicity/commandline.py:897 +#: ../duplicity/commandline.py:893 msgid "source_url" msgstr "source_url" -#. Used in usage help to represent the name of a single file +#. TRANSL: Used in usage help to represent the name of a single file #. directory or a Unix-style path to a directory. where files will be #. going TO. Example: #. duplicity [restore] [options] source_url target_dir -#: ../duplicity/commandline.py:903 +#: ../duplicity/commandline.py:899 msgid "target_dir" msgstr "target_dir" -#. Used in usage help to represent a URL files will be going TO. +#. TRANSL: Used in usage help to represent a URL files will be going TO. #. Example: #. duplicity [full|incremental] [options] source_dir target_url -#: ../duplicity/commandline.py:908 +#: ../duplicity/commandline.py:904 msgid "target_url" msgstr "target_url" -#. Used in usage help to represent a user name (i.e. login). +#. TRANSL: Used in usage help to represent a user name (i.e. login). #. Example: #. ftp://user[:password]@other.host[:port]/some_dir -#: ../duplicity/commandline.py:918 +#: ../duplicity/commandline.py:914 msgid "user" msgstr "пользователь" -#. account id for b2. Example: b2://account_id@bucket/ -#: ../duplicity/commandline.py:921 +#. TRANSL: account id for b2. Example: b2://account_id@bucket/ +#: ../duplicity/commandline.py:917 msgid "account_id" msgstr "" -#. application_key for b2. +#. TRANSL: application_key for b2. #. Example: b2://account_id:application_key@bucket/ -#: ../duplicity/commandline.py:925 +#: ../duplicity/commandline.py:921 msgid "application_key" msgstr "" -#. Header in usage help +#. TRANSL: Header in usage help #: ../duplicity/commandline.py:944 msgid "Backends and their URL formats:" msgstr "Заглушки и формат их URL:" -#. Header in usage help +#. TRANSL: Header in usage help #: ../duplicity/commandline.py:977 msgid "Commands:" msgstr "Команды:" @@ -909,42 +909,42 @@ msgid "Main action: " msgstr "Главное действие: " -#: ../duplicity/backend.py:103 +#: ../duplicity/backend.py:102 #, python-format msgid "Import of %s %s" msgstr "Импортирование %s %s" -#: ../duplicity/backend.py:212 +#: ../duplicity/backend.py:211 #, python-format msgid "Could not initialize backend: %s" msgstr "Невозможно инициализиовать внутренний интерфейс: %s" -#: ../duplicity/backend.py:379 +#: ../duplicity/backend.py:390 #, python-format msgid "Backtrace of previous error: %s" msgstr "" -#: ../duplicity/backend.py:394 +#: ../duplicity/backend.py:406 #, python-format msgid "Giving up after %s attempts. %s: %s" msgstr "" -#: ../duplicity/backend.py:398 +#: ../duplicity/backend.py:410 #, python-format msgid "Attempt %s failed. %s: %s" msgstr "Попытка %s произошла с ошибкой. %s: %s" -#: ../duplicity/backend.py:492 +#: ../duplicity/backend.py:504 #, python-format msgid "Reading results of '%s'" msgstr "Чтение результата '%s'" -#: ../duplicity/backend.py:518 +#: ../duplicity/backend.py:530 #, python-format msgid "Writing %s" msgstr "Записывается %s" -#: ../duplicity/backend.py:559 +#: ../duplicity/backend.py:571 #, python-format msgid "File %s not found locally after get from backend" msgstr "" @@ -987,32 +987,32 @@ msgid "task execution done (success: %s)" msgstr "завершено выполнение задачи (успех: %s)" -#: ../duplicity/patchdir.py:84 ../duplicity/patchdir.py:89 +#: ../duplicity/patchdir.py:82 ../duplicity/patchdir.py:87 #, python-format msgid "Patching %s" msgstr "Внесение изменений в %s" -#: ../duplicity/patchdir.py:550 +#: ../duplicity/patchdir.py:547 #, python-format msgid "Error '%s' patching %s" msgstr "" -#: ../duplicity/patchdir.py:625 +#: ../duplicity/patchdir.py:622 #, python-format msgid "Writing %s of type %s" msgstr "Запись %s типа %s" -#: ../duplicity/dup_collections.py:180 ../duplicity/dup_collections.py:194 +#: ../duplicity/dup_collections.py:177 ../duplicity/dup_collections.py:191 #, python-format msgid "BackupSet.delete: missing %s" msgstr "" -#: ../duplicity/dup_collections.py:219 +#: ../duplicity/dup_collections.py:216 msgid "Fatal Error: No manifests found for most recent backup" msgstr "" "Критическая ошибка: отсутствуют манифесты для недавней резервной копии" -#: ../duplicity/dup_collections.py:228 +#: ../duplicity/dup_collections.py:225 msgid "" "Fatal Error: Remote manifest does not match local one. Either the remote " "backup set or the local archive directory has been corrupted." @@ -1021,104 +1021,106 @@ "Неисправен удалённый набор резервного копирования или папка локального " "архива." -#: ../duplicity/dup_collections.py:236 +#: ../duplicity/dup_collections.py:233 msgid "Fatal Error: Neither remote nor local manifest is readable." msgstr "" "Критическая ошибка: Нет доступа к чтению удалённого и локального манифеста." -#: ../duplicity/dup_collections.py:247 +#: ../duplicity/dup_collections.py:244 #, python-format msgid "Processing local manifest %s (%s)" msgstr "" -#: ../duplicity/dup_collections.py:259 +#: ../duplicity/dup_collections.py:256 #, python-format msgid "Error processing remote manifest (%s): %s" msgstr "" -#: ../duplicity/dup_collections.py:262 +#: ../duplicity/dup_collections.py:259 #, python-format msgid "Processing remote manifest %s (%s)" msgstr "" -#: ../duplicity/dup_collections.py:358 +#: ../duplicity/dup_collections.py:355 msgid "Preferring Backupset over previous one!" msgstr "Предпочтение набора резервного копирования вместо предыдущего!" -#: ../duplicity/dup_collections.py:361 +#: ../duplicity/dup_collections.py:358 #, python-format msgid "Ignoring incremental Backupset (start_time: %s; needed: %s)" msgstr "" "Пропуск инкрементального набора резервного копирования (время_запуска: %s; " "необходимо: %s)" -#: ../duplicity/dup_collections.py:366 +#: ../duplicity/dup_collections.py:363 #, python-format msgid "Added incremental Backupset (start_time: %s / end_time: %s)" msgstr "" "Добавлена пошаговая резервная копия (время_начала: %s / время_конца: %s)" -#: ../duplicity/dup_collections.py:436 +#: ../duplicity/dup_collections.py:433 msgid "Chain start time: " msgstr "Цепочка начата: " -#: ../duplicity/dup_collections.py:437 +#: ../duplicity/dup_collections.py:434 msgid "Chain end time: " msgstr "Цепочка завершена: " -#: ../duplicity/dup_collections.py:438 +#: ../duplicity/dup_collections.py:435 #, python-format msgid "Number of contained backup sets: %d" msgstr "Количество содержащихся наборов резервного копирования: %d" -#: ../duplicity/dup_collections.py:440 +#: ../duplicity/dup_collections.py:437 #, python-format msgid "Total number of contained volumes: %d" msgstr "Общее число содержащихся томов: %d" -#: ../duplicity/dup_collections.py:442 ../duplicity/dup_collections.py:1239 +#: ../duplicity/dup_collections.py:439 ../duplicity/dup_collections.py:1228 msgid "Type of backup set:" msgstr "Тип резервной копии:" -#: ../duplicity/dup_collections.py:442 ../duplicity/dup_collections.py:1239 +#: ../duplicity/dup_collections.py:439 ../duplicity/dup_collections.py:1228 msgid "Time:" msgstr "Время:" -#: ../duplicity/dup_collections.py:442 +#: ../duplicity/dup_collections.py:439 msgid "Num volumes:" msgstr "Число томов:" -#: ../duplicity/dup_collections.py:446 ../duplicity/dup_collections.py:1245 +#: ../duplicity/dup_collections.py:443 ../duplicity/dup_collections.py:1234 msgid "Full" msgstr "Полная" -#: ../duplicity/dup_collections.py:449 ../duplicity/dup_collections.py:1247 +#: ../duplicity/dup_collections.py:446 ../duplicity/dup_collections.py:1236 msgid "Incremental" msgstr "Пошаговая" -#: ../duplicity/dup_collections.py:509 +#: ../duplicity/dup_collections.py:506 msgid "local" msgstr "Локальная" -#: ../duplicity/dup_collections.py:511 +#. TRANSL: remote name for rclone. +#. Example: rclone://remote:/some_dir +#: ../duplicity/commandline.py:925 ../duplicity/dup_collections.py:508 msgid "remote" msgstr "удалённая" -#: ../duplicity/dup_collections.py:666 +#: ../duplicity/dup_collections.py:663 msgid "Collection Status" msgstr "Состояние сбора" -#: ../duplicity/dup_collections.py:668 +#: ../duplicity/dup_collections.py:665 #, python-format msgid "Connecting with backend: %s" msgstr "Соединение с внутренним интерфейсом: %s" -#: ../duplicity/dup_collections.py:670 +#: ../duplicity/dup_collections.py:667 #, python-format msgid "Archive dir: %s" msgstr "Папка архива: %s" -#: ../duplicity/dup_collections.py:673 +#: ../duplicity/dup_collections.py:670 #, python-format msgid "Found %d secondary backup chain." msgid_plural "Found %d secondary backup chains." @@ -1126,24 +1128,24 @@ msgstr[1] "Найдены %d вторичные цепочки резервных копий." msgstr[2] "Найдено %d вторичных цепочек резервных копий." -#: ../duplicity/dup_collections.py:678 +#: ../duplicity/dup_collections.py:675 #, python-format msgid "Secondary chain %d of %d:" msgstr "Вторичная цепочка %d из %d:" -#: ../duplicity/dup_collections.py:684 +#: ../duplicity/dup_collections.py:681 msgid "Found primary backup chain with matching signature chain:" msgstr "" "Найдена первичная цепочка резервного копирования с соответствующей цепочкой " "подписи:" -#: ../duplicity/dup_collections.py:688 +#: ../duplicity/dup_collections.py:685 msgid "No backup chains with active signatures found" msgstr "" "Отсутствуют цепочки резервного копирования с найденными, задействованными " "подписями" -#: ../duplicity/dup_collections.py:691 +#: ../duplicity/dup_collections.py:688 #, python-format msgid "Also found %d backup set not part of any chain," msgid_plural "Also found %d backup sets not part of any chain," @@ -1157,7 +1159,7 @@ "Также найдены %d наборов резервного копирования, не являющихся частью ни " "одной цепочки," -#: ../duplicity/dup_collections.py:695 +#: ../duplicity/dup_collections.py:692 #, python-format msgid "and %d incomplete backup set." msgid_plural "and %d incomplete backup sets." @@ -1165,19 +1167,19 @@ msgstr[1] "а также %d неполных набора резервного копирования." msgstr[2] "а также %d неполных наборов резервного копирования." -#. "cleanup" is a hard-coded command, so do not translate it -#: ../duplicity/dup_collections.py:700 +#. TRANSL: "cleanup" is a hard-coded command, so do not translate it +#: ../duplicity/dup_collections.py:697 msgid "" "These may be deleted by running duplicity with the \"cleanup\" command." msgstr "" "Это может быть удалено с помощью запуска duplicity с командой \"cleanup\"." -#: ../duplicity/dup_collections.py:703 +#: ../duplicity/dup_collections.py:700 msgid "No orphaned or incomplete backup sets found." msgstr "" "Отсутствуют изолированные или неполные наборы резервного копирования." -#: ../duplicity/dup_collections.py:719 +#: ../duplicity/dup_collections.py:716 #, python-format msgid "%d file exists on backend" msgid_plural "%d files exist on backend" @@ -1185,7 +1187,7 @@ msgstr[1] "%d файлов существует во внутреннем интерфейсе" msgstr[2] "%d файлов существует во внутреннем интерфейсе" -#: ../duplicity/dup_collections.py:729 +#: ../duplicity/dup_collections.py:726 #, python-format msgid "%d file exists in cache" msgid_plural "%d files exist in cache" @@ -1193,14 +1195,14 @@ msgstr[1] "%d файла существует во временных файлах" msgstr[2] "%d файлов существует во временных файлах" -#: ../duplicity/dup_collections.py:782 +#: ../duplicity/dup_collections.py:779 msgid "" "Warning, discarding last backup set, because of missing signature file." msgstr "" "Внимание, отозван последний набор резервного копирования, в связи с " "отсутствием файла подписи." -#: ../duplicity/dup_collections.py:805 +#: ../duplicity/dup_collections.py:802 msgid "Warning, found the following local orphaned signature file:" msgid_plural "Warning, found the following local orphaned signature files:" msgstr[0] "Внимание, найден следующий локальный изолированный файл подписи:" @@ -1209,7 +1211,7 @@ msgstr[2] "" "Внимание, найдены следующие локальные изолированные файлы подписей:" -#: ../duplicity/dup_collections.py:814 +#: ../duplicity/dup_collections.py:811 msgid "Warning, found the following remote orphaned signature file:" msgid_plural "Warning, found the following remote orphaned signature files:" msgstr[0] "Внимание, найден следующий удалённый изолированный файл подписи:" @@ -1218,19 +1220,19 @@ msgstr[2] "" "Внимание, найдены следующие удалённые изолированные файлы подписей:" -#: ../duplicity/dup_collections.py:823 +#: ../duplicity/dup_collections.py:820 msgid "Warning, found signatures but no corresponding backup files" msgstr "" "Внимание, найдены подписи, которые не соответствуют с файлами резервной копии" -#: ../duplicity/dup_collections.py:827 +#: ../duplicity/dup_collections.py:824 msgid "" "Warning, found incomplete backup sets, probably left from aborted session" msgstr "" "Внимание, обнаружены незавершённые наборы резервных копий, возможно они " "остались от прерванного сеанса" -#: ../duplicity/dup_collections.py:831 +#: ../duplicity/dup_collections.py:828 msgid "Warning, found the following orphaned backup file:" msgid_plural "Warning, found the following orphaned backup files:" msgstr[0] "" @@ -1240,42 +1242,42 @@ msgstr[2] "" "Внимание, найдены следующие изолированные файлы резервного копирования:" -#: ../duplicity/dup_collections.py:848 +#: ../duplicity/dup_collections.py:845 #, python-format msgid "Extracting backup chains from list of files: %s" msgstr "Извлечение цепочек резервного копирования из списка файлов: %s" -#: ../duplicity/dup_collections.py:860 +#: ../duplicity/dup_collections.py:857 #, python-format msgid "File %s is part of known set" msgstr "Файл %s является частью известного набора" -#: ../duplicity/dup_collections.py:863 +#: ../duplicity/dup_collections.py:860 #, python-format msgid "File %s is not part of a known set; creating new set" msgstr "Файл %s не является частью известного набора; создаётся новый набор" -#: ../duplicity/dup_collections.py:868 +#: ../duplicity/dup_collections.py:865 #, python-format msgid "Ignoring file (rejected by backup set) '%s'" msgstr "Пропуск файла (отклонено набором резервного копирования) '%s'" -#: ../duplicity/dup_collections.py:884 +#: ../duplicity/dup_collections.py:881 #, python-format msgid "Found backup chain %s" msgstr "Найдена резервная копия %s" -#: ../duplicity/dup_collections.py:889 +#: ../duplicity/dup_collections.py:886 #, python-format msgid "Added set %s to pre-existing chain %s" msgstr "Добавление набора %s для ранее существующей цепочки %s" -#: ../duplicity/dup_collections.py:893 +#: ../duplicity/dup_collections.py:890 #, python-format msgid "Found orphaned set %s" msgstr "Обнаружен изолированный набор %s" -#: ../duplicity/dup_collections.py:1043 +#: ../duplicity/dup_collections.py:1040 #, python-format msgid "" "No signature chain for the requested time. Using oldest available chain, " @@ -1317,17 +1319,17 @@ msgid "D %s" msgstr "У %s" -#: ../duplicity/lazy.py:352 +#: ../duplicity/lazy.py:355 #, python-format msgid "Warning: oldindex %s >= newindex %s" msgstr "Внимание: старый индекс %s >= нового индекса %s" -#: ../duplicity/lazy.py:427 +#: ../duplicity/lazy.py:430 #, python-format msgid "Error '%s' processing %s" msgstr "Ошибка '%s' при обработке %s" -#: ../duplicity/lazy.py:437 +#: ../duplicity/lazy.py:440 #, python-format msgid "Skipping %s because of previous error" msgstr "Пропуск %s из-за предыдущей ошибки" @@ -1411,22 +1413,22 @@ "MultiBackend: failed to get %s. Tried all backing stores and none succeeded" msgstr "" -#: ../duplicity/backends/multibackend.py:309 +#: ../duplicity/backends/multibackend.py:305 #, python-format msgid "MultiBackend: list from %s: %s" msgstr "" -#: ../duplicity/backends/multibackend.py:315 +#: ../duplicity/backends/multibackend.py:317 #, python-format msgid "MultiBackend: combined list: %s" msgstr "" -#: ../duplicity/backends/multibackend.py:343 +#: ../duplicity/backends/multibackend.py:345 #, python-format msgid "MultiBackend: failed to delete %s from %s" msgstr "" -#: ../duplicity/backends/multibackend.py:347 +#: ../duplicity/backends/multibackend.py:349 #, python-format msgid "" "MultiBackend: failed to delete %s. Tried all backing stores and none " @@ -1573,13 +1575,13 @@ msgid "WebDAV DEL Bad status code %s reason %s." msgstr "" -#: ../duplicity/librsync.py:195 +#: ../duplicity/librsync.py:196 msgid "" "basis_file must be a (true) file or an object whose file attribute is the " "underlying true file object" msgstr "" -#: ../duplicity/manifest.py:96 +#: ../duplicity/manifest.py:95 #, python-format msgid "" "Fatal Error: Backup source host has changed.\n" @@ -1590,7 +1592,7 @@ "Текущий узел: %s\n" "Предыдущий узел: %s" -#: ../duplicity/manifest.py:103 +#: ../duplicity/manifest.py:102 #, python-format msgid "" "Fatal Error: Backup source directory has changed.\n" @@ -1601,7 +1603,7 @@ "Текущий каталог: %s\n" "Предыдущий каталон: %s" -#: ../duplicity/manifest.py:113 +#: ../duplicity/manifest.py:112 msgid "" "Aborting because you may have accidentally tried to backup two different " "data sets to the same remote location, or using the same archive directory. " @@ -1613,131 +1615,131 @@ "тоже удалённое расположение. Если это ошибка, используйте параметр --allow-" "source-mismatch для скрытия этого сообщения" -#: ../duplicity/manifest.py:215 +#: ../duplicity/manifest.py:214 #, python-format msgid "Found manifest volume %s" msgstr "" -#: ../duplicity/manifest.py:222 +#: ../duplicity/manifest.py:221 #, python-format msgid "Found %s volumes in manifest" msgstr "" -#: ../duplicity/manifest.py:258 +#: ../duplicity/manifest.py:257 msgid "Manifests not equal because different volume numbers" msgstr "Манифесты не одинаковы в связи с отличающимися номерами томов" -#: ../duplicity/manifest.py:263 +#: ../duplicity/manifest.py:262 msgid "Manifests not equal because volume lists differ" msgstr "Манифесты не одинаковы в связи с отличающимися списками томов" -#: ../duplicity/manifest.py:268 +#: ../duplicity/manifest.py:267 msgid "Manifests not equal because hosts or directories differ" msgstr "Манифесты не одинаковы в связи с отличающимися узлами или каталогами" -#: ../duplicity/manifest.py:425 +#: ../duplicity/manifest.py:424 msgid "Warning, found extra Volume identifier" msgstr "Внимание, найден дополнительный идентификатор тома" -#: ../duplicity/manifest.py:451 +#: ../duplicity/manifest.py:450 msgid "Other is not VolumeInfo" msgstr "Другой не является VolumeInfo" -#: ../duplicity/manifest.py:454 +#: ../duplicity/manifest.py:453 msgid "Volume numbers don't match" msgstr "Номера томов не соответствуют" -#: ../duplicity/manifest.py:457 +#: ../duplicity/manifest.py:456 msgid "start_indicies don't match" msgstr "start_indicies не соответствует" -#: ../duplicity/manifest.py:460 +#: ../duplicity/manifest.py:459 msgid "end_index don't match" msgstr "end_index не соответствует" -#: ../duplicity/manifest.py:467 +#: ../duplicity/manifest.py:466 msgid "Hashes don't match" msgstr "Хэши не совпадают" -#: ../duplicity/path.py:116 +#: ../duplicity/path.py:115 #, python-format msgid "Warning: %s invalid devnums (0x%X), treating as (0, 0)." msgstr "" -#: ../duplicity/path.py:245 ../duplicity/path.py:306 +#: ../duplicity/path.py:244 ../duplicity/path.py:305 #, python-format msgid "Warning: %s has negative mtime, treating as 0." msgstr "Внимание: у %s отрицательное mtime, принимается равным 0." -#: ../duplicity/path.py:370 +#: ../duplicity/path.py:369 msgid "Difference found:" msgstr "Найдено отличие:" -#: ../duplicity/path.py:379 +#: ../duplicity/path.py:378 #, python-format msgid "New file %s" msgstr "Новый файл %s" -#: ../duplicity/path.py:382 +#: ../duplicity/path.py:381 #, python-format msgid "File %s is missing" msgstr "Файл %s отсутствует" -#: ../duplicity/path.py:385 +#: ../duplicity/path.py:384 #, python-format msgid "File %%s has type %s, expected %s" msgstr "Файл %%s относится к типу %s, а ожидался %s" -#: ../duplicity/path.py:391 ../duplicity/path.py:417 +#: ../duplicity/path.py:390 ../duplicity/path.py:416 #, python-format msgid "File %%s has permissions %s, expected %s" msgstr "Файл %%s имеет разрешения %s, а ожидалось %s" -#: ../duplicity/path.py:396 +#: ../duplicity/path.py:395 #, python-format msgid "File %%s has mtime %s, expected %s" msgstr "Файл %%s имеет mtime %s, а ожидалось %s" -#: ../duplicity/path.py:404 +#: ../duplicity/path.py:403 #, python-format msgid "Data for file %s is different" msgstr "Данные для файла %s отличаются" -#: ../duplicity/path.py:412 +#: ../duplicity/path.py:411 #, python-format msgid "Symlink %%s points to %s, expected %s" msgstr "Символическая ссылка %%s указывает на %s, а ожидалось %s" -#: ../duplicity/path.py:421 +#: ../duplicity/path.py:420 #, python-format msgid "Device file %%s has numbers %s, expected %s" msgstr "Файл устройства %%s содержит номера %s, а ожидались %s" -#: ../duplicity/path.py:603 +#: ../duplicity/path.py:602 #, python-format msgid "Making directory %s" msgstr "Создаётся каталог %s" -#: ../duplicity/path.py:613 +#: ../duplicity/path.py:612 #, python-format msgid "Deleting %s" msgstr "Удаляется %s" -#: ../duplicity/path.py:622 +#: ../duplicity/path.py:621 #, python-format msgid "Touching %s" msgstr "" -#: ../duplicity/path.py:629 +#: ../duplicity/path.py:628 #, python-format msgid "Deleting tree %s" msgstr "Удаление дерева %s" -#: ../duplicity/gpginterface.py:238 +#: ../duplicity/gpginterface.py:240 msgid "Threading not available -- zombie processes may appear" msgstr "" -#: ../duplicity/gpginterface.py:705 +#: ../duplicity/gpginterface.py:707 #, python-format msgid "GPG process %d terminated before wait()" msgstr "Процесс GPG %d завершился до вызова wait()" diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/e2fsprogs.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/e2fsprogs.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/e2fsprogs.po 2020-01-23 16:52:10.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/e2fsprogs.po 2020-07-08 13:54:12.000000000 +0000 @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2020-01-23 10:40+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:37+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: e2fsck/badblocks.c:23 misc/mke2fs.c:220 #, c-format @@ -35,9 +35,9 @@ #: e2fsck/badblocks.c:72 e2fsck/scantest.c:107 e2fsck/unix.c:1571 #: e2fsck/unix.c:1685 misc/badblocks.c:1251 misc/badblocks.c:1259 #: misc/badblocks.c:1273 misc/badblocks.c:1285 misc/dumpe2fs.c:431 -#: misc/dumpe2fs.c:688 misc/dumpe2fs.c:692 misc/e2image.c:1430 +#: misc/dumpe2fs.c:692 misc/dumpe2fs.c:696 misc/e2image.c:1430 #: misc/e2image.c:1627 misc/e2image.c:1648 misc/mke2fs.c:236 -#: misc/tune2fs.c:2796 misc/tune2fs.c:2895 resize/main.c:414 +#: misc/tune2fs.c:2808 misc/tune2fs.c:2907 resize/main.c:414 #, c-format msgid "while trying to open %s" msgstr "при попытке открыть %s" @@ -89,15 +89,15 @@ msgid "Error writing block %lu (%s). " msgstr "Ошибка записи блока %lu (%s). " -#: e2fsck/emptydir.c:57 +#: e2fsck/emptydir.c:56 msgid "empty dirblocks" msgstr "пустые блоки директории" -#: e2fsck/emptydir.c:62 +#: e2fsck/emptydir.c:61 msgid "empty dir map" msgstr "пустая карта директории" -#: e2fsck/emptydir.c:98 +#: e2fsck/emptydir.c:97 #, c-format msgid "Empty directory block %u (#%d) in inode %u\n" msgstr "Пустой блок каталога %u (#%d) в inode %u\n" @@ -107,12 +107,12 @@ msgid "%s: %s filename nblocks blocksize\n" msgstr "%s: %s имяфайла нблоков размерблоков\n" -#: e2fsck/extend.c:44 +#: e2fsck/extend.c:45 #, c-format msgid "Illegal number of blocks!\n" msgstr "Неправильное количество блоков!\n" -#: e2fsck/extend.c:50 +#: e2fsck/extend.c:51 #, c-format msgid "Couldn't allocate block buffer (size=%d)\n" msgstr "Не могу распределить буфер блока (размер=%d)\n" @@ -179,7 +179,7 @@ msgid "%s: journal too short\n" msgstr "%s: журнал слишком короткий\n" -#: e2fsck/journal.c:972 misc/fuse2fs.c:3792 +#: e2fsck/journal.c:972 misc/fuse2fs.c:3787 #, c-format msgid "%s: recovering journal\n" msgstr "%s: восстановление журнала\n" @@ -431,21 +431,21 @@ msgid "multiply claimed inode map" msgstr "" -#: e2fsck/pass1b.c:672 e2fsck/pass1b.c:826 +#: e2fsck/pass1b.c:672 e2fsck/pass1b.c:830 #, c-format msgid "internal error: can't find dup_blk for %llu\n" msgstr "" -#: e2fsck/pass1b.c:952 +#: e2fsck/pass1b.c:956 msgid "returned from clone_file_block" msgstr "" -#: e2fsck/pass1b.c:976 +#: e2fsck/pass1b.c:980 #, c-format msgid "internal error: couldn't lookup EA block record for %llu" msgstr "" -#: e2fsck/pass1b.c:988 +#: e2fsck/pass1b.c:992 #, c-format msgid "internal error: couldn't lookup EA inode record for %u" msgstr "внутренняя ошибка: не могу просмотреть блок inode EA для %u" @@ -455,89 +455,89 @@ msgid "while hashing entry with e_value_inum = %u" msgstr "" -#: e2fsck/pass1.c:775 e2fsck/pass2.c:1007 +#: e2fsck/pass1.c:775 e2fsck/pass2.c:1010 msgid "reading directory block" msgstr "чтение блока каталога" -#: e2fsck/pass1.c:1224 +#: e2fsck/pass1.c:1226 msgid "in-use inode map" msgstr "карта используемых inod'ов" -#: e2fsck/pass1.c:1235 +#: e2fsck/pass1.c:1237 msgid "directory inode map" msgstr "карта inod'ов каталогов" -#: e2fsck/pass1.c:1245 +#: e2fsck/pass1.c:1247 msgid "regular file inode map" msgstr "карта inod'ов обычных файлов" -#: e2fsck/pass1.c:1254 misc/e2image.c:1282 +#: e2fsck/pass1.c:1256 misc/e2image.c:1282 msgid "in-use block map" msgstr "" -#: e2fsck/pass1.c:1263 +#: e2fsck/pass1.c:1265 msgid "metadata block map" msgstr "" -#: e2fsck/pass1.c:1325 +#: e2fsck/pass1.c:1327 msgid "opening inode scan" msgstr "вначале сканирования inod'ов" -#: e2fsck/pass1.c:1363 +#: e2fsck/pass1.c:1174 msgid "getting next inode from scan" msgstr "получение следующего сканируемого inod'а" -#: e2fsck/pass1.c:2067 +#: e2fsck/pass1.c:2080 msgid "Pass 1" msgstr "Проход 1" -#: e2fsck/pass1.c:2128 +#: e2fsck/pass1.c:2141 #, c-format msgid "reading indirect blocks of inode %u" msgstr "чтение косвенных блоков inod'а %u" -#: e2fsck/pass1.c:2179 +#: e2fsck/pass1.c:2192 msgid "bad inode map" msgstr "карта плохих inod'ов" -#: e2fsck/pass1.c:2219 +#: e2fsck/pass1.c:2232 msgid "inode in bad block map" msgstr "карта inod'ов, расположенных в плохих блоках" -#: e2fsck/pass1.c:2239 +#: e2fsck/pass1.c:2252 msgid "imagic inode map" msgstr "" -#: e2fsck/pass1.c:2270 +#: e2fsck/pass1.c:2283 msgid "multiply claimed block map" msgstr "" -#: e2fsck/pass1.c:2395 +#: e2fsck/pass1.c:2408 msgid "ext attr block map" msgstr "" -#: e2fsck/pass1.c:3640 +#: e2fsck/pass1.c:3653 #, c-format msgid "%6lu(%c): expecting %6lu got phys %6lu (blkcnt %lld)\n" msgstr "" -#: e2fsck/pass1.c:4060 +#: e2fsck/pass1.c:4073 msgid "block bitmap" msgstr "" -#: e2fsck/pass1.c:4066 +#: e2fsck/pass1.c:4079 msgid "inode bitmap" msgstr "" -#: e2fsck/pass1.c:4072 +#: e2fsck/pass1.c:4085 msgid "inode table" msgstr "таблица inod'ов" -#: e2fsck/pass2.c:307 +#: e2fsck/pass2.c:308 msgid "Pass 2" msgstr "Проход 2" -#: e2fsck/pass2.c:1079 e2fsck/pass2.c:1246 +#: e2fsck/pass2.c:1083 e2fsck/pass2.c:1250 msgid "Can not continue." msgstr "Продолжение работы невозможно." @@ -553,11 +553,11 @@ msgid "Pass 3" msgstr "Проход 3" -#: e2fsck/pass3.c:344 +#: e2fsck/pass3.c:350 msgid "inode loop detection bitmap" msgstr "" -#: e2fsck/pass4.c:277 +#: e2fsck/pass4.c:289 msgid "Pass 4" msgstr "Проход 4" @@ -573,179 +573,179 @@ msgid "check_block_bitmap_checksum: Memory allocation error" msgstr "" -#: e2fsck/problem.c:52 +#: e2fsck/problem.c:53 msgid "(no prompt)" msgstr "" -#: e2fsck/problem.c:53 +#: e2fsck/problem.c:54 msgid "Fix" msgstr "Исправить" -#: e2fsck/problem.c:54 +#: e2fsck/problem.c:55 msgid "Clear" msgstr "Очистить" -#: e2fsck/problem.c:55 +#: e2fsck/problem.c:56 msgid "Relocate" msgstr "Переместить" -#: e2fsck/problem.c:56 +#: e2fsck/problem.c:57 msgid "Allocate" msgstr "Разместить" -#: e2fsck/problem.c:57 +#: e2fsck/problem.c:58 msgid "Expand" msgstr "Расширить" -#: e2fsck/problem.c:58 +#: e2fsck/problem.c:59 msgid "Connect to /lost+found" msgstr "Присоединить к /lost+found" -#: e2fsck/problem.c:59 +#: e2fsck/problem.c:60 msgid "Create" msgstr "Создать" -#: e2fsck/problem.c:60 +#: e2fsck/problem.c:61 msgid "Salvage" msgstr "Сохранить" -#: e2fsck/problem.c:61 +#: e2fsck/problem.c:62 msgid "Truncate" msgstr "Обрезать" -#: e2fsck/problem.c:62 +#: e2fsck/problem.c:63 msgid "Clear inode" msgstr "Очистить inode" -#: e2fsck/problem.c:63 +#: e2fsck/problem.c:64 msgid "Abort" msgstr "Прервать" -#: e2fsck/problem.c:64 +#: e2fsck/problem.c:65 msgid "Split" msgstr "Разделить" -#: e2fsck/problem.c:65 +#: e2fsck/problem.c:66 msgid "Continue" msgstr "Продолжить" -#: e2fsck/problem.c:66 +#: e2fsck/problem.c:67 msgid "Clone multiply-claimed blocks" msgstr "Создать копию общих блоков" -#: e2fsck/problem.c:67 +#: e2fsck/problem.c:68 msgid "Delete file" msgstr "Удалить файл" -#: e2fsck/problem.c:68 +#: e2fsck/problem.c:69 msgid "Suppress messages" msgstr "Не выводить сообщения" -#: e2fsck/problem.c:69 +#: e2fsck/problem.c:70 msgid "Unlink" msgstr "Удалить жесткую ссылку" -#: e2fsck/problem.c:70 +#: e2fsck/problem.c:71 msgid "Clear HTree index" msgstr "Создать индекс HTree" -#: e2fsck/problem.c:71 +#: e2fsck/problem.c:72 msgid "Recreate" msgstr "Создать заново" -#: e2fsck/problem.c:81 +#: e2fsck/problem.c:83 msgid "(NONE)" msgstr "(НЕТ)" -#: e2fsck/problem.c:82 +#: e2fsck/problem.c:84 msgid "FIXED" msgstr "ИСПРАВЛЕНО" -#: e2fsck/problem.c:83 +#: e2fsck/problem.c:85 msgid "CLEARED" msgstr "ОЧИЩЕНО" -#: e2fsck/problem.c:84 +#: e2fsck/problem.c:86 msgid "RELOCATED" msgstr "ПЕРЕМЕЩЕНО" -#: e2fsck/problem.c:85 +#: e2fsck/problem.c:87 msgid "ALLOCATED" msgstr "ВЫДЕЛЕНО" -#: e2fsck/problem.c:86 +#: e2fsck/problem.c:88 msgid "EXPANDED" msgstr "РАСШИРЕНО" -#: e2fsck/problem.c:87 +#: e2fsck/problem.c:89 msgid "RECONNECTED" msgstr "ПОДКЛЮЧЕНО" -#: e2fsck/problem.c:88 +#: e2fsck/problem.c:90 msgid "CREATED" msgstr "СОЗДАНО" -#: e2fsck/problem.c:89 +#: e2fsck/problem.c:91 msgid "SALVAGED" msgstr "СОХРАНЕНО" -#: e2fsck/problem.c:90 +#: e2fsck/problem.c:92 msgid "TRUNCATED" msgstr "ОБРЕЗАНО" -#: e2fsck/problem.c:91 +#: e2fsck/problem.c:93 msgid "INODE CLEARED" msgstr "INODE ОЧИЩЕН" -#: e2fsck/problem.c:92 +#: e2fsck/problem.c:94 msgid "ABORTED" msgstr "ПРЕРВАНО" -#: e2fsck/problem.c:93 +#: e2fsck/problem.c:95 msgid "SPLIT" msgstr "РАЗДЕЛЕНО" -#: e2fsck/problem.c:94 +#: e2fsck/problem.c:96 msgid "CONTINUING" msgstr "" -#: e2fsck/problem.c:95 +#: e2fsck/problem.c:97 msgid "MULTIPLY-CLAIMED BLOCKS CLONED" msgstr "СОЗДАНА КОПИЯ" -#: e2fsck/problem.c:96 +#: e2fsck/problem.c:98 msgid "FILE DELETED" msgstr "ФАЙЛ УДАЛЕН" -#: e2fsck/problem.c:97 +#: e2fsck/problem.c:99 msgid "SUPPRESSED" msgstr "ПОДАВЛЕНО" -#: e2fsck/problem.c:98 +#: e2fsck/problem.c:100 msgid "UNLINKED" msgstr "УДАЛЕНА ССЫЛКА" -#: e2fsck/problem.c:99 +#: e2fsck/problem.c:101 msgid "HTREE INDEX CLEARED" msgstr "ОЧИЩЕН ИНДЕКС HTREE" -#: e2fsck/problem.c:100 +#: e2fsck/problem.c:102 msgid "WILL RECREATE" msgstr "БУДЕТ СОЗДАНО ЗАНОВО" #. @-expanded: block bitmap for group %g is not in group. (block %b)\n -#: e2fsck/problem.c:115 +#: e2fsck/problem.c:118 msgid "@b @B for @g %g is not in @g. (@b %b)\n" msgstr "@b @B для @g %g отстутствует в @g. (@b %b)\n" #. @-expanded: inode bitmap for group %g is not in group. (block %b)\n -#: e2fsck/problem.c:119 +#: e2fsck/problem.c:122 msgid "@i @B for @g %g is not in @g. (@b %b)\n" msgstr "@i @B для @g %g отсутствует @g. (@b %b)\n" #. @-expanded: inode table for group %g is not in group. (block %b)\n #. @-expanded: WARNING: SEVERE DATA LOSS POSSIBLE.\n -#: e2fsck/problem.c:124 +#: e2fsck/problem.c:127 msgid "" "@i table for @g %g is not in @g. (@b %b)\n" "WARNING: SEVERE DATA LOSS POSSIBLE.\n" @@ -762,7 +762,7 @@ #. @-expanded: or\n #. @-expanded: e2fsck -b 32768 \n #. @-expanded: \n -#: e2fsck/problem.c:130 +#: e2fsck/problem.c:133 msgid "" "\n" "The @S could not be read or does not describe a valid ext2/ext3/ext4\n" @@ -778,7 +778,7 @@ #. @-expanded: The filesystem size (according to the superblock) is %b blocks\n #. @-expanded: The physical size of the device is %c blocks\n #. @-expanded: Either the superblock or the partition table is likely to be corrupt!\n -#: e2fsck/problem.c:141 +#: e2fsck/problem.c:144 msgid "" "The @f size (according to the @S) is %b @bs\n" "The physical size of the @v is %c @bs\n" @@ -788,7 +788,7 @@ #. @-expanded: superblock block_size = %b, fragsize = %c.\n #. @-expanded: This version of e2fsck does not support fragment sizes different\n #. @-expanded: from the block size.\n -#: e2fsck/problem.c:148 +#: e2fsck/problem.c:151 msgid "" "@S @b_size = %b, fragsize = %c.\n" "This version of e2fsck does not support fragment sizes different\n" @@ -799,18 +799,18 @@ "размера @b.\n" #. @-expanded: superblock blocks_per_group = %b, should have been %c\n -#: e2fsck/problem.c:155 +#: e2fsck/problem.c:158 msgid "@S @bs_per_group = %b, should have been %c\n" msgstr "@S @bs_per_group = %b, должно быть %c\n" #. @-expanded: superblock first_data_block = %b, should have been %c\n -#: e2fsck/problem.c:160 +#: e2fsck/problem.c:163 msgid "@S first_data_@b = %b, should have been %c\n" msgstr "" #. @-expanded: filesystem did not have a UUID; generating one.\n #. @-expanded: \n -#: e2fsck/problem.c:165 +#: e2fsck/problem.c:168 msgid "" "@f did not have a UUID; generating one.\n" "\n" @@ -818,7 +818,7 @@ "У @f отсутствовал UUID; создан новый.\n" "\n" -#: e2fsck/problem.c:171 +#: e2fsck/problem.c:174 #, no-c-format msgid "" "Note: if several inode or block bitmap blocks or part\n" @@ -830,49 +830,49 @@ msgstr "" #. @-expanded: Corruption found in superblock. (%s = %N).\n -#: e2fsck/problem.c:180 +#: e2fsck/problem.c:183 msgid "Corruption found in @S. (%s = %N).\n" msgstr "Обнаружено повреждение: @S. (%s = %N).\n" #. @-expanded: Error determining size of the physical device: %m\n -#: e2fsck/problem.c:186 +#: e2fsck/problem.c:189 #, no-c-format msgid "Error determining size of the physical @v: %m\n" msgstr "Ошибка определения размера физического @v: %m\n" #. @-expanded: inode count in superblock is %i, should be %j.\n -#: e2fsck/problem.c:191 +#: e2fsck/problem.c:194 msgid "@i count in @S is %i, @s %j.\n" msgstr "" -#: e2fsck/problem.c:195 +#: e2fsck/problem.c:198 msgid "The Hurd does not support the filetype feature.\n" msgstr "ОС Hurd не поддерживает функцию типов файлов.\n" #. @-expanded: superblock has an invalid journal (inode %i).\n -#: e2fsck/problem.c:201 +#: e2fsck/problem.c:204 #, no-c-format msgid "@S has an @n @j (@i %i).\n" msgstr "" #. @-expanded: External journal has multiple filesystem users (unsupported).\n -#: e2fsck/problem.c:206 +#: e2fsck/problem.c:209 msgid "External @j has multiple @f users (unsupported).\n" msgstr "" "Внешний @j содержит несколько пользователей @f (не поддерживается).\n" #. @-expanded: Can't find external journal\n -#: e2fsck/problem.c:211 +#: e2fsck/problem.c:214 msgid "Can't find external @j\n" msgstr "Не удалось найти внешний @j\n" #. @-expanded: External journal has bad superblock\n -#: e2fsck/problem.c:216 +#: e2fsck/problem.c:219 msgid "External @j has bad @S\n" msgstr "Внешний @j содержит неисправный @S\n" #. @-expanded: External journal does not support this filesystem\n -#: e2fsck/problem.c:221 +#: e2fsck/problem.c:224 msgid "External @j does not support this @f\n" msgstr "Внешний @j не поддерживает эту @f\n" @@ -880,7 +880,7 @@ #. @-expanded: It is likely that your copy of e2fsck is old and/or doesn't support this journal #. @-expanded: format.\n #. @-expanded: It is also possible the journal superblock is corrupt.\n -#: e2fsck/problem.c:226 +#: e2fsck/problem.c:229 msgid "" "@f @j @S is unknown type %N (unsupported).\n" "It is likely that your copy of e2fsck is old and/or doesn't support this @j " @@ -889,80 +889,80 @@ msgstr "" #. @-expanded: journal superblock is corrupt.\n -#: e2fsck/problem.c:235 +#: e2fsck/problem.c:238 msgid "@j @S is corrupt.\n" msgstr "" #. @-expanded: superblock has_journal flag is clear, but a journal is present.\n -#: e2fsck/problem.c:240 +#: e2fsck/problem.c:243 msgid "@S has_@j flag is clear, but a @j is present.\n" msgstr "" #. @-expanded: superblock needs_recovery flag is set, but no journal is present.\n -#: e2fsck/problem.c:245 +#: e2fsck/problem.c:248 msgid "@S needs_recovery flag is set, but no @j is present.\n" msgstr "" #. @-expanded: superblock needs_recovery flag is clear, but journal has data.\n -#: e2fsck/problem.c:250 +#: e2fsck/problem.c:253 msgid "@S needs_recovery flag is clear, but @j has data.\n" msgstr "" #. @-expanded: Clear journal -#: e2fsck/problem.c:255 +#: e2fsck/problem.c:258 msgid "Clear @j" msgstr "Очистить @j" #. @-expanded: filesystem has feature flag(s) set, but is a revision 0 filesystem. -#: e2fsck/problem.c:260 e2fsck/problem.c:796 +#: e2fsck/problem.c:263 e2fsck/problem.c:799 msgid "@f has feature flag(s) set, but is a revision 0 @f. " msgstr "" #. @-expanded: %s orphaned inode %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n -#: e2fsck/problem.c:265 +#: e2fsck/problem.c:268 msgid "%s @o @i %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n" msgstr "" #. @-expanded: illegal %B (%b) found in orphaned inode %i.\n -#: e2fsck/problem.c:270 +#: e2fsck/problem.c:273 msgid "@I %B (%b) found in @o @i %i.\n" msgstr "" #. @-expanded: Already cleared %B (%b) found in orphaned inode %i.\n -#: e2fsck/problem.c:275 +#: e2fsck/problem.c:278 msgid "Already cleared %B (%b) found in @o @i %i.\n" msgstr "" #. @-expanded: illegal orphaned inode %i in superblock.\n -#: e2fsck/problem.c:281 +#: e2fsck/problem.c:284 #, no-c-format msgid "@I @o @i %i in @S.\n" msgstr "@I @o @i %i в @S.\n" #. @-expanded: illegal inode %i in orphaned inode list.\n -#: e2fsck/problem.c:287 +#: e2fsck/problem.c:290 #, no-c-format msgid "@I @i %i in @o @i list.\n" msgstr "@I @i %i в списке @o @i.\n" #. @-expanded: journal superblock has an unknown read-only feature flag set.\n -#: e2fsck/problem.c:292 +#: e2fsck/problem.c:295 msgid "@j @S has an unknown read-only feature flag set.\n" msgstr "" #. @-expanded: journal superblock has an unknown incompatible feature flag set.\n -#: e2fsck/problem.c:297 +#: e2fsck/problem.c:300 msgid "@j @S has an unknown incompatible feature flag set.\n" msgstr "" #. @-expanded: journal version not supported by this e2fsck.\n -#: e2fsck/problem.c:302 +#: e2fsck/problem.c:305 msgid "@j version not supported by this e2fsck.\n" msgstr "Версия @j не поддерживается этим выпуском e2fsck.\n" #. @-expanded: Moving journal from /%s to hidden inode.\n #. @-expanded: \n -#: e2fsck/problem.c:308 +#: e2fsck/problem.c:311 #, no-c-format msgid "" "Moving @j from /%s to hidden @i.\n" @@ -973,7 +973,7 @@ #. @-expanded: Error moving journal: %m\n #. @-expanded: \n -#: e2fsck/problem.c:314 +#: e2fsck/problem.c:317 #, no-c-format msgid "" "Error moving @j: %m\n" @@ -985,7 +985,7 @@ #. @-expanded: Found invalid V2 journal superblock fields (from V1 journal).\n #. @-expanded: Clearing fields beyond the V1 journal superblock...\n #. @-expanded: \n -#: e2fsck/problem.c:319 +#: e2fsck/problem.c:322 msgid "" "Found @n V2 @j @S fields (from V1 @j).\n" "Clearing fields beyond the V1 @j @S...\n" @@ -993,18 +993,18 @@ msgstr "" #. @-expanded: Run journal anyway -#: e2fsck/problem.c:325 +#: e2fsck/problem.c:328 msgid "Run @j anyway" msgstr "Запустить @j всё равно" #. @-expanded: Recovery flag not set in backup superblock, so running journal anyway.\n -#: e2fsck/problem.c:330 +#: e2fsck/problem.c:333 msgid "Recovery flag not set in backup @S, so running @j anyway.\n" msgstr "" #. @-expanded: Backing up journal inode block information.\n #. @-expanded: \n -#: e2fsck/problem.c:335 +#: e2fsck/problem.c:338 msgid "" "Backing up @j @i @b information.\n" "\n" @@ -1012,25 +1012,25 @@ #. @-expanded: filesystem does not have resize_inode enabled, but s_reserved_gdt_blocks\n #. @-expanded: is %N; should be zero. -#: e2fsck/problem.c:341 +#: e2fsck/problem.c:344 msgid "" "@f does not have resize_@i enabled, but s_reserved_gdt_@bs\n" "is %N; @s zero. " msgstr "" #. @-expanded: Resize_inode not enabled, but the resize inode is non-zero. -#: e2fsck/problem.c:347 +#: e2fsck/problem.c:350 msgid "Resize_@i not enabled, but the resize @i is non-zero. " msgstr "" #. @-expanded: Resize inode not valid. -#: e2fsck/problem.c:352 +#: e2fsck/problem.c:355 msgid "Resize @i not valid. " msgstr "" #. @-expanded: superblock last mount time (%t,\n #. @-expanded: \tnow = %T) is in the future.\n -#: e2fsck/problem.c:357 +#: e2fsck/problem.c:360 msgid "" "@S last mount time (%t,\n" "\tnow = %T) is in the future.\n" @@ -1038,60 +1038,60 @@ #. @-expanded: superblock last write time (%t,\n #. @-expanded: \tnow = %T) is in the future.\n -#: e2fsck/problem.c:362 +#: e2fsck/problem.c:365 msgid "" "@S last write time (%t,\n" "\tnow = %T) is in the future.\n" msgstr "" #. @-expanded: superblock hint for external superblock should be %X. -#: e2fsck/problem.c:368 +#: e2fsck/problem.c:371 #, no-c-format msgid "@S hint for external superblock @s %X. " msgstr "" #. @-expanded: Adding dirhash hint to filesystem.\n #. @-expanded: \n -#: e2fsck/problem.c:373 +#: e2fsck/problem.c:376 msgid "" "Adding dirhash hint to @f.\n" "\n" msgstr "" #. @-expanded: group descriptor %g checksum is %04x, should be %04y. -#: e2fsck/problem.c:378 +#: e2fsck/problem.c:381 msgid "@g descriptor %g checksum is %04x, should be %04y. " msgstr "" #. @-expanded: group descriptor %g marked uninitialized without feature set.\n -#: e2fsck/problem.c:384 +#: e2fsck/problem.c:387 #, no-c-format msgid "@g descriptor %g marked uninitialized without feature set.\n" msgstr "" #. @-expanded: group descriptor %g has invalid unused inodes count %b. -#: e2fsck/problem.c:389 +#: e2fsck/problem.c:392 msgid "@g descriptor %g has invalid unused inodes count %b. " msgstr "" #. @-expanded: Last group block bitmap uninitialized. -#: e2fsck/problem.c:394 +#: e2fsck/problem.c:397 msgid "Last @g @b @B uninitialized. " msgstr "" -#: e2fsck/problem.c:400 +#: e2fsck/problem.c:403 #, no-c-format msgid "Journal transaction %i was corrupt, replay was aborted.\n" msgstr "" -#: e2fsck/problem.c:405 +#: e2fsck/problem.c:408 msgid "The test_fs flag is set (and ext4 is available). " msgstr "" #. @-expanded: superblock last mount time is in the future.\n #. @-expanded: \t(by less than a day, probably due to the hardware clock being incorrectly #. @-expanded: set)\n -#: e2fsck/problem.c:410 +#: e2fsck/problem.c:413 msgid "" "@S last mount time is in the future.\n" "\t(by less than a day, probably due to the hardware clock being incorrectly " @@ -1101,7 +1101,7 @@ #. @-expanded: superblock last write time is in the future.\n #. @-expanded: \t(by less than a day, probably due to the hardware clock being incorrectly #. @-expanded: set)\n -#: e2fsck/problem.c:416 +#: e2fsck/problem.c:419 msgid "" "@S last write time is in the future.\n" "\t(by less than a day, probably due to the hardware clock being incorrectly " @@ -1109,48 +1109,48 @@ msgstr "" #. @-expanded: One or more block group descriptor checksums are invalid. -#: e2fsck/problem.c:422 +#: e2fsck/problem.c:425 msgid "One or more @b @g descriptor checksums are invalid. " msgstr "" #. @-expanded: Setting free inodes count to %j (was %i)\n -#: e2fsck/problem.c:427 +#: e2fsck/problem.c:430 msgid "Setting free @is count to %j (was %i)\n" msgstr "" #. @-expanded: Setting free blocks count to %c (was %b)\n -#: e2fsck/problem.c:432 +#: e2fsck/problem.c:435 msgid "Setting free @bs count to %c (was %b)\n" msgstr "" #. @-expanded: Hiding %U quota inode %i (%Q).\n -#: e2fsck/problem.c:437 +#: e2fsck/problem.c:440 msgid "Hiding %U @q @i %i (%Q).\n" msgstr "" #. @-expanded: superblock has invalid MMP block. -#: e2fsck/problem.c:442 +#: e2fsck/problem.c:445 msgid "@S has invalid MMP block. " msgstr "" #. @-expanded: superblock has invalid MMP magic. -#: e2fsck/problem.c:447 +#: e2fsck/problem.c:450 msgid "@S has invalid MMP magic. " msgstr "" -#: e2fsck/problem.c:453 +#: e2fsck/problem.c:456 #, no-c-format msgid "ext2fs_open2: %m\n" msgstr "" -#: e2fsck/problem.c:459 +#: e2fsck/problem.c:462 #, no-c-format msgid "ext2fs_check_desc: %m\n" msgstr "" #. @-expanded: superblock metadata_csum supersedes uninit_bg; both feature bits cannot be set #. @-expanded: simultaneously. -#: e2fsck/problem.c:465 +#: e2fsck/problem.c:468 msgid "" "@S metadata_csum supersedes uninit_bg; both feature bits cannot be set " "simultaneously." @@ -1162,156 +1162,156 @@ msgstr "" #. @-expanded: superblock 64bit filesystem needs extents to access the whole disk. -#: e2fsck/problem.c:476 +#: e2fsck/problem.c:479 msgid "@S 64bit @f needs extents to access the whole disk. " msgstr "" -#: e2fsck/problem.c:481 +#: e2fsck/problem.c:484 msgid "First_meta_bg is too big. (%N, max value %g). " msgstr "" #. @-expanded: External journal superblock checksum does not match superblock. -#: e2fsck/problem.c:486 +#: e2fsck/problem.c:489 msgid "External @j @S checksum does not match @S. " msgstr "" #. @-expanded: superblock metadata_csum_seed is not necessary without metadata_csum. -#: e2fsck/problem.c:491 +#: e2fsck/problem.c:494 msgid "@S metadata_csum_seed is not necessary without metadata_csum." msgstr "" -#: e2fsck/problem.c:497 +#: e2fsck/problem.c:500 #, no-c-format msgid "Error initializing quota context in support library: %m\n" msgstr "" #. @-expanded: Bad required extra isize in superblock (%N). -#: e2fsck/problem.c:502 +#: e2fsck/problem.c:505 msgid "Bad required extra isize in @S (%N). " msgstr "" #. @-expanded: Bad desired extra isize in superblock (%N). -#: e2fsck/problem.c:507 +#: e2fsck/problem.c:510 msgid "Bad desired extra isize in @S (%N). " msgstr "" #. @-expanded: Invalid %U quota inode %i. -#: e2fsck/problem.c:512 +#: e2fsck/problem.c:515 msgid "Invalid %U @q @i %i. " msgstr "" #. @-expanded: Pass 1: Checking inodes, blocks, and sizes\n -#: e2fsck/problem.c:530 +#: e2fsck/problem.c:533 msgid "Pass 1: Checking @is, @bs, and sizes\n" msgstr "Проход 1: Проверка @is, @bs, а также размеров\n" #. @-expanded: root inode is not a directory. -#: e2fsck/problem.c:534 +#: e2fsck/problem.c:537 msgid "@r is not a @d. " msgstr "@r не является @d. " #. @-expanded: root inode has dtime set (probably due to old mke2fs). -#: e2fsck/problem.c:539 +#: e2fsck/problem.c:542 msgid "@r has dtime set (probably due to old mke2fs). " msgstr "" #. @-expanded: Reserved inode %i (%Q) has invalid mode. -#: e2fsck/problem.c:544 +#: e2fsck/problem.c:547 msgid "Reserved @i %i (%Q) has @n mode. " msgstr "" #. @-expanded: deleted inode %i has zero dtime. -#: e2fsck/problem.c:550 +#: e2fsck/problem.c:553 #, no-c-format msgid "@D @i %i has zero dtime. " msgstr "" #. @-expanded: inode %i is in use, but has dtime set. -#: e2fsck/problem.c:556 +#: e2fsck/problem.c:559 #, no-c-format msgid "@i %i is in use, but has dtime set. " msgstr "" #. @-expanded: inode %i is a zero-length directory. -#: e2fsck/problem.c:562 +#: e2fsck/problem.c:565 #, no-c-format msgid "@i %i is a @z @d. " msgstr "@i %i является @z @d. " #. @-expanded: group %g's block bitmap at %b conflicts with some other fs block.\n -#: e2fsck/problem.c:567 +#: e2fsck/problem.c:570 msgid "@g %g's @b @B at %b @C.\n" msgstr "" #. @-expanded: group %g's inode bitmap at %b conflicts with some other fs block.\n -#: e2fsck/problem.c:572 +#: e2fsck/problem.c:575 msgid "@g %g's @i @B at %b @C.\n" msgstr "" #. @-expanded: group %g's inode table at %b conflicts with some other fs block.\n -#: e2fsck/problem.c:577 +#: e2fsck/problem.c:580 msgid "@g %g's @i table at %b @C.\n" msgstr "" #. @-expanded: group %g's block bitmap (%b) is bad. -#: e2fsck/problem.c:582 +#: e2fsck/problem.c:585 msgid "@g %g's @b @B (%b) is bad. " msgstr "" #. @-expanded: group %g's inode bitmap (%b) is bad. -#: e2fsck/problem.c:587 +#: e2fsck/problem.c:590 msgid "@g %g's @i @B (%b) is bad. " msgstr "" #. @-expanded: inode %i, i_size is %Is, should be %N. -#: e2fsck/problem.c:592 +#: e2fsck/problem.c:595 msgid "@i %i, i_size is %Is, @s %N. " msgstr "" #. @-expanded: inode %i, i_blocks is %Ib, should be %N. -#: e2fsck/problem.c:597 +#: e2fsck/problem.c:600 msgid "@i %i, i_@bs is %Ib, @s %N. " msgstr "" #. @-expanded: illegal %B (%b) in inode %i. -#: e2fsck/problem.c:602 +#: e2fsck/problem.c:605 msgid "@I %B (%b) in @i %i. " msgstr "" #. @-expanded: %B (%b) overlaps filesystem metadata in inode %i. -#: e2fsck/problem.c:607 +#: e2fsck/problem.c:610 msgid "%B (%b) overlaps @f metadata in @i %i. " msgstr "" #. @-expanded: inode %i has illegal block(s). -#: e2fsck/problem.c:613 +#: e2fsck/problem.c:616 #, no-c-format msgid "@i %i has illegal @b(s). " msgstr "" #. @-expanded: Too many illegal blocks in inode %i.\n -#: e2fsck/problem.c:619 +#: e2fsck/problem.c:622 #, no-c-format msgid "Too many illegal @bs in @i %i.\n" msgstr "Слишком много недопустимых @bs в @i %i.\n" #. @-expanded: illegal %B (%b) in bad block inode. -#: e2fsck/problem.c:624 +#: e2fsck/problem.c:627 msgid "@I %B (%b) in bad @b @i. " msgstr "" #. @-expanded: Bad block inode has illegal block(s). -#: e2fsck/problem.c:629 +#: e2fsck/problem.c:632 msgid "Bad @b @i has illegal @b(s). " msgstr "" #. @-expanded: Duplicate or bad block in use!\n -#: e2fsck/problem.c:634 +#: e2fsck/problem.c:637 msgid "Duplicate or bad @b in use!\n" msgstr "Используется копия или неисправный @b!\n" #. @-expanded: Bad block %b used as bad block inode indirect block. -#: e2fsck/problem.c:639 +#: e2fsck/problem.c:642 msgid "Bad @b %b used as bad @b @i indirect @b. " msgstr "" @@ -1319,7 +1319,7 @@ #. @-expanded: The bad block inode has probably been corrupted. You probably\n #. @-expanded: should stop now and run e2fsck -c to scan for bad blocks\n #. @-expanded: in the filesystem.\n -#: e2fsck/problem.c:644 +#: e2fsck/problem.c:647 msgid "" "\n" "The bad @b @i has probably been corrupted. You probably\n" @@ -1329,7 +1329,7 @@ #. @-expanded: \n #. @-expanded: If the block is really bad, the filesystem can not be fixed.\n -#: e2fsck/problem.c:651 +#: e2fsck/problem.c:654 msgid "" "\n" "If the @b is really bad, the @f can not be fixed.\n" @@ -1338,7 +1338,7 @@ #. @-expanded: You can remove this block from the bad block list and hope\n #. @-expanded: that the block is really OK. But there are no guarantees.\n #. @-expanded: \n -#: e2fsck/problem.c:656 +#: e2fsck/problem.c:659 msgid "" "You can remove this @b from the bad @b list and hope\n" "that the @b is really OK. But there are no guarantees.\n" @@ -1346,121 +1346,121 @@ msgstr "" #. @-expanded: The primary superblock (%b) is on the bad block list.\n -#: e2fsck/problem.c:662 +#: e2fsck/problem.c:665 msgid "The primary @S (%b) is on the bad @b list.\n" msgstr "" #. @-expanded: Block %b in the primary group descriptors is on the bad block list\n -#: e2fsck/problem.c:667 +#: e2fsck/problem.c:670 msgid "Block %b in the primary @g descriptors is on the bad @b list\n" msgstr "" #. @-expanded: Warning: Group %g's superblock (%b) is bad.\n -#: e2fsck/problem.c:673 +#: e2fsck/problem.c:676 msgid "Warning: Group %g's @S (%b) is bad.\n" msgstr "" #. @-expanded: Warning: Group %g's copy of the group descriptors has a bad block (%b).\n -#: e2fsck/problem.c:679 +#: e2fsck/problem.c:682 msgid "Warning: Group %g's copy of the @g descriptors has a bad @b (%b).\n" msgstr "" #. @-expanded: Programming error? block #%b claimed for no reason in process_bad_block.\n -#: e2fsck/problem.c:685 +#: e2fsck/problem.c:688 msgid "Programming error? @b #%b claimed for no reason in process_bad_@b.\n" msgstr "" #. @-expanded: error allocating %N contiguous block(s) in block group %g for %s: %m\n -#: e2fsck/problem.c:691 +#: e2fsck/problem.c:694 msgid "@A %N contiguous @b(s) in @b @g %g for %s: %m\n" msgstr "" #. @-expanded: error allocating block buffer for relocating %s\n -#: e2fsck/problem.c:697 +#: e2fsck/problem.c:700 #, no-c-format msgid "@A @b buffer for relocating %s\n" msgstr "" #. @-expanded: Relocating group %g's %s from %b to %c...\n -#: e2fsck/problem.c:702 +#: e2fsck/problem.c:705 msgid "Relocating @g %g's %s from %b to %c...\n" msgstr "" #. @-expanded: Relocating group %g's %s to %c...\n -#: e2fsck/problem.c:708 +#: e2fsck/problem.c:711 #, no-c-format msgid "Relocating @g %g's %s to %c...\n" msgstr "" #. @-expanded: Warning: could not read block %b of %s: %m\n -#: e2fsck/problem.c:713 +#: e2fsck/problem.c:716 msgid "Warning: could not read @b %b of %s: %m\n" msgstr "" #. @-expanded: Warning: could not write block %b for %s: %m\n -#: e2fsck/problem.c:718 +#: e2fsck/problem.c:721 msgid "Warning: could not write @b %b for %s: %m\n" msgstr "" #. @-expanded: error allocating inode bitmap (%N): %m\n -#: e2fsck/problem.c:723 e2fsck/problem.c:1871 +#: e2fsck/problem.c:726 e2fsck/problem.c:1883 msgid "@A @i @B (%N): %m\n" msgstr "" #. @-expanded: error allocating block bitmap (%N): %m\n -#: e2fsck/problem.c:728 +#: e2fsck/problem.c:731 msgid "@A @b @B (%N): %m\n" msgstr "" #. @-expanded: error allocating icount link information: %m\n -#: e2fsck/problem.c:734 +#: e2fsck/problem.c:737 #, no-c-format msgid "@A icount link information: %m\n" msgstr "" #. @-expanded: error allocating directory block array: %m\n -#: e2fsck/problem.c:740 +#: e2fsck/problem.c:743 #, no-c-format msgid "@A @d @b array: %m\n" msgstr "" #. @-expanded: Error while scanning inodes (%i): %m\n -#: e2fsck/problem.c:746 +#: e2fsck/problem.c:749 #, no-c-format msgid "Error while scanning @is (%i): %m\n" msgstr "" #. @-expanded: Error while iterating over blocks in inode %i: %m\n -#: e2fsck/problem.c:752 +#: e2fsck/problem.c:755 #, no-c-format msgid "Error while iterating over @bs in @i %i: %m\n" msgstr "" #. @-expanded: Error storing inode count information (inode=%i, count=%N): %m\n -#: e2fsck/problem.c:757 +#: e2fsck/problem.c:760 msgid "Error storing @i count information (@i=%i, count=%N): %m\n" msgstr "" #. @-expanded: Error storing directory block information (inode=%i, block=%b, num=%N): %m\n -#: e2fsck/problem.c:762 +#: e2fsck/problem.c:765 msgid "Error storing @d @b information (@i=%i, @b=%b, num=%N): %m\n" msgstr "" #. @-expanded: Error reading inode %i: %m\n -#: e2fsck/problem.c:769 +#: e2fsck/problem.c:772 #, no-c-format msgid "Error reading @i %i: %m\n" msgstr "Ошибка считывания @i %i: %m\n" #. @-expanded: inode %i has imagic flag set. -#: e2fsck/problem.c:778 +#: e2fsck/problem.c:781 #, no-c-format msgid "@i %i has imagic flag set. " msgstr "" #. @-expanded: Special (device/socket/fifo/symlink) file (inode %i) has immutable\n #. @-expanded: or append-only flag set. -#: e2fsck/problem.c:784 +#: e2fsck/problem.c:787 #, no-c-format msgid "" "Special (@v/socket/fifo/symlink) file (@i %i) has immutable\n" @@ -1468,198 +1468,198 @@ msgstr "" #. @-expanded: Special (device/socket/fifo) inode %i has non-zero size. -#: e2fsck/problem.c:791 +#: e2fsck/problem.c:794 #, no-c-format msgid "Special (@v/socket/fifo) @i %i has non-zero size. " msgstr "" #. @-expanded: journal inode is not in use, but contains data. -#: e2fsck/problem.c:801 +#: e2fsck/problem.c:804 msgid "@j @i is not in use, but contains data. " msgstr "@j @i не используется, но содержит данные. " #. @-expanded: journal is not regular file. -#: e2fsck/problem.c:806 +#: e2fsck/problem.c:809 msgid "@j is not regular file. " msgstr "" #. @-expanded: inode %i was part of the orphaned inode list. -#: e2fsck/problem.c:812 +#: e2fsck/problem.c:815 #, no-c-format msgid "@i %i was part of the @o @i list. " msgstr "" #. @-expanded: inodes that were part of a corrupted orphan linked list found. -#: e2fsck/problem.c:818 +#: e2fsck/problem.c:821 msgid "@is that were part of a corrupted orphan linked list found. " msgstr "" #. @-expanded: error allocating refcount structure (%N): %m\n -#: e2fsck/problem.c:823 +#: e2fsck/problem.c:826 msgid "@A refcount structure (%N): %m\n" msgstr "" #. @-expanded: Error reading extended attribute block %b for inode %i. -#: e2fsck/problem.c:828 +#: e2fsck/problem.c:831 msgid "Error reading @a @b %b for @i %i. " msgstr "Ошибка считывания @a @b %b для @i %i. " #. @-expanded: inode %i has a bad extended attribute block %b. -#: e2fsck/problem.c:833 +#: e2fsck/problem.c:836 msgid "@i %i has a bad @a @b %b. " msgstr "@i %i содержит неисправный @a @b %b. " #. @-expanded: Error reading extended attribute block %b (%m). -#: e2fsck/problem.c:838 +#: e2fsck/problem.c:841 msgid "Error reading @a @b %b (%m). " msgstr "Ошибка считывания @a @b %b (%m). " #. @-expanded: extended attribute block %b has reference count %r, should be %N. -#: e2fsck/problem.c:843 +#: e2fsck/problem.c:846 msgid "@a @b %b has reference count %r, @s %N. " msgstr "" #. @-expanded: Error writing extended attribute block %b (%m). -#: e2fsck/problem.c:848 +#: e2fsck/problem.c:851 msgid "Error writing @a @b %b (%m). " msgstr "Ошибка записи @a @b %b (%m). " #. @-expanded: extended attribute block %b has h_blocks > 1. -#: e2fsck/problem.c:853 +#: e2fsck/problem.c:856 msgid "@a @b %b has h_@bs > 1. " msgstr "" #. @-expanded: error allocating extended attribute region allocation structure. -#: e2fsck/problem.c:858 +#: e2fsck/problem.c:861 msgid "@A @a region allocation structure. " msgstr "" #. @-expanded: extended attribute block %b is corrupt (allocation collision). -#: e2fsck/problem.c:863 +#: e2fsck/problem.c:866 msgid "@a @b %b is corrupt (allocation collision). " msgstr "@a @b %b неисправен (неполадка распределения). " #. @-expanded: extended attribute block %b is corrupt (invalid name). -#: e2fsck/problem.c:868 +#: e2fsck/problem.c:871 msgid "@a @b %b is corrupt (@n name). " msgstr "@a @b %b неисправен (@n имя). " #. @-expanded: extended attribute block %b is corrupt (invalid value). -#: e2fsck/problem.c:873 +#: e2fsck/problem.c:876 msgid "@a @b %b is corrupt (@n value). " msgstr "@a @b %b неисправен (@n значение). " #. @-expanded: inode %i is too big. -#: e2fsck/problem.c:879 +#: e2fsck/problem.c:882 #, no-c-format msgid "@i %i is too big. " msgstr "@i %i слишком большой. " #. @-expanded: %B (%b) causes directory to be too big. -#: e2fsck/problem.c:883 +#: e2fsck/problem.c:886 msgid "%B (%b) causes @d to be too big. " msgstr "" -#: e2fsck/problem.c:888 +#: e2fsck/problem.c:891 msgid "%B (%b) causes file to be too big. " msgstr "" -#: e2fsck/problem.c:893 +#: e2fsck/problem.c:896 msgid "%B (%b) causes symlink to be too big. " msgstr "" #. @-expanded: inode %i has INDEX_FL flag set on filesystem without htree support.\n -#: e2fsck/problem.c:899 +#: e2fsck/problem.c:902 #, no-c-format msgid "@i %i has INDEX_FL flag set on @f without htree support.\n" msgstr "" #. @-expanded: inode %i has INDEX_FL flag set but is not a directory.\n -#: e2fsck/problem.c:905 +#: e2fsck/problem.c:908 #, no-c-format msgid "@i %i has INDEX_FL flag set but is not a @d.\n" msgstr "" #. @-expanded: HTREE directory inode %i has an invalid root node.\n -#: e2fsck/problem.c:911 +#: e2fsck/problem.c:914 #, no-c-format msgid "@h %i has an @n root node.\n" msgstr "" #. @-expanded: HTREE directory inode %i has an unsupported hash version (%N)\n -#: e2fsck/problem.c:916 +#: e2fsck/problem.c:919 msgid "@h %i has an unsupported hash version (%N)\n" msgstr "" #. @-expanded: HTREE directory inode %i uses an incompatible htree root node flag.\n -#: e2fsck/problem.c:922 +#: e2fsck/problem.c:925 #, no-c-format msgid "@h %i uses an incompatible htree root node flag.\n" msgstr "" #. @-expanded: HTREE directory inode %i has a tree depth (%N) which is too big\n -#: e2fsck/problem.c:927 +#: e2fsck/problem.c:930 msgid "@h %i has a tree depth (%N) which is too big\n" msgstr "" #. @-expanded: Bad block inode has an indirect block (%b) that conflicts with\n #. @-expanded: filesystem metadata. -#: e2fsck/problem.c:933 +#: e2fsck/problem.c:936 msgid "" "Bad @b @i has an indirect @b (%b) that conflicts with\n" "@f metadata. " msgstr "" #. @-expanded: Resize inode (re)creation failed: %m. -#: e2fsck/problem.c:940 +#: e2fsck/problem.c:943 #, no-c-format msgid "Resize @i (re)creation failed: %m." msgstr "" #. @-expanded: inode %i has a extra size (%IS) which is invalid\n -#: e2fsck/problem.c:945 +#: e2fsck/problem.c:948 msgid "@i %i has a extra size (%IS) which is @n\n" msgstr "" #. @-expanded: extended attribute in inode %i has a namelen (%N) which is invalid\n -#: e2fsck/problem.c:950 +#: e2fsck/problem.c:953 msgid "@a in @i %i has a namelen (%N) which is @n\n" msgstr "" #. @-expanded: extended attribute in inode %i has a value offset (%N) which is invalid\n -#: e2fsck/problem.c:955 +#: e2fsck/problem.c:958 msgid "@a in @i %i has a value offset (%N) which is @n\n" msgstr "" #. @-expanded: extended attribute in inode %i has a value block (%N) which is invalid (must be 0)\n -#: e2fsck/problem.c:960 +#: e2fsck/problem.c:963 msgid "@a in @i %i has a value @b (%N) which is @n (must be 0)\n" msgstr "" #. @-expanded: extended attribute in inode %i has a value size (%N) which is invalid\n -#: e2fsck/problem.c:965 +#: e2fsck/problem.c:968 msgid "@a in @i %i has a value size (%N) which is @n\n" msgstr "" #. @-expanded: extended attribute in inode %i has a hash (%N) which is invalid\n -#: e2fsck/problem.c:970 +#: e2fsck/problem.c:973 msgid "@a in @i %i has a hash (%N) which is @n\n" msgstr "" #. @-expanded: inode %i is a %It but it looks like it is really a directory.\n -#: e2fsck/problem.c:975 +#: e2fsck/problem.c:978 msgid "@i %i is a %It but it looks like it is really a directory.\n" msgstr "" #. @-expanded: Error while reading over extent tree in inode %i: %m\n -#: e2fsck/problem.c:981 +#: e2fsck/problem.c:984 #, no-c-format msgid "Error while reading over @x tree in @i %i: %m\n" msgstr "" #. @-expanded: Failed to iterate extents in inode %i\n #. @-expanded: \t(op %s, blk %b, lblk %c): %m\n -#: e2fsck/problem.c:986 +#: e2fsck/problem.c:989 msgid "" "Failed to iterate extents in @i %i\n" "\t(op %s, blk %b, lblk %c): %m\n" @@ -1667,7 +1667,7 @@ #. @-expanded: inode %i has an invalid extent\n #. @-expanded: \t(logical block %c, invalid physical block %b, len %N)\n -#: e2fsck/problem.c:992 +#: e2fsck/problem.c:995 msgid "" "@i %i has an @n extent\n" "\t(logical @b %c, @n physical @b %b, len %N)\n" @@ -1675,116 +1675,116 @@ #. @-expanded: inode %i has an invalid extent\n #. @-expanded: \t(logical block %c, physical block %b, invalid len %N)\n -#: e2fsck/problem.c:997 +#: e2fsck/problem.c:1000 msgid "" "@i %i has an @n extent\n" "\t(logical @b %c, physical @b %b, @n len %N)\n" msgstr "" #. @-expanded: inode %i has EXTENTS_FL flag set on filesystem without extents support.\n -#: e2fsck/problem.c:1003 +#: e2fsck/problem.c:1006 #, no-c-format msgid "@i %i has EXTENTS_FL flag set on @f without extents support.\n" msgstr "" #. @-expanded: inode %i is in extent format, but superblock is missing EXTENTS feature\n -#: e2fsck/problem.c:1009 +#: e2fsck/problem.c:1012 #, no-c-format msgid "@i %i is in extent format, but @S is missing EXTENTS feature\n" msgstr "" #. @-expanded: inode %i missing EXTENT_FL, but is in extents format\n -#: e2fsck/problem.c:1015 +#: e2fsck/problem.c:1018 #, no-c-format msgid "@i %i missing EXTENT_FL, but is in extents format\n" msgstr "" -#: e2fsck/problem.c:1021 +#: e2fsck/problem.c:1024 #, no-c-format msgid "Fast symlink %i has EXTENT_FL set. " msgstr "" #. @-expanded: inode %i has out of order extents\n #. @-expanded: \t(invalid logical block %c, physical block %b, len %N)\n -#: e2fsck/problem.c:1026 +#: e2fsck/problem.c:1029 msgid "" "@i %i has out of order extents\n" "\t(@n logical @b %c, physical @b %b, len %N)\n" msgstr "" #. @-expanded: inode %i has an invalid extent node (blk %b, lblk %c)\n -#: e2fsck/problem.c:1030 +#: e2fsck/problem.c:1033 msgid "@i %i has an invalid extent node (blk %b, lblk %c)\n" msgstr "" #. @-expanded: Error converting subcluster block bitmap: %m\n -#: e2fsck/problem.c:1036 +#: e2fsck/problem.c:1039 #, no-c-format msgid "Error converting subcluster @b @B: %m\n" msgstr "" #. @-expanded: quota inode is not a regular file. -#: e2fsck/problem.c:1041 +#: e2fsck/problem.c:1044 msgid "@q @i is not a regular file. " msgstr "" #. @-expanded: quota inode is not in use, but contains data. -#: e2fsck/problem.c:1046 +#: e2fsck/problem.c:1049 msgid "@q @i is not in use, but contains data. " msgstr "" #. @-expanded: quota inode is visible to the user. -#: e2fsck/problem.c:1051 +#: e2fsck/problem.c:1054 msgid "@q @i is visible to the user. " msgstr "" #. @-expanded: The bad block inode looks invalid. -#: e2fsck/problem.c:1056 +#: e2fsck/problem.c:1059 msgid "The bad @b @i looks @n. " msgstr "" #. @-expanded: inode %i has zero length extent\n #. @-expanded: \t(invalid logical block %c, physical block %b)\n -#: e2fsck/problem.c:1061 +#: e2fsck/problem.c:1064 msgid "" "@i %i has zero length extent\n" "\t(@n logical @b %c, physical @b %b)\n" msgstr "" #. @-expanded: inode %i seems to contain garbage. -#: e2fsck/problem.c:1067 +#: e2fsck/problem.c:1070 #, no-c-format msgid "@i %i seems to contain garbage. " msgstr "" #. @-expanded: inode %i passes checks, but checksum does not match inode. -#: e2fsck/problem.c:1073 +#: e2fsck/problem.c:1076 #, no-c-format msgid "@i %i passes checks, but checksum does not match @i. " msgstr "" #. @-expanded: inode %i extended attribute is corrupt (allocation collision). -#: e2fsck/problem.c:1079 +#: e2fsck/problem.c:1082 #, no-c-format msgid "@i %i @a is corrupt (allocation collision). " msgstr "" #. @-expanded: inode %i extent block passes checks, but checksum does not match extent\n #. @-expanded: \t(logical block %c, physical block %b, len %N)\n -#: e2fsck/problem.c:1087 +#: e2fsck/problem.c:1090 msgid "" "@i %i extent block passes checks, but checksum does not match extent\n" "\t(logical @b %c, physical @b %b, len %N)\n" msgstr "" #. @-expanded: inode %i extended attribute block %b passes checks, but checksum does not match block. -#: e2fsck/problem.c:1096 +#: e2fsck/problem.c:1099 msgid "@i %i @a @b %b passes checks, but checksum does not match @b. " msgstr "" #. @-expanded: Interior extent node level %N of inode %i:\n #. @-expanded: Logical start %b does not match logical start %c at next level. -#: e2fsck/problem.c:1101 +#: e2fsck/problem.c:1104 msgid "" "Interior @x node level %N of @i %i:\n" "Logical start %b does not match logical start %c at next level. " @@ -1792,59 +1792,59 @@ #. @-expanded: inode %i, end of extent exceeds allowed value\n #. @-expanded: \t(logical block %c, physical block %b, len %N)\n -#: e2fsck/problem.c:1107 +#: e2fsck/problem.c:1110 msgid "" "@i %i, end of extent exceeds allowed value\n" "\t(logical @b %c, physical @b %b, len %N)\n" msgstr "" #. @-expanded: inode %i has inline data, but superblock is missing INLINE_DATA feature\n -#: e2fsck/problem.c:1113 +#: e2fsck/problem.c:1116 #, no-c-format msgid "@i %i has inline data, but @S is missing INLINE_DATA feature\n" msgstr "" #. @-expanded: inode %i has INLINE_DATA_FL flag on filesystem without inline data support.\n -#: e2fsck/problem.c:1119 +#: e2fsck/problem.c:1122 #, no-c-format msgid "@i %i has INLINE_DATA_FL flag on @f without inline data support.\n" msgstr "" #. @-expanded: inode %i block %b conflicts with critical metadata, skipping block checks.\n -#: e2fsck/problem.c:1127 +#: e2fsck/problem.c:1130 #, no-c-format msgid "" "@i %i block %b conflicts with critical metadata, skipping block checks.\n" msgstr "" #. @-expanded: directory inode %i block %b should be at block %c. -#: e2fsck/problem.c:1132 +#: e2fsck/problem.c:1135 msgid "@d @i %i @b %b should be at @b %c. " msgstr "" #. @-expanded: directory inode %i has extent marked uninitialized at block %c. -#: e2fsck/problem.c:1138 +#: e2fsck/problem.c:1141 #, no-c-format msgid "@d @i %i has @x marked uninitialized at @b %c. " msgstr "" #. @-expanded: inode %i logical block %b (physical block %c) violates cluster allocation rules.\n #. @-expanded: Will fix in pass 1B.\n -#: e2fsck/problem.c:1143 +#: e2fsck/problem.c:1146 msgid "" "@i %i logical @b %b (physical @b %c) violates cluster allocation rules.\n" "Will fix in pass 1B.\n" msgstr "" #. @-expanded: inode %i has INLINE_DATA_FL flag but extended attribute not found. -#: e2fsck/problem.c:1149 +#: e2fsck/problem.c:1152 #, no-c-format msgid "@i %i has INLINE_DATA_FL flag but @a not found. " msgstr "" #. @-expanded: Special (device/socket/fifo) file (inode %i) has extents\n #. @-expanded: or inline-data flag set. -#: e2fsck/problem.c:1156 +#: e2fsck/problem.c:1159 #, no-c-format msgid "" "Special (@v/socket/fifo) file (@i %i) has extents\n" @@ -1852,88 +1852,88 @@ msgstr "" #. @-expanded: inode %i has extent header but inline data flag is set.\n -#: e2fsck/problem.c:1163 +#: e2fsck/problem.c:1166 #, no-c-format msgid "@i %i has @x header but inline data flag is set.\n" msgstr "" #. @-expanded: inode %i seems to have inline data but extent flag is set.\n -#: e2fsck/problem.c:1169 +#: e2fsck/problem.c:1172 #, no-c-format msgid "@i %i seems to have inline data but @x flag is set.\n" msgstr "" #. @-expanded: inode %i seems to have block map but inline data and extent flags set.\n -#: e2fsck/problem.c:1175 +#: e2fsck/problem.c:1178 #, no-c-format msgid "@i %i seems to have @b map but inline data and @x flags set.\n" msgstr "" #. @-expanded: inode %i has inline data and extent flags set but i_block contains junk.\n -#: e2fsck/problem.c:1181 +#: e2fsck/problem.c:1184 #, no-c-format msgid "@i %i has inline data and @x flags set but i_block contains junk.\n" msgstr "" #. @-expanded: Bad block list says the bad block list inode is bad. -#: e2fsck/problem.c:1186 +#: e2fsck/problem.c:1189 msgid "Bad block list says the bad block list @i is bad. " msgstr "" #. @-expanded: error allocating extent region allocation structure. -#: e2fsck/problem.c:1191 +#: e2fsck/problem.c:1194 msgid "@A @x region allocation structure. " msgstr "" #. @-expanded: inode %i has a duplicate extent mapping\n #. @-expanded: \t(logical block %c, invalid physical block %b, len %N)\n -#: e2fsck/problem.c:1196 +#: e2fsck/problem.c:1199 msgid "" "@i %i has a duplicate @x mapping\n" "\t(logical @b %c, @n physical @b %b, len %N)\n" msgstr "" #. @-expanded: error allocating memory for encrypted directory list\n -#: e2fsck/problem.c:1201 +#: e2fsck/problem.c:1204 msgid "@A memory for encrypted @d list\n" msgstr "" #. @-expanded: inode %i extent tree could be more shallow (%b; could be <= %c)\n -#: e2fsck/problem.c:1206 +#: e2fsck/problem.c:1209 msgid "@i %i @x tree could be more shallow (%b; could be <= %c)\n" msgstr "" #. @-expanded: inode %i on bigalloc filesystem cannot be block mapped. -#: e2fsck/problem.c:1212 +#: e2fsck/problem.c:1215 #, no-c-format msgid "@i %i on bigalloc @f cannot be @b mapped. " msgstr "" #. @-expanded: inode %i has corrupt extent header. -#: e2fsck/problem.c:1218 +#: e2fsck/problem.c:1221 #, no-c-format msgid "@i %i has corrupt @x header. " msgstr "" #. @-expanded: Timestamp(s) on inode %i beyond 2310-04-04 are likely pre-1970.\n -#: e2fsck/problem.c:1224 +#: e2fsck/problem.c:1227 #, no-c-format msgid "Timestamp(s) on @i %i beyond 2310-04-04 are likely pre-1970.\n" msgstr "" #. @-expanded: inode %i has illegal extended attribute value inode %N.\n -#: e2fsck/problem.c:1229 +#: e2fsck/problem.c:1232 msgid "@i %i has @I @a value @i %N.\n" msgstr "" #. @-expanded: inode %i has invalid extended attribute. EA inode %N missing EA_INODE flag.\n -#: e2fsck/problem.c:1235 +#: e2fsck/problem.c:1238 msgid "@i %i has @n @a. EA @i %N missing EA_INODE flag.\n" msgstr "" #. @-expanded: EA inode %N for parent inode %i missing EA_INODE flag.\n #. @-expanded: -#: e2fsck/problem.c:1240 +#: e2fsck/problem.c:1243 msgid "" "EA @i %N for parent @i %i missing EA_INODE flag.\n" " " @@ -1942,7 +1942,7 @@ #. @-expanded: \n #. @-expanded: Running additional passes to resolve blocks claimed by more than one inode...\n #. @-expanded: Pass 1B: Rescanning for multiply-claimed blocks\n -#: e2fsck/problem.c:1248 +#: e2fsck/problem.c:1260 msgid "" "\n" "Running additional passes to resolve @bs claimed by more than one @i...\n" @@ -1950,64 +1950,64 @@ msgstr "" #. @-expanded: multiply-claimed block(s) in inode %i: -#: e2fsck/problem.c:1255 +#: e2fsck/problem.c:1267 #, no-c-format msgid "@m @b(s) in @i %i:" msgstr "" -#: e2fsck/problem.c:1271 +#: e2fsck/problem.c:1283 #, no-c-format msgid "Error while scanning inodes (%i): %m\n" msgstr "Ошибка при сканированнии inod'ов (%i): %m\n" #. @-expanded: error allocating inode bitmap (inode_dup_map): %m\n -#: e2fsck/problem.c:1277 +#: e2fsck/problem.c:1289 #, no-c-format msgid "@A @i @B (@i_dup_map): %m\n" msgstr "" #. @-expanded: Error while iterating over blocks in inode %i (%s): %m\n -#: e2fsck/problem.c:1283 +#: e2fsck/problem.c:1295 #, no-c-format msgid "Error while iterating over @bs in @i %i (%s): %m\n" msgstr "" #. @-expanded: Error adjusting refcount for extended attribute block %b (inode %i): %m\n -#: e2fsck/problem.c:1288 e2fsck/problem.c:1663 +#: e2fsck/problem.c:1300 e2fsck/problem.c:1675 msgid "Error adjusting refcount for @a @b %b (@i %i): %m\n" msgstr "" #. @-expanded: Pass 1C: Scanning directories for inodes with multiply-claimed blocks\n -#: e2fsck/problem.c:1298 +#: e2fsck/problem.c:1310 msgid "Pass 1C: Scanning directories for @is with @m @bs\n" msgstr "" #. @-expanded: Pass 1D: Reconciling multiply-claimed blocks\n -#: e2fsck/problem.c:1304 +#: e2fsck/problem.c:1316 msgid "Pass 1D: Reconciling @m @bs\n" msgstr "" #. @-expanded: File %Q (inode #%i, mod time %IM) \n #. @-expanded: has %r multiply-claimed block(s), shared with %N file(s):\n -#: e2fsck/problem.c:1309 +#: e2fsck/problem.c:1321 msgid "" "File %Q (@i #%i, mod time %IM) \n" " has %r @m @b(s), shared with %N file(s):\n" msgstr "" #. @-expanded: \t%Q (inode #%i, mod time %IM)\n -#: e2fsck/problem.c:1315 +#: e2fsck/problem.c:1327 msgid "\t%Q (@i #%i, mod time %IM)\n" msgstr "" #. @-expanded: \t\n -#: e2fsck/problem.c:1320 +#: e2fsck/problem.c:1332 msgid "\t<@f metadata>\n" msgstr "" #. @-expanded: (There are %N inodes containing multiply-claimed blocks.)\n #. @-expanded: \n -#: e2fsck/problem.c:1325 +#: e2fsck/problem.c:1337 msgid "" "(There are %N @is containing @m @bs.)\n" "\n" @@ -2015,351 +2015,351 @@ #. @-expanded: multiply-claimed blocks already reassigned or cloned.\n #. @-expanded: \n -#: e2fsck/problem.c:1330 +#: e2fsck/problem.c:1342 msgid "" "@m @bs already reassigned or cloned.\n" "\n" msgstr "" -#: e2fsck/problem.c:1344 +#: e2fsck/problem.c:1356 #, no-c-format msgid "Couldn't clone file: %m\n" msgstr "" #. @-expanded: Pass 1E: Optimizing extent trees\n -#: e2fsck/problem.c:1350 +#: e2fsck/problem.c:1362 msgid "Pass 1E: Optimizing @x trees\n" msgstr "" #. @-expanded: Failed to optimize extent tree %p (%i): %m\n -#: e2fsck/problem.c:1356 +#: e2fsck/problem.c:1368 #, no-c-format msgid "Failed to optimize @x tree %p (%i): %m\n" msgstr "" #. @-expanded: Optimizing extent trees: -#: e2fsck/problem.c:1361 +#: e2fsck/problem.c:1373 msgid "Optimizing @x trees: " msgstr "" -#: e2fsck/problem.c:1376 +#: e2fsck/problem.c:1388 msgid "Internal error: max extent tree depth too large (%b; expected=%c).\n" msgstr "" #. @-expanded: inode %i extent tree (at level %b) could be shorter. -#: e2fsck/problem.c:1381 +#: e2fsck/problem.c:1393 msgid "@i %i @x tree (at level %b) could be shorter. " msgstr "" #. @-expanded: inode %i extent tree (at level %b) could be narrower. -#: e2fsck/problem.c:1386 +#: e2fsck/problem.c:1398 msgid "@i %i @x tree (at level %b) could be narrower. " msgstr "" #. @-expanded: Pass 2: Checking directory structure\n -#: e2fsck/problem.c:1393 +#: e2fsck/problem.c:1405 msgid "Pass 2: Checking @d structure\n" msgstr "" #. @-expanded: invalid inode number for '.' in directory inode %i.\n -#: e2fsck/problem.c:1399 +#: e2fsck/problem.c:1411 #, no-c-format msgid "@n @i number for '.' in @d @i %i.\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) has invalid inode #: %Di.\n -#: e2fsck/problem.c:1404 +#: e2fsck/problem.c:1416 msgid "@E has @n @i #: %Di.\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) has deleted/unused inode %Di. -#: e2fsck/problem.c:1409 +#: e2fsck/problem.c:1421 msgid "@E has @D/unused @i %Di. " msgstr "" #. @-expanded: entry '%Dn' in %p (%i) is a link to '.' -#: e2fsck/problem.c:1414 +#: e2fsck/problem.c:1426 msgid "@E @L to '.' " msgstr "" #. @-expanded: entry '%Dn' in %p (%i) points to inode (%Di) located in a bad block.\n -#: e2fsck/problem.c:1419 +#: e2fsck/problem.c:1431 msgid "@E points to @i (%Di) located in a bad @b.\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) is a link to directory %P (%Di).\n -#: e2fsck/problem.c:1424 +#: e2fsck/problem.c:1436 msgid "@E @L to @d %P (%Di).\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) is a link to the root inode.\n -#: e2fsck/problem.c:1429 +#: e2fsck/problem.c:1441 msgid "@E @L to the @r.\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) has illegal characters in its name.\n -#: e2fsck/problem.c:1434 +#: e2fsck/problem.c:1446 msgid "@E has illegal characters in its name.\n" msgstr "" #. @-expanded: Missing '.' in directory inode %i.\n -#: e2fsck/problem.c:1440 +#: e2fsck/problem.c:1452 #, no-c-format msgid "Missing '.' in @d @i %i.\n" msgstr "" #. @-expanded: Missing '..' in directory inode %i.\n -#: e2fsck/problem.c:1446 +#: e2fsck/problem.c:1458 #, no-c-format msgid "Missing '..' in @d @i %i.\n" msgstr "" #. @-expanded: First entry '%Dn' (inode=%Di) in directory inode %i (%p) should be '.'\n -#: e2fsck/problem.c:1451 +#: e2fsck/problem.c:1463 msgid "First @e '%Dn' (@i=%Di) in @d @i %i (%p) @s '.'\n" msgstr "" #. @-expanded: Second entry '%Dn' (inode=%Di) in directory inode %i should be '..'\n -#: e2fsck/problem.c:1456 +#: e2fsck/problem.c:1468 msgid "Second @e '%Dn' (@i=%Di) in @d @i %i @s '..'\n" msgstr "" #. @-expanded: i_faddr for inode %i (%Q) is %IF, should be zero.\n -#: e2fsck/problem.c:1461 +#: e2fsck/problem.c:1473 msgid "i_faddr @F %IF, @s zero.\n" msgstr "" #. @-expanded: i_file_acl for inode %i (%Q) is %If, should be zero.\n -#: e2fsck/problem.c:1466 +#: e2fsck/problem.c:1478 msgid "i_file_acl @F %If, @s zero.\n" msgstr "" #. @-expanded: i_size_high for inode %i (%Q) is %Id, should be zero.\n -#: e2fsck/problem.c:1471 +#: e2fsck/problem.c:1483 msgid "i_size_high @F %Id, @s zero.\n" msgstr "" #. @-expanded: i_frag for inode %i (%Q) is %N, should be zero.\n -#: e2fsck/problem.c:1476 +#: e2fsck/problem.c:1488 msgid "i_frag @F %N, @s zero.\n" msgstr "" #. @-expanded: i_fsize for inode %i (%Q) is %N, should be zero.\n -#: e2fsck/problem.c:1481 +#: e2fsck/problem.c:1493 msgid "i_fsize @F %N, @s zero.\n" msgstr "" #. @-expanded: inode %i (%Q) has invalid mode (%Im).\n -#: e2fsck/problem.c:1486 +#: e2fsck/problem.c:1498 msgid "@i %i (%Q) has @n mode (%Im).\n" msgstr "" #. @-expanded: directory inode %i, %B, offset %N: directory corrupted\n -#: e2fsck/problem.c:1491 +#: e2fsck/problem.c:1503 msgid "@d @i %i, %B, offset %N: @d corrupted\n" msgstr "" #. @-expanded: directory inode %i, %B, offset %N: filename too long\n -#: e2fsck/problem.c:1496 +#: e2fsck/problem.c:1508 msgid "@d @i %i, %B, offset %N: filename too long\n" msgstr "" #. @-expanded: directory inode %i has an unallocated %B. -#: e2fsck/problem.c:1501 +#: e2fsck/problem.c:1513 msgid "@d @i %i has an unallocated %B. " msgstr "" #. @-expanded: '.' directory entry in directory inode %i is not NULL terminated\n -#: e2fsck/problem.c:1507 +#: e2fsck/problem.c:1519 #, no-c-format msgid "'.' @d @e in @d @i %i is not NULL terminated\n" msgstr "" #. @-expanded: '..' directory entry in directory inode %i is not NULL terminated\n -#: e2fsck/problem.c:1513 +#: e2fsck/problem.c:1525 #, no-c-format msgid "'..' @d @e in @d @i %i is not NULL terminated\n" msgstr "" #. @-expanded: inode %i (%Q) is an illegal character device.\n -#: e2fsck/problem.c:1518 +#: e2fsck/problem.c:1530 msgid "@i %i (%Q) is an @I character @v.\n" msgstr "" #. @-expanded: inode %i (%Q) is an illegal block device.\n -#: e2fsck/problem.c:1523 +#: e2fsck/problem.c:1535 msgid "@i %i (%Q) is an @I @b @v.\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) is duplicate '.' entry.\n -#: e2fsck/problem.c:1528 +#: e2fsck/problem.c:1540 msgid "@E is duplicate '.' @e.\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) is duplicate '..' entry.\n -#: e2fsck/problem.c:1533 +#: e2fsck/problem.c:1545 msgid "@E is duplicate '..' @e.\n" msgstr "" -#: e2fsck/problem.c:1539 e2fsck/problem.c:1898 +#: e2fsck/problem.c:1551 e2fsck/problem.c:1910 #, no-c-format msgid "Internal error: couldn't find dir_info for %i.\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) has rec_len of %Dr, should be %N.\n -#: e2fsck/problem.c:1544 +#: e2fsck/problem.c:1556 msgid "@E has rec_len of %Dr, @s %N.\n" msgstr "" #. @-expanded: error allocating icount structure: %m\n -#: e2fsck/problem.c:1550 +#: e2fsck/problem.c:1562 #, no-c-format msgid "@A icount structure: %m\n" msgstr "" #. @-expanded: Error iterating over directory blocks: %m\n -#: e2fsck/problem.c:1556 +#: e2fsck/problem.c:1568 #, no-c-format msgid "Error iterating over @d @bs: %m\n" msgstr "" #. @-expanded: Error reading directory block %b (inode %i): %m\n -#: e2fsck/problem.c:1561 +#: e2fsck/problem.c:1573 msgid "Error reading @d @b %b (@i %i): %m\n" msgstr "" #. @-expanded: Error writing directory block %b (inode %i): %m\n -#: e2fsck/problem.c:1566 +#: e2fsck/problem.c:1578 msgid "Error writing @d @b %b (@i %i): %m\n" msgstr "" #. @-expanded: error allocating new directory block for inode %i (%s): %m\n -#: e2fsck/problem.c:1572 +#: e2fsck/problem.c:1584 #, no-c-format msgid "@A new @d @b for @i %i (%s): %m\n" msgstr "" #. @-expanded: Error deallocating inode %i: %m\n -#: e2fsck/problem.c:1578 +#: e2fsck/problem.c:1590 #, no-c-format msgid "Error deallocating @i %i: %m\n" msgstr "" #. @-expanded: directory entry for '.' in %p (%i) is big.\n -#: e2fsck/problem.c:1584 +#: e2fsck/problem.c:1596 #, no-c-format msgid "@d @e for '.' in %p (%i) is big.\n" msgstr "" #. @-expanded: inode %i (%Q) is an illegal FIFO.\n -#: e2fsck/problem.c:1589 +#: e2fsck/problem.c:1601 msgid "@i %i (%Q) is an @I FIFO.\n" msgstr "" #. @-expanded: inode %i (%Q) is an illegal socket.\n -#: e2fsck/problem.c:1594 +#: e2fsck/problem.c:1606 msgid "@i %i (%Q) is an @I socket.\n" msgstr "" #. @-expanded: Setting filetype for entry '%Dn' in %p (%i) to %N.\n -#: e2fsck/problem.c:1599 +#: e2fsck/problem.c:1611 msgid "Setting filetype for @E to %N.\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) has an incorrect filetype (was %Dt, should be %N).\n -#: e2fsck/problem.c:1604 +#: e2fsck/problem.c:1616 msgid "@E has an incorrect filetype (was %Dt, @s %N).\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) has filetype set.\n -#: e2fsck/problem.c:1609 +#: e2fsck/problem.c:1621 msgid "@E has filetype set.\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) has a zero-length name.\n -#: e2fsck/problem.c:1614 +#: e2fsck/problem.c:1626 msgid "@E has a @z name.\n" msgstr "" #. @-expanded: Symlink %Q (inode #%i) is invalid.\n -#: e2fsck/problem.c:1619 +#: e2fsck/problem.c:1631 msgid "Symlink %Q (@i #%i) is @n.\n" msgstr "" #. @-expanded: extended attribute block for inode %i (%Q) is invalid (%If).\n -#: e2fsck/problem.c:1624 +#: e2fsck/problem.c:1636 msgid "@a @b @F @n (%If).\n" msgstr "" #. @-expanded: filesystem contains large files, but lacks LARGE_FILE flag in superblock.\n -#: e2fsck/problem.c:1629 +#: e2fsck/problem.c:1641 msgid "@f contains large files, but lacks LARGE_FILE flag in @S.\n" msgstr "" #. @-expanded: problem in HTREE directory inode %d: %B not referenced\n -#: e2fsck/problem.c:1634 +#: e2fsck/problem.c:1646 msgid "@p @h %d: %B not referenced\n" msgstr "" #. @-expanded: problem in HTREE directory inode %d: %B referenced twice\n -#: e2fsck/problem.c:1639 +#: e2fsck/problem.c:1651 msgid "@p @h %d: %B referenced twice\n" msgstr "" #. @-expanded: problem in HTREE directory inode %d: %B has bad min hash\n -#: e2fsck/problem.c:1644 +#: e2fsck/problem.c:1656 msgid "@p @h %d: %B has bad min hash\n" msgstr "" #. @-expanded: problem in HTREE directory inode %d: %B has bad max hash\n -#: e2fsck/problem.c:1649 +#: e2fsck/problem.c:1661 msgid "@p @h %d: %B has bad max hash\n" msgstr "" #. @-expanded: invalid HTREE directory inode %d (%q). -#: e2fsck/problem.c:1654 +#: e2fsck/problem.c:1666 msgid "@n @h %d (%q). " msgstr "" #. @-expanded: problem in HTREE directory inode %d (%q): bad block number %b.\n -#: e2fsck/problem.c:1658 +#: e2fsck/problem.c:1670 msgid "@p @h %d (%q): bad @b number %b.\n" msgstr "" #. @-expanded: problem in HTREE directory inode %d: root node is invalid\n -#: e2fsck/problem.c:1669 +#: e2fsck/problem.c:1681 #, no-c-format msgid "@p @h %d: root node is @n\n" msgstr "" #. @-expanded: problem in HTREE directory inode %d: %B has invalid limit (%N)\n -#: e2fsck/problem.c:1674 +#: e2fsck/problem.c:1686 msgid "@p @h %d: %B has @n limit (%N)\n" msgstr "" #. @-expanded: problem in HTREE directory inode %d: %B has invalid count (%N)\n -#: e2fsck/problem.c:1679 +#: e2fsck/problem.c:1691 msgid "@p @h %d: %B has @n count (%N)\n" msgstr "" #. @-expanded: problem in HTREE directory inode %d: %B has an unordered hash table\n -#: e2fsck/problem.c:1684 +#: e2fsck/problem.c:1696 msgid "@p @h %d: %B has an unordered hash table\n" msgstr "" #. @-expanded: problem in HTREE directory inode %d: %B has invalid depth (%N)\n -#: e2fsck/problem.c:1689 +#: e2fsck/problem.c:1701 msgid "@p @h %d: %B has @n depth (%N)\n" msgstr "" #. @-expanded: Duplicate entry '%Dn' in %p (%i) found. -#: e2fsck/problem.c:1694 +#: e2fsck/problem.c:1706 msgid "Duplicate @E found. " msgstr "" #. @-expanded: entry '%Dn' in %p (%i) has a non-unique filename.\n #. @-expanded: Rename to %s -#: e2fsck/problem.c:1699 +#: e2fsck/problem.c:1711 #, no-c-format msgid "" "@E has a non-unique filename.\n" @@ -2369,7 +2369,7 @@ #. @-expanded: Duplicate entry '%Dn' found.\n #. @-expanded: \tMarking %p (%i) to be rebuilt.\n #. @-expanded: \n -#: e2fsck/problem.c:1704 +#: e2fsck/problem.c:1716 msgid "" "Duplicate @e '%Dn' found.\n" "\tMarking %p (%i) to be rebuilt.\n" @@ -2377,155 +2377,155 @@ msgstr "" #. @-expanded: i_blocks_hi for inode %i (%Q) is %N, should be zero.\n -#: e2fsck/problem.c:1709 +#: e2fsck/problem.c:1721 msgid "i_blocks_hi @F %N, @s zero.\n" msgstr "" #. @-expanded: Unexpected block in HTREE directory inode %d (%q).\n -#: e2fsck/problem.c:1714 +#: e2fsck/problem.c:1726 msgid "Unexpected @b in @h %d (%q).\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) references inode %Di in group %g where _INODE_UNINIT is set.\n -#: e2fsck/problem.c:1719 +#: e2fsck/problem.c:1731 msgid "@E references @i %Di in @g %g where _INODE_UNINIT is set.\n" msgstr "" #. @-expanded: entry '%Dn' in %p (%i) references inode %Di found in group %g's unused inodes area.\n -#: e2fsck/problem.c:1724 +#: e2fsck/problem.c:1736 msgid "@E references @i %Di found in @g %g's unused inodes area.\n" msgstr "" #. @-expanded: i_file_acl_hi for inode %i (%Q) is %N, should be zero.\n -#: e2fsck/problem.c:1729 +#: e2fsck/problem.c:1741 msgid "i_file_acl_hi @F %N, @s zero.\n" msgstr "" #. @-expanded: problem in HTREE directory inode %d: root node fails checksum.\n -#: e2fsck/problem.c:1735 +#: e2fsck/problem.c:1747 #, no-c-format msgid "@p @h %d: root node fails checksum.\n" msgstr "" #. @-expanded: problem in HTREE directory inode %d: internal node fails checksum.\n -#: e2fsck/problem.c:1741 +#: e2fsck/problem.c:1753 #, no-c-format msgid "@p @h %d: internal node fails checksum.\n" msgstr "" #. @-expanded: directory inode %i, %B, offset %N: directory has no checksum.\n -#: e2fsck/problem.c:1746 +#: e2fsck/problem.c:1758 msgid "@d @i %i, %B, offset %N: @d has no checksum.\n" msgstr "" #. @-expanded: directory inode %i, %B: directory passes checks but fails checksum.\n -#: e2fsck/problem.c:1751 +#: e2fsck/problem.c:1763 msgid "@d @i %i, %B: @d passes checks but fails checksum.\n" msgstr "" #. @-expanded: Inline directory inode %i size (%N) must be a multiple of 4.\n -#: e2fsck/problem.c:1756 +#: e2fsck/problem.c:1768 msgid "Inline @d @i %i size (%N) must be a multiple of 4.\n" msgstr "" #. @-expanded: Fixing size of inline directory inode %i failed.\n -#: e2fsck/problem.c:1762 +#: e2fsck/problem.c:1774 #, no-c-format msgid "Fixing size of inline @d @i %i failed.\n" msgstr "" #. @-expanded: Encrypted entry '%Dn' in %p (%i) is too short.\n -#: e2fsck/problem.c:1767 +#: e2fsck/problem.c:1779 msgid "Encrypted @E is too short.\n" msgstr "" #. @-expanded: Pass 3: Checking directory connectivity\n -#: e2fsck/problem.c:1774 +#: e2fsck/problem.c:1786 msgid "Pass 3: Checking @d connectivity\n" msgstr "" #. @-expanded: root inode not allocated. -#: e2fsck/problem.c:1779 +#: e2fsck/problem.c:1791 msgid "@r not allocated. " msgstr "" #. @-expanded: No room in lost+found directory. -#: e2fsck/problem.c:1784 +#: e2fsck/problem.c:1796 msgid "No room in @l @d. " msgstr "" #. @-expanded: Unconnected directory inode %i (%p)\n -#: e2fsck/problem.c:1790 +#: e2fsck/problem.c:1802 #, no-c-format msgid "Unconnected @d @i %i (%p)\n" msgstr "" #. @-expanded: /lost+found not found. -#: e2fsck/problem.c:1795 +#: e2fsck/problem.c:1807 msgid "/@l not found. " msgstr "" #. @-expanded: '..' in %Q (%i) is %P (%j), should be %q (%d).\n -#: e2fsck/problem.c:1800 +#: e2fsck/problem.c:1812 msgid "'..' in %Q (%i) is %P (%j), @s %q (%d).\n" msgstr "" #. @-expanded: Bad or non-existent /lost+found. Cannot reconnect.\n -#: e2fsck/problem.c:1806 +#: e2fsck/problem.c:1818 #, no-c-format msgid "Bad or non-existent /@l. Cannot reconnect.\n" msgstr "" #. @-expanded: Could not expand /lost+found: %m\n -#: e2fsck/problem.c:1812 +#: e2fsck/problem.c:1824 #, no-c-format msgid "Could not expand /@l: %m\n" msgstr "" -#: e2fsck/problem.c:1818 +#: e2fsck/problem.c:1830 #, no-c-format msgid "Could not reconnect %i: %m\n" msgstr "" #. @-expanded: Error while trying to find /lost+found: %m\n -#: e2fsck/problem.c:1824 +#: e2fsck/problem.c:1836 #, no-c-format msgid "Error while trying to find /@l: %m\n" msgstr "" #. @-expanded: ext2fs_new_block: %m while trying to create /lost+found directory\n -#: e2fsck/problem.c:1830 +#: e2fsck/problem.c:1842 #, no-c-format msgid "ext2fs_new_@b: %m while trying to create /@l @d\n" msgstr "" #. @-expanded: ext2fs_new_inode: %m while trying to create /lost+found directory\n -#: e2fsck/problem.c:1836 +#: e2fsck/problem.c:1848 #, no-c-format msgid "ext2fs_new_@i: %m while trying to create /@l @d\n" msgstr "" #. @-expanded: ext2fs_new_dir_block: %m while creating new directory block\n -#: e2fsck/problem.c:1842 +#: e2fsck/problem.c:1854 #, no-c-format msgid "ext2fs_new_dir_@b: %m while creating new @d @b\n" msgstr "" #. @-expanded: ext2fs_write_dir_block: %m while writing the directory block for /lost+found\n -#: e2fsck/problem.c:1848 +#: e2fsck/problem.c:1860 #, no-c-format msgid "ext2fs_write_dir_@b: %m while writing the @d @b for /@l\n" msgstr "" #. @-expanded: Error while adjusting inode count on inode %i\n -#: e2fsck/problem.c:1854 +#: e2fsck/problem.c:1866 #, no-c-format msgid "Error while adjusting @i count on @i %i\n" msgstr "" #. @-expanded: Couldn't fix parent of inode %i: %m\n #. @-expanded: \n -#: e2fsck/problem.c:1860 +#: e2fsck/problem.c:1872 #, no-c-format msgid "" "Couldn't fix parent of @i %i: %m\n" @@ -2534,7 +2534,7 @@ #. @-expanded: Couldn't fix parent of inode %i: Couldn't find parent directory entry\n #. @-expanded: \n -#: e2fsck/problem.c:1866 +#: e2fsck/problem.c:1878 #, no-c-format msgid "" "Couldn't fix parent of @i %i: Couldn't find parent @d @e\n" @@ -2542,41 +2542,41 @@ msgstr "" #. @-expanded: Error creating root directory (%s): %m\n -#: e2fsck/problem.c:1877 +#: e2fsck/problem.c:1889 #, no-c-format msgid "Error creating root @d (%s): %m\n" msgstr "" #. @-expanded: Error creating /lost+found directory (%s): %m\n -#: e2fsck/problem.c:1883 +#: e2fsck/problem.c:1895 #, no-c-format msgid "Error creating /@l @d (%s): %m\n" msgstr "" #. @-expanded: root inode is not a directory; aborting.\n -#: e2fsck/problem.c:1888 +#: e2fsck/problem.c:1900 msgid "@r is not a @d; aborting.\n" msgstr "" #. @-expanded: Cannot proceed without a root inode.\n -#: e2fsck/problem.c:1893 +#: e2fsck/problem.c:1905 msgid "Cannot proceed without a @r.\n" msgstr "" #. @-expanded: /lost+found is not a directory (ino=%i)\n -#: e2fsck/problem.c:1904 +#: e2fsck/problem.c:1916 #, no-c-format msgid "/@l is not a @d (ino=%i)\n" msgstr "" #. @-expanded: /lost+found has inline data\n -#: e2fsck/problem.c:1909 +#: e2fsck/problem.c:1921 msgid "/@l has inline data\n" msgstr "" #. @-expanded: Cannot allocate space for /lost+found.\n #. @-expanded: Place lost files in root directory instead -#: e2fsck/problem.c:1914 +#: e2fsck/problem.c:1926 msgid "" "Cannot allocate space for /@l.\n" "Place lost files in root directory instead" @@ -2585,7 +2585,7 @@ #. @-expanded: Insufficient space to recover lost files!\n #. @-expanded: Move data off the filesystem and re-run e2fsck.\n #. @-expanded: \n -#: e2fsck/problem.c:1919 +#: e2fsck/problem.c:1931 msgid "" "Insufficient space to recover lost files!\n" "Move data off the @f and re-run e2fsck.\n" @@ -2593,52 +2593,52 @@ msgstr "" #. @-expanded: /lost+found is encrypted\n -#: e2fsck/problem.c:1924 +#: e2fsck/problem.c:1936 msgid "/@l is encrypted\n" msgstr "" -#: e2fsck/problem.c:1931 +#: e2fsck/problem.c:1943 msgid "Pass 3A: Optimizing directories\n" msgstr "Проход 3A: оптимизация каталогов\n" -#: e2fsck/problem.c:1937 +#: e2fsck/problem.c:1949 #, no-c-format msgid "Failed to create dirs_to_hash iterator: %m\n" msgstr "" -#: e2fsck/problem.c:1942 +#: e2fsck/problem.c:1954 msgid "Failed to optimize directory %q (%d): %m\n" msgstr "" -#: e2fsck/problem.c:1947 +#: e2fsck/problem.c:1959 msgid "Optimizing directories: " msgstr "Оптимизация каталогов: " -#: e2fsck/problem.c:1964 +#: e2fsck/problem.c:1976 msgid "Pass 4: Checking reference counts\n" msgstr "" #. @-expanded: unattached zero-length inode %i. -#: e2fsck/problem.c:1970 +#: e2fsck/problem.c:1982 #, no-c-format msgid "@u @z @i %i. " msgstr "" #. @-expanded: unattached inode %i\n -#: e2fsck/problem.c:1976 +#: e2fsck/problem.c:1988 #, no-c-format msgid "@u @i %i\n" msgstr "" #. @-expanded: inode %i ref count is %Il, should be %N. -#: e2fsck/problem.c:1981 +#: e2fsck/problem.c:1993 msgid "@i %i ref count is %Il, @s %N. " msgstr "" #. @-expanded: WARNING: PROGRAMMING BUG IN E2FSCK!\n #. @-expanded: \tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n #. @-expanded: inode_link_info[%i] is %N, inode.i_links_count is %Il. They should be the same!\n -#: e2fsck/problem.c:1985 +#: e2fsck/problem.c:1997 msgid "" "WARNING: PROGRAMMING BUG IN E2FSCK!\n" "\tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n" @@ -2646,143 +2646,143 @@ msgstr "" #. @-expanded: extended attribute inode %i ref count is %N, should be %n. -#: e2fsck/problem.c:1992 +#: e2fsck/problem.c:2004 msgid "@a @i %i ref count is %N, @s %n. " msgstr "" #. @-expanded: Pass 5: Checking group summary information\n -#: e2fsck/problem.c:2004 +#: e2fsck/problem.c:2021 msgid "Pass 5: Checking @g summary information\n" msgstr "" #. @-expanded: Padding at end of inode bitmap is not set. -#: e2fsck/problem.c:2009 +#: e2fsck/problem.c:2026 msgid "Padding at end of @i @B is not set. " msgstr "" #. @-expanded: Padding at end of block bitmap is not set. -#: e2fsck/problem.c:2014 +#: e2fsck/problem.c:2031 msgid "Padding at end of @b @B is not set. " msgstr "" #. @-expanded: block bitmap differences: -#: e2fsck/problem.c:2019 +#: e2fsck/problem.c:2036 msgid "@b @B differences: " msgstr "" #. @-expanded: inode bitmap differences: -#: e2fsck/problem.c:2041 +#: e2fsck/problem.c:2058 msgid "@i @B differences: " msgstr "" #. @-expanded: Free inodes count wrong for group #%g (%i, counted=%j).\n -#: e2fsck/problem.c:2063 +#: e2fsck/problem.c:2080 msgid "Free @is count wrong for @g #%g (%i, counted=%j).\n" msgstr "" #. @-expanded: Directories count wrong for group #%g (%i, counted=%j).\n -#: e2fsck/problem.c:2068 +#: e2fsck/problem.c:2085 msgid "Directories count wrong for @g #%g (%i, counted=%j).\n" msgstr "" #. @-expanded: Free inodes count wrong (%i, counted=%j).\n -#: e2fsck/problem.c:2073 +#: e2fsck/problem.c:2090 msgid "Free @is count wrong (%i, counted=%j).\n" msgstr "" #. @-expanded: Free blocks count wrong for group #%g (%b, counted=%c).\n -#: e2fsck/problem.c:2078 +#: e2fsck/problem.c:2095 msgid "Free @bs count wrong for @g #%g (%b, counted=%c).\n" msgstr "" #. @-expanded: Free blocks count wrong (%b, counted=%c).\n -#: e2fsck/problem.c:2083 +#: e2fsck/problem.c:2100 msgid "Free @bs count wrong (%b, counted=%c).\n" msgstr "" #. @-expanded: PROGRAMMING ERROR: filesystem (#%N) bitmap endpoints (%b, %c) don't match calculated bitmap #. @-expanded: endpoints (%i, %j)\n -#: e2fsck/problem.c:2088 +#: e2fsck/problem.c:2105 msgid "" "PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B " "endpoints (%i, %j)\n" msgstr "" -#: e2fsck/problem.c:2094 +#: e2fsck/problem.c:2111 msgid "Internal error: fudging end of bitmap (%N)\n" msgstr "" #. @-expanded: Error copying in replacement inode bitmap: %m\n -#: e2fsck/problem.c:2100 +#: e2fsck/problem.c:2117 #, no-c-format msgid "Error copying in replacement @i @B: %m\n" msgstr "" #. @-expanded: Error copying in replacement block bitmap: %m\n -#: e2fsck/problem.c:2106 +#: e2fsck/problem.c:2123 #, no-c-format msgid "Error copying in replacement @b @B: %m\n" msgstr "" #. @-expanded: group %g block(s) in use but group is marked BLOCK_UNINIT\n -#: e2fsck/problem.c:2136 +#: e2fsck/problem.c:2153 #, no-c-format msgid "@g %g @b(s) in use but @g is marked BLOCK_UNINIT\n" msgstr "" #. @-expanded: group %g inode(s) in use but group is marked INODE_UNINIT\n -#: e2fsck/problem.c:2142 +#: e2fsck/problem.c:2159 #, no-c-format msgid "@g %g @i(s) in use but @g is marked INODE_UNINIT\n" msgstr "" #. @-expanded: group %g inode bitmap does not match checksum.\n -#: e2fsck/problem.c:2148 +#: e2fsck/problem.c:2165 #, no-c-format msgid "@g %g @i @B does not match checksum.\n" msgstr "" #. @-expanded: group %g block bitmap does not match checksum.\n -#: e2fsck/problem.c:2154 +#: e2fsck/problem.c:2171 #, no-c-format msgid "@g %g @b @B does not match checksum.\n" msgstr "" #. @-expanded: Recreate journal -#: e2fsck/problem.c:2161 +#: e2fsck/problem.c:2178 msgid "Recreate @j" msgstr "" -#: e2fsck/problem.c:2166 +#: e2fsck/problem.c:2183 msgid "Update quota info for quota type %N" msgstr "" #. @-expanded: Error setting block group checksum info: %m\n -#: e2fsck/problem.c:2172 +#: e2fsck/problem.c:2189 #, no-c-format msgid "Error setting @b @g checksum info: %m\n" msgstr "" -#: e2fsck/problem.c:2178 +#: e2fsck/problem.c:2195 #, no-c-format msgid "Error writing file system info: %m\n" msgstr "" -#: e2fsck/problem.c:2184 +#: e2fsck/problem.c:2201 #, no-c-format msgid "Error flushing writes to storage device: %m\n" msgstr "" -#: e2fsck/problem.c:2189 +#: e2fsck/problem.c:2206 msgid "Error writing quota info for quota type %N: %m\n" msgstr "" -#: e2fsck/problem.c:2352 +#: e2fsck/problem.c:2369 #, c-format msgid "Unhandled error code (0x%x)!\n" msgstr "" -#: e2fsck/problem.c:2482 e2fsck/problem.c:2486 +#: e2fsck/problem.c:2499 e2fsck/problem.c:2503 msgid "IGNORED" msgstr "" @@ -2991,7 +2991,7 @@ msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:238 misc/badblocks.c:1002 misc/tune2fs.c:2986 misc/util.c:129 +#: e2fsck/unix.c:238 misc/badblocks.c:1002 misc/tune2fs.c:2997 misc/util.c:129 #: resize/main.c:354 #, c-format msgid "while determining whether %s is mounted." @@ -3150,7 +3150,7 @@ msgstr "Опция -t не поддерживается в этой версии e2fsck.\n" #: e2fsck/unix.c:934 e2fsck/unix.c:1012 misc/e2initrd_helper.c:330 -#: misc/tune2fs.c:1695 misc/tune2fs.c:1990 misc/tune2fs.c:2008 +#: misc/tune2fs.c:1707 misc/tune2fs.c:2002 misc/tune2fs.c:2020 #, c-format msgid "Unable to resolve '%s'" msgstr "" @@ -3207,7 +3207,7 @@ msgid "while checking MMP block" msgstr "" -#: misc/tune2fs.c:2900 +#: misc/tune2fs.c:2912 msgid "" "If you are sure the filesystem is not in use on any node, run:\n" "'tune2fs -f -E clear_mmp {device}'\n" @@ -3218,8 +3218,8 @@ msgstr "" #: e2fsck/unix.c:1302 e2fsck/unix.c:1354 misc/e2undo.c:236 misc/e2undo.c:281 -#: misc/mke2fs.c:2696 misc/mke2fs.c:2747 misc/tune2fs.c:2713 -#: misc/tune2fs.c:2758 resize/main.c:188 resize/main.c:233 +#: misc/mke2fs.c:2694 misc/mke2fs.c:2745 misc/tune2fs.c:2725 +#: misc/tune2fs.c:2770 resize/main.c:188 resize/main.c:233 #, c-format msgid "" "Overwriting existing filesystem; this can be undone using the command:\n" @@ -3227,13 +3227,13 @@ "\n" msgstr "" -#: e2fsck/unix.c:1343 misc/e2undo.c:270 misc/mke2fs.c:2736 misc/tune2fs.c:2747 +#: e2fsck/unix.c:1343 misc/e2undo.c:270 misc/mke2fs.c:2734 misc/tune2fs.c:2759 #: resize/main.c:222 #, c-format msgid "while trying to delete %s" msgstr "" -#: e2fsck/unix.c:1369 misc/mke2fs.c:2762 resize/main.c:243 +#: e2fsck/unix.c:1369 misc/mke2fs.c:2760 resize/main.c:243 msgid "while trying to setup undo file\n" msgstr "" @@ -3317,100 +3317,100 @@ msgid "Get a newer version of e2fsck!" msgstr "" -#: e2fsck/unix.c:1749 +#: e2fsck/unix.c:1748 #, c-format msgid "while checking journal for %s" msgstr "" -#: e2fsck/unix.c:1752 +#: e2fsck/unix.c:1751 msgid "Cannot proceed with file system check" msgstr "" -#: e2fsck/unix.c:1763 +#: e2fsck/unix.c:1762 msgid "" "Warning: skipping journal recovery because doing a read-only filesystem " "check.\n" msgstr "" -#: e2fsck/unix.c:1775 +#: e2fsck/unix.c:1774 #, c-format msgid "unable to set superblock flags on %s\n" msgstr "" -#: e2fsck/unix.c:1781 +#: e2fsck/unix.c:1780 #, c-format msgid "Journal checksum error found in %s\n" msgstr "" -#: e2fsck/unix.c:1785 +#: e2fsck/unix.c:1784 #, c-format msgid "Journal corrupted in %s\n" msgstr "" -#: e2fsck/unix.c:1789 +#: e2fsck/unix.c:1788 #, c-format msgid "while recovering journal of %s" msgstr "" -#: e2fsck/unix.c:1811 +#: e2fsck/unix.c:1810 #, c-format msgid "%s has unsupported feature(s):" msgstr "" -#: e2fsck/unix.c:1876 +#: e2fsck/unix.c:1875 #, c-format msgid "%s: %s while reading bad blocks inode\n" msgstr "" -#: e2fsck/unix.c:1879 +#: e2fsck/unix.c:1878 msgid "This doesn't bode well, but we'll try to go on...\n" msgstr "" -#: e2fsck/unix.c:1919 +#: e2fsck/unix.c:1918 #, c-format msgid "Creating journal (%d blocks): " msgstr "Создание журнала (%d блоков): " -#: e2fsck/unix.c:1929 +#: e2fsck/unix.c:1928 msgid " Done.\n" msgstr " Готово.\n" -#: e2fsck/unix.c:1931 +#: e2fsck/unix.c:1930 msgid "" "\n" "*** journal has been regenerated ***\n" msgstr "" -#: e2fsck/unix.c:1937 +#: e2fsck/unix.c:1936 msgid "aborted" msgstr "" -#: e2fsck/unix.c:1939 +#: e2fsck/unix.c:1938 #, c-format msgid "%s: e2fsck canceled.\n" msgstr "" -#: e2fsck/unix.c:1966 +#: e2fsck/unix.c:1965 msgid "Restarting e2fsck from the beginning...\n" msgstr "Перезапуск e2fsck с начала…\n" -#: e2fsck/unix.c:1970 +#: e2fsck/unix.c:1969 msgid "while resetting context" msgstr "" -#: e2fsck/unix.c:2029 +#: e2fsck/unix.c:2028 #, c-format msgid "" "\n" "%s: ***** FILE SYSTEM ERRORS CORRECTED *****\n" msgstr "" -#: e2fsck/unix.c:2031 +#: e2fsck/unix.c:2030 #, c-format msgid "%s: File system was modified.\n" msgstr "" -#: e2fsck/unix.c:2035 e2fsck/util.c:71 +#: e2fsck/unix.c:2034 e2fsck/util.c:71 #, c-format msgid "" "\n" @@ -3419,12 +3419,12 @@ "\n" "%s: ***** ФАЙЛОВАЯ СИСТЕМА БЫЛА ИЗМЕНЕНА *****\n" -#: e2fsck/unix.c:2040 +#: e2fsck/unix.c:2039 #, c-format msgid "%s: ***** REBOOT SYSTEM *****\n" msgstr "" -#: e2fsck/unix.c:2050 e2fsck/util.c:77 +#: e2fsck/unix.c:2049 e2fsck/util.c:77 #, c-format msgid "" "\n" @@ -3436,96 +3436,96 @@ "**********\n" "\n" -#: e2fsck/util.c:196 misc/util.c:93 +#: e2fsck/util.c:195 misc/util.c:93 msgid "yY" msgstr "" -#: e2fsck/util.c:197 misc/util.c:112 +#: e2fsck/util.c:196 misc/util.c:112 msgid "nN" msgstr "" -#: e2fsck/util.c:198 +#: e2fsck/util.c:197 msgid "aA" msgstr "" -#: e2fsck/util.c:202 +#: e2fsck/util.c:201 msgid " ('a' enables 'yes' to all) " msgstr "" -#: e2fsck/util.c:219 +#: e2fsck/util.c:218 msgid "" msgstr "" -#: e2fsck/util.c:221 +#: e2fsck/util.c:220 msgid "" msgstr "" -#: e2fsck/util.c:223 +#: e2fsck/util.c:222 msgid " (y/n)" msgstr "" -#: e2fsck/util.c:246 +#: e2fsck/util.c:245 msgid "cancelled!\n" msgstr "" -#: e2fsck/util.c:279 +#: e2fsck/util.c:278 msgid "yes to all\n" msgstr "" -#: e2fsck/util.c:281 +#: e2fsck/util.c:280 msgid "yes\n" msgstr "" -#: e2fsck/util.c:283 +#: e2fsck/util.c:282 msgid "no\n" msgstr "" -#: e2fsck/util.c:293 +#: e2fsck/util.c:292 #, c-format msgid "" "%s? no\n" "\n" msgstr "" -#: e2fsck/util.c:297 +#: e2fsck/util.c:296 #, c-format msgid "" "%s? yes\n" "\n" msgstr "" -#: e2fsck/util.c:301 +#: e2fsck/util.c:300 msgid "yes" msgstr "" -#: e2fsck/util.c:301 +#: e2fsck/util.c:300 msgid "no" msgstr "" -#: e2fsck/util.c:317 +#: e2fsck/util.c:316 #, c-format msgid "e2fsck_read_bitmaps: illegal bitmap block(s) for %s" msgstr "" -#: e2fsck/util.c:322 +#: e2fsck/util.c:321 msgid "reading inode and block bitmaps" msgstr "" -#: e2fsck/util.c:334 +#: e2fsck/util.c:333 #, c-format msgid "while retrying to read bitmaps for %s" msgstr "" -#: e2fsck/util.c:346 +#: e2fsck/util.c:345 msgid "writing block and inode bitmaps" msgstr "" -#: e2fsck/util.c:351 +#: e2fsck/util.c:350 #, c-format msgid "while rewriting block and inode bitmaps for %s" msgstr "" -#: e2fsck/util.c:363 +#: e2fsck/util.c:362 #, c-format msgid "" "\n" @@ -3544,27 +3544,27 @@ msgid "Memory used: %lu, " msgstr "" -#: e2fsck/util.c:455 +#: e2fsck/util.c:454 #, c-format msgid "time: %5.2f/%5.2f/%5.2f\n" msgstr "" -#: e2fsck/util.c:460 +#: e2fsck/util.c:459 #, c-format msgid "elapsed time: %6.3f\n" msgstr "" -#: e2fsck/util.c:495 e2fsck/util.c:509 +#: e2fsck/util.c:494 e2fsck/util.c:508 #, c-format msgid "while reading inode %lu in %s" msgstr "" -#: e2fsck/util.c:523 e2fsck/util.c:536 +#: e2fsck/util.c:522 e2fsck/util.c:535 #, c-format msgid "while writing inode %lu in %s" msgstr "" -#: e2fsck/util.c:792 +#: e2fsck/util.c:793 msgid "" "UNEXPECTED INCONSISTENCY: the filesystem is being modified while fsck is " "running.\n" @@ -3842,8 +3842,8 @@ msgid "while reading inode %u" msgstr "" -#: misc/create_inode.c:90 misc/create_inode.c:288 misc/create_inode.c:353 -#: misc/create_inode.c:391 +#: misc/create_inode.c:90 misc/create_inode.c:290 misc/create_inode.c:355 +#: misc/create_inode.c:393 msgid "while expanding directory" msgstr "" @@ -3852,73 +3852,73 @@ msgid "while linking \"%s\"" msgstr "" -#: misc/create_inode.c:105 misc/create_inode.c:132 misc/create_inode.c:322 +#: misc/create_inode.c:105 misc/create_inode.c:134 misc/create_inode.c:324 #, c-format msgid "while writing inode %u" msgstr "" -#: misc/create_inode.c:152 misc/create_inode.c:176 +#: misc/create_inode.c:154 misc/create_inode.c:178 #, c-format msgid "while listing attributes of \"%s\"" msgstr "" -#: misc/create_inode.c:163 +#: misc/create_inode.c:165 #, c-format msgid "while opening inode %u" msgstr "" -#: misc/create_inode.c:169 misc/create_inode.c:196 misc/create_inode.c:1043 +#: misc/create_inode.c:171 misc/create_inode.c:198 misc/create_inode.c:1045 #: misc/e2undo.c:182 misc/e2undo.c:479 misc/e2undo.c:485 misc/e2undo.c:491 #: misc/mke2fs.c:359 msgid "while allocating memory" msgstr "" -#: misc/create_inode.c:189 misc/create_inode.c:205 +#: misc/create_inode.c:191 misc/create_inode.c:207 #, c-format msgid "while reading attribute \"%s\" of \"%s\"" msgstr "" -#: misc/create_inode.c:214 +#: misc/create_inode.c:216 #, c-format msgid "while writing attribute \"%s\" to inode %u" msgstr "" -#: misc/create_inode.c:224 +#: misc/create_inode.c:226 #, c-format msgid "while closing inode %u" msgstr "" -#: misc/create_inode.c:275 +#: misc/create_inode.c:277 #, c-format msgid "while allocating inode \"%s\"" msgstr "" -#: misc/create_inode.c:294 +#: misc/create_inode.c:296 #, c-format msgid "while creating inode \"%s\"" msgstr "" -#: misc/create_inode.c:360 +#: misc/create_inode.c:362 #, c-format msgid "while creating symlink \"%s\"" msgstr "" -#: misc/create_inode.c:378 misc/create_inode.c:963 +#: misc/create_inode.c:380 misc/create_inode.c:965 #, c-format msgid "while looking up \"%s\"" msgstr "" -#: misc/create_inode.c:398 +#: misc/create_inode.c:400 #, c-format msgid "while creating directory \"%s\"" msgstr "при создании каталога \"%s\"" -#: misc/create_inode.c:627 +#: misc/create_inode.c:629 #, c-format msgid "while opening \"%s\" to copy" msgstr "" -#: misc/create_inode.c:805 +#: misc/create_inode.c:807 #, c-format msgid "while changing working directory to \"%s\"" msgstr "при смене рабочего каталога на \"%s\"" @@ -3928,64 +3928,64 @@ msgid "while opening directory \"%s\"" msgstr "при открытии каталога \"%s\"" -#: misc/create_inode.c:825 +#: misc/create_inode.c:827 #, c-format msgid "while lstat \"%s\"" msgstr "" -#: misc/create_inode.c:875 +#: misc/create_inode.c:877 #, c-format msgid "while creating special file \"%s\"" msgstr "" -#: misc/create_inode.c:884 +#: misc/create_inode.c:886 msgid "malloc failed" msgstr "" -#: misc/create_inode.c:892 +#: misc/create_inode.c:894 #, c-format msgid "while trying to read link \"%s\"" msgstr "" -#: misc/create_inode.c:899 +#: misc/create_inode.c:901 msgid "symlink increased in size between lstat() and readlink()" msgstr "" -#: misc/create_inode.c:910 +#: misc/create_inode.c:912 #, c-format msgid "while writing symlink\"%s\"" msgstr "" -#: misc/create_inode.c:921 +#: misc/create_inode.c:923 #, c-format msgid "while writing file \"%s\"" msgstr "при записи файла \"%s\"" -#: misc/create_inode.c:934 +#: misc/create_inode.c:936 #, c-format msgid "while making dir \"%s\"" msgstr "при создании каталога \"%s\"" -#: misc/create_inode.c:952 +#: misc/create_inode.c:954 msgid "while changing directory" msgstr "" -#: misc/create_inode.c:958 +#: misc/create_inode.c:960 #, c-format msgid "ignoring entry \"%s\"" msgstr "" -#: misc/create_inode.c:971 +#: misc/create_inode.c:973 #, c-format msgid "while setting inode for \"%s\"" msgstr "" -#: misc/create_inode.c:978 +#: misc/create_inode.c:980 #, c-format msgid "while setting xattrs for \"%s\"" msgstr "" -#: misc/create_inode.c:1004 +#: misc/create_inode.c:1006 msgid "while saving inode data" msgstr "" @@ -4127,21 +4127,21 @@ msgid "Couldn't find journal superblock magic numbers" msgstr "" -#: misc/dumpe2fs.c:507 misc/mke2fs.c:800 misc/tune2fs.c:2027 +#: misc/dumpe2fs.c:511 misc/mke2fs.c:798 misc/tune2fs.c:2039 msgid "Couldn't allocate memory to parse options!\n" msgstr "" -#: misc/dumpe2fs.c:533 +#: misc/dumpe2fs.c:537 #, c-format msgid "Invalid superblock parameter: %s\n" msgstr "" -#: misc/dumpe2fs.c:548 +#: misc/dumpe2fs.c:552 #, c-format msgid "Invalid blocksize parameter: %s\n" msgstr "" -#: misc/dumpe2fs.c:559 +#: misc/dumpe2fs.c:563 #, c-format msgid "" "\n" @@ -4155,7 +4155,7 @@ "\tblocksize=\n" msgstr "" -#: misc/dumpe2fs.c:649 misc/mke2fs.c:1889 +#: misc/dumpe2fs.c:653 misc/mke2fs.c:1887 #, c-format msgid "\tUsing %s\n" msgstr "" @@ -4167,7 +4167,7 @@ "\n" msgstr "" -#: misc/dumpe2fs.c:694 misc/e2image.c:1629 misc/tune2fs.c:2913 +#: misc/dumpe2fs.c:698 misc/e2image.c:1629 misc/tune2fs.c:2925 #: resize/main.c:416 msgid "Couldn't find valid filesystem superblock.\n" msgstr "" @@ -4455,7 +4455,7 @@ msgid "e2label: not an ext2 filesystem\n" msgstr "e2label: не файловая система ext2\n" -#: misc/e2label.c:97 misc/tune2fs.c:3117 +#: misc/e2label.c:97 misc/tune2fs.c:3128 #, c-format msgid "Warning: label too long, truncating.\n" msgstr "" @@ -4470,7 +4470,7 @@ msgid "e2label: error writing superblock\n" msgstr "e2label: ошибка при записи суперблока\n" -#: misc/e2label.c:117 misc/tune2fs.c:1687 +#: misc/e2label.c:117 misc/tune2fs.c:1699 #, c-format msgid "Usage: e2label device [newlabel]\n" msgstr "Использование: e2label устройство [новая метка]\n" @@ -4675,7 +4675,7 @@ " sb_uuid label\n" msgstr "" -#: misc/findsuper.c:264 +#: misc/findsuper.c:265 #, c-format msgid "" "\n" @@ -4776,57 +4776,57 @@ msgid "%s: too many arguments\n" msgstr "%s: слишком много аргументов\n" -#: misc/fuse2fs.c:3745 +#: misc/fuse2fs.c:3740 msgid "Mounting read-only.\n" msgstr "" -#: misc/fuse2fs.c:3769 +#: misc/fuse2fs.c:3764 #, c-format msgid "%s: Allowing users to allocate all blocks. This is dangerous!\n" msgstr "" -#: misc/fuse2fs.c:3781 misc/fuse2fs.c:3795 +#: misc/fuse2fs.c:3776 misc/fuse2fs.c:3790 #, c-format msgid "%s: %s.\n" msgstr "" -#: misc/fuse2fs.c:3782 misc/fuse2fs.c:3797 misc/tune2fs.c:3013 +#: misc/fuse2fs.c:3777 misc/fuse2fs.c:3792 misc/tune2fs.c:3024 #, c-format msgid "Please run e2fsck -fy %s.\n" msgstr "Выполните e2fsck -fy %s.\n" -#: misc/fuse2fs.c:3804 +#: misc/fuse2fs.c:3799 msgid "" "Journal needs recovery; running `e2fsck -E journal_only' is required.\n" msgstr "" "Требуется восстановление журнала; необходимо выполнить `e2fsck -E " "journal_only'.\n" -#: misc/fuse2fs.c:3812 +#: misc/fuse2fs.c:3807 #, c-format msgid "%s: Writing to the journal is not supported.\n" msgstr "%s: Запись в журнал не поддерживается.\n" -#: misc/fuse2fs.c:3827 +#: misc/fuse2fs.c:3822 msgid "Warning: Mounting unchecked fs, running e2fsck is recommended.\n" msgstr "" "Внимание: монтирование не проверенной файловой системы, рекомендуется " "запустить e2fsck.\n" -#: misc/fuse2fs.c:3831 +#: misc/fuse2fs.c:3826 msgid "" "Warning: Maximal mount count reached, running e2fsck is recommended.\n" msgstr "" -#: misc/fuse2fs.c:3836 +#: misc/fuse2fs.c:3831 msgid "Warning: Check time reached; running e2fsck is recommended.\n" msgstr "" -#: misc/fuse2fs.c:3840 +#: misc/fuse2fs.c:3835 msgid "Orphans detected; running e2fsck is recommended.\n" msgstr "" -#: misc/fuse2fs.c:3844 +#: misc/fuse2fs.c:3839 msgid "Errors detected; running e2fsck is required.\n" msgstr "Обнаружены ошибки; рекомендуется запустить e2fsck.\n" @@ -4916,7 +4916,7 @@ "Could not write %d blocks in inode table starting at %llu: %s\n" msgstr "" -#: misc/mke2fs.c:456 misc/mke2fs.c:2809 misc/mke2fs.c:3214 +#: misc/mke2fs.c:456 misc/mke2fs.c:2807 misc/mke2fs.c:3212 msgid "done \n" msgstr "" @@ -4980,12 +4980,12 @@ msgid "while writing journal superblock" msgstr "" -#: misc/mke2fs.c:665 +#: misc/mke2fs.c:664 #, c-format msgid "Creating filesystem with %llu %dk blocks and %u inodes\n" msgstr "" -#: misc/mke2fs.c:673 +#: misc/mke2fs.c:672 #, c-format msgid "" "warning: %llu blocks unused.\n" @@ -4997,154 +4997,154 @@ msgid "Filesystem label=%s\n" msgstr "Метка файловой системы=%s\n" -#: misc/mke2fs.c:681 +#: misc/mke2fs.c:679 #, c-format msgid "OS type: %s\n" msgstr "" -#: misc/mke2fs.c:683 +#: misc/mke2fs.c:681 #, c-format msgid "Block size=%u (log=%u)\n" msgstr "" -#: misc/mke2fs.c:686 +#: misc/mke2fs.c:684 #, c-format msgid "Cluster size=%u (log=%u)\n" msgstr "" -#: misc/mke2fs.c:690 +#: misc/mke2fs.c:688 #, c-format msgid "Fragment size=%u (log=%u)\n" msgstr "" -#: misc/mke2fs.c:692 +#: misc/mke2fs.c:690 #, c-format msgid "Stride=%u blocks, Stripe width=%u blocks\n" msgstr "" -#: misc/mke2fs.c:694 +#: misc/mke2fs.c:692 #, c-format msgid "%u inodes, %llu blocks\n" msgstr "" -#: misc/mke2fs.c:696 +#: misc/mke2fs.c:694 #, c-format msgid "%llu blocks (%2.2f%%) reserved for the super user\n" msgstr "" -#: misc/mke2fs.c:699 +#: misc/mke2fs.c:697 #, c-format msgid "First data block=%u\n" msgstr "Первый блок данных=%u\n" -#: misc/mke2fs.c:701 +#: misc/mke2fs.c:699 #, c-format msgid "Root directory owner=%u:%u\n" msgstr "" -#: misc/mke2fs.c:703 +#: misc/mke2fs.c:701 #, c-format msgid "Maximum filesystem blocks=%lu\n" msgstr "" -#: misc/mke2fs.c:707 +#: misc/mke2fs.c:705 #, c-format msgid "%u block groups\n" msgstr "" -#: misc/mke2fs.c:709 +#: misc/mke2fs.c:707 #, c-format msgid "%u block group\n" msgstr "" -#: misc/mke2fs.c:711 +#: misc/mke2fs.c:709 #, c-format msgid "%u blocks per group, %u clusters per group\n" msgstr "" -#: misc/mke2fs.c:714 +#: misc/mke2fs.c:712 #, c-format msgid "%u blocks per group, %u fragments per group\n" msgstr "" -#: misc/mke2fs.c:716 +#: misc/mke2fs.c:714 #, c-format msgid "%u inodes per group\n" msgstr "%u inod'ов в группе\n" -#: misc/mke2fs.c:725 +#: misc/mke2fs.c:723 #, c-format msgid "Filesystem UUID: %s\n" msgstr "" -#: misc/mke2fs.c:726 +#: misc/mke2fs.c:724 msgid "Superblock backups stored on blocks: " msgstr "" -#: misc/mke2fs.c:822 +#: misc/mke2fs.c:820 #, c-format msgid "%s requires '-O 64bit'\n" msgstr "" -#: misc/mke2fs.c:828 +#: misc/mke2fs.c:826 #, c-format msgid "'%s' must be before 'resize=%u'\n" msgstr "" -#: misc/mke2fs.c:841 +#: misc/mke2fs.c:839 #, c-format msgid "Invalid desc_size: '%s'\n" msgstr "" -#: misc/mke2fs.c:855 +#: misc/mke2fs.c:853 #, c-format msgid "Invalid hash seed: %s\n" msgstr "" -#: misc/mke2fs.c:867 +#: misc/mke2fs.c:865 #, c-format msgid "Invalid offset: %s\n" msgstr "" -#: misc/mke2fs.c:881 misc/tune2fs.c:2055 +#: misc/mke2fs.c:879 misc/tune2fs.c:2067 #, c-format msgid "Invalid mmp_update_interval: %s\n" msgstr "" -#: misc/mke2fs.c:898 +#: misc/mke2fs.c:896 #, c-format msgid "Invalid # of backup superblocks: %s\n" msgstr "" -#: misc/mke2fs.c:920 +#: misc/mke2fs.c:918 #, c-format msgid "Invalid stride parameter: %s\n" msgstr "" -#: misc/mke2fs.c:935 +#: misc/mke2fs.c:933 #, c-format msgid "Invalid stripe-width parameter: %s\n" msgstr "" -#: misc/mke2fs.c:958 +#: misc/mke2fs.c:956 #, c-format msgid "Invalid resize parameter: %s\n" msgstr "" -#: misc/mke2fs.c:965 +#: misc/mke2fs.c:963 msgid "The resize maximum must be greater than the filesystem size.\n" msgstr "" -#: misc/mke2fs.c:989 +#: misc/mke2fs.c:987 msgid "On-line resizing not supported with revision 0 filesystems\n" msgstr "" -#: misc/mke2fs.c:1015 misc/mke2fs.c:1024 +#: misc/mke2fs.c:1013 misc/mke2fs.c:1022 #, c-format msgid "Invalid root_owner: '%s'\n" msgstr "" -#: misc/mke2fs.c:1056 +#: misc/mke2fs.c:1065 #, c-format msgid "" "\n" @@ -5171,7 +5171,7 @@ "\n" msgstr "" -#: misc/mke2fs.c:1114 +#: misc/mke2fs.c:1112 #, c-format msgid "" "\n" @@ -5179,7 +5179,7 @@ "\n" msgstr "" -#: misc/mke2fs.c:1179 +#: misc/mke2fs.c:1177 #, c-format msgid "" "Syntax error in mke2fs config file (%s, line #%d)\n" @@ -5188,34 +5188,34 @@ "Синтаксическая ошибка в конфигурационном файле mke2fs (%s, строка #%d)\n" "\t%s\n" -#: misc/mke2fs.c:1192 misc/tune2fs.c:1068 +#: misc/mke2fs.c:1190 misc/tune2fs.c:1068 #, c-format msgid "Invalid filesystem option set: %s\n" msgstr "" -#: misc/mke2fs.c:1204 misc/tune2fs.c:417 +#: misc/mke2fs.c:1202 misc/tune2fs.c:417 #, c-format msgid "Invalid mount option set: %s\n" msgstr "" -#: misc/mke2fs.c:1340 +#: misc/mke2fs.c:1338 #, c-format msgid "" "\n" "Your mke2fs.conf file does not define the %s filesystem type.\n" msgstr "" -#: misc/mke2fs.c:1344 +#: misc/mke2fs.c:1342 msgid "" "You probably need to install an updated mke2fs.conf file.\n" "\n" msgstr "" -#: misc/mke2fs.c:1348 +#: misc/mke2fs.c:1346 msgid "Aborting...\n" msgstr "Прерывание...\n" -#: misc/mke2fs.c:1389 +#: misc/mke2fs.c:1387 #, c-format msgid "" "\n" @@ -5223,81 +5223,81 @@ "\n" msgstr "" -#: misc/mke2fs.c:1571 +#: misc/mke2fs.c:1569 msgid "Couldn't allocate memory for new PATH.\n" msgstr "" -#: misc/mke2fs.c:1608 +#: misc/mke2fs.c:1606 #, c-format msgid "Couldn't init profile successfully (error: %ld).\n" msgstr "" -#: misc/mke2fs.c:1641 +#: misc/mke2fs.c:1639 #, c-format msgid "invalid block size - %s" msgstr "неверный размер блока - %s" -#: misc/mke2fs.c:1645 +#: misc/mke2fs.c:1643 #, c-format msgid "Warning: blocksize %d not usable on most systems.\n" msgstr "" -#: misc/mke2fs.c:1661 +#: misc/mke2fs.c:1659 #, c-format msgid "invalid cluster size - %s" msgstr "" -#: misc/mke2fs.c:1674 +#: misc/mke2fs.c:1672 msgid "'-R' is deprecated, use '-E' instead" msgstr "" -#: misc/mke2fs.c:1688 misc/tune2fs.c:1784 +#: misc/mke2fs.c:1686 misc/tune2fs.c:1796 #, c-format msgid "bad error behavior - %s" msgstr "" -#: misc/mke2fs.c:1700 +#: misc/mke2fs.c:1698 msgid "Illegal number for blocks per group" msgstr "" -#: misc/mke2fs.c:1705 +#: misc/mke2fs.c:1703 msgid "blocks per group must be multiple of 8" msgstr "" -#: misc/mke2fs.c:1713 +#: misc/mke2fs.c:1711 msgid "Illegal number for flex_bg size" msgstr "" -#: misc/mke2fs.c:1719 +#: misc/mke2fs.c:1717 msgid "flex_bg size must be a power of 2" msgstr "" -#: misc/mke2fs.c:1724 +#: misc/mke2fs.c:1722 #, c-format msgid "flex_bg size (%lu) must be less than or equal to 2^31" msgstr "" -#: misc/mke2fs.c:1734 +#: misc/mke2fs.c:1732 #, c-format msgid "invalid inode ratio %s (min %d/max %d)" msgstr "" -#: misc/mke2fs.c:1744 +#: misc/mke2fs.c:1742 #, c-format msgid "invalid inode size - %s" msgstr "неверный размер inod'а - %s" -#: misc/mke2fs.c:1757 +#: misc/mke2fs.c:1755 msgid "" "Warning: -K option is deprecated and should not be used anymore. Use '-E " "nodiscard' extended option instead!\n" msgstr "" -#: misc/mke2fs.c:1768 +#: misc/mke2fs.c:1766 msgid "in malloc for bad_blocks_filename" msgstr "" -#: misc/mke2fs.c:1777 +#: misc/mke2fs.c:1775 #, c-format msgid "" "Warning: label too long; will be truncated to '%s'\n" @@ -5306,67 +5306,67 @@ "Внимание: метка слишком длинная; будет усечена до '%s'\n" "\n" -#: misc/mke2fs.c:1786 +#: misc/mke2fs.c:1784 #, c-format msgid "invalid reserved blocks percent - %s" msgstr "" -#: misc/mke2fs.c:1801 +#: misc/mke2fs.c:1799 #, c-format msgid "bad num inodes - %s" msgstr "" -#: misc/mke2fs.c:1814 +#: misc/mke2fs.c:1812 msgid "while allocating fs_feature string" msgstr "" -#: misc/mke2fs.c:1831 +#: misc/mke2fs.c:1829 #, c-format msgid "bad revision level - %s" msgstr "" -#: misc/mke2fs.c:1836 +#: misc/mke2fs.c:1834 #, c-format msgid "while trying to create revision %d" msgstr "" -#: misc/mke2fs.c:1850 +#: misc/mke2fs.c:1848 msgid "The -t option may only be used once" msgstr "" -#: misc/mke2fs.c:1858 +#: misc/mke2fs.c:1856 msgid "The -T option may only be used once" msgstr "" -#: misc/mke2fs.c:1914 misc/mke2fs.c:3298 +#: misc/mke2fs.c:1912 misc/mke2fs.c:3296 #, c-format msgid "while trying to open journal device %s\n" msgstr "" -#: misc/mke2fs.c:1920 +#: misc/mke2fs.c:1918 #, c-format msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n" msgstr "" -#: misc/mke2fs.c:1926 +#: misc/mke2fs.c:1924 #, c-format msgid "Using journal device's blocksize: %d\n" msgstr "" -#: misc/mke2fs.c:1937 +#: misc/mke2fs.c:1935 #, c-format msgid "invalid blocks '%s' on device '%s'" msgstr "" -#: misc/mke2fs.c:1967 +#: misc/mke2fs.c:1965 msgid "filesystem" msgstr "" -#: misc/mke2fs.c:1985 resize/main.c:497 +#: misc/mke2fs.c:1983 resize/main.c:497 msgid "while trying to determine filesystem size" msgstr "при попытке определить размер файловой системы" -#: misc/mke2fs.c:1991 +#: misc/mke2fs.c:1989 msgid "" "Couldn't determine device size; you must specify\n" "the size of the filesystem\n" @@ -5374,7 +5374,7 @@ "Не удалось определить размер устройства; необходимо\n" "указать размер файловой системы\n" -#: misc/mke2fs.c:1998 +#: misc/mke2fs.c:1996 msgid "" "Device size reported to be zero. Invalid partition specified, or\n" "\tpartition table wasn't reread after running fdisk, due to\n" @@ -5382,132 +5382,132 @@ "\tto re-read your partition table.\n" msgstr "" -#: misc/mke2fs.c:2015 +#: misc/mke2fs.c:2013 msgid "Filesystem larger than apparent device size." msgstr "" -#: misc/mke2fs.c:2035 +#: misc/mke2fs.c:2033 msgid "Failed to parse fs types list\n" msgstr "" -#: misc/mke2fs.c:2085 +#: misc/mke2fs.c:2083 msgid "The HURD does not support the filetype feature.\n" msgstr "" -#: misc/mke2fs.c:2090 +#: misc/mke2fs.c:2088 msgid "The HURD does not support the huge_file feature.\n" msgstr "" -#: misc/mke2fs.c:2095 +#: misc/mke2fs.c:2093 msgid "The HURD does not support the metadata_csum feature.\n" msgstr "" -#: misc/mke2fs.c:2100 +#: misc/mke2fs.c:2098 msgid "The HURD does not support the ea_inode feature.\n" msgstr "" -#: misc/mke2fs.c:2110 +#: misc/mke2fs.c:2108 msgid "while trying to determine hardware sector size" msgstr "" -#: misc/mke2fs.c:2116 +#: misc/mke2fs.c:2114 msgid "while trying to determine physical sector size" msgstr "" -#: misc/mke2fs.c:2148 +#: misc/mke2fs.c:2146 msgid "while setting blocksize; too small for device\n" msgstr "" -#: misc/mke2fs.c:2153 +#: misc/mke2fs.c:2151 #, c-format msgid "" "Warning: specified blocksize %d is less than device physical sectorsize %d\n" msgstr "" -#: misc/mke2fs.c:2177 +#: misc/mke2fs.c:2175 #, c-format msgid "" "%s: Size of device (0x%llx blocks) %s too big to be expressed\n" "\tin 32 bits using a blocksize of %d.\n" msgstr "" -#: misc/mke2fs.c:2191 +#: misc/mke2fs.c:2189 #, c-format msgid "" "%s: Size of device (0x%llx blocks) %s too big to create\n" "\ta filesystem using a blocksize of %d.\n" msgstr "" -#: misc/mke2fs.c:2213 +#: misc/mke2fs.c:2211 msgid "fs_types for mke2fs.conf resolution: " msgstr "" -#: misc/mke2fs.c:2220 +#: misc/mke2fs.c:2218 msgid "Filesystem features not supported with revision 0 filesystems\n" msgstr "" -#: misc/mke2fs.c:2228 +#: misc/mke2fs.c:2226 msgid "Sparse superblocks not supported with revision 0 filesystems\n" msgstr "" -#: misc/mke2fs.c:2238 +#: misc/mke2fs.c:2236 msgid "Journals not supported with revision 0 filesystems\n" msgstr "" -#: misc/mke2fs.c:2251 +#: misc/mke2fs.c:2249 #, c-format msgid "invalid reserved blocks percent - %lf" msgstr "" -#: misc/mke2fs.c:2268 +#: misc/mke2fs.c:2266 msgid "" "Extents MUST be enabled for a 64-bit filesystem. Pass -O extents to " "rectify.\n" msgstr "" -#: misc/mke2fs.c:2288 +#: misc/mke2fs.c:2286 msgid "The cluster size may not be smaller than the block size.\n" msgstr "" -#: misc/mke2fs.c:2294 +#: misc/mke2fs.c:2292 msgid "specifying a cluster size requires the bigalloc feature" msgstr "" -#: misc/mke2fs.c:2314 +#: misc/mke2fs.c:2312 #, c-format msgid "warning: Unable to get device geometry for %s\n" msgstr "" -#: misc/mke2fs.c:2317 +#: misc/mke2fs.c:2315 #, c-format msgid "%s alignment is offset by %lu bytes.\n" msgstr "" -#: misc/mke2fs.c:2319 +#: misc/mke2fs.c:2317 #, c-format msgid "" "This may result in very poor performance, (re)-partitioning suggested.\n" msgstr "" -#: misc/mke2fs.c:2340 +#: misc/mke2fs.c:2338 #, c-format msgid "%d-byte blocks too big for system (max %d)" msgstr "" -#: misc/mke2fs.c:2344 +#: misc/mke2fs.c:2342 #, c-format msgid "" "Warning: %d-byte blocks too big for system (max %d), forced to continue\n" msgstr "" -#: misc/mke2fs.c:2352 +#: misc/mke2fs.c:2350 #, c-format msgid "" "Suggestion: Use Linux kernel >= 3.18 for improved stability of the metadata " "and journal checksum features.\n" msgstr "" -#: misc/mke2fs.c:2434 +#: misc/mke2fs.c:2432 #, c-format msgid "" "\n" @@ -5517,16 +5517,16 @@ "\n" msgstr "" -#: misc/mke2fs.c:2449 +#: misc/mke2fs.c:2447 #, c-format msgid "%d byte inodes are too small for project quota" msgstr "" -#: misc/mke2fs.c:2480 +#: misc/mke2fs.c:2478 msgid "Can't support bigalloc feature without extents feature" msgstr "" -#: misc/mke2fs.c:2487 +#: misc/mke2fs.c:2485 msgid "" "The resize_inode and meta_bg features are not compatible.\n" "They can not be both enabled simultaneously.\n" @@ -5534,7 +5534,7 @@ "Функции resize_inode и meta_bg не совеместимы.\n" "Их совместное использование невозможно.\n" -#: misc/mke2fs.c:2495 +#: misc/mke2fs.c:2493 msgid "" "\n" "Warning: the bigalloc feature is still under development\n" @@ -5542,39 +5542,39 @@ "\n" msgstr "" -#: misc/mke2fs.c:2507 +#: misc/mke2fs.c:2505 msgid "reserved online resize blocks not supported on non-sparse filesystem" msgstr "" -#: misc/mke2fs.c:2516 +#: misc/mke2fs.c:2514 msgid "blocks per group count out of range" msgstr "" -#: misc/mke2fs.c:2538 +#: misc/mke2fs.c:2536 msgid "Flex_bg feature not enabled, so flex_bg size may not be specified" msgstr "" -#: misc/mke2fs.c:2550 +#: misc/mke2fs.c:2548 #, c-format msgid "invalid inode size %d (min %d/max %d)" msgstr "неверный размер inod'а %d (min %d/max %d)" -#: misc/mke2fs.c:2565 +#: misc/mke2fs.c:2563 #, c-format msgid "%d byte inodes are too small for inline data; specify larger size" msgstr "" -#: misc/mke2fs.c:2580 +#: misc/mke2fs.c:2578 #, c-format msgid "too many inodes (%llu), raise inode ratio?" msgstr "" -#: misc/mke2fs.c:2587 +#: misc/mke2fs.c:2585 #, c-format msgid "too many inodes (%llu), specify < 2^32 inodes" msgstr "" -#: misc/mke2fs.c:2601 +#: misc/mke2fs.c:2599 #, c-format msgid "" "inode_size (%u) * inodes_count (%u) too big for a\n" @@ -5582,120 +5582,120 @@ "\tor lower inode count (-N).\n" msgstr "" -#: misc/mke2fs.c:2788 +#: misc/mke2fs.c:2786 msgid "Discarding device blocks: " msgstr "" -#: misc/mke2fs.c:2804 +#: misc/mke2fs.c:2802 msgid "failed - " msgstr "" -#: misc/mke2fs.c:2863 +#: misc/mke2fs.c:2861 msgid "while initializing quota context" msgstr "" -#: misc/mke2fs.c:2870 +#: misc/mke2fs.c:2868 msgid "while writing quota inodes" msgstr "" -#: misc/mke2fs.c:2895 +#: misc/mke2fs.c:2893 #, c-format msgid "bad error behavior in profile - %s" msgstr "" -#: misc/mke2fs.c:2971 +#: misc/mke2fs.c:2969 msgid "in malloc for android_sparse_params" msgstr "" -#: misc/mke2fs.c:2985 +#: misc/mke2fs.c:2983 msgid "while setting up superblock" msgstr "" -#: misc/mke2fs.c:3001 +#: misc/mke2fs.c:2999 msgid "" "Extents are not enabled. The file extent tree can be checksummed, whereas " "block maps cannot. Not enabling extents reduces the coverage of metadata " "checksumming. Pass -O extents to rectify.\n" msgstr "" -#: misc/mke2fs.c:3008 +#: misc/mke2fs.c:3006 msgid "" "64-bit filesystem support is not enabled. The larger fields afforded by " "this feature enable full-strength checksumming. Pass -O 64bit to rectify.\n" msgstr "" -#: misc/mke2fs.c:3016 +#: misc/mke2fs.c:3014 msgid "The metadata_csum_seed feature requires the metadata_csum feature.\n" msgstr "" -#: misc/mke2fs.c:3040 +#: misc/mke2fs.c:3038 msgid "Discard succeeded and will return 0s - skipping inode table wipe\n" msgstr "" -#: misc/mke2fs.c:3139 +#: misc/mke2fs.c:3137 #, c-format msgid "unknown os - %s" msgstr "" -#: misc/mke2fs.c:3202 +#: misc/mke2fs.c:3200 msgid "Allocating group tables: " msgstr "" -#: misc/mke2fs.c:3210 +#: misc/mke2fs.c:3208 msgid "while trying to allocate filesystem tables" msgstr "" -#: misc/mke2fs.c:3219 +#: misc/mke2fs.c:3217 msgid "" "\n" "\twhile converting subcluster bitmap" msgstr "" -#: misc/mke2fs.c:3225 +#: misc/mke2fs.c:3223 #, c-format msgid "%s may be further corrupted by superblock rewrite\n" msgstr "" -#: misc/mke2fs.c:3266 +#: misc/mke2fs.c:3264 #, c-format msgid "while zeroing block %llu at end of filesystem" msgstr "" -#: misc/mke2fs.c:3279 +#: misc/mke2fs.c:3277 msgid "while reserving blocks for online resize" msgstr "" -#: misc/mke2fs.c:3291 misc/tune2fs.c:1492 +#: misc/mke2fs.c:3289 misc/tune2fs.c:1504 msgid "journal" msgstr "" -#: misc/mke2fs.c:3303 +#: misc/mke2fs.c:3301 #, c-format msgid "Adding journal to device %s: " msgstr "" -#: misc/mke2fs.c:3310 +#: misc/mke2fs.c:3308 #, c-format msgid "" "\n" "\twhile trying to add journal to device %s" msgstr "" -#: misc/mke2fs.c:3315 misc/mke2fs.c:3344 misc/mke2fs.c:3382 -#: misc/mk_hugefiles.c:600 misc/tune2fs.c:1521 misc/tune2fs.c:1540 +#: misc/mke2fs.c:3313 misc/mke2fs.c:3342 misc/mke2fs.c:3380 +#: misc/mk_hugefiles.c:600 misc/tune2fs.c:1533 misc/tune2fs.c:1552 msgid "done\n" msgstr "готово\n" -#: misc/mke2fs.c:3321 +#: misc/mke2fs.c:3319 msgid "Skipping journal creation in super-only mode\n" msgstr "" -#: misc/mke2fs.c:3331 +#: misc/mke2fs.c:3329 #, c-format msgid "Creating journal (%u blocks): " msgstr "Создание журнала (%u блоков): " -#: misc/mke2fs.c:3340 +#: misc/mke2fs.c:3338 msgid "" "\n" "\twhile trying to create journal" @@ -5703,27 +5703,27 @@ "\n" "\tпри попытке создания журнала" -#: misc/mke2fs.c:3352 misc/tune2fs.c:1133 +#: misc/mke2fs.c:3350 misc/tune2fs.c:1133 msgid "" "\n" "Error while enabling multiple mount protection feature." msgstr "" -#: misc/mke2fs.c:3357 +#: misc/mke2fs.c:3355 #, c-format msgid "" "Multiple mount protection is enabled with update interval %d seconds.\n" msgstr "" -#: misc/mke2fs.c:3373 +#: misc/mke2fs.c:3371 msgid "Copying files into the device: " msgstr "Копирование файлов на устройство: " -#: misc/mke2fs.c:3379 +#: misc/mke2fs.c:3377 msgid "while populating file system" msgstr "" -#: misc/mke2fs.c:3386 +#: misc/mke2fs.c:3384 msgid "Writing superblocks and filesystem accounting information: " msgstr "" @@ -5733,7 +5733,7 @@ "Warning, had trouble writing out superblocks.\n" msgstr "" -#: misc/mke2fs.c:3396 +#: misc/mke2fs.c:3394 msgid "" "done\n" "\n" @@ -5845,12 +5845,12 @@ msgid "while trying to open external journal" msgstr "" -#: misc/tune2fs.c:287 misc/tune2fs.c:2804 +#: misc/tune2fs.c:287 misc/tune2fs.c:2816 #, c-format msgid "%s is not a journal device.\n" msgstr "" -#: misc/tune2fs.c:303 misc/tune2fs.c:2820 +#: misc/tune2fs.c:303 misc/tune2fs.c:2832 msgid "Filesystem's UUID not found on journal device.\n" msgstr "" @@ -6013,100 +6013,100 @@ msgid "Cannot disable metadata_csum on a mounted filesystem!\n" msgstr "" -#: misc/tune2fs.c:1334 +#: misc/tune2fs.c:1346 #, c-format msgid "Cannot enable 64-bit mode while mounted!\n" msgstr "" -#: misc/tune2fs.c:1344 +#: misc/tune2fs.c:1356 #, c-format msgid "Cannot disable 64-bit mode while mounted!\n" msgstr "" -#: misc/tune2fs.c:1374 +#: misc/tune2fs.c:1386 #, c-format msgid "Cannot enable project feature; inode size too small.\n" msgstr "" -#: misc/tune2fs.c:1395 +#: misc/tune2fs.c:1407 msgid "" "\n" "Warning: '^quota' option overrides '-Q'arguments.\n" msgstr "" -#: misc/tune2fs.c:1419 +#: misc/tune2fs.c:1431 msgid "" "Setting feature 'metadata_csum_seed' is only supported\n" "on filesystems with the metadata_csum feature enabled.\n" msgstr "" -#: misc/tune2fs.c:1437 +#: misc/tune2fs.c:1449 msgid "" "UUID has changed since enabling metadata_csum. Filesystem must be unmounted " "\n" "to safely rewrite all metadata to match the new UUID.\n" msgstr "" -#: misc/tune2fs.c:1443 +#: misc/tune2fs.c:1455 msgid "Recalculating checksums could take some time." msgstr "" -#: misc/tune2fs.c:1485 +#: misc/tune2fs.c:1497 msgid "The filesystem already has a journal.\n" msgstr "" -#: misc/tune2fs.c:1505 +#: misc/tune2fs.c:1517 #, c-format msgid "" "\n" "\twhile trying to open journal on %s\n" msgstr "" -#: misc/tune2fs.c:1509 +#: misc/tune2fs.c:1521 #, c-format msgid "Creating journal on device %s: " msgstr "Создание журнала на устройстве %s: " -#: misc/tune2fs.c:1517 +#: misc/tune2fs.c:1529 #, c-format msgid "while adding filesystem to journal on %s" msgstr "" -#: misc/tune2fs.c:1523 +#: misc/tune2fs.c:1535 msgid "Creating journal inode: " msgstr "Создание inod'а журнала: " -#: misc/tune2fs.c:1537 +#: misc/tune2fs.c:1549 msgid "" "\n" "\twhile trying to create journal file" msgstr "" -#: misc/tune2fs.c:1575 +#: misc/tune2fs.c:1587 #, c-format msgid "Cannot enable project quota; inode size too small.\n" msgstr "" -#: misc/tune2fs.c:1588 +#: misc/tune2fs.c:1600 msgid "while initializing quota context in support library" msgstr "" -#: misc/tune2fs.c:1603 +#: misc/tune2fs.c:1615 #, c-format msgid "while updating quota limits (%d)" msgstr "" -#: misc/tune2fs.c:1611 +#: misc/tune2fs.c:1623 #, c-format msgid "while writing quota file (%d)" msgstr "" -#: misc/tune2fs.c:1629 +#: misc/tune2fs.c:1641 #, c-format msgid "while removing quota file (%d)" msgstr "" -#: misc/tune2fs.c:1672 +#: misc/tune2fs.c:1684 msgid "" "\n" "Bad quota options specified.\n" @@ -6120,65 +6120,65 @@ "\n" msgstr "" -#: misc/tune2fs.c:1730 +#: misc/tune2fs.c:1742 #, c-format msgid "Couldn't parse date/time specifier: %s" msgstr "" -#: misc/tune2fs.c:1755 misc/tune2fs.c:1768 +#: misc/tune2fs.c:1767 misc/tune2fs.c:1780 #, c-format msgid "bad mounts count - %s" msgstr "" -#: misc/tune2fs.c:1811 +#: misc/tune2fs.c:1823 #, c-format msgid "bad gid/group name - %s" msgstr "неверный gid/имя группы - %s" -#: misc/tune2fs.c:1844 +#: misc/tune2fs.c:1856 #, c-format msgid "bad interval - %s" msgstr "неверный интервал - %s" -#: misc/tune2fs.c:1873 +#: misc/tune2fs.c:1885 #, c-format msgid "bad reserved block ratio - %s" msgstr "" -#: misc/tune2fs.c:1888 +#: misc/tune2fs.c:1900 msgid "-o may only be specified once" msgstr "-o можно указать только один раз" -#: misc/tune2fs.c:1897 +#: misc/tune2fs.c:1909 msgid "-O may only be specified once" msgstr "-O можно указать только один раз" -#: misc/tune2fs.c:1914 +#: misc/tune2fs.c:1926 #, c-format msgid "bad reserved blocks count - %s" msgstr "" -#: misc/tune2fs.c:1943 +#: misc/tune2fs.c:1955 #, c-format msgid "bad uid/user name - %s" msgstr "" -#: misc/tune2fs.c:1960 +#: misc/tune2fs.c:1972 #, c-format msgid "bad inode size - %s" msgstr "" -#: misc/tune2fs.c:1967 +#: misc/tune2fs.c:1979 #, c-format msgid "Inode size must be a power of two- %s" msgstr "" -#: misc/tune2fs.c:2064 +#: misc/tune2fs.c:2076 #, c-format msgid "mmp_update_interval too big: %lu\n" msgstr "" -#: misc/tune2fs.c:2069 +#: misc/tune2fs.c:2081 #, c-format msgid "Setting multiple mount protection update interval to %lu second\n" msgid_plural "" @@ -6186,27 +6186,27 @@ msgstr[0] "" msgstr[1] "" -#: misc/tune2fs.c:2096 +#: misc/tune2fs.c:2108 #, c-format msgid "Invalid RAID stride: %s\n" msgstr "" -#: misc/tune2fs.c:2111 +#: misc/tune2fs.c:2123 #, c-format msgid "Invalid RAID stripe-width: %s\n" msgstr "" -#: misc/tune2fs.c:2126 +#: misc/tune2fs.c:2138 #, c-format msgid "Invalid hash algorithm: %s\n" msgstr "" -#: misc/tune2fs.c:2132 +#: misc/tune2fs.c:2144 #, c-format msgid "Setting default hash algorithm to %s (%d)\n" msgstr "" -#: misc/tune2fs.c:2191 +#: misc/tune2fs.c:2199 msgid "" "\n" "Bad options specified.\n" @@ -6225,66 +6225,66 @@ "\t^test_fs\n" msgstr "" -#: misc/tune2fs.c:2622 +#: misc/tune2fs.c:2634 msgid "Failed to read inode bitmap\n" msgstr "" -#: misc/tune2fs.c:2627 +#: misc/tune2fs.c:2639 msgid "Failed to read block bitmap\n" msgstr "" -#: misc/tune2fs.c:2644 resize/resize2fs.c:1277 +#: misc/tune2fs.c:2656 resize/resize2fs.c:1277 msgid "blocks to be moved" msgstr "" -#: misc/tune2fs.c:2647 +#: misc/tune2fs.c:2659 msgid "Failed to allocate block bitmap when increasing inode size\n" msgstr "" -#: misc/tune2fs.c:2653 +#: misc/tune2fs.c:2665 msgid "Not enough space to increase inode size \n" msgstr "" -#: misc/tune2fs.c:2658 +#: misc/tune2fs.c:2670 msgid "Failed to relocate blocks during inode resize \n" msgstr "" -#: misc/tune2fs.c:2690 +#: misc/tune2fs.c:2702 msgid "" "Error in resizing the inode size.\n" "Run e2undo to undo the file system changes. \n" msgstr "" -#: misc/tune2fs.c:2907 +#: misc/tune2fs.c:2919 #, c-format msgid "" "MMP block magic is bad. Try to fix it by running:\n" "'e2fsck -f %s'\n" msgstr "" -#: misc/tune2fs.c:2919 +#: misc/tune2fs.c:2931 msgid "Cannot modify a journal device.\n" msgstr "" -#: misc/tune2fs.c:2932 +#: misc/tune2fs.c:2944 #, c-format msgid "The inode size is already %lu\n" msgstr "" -#: misc/tune2fs.c:2939 +#: misc/tune2fs.c:2951 msgid "Shrinking inode size is not supported\n" msgstr "" -#: misc/tune2fs.c:2944 +#: misc/tune2fs.c:2956 #, c-format msgid "Invalid inode size %lu (max %d)\n" msgstr "" -#: misc/tune2fs.c:2950 +#: misc/tune2fs.c:2962 msgid "Resizing inodes could take some time." msgstr "" -#: misc/tune2fs.c:2998 +#: misc/tune2fs.c:3009 #, c-format msgid "" "Warning: The journal is dirty. You may wish to replay the journal like:\n" @@ -6295,106 +6295,106 @@ "by journal recovery.\n" msgstr "" -#: misc/tune2fs.c:3009 +#: misc/tune2fs.c:3020 #, c-format msgid "Recovering journal.\n" msgstr "" -#: misc/tune2fs.c:3028 +#: misc/tune2fs.c:3039 #, c-format msgid "Setting maximal mount count to %d\n" msgstr "" -#: misc/tune2fs.c:3034 +#: misc/tune2fs.c:3045 #, c-format msgid "Setting current mount count to %d\n" msgstr "" -#: misc/tune2fs.c:3039 +#: misc/tune2fs.c:3050 #, c-format msgid "Setting error behavior to %d\n" msgstr "" -#: misc/tune2fs.c:3044 +#: misc/tune2fs.c:3055 #, c-format msgid "Setting reserved blocks gid to %lu\n" msgstr "" -#: misc/tune2fs.c:3049 +#: misc/tune2fs.c:3060 #, c-format msgid "interval between checks is too big (%lu)" msgstr "" -#: misc/tune2fs.c:3056 +#: misc/tune2fs.c:3067 #, c-format msgid "Setting interval between checks to %lu seconds\n" msgstr "" -#: misc/tune2fs.c:3063 +#: misc/tune2fs.c:3074 #, c-format msgid "Setting reserved blocks percentage to %g%% (%llu blocks)\n" msgstr "" -#: misc/tune2fs.c:3069 +#: misc/tune2fs.c:3080 #, c-format msgid "reserved blocks count is too big (%llu)" msgstr "" -#: misc/tune2fs.c:3076 +#: misc/tune2fs.c:3087 #, c-format msgid "Setting reserved blocks count to %llu\n" msgstr "" -#: misc/tune2fs.c:3081 +#: misc/tune2fs.c:3092 msgid "" "\n" "The filesystem already has sparse superblocks.\n" msgstr "" -#: misc/tune2fs.c:3084 +#: misc/tune2fs.c:3095 msgid "" "\n" "Setting the sparse superblock flag not supported\n" "for filesystems with the meta_bg feature enabled.\n" msgstr "" -#: misc/tune2fs.c:3094 +#: misc/tune2fs.c:3105 #, c-format msgid "" "\n" "Sparse superblock flag set. %s" msgstr "" -#: misc/tune2fs.c:3099 +#: misc/tune2fs.c:3110 msgid "" "\n" "Clearing the sparse superblock flag not supported.\n" msgstr "" -#: misc/tune2fs.c:3107 +#: misc/tune2fs.c:3118 #, c-format msgid "Setting time filesystem last checked to %s\n" msgstr "" -#: misc/tune2fs.c:3113 +#: misc/tune2fs.c:3124 #, c-format msgid "Setting reserved blocks uid to %lu\n" msgstr "" -#: misc/tune2fs.c:3145 +#: misc/tune2fs.c:3156 msgid "Error in using clear_mmp. It must be used with -f\n" msgstr "" -#: misc/tune2fs.c:3163 +#: misc/tune2fs.c:3174 msgid "" "The quota feature may only be changed when the filesystem is unmounted.\n" msgstr "" -#: misc/tune2fs.c:3196 +#: misc/tune2fs.c:3207 msgid "The UUID may only be changed when the filesystem is unmounted.\n" msgstr "" -#: misc/tune2fs.c:3199 +#: misc/tune2fs.c:3210 msgid "" "If you only use kernels newer than v4.4, run 'tune2fs -O metadata_csum_seed' " "and re-run this command.\n" @@ -6404,45 +6404,45 @@ msgid "Setting UUID on a checksummed filesystem could take some time." msgstr "" -#: misc/tune2fs.c:3229 +#: misc/tune2fs.c:3240 msgid "Invalid UUID format\n" msgstr "Неверный формат UUID\n" -#: misc/tune2fs.c:3245 +#: misc/tune2fs.c:3256 msgid "Need to update journal superblock.\n" msgstr "" -#: misc/tune2fs.c:3267 +#: misc/tune2fs.c:3278 msgid "" "The inode size may only be changed when the filesystem is unmounted.\n" msgstr "" -#: misc/tune2fs.c:3274 +#: misc/tune2fs.c:3285 msgid "" "Changing the inode size not supported for filesystems with the flex_bg\n" "feature enabled.\n" msgstr "" -#: misc/tune2fs.c:3292 +#: misc/tune2fs.c:3303 #, c-format msgid "Setting inode size %lu\n" msgstr "" -#: misc/tune2fs.c:3296 +#: misc/tune2fs.c:3307 msgid "Failed to change inode size\n" msgstr "" -#: misc/tune2fs.c:3310 +#: misc/tune2fs.c:3321 #, c-format msgid "Setting stride size to %d\n" msgstr "" -#: misc/tune2fs.c:3315 +#: misc/tune2fs.c:3326 #, c-format msgid "Setting stripe width to %d\n" msgstr "" -#: misc/tune2fs.c:3322 +#: misc/tune2fs.c:3333 #, c-format msgid "Setting extended default mount options to '%s'\n" msgstr "" @@ -7788,63 +7788,63 @@ msgid "\tlast mounted on %s on %s" msgstr "" -#: lib/support/plausible.c:121 +#: lib/support/plausible.c:117 #, c-format msgid "\tlast mounted on %s" msgstr "" -#: lib/support/plausible.c:124 +#: lib/support/plausible.c:120 #, c-format msgid "\tcreated on %s" msgstr "" -#: lib/support/plausible.c:127 +#: lib/support/plausible.c:123 #, c-format msgid "\tlast modified on %s" msgstr "" -#: lib/support/plausible.c:161 +#: lib/support/plausible.c:157 #, c-format msgid "Found a %s partition table in %s\n" msgstr "" -#: lib/support/plausible.c:191 +#: lib/support/plausible.c:187 #, c-format msgid "The file %s does not exist and no size was specified.\n" msgstr "" -#: lib/support/plausible.c:199 +#: lib/support/plausible.c:195 #, c-format msgid "Creating regular file %s\n" msgstr "" -#: lib/support/plausible.c:202 +#: lib/support/plausible.c:198 #, c-format msgid "Could not open %s: %s\n" msgstr "Не удалось открыть %s: %s\n" -#: lib/support/plausible.c:205 +#: lib/support/plausible.c:201 msgid "" "\n" "The device apparently does not exist; did you specify it correctly?\n" msgstr "" -#: lib/support/plausible.c:227 +#: lib/support/plausible.c:223 #, c-format msgid "%s is not a block special device.\n" msgstr "" -#: lib/support/plausible.c:249 +#: lib/support/plausible.c:245 #, c-format msgid "%s contains a %s file system labelled '%s'\n" msgstr "" -#: lib/support/plausible.c:252 +#: lib/support/plausible.c:248 #, c-format msgid "%s contains a %s file system\n" msgstr "" -#: lib/support/plausible.c:276 +#: lib/support/plausible.c:272 #, c-format msgid "%s contains `%s' data\n" msgstr "" diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/elfutils.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/elfutils.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/elfutils.po 2020-01-23 16:52:12.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/elfutils.po 2020-07-08 13:54:14.000000000 +0000 @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2020-01-23 11:39+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:26+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: lib/color.c:53 msgid "" diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/fcitx-mozc.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/fcitx-mozc.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/fcitx-mozc.po 2020-01-23 16:52:08.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/fcitx-mozc.po 2020-07-08 13:54:10.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 12:02+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:43+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: ../eim.cc:184 msgid "Press Escape to go back" diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/fetchmail.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/fetchmail.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/fetchmail.po 2020-01-23 16:52:18.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/fetchmail.po 2020-07-08 13:54:20.000000000 +0000 @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2020-01-23 10:52+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:45+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ru\n" #: checkalias.c:174 @@ -397,7 +397,7 @@ msgid "%s at %s (folder %s)" msgstr "%s на %s (каталог %s)" -#: driver.c:1335 rcfile_y.y:392 +#: driver.c:1335 rcfile_y.y:390 #, c-format msgid "%s at %s" msgstr "%s на %s" @@ -532,7 +532,7 @@ msgid "Option --limit is not supported with %s\n" msgstr "Опция --limit не поддерживается с %s\n" -#: env.c:62 +#: env.c:58 #, c-format msgid "" "%s: The QMAILINJECT environment variable is set.\n" @@ -548,7 +548,7 @@ "Попробуйте \"env QMAILINJECT= %s СВОИ АРГУМЕНТЫ\"\n" "%s: Сброс.\n" -#: env.c:74 +#: env.c:70 #, c-format msgid "" "%s: The NULLMAILER_FLAGS environment variable is set.\n" @@ -565,12 +565,12 @@ "Попробуйте \"env NULLMAILER_FLAGS= %s СВОИ АРГУМЕНТЫ\"\n" "%s: Сброс.\n" -#: env.c:86 +#: env.c:82 #, c-format msgid "%s: You don't exist. Go away.\n" msgstr "%s: Ты существуешь. Вали отсюда.\n" -#: env.c:204 +#: env.c:200 #, c-format msgid "%s: can't determine your host!" msgstr "%s: невозможно определить ваш хост!" @@ -580,13 +580,13 @@ msgid "gethostbyname failed for %s\n" msgstr "сбой gethostbyname для %s\n" -#: env.c:229 +#: env.c:225 msgid "Cannot find my own host in hosts database to qualify it!\n" msgstr "" "Невозможно найти свой собственный хост в базе данных хостов, чтобы " "определить его!\n" -#: env.c:233 +#: env.c:229 msgid "" "Trying to continue with unqualified hostname.\n" "DO NOT report broken Received: headers, HELO/EHLO lines or similar " @@ -694,76 +694,76 @@ msgid "could not get current working directory\n" msgstr "невозможно было получить текущий рабочий каталог\n" -#: fetchmail.c:297 +#: fetchmail.c:304 #, c-format msgid "This is fetchmail release %s" msgstr "Это fetchmail версии %s" -#: fetchmail.c:322 +#: fetchmail.c:339 msgid "The nodetach option is in effect, ignoring logfile option.\n" msgstr "" -#: fetchmail.c:329 +#: fetchmail.c:346 msgid "Not running in daemon mode, ignoring logfile option.\n" msgstr "" -#: fetchmail.c:336 +#: fetchmail.c:353 #, c-format msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n" msgstr "" -#: fetchmail.c:342 +#: fetchmail.c:359 #, c-format msgid "Logfile \"%s\" is not writable, aborting.\n" msgstr "" -#: fetchmail.c:360 +#: fetchmail.c:377 #, c-format msgid "" "syslog and logfile options are both set, ignoring syslog, and logging to %s" msgstr "" -#: fetchmail.c:448 +#: fetchmail.c:468 #, c-format msgid "Taking options from command line%s%s\n" msgstr "Опции берутся из командной строки %s%s\n" -#: fetchmail.c:449 +#: fetchmail.c:469 msgid " and " msgstr " и " -#: fetchmail.c:454 +#: fetchmail.c:474 #, c-format msgid "No mailservers set up -- perhaps %s is missing?\n" msgstr "Нет настроенных почтовых серверов -- может отсутствует %s?\n" -#: fetchmail.c:475 +#: fetchmail.c:495 msgid "fetchmail: no mailservers have been specified.\n" msgstr "fetchmail: не были указаны почтовые серверы.\n" -#: fetchmail.c:487 +#: fetchmail.c:507 msgid "fetchmail: no other fetchmail is running\n" msgstr "fetchmail: другие запущенные fetchmail отсутствуют\n" -#: fetchmail.c:493 +#: fetchmail.c:513 #, c-format msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n" msgstr "fetchmail: ошибка при уничтожении %s fetchmail %ld; выходим.\n" -#: fetchmail.c:494 fetchmail.c:503 +#: fetchmail.c:514 fetchmail.c:523 msgid "background" msgstr "фоновый режим" -#: fetchmail.c:494 fetchmail.c:503 +#: fetchmail.c:514 fetchmail.c:523 msgid "foreground" msgstr "приоритетный режим" -#: fetchmail.c:502 +#: fetchmail.c:522 #, c-format msgid "fetchmail: %s fetchmail at %ld killed.\n" msgstr "fetchmail: %s fetchmail %ld уничтожен.\n" -#: fetchmail.c:525 +#: fetchmail.c:545 msgid "" "fetchmail: can't check mail while another fetchmail to same host is " "running.\n" @@ -771,7 +771,7 @@ "fetchmail: невозможно проверить почту, пока на том же хосте запущен другой " "fetchmail.\n" -#: fetchmail.c:531 +#: fetchmail.c:551 #, c-format msgid "" "fetchmail: can't poll specified hosts with another fetchmail running at " @@ -780,180 +780,180 @@ "fetchmail: не могу опросить указанные хосты с другой запущенной копией " "fetchmail %ld.\n" -#: fetchmail.c:538 +#: fetchmail.c:558 #, c-format msgid "fetchmail: another foreground fetchmail is running at %ld.\n" msgstr "fetchmail: другой fetchmail запущен как %ld.\n" -#: fetchmail.c:548 +#: fetchmail.c:568 msgid "" "fetchmail: can't accept options while a background fetchmail is running.\n" msgstr "" "fetchmail: невозможно применить опции, пока запущен фоновый fetchmail.\n" -#: fetchmail.c:560 +#: fetchmail.c:580 #, c-format msgid "fetchmail: background fetchmail at %ld awakened.\n" msgstr "fetchmail: фоновый fetchmail %ld пробуждён.\n" -#: fetchmail.c:572 +#: fetchmail.c:592 #, c-format msgid "fetchmail: elder sibling at %ld died mysteriously.\n" msgstr "" -#: fetchmail.c:587 +#: fetchmail.c:607 #, c-format msgid "fetchmail: can't find a password for %s@%s.\n" msgstr "fetchmail: невозможно найти пароль для %s@%s.\n" -#: fetchmail.c:591 +#: fetchmail.c:611 #, c-format msgid "Enter password for %s@%s: " msgstr "Введите пароль для %s@%s: " -#: fetchmail.c:633 +#: fetchmail.c:653 msgid "fetchmail: Cannot detach into background. Aborting.\n" msgstr "" "fetchmail: невозможно выполнить переход в фоновый режим. Прерывание.\n" -#: fetchmail.c:637 +#: fetchmail.c:657 #, c-format msgid "starting fetchmail %s daemon\n" msgstr "Запуск fetchmail %s демона\n" -#: fetchmail.c:653 fetchmail.c:655 +#: fetchmail.c:673 fetchmail.c:675 #, c-format msgid "could not open %s to append logs to\n" msgstr "не могу открыть %s для добавления в журнал\n" -#: fetchmail.c:674 +#: fetchmail.c:694 msgid "--check mode enabled, not fetching mail\n" msgstr "влючен режим --check, выборка почты не выполняется\n" -#: fetchmail.c:696 +#: fetchmail.c:716 #, c-format msgid "couldn't time-check %s (error %d)\n" msgstr "невозможно было проверить время %s (ошибка %d)\n" -#: fetchmail.c:701 +#: fetchmail.c:721 #, c-format msgid "restarting fetchmail (%s changed)\n" msgstr "fetchmail перезапускается (%s изменен)\n" -#: fetchmail.c:705 +#: fetchmail.c:725 msgid "attempt to re-exec may fail as directory has not been restored\n" msgstr "возможен сбой при перезапуске, т.к. каталог не был восстановлен\n" -#: fetchmail.c:731 +#: fetchmail.c:751 msgid "attempt to re-exec fetchmail failed\n" msgstr "сбой перезапуска fetchmail\n" -#: fetchmail.c:761 +#: fetchmail.c:781 #, c-format msgid "poll of %s skipped (failed authentication or too many timeouts)\n" msgstr "" "опрос %s пропущен (ошибка аутентификации или слишком много тайм-аутов)\n" -#: fetchmail.c:773 +#: fetchmail.c:793 #, c-format msgid "interval not reached, not querying %s\n" msgstr "интервал не достигнут, %s не запрашивается\n" -#: fetchmail.c:811 +#: fetchmail.c:831 msgid "Query status=0 (SUCCESS)\n" msgstr "Статус запроса=0 (SUCCESS)\n" -#: fetchmail.c:813 +#: fetchmail.c:833 msgid "Query status=1 (NOMAIL)\n" msgstr "Статус запроса=1 (NOMAIL)\n" -#: fetchmail.c:815 +#: fetchmail.c:835 msgid "Query status=2 (SOCKET)\n" msgstr "Статус запроса=2 (SOCKET)\n" -#: fetchmail.c:817 +#: fetchmail.c:837 msgid "Query status=3 (AUTHFAIL)\n" msgstr "Статус запроса=3 (AUTHFAIL)\n" -#: fetchmail.c:819 +#: fetchmail.c:839 msgid "Query status=4 (PROTOCOL)\n" msgstr "Статус запроса=4 (PROTOCOL)\n" -#: fetchmail.c:821 +#: fetchmail.c:841 msgid "Query status=5 (SYNTAX)\n" msgstr "Статус запроса=5 (SYNTAX)\n" -#: fetchmail.c:823 +#: fetchmail.c:843 msgid "Query status=6 (IOERR)\n" msgstr "Статус запроса=6 (IOERR)\n" -#: fetchmail.c:825 +#: fetchmail.c:845 msgid "Query status=7 (ERROR)\n" msgstr "Статус запроса=7 (ERROR)\n" -#: fetchmail.c:827 +#: fetchmail.c:847 msgid "Query status=8 (EXCLUDE)\n" msgstr "Статус запроса=8 (EXCLUDE)\n" -#: fetchmail.c:829 +#: fetchmail.c:849 msgid "Query status=9 (LOCKBUSY)\n" msgstr "Статус запроса=9 (LOCKBUSY)\n" -#: fetchmail.c:831 +#: fetchmail.c:851 msgid "Query status=10 (SMTP)\n" msgstr "Статус запроса=10 (SMTP)\n" -#: fetchmail.c:833 +#: fetchmail.c:853 msgid "Query status=11 (DNS)\n" msgstr "Статус запроса=11 (DNS)\n" -#: fetchmail.c:835 +#: fetchmail.c:855 msgid "Query status=12 (BSMTP)\n" msgstr "Статус запроса=12 (BSMTP)\n" -#: fetchmail.c:837 +#: fetchmail.c:857 msgid "Query status=13 (MAXFETCH)\n" msgstr "Статус запроса=13 (MAXFETCH)\n" -#: fetchmail.c:839 +#: fetchmail.c:859 #, c-format msgid "Query status=%d\n" msgstr "Статус запроса=%d\n" -#: fetchmail.c:881 +#: fetchmail.c:901 msgid "All connections are wedged. Exiting.\n" msgstr "Все соединения перегружены. Завершение работы.\n" -#: fetchmail.c:889 +#: fetchmail.c:909 #, c-format msgid "sleeping at %s for %d seconds\n" msgstr "в спящем режиме в %s на %d секунд\n" -#: fetchmail.c:913 +#: fetchmail.c:933 #, c-format msgid "awakened by %s\n" msgstr "разбужен %s'ом\n" -#: fetchmail.c:916 +#: fetchmail.c:936 #, c-format msgid "awakened by signal %d\n" msgstr "разбужен по сигналу %d\n" -#: fetchmail.c:924 +#: fetchmail.c:944 #, c-format msgid "awakened at %s\n" msgstr "разбужен на %s\n" -#: fetchmail.c:929 +#: fetchmail.c:949 #, c-format msgid "normal termination, status %d\n" msgstr "нормальное завершение, статус %d\n" -#: fetchmail.c:1090 +#: fetchmail.c:1113 msgid "couldn't time-check the run-control file\n" msgstr "невозможно было проверить время файла контроля запуска\n" -#: fetchmail.c:1124 +#: fetchmail.c:1147 #, c-format msgid "Warning: multiple mentions of host %s in config file\n" msgstr "Предупреждение: многократные ссылки на хост %s в файле настройки\n" @@ -963,25 +963,25 @@ msgstr "" "fetchmail: Ошибка: многократные записи \"defaults\" в файле настройки.\n" -#: fetchmail.c:1285 +#: fetchmail.c:1316 msgid "SSL support is not compiled in.\n" msgstr "Поддержка SSL не была включена при компиляции.\n" -#: fetchmail.c:1292 +#: fetchmail.c:1323 msgid "KERBEROS v4 support is configured, but not compiled in.\n" msgstr "" "Поддержка KERBEROS v4 настроена, но не была включена при компиляции.\n" -#: fetchmail.c:1298 +#: fetchmail.c:1329 msgid "KERBEROS v5 support is configured, but not compiled in.\n" msgstr "" "Поддержка KERBEROS v5 настроена, но не была включена при компиляции.\n" -#: fetchmail.c:1304 +#: fetchmail.c:1335 msgid "GSSAPI support is configured, but not compiled in.\n" msgstr "Поддержка GSSAPI настроена, но не была включена при компиляции.\n" -#: fetchmail.c:1334 +#: fetchmail.c:1365 #, c-format msgid "" "fetchmail: warning: no DNS available to check multidrop fetches from %s\n" @@ -989,18 +989,18 @@ "fetchmail: предупреждение: не доступен DNS для проверки многоканальной " "выборки из %s\n" -#: fetchmail.c:1345 +#: fetchmail.c:1376 #, c-format msgid "warning: multidrop for %s requires envelope option!\n" msgstr "предупреждение: multidrop для %s требует опцию envelope!\n" -#: fetchmail.c:1346 +#: fetchmail.c:1377 msgid "warning: Do not ask for support if all mail goes to postmaster!\n" msgstr "" "предупреждение: Не просите технической поддержки, если все сообщения " "отправляются постмастеру!\n" -#: fetchmail.c:1363 +#: fetchmail.c:1394 #, c-format msgid "" "fetchmail: %s configuration invalid, specify positive port number for " @@ -1009,7 +1009,7 @@ "fetchmail: конфигурация %s не верна, укажите положительный номер порта для " "службы\n" -#: fetchmail.c:1370 +#: fetchmail.c:1401 #, c-format msgid "" "fetchmail: %s configuration invalid, RPOP requires a privileged port\n" @@ -1017,121 +1017,121 @@ "fetchmail: конфигурация %s не верна, для RPOP требуется привилегированный " "порт\n" -#: fetchmail.c:1388 +#: fetchmail.c:1419 #, c-format msgid "%s configuration invalid, LMTP can't use default SMTP port\n" msgstr "" "конфигурация %s не верна, LMTP не может использовать порт SMTP по умолчанию\n" -#: fetchmail.c:1402 +#: fetchmail.c:1433 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n" msgstr "" "Запускать fetchall, оставляя его при этом в режиме демона или простоя, " "нельзя!\n" -#: fetchmail.c:1436 +#: fetchmail.c:1467 #, c-format msgid "terminated with signal %d\n" msgstr "завершен по сигналу %d\n" -#: fetchmail.c:1509 +#: fetchmail.c:1540 #, c-format msgid "%s querying %s (protocol %s) at %s: poll started\n" msgstr "%s запрашивает %s (протокол %s) на %s: опрос начат\n" -#: fetchmail.c:1534 +#: fetchmail.c:1565 msgid "POP2 support is not configured.\n" msgstr "Поддержка POP2 не настроена.\n" -#: fetchmail.c:1546 +#: fetchmail.c:1577 msgid "POP3 support is not configured.\n" msgstr "Поддержка POP3 не настроена.\n" -#: fetchmail.c:1556 +#: fetchmail.c:1587 msgid "IMAP support is not configured.\n" msgstr "Поддержка IMAP не настроена.\n" -#: fetchmail.c:1562 +#: fetchmail.c:1593 msgid "ETRN support is not configured.\n" msgstr "Поддержка ETRN не настроена.\n" -#: fetchmail.c:1570 +#: fetchmail.c:1601 msgid "ODMR support is not configured.\n" msgstr "Поддержка ODMR не настроена.\n" -#: fetchmail.c:1577 +#: fetchmail.c:1608 msgid "unsupported protocol selected.\n" msgstr "выбран неподдерживаемый протокол.\n" -#: fetchmail.c:1588 +#: fetchmail.c:1619 #, c-format msgid "%s querying %s (protocol %s) at %s: poll completed\n" msgstr "%s запрашивает %s (протокол %s) на %s: опрос завершен\n" -#: fetchmail.c:1613 +#: fetchmail.c:1644 #, c-format msgid "Poll interval is %d seconds\n" msgstr "Интервал опроса - %d секунд\n" -#: fetchmail.c:1615 +#: fetchmail.c:1646 #, c-format msgid "Logfile is %s\n" msgstr "Лог-файл - %s\n" -#: fetchmail.c:1617 +#: fetchmail.c:1648 #, c-format msgid "Idfile is %s\n" msgstr "ID-файл - %s\n" -#: fetchmail.c:1620 +#: fetchmail.c:1651 msgid "Progress messages will be logged via syslog\n" msgstr "Обработка сообщений будет регистрироваться через syslog\n" -#: fetchmail.c:1623 +#: fetchmail.c:1654 msgid "Fetchmail will masquerade and will not generate Received\n" msgstr "Fetchmail включит маскировку и не создаст поле Received\n" -#: fetchmail.c:1625 +#: fetchmail.c:1656 msgid "Fetchmail will show progress dots even in logfiles.\n" msgstr "" "Fetchmail будет отображать точечную строку прогресса даже в log-файлах.\n" -#: fetchmail.c:1627 +#: fetchmail.c:1658 #, c-format msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n" msgstr "" "Fetchmail будет пересылать многоканальные сообщения без адреса на %s.\n" -#: fetchmail.c:1631 +#: fetchmail.c:1662 msgid "Fetchmail will direct error mail to the postmaster.\n" msgstr "Fetchmail направит ошибочное письмо постмастеру.\n" -#: fetchmail.c:1633 +#: fetchmail.c:1664 msgid "Fetchmail will direct error mail to the sender.\n" msgstr "Fetchmail направит ошибочное письмо отправителю.\n" -#: fetchmail.c:1636 +#: fetchmail.c:1667 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n" msgstr "" "Fetchmail рассматривает долговременные ошибки как постоянные (удалять " "сообщения).\n" -#: fetchmail.c:1638 +#: fetchmail.c:1669 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n" msgstr "" "Fetchmail будет считать постоянные ошибки временными (сохранит сообщения).\n" -#: fetchmail.c:1645 +#: fetchmail.c:1676 #, c-format msgid "Options for retrieving from %s@%s:\n" msgstr "Параметры для получения из %s@%s:\n" -#: fetchmail.c:1649 +#: fetchmail.c:1680 #, c-format msgid " Mail will be retrieved via %s\n" msgstr " Почта будет получена через %s\n" -#: fetchmail.c:1652 +#: fetchmail.c:1683 #, c-format msgid " Poll of this server will occur every %d interval.\n" msgid_plural " Poll of this server will occur every %d intervals.\n" @@ -1139,186 +1139,186 @@ msgstr[1] " Опрос этого сервера будет выполняться каждые %d интервала.\n" msgstr[2] " Опрос этого сервера будет выполняться каждые %d интервалов.\n" -#: fetchmail.c:1656 +#: fetchmail.c:1687 #, c-format msgid " True name of server is %s.\n" msgstr " Настоящее имя севера - %s.\n" -#: fetchmail.c:1659 +#: fetchmail.c:1690 msgid " This host will not be queried when no host is specified.\n" msgstr " Когда хост не указан, этот хост не будет запрошен.\n" -#: fetchmail.c:1660 +#: fetchmail.c:1691 msgid " This host will be queried when no host is specified.\n" msgstr " Когда хост не указан, будет запрошен этот хост.\n" -#: fetchmail.c:1664 +#: fetchmail.c:1695 msgid " Password will be prompted for.\n" msgstr " Будет затребован пароль.\n" -#: fetchmail.c:1668 +#: fetchmail.c:1699 #, c-format msgid " APOP secret = \"%s\".\n" msgstr " Секрет APOP = \"%s\".\n" -#: fetchmail.c:1671 +#: fetchmail.c:1702 #, c-format msgid " RPOP id = \"%s\".\n" msgstr " RPOP id = \"%s\".\n" -#: fetchmail.c:1674 +#: fetchmail.c:1705 #, c-format msgid " Password = \"%s\".\n" msgstr " Пароль = \"%s\".\n" -#: fetchmail.c:1683 +#: fetchmail.c:1714 #, c-format msgid " Protocol is KPOP with Kerberos %s authentication" msgstr " Протокол - KPOP с аутентификацией Kerberos %s" -#: fetchmail.c:1686 +#: fetchmail.c:1717 #, c-format msgid " Protocol is %s" msgstr " Протокол - %s" -#: fetchmail.c:1688 +#: fetchmail.c:1719 #, c-format msgid " (using service %s)" msgstr " (используется служба %s)" -#: fetchmail.c:1690 +#: fetchmail.c:1721 msgid " (using default port)" msgstr " (используется порт по умолчанию)" -#: fetchmail.c:1692 +#: fetchmail.c:1723 msgid " (forcing UIDL use)" msgstr " (принудительно используется UIDL)" -#: fetchmail.c:1698 +#: fetchmail.c:1729 msgid " All available authentication methods will be tried.\n" msgstr " Будут испробованы все доступные способы аутентификации.\n" -#: fetchmail.c:1701 +#: fetchmail.c:1732 msgid " Password authentication will be forced.\n" msgstr " Будет использована принудительная аутентификация с паролем.\n" -#: fetchmail.c:1704 +#: fetchmail.c:1735 msgid " MSN authentication will be forced.\n" msgstr " Будет использована принудительная аутентификация MSN.\n" -#: fetchmail.c:1707 +#: fetchmail.c:1738 msgid " NTLM authentication will be forced.\n" msgstr " Будет использована принудительная аутентификация NTLM.\n" -#: fetchmail.c:1710 +#: fetchmail.c:1741 msgid " OTP authentication will be forced.\n" msgstr " Будет использована принудительная аутентификация OTP.\n" -#: fetchmail.c:1713 +#: fetchmail.c:1744 msgid " CRAM-MD5 authentication will be forced.\n" msgstr "" -#: fetchmail.c:1716 +#: fetchmail.c:1747 msgid " GSSAPI authentication will be forced.\n" msgstr " Будет использована принудительная аутентификация GSSAPI.\n" -#: fetchmail.c:1719 +#: fetchmail.c:1750 msgid " Kerberos V4 authentication will be forced.\n" msgstr " Будет использована принудительная аутентификация Kerberos V4.\n" -#: fetchmail.c:1722 +#: fetchmail.c:1753 msgid " Kerberos V5 authentication will be forced.\n" msgstr " Будет использована принудительная аутентификация Kerberos V5.\n" -#: fetchmail.c:1725 +#: fetchmail.c:1756 msgid " End-to-end encryption assumed.\n" msgstr " Допускается оперативное шифрование.\n" -#: fetchmail.c:1729 +#: fetchmail.c:1760 #, c-format msgid " Mail service principal is: %s\n" msgstr " Принципал почтовой службы: %s\n" -#: fetchmail.c:1732 +#: fetchmail.c:1763 msgid " SSL encrypted sessions enabled.\n" msgstr " Включены сессии, зашифрованные SSL.\n" -#: fetchmail.c:1734 +#: fetchmail.c:1765 #, c-format msgid " SSL protocol: %s.\n" msgstr " Протокол SSL: %s.\n" -#: fetchmail.c:1736 +#: fetchmail.c:1767 msgid " SSL server certificate checking enabled.\n" msgstr " Включена проверка сертификата сервера SSL.\n" -#: fetchmail.c:1741 +#: fetchmail.c:1772 #, c-format msgid " SSL trusted certificate file: %s\n" msgstr " доверенный сертификат SSL: %s\n" -#: fetchmail.c:1743 +#: fetchmail.c:1774 #, c-format msgid " SSL trusted certificate directory: %s\n" msgstr " Каталог доверенных сертификатов SSL: %s\n" -#: fetchmail.c:1745 +#: fetchmail.c:1776 #, c-format msgid " SSL server CommonName: %s\n" msgstr " Общепринятое имя SSL-сервера: %s\n" -#: fetchmail.c:1747 +#: fetchmail.c:1778 #, c-format msgid " SSL key fingerprint (checked against the server key): %s\n" msgstr " Отпечаток ключа SSL (сверенный с ключом сервера): %s\n" -#: fetchmail.c:1750 +#: fetchmail.c:1781 #, c-format msgid " Server nonresponse timeout is %d seconds" msgstr " Таймаут молчания сервера - %d секунд" -#: fetchmail.c:1752 +#: fetchmail.c:1783 msgid " (default).\n" msgstr " (по умолчанию).\n" -#: fetchmail.c:1759 +#: fetchmail.c:1790 msgid " Default mailbox selected.\n" msgstr " Выбран почтовый ящик по умолчанию.\n" -#: fetchmail.c:1764 +#: fetchmail.c:1795 msgid " Selected mailboxes are:" msgstr " Выбранные почтовые ящики:" -#: fetchmail.c:1770 +#: fetchmail.c:1801 msgid " All messages will be retrieved (--all on).\n" msgstr " Будут получены все сообщения (--all on).\n" -#: fetchmail.c:1771 +#: fetchmail.c:1802 msgid " Only new messages will be retrieved (--all off).\n" msgstr " Будут получены только новые сообщения (--all off).\n" -#: fetchmail.c:1773 +#: fetchmail.c:1804 msgid " Fetched messages will be kept on the server (--keep on).\n" msgstr " Выбранные сообщения будут оставлены на сервере (--keep on).\n" -#: fetchmail.c:1774 +#: fetchmail.c:1805 msgid " Fetched messages will not be kept on the server (--keep off).\n" msgstr " Выбранные сообщения будут удалены с сервера (--keep off).\n" -#: fetchmail.c:1776 +#: fetchmail.c:1807 msgid "" " Old messages will be flushed before message retrieval (--flush on).\n" msgstr "" " Старые сообщения будут удалены перед получением сообщения (--flush on).\n" -#: fetchmail.c:1777 +#: fetchmail.c:1808 msgid "" " Old messages will not be flushed before message retrieval (--flush off).\n" msgstr "" " Старые сообщения не будут удалены перед получением сообщения (--flush " "off).\n" -#: fetchmail.c:1779 +#: fetchmail.c:1810 msgid "" " Oversized messages will be flushed before message retrieval (--limitflush " "on).\n" @@ -1326,7 +1326,7 @@ " Сообщения завышенного размера будут удалены перед получением сообщения (--" "limitflush on).\n" -#: fetchmail.c:1780 +#: fetchmail.c:1811 msgid "" " Oversized messages will not be flushed before message retrieval (--" "limitflush off).\n" @@ -1334,120 +1334,120 @@ " Сообщения завышенного размера не будут удалены перед получением сообщения " "(--limitflush off).\n" -#: fetchmail.c:1782 +#: fetchmail.c:1813 msgid " Rewrite of server-local addresses is enabled (--norewrite off).\n" msgstr " Перезапись локальных адресов сервера включена (--norewrite off).\n" -#: fetchmail.c:1783 +#: fetchmail.c:1814 msgid " Rewrite of server-local addresses is disabled (--norewrite on).\n" msgstr " Перезапись локальных адресов сервера выключена (--norewrite on).\n" -#: fetchmail.c:1785 +#: fetchmail.c:1816 msgid " Carriage-return stripping is enabled (stripcr on).\n" msgstr " Удаление возврата каретки включено (stripcr on).\n" -#: fetchmail.c:1786 +#: fetchmail.c:1817 msgid " Carriage-return stripping is disabled (stripcr off).\n" msgstr " Удаление возврата каретки выключено (stripcr off).\n" -#: fetchmail.c:1788 +#: fetchmail.c:1819 msgid " Carriage-return forcing is enabled (forcecr on).\n" msgstr " Принудительный возврат каретки включен (forcecr on).\n" -#: fetchmail.c:1789 +#: fetchmail.c:1820 msgid " Carriage-return forcing is disabled (forcecr off).\n" msgstr " Принудительный возврат каретки выключен (forcecr off).\n" -#: fetchmail.c:1791 +#: fetchmail.c:1822 msgid "" " Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n" msgstr "" " Интерпретация кодировки передаваемого контента выключена (pass8bits on).\n" -#: fetchmail.c:1792 +#: fetchmail.c:1823 msgid "" " Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n" msgstr "" " Интерпретация кодировки передаваемого контента включена (pass8bits off).\n" -#: fetchmail.c:1794 +#: fetchmail.c:1825 msgid " MIME decoding is enabled (mimedecode on).\n" msgstr " MIME-декодирование включено (mimedecode on).\n" -#: fetchmail.c:1795 +#: fetchmail.c:1826 msgid " MIME decoding is disabled (mimedecode off).\n" msgstr " MIME-декодирование выключено (mimedecode off).\n" -#: fetchmail.c:1797 +#: fetchmail.c:1828 msgid " Idle after poll is enabled (idle on).\n" msgstr " Простой после опроса включен (idle on).\n" -#: fetchmail.c:1798 +#: fetchmail.c:1829 msgid " Idle after poll is disabled (idle off).\n" msgstr " Простой после опроса выключен (idle off).\n" -#: fetchmail.c:1800 +#: fetchmail.c:1831 msgid " Nonempty Status lines will be discarded (dropstatus on)\n" msgstr " Непустые строки состояния будут удалены (dropstatus on)\n" -#: fetchmail.c:1801 +#: fetchmail.c:1832 msgid " Nonempty Status lines will be kept (dropstatus off)\n" msgstr " Непустые строки состояния будут сохранены (dropstatus off)\n" -#: fetchmail.c:1803 +#: fetchmail.c:1834 msgid " Delivered-To lines will be discarded (dropdelivered on)\n" msgstr " Строки Delivered-To будут удалены (dropdelivered on)\n" -#: fetchmail.c:1804 +#: fetchmail.c:1835 msgid " Delivered-To lines will be kept (dropdelivered off)\n" msgstr " Строки Delivered-To будут сохранены (dropdelivered off)\n" -#: fetchmail.c:1808 +#: fetchmail.c:1839 #, c-format msgid " Message size limit is %d octets (--limit %d).\n" msgstr " Ограничение на размер сообщения - %d октетов (--limit %d).\n" -#: fetchmail.c:1811 +#: fetchmail.c:1842 msgid " No message size limit (--limit 0).\n" msgstr " Нет ограничения на размер сообщения (--limit 0).\n" -#: fetchmail.c:1813 +#: fetchmail.c:1844 #, c-format msgid " Message size warning interval is %d seconds (--warnings %d).\n" msgstr "" " Интервал между предупреждениями о размере сообщения - %d секунд (--" "warnings %d).\n" -#: fetchmail.c:1816 +#: fetchmail.c:1847 msgid " Size warnings on every poll (--warnings 0).\n" msgstr " Предупреждения о размере при каждом опросе (--warnings 0).\n" -#: fetchmail.c:1819 +#: fetchmail.c:1850 #, c-format msgid " Received-message limit is %d (--fetchlimit %d).\n" msgstr " Ограничение на полученные сообщения - %d (--fetchlimit %d).\n" -#: fetchmail.c:1822 +#: fetchmail.c:1853 msgid " No received-message limit (--fetchlimit 0).\n" msgstr " Нет ограничения на полученные сообщения (--fetchlimit 0).\n" -#: fetchmail.c:1824 +#: fetchmail.c:1855 #, c-format msgid " Fetch message size limit is %d (--fetchsizelimit %d).\n" msgstr "" " Ограничение на размер выборки сообщений - %d (--fetchsizelimit %d).\n" -#: fetchmail.c:1827 +#: fetchmail.c:1858 msgid " No fetch message size limit (--fetchsizelimit 0).\n" msgstr "" " Нет ограничения на размер выборки сообщений (--fetchsizelimit 0).\n" -#: fetchmail.c:1831 +#: fetchmail.c:1862 msgid " Do binary search of UIDs during each poll (--fastuidl 1).\n" msgstr "" " Выполнять двоичный поиск UID'ов во время каждого опроса (--fastuidl -1).\n" -#: fetchmail.c:1833 +#: fetchmail.c:1864 #, c-format msgid "" " Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n" @@ -1455,103 +1455,103 @@ " Выполнять двоичный поиск UID'ов во время %d из %d опросов (--fastuidl " "%d).\n" -#: fetchmail.c:1836 +#: fetchmail.c:1867 msgid " Do linear search of UIDs during each poll (--fastuidl 0).\n" msgstr "" " Выполнять линейный поиск UID'ов во время каждого опроса (--fastuidl 0).\n" -#: fetchmail.c:1838 +#: fetchmail.c:1869 #, c-format msgid " SMTP message batch limit is %d.\n" msgstr " Ограничение на пакет SMTP-сообщений - %d.\n" -#: fetchmail.c:1840 +#: fetchmail.c:1871 msgid " No SMTP message batch limit (--batchlimit 0).\n" msgstr " Нет ограничения на пакет SMTP-сообщений (--batchlimit 0).\n" -#: fetchmail.c:1844 +#: fetchmail.c:1875 #, c-format msgid " Deletion interval between expunges forced to %d (--expunge %d).\n" msgstr "" " Интервал между удалениями принудительно установлен в %d (--expunge %d).\n" -#: fetchmail.c:1846 +#: fetchmail.c:1877 msgid " No forced expunges (--expunge 0).\n" msgstr " Нет принудительных удалений (--expunge 0).\n" -#: fetchmail.c:1853 +#: fetchmail.c:1884 msgid " Domains for which mail will be fetched are:" msgstr " Домены, для которых будет выполняться выборка почты:" -#: fetchmail.c:1858 fetchmail.c:1878 +#: fetchmail.c:1889 fetchmail.c:1909 msgid " (default)" msgstr " (по умолчанию)" -#: fetchmail.c:1863 +#: fetchmail.c:1894 #, c-format msgid " Messages will be appended to %s as BSMTP\n" msgstr " Сообщения будут прикреплены к %s как BSMTP\n" -#: fetchmail.c:1865 +#: fetchmail.c:1896 #, c-format msgid " Messages will be delivered with \"%s\".\n" msgstr " Сообщения будут доставлены с \"%s\".\n" -#: fetchmail.c:1872 +#: fetchmail.c:1903 #, c-format msgid " Messages will be %cMTP-forwarded to:" msgstr " Сообщения будут переадресованы по %cMTP на:" -#: fetchmail.c:1883 +#: fetchmail.c:1914 #, c-format msgid " Host part of MAIL FROM line will be %s\n" msgstr " Часть хоста из строки MAIL FROM будет %s\n" -#: fetchmail.c:1886 +#: fetchmail.c:1917 #, c-format msgid " Address to be put in RCPT TO lines shipped to SMTP will be %s\n" msgstr "" " Адрес, вставляемый в строки RCPT TO, отправляемые по SMTP, будет %s\n" -#: fetchmail.c:1895 +#: fetchmail.c:1926 msgid " Recognized listener spam block responses are:" msgstr " Ответные действия на распознанные слушателем спам-блоки:" -#: fetchmail.c:1901 +#: fetchmail.c:1932 msgid " Spam-blocking disabled\n" msgstr " Блокировка спама отключена\n" -#: fetchmail.c:1904 +#: fetchmail.c:1935 #, c-format msgid " Server connection will be brought up with \"%s\".\n" msgstr " Подключение к серверу будет установлено с \"%s\".\n" -#: fetchmail.c:1907 +#: fetchmail.c:1938 msgid " No pre-connection command.\n" msgstr " Нет команды, выполняемой до соединения.\n" -#: fetchmail.c:1909 +#: fetchmail.c:1940 #, c-format msgid " Server connection will be taken down with \"%s\".\n" msgstr " Подключение к серверу будет разорвано с \"%s\".\n" -#: fetchmail.c:1912 +#: fetchmail.c:1943 msgid " No post-connection command.\n" msgstr " Нет команды, выполняемой после соединения.\n" -#: fetchmail.c:1915 +#: fetchmail.c:1946 msgid " No localnames declared for this host.\n" msgstr " Нет локальных имен, объявленных для этого хоста.\n" -#: fetchmail.c:1925 +#: fetchmail.c:1956 msgid " Multi-drop mode: " msgstr " Многоканальный режим: " -#: fetchmail.c:1927 +#: fetchmail.c:1958 msgid " Single-drop mode: " msgstr " Одноканальный режим: " -#: fetchmail.c:1929 +#: fetchmail.c:1960 #, c-format msgid "%d local name recognized.\n" msgid_plural "%d local names recognized.\n" @@ -1559,122 +1559,122 @@ msgstr[1] "распознано %d локальных имени.\n" msgstr[2] "распознано %d локальных имен.\n" -#: fetchmail.c:1944 +#: fetchmail.c:1975 msgid " DNS lookup for multidrop addresses is enabled.\n" msgstr " DNS-запрос для многоканальных адресов включен.\n" -#: fetchmail.c:1945 +#: fetchmail.c:1976 msgid " DNS lookup for multidrop addresses is disabled.\n" msgstr " DNS-запрос для многоканальных адресов выключен.\n" -#: fetchmail.c:1949 +#: fetchmail.c:1980 msgid "" " Server aliases will be compared with multidrop addresses by IP address.\n" msgstr "" " Алисы сервера будут сравнены с многоканальными адресами по IP-адресу.\n" -#: fetchmail.c:1951 +#: fetchmail.c:1982 msgid " Server aliases will be compared with multidrop addresses by name.\n" msgstr "" " Алисы сервера будут сравнены с многоканальными адресами по имени.\n" -#: fetchmail.c:1954 +#: fetchmail.c:1985 msgid " Envelope-address routing is disabled\n" msgstr " Маршрутизация охватывающего адреса отключена\n" -#: fetchmail.c:1957 +#: fetchmail.c:1988 #, c-format msgid " Envelope header is assumed to be: %s\n" msgstr " Охватывающий заголовок должен быть: %s\n" -#: fetchmail.c:1960 +#: fetchmail.c:1991 #, c-format msgid " Number of envelope headers to be skipped over: %d\n" msgstr " Количество пропускаемых охватывающих заголовков: %d\n" -#: fetchmail.c:1963 +#: fetchmail.c:1994 #, c-format msgid " Prefix %s will be removed from user id\n" msgstr " Префикс %s будет удален из id пользователя\n" -#: fetchmail.c:1966 +#: fetchmail.c:1997 msgid " No prefix stripping\n" msgstr " Нет разборки префикса\n" -#: fetchmail.c:1971 +#: fetchmail.c:2002 msgid " Predeclared mailserver aliases:" msgstr " Ранее объявленные алиасы почтового сервера:" -#: fetchmail.c:1979 +#: fetchmail.c:2010 msgid " Local domains:" msgstr " Локальные домены:" -#: fetchmail.c:1989 +#: fetchmail.c:2020 #, c-format msgid " Connection must be through interface %s.\n" msgstr " Подключение должно быть через интерфейс %s.\n" -#: fetchmail.c:1991 +#: fetchmail.c:2022 msgid " No interface requirement specified.\n" msgstr " Не указаны требования интерфейса.\n" -#: fetchmail.c:1993 +#: fetchmail.c:2024 #, c-format msgid " Polling loop will monitor %s.\n" msgstr " Цикл опроса будет наблюдать за %s.\n" -#: fetchmail.c:1995 +#: fetchmail.c:2026 msgid " No monitor interface specified.\n" msgstr " Не указан интерфейс монитора.\n" -#: fetchmail.c:1999 +#: fetchmail.c:2030 #, c-format msgid " Server connections will be made via plugin %s (--plugin %s).\n" msgstr "" " Подключения к серверу будут выполняться посредством плагина %s (--plugin " "%s).\n" -#: fetchmail.c:2001 +#: fetchmail.c:2032 msgid " No plugin command specified.\n" msgstr " Не указана команда плагина.\n" -#: fetchmail.c:2003 +#: fetchmail.c:2034 #, c-format msgid " Listener connections will be made via plugout %s (--plugout %s).\n" msgstr "" " Подключения слушателя будут выполняться через plugout %s (--plugout %s).\n" -#: fetchmail.c:2005 +#: fetchmail.c:2036 msgid " No plugout command specified.\n" msgstr " Не указана команда plugout'а.\n" -#: fetchmail.c:2012 +#: fetchmail.c:2043 msgid " No UIDs saved from this host.\n" msgstr " С этого хоста нет сохраненных UID'ов.\n" -#: fetchmail.c:2015 +#: fetchmail.c:2046 #, c-format msgid " %d UIDs saved.\n" msgstr " Сохранено %d UID'ов.\n" -#: fetchmail.c:2021 +#: fetchmail.c:2052 msgid " Poll trace information will be added to the Received header.\n" msgstr "" " Информация с трассировкой опроса будет добавлена в заголовок Received.\n" -#: fetchmail.c:2023 +#: fetchmail.c:2054 msgid " No poll trace information will be added to the Received header.\n" msgstr "" -#: fetchmail.c:2028 +#: fetchmail.c:2059 msgid " Messages with bad headers will be rejected.\n" msgstr " Сообщения с плохими заголовками будут отбрасываться.\n" -#: fetchmail.c:2031 +#: fetchmail.c:2062 msgid " Messages with bad headers will be passed on.\n" msgstr " Сообщения с плохими заголовками будут предаваться.\n" -#: fetchmail.c:2036 +#: fetchmail.c:2067 #, c-format msgid " Pass-through properties \"%s\".\n" msgstr " Свойства ретрансляции \"%s\".\n" @@ -2535,15 +2535,15 @@ msgid "Option --folder is not supported with POP3\n" msgstr "Опция --folder не поддерживается с POP3\n" -#: rcfile_y.y:132 +#: rcfile_y.y:130 msgid "server option after user options" msgstr "опция сервера после опций пользователя" -#: rcfile_y.y:175 +#: rcfile_y.y:173 msgid "SDPS not enabled." msgstr "SDPS не включен." -#: rcfile_y.y:219 +#: rcfile_y.y:217 msgid "" "fetchmail: interface option is only supported under Linux (without IPv6) and " "FreeBSD\n" @@ -2551,32 +2551,32 @@ "fetchmail: опция interface поддерживается только в Linux (без IPv6) и " "FreeBSD\n" -#: rcfile_y.y:227 +#: rcfile_y.y:225 msgid "" "fetchmail: monitor option is only supported under Linux (without IPv6) and " "FreeBSD\n" msgstr "" "fetchmail: опция monitor поддерживается только в Linux (без IPv6) и FreeBSD\n" -#: rcfile_y.y:341 +#: rcfile_y.y:339 msgid "SSL is not enabled" msgstr "SSL не включен" -#: rcfile_y.y:393 +#: rcfile_y.y:391 msgid "end of input" msgstr "конец ввода" -#: rcfile_y.y:431 +#: rcfile_y.y:429 #, c-format msgid "File %s must be a regular file.\n" msgstr "Файл %s должен быть обычным файлом.\n" -#: rcfile_y.y:441 +#: rcfile_y.y:439 #, c-format msgid "File %s must have no more than -rwx------ (0700) permissions.\n" msgstr "Файл %s должен иметь прав доступа не более -rwx------ (0700).\n" -#: rcfile_y.y:453 +#: rcfile_y.y:451 #, c-format msgid "File %s must be owned by you.\n" msgstr "Владельцем файла %s должны быть вы.\n" @@ -2959,211 +2959,211 @@ msgid "smtp listener protocol error\n" msgstr "ошибка протокола слушателя smtp\n" -#: socket.c:111 socket.c:140 +#: socket.c:112 socket.c:141 msgid "fetchmail: malloc failed\n" msgstr "fetchmail: сбой malloc\n" -#: socket.c:172 +#: socket.c:173 msgid "fetchmail: socketpair failed\n" msgstr "fetchmail: сбой socketpair\n" -#: socket.c:178 +#: socket.c:179 msgid "fetchmail: fork failed\n" msgstr "fetchmail: не удалось создать дочерний процесс\n" -#: socket.c:185 +#: socket.c:186 msgid "dup2 failed\n" msgstr "сбой dup2\n" -#: socket.c:191 +#: socket.c:192 #, c-format msgid "running %s (host %s service %s)\n" msgstr "запущен %s (хост %s служба %s)\n" -#: socket.c:196 +#: socket.c:197 #, c-format msgid "execvp(%s) failed\n" msgstr "сбой execvp(%s)\n" -#: socket.c:271 +#: socket.c:272 #, c-format msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n" msgstr "ошибка getaddrinfo(\"%s\",\"%s\"): %s\n" -#: socket.c:274 +#: socket.c:275 msgid "Try adding the --service option (see also FAQ item R12).\n" msgstr "Попробуйте добавить опцию --service (см. FAQ, пункт R12).\n" -#: socket.c:288 socket.c:291 +#: socket.c:289 socket.c:292 #, c-format msgid "unknown (%s)" msgstr "неизв. (%s)" -#: socket.c:294 +#: socket.c:295 #, c-format msgid "Trying to connect to %s/%s..." msgstr "Попытка подключения к %s/%s..." -#: socket.c:303 +#: socket.c:304 #, c-format msgid "cannot create socket: %s\n" msgstr "невозможно создать сокет: %s\n" -#: socket.c:305 +#: socket.c:306 #, c-format msgid "name %d: cannot create socket family %d type %d: %s\n" msgstr "" -#: socket.c:323 +#: socket.c:324 msgid "connection failed.\n" msgstr "не удалось подключиться.\n" -#: socket.c:325 +#: socket.c:326 #, c-format msgid "connection to %s:%s [%s/%s] failed: %s.\n" msgstr "сбой подключения к %s:%s [%s/%s]: %s.\n" -#: socket.c:326 +#: socket.c:327 #, c-format msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n" msgstr "" -#: socket.c:332 +#: socket.c:333 msgid "connected.\n" msgstr "соединение установлено.\n" -#: socket.c:345 +#: socket.c:346 #, c-format msgid "" "Connection errors for this poll:\n" "%s" msgstr "" -#: socket.c:411 +#: socket.c:416 #, c-format msgid "OpenSSL reported: %s\n" msgstr "" -#: socket.c:652 +#: socket.c:657 msgid "Server certificate:\n" msgstr "" -#: socket.c:657 +#: socket.c:662 #, c-format msgid "Certificate chain, from root to peer, starting at depth %d:\n" msgstr "" -#: socket.c:660 +#: socket.c:665 #, c-format msgid "Certificate at depth %d:\n" msgstr "" -#: socket.c:666 +#: socket.c:671 #, c-format msgid "Issuer Organization: %s\n" msgstr "Запрашивающая организация: %s\n" -#: socket.c:669 +#: socket.c:674 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n" msgstr "" "Предупреждение: имя запрашивающей организации слишком длинное (возможно " "укорочено).\n" -#: socket.c:671 +#: socket.c:676 msgid "Unknown Organization\n" msgstr "Неизвестная организация\n" -#: socket.c:673 +#: socket.c:678 #, c-format msgid "Issuer CommonName: %s\n" msgstr "Общепринятое имя: %s\n" -#: socket.c:676 +#: socket.c:681 msgid "Warning: Issuer CommonName too long (possibly truncated).\n" msgstr "" "Предупреждение: общепринятое имя слишком длинное (возможно укорочено).\n" -#: socket.c:678 +#: socket.c:683 msgid "Unknown Issuer CommonName\n" msgstr "Неизвестное общепринятое имя\n" -#: socket.c:684 +#: socket.c:689 #, c-format msgid "Subject CommonName: %s\n" msgstr "" -#: socket.c:690 +#: socket.c:695 msgid "Bad certificate: Subject CommonName too long!\n" msgstr "Неправильный сертификат: общее название Темы слишком длинное!\n" -#: socket.c:696 +#: socket.c:701 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n" msgstr "" -#: socket.c:724 +#: socket.c:729 #, c-format msgid "Subject Alternative Name: %s\n" msgstr "" -#: socket.c:730 +#: socket.c:735 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n" msgstr "" -#: socket.c:747 +#: socket.c:752 #, c-format msgid "Server CommonName mismatch: %s != %s\n" msgstr "Несовпадение общепринятого имени сервера: %s != %s\n" -#: socket.c:754 +#: socket.c:759 msgid "Server name not set, could not verify certificate!\n" msgstr "Имя сервера не установлено, невозможно проверить сертификат!\n" -#: socket.c:759 +#: socket.c:764 msgid "Unknown Server CommonName\n" msgstr "Неизвестное общепринятое имя сервера\n" -#: socket.c:761 +#: socket.c:766 msgid "Server name not specified in certificate!\n" msgstr "Имя сервера не указано в сертификате!\n" -#: socket.c:773 +#: socket.c:778 msgid "EVP_md5() failed!\n" msgstr "сбой EVP_md5()!\n" -#: socket.c:777 +#: socket.c:782 msgid "Out of memory!\n" msgstr "Нехватка памяти!\n" -#: socket.c:785 +#: socket.c:790 msgid "Digest text buffer too small!\n" msgstr "Буфер текстового журнала слишком мал!\n" -#: socket.c:791 +#: socket.c:796 #, c-format msgid "%s key fingerprint: %s\n" msgstr "Отпечаток ключа %s: %s\n" -#: socket.c:795 +#: socket.c:800 #, c-format msgid "%s fingerprints match.\n" msgstr "Отпечатки %s совпадают.\n" -#: socket.c:797 +#: socket.c:802 #, c-format msgid "%s fingerprints do not match!\n" msgstr "Отпечатки %s не совпадают!\n" -#: socket.c:809 +#: socket.c:814 #, c-format msgid "Server certificate verification error: %s\n" msgstr "Ошибка проверки сертификата сервера: %s\n" -#: socket.c:824 +#: socket.c:829 #, c-format msgid "Broken certification chain at: %s\n" msgstr "" -#: socket.c:826 +#: socket.c:831 msgid "" "This could mean that the server did not provide the intermediate CA's " "certificate(s), which is nothing fetchmail could do anything about. For " @@ -3171,7 +3171,7 @@ "fetchmail.\n" msgstr "" -#: socket.c:836 +#: socket.c:841 #, c-format msgid "Missing trust anchor certificate: %s\n" msgstr "" @@ -3184,7 +3184,7 @@ "sslcertfile in the manual page.\n" msgstr "" -#: socket.c:1100 +#: socket.c:1106 msgid "File descriptor out of range for SSL" msgstr "Дескриптор файла вне диапазона SSL" @@ -3199,21 +3199,21 @@ "Указан неверный протокол SSL '%s', используется протокол по умолчанию " "(SSLv23).\n" -#: socket.c:1274 +#: socket.c:1280 msgid "Certificate/fingerprint verification was somehow skipped!\n" msgstr "Проверка сертификата/отпечатка была как-то пропущена!\n" -#: socket.c:1291 +#: socket.c:1297 msgid "" "Warning: the connection is insecure, continuing anyways. (Better use --" "sslcertck!)\n" msgstr "" -#: socket.c:1333 +#: socket.c:1339 msgid "Cygwin socket read retry\n" msgstr "Повторная попытка чтения сокета Cygwin\n" -#: socket.c:1336 +#: socket.c:1342 msgid "Cygwin socket read retry failed!\n" msgstr "Сбой повторного чтения сокета Cygwin!\n" @@ -3333,7 +3333,7 @@ msgid "Old UID list from %s:" msgstr "Старый список UID из %s:" -#: uid.c:266 uid.c:275 uid.c:343 +#: uid.c:277 uid.c:286 uid.c:355 msgid " " msgstr " <пусто>" @@ -3355,43 +3355,43 @@ msgid "swapping UID lists\n" msgstr "обмениваются списки UID\n" -#: uid.c:390 +#: uid.c:402 msgid "not swapping UID lists, no UIDs seen this query\n" msgstr "списки UID не обмениваются, в этом запросе нет UID'ов\n" -#: uid.c:410 +#: uid.c:422 msgid "discarding new UID list\n" msgstr "отбрасывается новый список UID\n" -#: uid.c:467 +#: uid.c:479 msgid "Deleting fetchids file.\n" msgstr "Удаляется файл fetchids.\n" -#: uid.c:470 +#: uid.c:482 #, c-format msgid "Error deleting %s: %s\n" msgstr "Ошибка удаления %s: %s\n" -#: uid.c:477 +#: uid.c:489 msgid "Writing fetchids file.\n" msgstr "Записывается файл fetchids.\n" -#: uid.c:491 uid.c:500 +#: uid.c:503 uid.c:512 #, c-format msgid "Write error on fetchids file %s: %s\n" msgstr "" -#: uid.c:512 +#: uid.c:524 #, c-format msgid "Error writing to fetchids file %s, old file left in place.\n" msgstr "Ошибка записи в fetchids-файл %s, старый файл остался на месте.\n" -#: uid.c:516 +#: uid.c:528 #, c-format msgid "Cannot rename fetchids file %s to %s: %s\n" msgstr "Невозможно переименовать fetchids-файл %s в %s: %s\n" -#: uid.c:520 +#: uid.c:532 #, c-format msgid "Cannot open fetchids file %s for writing: %s\n" msgstr "Невозможно открыть fetchids-файл %s для записи: %s\n" diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/friendly-recovery.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/friendly-recovery.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/friendly-recovery.po 2020-01-23 16:52:18.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/friendly-recovery.po 2020-07-08 13:54:20.000000000 +0000 @@ -14,8 +14,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 11:45+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:31+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: ../lib/recovery-mode/options/apt-snapshots:20 #, sh-format diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/gas.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/gas.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/gas.po 2020-01-23 16:52:10.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/gas.po 2020-07-08 13:54:12.000000000 +0000 @@ -8,7 +8,7 @@ "Project-Id-Version: gas 2.30.0\n" "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n" "POT-Creation-Date: 2018-01-13 13:44+0000\n" -"PO-Revision-Date: 2019-06-05 20:04+0000\n" +"PO-Revision-Date: 2020-04-22 13:22+0000\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -16,8 +16,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2020-01-23 10:37+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:34+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ru\n" "X-Bugs: Report translation errors to the Language-Team address.\n" @@ -202,7 +202,7 @@ " --size-check=[error|warning]\n" "\t\t\t проверка директивы .size в ELF (по умолчанию --size-check=error)\n" -#: as.c:303 +#: as.c:302 #, c-format msgid "" " --elf-stt-common=[no|yes]\n" @@ -491,7 +491,7 @@ msgid "GNU assembler %s\n" msgstr "GNU ассемблер %s\n" -#: as.c:673 +#: as.c:659 #, c-format msgid "Copyright (C) 2018 Free Software Foundation, Inc.\n" msgstr "Copyright (C) 2018 Free Software Foundation, Inc.\n" @@ -2028,7 +2028,7 @@ msgid "selected processor does not support `%s'" msgstr "выбранный процессор не поддерживает «%s»" -#: config/tc-aarch64.c:7544 config/tc-arm.c:27479 +#: config/tc-aarch64.c:7544 config/tc-arm.c:27481 msgid "GOT already in the symbol table" msgstr "GOT уже в таблице символов" @@ -2054,8 +2054,8 @@ msgid "immediate offset out of range" msgstr "непосредственное смещение за пределами диапазона" -#: config/tc-aarch64.c:7953 config/tc-arm.c:27817 config/tc-arm.c:27885 -#: config/tc-arm.c:28167 +#: config/tc-aarch64.c:7953 config/tc-arm.c:27819 config/tc-arm.c:27887 +#: config/tc-arm.c:28169 #, c-format msgid "undefined symbol %s used as an immediate value" msgstr "неопределенный символ %s используется как непосредственное значение" @@ -2077,7 +2077,7 @@ msgid "conditional branch target not word aligned" msgstr "цель условного ветвления не выровнена по границе слова" -#: config/tc-aarch64.c:7995 config/tc-aarch64.c:8010 config/tc-arm.c:28462 +#: config/tc-aarch64.c:7995 config/tc-aarch64.c:8010 config/tc-arm.c:28464 msgid "conditional branch out of range" msgstr "цель условного ветвления за пределами диапазона" @@ -2085,14 +2085,14 @@ msgid "branch target not word aligned" msgstr "цель ветвления не выровнена по границе слова" -#: config/tc-aarch64.c:8026 config/tc-arm.c:899 config/tc-arm.c:29265 +#: config/tc-aarch64.c:8026 config/tc-arm.c:899 config/tc-arm.c:29267 #: config/tc-mips.c:16047 config/tc-mips.c:16063 config/tc-mips.c:16153 msgid "branch out of range" msgstr "ветвление за пределами диапазона" -#: config/tc-aarch64.c:8085 config/tc-arm.c:28058 config/tc-arm.c:28073 -#: config/tc-arm.c:28088 config/tc-arm.c:28099 config/tc-arm.c:28122 -#: config/tc-arm.c:28969 config/tc-moxie.c:716 config/tc-pj.c:452 +#: config/tc-aarch64.c:8085 config/tc-arm.c:28060 config/tc-arm.c:28075 +#: config/tc-arm.c:28090 config/tc-arm.c:28101 config/tc-arm.c:28124 +#: config/tc-arm.c:28971 config/tc-moxie.c:716 config/tc-pj.c:452 #: config/tc-sh.c:3727 msgid "offset out of range" msgstr "смещение вне диапазона" @@ -2110,7 +2110,7 @@ msgid "unexpected %s fixup" msgstr "неожиданное местоположение %s" -#: config/tc-aarch64.c:8327 config/tc-arm.c:29685 config/tc-arm.c:29706 +#: config/tc-aarch64.c:8327 config/tc-arm.c:29687 config/tc-arm.c:29708 #: config/tc-mips.c:18414 config/tc-or1k.c:345 config/tc-score.c:7468 #, c-format msgid "cannot represent %s relocation in this object file format" @@ -2122,16 +2122,16 @@ msgid "cannot do %u-byte relocation" msgstr "невозможно выполнить %u-байтовое перемещение" -#: config/tc-aarch64.c:8683 config/tc-arm.c:30180 config/tc-score.c:6293 +#: config/tc-aarch64.c:8683 config/tc-arm.c:30182 config/tc-score.c:6293 #: config/tc-score.c:6523 config/tc-score.c:6528 msgid "virtual memory exhausted" msgstr "закончилась виртуальная память" -#: config/tc-aarch64.c:8849 config/tc-arm.c:30523 +#: config/tc-aarch64.c:8849 config/tc-arm.c:30525 msgid "assemble for big-endian" msgstr "ассемблирование в порядке от старшего к младшему" -#: config/tc-aarch64.c:8850 config/tc-arm.c:30524 +#: config/tc-aarch64.c:8850 config/tc-arm.c:30526 msgid "assemble for little-endian" msgstr "ассемблирование в порядке от младшего к старшему" @@ -2147,41 +2147,41 @@ msgid "do not output verbose error messages" msgstr "не выводить подробные сообщения об ошибках" -#: config/tc-aarch64.c:9137 config/tc-arm.c:31607 +#: config/tc-aarch64.c:9137 config/tc-arm.c:31611 msgid "invalid architectural extension" msgstr "недопустимое расширение архитектуры" -#: config/tc-aarch64.c:9162 config/tc-arm.c:31639 +#: config/tc-aarch64.c:9162 config/tc-arm.c:31643 msgid "must specify extensions to add before specifying those to remove" msgstr "добавляемые расширения должны быть указаны до указания их удаления" -#: config/tc-aarch64.c:9170 config/tc-arm.c:31647 +#: config/tc-aarch64.c:9170 config/tc-arm.c:31651 msgid "missing architectural extension" msgstr "отсутствует расширение архитектуры" -#: config/tc-aarch64.c:9197 config/tc-arm.c:31733 +#: config/tc-aarch64.c:9197 config/tc-arm.c:31737 #, c-format msgid "unknown architectural extension `%s'" msgstr "неизвестное расширение архитектуры «%s»" -#: config/tc-aarch64.c:9221 config/tc-arm.c:31783 config/tc-metag.c:5834 +#: config/tc-aarch64.c:9221 config/tc-arm.c:31787 config/tc-metag.c:5834 #, c-format msgid "missing cpu name `%s'" msgstr "отсутствует имя ЦП «%s»" -#: config/tc-aarch64.c:9235 config/tc-aarch64.c:9452 config/tc-arm.c:31818 -#: config/tc-arm.c:32617 config/tc-csky.c:896 config/tc-metag.c:5845 +#: config/tc-aarch64.c:9235 config/tc-aarch64.c:9452 config/tc-arm.c:31822 +#: config/tc-arm.c:32621 config/tc-csky.c:896 config/tc-metag.c:5845 #, c-format msgid "unknown cpu `%s'" msgstr "неизвестный ЦП «%s»" -#: config/tc-aarch64.c:9253 config/tc-arm.c:31836 +#: config/tc-aarch64.c:9253 config/tc-arm.c:31840 #, c-format msgid "missing architecture name `%s'" msgstr "отсутствует название архитектуры «%s»" -#: config/tc-aarch64.c:9267 config/tc-aarch64.c:9499 config/tc-arm.c:31858 -#: config/tc-arm.c:32652 config/tc-arm.c:32682 config/tc-score.c:7703 +#: config/tc-aarch64.c:9267 config/tc-aarch64.c:9499 config/tc-arm.c:31862 +#: config/tc-arm.c:32656 config/tc-arm.c:32686 config/tc-score.c:7703 #, c-format msgid "unknown architecture `%s'\n" msgstr "неизвестная архитектура «%s»\n" @@ -2200,16 +2200,16 @@ msgid "\t specify for ABI " msgstr "<имя abi>\t указать для ABI <имя abi>" -#: config/tc-aarch64.c:9310 config/tc-arm.c:31945 config/tc-metag.c:5911 +#: config/tc-aarch64.c:9310 config/tc-arm.c:31949 config/tc-metag.c:5911 msgid "\t assemble for CPU " msgstr "<имя ЦП>\t ассемблировать для ЦП <имя ЦП>" -#: config/tc-aarch64.c:9312 config/tc-arm.c:31947 +#: config/tc-aarch64.c:9312 config/tc-arm.c:31951 msgid "\t assemble for architecture " msgstr "<имя арх>\t ассемблировать для архитектуры <имя арх>" -#: config/tc-aarch64.c:9351 config/tc-aarch64.c:9371 config/tc-arm.c:32015 -#: config/tc-arm.c:32033 config/tc-arm.c:32053 config/tc-metag.c:5936 +#: config/tc-aarch64.c:9351 config/tc-aarch64.c:9371 config/tc-arm.c:32019 +#: config/tc-arm.c:32037 config/tc-arm.c:32057 config/tc-metag.c:5936 #, c-format msgid "option `-%c%s' is deprecated: %s" msgstr "параметр «-%c%s» устарел: %s" @@ -2219,13 +2219,13 @@ msgid " AArch64-specific assembler options:\n" msgstr " Специализированные параметры ассемблера для AArch64:\n" -#: config/tc-aarch64.c:9402 config/tc-arc.c:3583 config/tc-arm.c:32084 +#: config/tc-aarch64.c:9402 config/tc-arc.c:3583 config/tc-arm.c:32088 #, c-format msgid " -EB assemble code for a big-endian cpu\n" msgstr "" " -EB ассемблерный код для ЦП с прямым порядком байт\n" -#: config/tc-aarch64.c:9407 config/tc-arc.c:3585 config/tc-arm.c:32089 +#: config/tc-aarch64.c:9407 config/tc-arc.c:3585 config/tc-arm.c:32093 #, c-format msgid " -EL assemble code for a little-endian cpu\n" msgstr "" @@ -3633,7 +3633,7 @@ #: config/tc-arm.c:12139 config/tc-arm.c:14259 config/tc-arm.c:16192 #: config/tc-arm.c:16227 config/tc-arm.c:17155 config/tc-arm.c:19082 #: config/tc-arm.c:19090 config/tc-arm.c:19097 config/tc-arm.c:20739 -#: config/tc-arm.c:28846 config/tc-arm.c:28910 config/tc-arm.c:28918 +#: config/tc-arm.c:28848 config/tc-arm.c:28912 config/tc-arm.c:28920 #: config/tc-metag.c:5176 config/tc-z8k.c:1151 config/tc-z8k.c:1161 msgid "immediate value out of range" msgstr "непосредственное значение за пределами диапазона" @@ -4073,7 +4073,7 @@ msgid "shift by register not allowed in thumb mode" msgstr "сдвиг регистром запрещён в режиме thumb" -#: config/tc-arm.c:11274 config/tc-arm.c:14099 config/tc-arm.c:28140 +#: config/tc-arm.c:11274 config/tc-arm.c:14099 config/tc-arm.c:28142 msgid "shift expression is too large" msgstr "выражение сдвига слишком большое" @@ -4329,7 +4329,7 @@ msgid "operand size must match register width" msgstr "размер операнда должен совпадать с шириной регистра" -#: config/tc-arm.c:14158 +#: config/tc-arm.c:14139 msgid "bad type in Neon instruction" msgstr "неверный тип в инструкции Neon" @@ -4604,593 +4604,593 @@ msgid "file finished with an open IT block." msgstr "файл завершён с открытым блоком IT" -#: config/tc-arm.c:26787 +#: config/tc-arm.c:26789 #, c-format msgid "alignments greater than %d bytes not supported in .text sections." msgstr "выравнивание больше чем %d байт не поддерживается в разделах .text" -#: config/tc-arm.c:27054 config/tc-ia64.c:3594 +#: config/tc-arm.c:27056 config/tc-ia64.c:3594 #, c-format msgid "Group section `%s' has no group signature" msgstr "Раздел групп «%s» не имеет подписи группы" -#: config/tc-arm.c:27100 +#: config/tc-arm.c:27102 msgid "handlerdata in cantunwind frame" msgstr "handlerdata в кадре cantunwind" -#: config/tc-arm.c:27117 +#: config/tc-arm.c:27119 msgid "too many unwind opcodes for personality routine 0" msgstr "" "слишком много раскрываемых кодов операций для персонализационной процедуры 0" -#: config/tc-arm.c:27148 +#: config/tc-arm.c:27150 msgid "attempt to recreate an unwind entry" msgstr "попытаться пересоздать элемент раскрытия" -#: config/tc-arm.c:27158 +#: config/tc-arm.c:27160 msgid "too many unwind opcodes" msgstr "слишком много раскрываемых кодов операций" -#: config/tc-arm.c:27457 +#: config/tc-arm.c:27459 #, c-format msgid "[-mwarn-syms]: Assignment makes a symbol match an ARM instruction: %s" msgstr "" "[-mwarn-syms]: Назначение делает символ, совпадающий с инструкцией ARM: %s" -#: config/tc-arm.c:27819 config/tc-arm.c:27887 +#: config/tc-arm.c:27821 config/tc-arm.c:27889 #, c-format msgid "symbol %s is in a different section" msgstr "символ %s в другом разделе" -#: config/tc-arm.c:27821 config/tc-arm.c:27889 +#: config/tc-arm.c:27823 config/tc-arm.c:27891 #, c-format msgid "symbol %s is weak and may be overridden later" msgstr "символ %s слаб и позднее может быть замещён" -#: config/tc-arm.c:27866 config/tc-arm.c:28238 +#: config/tc-arm.c:27868 config/tc-arm.c:28240 #, c-format msgid "invalid constant (%lx) after fixup" msgstr "некорректная константа (%lx) после местоположения" -#: config/tc-arm.c:27922 +#: config/tc-arm.c:27924 #, c-format msgid "unable to compute ADRL instructions for PC offset of 0x%lx" msgstr "" "невозможно вычислить инструкции ADRL для смещения относительно PC по адресу " "0x%lx" -#: config/tc-arm.c:27958 config/tc-arm.c:27988 +#: config/tc-arm.c:27960 config/tc-arm.c:27990 msgid "invalid literal constant: pool needs to be closer" msgstr "некорректная литеральная константа: пул должен быт ближе" -#: config/tc-arm.c:27961 config/tc-arm.c:28010 +#: config/tc-arm.c:27963 config/tc-arm.c:28012 #, c-format msgid "bad immediate value for offset (%ld)" msgstr "некорректное непосредственное значение для смещения (%ld)" -#: config/tc-arm.c:27991 +#: config/tc-arm.c:27993 #, c-format msgid "bad immediate value for 8-bit offset (%ld)" msgstr "некорректное непосредственное значение для 8-битного смещения (%ld)" -#: config/tc-arm.c:28051 +#: config/tc-arm.c:28053 msgid "offset not a multiple of 4" msgstr "смещение не кратно 4" -#: config/tc-arm.c:28254 +#: config/tc-arm.c:28256 msgid "invalid smc expression" msgstr "неверное выражение smc" -#: config/tc-arm.c:28264 +#: config/tc-arm.c:28266 msgid "invalid hvc expression" msgstr "неверное выражение hvc" -#: config/tc-arm.c:28275 config/tc-arm.c:28284 +#: config/tc-arm.c:28277 config/tc-arm.c:28286 msgid "invalid swi expression" msgstr "неверное выражение swi" -#: config/tc-arm.c:28294 +#: config/tc-arm.c:28296 msgid "invalid expression in load/store multiple" msgstr "неправильное выражение в многозначной загрузке/сохранении" -#: config/tc-arm.c:28356 +#: config/tc-arm.c:28358 #, c-format msgid "blx to '%s' an ARM ISA state function changed to bl" msgstr "blx в «%s» — функция состояния ARM ISA, изменяется на bl" -#: config/tc-arm.c:28375 +#: config/tc-arm.c:28377 msgid "misaligned branch destination" msgstr "невыравненное назначение ветвления" -#: config/tc-arm.c:28496 +#: config/tc-arm.c:28498 #, c-format msgid "blx to Thumb func '%s' from Thumb ISA state changed to bl" msgstr "blx в функции Thumb«%s» из состояния Thumb ISA изменяется на bl" -#: config/tc-arm.c:28545 +#: config/tc-arm.c:28547 msgid "Thumb2 branch out of range" msgstr "ветвление Thumb2 за пределами диапазона" -#: config/tc-arm.c:28660 +#: config/tc-arm.c:28662 msgid "rel31 relocation overflow" msgstr "переполнение перемещения rel31" -#: config/tc-arm.c:28682 config/tc-arm.c:28688 config/tc-arm.c:28692 -#: config/tc-arm.c:28739 +#: config/tc-arm.c:28684 config/tc-arm.c:28690 config/tc-arm.c:28694 +#: config/tc-arm.c:28741 msgid "co-processor offset out of range" msgstr "смещение сопроцессора вне диапазона" -#: config/tc-arm.c:28756 +#: config/tc-arm.c:28758 #, c-format msgid "invalid offset, target not word aligned (0x%08lX)" msgstr "неверное смещение, цель не выровнена по границе слова (0x%08lX)" -#: config/tc-arm.c:28763 config/tc-arm.c:28772 config/tc-arm.c:28780 -#: config/tc-arm.c:28788 config/tc-arm.c:28796 +#: config/tc-arm.c:28765 config/tc-arm.c:28774 config/tc-arm.c:28782 +#: config/tc-arm.c:28790 config/tc-arm.c:28798 #, c-format msgid "invalid offset, value too big (0x%08lX)" msgstr "неверное смещение, слишком большое значение (0x%08lX)" -#: config/tc-arm.c:28837 +#: config/tc-arm.c:28839 msgid "invalid Hi register with immediate" msgstr "неверный старший регистр с непосредственным значением" -#: config/tc-arm.c:28853 +#: config/tc-arm.c:28855 msgid "invalid immediate for stack address calculation" msgstr "некорректный непосредственный элемент при вычислении адреса стека" -#: config/tc-arm.c:28872 +#: config/tc-arm.c:28874 msgid "address calculation needs a strongly defined nearby symbol" msgstr "для вычисления адреса необходимо стойкий близко определённый символ" -#: config/tc-arm.c:28888 +#: config/tc-arm.c:28890 msgid "symbol too far away" msgstr "символ слишком далеко" -#: config/tc-arm.c:28900 +#: config/tc-arm.c:28902 #, c-format msgid "invalid immediate for address calculation (value = 0x%08lX)" msgstr "" "некорректный непосредственный элемент при вычислении адреса (значение = " "0x%08lX)" -#: config/tc-arm.c:28930 +#: config/tc-arm.c:28932 #, c-format msgid "invalid immediate: %ld is out of range" msgstr "неверное непосредственное значение: %ld за пределами диапазона" -#: config/tc-arm.c:28942 +#: config/tc-arm.c:28944 #, c-format msgid "invalid shift value: %ld" msgstr "некорректное значение сдвига: %ld" -#: config/tc-arm.c:29012 config/tc-arm.c:29083 +#: config/tc-arm.c:29014 config/tc-arm.c:29085 #, c-format msgid "the offset 0x%08lX is not representable" msgstr "смещение 0x%08lX невозможно представить" -#: config/tc-arm.c:29044 +#: config/tc-arm.c:29046 #, c-format msgid "Unable to process relocation for thumb opcode: %lx" msgstr "Невозможно обработать перемещение для кода операции thumb: %lx" -#: config/tc-arm.c:29123 +#: config/tc-arm.c:29125 #, c-format msgid "bad offset 0x%08lX (only 12 bits available for the magnitude)" msgstr "" "неправильное смещение 0x%08lX (для представления доступно только 12 бит)" -#: config/tc-arm.c:29162 +#: config/tc-arm.c:29164 #, c-format msgid "bad offset 0x%08lX (only 8 bits available for the magnitude)" msgstr "" "неправильное смещение 0x%08lX (для представления доступно только 8 бит)" -#: config/tc-arm.c:29202 +#: config/tc-arm.c:29204 #, c-format msgid "bad offset 0x%08lX (must be word-aligned)" msgstr "" "неправильное смещение 0x%08lX (должно быть выровнено по границе слова)" -#: config/tc-arm.c:29207 +#: config/tc-arm.c:29209 #, c-format msgid "bad offset 0x%08lX (must be an 8-bit number of words)" msgstr "неправильное смещение 0x%08lX (должно быть 8-битный номер слова)" -#: config/tc-arm.c:29428 config/tc-score.c:7379 +#: config/tc-arm.c:29430 config/tc-score.c:7379 #, c-format msgid "bad relocation fixup type (%d)" msgstr "недопустимый тип перемещаемого местоположения (%d)" -#: config/tc-arm.c:29546 +#: config/tc-arm.c:29548 msgid "literal referenced across section boundary" msgstr "литерал указывает за границу раздела" -#: config/tc-arm.c:29626 +#: config/tc-arm.c:29628 msgid "internal relocation (type: IMMEDIATE) not fixed up" msgstr "внутреннее перемещение (тип: IMMEDIATE) не исправляется" -#: config/tc-arm.c:29631 +#: config/tc-arm.c:29633 msgid "ADRL used for a symbol not defined in the same file" msgstr "ADRL, используемая для символа, не определена в том же файле" -#: config/tc-arm.c:29654 +#: config/tc-arm.c:29656 #, c-format msgid "undefined local label `%s'" msgstr "неопределенная локальная метка «%s»" -#: config/tc-arm.c:29660 +#: config/tc-arm.c:29662 msgid "internal_relocation (type: OFFSET_IMM) not fixed up" msgstr "internal_relocation (тип: OFFSET_IMM) не исправляется" -#: config/tc-arm.c:29682 config/tc-cris.c:4006 config/tc-csky.c:877 +#: config/tc-arm.c:29684 config/tc-cris.c:4006 config/tc-csky.c:877 #: config/tc-ft32.c:709 config/tc-mcore.c:1928 config/tc-microblaze.c:1995 #: config/tc-mmix.c:2894 config/tc-moxie.c:825 config/tc-ns32k.c:2248 #: config/tc-score.c:7466 msgid "" msgstr "<неизвестно>" -#: config/tc-arm.c:30084 +#: config/tc-arm.c:30086 #, c-format msgid "%s: unexpected function type: %d" msgstr "%s: неожиданный тип функции: %d" -#: config/tc-arm.c:30224 +#: config/tc-arm.c:30226 msgid "use of old and new-style options to set CPU type" msgstr "использование параметров в старом и новом стиле для задания типа ЦП" -#: config/tc-arm.c:30243 +#: config/tc-arm.c:30245 msgid "use of old and new-style options to set FPU type" msgstr "использование параметров в старом и новом стиле для задания типа FPU" -#: config/tc-arm.c:30322 +#: config/tc-arm.c:30324 msgid "hard-float conflicts with specified fpu" msgstr "hard-float конфликтует с заданным fpu" -#: config/tc-arm.c:30513 +#: config/tc-arm.c:30515 msgid "generate PIC code" msgstr "генерировать код PIC" -#: config/tc-arm.c:30514 +#: config/tc-arm.c:30516 msgid "assemble Thumb code" msgstr "ассемблировать код Thumb" -#: config/tc-arm.c:30515 +#: config/tc-arm.c:30517 msgid "support ARM/Thumb interworking" msgstr "поддержка совместной работы ARM/Thumb" -#: config/tc-arm.c:30517 +#: config/tc-arm.c:30519 msgid "code uses 32-bit program counter" msgstr "в коде используется 32-битный программный счётчик" -#: config/tc-arm.c:30518 +#: config/tc-arm.c:30520 msgid "code uses 26-bit program counter" msgstr "в коде используется 26-битный программный счётчик" -#: config/tc-arm.c:30519 +#: config/tc-arm.c:30521 msgid "floating point args are in fp regs" msgstr "аргументы значений с плавающей точкой не в регистрах fp" -#: config/tc-arm.c:30521 +#: config/tc-arm.c:30523 msgid "re-entrant code" msgstr "реентерабельный код" -#: config/tc-arm.c:30522 +#: config/tc-arm.c:30524 msgid "code is ATPCS conformant" msgstr "код совместимый с ATPCS" #. These are recognized by the assembler, but have no affect on code. -#: config/tc-arm.c:30528 +#: config/tc-arm.c:30530 msgid "use frame pointer" msgstr "использовать указатель кадра" -#: config/tc-arm.c:30529 +#: config/tc-arm.c:30531 msgid "use stack size checking" msgstr "выполнять проверку размера стека" -#: config/tc-arm.c:30532 +#: config/tc-arm.c:30534 msgid "do not warn on use of deprecated feature" msgstr "не предупреждать об использовании устаревших возможностей" -#: config/tc-arm.c:30539 +#: config/tc-arm.c:30541 msgid "warn about symbols that match instruction names [default]" msgstr "" "предупреждать о символах, которые совпадают с именами инструкций [по " "умолчанию]" -#: config/tc-arm.c:30540 +#: config/tc-arm.c:30542 msgid "disable warnings about symobls that match instructions" msgstr "выключить предупреждения о символах, совпадающих с инструкциями" #. DON'T add any new processors to this list -- we want the whole list #. to go away... Add them to the processors table instead. -#: config/tc-arm.c:30556 config/tc-arm.c:30557 +#: config/tc-arm.c:30558 config/tc-arm.c:30559 msgid "use -mcpu=arm1" msgstr "использовать -mcpu=arm1" -#: config/tc-arm.c:30558 config/tc-arm.c:30559 +#: config/tc-arm.c:30560 config/tc-arm.c:30561 msgid "use -mcpu=arm2" msgstr "использовать -mcpu=arm2" -#: config/tc-arm.c:30560 config/tc-arm.c:30561 +#: config/tc-arm.c:30562 config/tc-arm.c:30563 msgid "use -mcpu=arm250" msgstr "использовать -mcpu=arm250" -#: config/tc-arm.c:30562 config/tc-arm.c:30563 +#: config/tc-arm.c:30564 config/tc-arm.c:30565 msgid "use -mcpu=arm3" msgstr "использовать -mcpu=arm3" -#: config/tc-arm.c:30564 config/tc-arm.c:30565 +#: config/tc-arm.c:30566 config/tc-arm.c:30567 msgid "use -mcpu=arm6" msgstr "использовать -mcpu=arm6" -#: config/tc-arm.c:30566 config/tc-arm.c:30567 +#: config/tc-arm.c:30568 config/tc-arm.c:30569 msgid "use -mcpu=arm600" msgstr "использовать -mcpu=arm600" -#: config/tc-arm.c:30568 config/tc-arm.c:30569 +#: config/tc-arm.c:30570 config/tc-arm.c:30571 msgid "use -mcpu=arm610" msgstr "использовать -mcpu=arm610" -#: config/tc-arm.c:30570 config/tc-arm.c:30571 +#: config/tc-arm.c:30572 config/tc-arm.c:30573 msgid "use -mcpu=arm620" msgstr "использовать -mcpu=arm620" -#: config/tc-arm.c:30572 config/tc-arm.c:30573 +#: config/tc-arm.c:30574 config/tc-arm.c:30575 msgid "use -mcpu=arm7" msgstr "использовать -mcpu=arm7" -#: config/tc-arm.c:30574 config/tc-arm.c:30575 +#: config/tc-arm.c:30576 config/tc-arm.c:30577 msgid "use -mcpu=arm70" msgstr "использовать -mcpu=arm70" -#: config/tc-arm.c:30576 config/tc-arm.c:30577 +#: config/tc-arm.c:30578 config/tc-arm.c:30579 msgid "use -mcpu=arm700" msgstr "использовать -mcpu=arm700" -#: config/tc-arm.c:30578 config/tc-arm.c:30579 +#: config/tc-arm.c:30580 config/tc-arm.c:30581 msgid "use -mcpu=arm700i" msgstr "использовать -mcpu=arm700i" -#: config/tc-arm.c:30580 config/tc-arm.c:30581 +#: config/tc-arm.c:30582 config/tc-arm.c:30583 msgid "use -mcpu=arm710" msgstr "использовать -mcpu=arm710" -#: config/tc-arm.c:30582 config/tc-arm.c:30583 +#: config/tc-arm.c:30584 config/tc-arm.c:30585 msgid "use -mcpu=arm710c" msgstr "использовать -mcpu=arm710c" -#: config/tc-arm.c:30584 config/tc-arm.c:30585 +#: config/tc-arm.c:30586 config/tc-arm.c:30587 msgid "use -mcpu=arm720" msgstr "использовать -mcpu=arm720" -#: config/tc-arm.c:30586 config/tc-arm.c:30587 +#: config/tc-arm.c:30588 config/tc-arm.c:30589 msgid "use -mcpu=arm7d" msgstr "использовать -mcpu=arm7d" -#: config/tc-arm.c:30588 config/tc-arm.c:30589 +#: config/tc-arm.c:30590 config/tc-arm.c:30591 msgid "use -mcpu=arm7di" msgstr "использовать -mcpu=arm7di" -#: config/tc-arm.c:30590 config/tc-arm.c:30591 +#: config/tc-arm.c:30592 config/tc-arm.c:30593 msgid "use -mcpu=arm7m" msgstr "использовать -mcpu=arm7m" -#: config/tc-arm.c:30592 config/tc-arm.c:30593 +#: config/tc-arm.c:30594 config/tc-arm.c:30595 msgid "use -mcpu=arm7dm" msgstr "использовать -mcpu=arm7dm" -#: config/tc-arm.c:30594 config/tc-arm.c:30595 +#: config/tc-arm.c:30596 config/tc-arm.c:30597 msgid "use -mcpu=arm7dmi" msgstr "использовать -mcpu=arm7dmi" -#: config/tc-arm.c:30596 config/tc-arm.c:30597 +#: config/tc-arm.c:30598 config/tc-arm.c:30599 msgid "use -mcpu=arm7100" msgstr "использовать -mcpu=arm7100" -#: config/tc-arm.c:30598 config/tc-arm.c:30599 +#: config/tc-arm.c:30600 config/tc-arm.c:30601 msgid "use -mcpu=arm7500" msgstr "использовать -mcpu=arm7500" -#: config/tc-arm.c:30600 config/tc-arm.c:30601 +#: config/tc-arm.c:30602 config/tc-arm.c:30603 msgid "use -mcpu=arm7500fe" msgstr "использовать -mcpu=arm7500fe" -#: config/tc-arm.c:30602 config/tc-arm.c:30603 config/tc-arm.c:30604 -#: config/tc-arm.c:30605 +#: config/tc-arm.c:30604 config/tc-arm.c:30605 config/tc-arm.c:30606 +#: config/tc-arm.c:30607 msgid "use -mcpu=arm7tdmi" msgstr "использовать -mcpu=arm7tdmi" -#: config/tc-arm.c:30606 config/tc-arm.c:30607 +#: config/tc-arm.c:30608 config/tc-arm.c:30609 msgid "use -mcpu=arm710t" msgstr "использовать -mcpu=arm710t" -#: config/tc-arm.c:30608 config/tc-arm.c:30609 +#: config/tc-arm.c:30610 config/tc-arm.c:30611 msgid "use -mcpu=arm720t" msgstr "использовать -mcpu=arm720t" -#: config/tc-arm.c:30610 config/tc-arm.c:30611 +#: config/tc-arm.c:30612 config/tc-arm.c:30613 msgid "use -mcpu=arm740t" msgstr "использовать -mcpu=arm740t" -#: config/tc-arm.c:30612 config/tc-arm.c:30613 +#: config/tc-arm.c:30614 config/tc-arm.c:30615 msgid "use -mcpu=arm8" msgstr "использовать -mcpu=arm8" -#: config/tc-arm.c:30614 config/tc-arm.c:30615 +#: config/tc-arm.c:30616 config/tc-arm.c:30617 msgid "use -mcpu=arm810" msgstr "использовать -mcpu=arm810" -#: config/tc-arm.c:30616 config/tc-arm.c:30617 +#: config/tc-arm.c:30618 config/tc-arm.c:30619 msgid "use -mcpu=arm9" msgstr "использовать -mcpu=arm9" -#: config/tc-arm.c:30618 config/tc-arm.c:30619 +#: config/tc-arm.c:30620 config/tc-arm.c:30621 msgid "use -mcpu=arm9tdmi" msgstr "использовать -mcpu=arm9tdmi" -#: config/tc-arm.c:30620 config/tc-arm.c:30621 +#: config/tc-arm.c:30622 config/tc-arm.c:30623 msgid "use -mcpu=arm920" msgstr "использовать -mcpu=arm920" -#: config/tc-arm.c:30622 config/tc-arm.c:30623 +#: config/tc-arm.c:30624 config/tc-arm.c:30625 msgid "use -mcpu=arm940" msgstr "использовать -mcpu=arm940" -#: config/tc-arm.c:30624 +#: config/tc-arm.c:30626 msgid "use -mcpu=strongarm" msgstr "использовать -mcpu=strongarm" -#: config/tc-arm.c:30626 +#: config/tc-arm.c:30628 msgid "use -mcpu=strongarm110" msgstr "использовать -mcpu=strongarm110" -#: config/tc-arm.c:30628 +#: config/tc-arm.c:30630 msgid "use -mcpu=strongarm1100" msgstr "использовать -mcpu=strongarm1100" -#: config/tc-arm.c:30630 +#: config/tc-arm.c:30632 msgid "use -mcpu=strongarm1110" msgstr "использовать -mcpu=strongarm1110" -#: config/tc-arm.c:30631 +#: config/tc-arm.c:30633 msgid "use -mcpu=xscale" msgstr "использовать -mcpu=xscale" -#: config/tc-arm.c:30632 +#: config/tc-arm.c:30634 msgid "use -mcpu=iwmmxt" msgstr "использовать -mcpu=iwmmxt" -#: config/tc-arm.c:30633 +#: config/tc-arm.c:30635 msgid "use -mcpu=all" msgstr "использовать -mcpu=all" #. Architecture variants -- don't add any more to this list either. -#: config/tc-arm.c:30636 config/tc-arm.c:30637 +#: config/tc-arm.c:30638 config/tc-arm.c:30639 msgid "use -march=armv2" msgstr "использовать -march=armv2" -#: config/tc-arm.c:30638 config/tc-arm.c:30639 +#: config/tc-arm.c:30640 config/tc-arm.c:30641 msgid "use -march=armv2a" msgstr "использовать -march=armv2" -#: config/tc-arm.c:30640 config/tc-arm.c:30641 +#: config/tc-arm.c:30642 config/tc-arm.c:30643 msgid "use -march=armv3" msgstr "использовать -march=armv3" -#: config/tc-arm.c:30642 config/tc-arm.c:30643 +#: config/tc-arm.c:30644 config/tc-arm.c:30645 msgid "use -march=armv3m" msgstr "использовать -march=armv3m" -#: config/tc-arm.c:30644 config/tc-arm.c:30645 +#: config/tc-arm.c:30646 config/tc-arm.c:30647 msgid "use -march=armv4" msgstr "использовать -march=armv4" -#: config/tc-arm.c:30646 config/tc-arm.c:30647 +#: config/tc-arm.c:30648 config/tc-arm.c:30649 msgid "use -march=armv4t" msgstr "использовать -march=armv4t" -#: config/tc-arm.c:30648 config/tc-arm.c:30649 +#: config/tc-arm.c:30650 config/tc-arm.c:30651 msgid "use -march=armv5" msgstr "использовать -march=armv5" -#: config/tc-arm.c:30650 config/tc-arm.c:30651 +#: config/tc-arm.c:30652 config/tc-arm.c:30653 msgid "use -march=armv5t" msgstr "использовать -march=armv5t" -#: config/tc-arm.c:30652 config/tc-arm.c:30653 +#: config/tc-arm.c:30654 config/tc-arm.c:30655 msgid "use -march=armv5te" msgstr "использовать -march=armv5te" #. Floating point variants -- don't add any more to this list either. -#: config/tc-arm.c:30656 +#: config/tc-arm.c:30658 msgid "use -mfpu=fpe" msgstr "использовать -mfpu=fpe" -#: config/tc-arm.c:30657 +#: config/tc-arm.c:30659 msgid "use -mfpu=fpa10" msgstr "использовать -mfpu=fpa10" -#: config/tc-arm.c:30658 +#: config/tc-arm.c:30660 msgid "use -mfpu=fpa11" msgstr "использовать -mfpu=fpa11" -#: config/tc-arm.c:30660 +#: config/tc-arm.c:30662 msgid "use either -mfpu=softfpa or -mfpu=softvfp" msgstr "использовать -mfpu=softfpa или -mfpu=softvfp" -#: config/tc-arm.c:31706 +#: config/tc-arm.c:31710 msgid "extension does not apply to the base architecture" msgstr "расширение не применяется к базовой архитектуре" -#: config/tc-arm.c:31735 +#: config/tc-arm.c:31739 msgid "architectural extensions must be specified in alphabetical order" msgstr "архитектурные расширения должны указываться в алфавитном порядке" -#: config/tc-arm.c:31874 config/tc-arm.c:32815 +#: config/tc-arm.c:31878 config/tc-arm.c:32819 #, c-format msgid "unknown floating point format `%s'\n" msgstr "неизвестный формат плавающей точки «%s»\n" -#: config/tc-arm.c:31890 +#: config/tc-arm.c:31894 #, c-format msgid "unknown floating point abi `%s'\n" msgstr "неизвестный abi плавающей точки «%s»\n" -#: config/tc-arm.c:31906 +#: config/tc-arm.c:31910 #, c-format msgid "unknown EABI `%s'\n" msgstr "неизвестный EABI «%s»\n" -#: config/tc-arm.c:31926 +#: config/tc-arm.c:31930 #, c-format msgid "" "unknown implicit IT mode `%s', should be arm, thumb, always, or never." msgstr "" "неизвестный неявный режим IT «%s», должно быть arm, thumb, always или never." -#: config/tc-arm.c:31949 config/tc-metag.c:5913 +#: config/tc-arm.c:31953 config/tc-metag.c:5913 msgid "\t assemble for FPU architecture " msgstr "<имя fpu>\t ассемблировать для архитектуры FPU <имя fpu>" -#: config/tc-arm.c:31951 +#: config/tc-arm.c:31955 msgid "\t assemble for floating point ABI " msgstr "\t ассемблировать для ABI плавающей точки " -#: config/tc-arm.c:31954 +#: config/tc-arm.c:31958 msgid "\t\t assemble for eabi version " msgstr "\t\t ассемблировать для версии eabi " -#: config/tc-arm.c:31957 +#: config/tc-arm.c:31961 msgid "\t controls implicit insertion of IT instructions" msgstr "\t управлять неявной вставкой инструкций IT" -#: config/tc-arm.c:31959 +#: config/tc-arm.c:31963 msgid "\t\t\t TI CodeComposer Studio syntax compatibility mode" msgstr "\t\t\t режим совместимости с синтаксисом TI CodeComposer Studio" -#: config/tc-arm.c:32073 +#: config/tc-arm.c:32077 #, c-format msgid " ARM-specific assembler options:\n" msgstr " Специализированные параметры ассемблера для ARM:\n" -#: config/tc-arm.c:32093 +#: config/tc-arm.c:32097 #, c-format msgid " --fix-v4bx Allow BX in ARMv4 code\n" msgstr " --fix-v4bx допускать BX в коде ARMv4\n" -#: config/tc-arm.c:32403 +#: config/tc-arm.c:32407 msgid "no architecture contains all the instructions used\n" msgstr "не существует архитектуры со всеми используемыми инструкциями\n" -#: config/tc-arm.c:32755 +#: config/tc-arm.c:32759 #, c-format msgid "" "architectural extension `%s' is not allowed for the current base architecture" msgstr "" "расширение архитектуры «%s» недопустимо для текущей базовой архитектуры" -#: config/tc-arm.c:32778 +#: config/tc-arm.c:32782 #, c-format msgid "unknown architecture extension `%s'\n" msgstr "неизвестное расширение архитектуры «%s»\n" @@ -7555,7 +7555,7 @@ msgid "Internal assembler error for macro %s" msgstr "внутренняя ошибка ассемблера для макроса %s" -#: config/tc-ppc.c:2141 +#: config/tc-i370.c:629 config/tc-ppc.c:2129 msgid "identifier+constant@got means identifier@got+constant" msgstr "identifier+constant@got означает identifier@got+constant" @@ -7797,7 +7797,7 @@ msgid "cannot do %s %u byte relocation" msgstr "невозможно выполнить %s %u-байтовое перемещение" -#: config/tc-i386.c:3838 config/tc-i386.c:3865 +#: config/tc-i386.c:3549 config/tc-i386.c:3576 #, c-format msgid "can't use register '%s%s' as operand %d in '%s'." msgstr "Нельзя использовать регистр «%s%s» как операнд %d в «%s»." @@ -7858,7 +7858,7 @@ msgid "translating to `%sp'" msgstr "преобразуется в «%sp»" -#: config/tc-i386.c:4291 +#: config/tc-i386.c:3854 #, c-format msgid "instruction `%s' isn't supported in 16-bit mode." msgstr "Инструкция «%s» не поддерживается в 16-битном режиме." @@ -8009,7 +8009,7 @@ msgid "unsupported broadcast" msgstr "неподдерживаемый broadcast" -#: config/tc-i386.c:5687 +#: config/tc-i386.c:5282 msgid "broadcast not on source memory operand" msgstr "broadcast находится не в операнде-источнике памяти" @@ -8063,7 +8063,7 @@ msgid "stand-alone `%s' prefix" msgstr "автономный префикс «%s»" -#: config/tc-i386.c:6199 config/tc-i386.c:6215 +#: config/tc-i386.c:5362 config/tc-i386.c:5378 #, c-format msgid "`%s' operand %d must use `%ses' segment" msgstr "для «%s» операнда %d нужно использовать сегмент «%ses»" @@ -8114,7 +8114,7 @@ "второй регистр-источник «%s%s» неявно обозначает «%s%.3s%d» как источник-" "группу «%s%.3s%d» в «%s»" -#: config/tc-i386.c:6817 +#: config/tc-i386.c:6139 #, c-format msgid "you can't `pop %scs'" msgstr "нельзя использовать «pop %scs»" @@ -8136,7 +8136,7 @@ msgid "segment override on `%s' is ineffectual" msgstr "замена сегмента на «%s» не сработает" -#: config/tc-i386.c:7837 config/tc-i386.c:7978 config/tc-i386.c:8042 +#: config/tc-i386.c:6975 config/tc-i386.c:7076 config/tc-i386.c:7131 msgid "skipping prefixes on this instruction" msgstr "пропускаются префиксы для этой инструкции" @@ -8419,7 +8419,7 @@ msgid "invalid -mrelax-relocations= option: `%s'" msgstr "неверный параметр -mrelax-relocations=: «%s»" -#: config/tc-i386.c:11463 +#: config/tc-i386.c:10486 #, c-format msgid "" " -Q ignored\n" @@ -8487,7 +8487,7 @@ msgstr "" " -msse2avx кодировать инструкции SSE с префиксом VEX\n" -#: config/tc-i386.c:10994 +#: config/tc-i386.c:10522 #, c-format msgid "" " -msse-check=[none|error|warning]\n" @@ -8496,7 +8496,7 @@ " -msse-check=[none|error|warning]\n" " проверять инструкции SSE\n" -#: config/tc-i386.c:10997 +#: config/tc-i386.c:10525 #, c-format msgid "" " -moperand-check=[none|error|warning]\n" @@ -8505,7 +8505,7 @@ " -moperand-check=[none|error|warning]\n" " проверять комбинации операндов на корректность\n" -#: config/tc-i386.c:11000 +#: config/tc-i386.c:10528 #, c-format msgid "" " -mavxscalar=[128|256] encode scalar AVX instructions with specific " @@ -8515,7 +8515,7 @@ " -mavxscalar=[128|256] кодировать скалярные инструкции AVX с заданной\n" " длиной вектора\n" -#: config/tc-i386.c:11003 +#: config/tc-i386.c:10531 #, c-format msgid "" " -mevexlig=[128|256|512] encode scalar EVEX instructions with specific " @@ -8525,7 +8525,7 @@ " -mevexlig=[128|256|512] кодировать скалярные инструкции EVEX с заданной\n" " длиной вектора\n" -#: config/tc-i386.c:11006 +#: config/tc-i386.c:10534 #, c-format msgid "" " -mevexwig=[0|1] encode EVEX instructions with specific EVEX.W " @@ -8535,7 +8535,7 @@ " -mevexwig=[0|1] кодировать инструкции EVEX с заданным значением\n" " EVEX.W для бита игнорированных инструкций EVEX.W\n" -#: config/tc-i386.c:11009 +#: config/tc-i386.c:10537 #, c-format msgid "" " -mevexrcig=[rne|rd|ru|rz]\n" @@ -8547,12 +8547,12 @@ " кодировать инструкции EVEX с заданным значением\n" " EVEX.RC для игнорированных инструкций только SAE\n" -#: config/tc-i386.c:11013 +#: config/tc-i386.c:10541 #, c-format msgid " -mmnemonic=[att|intel] use AT&T/Intel mnemonic\n" msgstr " -mmnemonic=[att|intel] использовать мнемонику AT&T/Intel\n" -#: config/tc-i386.c:11015 +#: config/tc-i386.c:10543 #, c-format msgid " -msyntax=[att|intel] use AT&T/Intel syntax\n" msgstr " -msyntax=[att|intel] использовать синтаксис AT&T/Intel\n" @@ -8592,7 +8592,7 @@ msgid " -mbig-obj generate big object files\n" msgstr " -mbig-obj генерировать большие объектные файлы\n" -#: config/tc-i386.c:11029 +#: config/tc-i386.c:10559 #, c-format msgid "" " -momit-lock-prefix=[no|yes]\n" @@ -8601,7 +8601,7 @@ " -momit-lock-prefix=[no|yes]\n" " удалять все префиксы блокировки\n" -#: config/tc-i386.c:11032 +#: config/tc-i386.c:10562 #, c-format msgid "" " -mfence-as-lock-add=[no|yes]\n" @@ -8612,7 +8612,7 @@ " кодировать lfence, mfence и sfence как\n" " lock addl $0x0, (%%{re}sp)\n" -#: config/tc-i386.c:11036 +#: config/tc-i386.c:10566 #, c-format msgid "" " -mrelax-relocations=[no|yes]\n" @@ -8621,7 +8621,7 @@ " -mrelax-relocations=[no|yes]\n" " генерировать ослабленные перемещения\n" -#: config/tc-i386.c:11039 +#: config/tc-i386.c:10569 #, c-format msgid " -mamd64 accept only AMD64 ISA\n" msgstr " -mamd64 принимать только AMD64 ISA\n" @@ -14158,7 +14158,7 @@ msgid "Can not find match relax hint. Line: %d" msgstr "Не найдена подходящая ослабляющая подсказка: строка %d" -#: config/tc-nds32.c:5046 +#: config/tc-nds32.c:4999 #, c-format msgid "Internal error: Relax hint error. %s: %x" msgstr "Внутренняя ошибка: ошибка в ослабляющей подсказке. %s: %x" @@ -14217,7 +14217,7 @@ msgid "Internal error: Unknown fixup type %d (`%s')" msgstr "Внутренняя ошибка: неизвестный тип местоположения %d («%s»)" -#: config/tc-nds32.c:6762 +#: config/tc-nds32.c:6711 msgid "need PIC qualifier with symbol." msgstr "С символом требуется классификатор PIC." @@ -14796,7 +14796,7 @@ "-m750cl генерировать код для PowerPC 750cl\n" "-m821, -m850, -m860 генерировать код для PowerPC 821/850/860\n" -#: config/tc-ppc.c:1346 +#: config/tc-ppc.c:1345 #, c-format msgid "" "-mppc64, -m620 generate code for PowerPC 620/625/630\n" @@ -14834,7 +14834,7 @@ "-many генерировать код для любой архитектуры " "(PWR/PWRX/PPC)\n" -#: config/tc-ppc.c:1361 +#: config/tc-ppc.c:1360 #, c-format msgid "" "-maltivec generate code for AltiVec\n" @@ -14869,7 +14869,7 @@ "-mregnames позволять символические имена для регистров\n" "-mno-regnames не позволять символические имена для регистров\n" -#: config/tc-ppc.c:1377 +#: config/tc-ppc.c:1376 #, c-format msgid "" "-mrelocatable support for GCC's -mrelocatble option\n" @@ -14898,7 +14898,7 @@ "-V напечатать номер версии ассемблера\n" "-Qy, -Qn игнорируется\n" -#: config/tc-ppc.c:1391 +#: config/tc-ppc.c:1390 #, c-format msgid "" "-nops=count when aligning, more than COUNT nops uses a branch\n" @@ -14969,7 +14969,7 @@ msgid "duplicate macro %s" msgstr "повторяющийся макрос %s" -#: config/tc-ppc.c:2161 +#: config/tc-ppc.c:2149 msgid "symbol+offset not supported for got tls" msgstr "символ+смещение не поддерживается для got tls" @@ -16979,7 +16979,7 @@ msgid "FP branch in delay slot" msgstr "ветвление FP в слоте задержки" -#: config/tc-sparc.c:1573 +#: config/tc-sparc.c:1629 msgid "FP branch preceded by FP instruction; NOP inserted" msgstr "ветвление FP предваряется инструкцией FP; вставлена NOP" @@ -20337,12 +20337,12 @@ msgid "unresolved loop target symbol: %s" msgstr "неопределённый символ циклической цели: %s" -#: config/tc-xtensa.c:11008 +#: config/tc-xtensa.c:10972 #, c-format msgid "invalid expression evaluation type %d" msgstr "недействительный тип вычисления выражения %d" -#: config/tc-xtensa.c:11025 +#: config/tc-xtensa.c:10989 msgid "loop too long for LOOP instruction" msgstr "слишком длинный цикл для инструкции LOOP" @@ -20836,7 +20836,7 @@ msgid "file number less than one" msgstr "номер файла меньше 1" -#: dwarf2dbg.c:792 +#: dwarf2dbg.c:789 #, c-format msgid "file number %ld already allocated" msgstr "номер файла %ld уже выделен" diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/gcc.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/gcc.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/gcc.po 2020-01-23 16:52:14.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/gcc.po 2020-07-08 13:54:16.000000000 +0000 @@ -13,7 +13,7 @@ "Project-Id-Version: gcc 8.2.0\n" "Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n" "POT-Creation-Date: 2018-07-25 14:25+0000\n" -"PO-Revision-Date: 2019-12-10 16:27+0000\n" +"PO-Revision-Date: 2020-03-30 15:04+0000\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -21,8 +21,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2020-01-23 12:22+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 12:00+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ru\n" "X-Bugs: Report translation errors to the Language-Team address.\n" diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/gdb.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/gdb.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/gdb.po 2020-01-23 16:52:11.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/gdb.po 2020-07-08 13:54:13.000000000 +0000 @@ -14,28 +14,27 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 10:55+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:48+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" #: aarch64-fbsd-nat.c:71 aarch64-fbsd-nat.c:103 alpha-bsd-nat.c:103 #: alpha-bsd-nat.c:134 amd64-bsd-nat.c:55 amd64-bsd-nat.c:131 #: amd64-fbsd-nat.c:172 amd64-linux-nat.c:225 amd64-linux-nat.c:309 -#: arm-fbsd-nat.c:74 arm-fbsd-nat.c:107 hppa-nbsd-nat.c:180 -#: hppa-nbsd-nat.c:209 hppa-obsd-nat.c:206 hppa-obsd-nat.c:233 -#: i386-bsd-nat.c:140 i386-bsd-nat.c:230 i386-linux-nat.c:223 -#: i386-linux-nat.c:238 m32r-linux-nat.c:121 m32r-linux-nat.c:170 -#: m68k-bsd-nat.c:127 m68k-bsd-nat.c:156 m68k-linux-nat.c:268 -#: m68k-linux-nat.c:283 mips64-obsd-nat.c:95 mips64-obsd-nat.c:110 +#: arm-fbsd-nat.c:74 arm-fbsd-nat.c:107 hppa-nbsd-nat.c:180 hppa-nbsd-nat.c:209 +#: hppa-obsd-nat.c:206 hppa-obsd-nat.c:233 i386-bsd-nat.c:140 +#: i386-bsd-nat.c:230 i386-linux-nat.c:223 i386-linux-nat.c:238 +#: m32r-linux-nat.c:121 m32r-linux-nat.c:170 m68k-bsd-nat.c:127 +#: m68k-bsd-nat.c:156 m68k-linux-nat.c:268 m68k-linux-nat.c:283 #: mips-fbsd-nat.c:74 mips-fbsd-nat.c:105 mips-linux-nat.c:286 #: mips-linux-nat.c:367 mips-nbsd-nat.c:60 mips-nbsd-nat.c:90 -#: ppc-fbsd-nat.c:133 ppc-fbsd-nat.c:159 ppc-nbsd-nat.c:98 ppc-nbsd-nat.c:127 -#: ppc-obsd-nat.c:88 ppc-obsd-nat.c:122 riscv-fbsd-nat.c:75 -#: riscv-fbsd-nat.c:107 riscv-linux-nat.c:217 riscv-linux-nat.c:235 -#: riscv-linux-nat.c:272 riscv-linux-nat.c:296 s390-linux-nat.c:281 -#: s390-linux-nat.c:298 sh-nbsd-nat.c:62 sh-nbsd-nat.c:84 sparc-nat.c:170 -#: sparc-nat.c:203 tilegx-linux-nat.c:143 tilegx-linux-nat.c:159 -#: vax-bsd-nat.c:80 vax-bsd-nat.c:95 xtensa-linux-nat.c:211 -#: xtensa-linux-nat.c:230 +#: mips64-obsd-nat.c:95 mips64-obsd-nat.c:110 ppc-fbsd-nat.c:133 +#: ppc-fbsd-nat.c:159 ppc-nbsd-nat.c:98 ppc-nbsd-nat.c:127 ppc-obsd-nat.c:88 +#: ppc-obsd-nat.c:122 riscv-fbsd-nat.c:75 riscv-fbsd-nat.c:107 +#: riscv-linux-nat.c:217 riscv-linux-nat.c:235 riscv-linux-nat.c:272 +#: riscv-linux-nat.c:296 s390-linux-nat.c:281 s390-linux-nat.c:298 +#: sh-nbsd-nat.c:62 sh-nbsd-nat.c:84 sparc-nat.c:170 sparc-nat.c:203 +#: tilegx-linux-nat.c:143 tilegx-linux-nat.c:159 vax-bsd-nat.c:80 +#: vax-bsd-nat.c:95 xtensa-linux-nat.c:211 xtensa-linux-nat.c:230 msgid "Couldn't get registers" msgstr "" @@ -47,9 +46,9 @@ #: i386-bsd-nat.c:310 i386-linux-nat.c:287 i386-linux-nat.c:301 #: m68k-bsd-nat.c:137 m68k-bsd-nat.c:169 m68k-linux-nat.c:362 #: m68k-linux-nat.c:376 mips-fbsd-nat.c:84 mips-fbsd-nat.c:119 -#: mips-nbsd-nat.c:73 mips-nbsd-nat.c:107 ppc-obsd-nat.c:104 -#: ppc-obsd-nat.c:141 riscv-fbsd-nat.c:86 riscv-fbsd-nat.c:121 -#: s390-linux-nat.c:318 s390-linux-nat.c:335 sparc-nat.c:182 +#: mips-nbsd-nat.c:73 mips-nbsd-nat.c:107 ppc-obsd-nat.c:104 ppc-obsd-nat.c:141 +#: riscv-fbsd-nat.c:86 riscv-fbsd-nat.c:121 s390-linux-nat.c:318 +#: s390-linux-nat.c:335 sparc-nat.c:182 msgid "Couldn't get floating point status" msgstr "" @@ -57,7 +56,7 @@ #: amd64-linux-nat.c:314 arm-fbsd-nat.c:113 hppa-nbsd-nat.c:214 #: hppa-obsd-nat.c:238 i386-bsd-nat.c:235 i386-linux-nat.c:243 #: m32r-linux-nat.c:175 m68k-bsd-nat.c:161 m68k-linux-nat.c:288 -#: mips64-obsd-nat.c:115 mips-fbsd-nat.c:111 mips-nbsd-nat.c:95 +#: mips-fbsd-nat.c:111 mips-nbsd-nat.c:95 mips64-obsd-nat.c:115 #: ppc-fbsd-nat.c:164 ppc-nbsd-nat.c:133 ppc-obsd-nat.c:132 #: riscv-fbsd-nat.c:113 s390-linux-nat.c:303 sparc-nat.c:208 #: tilegx-linux-nat.c:164 vax-bsd-nat.c:100 xtensa-linux-nat.c:238 @@ -121,7 +120,7 @@ msgstr "" #: aarch64-linux-tdep.c:714 arm-linux-tdep.c:1204 i386-tdep.c:4133 -#: i386-tdep.c:4242 i386-tdep.c:4257 ppc-linux-tdep.c:1710 stap-probe.c:769 +#: i386-tdep.c:4242 i386-tdep.c:4257 ppc-linux-tdep.c:1710 stap-probe.c:775 #, possible-c-format msgid "Invalid register name `%s' on expression `%s'." msgstr "" @@ -965,26 +964,26 @@ msgid "Invalid character '%s' in expression." msgstr "Недопустимый символ '%s' в выражении." -#: ada-lex.l:355 +#: ada-lex.l:354 #, possible-c-format msgid "Invalid base: %d." msgstr "" -#: ada-lex.l:366 ada-lex.l:373 +#: ada-lex.l:365 ada-lex.l:372 msgid "Integer literal out of range" msgstr "" -#: ada-lex.l:368 +#: ada-lex.l:367 #, possible-c-format msgid "Invalid digit `%c' in based literal" msgstr "" -#: ada-lex.l:613 +#: ada-lex.l:612 #, possible-c-format msgid "ambiguous attribute name: `%s'" msgstr "" -#: ada-lex.l:616 +#: ada-lex.l:615 #, possible-c-format msgid "unrecognized attribute: `%s'" msgstr "" @@ -1256,8 +1255,8 @@ msgstr "" #: ada-valprint.c:1217 cp-valprint.c:314 guile/scm-pretty-print.c:631 -#: mi/mi-cmd-stack.c:536 mi/mi-cmd-stack.c:550 python/py-framefilter.c:401 -#: python/py-prettyprint.c:267 stack.c:456 stack.c:493 +#: mi/mi-cmd-stack.c:536 mi/mi-cmd-stack.c:550 python/py-prettyprint.c:267 +#: python/py-framefilter.c:401 stack.c:456 stack.c:493 #, possible-c-format msgid "" msgstr "" @@ -1563,8 +1562,8 @@ msgstr "" #. multiply -#: arch/arm.c:134 arch/arm-get-next-pcs.c:682 arch/arm-get-next-pcs.c:703 -#: arch/arm-get-next-pcs.c:819 +#: arch/arm-get-next-pcs.c:682 arch/arm-get-next-pcs.c:703 +#: arch/arm-get-next-pcs.c:819 arch/arm.c:134 msgid "Invalid update to pc in instruction" msgstr "" @@ -2894,11 +2893,11 @@ msgid "Must start with a format string." msgstr "" -#: ax-gdb.c:2705 breakpoint.c:2228 printcmd.c:2550 +#: ax-gdb.c:2705 breakpoint.c:2228 printcmd.c:2551 msgid "Bad format string, non-terminated '\"'." msgstr "" -#: ax-gdb.c:2710 breakpoint.c:2233 printcmd.c:2555 +#: ax-gdb.c:2710 breakpoint.c:2233 printcmd.c:2556 msgid "Invalid argument syntax" msgstr "" @@ -2992,8 +2991,8 @@ msgid " %02x" msgstr "" -#: ax-general.c:372 darwin-nat.c:545 darwin-nat-info.c:292 -#: darwin-nat-info.c:585 darwin-nat-info.c:787 +#: ax-general.c:372 darwin-nat-info.c:292 darwin-nat-info.c:585 +#: darwin-nat-info.c:787 darwin-nat.c:545 msgid "\n" msgstr "" @@ -3589,7 +3588,7 @@ msgid "Catchpoint %d (exec)" msgstr "" -#: breakpoint.c:8656 printcmd.c:2545 +#: breakpoint.c:8656 printcmd.c:2546 msgid "Bad format string, missing '\"'." msgstr "" @@ -5056,8 +5055,8 @@ #: dbxread.c:2720 exec.c:521 exec.c:787 gdbsupport/print-utils.c:77 #: gdbsupport/print-utils.c:120 gdbsupport/print-utils.c:288 mdebugread.c:3597 -#: printcmd.c:1013 printcmd.c:2706 psymtab.c:695 psymtab.c:708 target.c:647 -#: ui-out.c:782 utils.c:1574 valprint.c:1367 +#: printcmd.c:1013 printcmd.c:2707 psymtab.c:695 psymtab.c:708 target.c:647 +#: ui-out.c:782 utils.c:1583 valprint.c:1367 msgid "failed internal consistency check" msgstr "" @@ -6521,11 +6520,11 @@ #. Should never come here as hookc would be 0. #: cli/cli-script.c:1499 gdbsupport/common-exceptions.c:93 #: gdbsupport/common-exceptions.c:109 gdbsupport/common-exceptions.c:125 -#: hppa-tdep.c:3127 hppa-tdep.c:3140 infcall.c:983 infcmd.c:1576 -#: language.c:464 mi/mi-out.c:227 mi/mi-out.c:247 mips-tdep.c:305 -#: mips-tdep.c:509 mips-tdep.c:2235 mips-tdep.c:5762 mips-tdep.c:6927 -#: mn10300-tdep.c:127 reggroups.c:274 remote.c:2116 remote.c:8663 -#: remote.c:9949 utils.c:380 utils.c:408 +#: hppa-tdep.c:3127 hppa-tdep.c:3140 infcall.c:983 infcmd.c:1576 language.c:464 +#: mi/mi-out.c:227 mi/mi-out.c:247 mips-tdep.c:305 mips-tdep.c:509 +#: mips-tdep.c:2235 mips-tdep.c:5762 mips-tdep.c:6927 mn10300-tdep.c:127 +#: reggroups.c:274 remote.c:2116 remote.c:8663 remote.c:9949 utils.c:380 +#: utils.c:408 msgid "bad switch" msgstr "" @@ -6950,7 +6949,7 @@ msgstr "" #. Probably TLS here. -#: compile/compile-loc2c.c:633 compile/compile-c-symbols.c:135 +#: compile/compile-c-symbols.c:135 compile/compile-loc2c.c:633 #: compile/compile-cplus-symbols.c:129 #, possible-c-format msgid "" @@ -6958,13 +6957,13 @@ "current thread in compiled code." msgstr "" -#: compile/compile-loc2c.c:623 compile/compile-c-symbols.c:153 +#: compile/compile-c-symbols.c:153 compile/compile-loc2c.c:623 #: compile/compile-cplus-symbols.c:147 #, possible-c-format msgid "Symbol \"%s\" cannot be used because there is no selected frame" msgstr "" -#: compile/compile-loc2c.c:629 compile/compile-c-symbols.c:160 +#: compile/compile-c-symbols.c:160 compile/compile-loc2c.c:629 #: compile/compile-cplus-symbols.c:154 #, possible-c-format msgid "" @@ -7202,19 +7201,19 @@ msgid "Unexpected type id from GCC, check you use recent enough GCC." msgstr "" -#: compile/compile-cplus-types.c:461 compile/compile-c-types.c:48 +#: compile/compile-c-types.c:48 compile/compile-cplus-types.c:461 msgid "array type with non-constant lower bound is not supported" msgstr "" -#: compile/compile-cplus-types.c:469 compile/compile-c-types.c:51 +#: compile/compile-c-types.c:51 compile/compile-cplus-types.c:469 msgid "cannot convert array type with non-zero lower bound to C" msgstr "" -#: compile/compile-cplus-types.c:480 compile/compile-c-types.c:60 +#: compile/compile-c-types.c:60 compile/compile-cplus-types.c:480 msgid "variably-sized vector type is not supported" msgstr "" -#: compile/compile-cplus-types.c:981 compile/compile-c-types.c:171 +#: compile/compile-c-types.c:171 compile/compile-cplus-types.c:981 msgid "function has unknown return type; assuming int" msgstr "" @@ -8717,7 +8716,7 @@ msgid "Attaching to program: %s, %s\n" msgstr "" -#: darwin-nat.c:2054 inf-ptrace.c:219 procfs.c:1889 remote.c:5801 +#: darwin-nat.c:2054 inf-ptrace.c:219 procfs.c:1810 remote.c:5801 #, possible-c-format msgid "Attaching to %s\n" msgstr "" @@ -9152,7 +9151,7 @@ msgid "skipping section '%s' which does not contain valid DOF data." msgstr "" -#: dtrace-probe.c:660 stap-probe.c:187 +#: dtrace-probe.c:660 stap-probe.c:193 #, possible-c-format msgid "" "Probe '%s' has %d arguments, but GDB is requesting\n" @@ -9203,7 +9202,7 @@ "register %s (#%d) at %s" msgstr "" -#: dwarf2expr.h:212 dwarf2-frame.c:302 +#: dwarf2-frame.c:302 dwarf2expr.h:212 #, possible-c-format msgid "%s is invalid in this context" msgstr "" @@ -11161,8 +11160,7 @@ "handle_inferior_event: Invalid gnu-indirect-function breakpoint type %d" msgstr "" -#: elfread.c:1084 elfread.c:1097 elfread.c:1123 machoread.c:808 -#: machoread.c:824 +#: elfread.c:1084 elfread.c:1097 elfread.c:1123 machoread.c:808 machoread.c:824 #, possible-c-format msgid "Can't read symbols from %s: %s" msgstr "" @@ -11573,7 +11571,7 @@ msgid "Debugging of FreeBSD lwp module is %s.\n" msgstr "" -#: fbsd-nat.c:1351 linux-nat.c:1010 procfs.c:2287 procfs.c:2408 +#: fbsd-nat.c:1351 linux-nat.c:1010 procfs.c:2208 procfs.c:2329 #, possible-c-format msgid "[%s exited]\n" msgstr "" @@ -11680,8 +11678,8 @@ msgid "Empty search range.\n" msgstr "" -#: findcmd.c:128 python/py-value.c:478 python/py-lazy-string.c:177 -#: python/py-lazy-string.c:210 +#: findcmd.c:128 python/py-lazy-string.c:177 python/py-lazy-string.c:210 +#: python/py-value.c:478 msgid "Invalid length." msgstr "" @@ -12144,7 +12142,7 @@ msgid "When non-zero, architecture debugging is enabled." msgstr "" -#: gdbserver/ax.c:837 printcmd.c:2587 +#: gdbserver/ax.c:837 printcmd.c:2588 msgid "Wrong number of arguments for specified format-string" msgstr "" @@ -13093,8 +13091,8 @@ "the `info dos ldt' command." msgstr "" -#: guile/scm-param.c:915 guile/scm-param.c:920 guile/scm-iterator.c:162 -#: guile/scm-cmd.c:702 guile/scm-pretty-print.c:158 +#: guile/scm-cmd.c:702 guile/scm-pretty-print.c:158 guile/scm-iterator.c:162 +#: guile/scm-param.c:915 guile/scm-param.c:920 msgid "procedure" msgstr "" @@ -13166,12 +13164,12 @@ msgid "'%s' is not a prefix command" msgstr "" -#: guile/scm-param.c:244 guile/scm-cmd.c:682 python/py-cmd.c:534 -#: python/py-param.c:342 +#: guile/scm-cmd.c:682 guile/scm-param.c:244 python/py-param.c:342 +#: python/py-cmd.c:534 msgid "This command is not documented." msgstr "" -#: guile/scm-param.c:894 guile/scm-cmd.c:709 +#: guile/scm-cmd.c:709 guile/scm-param.c:894 msgid "invalid command class argument" msgstr "" @@ -13187,7 +13185,7 @@ msgid "command is already registered" msgstr "" -#: guile/scm-value.c:1085 guile/scm-lazy-string.c:162 +#: guile/scm-lazy-string.c:162 guile/scm-value.c:1085 msgid "invalid length" msgstr "" @@ -13203,14 +13201,14 @@ msgid "cannot create a value from NULL" msgstr "" -#: guile/scm-param.c:514 guile/scm-param.c:701 guile/scm-type.c:986 -#: guile/scm-type.c:1027 guile/scm-utils.c:205 guile/scm-value.c:618 -#: guile/scm-pretty-print.c:156 +#: guile/scm-utils.c:205 guile/scm-value.c:618 guile/scm-pretty-print.c:156 +#: guile/scm-type.c:986 guile/scm-type.c:1027 guile/scm-param.c:514 +#: guile/scm-param.c:701 msgid "string" msgstr "" -#: guile/scm-param.c:494 guile/scm-objfile.c:290 guile/scm-value.c:705 -#: guile/scm-pretty-print.c:255 guile/scm-progspace.c:330 +#: guile/scm-value.c:705 guile/scm-pretty-print.c:255 guile/scm-param.c:494 +#: guile/scm-progspace.c:330 guile/scm-objfile.c:290 msgid "list" msgstr "" @@ -13365,8 +13363,8 @@ msgid "length is larger than array size" msgstr "" -#: guile/scm-param.c:722 guile/scm-utils.c:215 guile/scm-breakpoint.c:589 -#: guile/scm-breakpoint.c:628 +#: guile/scm-utils.c:215 guile/scm-breakpoint.c:589 guile/scm-breakpoint.c:628 +#: guile/scm-param.c:722 msgid "boolean" msgstr "" @@ -13458,9 +13456,8 @@ msgid "write buffer not empty: ~a" msgstr "" -#: guile/scm-param.c:762 guile/scm-type.c:1109 guile/scm-ports.c:1179 -#: guile/scm-ports.c:1221 guile/scm-breakpoint.c:666 -#: guile/scm-breakpoint.c:707 +#: guile/scm-ports.c:1179 guile/scm-ports.c:1221 guile/scm-breakpoint.c:666 +#: guile/scm-breakpoint.c:707 guile/scm-type.c:1109 guile/scm-param.c:762 msgid "integer" msgstr "" @@ -14529,8 +14526,8 @@ "The default is to unwind the frame." msgstr "" -#: infcmd.c:66 infcmd.c:2482 infcmd.c:2869 linux-fork.c:651 -#: record-btrace.c:387 remote-sim.c:894 +#: infcmd.c:66 infcmd.c:2482 infcmd.c:2869 linux-fork.c:651 record-btrace.c:387 +#: remote-sim.c:894 msgid "The program is not being run." msgstr "" @@ -14821,7 +14818,7 @@ msgid "\"unset\" must be followed by the name of an unset subcommand.\n" msgstr "" -#: fbsd-nat.c:327 infcmd.c:3019 procfs.c:3552 +#: fbsd-nat.c:327 infcmd.c:3019 procfs.c:3473 msgid "Not supported on this target." msgstr "" @@ -16554,7 +16551,7 @@ msgid "Could not compile regex to match ' (deleted)'" msgstr "" -#: fbsd-nat.c:335 linux-tdep.c:763 procfs.c:3574 +#: fbsd-nat.c:335 linux-tdep.c:763 procfs.c:3495 msgid "No current process: you must name one." msgstr "" @@ -16585,7 +16582,7 @@ msgstr "" #. No output for summary mode. -#: fbsd-tdep.c:1131 linux-tdep.c:826 linux-tdep.c:1075 procfs.c:3509 +#: fbsd-tdep.c:1131 linux-tdep.c:826 linux-tdep.c:1075 procfs.c:3430 msgid "" "Mapped address spaces:\n" "\n" @@ -19875,7 +19872,7 @@ msgid "Invalid target CPU." msgstr "" -#: nto-procfs.c:703 procfs.c:1879 +#: nto-procfs.c:703 procfs.c:1800 msgid "Attaching GDB to itself is not a good idea..." msgstr "" @@ -20650,16 +20647,16 @@ msgid " (cannot be evaluated in the current context)" msgstr "" -#: printcmd.c:2539 +#: printcmd.c:2540 msgid "format-control string and values to print" msgstr "" -#: printcmd.c:2614 +#: printcmd.c:2615 #, possible-c-format msgid "expected wchar_t argument for %%lc" msgstr "" -#: printcmd.c:2646 +#: printcmd.c:2647 msgid "long long not supported in printf" msgstr "" @@ -20673,7 +20670,7 @@ "Only for symbols with fixed locations (global or static scope)." msgstr "" -#: printcmd.c:2758 +#: printcmd.c:2759 msgid "" "Examine memory: x/FMT ADDRESS.\n" "ADDRESS is an expression for the memory address to examine.\n" @@ -20822,7 +20819,7 @@ msgid "Show the largest offset that will be printed in form." msgstr "" -#: printcmd.c:2917 +#: printcmd.c:2918 msgid "" "Tell GDB to only display the symbolic form of an address if the\n" "offset between the closest earlier symbol and the address is less than\n" @@ -21037,126 +21034,126 @@ msgid "procfs_find_LDT_entry: could not read gregs for %d:%ld." msgstr "" -#: procfs.c:1886 +#: procfs.c:1807 #, possible-c-format msgid "Attaching to program `%s', %s\n" msgstr "" -#: procfs.c:1912 target.c:3175 +#: procfs.c:1833 target.c:3175 #, possible-c-format msgid "Detaching from program: %s, %s\n" msgstr "" -#: procfs.c:1933 +#: procfs.c:1854 msgid "procfs: out of memory in 'attach'" msgstr "" -#: procfs.c:2022 +#: procfs.c:1943 msgid "Was stopped when attached, make it runnable again? " msgstr "" -#: procfs.c:2065 +#: procfs.c:1986 #, possible-c-format msgid "procfs: fetch_registers failed to find procinfo for %s" msgstr "" -#: procfs.c:2114 +#: procfs.c:2035 #, possible-c-format msgid "procfs: store_registers: failed to find procinfo for %s" msgstr "" -#: procfs.c:2233 +#: procfs.c:2154 #, possible-c-format msgid "procfs: couldn't stop process %d: wait returned %d." msgstr "" -#: procfs.c:2339 +#: procfs.c:2260 msgid "procfs: trapped on entry to " msgstr "" -#: procfs.c:2350 procfs.c:2436 +#: procfs.c:2271 procfs.c:2357 #, possible-c-format msgid "%ld syscall arguments:\n" msgstr "" -#: procfs.c:2425 +#: procfs.c:2346 msgid "procfs: trapped on exit from " msgstr "" -#: procfs.c:2454 +#: procfs.c:2375 #, possible-c-format msgid "Retry #%d:\n" msgstr "" -#: procfs.c:2487 +#: procfs.c:2408 msgid "child stopped for unknown reason:\n" msgstr "" -#: procfs.c:2489 +#: procfs.c:2410 msgid "... giving up..." msgstr "" -#: procfs.c:2514 +#: procfs.c:2435 msgid "procfs: ...giving up..." msgstr "" -#: procfs.c:2741 +#: procfs.c:2662 msgid "" "resume: target already running. Pretend to resume, and hope for the best!" msgstr "" -#: procfs.c:2777 +#: procfs.c:2698 #, possible-c-format msgid "\tUsing the running image of %s %s via /proc.\n" msgstr "" -#: procfs.c:2868 +#: procfs.c:2789 msgid "procfs: out of memory in 'init_inferior'" msgstr "" -#: procfs.c:2951 +#: procfs.c:2872 msgid "procfs: create_procinfo failed in child." msgstr "" #. Not found. This must be an error rather than merely passing #. the file to execlp(), because execlp() would try all the #. exec()s, causing GDB to get confused. -#: procfs.c:3081 +#: procfs.c:3002 #, possible-c-format msgid "procfs:%d -- Can't find shell %s in PATH" msgstr "" -#: procfs.c:3595 +#: procfs.c:3516 #, possible-c-format msgid "process %d flags:\n" msgstr "" -#: procfs.c:3605 +#: procfs.c:3526 #, possible-c-format msgid "thread %d flags:\n" msgstr "" -#: procfs.c:3663 +#: procfs.c:3584 msgid "you must be debugging a process to use this command." msgstr "" -#: procfs.c:3666 +#: procfs.c:3587 msgid "system call to trace" msgstr "" -#: procfs.c:3707 +#: procfs.c:3628 msgid "Give a trace of entries into the syscall." msgstr "" -#: procfs.c:3709 +#: procfs.c:3630 msgid "Give a trace of exits from the syscall." msgstr "" -#: procfs.c:3711 +#: procfs.c:3632 msgid "Cancel a trace of entries into the syscall." msgstr "" -#: procfs.c:3713 +#: procfs.c:3634 msgid "Cancel a trace of exits from the syscall." msgstr "" @@ -21310,7 +21307,7 @@ msgid "Command object already initialized." msgstr "" -#: python/py-cmd.c:470 python/py-param.c:682 +#: python/py-param.c:682 python/py-cmd.c:470 msgid "Invalid command class argument." msgstr "" @@ -21365,10 +21362,10 @@ msgid "internal error: Unhandled Python exception" msgstr "" -#: python/py-xmethods.c:537 python/py-xmethods.c:544 python/py-xmethods.c:558 -#: python/py-xmethods.c:569 python/py-xmethods.c:578 python/python.c:309 -#: python/python.c:392 python/python.c:408 python/py-function.c:94 -#: python/py-prettyprint.c:519 +#: python/py-prettyprint.c:519 python/py-xmethods.c:537 +#: python/py-xmethods.c:544 python/py-xmethods.c:558 python/py-xmethods.c:569 +#: python/py-xmethods.c:578 python/py-function.c:94 python/python.c:309 +#: python/python.c:392 python/python.c:408 msgid "Error while executing Python code." msgstr "" @@ -25359,11 +25356,11 @@ msgid "Cannot initialize thread debugging library: %s" msgstr "" -#: sol-thread.c:1131 +#: sol-thread.c:1099 msgid "info sol-thread: failed to get info for thread." msgstr "" -#: sol-thread.c:1219 +#: sol-thread.c:1187 msgid "Show info on Solaris user threads." msgstr "" @@ -25897,7 +25894,7 @@ msgid "%s preprocessor macro info.\n" msgstr "" -#: source.c:1187 +#: source.c:1182 msgid "invalid filename_display_string" msgstr "" @@ -25905,70 +25902,70 @@ msgid "Source file is more recent than executable." msgstr "" -#: source.c:1292 +#: source.c:1287 #, possible-c-format msgid "Line number %d out of range; %s has %d lines." msgstr "" -#: source.c:1431 +#: source.c:1426 msgid "No line number information available" msgstr "" #. Is there any case in which we get here, and have an address #. which the user would want to see? If we have debugging symbols #. and no line numbers? -#: source.c:1491 +#: source.c:1486 #, possible-c-format msgid "Line number %d is out of range for \"%s\".\n" msgstr "" -#: source.c:1526 +#: source.c:1521 msgid "Expression not found" msgstr "" -#: source.c:1586 +#: source.c:1581 msgid "Expression not found\n" msgstr "" -#: source.c:1703 +#: source.c:1698 msgid "Too many arguments in command" msgstr "" -#: source.c:1712 +#: source.c:1707 #, possible-c-format msgid "Source path substitution rule matching `%s':\n" msgstr "" -#: source.c:1714 +#: source.c:1709 msgid "List of all source path substitution rules:\n" msgstr "" -#: source.c:1737 source.c:1788 +#: source.c:1732 source.c:1783 msgid "Incorrect usage, too many arguments in command" msgstr "" -#: source.c:1747 +#: source.c:1742 msgid "Delete all source path substitution rules? " msgstr "" -#: source.c:1748 +#: source.c:1743 msgid "Canceled" msgstr "" -#: source.c:1770 +#: source.c:1765 #, possible-c-format msgid "No substitution rule defined for `%s'" msgstr "" -#: source.c:1785 +#: source.c:1780 msgid "Incorrect usage, too few arguments in command" msgstr "" -#: source.c:1791 +#: source.c:1786 msgid "First argument must be at least one character long" msgstr "" -#: source.c:1852 +#: source.c:1847 msgid "" "Add directory DIR to beginning of search path for source files.\n" "Forget cached info on source file locations and line positions.\n" @@ -25977,15 +25974,15 @@ "With no argument, reset the search path to $cdir:$cwd, the default." msgstr "" -#: source.c:1868 +#: source.c:1863 msgid "Set the search path for finding source files." msgstr "" -#: source.c:1870 +#: source.c:1865 msgid "Show the search path for finding source files." msgstr "" -#: source.c:1872 +#: source.c:1867 msgid "" "$cwd in the path means the current working directory.\n" "$cdir in the path means the compilation directory of the source file.\n" @@ -25994,11 +25991,11 @@ "Setting the value to an empty string sets it to $cdir:$cwd, the default." msgstr "" -#: source.c:1883 +#: source.c:1878 msgid "Information about the current source file." msgstr "" -#: source.c:1885 +#: source.c:1880 msgid "" "Core addresses of the code for a source line.\n" "Line can be specified as\n" @@ -26013,28 +26010,28 @@ "The address is also stored as the value of \"$_\"." msgstr "" -#: source.c:1897 +#: source.c:1892 msgid "" "Search for regular expression (see regex(3)) from last line listed.\n" "The matching line number is also stored as the value of \"$_\"." msgstr "" -#: source.c:1903 +#: source.c:1898 msgid "" "Search backward for regular expression (see regex(3)) from last line " "listed.\n" "The matching line number is also stored as the value of \"$_\"." msgstr "" -#: source.c:1908 +#: source.c:1903 msgid "Set number of source lines gdb will list by default." msgstr "" -#: source.c:1909 +#: source.c:1904 msgid "Show number of source lines gdb will list by default." msgstr "" -#: source.c:1910 +#: source.c:1905 msgid "" "Use this to choose how many source lines the \"list\" displays (unless\n" "the \"list\" argument explicitly specifies some other number).\n" @@ -26064,15 +26061,15 @@ "is not specified, print all substitution rules." msgstr "" -#: source.c:1947 +#: source.c:1942 msgid "Set how to display filenames." msgstr "" -#: source.c:1948 +#: source.c:1943 msgid "Show how to display filenames." msgstr "" -#: source.c:1949 +#: source.c:1944 msgid "" "filename-display can be:\n" " basename - display only basename of a filename\n" @@ -26753,7 +26750,7 @@ "or both. Note that one or both of these values may be ." msgstr "" -#: stap-probe.c:180 +#: stap-probe.c:186 #, possible-c-format msgid "" "Probe '%s' apparently does not have arguments, but \n" @@ -26761,133 +26758,133 @@ "Please report this bug." msgstr "" -#: stap-probe.c:272 +#: stap-probe.c:278 #, possible-c-format msgid "SystemTap Probe expression debugging is %s.\n" msgstr "" -#: stap-probe.c:417 +#: stap-probe.c:423 #, possible-c-format msgid "Invalid opcode in expression `%s' for SystemTapprobe" msgstr "" -#: stap-probe.c:466 +#: stap-probe.c:472 #, possible-c-format msgid "Undefined bitness for probe '%s'." msgstr "" -#: stap-probe.c:736 +#: stap-probe.c:742 #, possible-c-format msgid "Invalid register displacement syntax on expression `%s'." msgstr "" -#: stap-probe.c:820 +#: stap-probe.c:826 #, possible-c-format msgid "Missing register name suffix on expression `%s'." msgstr "" -#: stap-probe.c:830 +#: stap-probe.c:836 #, possible-c-format msgid "Missing indirection suffix on expression `%s'." msgstr "" -#: stap-probe.c:906 +#: stap-probe.c:912 #, possible-c-format msgid "Invalid operator `%c' for register displacement on expression `%s'." msgstr "" -#: stap-probe.c:959 stap-probe.c:987 +#: stap-probe.c:965 stap-probe.c:993 #, possible-c-format msgid "Invalid constant suffix on expression `%s'." msgstr "" -#: stap-probe.c:965 +#: stap-probe.c:971 #, possible-c-format msgid "Unknown numeric token on expression `%s'." msgstr "" -#: stap-probe.c:994 +#: stap-probe.c:1000 #, possible-c-format msgid "Operator `%c' not recognized on expression `%s'." msgstr "" -#: stap-probe.c:1026 +#: stap-probe.c:1032 #, possible-c-format msgid "Missign close-paren on expression `%s'." msgstr "" -#: stap-probe.c:1034 +#: stap-probe.c:1040 #, possible-c-format msgid "Cannot parse expression `%s'." msgstr "" -#: stap-probe.c:1077 +#: stap-probe.c:1083 #, possible-c-format msgid "Invalid operator `%c' on expression `%s'." msgstr "" #. We have an error, because we don't expect anything #. except 1, 2, 4 and 8. -#: stap-probe.c:1248 +#: stap-probe.c:1254 #, possible-c-format msgid "unrecognized bitness %s%c' for probe `%s'" msgstr "" -#: stap-probe.c:1316 +#: stap-probe.c:1322 msgid "" "The SystemTap SDT probe support is not fully implemented on this target;\n" "you will not be able to inspect the arguments of the probes.\n" "Please report a bug against GDB requesting a port to this target." msgstr "" -#: stap-probe.c:1434 +#: stap-probe.c:1440 msgid "Could not read the value of a SystemTap semaphore." msgstr "" -#: stap-probe.c:1450 +#: stap-probe.c:1456 msgid "Could not write the value of a SystemTap semaphore." msgstr "" -#: stap-probe.c:1525 +#: stap-probe.c:1531 #, possible-c-format msgid "corrupt probe name when reading `%s'" msgstr "" -#: stap-probe.c:1561 +#: stap-probe.c:1567 #, possible-c-format msgid "corrupt probe argument when reading `%s'" msgstr "" -#: stap-probe.c:1601 +#: stap-probe.c:1607 #, possible-c-format msgid "could not obtain base address for SystemTap section on objfile `%s'." msgstr "" #. If we are here, it means we have failed to parse every known #. probe. -#: stap-probe.c:1672 +#: stap-probe.c:1678 msgid "could not parse SystemTap probe(s) from inferior" msgstr "" -#: stap-probe.c:1693 +#: stap-probe.c:1699 msgid "Semaphore" msgstr "" -#: stap-probe.c:1713 +#: stap-probe.c:1719 msgid "Set SystemTap expression debugging." msgstr "" -#: stap-probe.c:1714 +#: stap-probe.c:1720 msgid "Show SystemTap expression debugging." msgstr "" -#: stap-probe.c:1715 +#: stap-probe.c:1721 msgid "" "When non-zero, the internal representation of SystemTap expressions will be " "printed." msgstr "" -#: stap-probe.c:1722 +#: stap-probe.c:1728 msgid "" "Show information about SystemTap static probes.\n" "Usage: info probes stap [PROVIDER [NAME [OBJECT]]]\n" @@ -27945,8 +27942,7 @@ msgid "Attempt to unpush the dummy target" msgstr "" -#: fbsd-tdep.c:2036 fbsd-tdep.c:2052 fbsd-tdep.c:2061 target.c:687 -#: target.c:772 +#: fbsd-tdep.c:2036 fbsd-tdep.c:2052 fbsd-tdep.c:2061 target.c:687 target.c:772 msgid "Cannot find thread-local variables on this target" msgstr "" @@ -28923,7 +28919,7 @@ msgid "Ignoring trace file definition \"%s\"" msgstr "" -#: tracefile.c:299 tracefile-tfile.c:846 +#: tracefile-tfile.c:846 tracefile.c:299 #, possible-c-format msgid "Unknown block type '%c' (0x%x) in trace frame" msgstr "" @@ -29817,11 +29813,11 @@ "Usage: > [win] [n]\n" msgstr "" -#: tui/tui-win.c:1457 +#: tui/tui-win.c:1468 msgid "Set the kind of border for TUI windows." msgstr "" -#: tui/tui-win.c:1458 +#: tui/tui-win.c:1469 msgid "Show the kind of border for TUI windows." msgstr "" @@ -29833,11 +29829,11 @@ "acs use the Alternate Character Set" msgstr "" -#: tui/tui-win.c:1469 +#: tui/tui-win.c:1480 msgid "Set the attribute mode to use for the TUI window borders." msgstr "" -#: tui/tui-win.c:1470 +#: tui/tui-win.c:1481 msgid "Show the attribute mode to use for the TUI window borders." msgstr "" @@ -29853,11 +29849,11 @@ "bold-standout use extra bright or bold with standout mode" msgstr "" -#: tui/tui-win.c:1485 +#: tui/tui-win.c:1496 msgid "Set the attribute mode to use for the active TUI window border." msgstr "" -#: tui/tui-win.c:1486 +#: tui/tui-win.c:1497 msgid "Show the attribute mode to use for the active TUI window border." msgstr "" @@ -30257,91 +30253,91 @@ msgid "Number of characters gdb thinks are in a line is %s.\n" msgstr "" -#: utils.c:2819 +#: utils.c:2834 #, possible-c-format msgid "Timestamping debugging messages is %s.\n" msgstr "" -#: utils.c:3424 +#: utils.c:3439 msgid "Set number of characters where GDB should wrap lines of its output." msgstr "" -#: utils.c:3425 +#: utils.c:3440 msgid "Show number of characters where GDB should wrap lines of its output." msgstr "" -#: utils.c:3426 +#: utils.c:3441 msgid "" "This affects where GDB wraps its output to fit the screen width.\n" "Setting this to \"unlimited\" or zero prevents GDB from wrapping its output." msgstr "" -#: utils.c:3433 +#: utils.c:3448 msgid "Set number of lines in a page for GDB output pagination." msgstr "" -#: utils.c:3434 +#: utils.c:3449 msgid "Show number of lines in a page for GDB output pagination." msgstr "" -#: utils.c:3435 +#: utils.c:3450 msgid "" "This affects the number of lines after which GDB will pause\n" "its output and ask you whether to continue.\n" "Setting this to \"unlimited\" or zero causes GDB never pause during output." msgstr "" -#: utils.c:3444 +#: utils.c:3459 msgid "Set state of GDB output pagination." msgstr "" -#: utils.c:3445 +#: utils.c:3460 msgid "Show state of GDB output pagination." msgstr "" -#: utils.c:3446 +#: utils.c:3461 msgid "" "When pagination is ON, GDB pauses at end of each screenful of\n" "its output and asks you whether to continue.\n" "Turning pagination off is an alternative to \"set height unlimited\"." msgstr "" -#: utils.c:3455 +#: utils.c:3470 msgid "Set printing of 8-bit characters in strings as \\nnn." msgstr "" -#: utils.c:3456 +#: utils.c:3471 msgid "Show printing of 8-bit characters in strings as \\nnn." msgstr "" -#: utils.c:3463 +#: utils.c:3478 msgid "Set timestamping of debugging messages." msgstr "" -#: utils.c:3464 +#: utils.c:3479 msgid "Show timestamping of debugging messages." msgstr "" -#: utils.c:3465 +#: utils.c:3480 msgid "" "When set, debugging messages will be marked with seconds and microseconds." msgstr "" -#: utils.c:2923 +#: utils.c:2938 #, possible-c-format msgid "invalid hex \"%s\"" msgstr "" -#: utils.c:2936 +#: utils.c:2951 #, possible-c-format msgid "invalid decimal \"%s\"" msgstr "" -#: utils.c:3080 +#: utils.c:3095 msgid "process-id to attach" msgstr "" -#: utils.c:3086 +#: utils.c:3101 #, possible-c-format msgid "Illegal process-id: %s." msgstr "" diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/gettext-runtime.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/gettext-runtime.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/gettext-runtime.po 2020-01-23 16:52:09.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/gettext-runtime.po 2020-07-08 13:54:11.000000000 +0000 @@ -15,8 +15,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 10:58+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:50+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ru\n" #: gnulib-lib/closeout.c:66 diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/gettext-tools.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/gettext-tools.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/gettext-tools.po 2020-01-23 16:52:08.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/gettext-tools.po 2020-07-08 13:54:10.000000000 +0000 @@ -18,8 +18,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2020-01-23 10:58+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 10:50+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ru\n" #: gnulib-lib/argmatch.c:133 diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/git-gui.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/git-gui.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/git-gui.po 2020-01-23 16:52:15.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/git-gui.po 2020-07-08 13:54:18.000000000 +0000 @@ -9,44 +9,44 @@ "Project-Id-Version: Git Russian Localization Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-26 15:47-0800\n" -"PO-Revision-Date: 2019-12-10 20:57+0000\n" +"PO-Revision-Date: 2020-04-21 13:42+0000\n" "Last-Translator: Dimitriy Ryazantcev \n" "Language-Team: Russian (http://www.transifex.com/djm00n/git-po-" "ru/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2020-01-23 11:18+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:07+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ru\n" -#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 -#: git-gui.sh:922 +#: git-gui.sh:917 git-gui.sh:931 git-gui.sh:944 git-gui.sh:1034 git-gui.sh:1053 +#: git-gui.sh:3212 msgid "git-gui: fatal error" msgstr "git-gui: критическая ошибка" -#: git-gui.sh:743 +#: git-gui.sh:847 #, tcl-format msgid "Invalid font specified in %s:" msgstr "В %s установлен неверный шрифт:" -#: git-gui.sh:779 +#: git-gui.sh:901 msgid "Main Font" msgstr "Шрифт интерфейса" -#: git-gui.sh:780 +#: git-gui.sh:902 msgid "Diff/Console Font" msgstr "Шрифт консоли и изменений (diff)" -#: git-gui.sh:794 +#: git-gui.sh:918 msgid "Cannot find git in PATH." msgstr "git не найден в PATH." -#: git-gui.sh:821 +#: git-gui.sh:945 msgid "Cannot parse Git version string:" msgstr "Невозможно распознать строку версии Git:" -#: git-gui.sh:839 +#: git-gui.sh:970 #, tcl-format msgid "" "Git version cannot be determined.\n" @@ -65,39 +65,39 @@ "\n" "Предположить, что «%s» и есть версия 1.5.0?\n" -#: git-gui.sh:1128 +#: git-gui.sh:1267 msgid "Git directory not found:" msgstr "Каталог Git не найден:" -#: git-gui.sh:1146 +#: git-gui.sh:1301 msgid "Cannot move to top of working directory:" msgstr "Невозможно перейти к корню рабочего каталога репозитория:" -#: git-gui.sh:1154 +#: git-gui.sh:1309 msgid "Cannot use bare repository:" msgstr "Невозможно использование репозитория без рабочего каталога:" -#: git-gui.sh:1162 +#: git-gui.sh:1317 msgid "No working directory" msgstr "Отсутствует рабочий каталог" -#: git-gui.sh:1334 lib/checkout_op.tcl:306 +#: git-gui.sh:1491 lib/checkout_op.tcl:306 msgid "Refreshing file status..." msgstr "Обновление информации о состоянии файлов…" -#: git-gui.sh:1390 +#: git-gui.sh:1551 msgid "Scanning for modified files ..." msgstr "Поиск измененных файлов…" -#: git-gui.sh:1454 +#: git-gui.sh:1629 msgid "Calling prepare-commit-msg hook..." msgstr "Вызов перехватчика prepare-commit-msg…" -#: git-gui.sh:1471 +#: git-gui.sh:1646 msgid "Commit declined by prepare-commit-msg hook." msgstr "Коммит прерван перехватчиком prepare-commit-msg." -#: git-gui.sh:1629 lib/browser.tcl:246 +#: git-gui.sh:1804 lib/browser.tcl:252 msgid "Ready." msgstr "Готово." @@ -106,52 +106,52 @@ msgid "Displaying only %s of %s files." msgstr "Показано %s из %s файлов." -#: git-gui.sh:1913 +#: git-gui.sh:2091 msgid "Unmodified" msgstr "Не изменено" -#: git-gui.sh:1915 +#: git-gui.sh:2093 msgid "Modified, not staged" msgstr "Изменено, не в индексе" -#: git-gui.sh:1916 git-gui.sh:1924 +#: git-gui.sh:2094 git-gui.sh:2106 msgid "Staged for commit" msgstr "В индексе для коммита" -#: git-gui.sh:1917 git-gui.sh:1925 +#: git-gui.sh:2095 git-gui.sh:2107 msgid "Portions staged for commit" msgstr "Части, в индексе для коммита" -#: git-gui.sh:1918 git-gui.sh:1926 +#: git-gui.sh:2096 git-gui.sh:2108 msgid "Staged for commit, missing" msgstr "В индексе для коммита, отсутствует" -#: git-gui.sh:1920 +#: git-gui.sh:2098 msgid "File type changed, not staged" msgstr "Тип файла изменён, не в индексе" -#: git-gui.sh:1921 +#: git-gui.sh:2101 msgid "File type changed, staged" msgstr "Тип файла изменён, в индексе" -#: git-gui.sh:1923 +#: git-gui.sh:2105 msgid "Untracked, not staged" msgstr "Не отслеживается, не в индексе" -#: git-gui.sh:1928 +#: git-gui.sh:2110 msgid "Missing" msgstr "Отсутствует" -#: git-gui.sh:1929 +#: git-gui.sh:2111 msgid "Staged for removal" msgstr "В индексе для удаления" -#: git-gui.sh:1930 +#: git-gui.sh:2112 msgid "Staged for removal, still present" msgstr "В индексе для удаления, еще не удалено" -#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 -#: git-gui.sh:1936 git-gui.sh:1937 +#: git-gui.sh:2114 git-gui.sh:2115 git-gui.sh:2116 git-gui.sh:2117 +#: git-gui.sh:2118 git-gui.sh:2119 msgid "Requires merge resolution" msgstr "Требуется разрешение конфликта при слиянии" @@ -159,148 +159,147 @@ msgid "Starting gitk... please wait..." msgstr "Запускается gitk… Подождите, пожалуйста…" -#: git-gui.sh:1984 +#: git-gui.sh:2164 msgid "Couldn't find gitk in PATH" msgstr "gitk не найден в PATH." -#: git-gui.sh:2043 +#: git-gui.sh:2224 msgid "Couldn't find git gui in PATH" msgstr "git gui не найден в PATH." -#: git-gui.sh:2455 lib/choose_repository.tcl:36 +#: git-gui.sh:2726 lib/choose_repository.tcl:53 msgid "Repository" msgstr "Репозиторий" -#: git-gui.sh:2456 +#: git-gui.sh:2727 msgid "Edit" msgstr "Редактировать" -#: git-gui.sh:2458 lib/choose_rev.tcl:561 +#: git-gui.sh:2729 lib/choose_rev.tcl:567 msgid "Branch" msgstr "Ветка" -#: git-gui.sh:2461 lib/choose_rev.tcl:548 +#: git-gui.sh:2732 lib/choose_rev.tcl:554 msgid "Commit@@noun" msgstr "Коммит" -#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +#: git-gui.sh:2735 lib/merge.tcl:127 lib/merge.tcl:174 msgid "Merge" msgstr "Слияние" -#: git-gui.sh:2465 lib/choose_rev.tcl:557 +#: git-gui.sh:2736 lib/choose_rev.tcl:563 msgid "Remote" msgstr "Внешние репозитории" -#: git-gui.sh:2468 +#: git-gui.sh:2739 msgid "Tools" msgstr "Вспомогательные операции" -#: git-gui.sh:2477 +#: git-gui.sh:2748 msgid "Explore Working Copy" msgstr "Просмотр рабочего каталога" -#: git-gui.sh:2483 +#: git-gui.sh:2772 msgid "Browse Current Branch's Files" msgstr "Просмотреть файлы текущей ветки" -#: git-gui.sh:2487 +#: git-gui.sh:2776 msgid "Browse Branch Files..." msgstr "Показать файлы ветки…" -#: git-gui.sh:2492 +#: git-gui.sh:2781 msgid "Visualize Current Branch's History" msgstr "Показать историю текущей ветки" -#: git-gui.sh:2496 +#: git-gui.sh:2785 msgid "Visualize All Branch History" msgstr "Показать историю всех веток" -#: git-gui.sh:2503 +#: git-gui.sh:2792 #, tcl-format msgid "Browse %s's Files" msgstr "Показать файлы ветки %s" -#: git-gui.sh:2505 +#: git-gui.sh:2794 #, tcl-format msgid "Visualize %s's History" msgstr "Показать историю ветки %s" -#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 +#: git-gui.sh:2799 lib/database.tcl:40 msgid "Database Statistics" msgstr "Статистика базы данных" -#: git-gui.sh:2513 lib/database.tcl:34 +#: git-gui.sh:2802 lib/database.tcl:33 msgid "Compress Database" msgstr "Сжать базу данных" -#: git-gui.sh:2516 +#: git-gui.sh:2805 msgid "Verify Database" msgstr "Проверить базу данных" -#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 -#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 +#: git-gui.sh:2812 git-gui.sh:2816 git-gui.sh:2820 msgid "Create Desktop Icon" msgstr "Создать ярлык на рабочем столе" -#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 +#: git-gui.sh:2828 lib/choose_repository.tcl:209 lib/choose_repository.tcl:217 msgid "Quit" msgstr "Выход" -#: git-gui.sh:2547 +#: git-gui.sh:2836 msgid "Undo" msgstr "Отменить" -#: git-gui.sh:2550 +#: git-gui.sh:2839 msgid "Redo" msgstr "Повторить" -#: git-gui.sh:2554 git-gui.sh:3109 +#: git-gui.sh:2843 git-gui.sh:3461 msgid "Cut" msgstr "Вырезать" -#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 +#: git-gui.sh:2846 git-gui.sh:3464 git-gui.sh:3540 git-gui.sh:3633 #: lib/console.tcl:69 msgid "Copy" msgstr "Копировать" -#: git-gui.sh:2560 git-gui.sh:3115 +#: git-gui.sh:2849 git-gui.sh:3467 msgid "Paste" msgstr "Вставить" -#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 +#: git-gui.sh:2852 git-gui.sh:3470 lib/remote_branch_delete.tcl:39 +#: lib/branch_delete.tcl:28 msgid "Delete" msgstr "Удалить" -#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 +#: git-gui.sh:2856 git-gui.sh:3474 git-gui.sh:3637 lib/console.tcl:71 msgid "Select All" msgstr "Выделить все" -#: git-gui.sh:2576 +#: git-gui.sh:2865 msgid "Create..." msgstr "Создать…" -#: git-gui.sh:2582 +#: git-gui.sh:2871 msgid "Checkout..." msgstr "Перейти…" -#: git-gui.sh:2588 +#: git-gui.sh:2877 msgid "Rename..." msgstr "Переименовать…" -#: git-gui.sh:2593 +#: git-gui.sh:2882 msgid "Delete..." msgstr "Удалить…" -#: git-gui.sh:2598 +#: git-gui.sh:2887 msgid "Reset..." msgstr "Сбросить…" -#: git-gui.sh:2608 +#: git-gui.sh:2897 msgid "Done" msgstr "Завершено" -#: git-gui.sh:2610 +#: git-gui.sh:2899 msgid "Commit@@verb" msgstr "Закоммитить" @@ -308,230 +307,230 @@ msgid "New Commit" msgstr "Новый коммит" -#: git-gui.sh:2627 git-gui.sh:3057 +#: git-gui.sh:2908 git-gui.sh:3400 msgid "Amend Last Commit" msgstr "Исправить последний коммит" -#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 +#: git-gui.sh:2918 git-gui.sh:3361 lib/remote_branch_delete.tcl:101 msgid "Rescan" msgstr "Перечитать" -#: git-gui.sh:2643 +#: git-gui.sh:2924 msgid "Stage To Commit" msgstr "Добавить в индекс" -#: git-gui.sh:2649 +#: git-gui.sh:2930 msgid "Stage Changed Files To Commit" msgstr "Добавить изменённые файлы в индекс" -#: git-gui.sh:2655 +#: git-gui.sh:2936 msgid "Unstage From Commit" msgstr "Убрать из издекса" -#: git-gui.sh:2661 lib/index.tcl:412 +#: git-gui.sh:2942 lib/index.tcl:521 msgid "Revert Changes" msgstr "Обратить изменения" -#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 +#: git-gui.sh:2950 git-gui.sh:3700 git-gui.sh:3731 msgid "Show Less Context" msgstr "Меньше контекста" -#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 +#: git-gui.sh:2954 git-gui.sh:3704 git-gui.sh:3735 msgid "Show More Context" msgstr "Больше контекста" -#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 +#: git-gui.sh:2961 git-gui.sh:3374 git-gui.sh:3485 msgid "Sign Off" msgstr "Вставить Signed-off-by" -#: git-gui.sh:2696 +#: git-gui.sh:2977 msgid "Local Merge..." msgstr "Локальное слияние…" -#: git-gui.sh:2701 +#: git-gui.sh:2982 msgid "Abort Merge..." msgstr "Прервать слияние…" -#: git-gui.sh:2713 git-gui.sh:2741 +#: git-gui.sh:2994 git-gui.sh:3022 msgid "Add..." msgstr "Добавить…" -#: git-gui.sh:2717 +#: git-gui.sh:2998 msgid "Push..." msgstr "Отправить…" -#: git-gui.sh:2721 +#: git-gui.sh:3002 msgid "Delete Branch..." msgstr "Удалить ветку…" -#: git-gui.sh:2731 git-gui.sh:3292 +#: git-gui.sh:3012 git-gui.sh:3666 msgid "Options..." msgstr "Настройки…" -#: git-gui.sh:2742 +#: git-gui.sh:3023 msgid "Remove..." msgstr "Удалить…" -#: git-gui.sh:2751 lib/choose_repository.tcl:50 +#: git-gui.sh:3032 lib/choose_repository.tcl:67 msgid "Help" msgstr "Помощь" -#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 +#: git-gui.sh:3036 git-gui.sh:3040 lib/choose_repository.tcl:61 +#: lib/choose_repository.tcl:70 lib/about.tcl:14 #, tcl-format msgid "About %s" msgstr "О %s" -#: git-gui.sh:2783 +#: git-gui.sh:3064 msgid "Online Documentation" msgstr "Документация в интернете" -#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 +#: git-gui.sh:3067 lib/choose_repository.tcl:64 lib/choose_repository.tcl:73 msgid "Show SSH Key" msgstr "Показать ключ SSH" -#: git-gui.sh:2893 +#: git-gui.sh:3213 #, tcl-format msgid "fatal: cannot stat path %s: No such file or directory" msgstr "критическая ошибка: %s: нет такого файла или каталога" -#: git-gui.sh:2926 +#: git-gui.sh:3246 msgid "Current Branch:" msgstr "Текущая ветка:" -#: git-gui.sh:2947 +#: git-gui.sh:3293 msgid "Staged Changes (Will Commit)" msgstr "Изменения в индексе (будут закоммичены)" -#: git-gui.sh:2967 +#: git-gui.sh:3271 msgid "Unstaged Changes" msgstr "Изменено (не будет сохранено)" -#: git-gui.sh:3017 +#: git-gui.sh:3367 msgid "Stage Changed" msgstr "Индексировать всё" -#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 +#: git-gui.sh:3386 lib/transport.tcl:137 msgid "Push" msgstr "Отправить" -#: git-gui.sh:3071 +#: git-gui.sh:3413 msgid "Initial Commit Message:" msgstr "Сообщение первого коммита:" -#: git-gui.sh:3072 +#: git-gui.sh:3414 msgid "Amended Commit Message:" msgstr "Сообщение исправленного коммита:" -#: git-gui.sh:3073 +#: git-gui.sh:3415 msgid "Amended Initial Commit Message:" msgstr "Сообщение исправленного первого коммита:" -#: git-gui.sh:3074 +#: git-gui.sh:3416 msgid "Amended Merge Commit Message:" msgstr "Сообщение исправленного слияния:" -#: git-gui.sh:3075 +#: git-gui.sh:3417 msgid "Merge Commit Message:" msgstr "Сообщение слияния:" -#: git-gui.sh:3076 +#: git-gui.sh:3418 msgid "Commit Message:" msgstr "Сообщение коммита:" -#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 +#: git-gui.sh:3477 git-gui.sh:3641 lib/console.tcl:73 msgid "Copy All" msgstr "Копировать все" -#: git-gui.sh:3149 lib/blame.tcl:104 +#: git-gui.sh:3501 lib/blame.tcl:106 msgid "File:" msgstr "Файл:" -#: git-gui.sh:3255 +#: git-gui.sh:3629 msgid "Refresh" msgstr "Обновить" -#: git-gui.sh:3276 +#: git-gui.sh:3650 msgid "Decrease Font Size" msgstr "Уменьшить размер шрифта" -#: git-gui.sh:3280 +#: git-gui.sh:3654 msgid "Increase Font Size" msgstr "Увеличить размер шрифта" -#: git-gui.sh:3288 lib/blame.tcl:281 +#: git-gui.sh:3662 lib/blame.tcl:296 msgid "Encoding" msgstr "Кодировка" -#: git-gui.sh:3299 +#: git-gui.sh:3673 msgid "Apply/Reverse Hunk" msgstr "Применить/Убрать изменение" -#: git-gui.sh:3304 +#: git-gui.sh:3678 msgid "Apply/Reverse Line" msgstr "Применить/Убрать строку" -#: git-gui.sh:3323 +#: git-gui.sh:3713 msgid "Run Merge Tool" msgstr "Запустить программу слияния" -#: git-gui.sh:3328 +#: git-gui.sh:3718 msgid "Use Remote Version" msgstr "Взять внешнюю версию" -#: git-gui.sh:3332 +#: git-gui.sh:3722 msgid "Use Local Version" msgstr "Взять локальную версию" -#: git-gui.sh:3336 +#: git-gui.sh:3726 msgid "Revert To Base" msgstr "Обратить изменения" -#: git-gui.sh:3354 +#: git-gui.sh:3744 msgid "Visualize These Changes In The Submodule" msgstr "Показать эти изменения подмодуля" -#: git-gui.sh:3358 +#: git-gui.sh:3748 msgid "Visualize Current Branch History In The Submodule" msgstr "Показать историю текущей ветки подмодуля" -#: git-gui.sh:3362 +#: git-gui.sh:3752 msgid "Visualize All Branch History In The Submodule" msgstr "Показать историю всех веток подмодуля" -#: git-gui.sh:3367 +#: git-gui.sh:3757 msgid "Start git gui In The Submodule" msgstr "Запустить git gui в подмодуле" -#: git-gui.sh:3389 +#: git-gui.sh:3793 msgid "Unstage Hunk From Commit" msgstr "Убрать блок из индекса" -#: git-gui.sh:3391 +#: git-gui.sh:3797 msgid "Unstage Lines From Commit" msgstr "Убрать строки из индекса" -#: git-gui.sh:3393 +#: git-gui.sh:3800 msgid "Unstage Line From Commit" msgstr "Убрать строку из индекса" -#: git-gui.sh:3396 +#: git-gui.sh:3804 msgid "Stage Hunk For Commit" msgstr "Добавить блок в индекс" -#: git-gui.sh:3398 +#: git-gui.sh:3808 msgid "Stage Lines For Commit" msgstr "Добавить строки в индекс" -#: git-gui.sh:3400 +#: git-gui.sh:3811 msgid "Stage Line For Commit" msgstr "Добавить строку в индекс" -#: git-gui.sh:3424 +#: git-gui.sh:3861 msgid "Initializing..." msgstr "Инициализация…" -#: git-gui.sh:3541 +#: git-gui.sh:4017 #, tcl-format msgid "" "Possible environment issues exist.\n" @@ -548,7 +547,7 @@ "запущенными из %s\n" "\n" -#: git-gui.sh:3570 +#: git-gui.sh:4046 msgid "" "\n" "This is due to a known issue with the\n" @@ -558,7 +557,7 @@ "Это известная проблема с Tcl,\n" "распространяемым Cygwin." -#: git-gui.sh:3575 +#: git-gui.sh:4051 #, tcl-format msgid "" "\n" @@ -583,137 +582,136 @@ msgid "File Viewer" msgstr "Просмотр файла" -#: lib/blame.tcl:78 +#: lib/blame.tcl:80 msgid "Commit:" msgstr "Коммит:" -#: lib/blame.tcl:271 +#: lib/blame.tcl:282 msgid "Copy Commit" msgstr "Копировать SHA-1" -#: lib/blame.tcl:275 +#: lib/blame.tcl:286 msgid "Find Text..." msgstr "Найти текст…" -#: lib/blame.tcl:284 +#: lib/blame.tcl:299 msgid "Do Full Copy Detection" msgstr "Провести полный поиск копий" -#: lib/blame.tcl:288 +#: lib/blame.tcl:303 msgid "Show History Context" msgstr "Показать исторический контекст" -#: lib/blame.tcl:291 +#: lib/blame.tcl:306 msgid "Blame Parent Commit" msgstr "Авторы родительского коммита" -#: lib/blame.tcl:450 +#: lib/blame.tcl:468 #, tcl-format msgid "Reading %s..." msgstr "Чтение %s…" -#: lib/blame.tcl:557 +#: lib/blame.tcl:596 msgid "Loading copy/move tracking annotations..." msgstr "Загрузка аннотации копирований/переименований…" -#: lib/blame.tcl:577 +#: lib/blame.tcl:613 msgid "lines annotated" msgstr "строк прокомментировано" -#: lib/blame.tcl:769 +#: lib/blame.tcl:815 msgid "Loading original location annotations..." msgstr "Загрузка аннотаций первоначального положения объекта…" -#: lib/blame.tcl:772 +#: lib/blame.tcl:818 msgid "Annotation complete." msgstr "Аннотация завершена." -#: lib/blame.tcl:802 +#: lib/blame.tcl:849 msgid "Busy" msgstr "Занят" -#: lib/blame.tcl:803 +#: lib/blame.tcl:850 msgid "Annotation process is already running." msgstr "Аннотация уже запущена" -#: lib/blame.tcl:842 +#: lib/blame.tcl:889 msgid "Running thorough copy detection..." msgstr "Выполнение полного поиска копий…" -#: lib/blame.tcl:910 +#: lib/blame.tcl:957 msgid "Loading annotation..." msgstr "Загрузка аннотации…" -#: lib/blame.tcl:963 +#: lib/blame.tcl:1010 msgid "Author:" msgstr "Автор:" -#: lib/blame.tcl:967 +#: lib/blame.tcl:1014 msgid "Committer:" msgstr "Коммитер:" -#: lib/blame.tcl:972 +#: lib/blame.tcl:1019 msgid "Original File:" msgstr "Исходный файл:" -#: lib/blame.tcl:1020 +#: lib/blame.tcl:1067 msgid "Cannot find HEAD commit:" msgstr "Не удалось найти текущее состояние:" -#: lib/blame.tcl:1075 +#: lib/blame.tcl:1122 msgid "Cannot find parent commit:" msgstr "Не удалось найти родительское состояние:" -#: lib/blame.tcl:1090 +#: lib/blame.tcl:1137 msgid "Unable to display parent" msgstr "Не могу показать предка" -#: lib/blame.tcl:1091 lib/diff.tcl:320 +#: lib/blame.tcl:1138 lib/diff.tcl:345 msgid "Error loading diff:" msgstr "Ошибка загрузки изменений:" -#: lib/blame.tcl:1231 +#: lib/blame.tcl:1279 msgid "Originally By:" msgstr "Источник:" -#: lib/blame.tcl:1237 +#: lib/blame.tcl:1285 msgid "In File:" msgstr "Файл:" -#: lib/blame.tcl:1242 +#: lib/blame.tcl:1290 msgid "Copied Or Moved Here By:" msgstr "Скопировано/перемещено в:" -#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 +#: lib/branch_checkout.tcl:21 msgid "Checkout Branch" msgstr "Перейти на ветку" -#: lib/branch_checkout.tcl:23 +#: lib/branch_checkout.tcl:26 msgid "Checkout" msgstr "Перейти" -#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 -#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 -#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 -#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 -#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 -#: lib/transport.tcl:108 +#: lib/transport.tcl:141 lib/checkout_op.tcl:580 lib/remote_add.tcl:34 +#: lib/browser.tcl:292 lib/branch_checkout.tcl:30 lib/branch_rename.tcl:32 +#: lib/choose_font.tcl:45 lib/option.tcl:127 lib/tools_dlg.tcl:41 +#: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/remote_branch_delete.tcl:43 +#: lib/branch_create.tcl:37 lib/branch_delete.tcl:34 lib/merge.tcl:178 msgid "Cancel" msgstr "Отмена" -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 +#: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321 msgid "Revision" msgstr "Версия" -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 +#: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69 msgid "Options" msgstr "Настройки" -#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 +#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92 msgid "Fetch Tracking Branch" msgstr "Извлечь изменения из внешней ветки" -#: lib/branch_checkout.tcl:44 +#: lib/branch_checkout.tcl:47 msgid "Detach From Local Branch" msgstr "Отсоединить от локальной ветки" @@ -721,23 +719,23 @@ msgid "Create Branch" msgstr "Создать ветку" -#: lib/branch_create.tcl:27 +#: lib/branch_create.tcl:28 msgid "Create New Branch" msgstr "Создать новую ветку" -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381 +#: lib/choose_repository.tcl:422 lib/branch_create.tcl:33 msgid "Create" msgstr "Создать" -#: lib/branch_create.tcl:40 +#: lib/branch_create.tcl:42 msgid "Branch Name" msgstr "Имя ветки" -#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 +#: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44 msgid "Name:" msgstr "Название:" -#: lib/branch_create.tcl:58 +#: lib/branch_create.tcl:57 msgid "Match Tracking Branch Name" msgstr "Соответствовать имени отслеживаемой ветки" @@ -757,7 +755,7 @@ msgid "Fast Forward Only" msgstr "Только Fast Forward" -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 +#: lib/checkout_op.tcl:572 lib/branch_create.tcl:85 msgid "Reset" msgstr "Сброс" @@ -765,20 +763,20 @@ msgid "Checkout After Creation" msgstr "После создания сделать текущей" -#: lib/branch_create.tcl:131 +#: lib/branch_create.tcl:132 msgid "Please select a tracking branch." msgstr "Укажите отлеживаемую ветку." -#: lib/branch_create.tcl:140 +#: lib/branch_create.tcl:141 #, tcl-format msgid "Tracking branch %s is not a branch in the remote repository." msgstr "Отслеживаемая ветка %s не является веткой на внешнем репозитории." -#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 +#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154 msgid "Please supply a branch name." msgstr "Укажите имя ветки." -#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 +#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165 #, tcl-format msgid "'%s' is not an acceptable branch name." msgstr "Недопустимое имя ветки «%s»." @@ -787,19 +785,19 @@ msgid "Delete Branch" msgstr "Удаление ветки" -#: lib/branch_delete.tcl:20 +#: lib/branch_delete.tcl:21 msgid "Delete Local Branch" msgstr "Удалить локальную ветку" -#: lib/branch_delete.tcl:37 +#: lib/branch_delete.tcl:39 msgid "Local Branches" msgstr "Локальные ветки" -#: lib/branch_delete.tcl:52 +#: lib/branch_delete.tcl:51 msgid "Delete Only If Merged Into" msgstr "Удалить только в случае, если было слияние с" -#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 +#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53 msgid "Always (Do not perform merge checks)" msgstr "Всегда (не выполнять проверку на слияние)" @@ -808,7 +806,7 @@ msgid "The following branches are not completely merged into %s:" msgstr "Ветки, которые не полностью сливаются с %s:" -#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217 +#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115 msgid "" "Recovering deleted branches is difficult.\n" "\n" @@ -827,32 +825,32 @@ "Не удалось удалить ветки:\n" "%s" -#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 +#: lib/branch_rename.tcl:23 msgid "Rename Branch" msgstr "Переименование ветки" -#: lib/branch_rename.tcl:26 +#: lib/branch_rename.tcl:28 msgid "Rename" msgstr "Переименовать" -#: lib/branch_rename.tcl:36 +#: lib/branch_rename.tcl:38 msgid "Branch:" msgstr "Ветка:" -#: lib/branch_rename.tcl:39 +#: lib/branch_rename.tcl:46 msgid "New Name:" msgstr "Новое название:" -#: lib/branch_rename.tcl:75 +#: lib/branch_rename.tcl:81 msgid "Please select a branch to rename." msgstr "Укажите ветку для переименования." -#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 +#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102 #, tcl-format msgid "Branch '%s' already exists." msgstr "Ветка «%s» уже существует." -#: lib/branch_rename.tcl:117 +#: lib/branch_rename.tcl:123 #, tcl-format msgid "Failed to rename '%s'." msgstr "Не удалось переименовать «%s»." @@ -865,22 +863,22 @@ msgid "File Browser" msgstr "Просмотр списка файлов" -#: lib/browser.tcl:126 lib/browser.tcl:143 +#: lib/browser.tcl:132 lib/browser.tcl:149 #, tcl-format msgid "Loading %s..." msgstr "Загрузка %s…" -#: lib/browser.tcl:187 +#: lib/browser.tcl:193 msgid "[Up To Parent]" msgstr "[На уровень выше]" -#: lib/browser.tcl:267 lib/browser.tcl:273 +#: lib/browser.tcl:282 msgid "Browse Branch Files" msgstr "Показать файлы ветки" -#: lib/browser.tcl:278 lib/choose_repository.tcl:398 -#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 -#: lib/choose_repository.tcl:1028 +#: lib/browser.tcl:288 lib/choose_repository.tcl:437 +#: lib/choose_repository.tcl:524 lib/choose_repository.tcl:533 +#: lib/choose_repository.tcl:1115 msgid "Browse" msgstr "Показать" @@ -894,8 +892,8 @@ msgid "fatal: Cannot resolve %s" msgstr "критическая ошибка: невозможно разрешить %s" -#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 -#: lib/sshkey.tcl:53 +#: lib/checkout_op.tcl:146 lib/sshkey.tcl:58 lib/console.tcl:81 +#: lib/database.tcl:30 msgid "Close" msgstr "Закрыть" @@ -962,21 +960,21 @@ msgid "files checked out" msgstr "файлы извлечены" -#: lib/checkout_op.tcl:376 +#: lib/checkout_op.tcl:377 #, tcl-format msgid "Aborted checkout of '%s' (file level merging is required)." msgstr "Прерван переход на «%s» (требуется слияние содержимого файлов)" -#: lib/checkout_op.tcl:377 +#: lib/checkout_op.tcl:378 msgid "File level merge required." msgstr "Требуется слияние содержания файлов." -#: lib/checkout_op.tcl:381 +#: lib/checkout_op.tcl:382 #, tcl-format msgid "Staying on branch '%s'." msgstr "Ветка «%s» остаётся текущей." -#: lib/checkout_op.tcl:452 +#: lib/checkout_op.tcl:453 msgid "" "You are no longer on a local branch.\n" "\n" @@ -988,30 +986,30 @@ "Если вы хотите снова вернуться к какой-нибудь ветке, создайте её сейчас, " "начиная с «Текущего отсоединенного состояния»." -#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 +#: lib/checkout_op.tcl:504 lib/checkout_op.tcl:508 #, tcl-format msgid "Checked out '%s'." msgstr "Выполнен переход на «%s»." -#: lib/checkout_op.tcl:535 +#: lib/checkout_op.tcl:536 #, tcl-format msgid "Resetting '%s' to '%s' will lose the following commits:" msgstr "Сброс «%s» на «%s» приведет к потере следующих коммитов:" -#: lib/checkout_op.tcl:557 +#: lib/checkout_op.tcl:558 msgid "Recovering lost commits may not be easy." msgstr "Восстановить потерянные коммиты будет сложно." -#: lib/checkout_op.tcl:562 +#: lib/checkout_op.tcl:563 #, tcl-format msgid "Reset '%s'?" msgstr "Сбросить «%s»?" -#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 +#: lib/checkout_op.tcl:568 lib/tools_dlg.tcl:336 lib/merge.tcl:170 msgid "Visualize" msgstr "Наглядно" -#: lib/checkout_op.tcl:635 +#: lib/checkout_op.tcl:636 #, tcl-format msgid "" "Failed to set current branch.\n" @@ -1028,23 +1026,23 @@ "\n" "Этого не должно было произойти. %s завершается." -#: lib/choose_font.tcl:39 +#: lib/choose_font.tcl:41 msgid "Select" msgstr "Выбрать" -#: lib/choose_font.tcl:53 +#: lib/choose_font.tcl:55 msgid "Font Family" msgstr "Шрифт" -#: lib/choose_font.tcl:74 +#: lib/choose_font.tcl:76 msgid "Font Size" msgstr "Размер шрифта" -#: lib/choose_font.tcl:91 +#: lib/choose_font.tcl:93 msgid "Font Example" msgstr "Пример текста" -#: lib/choose_font.tcl:103 +#: lib/choose_font.tcl:105 msgid "" "This is example text.\n" "If you like this text, it can be your font." @@ -1052,235 +1050,235 @@ "Это пример текста.\n" "Если Вам нравится этот текст, это может быть Ваш шрифт." -#: lib/choose_repository.tcl:28 +#: lib/choose_repository.tcl:45 msgid "Git Gui" msgstr "Git Gui" -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 +#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:427 msgid "Create New Repository" msgstr "Создать новый репозиторий" -#: lib/choose_repository.tcl:93 +#: lib/choose_repository.tcl:110 msgid "New..." msgstr "Новый…" -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 +#: lib/choose_repository.tcl:117 lib/choose_repository.tcl:511 msgid "Clone Existing Repository" msgstr "Склонировать существующий репозиторий" -#: lib/choose_repository.tcl:106 +#: lib/choose_repository.tcl:128 msgid "Clone..." msgstr "Клонировать…" -#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 +#: lib/choose_repository.tcl:135 lib/choose_repository.tcl:1105 msgid "Open Existing Repository" msgstr "Выбрать существующий репозиторий" -#: lib/choose_repository.tcl:119 +#: lib/choose_repository.tcl:141 msgid "Open..." msgstr "Открыть…" -#: lib/choose_repository.tcl:132 +#: lib/choose_repository.tcl:154 msgid "Recent Repositories" msgstr "Недавние репозитории" -#: lib/choose_repository.tcl:138 +#: lib/choose_repository.tcl:164 msgid "Open Recent Repository:" msgstr "Открыть последний репозиторий" -#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 -#: lib/choose_repository.tcl:320 +#: lib/choose_repository.tcl:331 lib/choose_repository.tcl:338 +#: lib/choose_repository.tcl:345 #, tcl-format msgid "Failed to create repository %s:" msgstr "Не удалось создать репозиторий %s:" -#: lib/choose_repository.tcl:391 +#: lib/choose_repository.tcl:432 msgid "Directory:" msgstr "Каталог:" -#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 -#: lib/choose_repository.tcl:1052 +#: lib/choose_repository.tcl:462 lib/choose_repository.tcl:588 +#: lib/choose_repository.tcl:1139 msgid "Git Repository" msgstr "Репозиторий" -#: lib/choose_repository.tcl:448 +#: lib/choose_repository.tcl:487 #, tcl-format msgid "Directory %s already exists." msgstr "Каталог '%s' уже существует." -#: lib/choose_repository.tcl:452 +#: lib/choose_repository.tcl:491 #, tcl-format msgid "File %s already exists." msgstr "Файл '%s' уже существует." -#: lib/choose_repository.tcl:466 +#: lib/choose_repository.tcl:506 msgid "Clone" msgstr "Склонировать" -#: lib/choose_repository.tcl:479 +#: lib/choose_repository.tcl:519 msgid "Source Location:" msgstr "Исходное положение:" -#: lib/choose_repository.tcl:490 +#: lib/choose_repository.tcl:528 msgid "Target Directory:" msgstr "Каталог назначения:" -#: lib/choose_repository.tcl:502 +#: lib/choose_repository.tcl:538 msgid "Clone Type:" msgstr "Тип клона:" -#: lib/choose_repository.tcl:508 +#: lib/choose_repository.tcl:543 msgid "Standard (Fast, Semi-Redundant, Hardlinks)" msgstr "Стандартный (Быстрый, полуизбыточный, «жесткие» ссылки)" -#: lib/choose_repository.tcl:514 +#: lib/choose_repository.tcl:548 msgid "Full Copy (Slower, Redundant Backup)" msgstr "Полная копия (Медленный, создает резервную копию)" -#: lib/choose_repository.tcl:520 +#: lib/choose_repository.tcl:553 msgid "Shared (Fastest, Not Recommended, No Backup)" msgstr "Общий (Самый быстрый, не рекомендуется, без резервной копии)" -#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 -#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 -#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 +#: lib/choose_repository.tcl:594 lib/choose_repository.tcl:641 +#: lib/choose_repository.tcl:790 lib/choose_repository.tcl:864 +#: lib/choose_repository.tcl:1145 lib/choose_repository.tcl:1153 #, tcl-format msgid "Not a Git repository: %s" msgstr "Каталог не является репозиторием: %s" -#: lib/choose_repository.tcl:592 +#: lib/choose_repository.tcl:630 msgid "Standard only available for local repository." msgstr "Стандартный клон возможен только для локального репозитория." -#: lib/choose_repository.tcl:596 +#: lib/choose_repository.tcl:634 msgid "Shared only available for local repository." msgstr "Общий клон возможен только для локального репозитория." -#: lib/choose_repository.tcl:617 +#: lib/choose_repository.tcl:655 #, tcl-format msgid "Location %s already exists." msgstr "Путь '%s' уже существует." -#: lib/choose_repository.tcl:628 +#: lib/choose_repository.tcl:666 msgid "Failed to configure origin" msgstr "Не могу сконфигурировать исходный репозиторий." -#: lib/choose_repository.tcl:640 +#: lib/choose_repository.tcl:678 msgid "Counting objects" msgstr "Считаю объекты" -#: lib/choose_repository.tcl:641 +#: lib/choose_repository.tcl:679 msgid "buckets" msgstr "блоки" -#: lib/choose_repository.tcl:665 +#: lib/choose_repository.tcl:703 #, tcl-format msgid "Unable to copy objects/info/alternates: %s" msgstr "Не могу скопировать objects/info/alternates: %s" -#: lib/choose_repository.tcl:701 +#: lib/choose_repository.tcl:740 #, tcl-format msgid "Nothing to clone from %s." msgstr "Нечего клонировать из %s." -#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 -#: lib/choose_repository.tcl:929 +#: lib/choose_repository.tcl:742 lib/choose_repository.tcl:962 +#: lib/choose_repository.tcl:974 msgid "The 'master' branch has not been initialized." msgstr "Не инициализирована ветвь «master»." -#: lib/choose_repository.tcl:716 +#: lib/choose_repository.tcl:755 msgid "Hardlinks are unavailable. Falling back to copying." msgstr "«Жесткие ссылки» недоступны. Будет использовано копирование." -#: lib/choose_repository.tcl:728 +#: lib/choose_repository.tcl:769 #, tcl-format msgid "Cloning from %s" msgstr "Клонирование из %s" -#: lib/choose_repository.tcl:759 +#: lib/choose_repository.tcl:800 msgid "Copying objects" msgstr "Копирование объектов" -#: lib/choose_repository.tcl:760 +#: lib/choose_repository.tcl:801 msgid "KiB" msgstr "КиБ" -#: lib/choose_repository.tcl:784 +#: lib/choose_repository.tcl:825 #, tcl-format msgid "Unable to copy object: %s" msgstr "Не могу скопировать объект: %s" -#: lib/choose_repository.tcl:794 +#: lib/choose_repository.tcl:837 msgid "Linking objects" msgstr "Создание ссылок на objects" -#: lib/choose_repository.tcl:795 +#: lib/choose_repository.tcl:838 msgid "objects" msgstr "объекты" -#: lib/choose_repository.tcl:803 +#: lib/choose_repository.tcl:846 #, tcl-format msgid "Unable to hardlink object: %s" msgstr "Не могу создать «жесткую ссылку» на объект: %s" -#: lib/choose_repository.tcl:858 +#: lib/choose_repository.tcl:903 msgid "Cannot fetch branches and objects. See console output for details." msgstr "" "Не удалось извлечь ветки и объекты. Дополнительная информация на консоли." -#: lib/choose_repository.tcl:869 +#: lib/choose_repository.tcl:914 msgid "Cannot fetch tags. See console output for details." msgstr "Не удалось извлечь метки. Дополнительная информация на консоли." -#: lib/choose_repository.tcl:893 +#: lib/choose_repository.tcl:938 msgid "Cannot determine HEAD. See console output for details." msgstr "Не могу определить HEAD. Дополнительная информация на консоли." -#: lib/choose_repository.tcl:902 +#: lib/choose_repository.tcl:947 #, tcl-format msgid "Unable to cleanup %s" msgstr "Не могу очистить %s" -#: lib/choose_repository.tcl:908 +#: lib/choose_repository.tcl:953 msgid "Clone failed." msgstr "Клонирование не удалось." -#: lib/choose_repository.tcl:915 +#: lib/choose_repository.tcl:960 msgid "No default branch obtained." msgstr "Ветка по умолчанию не была получена." -#: lib/choose_repository.tcl:926 +#: lib/choose_repository.tcl:971 #, tcl-format msgid "Cannot resolve %s as a commit." msgstr "Не могу распознать %s как коммит." -#: lib/choose_repository.tcl:938 +#: lib/choose_repository.tcl:998 msgid "Creating working directory" msgstr "Создаю рабочий каталог" -#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 -#: lib/index.tcl:198 +#: lib/index.tcl:77 lib/index.tcl:146 lib/index.tcl:220 lib/index.tcl:587 +#: lib/choose_repository.tcl:999 msgid "files" msgstr "файлов" -#: lib/choose_repository.tcl:968 +#: lib/choose_repository.tcl:1028 msgid "Initial file checkout failed." msgstr "Не удалось получить начальное состояние файлов репозитория." -#: lib/choose_repository.tcl:1011 +#: git-gui.sh:3549 lib/choose_repository.tcl:1100 msgid "Open" msgstr "Открыть" -#: lib/choose_repository.tcl:1021 +#: lib/choose_repository.tcl:1110 msgid "Repository:" msgstr "Репозиторий:" -#: lib/choose_repository.tcl:1072 +#: lib/choose_repository.tcl:1159 #, tcl-format msgid "Failed to open repository %s:" msgstr "Не удалось открыть репозиторий %s:" -#: lib/choose_rev.tcl:53 +#: lib/choose_rev.tcl:52 msgid "This Detached Checkout" msgstr "Текущее отсоединенное состояние" @@ -1288,36 +1286,36 @@ msgid "Revision Expression:" msgstr "Выражение для определения версии:" -#: lib/choose_rev.tcl:74 +#: lib/choose_rev.tcl:72 msgid "Local Branch" msgstr "Локальная ветка:" -#: lib/choose_rev.tcl:79 +#: lib/choose_rev.tcl:77 msgid "Tracking Branch" msgstr "Отслеживаемая ветка" -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 +#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544 msgid "Tag" msgstr "Метка" -#: lib/choose_rev.tcl:317 +#: lib/choose_rev.tcl:321 #, tcl-format msgid "Invalid revision: %s" msgstr "Неверная версия: %s" -#: lib/choose_rev.tcl:338 +#: lib/choose_rev.tcl:342 msgid "No revision selected." msgstr "Версия не указана." -#: lib/choose_rev.tcl:346 +#: lib/choose_rev.tcl:350 msgid "Revision expression is empty." msgstr "Пустое выражение для определения версии." -#: lib/choose_rev.tcl:531 +#: lib/choose_rev.tcl:537 msgid "Updated" msgstr "Обновлено" -#: lib/choose_rev.tcl:559 +#: lib/choose_rev.tcl:565 msgid "URL" msgstr "Ссылка" @@ -1345,24 +1343,24 @@ "Текущее слияние не завершено. Невозможно исправить предыдуий коммит, не " "прерывая эту операцию.\n" -#: lib/commit.tcl:48 +#: lib/commit.tcl:56 msgid "Error loading commit data for amend:" msgstr "Ошибка при загрузке данных для исправления коммита:" -#: lib/commit.tcl:75 +#: lib/commit.tcl:83 msgid "Unable to obtain your identity:" msgstr "Невозможно получить информацию об авторстве:" -#: lib/commit.tcl:80 +#: lib/commit.tcl:88 msgid "Invalid GIT_COMMITTER_IDENT:" msgstr "Недопустимый GIT_COMMITTER_IDENT:" -#: lib/commit.tcl:129 +#: lib/commit.tcl:138 #, tcl-format msgid "warning: Tcl does not support encoding '%s'." msgstr "предупреждение: Tcl не поддерживает кодировку «%s»." -#: lib/commit.tcl:149 +#: lib/commit.tcl:158 msgid "" "Last scanned state does not match repository state.\n" "\n" @@ -1378,7 +1376,7 @@ "\n" "Это будет сделано сейчас автоматически.\n" -#: lib/commit.tcl:172 +#: lib/commit.tcl:182 #, tcl-format msgid "" "Unmerged files cannot be committed.\n" @@ -1391,7 +1389,7 @@ "Для файла %s возник конфликт слияния. Разрешите конфликт и добавьте их в " "индекс перед выполнением коммита.\n" -#: lib/commit.tcl:180 +#: lib/commit.tcl:190 #, tcl-format msgid "" "Unknown file state %s detected.\n" @@ -1402,7 +1400,7 @@ "\n" "Файл %s не может быть закоммичен этой программой.\n" -#: lib/commit.tcl:188 +#: lib/commit.tcl:198 msgid "" "No changes to commit.\n" "\n" @@ -1412,7 +1410,7 @@ "\n" "Добавьте в индекс хотя бы один файл перед выполнением коммита.\n" -#: lib/commit.tcl:203 +#: lib/commit.tcl:213 msgid "" "Please supply a commit message.\n" "\n" @@ -1430,40 +1428,40 @@ "- вторая строка пустая\n" "- в оставшихся строках опишите, что дают ваши изменения\n" -#: lib/commit.tcl:234 +#: lib/commit.tcl:244 msgid "Calling pre-commit hook..." msgstr "Вызов перехватчика pre-commit…" -#: lib/commit.tcl:249 +#: lib/commit.tcl:259 msgid "Commit declined by pre-commit hook." msgstr "Коммит прерван переватчиком pre-commit." -#: lib/commit.tcl:272 +#: lib/commit.tcl:299 msgid "Calling commit-msg hook..." msgstr "Вызов перехватчика commit-msg…" -#: lib/commit.tcl:287 +#: lib/commit.tcl:314 msgid "Commit declined by commit-msg hook." msgstr "Коммит прерван переватчиком commit-msg" -#: lib/commit.tcl:300 +#: lib/commit.tcl:327 msgid "Committing changes..." msgstr "Коммит изменений…" -#: lib/commit.tcl:316 +#: lib/commit.tcl:344 msgid "write-tree failed:" msgstr "Программа write-tree завершилась с ошибкой:" -#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 +#: lib/commit.tcl:345 lib/commit.tcl:395 lib/commit.tcl:422 msgid "Commit failed." msgstr "Не удалось закоммитить изменения." -#: lib/commit.tcl:334 +#: lib/commit.tcl:362 #, tcl-format msgid "Commit %s appears to be corrupt" msgstr "Коммит %s похоже поврежден" -#: lib/commit.tcl:339 +#: lib/commit.tcl:367 msgid "" "No changes to commit.\n" "\n" @@ -1477,19 +1475,19 @@ "\n" "Сейчас автоматически запустится перечитывание репозитория.\n" -#: lib/commit.tcl:346 +#: lib/commit.tcl:374 msgid "No changes to commit." msgstr "Нет изменения для коммита." -#: lib/commit.tcl:360 +#: lib/commit.tcl:394 msgid "commit-tree failed:" msgstr "Программа commit-tree завершилась с ошибкой:" -#: lib/commit.tcl:381 +#: lib/commit.tcl:421 msgid "update-ref failed:" msgstr "Программа update-ref завершилась с ошибкой:" -#: lib/commit.tcl:469 +#: lib/commit.tcl:514 #, tcl-format msgid "Created commit %s: %s" msgstr "Создан коммит %s: %s" @@ -1506,31 +1504,31 @@ msgid "Error: Command Failed" msgstr "Ошибка: не удалось выполнить команду" -#: lib/database.tcl:43 +#: lib/database.tcl:42 msgid "Number of loose objects" msgstr "Количество несвязанных объектов" -#: lib/database.tcl:44 +#: lib/database.tcl:43 msgid "Disk space used by loose objects" msgstr "Объем дискового пространства, занятый несвязанными объектами" -#: lib/database.tcl:45 +#: lib/database.tcl:44 msgid "Number of packed objects" msgstr "Количество упакованных объектов" -#: lib/database.tcl:46 +#: lib/database.tcl:45 msgid "Number of packs" msgstr "Количество pack-файлов" -#: lib/database.tcl:47 +#: lib/database.tcl:46 msgid "Disk space used by packed objects" msgstr "Объем дискового пространства, занятый упакованными объектами" -#: lib/database.tcl:48 +#: lib/database.tcl:47 msgid "Packed objects waiting for pruning" msgstr "Несвязанные объекты, которые можно удалить" -#: lib/database.tcl:49 +#: lib/database.tcl:48 msgid "Garbage files" msgstr "Мусор" @@ -1563,7 +1561,7 @@ msgid "Invalid date from Git: %s" msgstr "Неправильная дата в репозитории: %s" -#: lib/diff.tcl:64 +#: lib/diff.tcl:77 #, tcl-format msgid "" "No differences detected.\n" @@ -1585,12 +1583,12 @@ "\n" "Сейчас будет запущено перечитывание репозитория, чтобы найти подобные файлы." -#: lib/diff.tcl:104 +#: lib/diff.tcl:117 #, tcl-format msgid "Loading diff of %s..." msgstr "Загрузка изменений %s…" -#: lib/diff.tcl:125 +#: lib/diff.tcl:143 msgid "" "LOCAL: deleted\n" "REMOTE:\n" @@ -1598,7 +1596,7 @@ "ЛОКАЛЬНО: удалён\n" "ВНЕШНИЙ:\n" -#: lib/diff.tcl:130 +#: lib/diff.tcl:148 msgid "" "REMOTE: deleted\n" "LOCAL:\n" @@ -1606,32 +1604,32 @@ "ВНЕШНИЙ: удалён\n" "ЛОКАЛЬНО:\n" -#: lib/diff.tcl:137 +#: lib/diff.tcl:155 msgid "LOCAL:\n" msgstr "ЛОКАЛЬНО:\n" -#: lib/diff.tcl:140 +#: lib/diff.tcl:158 msgid "REMOTE:\n" msgstr "ВНЕШНИЙ:\n" -#: lib/diff.tcl:202 lib/diff.tcl:319 +#: lib/diff.tcl:220 lib/diff.tcl:344 #, tcl-format msgid "Unable to display %s" msgstr "Не могу показать %s" -#: lib/diff.tcl:203 +#: lib/diff.tcl:221 msgid "Error loading file:" msgstr "Ошибка загрузки файла:" -#: lib/diff.tcl:210 +#: lib/diff.tcl:227 msgid "Git Repository (subproject)" msgstr "Репозиторий Git (подпроект)" -#: lib/diff.tcl:222 +#: lib/diff.tcl:239 msgid "* Binary file (not showing content)." msgstr "* Двоичный файл (содержимое не показано)" -#: lib/diff.tcl:227 +#: lib/diff.tcl:244 #, tcl-format msgid "" "* Untracked file is %d bytes.\n" @@ -1640,7 +1638,7 @@ "* Размер неотслеживаемого файла %d байт.\n" "* Показано первых %d байт.\n" -#: lib/diff.tcl:233 +#: lib/diff.tcl:250 #, tcl-format msgid "" "\n" @@ -1651,19 +1649,19 @@ "* Неотслеживаемый файл обрезан: %s.\n" "* Чтобы увидеть весь файл, используйте внешний редактор.\n" -#: lib/diff.tcl:482 +#: lib/diff.tcl:583 msgid "Failed to unstage selected hunk." msgstr "Не удалось исключить выбранную часть." -#: lib/diff.tcl:489 +#: lib/diff.tcl:594 msgid "Failed to stage selected hunk." msgstr "Не удалось проиндексировать выбранный блок изменений." -#: lib/diff.tcl:568 +#: lib/diff.tcl:687 msgid "Failed to unstage selected line." msgstr "Не удалось исключить выбранную строку." -#: lib/diff.tcl:576 +#: lib/diff.tcl:700 msgid "Failed to stage selected line." msgstr "Не удалось проиндексировать выбранную строку." @@ -1688,7 +1686,7 @@ msgid "warning" msgstr "предупреждение" -#: lib/error.tcl:94 +#: lib/error.tcl:96 msgid "You must correct the above errors before committing." msgstr "Перед коммитом, исправьте вышеуказанные ошибки." @@ -1696,11 +1694,11 @@ msgid "Unable to unlock the index." msgstr "Не удалось разблокировать индекс" -#: lib/index.tcl:15 +#: lib/index.tcl:30 msgid "Index Error" msgstr "Ошибка в индексе" -#: lib/index.tcl:17 +#: lib/index.tcl:32 msgid "" "Updating the Git index failed. A rescan will be automatically started to " "resynchronize git-gui." @@ -1708,52 +1706,52 @@ "Не удалось обновить индекс Git. Состояние репозитория будет перечитано " "автоматически." -#: lib/index.tcl:28 +#: lib/index.tcl:43 msgid "Continue" msgstr "Продолжить" -#: lib/index.tcl:31 +#: lib/index.tcl:46 msgid "Unlock Index" msgstr "Разблокировать индекс" -#: lib/index.tcl:289 +#: lib/index.tcl:330 #, tcl-format msgid "Unstaging %s from commit" msgstr "Удаление %s из индекса" -#: lib/index.tcl:328 +#: lib/index.tcl:369 msgid "Ready to commit." msgstr "Готов для коммита." -#: lib/index.tcl:341 +#: lib/index.tcl:382 #, tcl-format msgid "Adding %s" msgstr "Добавление %s…" -#: lib/index.tcl:398 +#: lib/index.tcl:503 #, tcl-format msgid "Revert changes in file %s?" msgstr "Обратить изменения в файле %s?" -#: lib/index.tcl:400 +#: lib/index.tcl:508 #, tcl-format msgid "Revert changes in these %i files?" msgstr "Обратить изменения в %i файле(-ах)?" -#: lib/index.tcl:408 +#: lib/index.tcl:517 msgid "Any unstaged changes will be permanently lost by the revert." msgstr "" "Любые непроиндексированные изменения, будут потеряны при обращении изменений." -#: lib/index.tcl:411 +#: lib/index.tcl:520 lib/index.tcl:563 msgid "Do Nothing" msgstr "Ничего не делать" -#: lib/index.tcl:429 +#: lib/index.tcl:726 msgid "Reverting selected files" msgstr "Обращение изменений в выбранных файлах" -#: lib/index.tcl:433 +#: lib/index.tcl:730 #, tcl-format msgid "Reverting %s" msgstr "Обращение изменений в %s" @@ -1818,34 +1816,34 @@ "Вы должны завершить текущий коммит перед началом слияния. В случае " "необходимости, это позволит прервать операцию слияния.\n" -#: lib/merge.tcl:107 +#: lib/merge.tcl:108 #, tcl-format msgid "%s of %s" msgstr "%s из %s" -#: lib/merge.tcl:120 +#: lib/merge.tcl:126 #, tcl-format msgid "Merging %s and %s..." msgstr "Слияние %s и %s…" -#: lib/merge.tcl:131 +#: lib/merge.tcl:137 msgid "Merge completed successfully." msgstr "Слияние успешно завершено." -#: lib/merge.tcl:133 +#: lib/merge.tcl:139 msgid "Merge failed. Conflict resolution is required." msgstr "Не удалось завершить слияние. Требуется разрешение конфликта." -#: lib/merge.tcl:158 +#: lib/merge.tcl:164 #, tcl-format msgid "Merge Into %s" msgstr "Слияние с %s" -#: lib/merge.tcl:177 +#: lib/merge.tcl:183 msgid "Revision To Merge" msgstr "Версия, с которой провести слияние" -#: lib/merge.tcl:212 +#: lib/merge.tcl:218 msgid "" "Cannot abort while amending.\n" "\n" @@ -1855,7 +1853,7 @@ "\n" "Завершите текущее исправление коммита.\n" -#: lib/merge.tcl:222 +#: lib/merge.tcl:228 msgid "" "Abort merge?\n" "\n" @@ -1870,7 +1868,7 @@ "\n" "Продолжить?" -#: lib/merge.tcl:228 +#: lib/merge.tcl:234 msgid "" "Reset changes?\n" "\n" @@ -1884,19 +1882,19 @@ "\n" "Продолжить?" -#: lib/merge.tcl:239 +#: lib/merge.tcl:246 msgid "Aborting" msgstr "Прерываю" -#: lib/merge.tcl:239 +#: lib/merge.tcl:247 msgid "files reset" msgstr "изменения в файлах отменены" -#: lib/merge.tcl:267 +#: lib/merge.tcl:277 msgid "Abort failed." msgstr "Прервать не удалось." -#: lib/merge.tcl:269 +#: lib/merge.tcl:279 msgid "Abort completed. Ready." msgstr "Прервано." @@ -1947,21 +1945,21 @@ msgid "Conflict file does not exist" msgstr "Конфликтующий файл не существует" -#: lib/mergetool.tcl:264 +#: lib/mergetool.tcl:246 #, tcl-format msgid "Not a GUI merge tool: '%s'" msgstr "«%s» не является программой слияния" -#: lib/mergetool.tcl:268 +#: lib/mergetool.tcl:275 #, tcl-format msgid "Unsupported merge tool '%s'" msgstr "Неподдерживаемая программа слияния «%s»" -#: lib/mergetool.tcl:303 +#: lib/mergetool.tcl:310 msgid "Merge tool is already running, terminate it?" msgstr "Программа слияния уже работает. Прервать?" -#: lib/mergetool.tcl:323 +#: lib/mergetool.tcl:330 #, tcl-format msgid "" "Error retrieving versions:\n" @@ -1970,7 +1968,7 @@ "Ошибка получения версий:\n" "%s" -#: lib/mergetool.tcl:343 +#: lib/mergetool.tcl:350 #, tcl-format msgid "" "Could not start the merge tool:\n" @@ -1981,11 +1979,11 @@ "\n" "%s" -#: lib/mergetool.tcl:347 +#: lib/mergetool.tcl:354 msgid "Running merge tool..." msgstr "Запуск программы слияния…" -#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 +#: lib/mergetool.tcl:382 lib/mergetool.tcl:390 msgid "Merge tool failed." msgstr "Ошибка выполнения программы слияния." @@ -1999,130 +1997,130 @@ msgid "Invalid repo encoding '%s'" msgstr "Неверная кодировка репозитория «%s»" -#: lib/option.tcl:117 +#: lib/option.tcl:119 msgid "Restore Defaults" msgstr "Восстановить настройки по умолчанию" -#: lib/option.tcl:121 +#: lib/option.tcl:123 msgid "Save" msgstr "Сохранить" -#: lib/option.tcl:131 +#: lib/option.tcl:133 #, tcl-format msgid "%s Repository" msgstr "Для репозитория %s" -#: lib/option.tcl:132 +#: lib/option.tcl:134 msgid "Global (All Repositories)" msgstr "Общие (для всех репозиториев)" -#: lib/option.tcl:138 +#: lib/option.tcl:140 msgid "User Name" msgstr "Имя пользователя" -#: lib/option.tcl:139 +#: lib/option.tcl:141 msgid "Email Address" msgstr "Адрес электронной почты" -#: lib/option.tcl:141 +#: lib/option.tcl:143 msgid "Summarize Merge Commits" msgstr "Суммарное сообщение при слиянии" -#: lib/option.tcl:142 +#: lib/option.tcl:144 msgid "Merge Verbosity" msgstr "Уровень детальности сообщений при слиянии" -#: lib/option.tcl:143 +#: lib/option.tcl:145 msgid "Show Diffstat After Merge" msgstr "Показать отчет об изменениях после слияния" -#: lib/option.tcl:144 +#: lib/option.tcl:146 msgid "Use Merge Tool" msgstr "Использовать для слияния программу" -#: lib/option.tcl:146 +#: lib/option.tcl:148 msgid "Trust File Modification Timestamps" msgstr "Доверять времени модификации файла" -#: lib/option.tcl:147 +#: lib/option.tcl:149 msgid "Prune Tracking Branches During Fetch" msgstr "Чистка отслеживаемых веток при извлечении изменений" -#: lib/option.tcl:148 +#: lib/option.tcl:150 msgid "Match Tracking Branches" msgstr "Такое же имя, как и у отслеживаемой ветки" -#: lib/option.tcl:149 +#: lib/option.tcl:152 msgid "Blame Copy Only On Changed Files" msgstr "Поиск копий только в изменённых файлах" -#: lib/option.tcl:150 +#: lib/option.tcl:154 msgid "Minimum Letters To Blame Copy On" msgstr "Минимальное количество символов для поиска копий" -#: lib/option.tcl:151 +#: lib/option.tcl:155 msgid "Blame History Context Radius (days)" msgstr "Радиус исторического контекста (в днях)" -#: lib/option.tcl:152 +#: lib/option.tcl:156 msgid "Number of Diff Context Lines" msgstr "Число строк в контексте diff" -#: lib/option.tcl:153 +#: lib/option.tcl:158 msgid "Commit Message Text Width" msgstr "Ширина текста сообщения коммита" -#: lib/option.tcl:154 +#: lib/option.tcl:159 msgid "New Branch Name Template" msgstr "Шаблон для имени новой ветки" -#: lib/option.tcl:155 +#: lib/option.tcl:160 msgid "Default File Contents Encoding" msgstr "Кодировка содержания файла по умолчанию" -#: lib/option.tcl:203 +#: lib/option.tcl:210 msgid "Change" msgstr "Изменить" -#: lib/option.tcl:230 +#: lib/option.tcl:254 msgid "Spelling Dictionary:" msgstr "Словарь для проверки правописания:" -#: lib/option.tcl:254 +#: lib/option.tcl:284 msgid "Change Font" msgstr "Изменить" -#: lib/option.tcl:258 +#: lib/option.tcl:288 #, tcl-format msgid "Choose %s" msgstr "Выберите %s" # carbon copy -#: lib/option.tcl:264 +#: lib/option.tcl:294 msgid "pt." msgstr "pt." -#: lib/option.tcl:278 +#: lib/option.tcl:308 msgid "Preferences" msgstr "Настройки" -#: lib/option.tcl:314 +#: lib/option.tcl:345 msgid "Failed to completely save options:" msgstr "Не удалось полностью сохранить настройки:" -#: lib/remote.tcl:163 +#: lib/remote.tcl:218 msgid "Remove Remote" msgstr "Удалить ссылку на внешний репозиторий" -#: lib/remote.tcl:168 +#: lib/remote.tcl:223 msgid "Prune from" msgstr "Чистка" -#: lib/remote.tcl:173 +#: lib/remote.tcl:228 msgid "Fetch from" msgstr "Извлечение из" -#: lib/remote.tcl:215 +#: lib/remote.tcl:200 msgid "Push to" msgstr "Отправить" @@ -2130,15 +2128,15 @@ msgid "Add Remote" msgstr "Зарегистрировать внешний репозиторий" -#: lib/remote_add.tcl:24 +#: lib/remote_add.tcl:25 msgid "Add New Remote" msgstr "Добавить внешний репозиторий" -#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 +#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37 msgid "Add" msgstr "Добавить" -#: lib/remote_add.tcl:37 +#: lib/remote_add.tcl:39 msgid "Remote Details" msgstr "Информация о внешнем репозитории" @@ -2146,95 +2144,95 @@ msgid "Location:" msgstr "Положение:" -#: lib/remote_add.tcl:62 +#: lib/remote_add.tcl:60 msgid "Further Action" msgstr "Следующая операция" -#: lib/remote_add.tcl:65 +#: lib/remote_add.tcl:63 msgid "Fetch Immediately" msgstr "Сразу извлечь изменения" -#: lib/remote_add.tcl:71 +#: lib/remote_add.tcl:69 msgid "Initialize Remote Repository and Push" msgstr "Инициализировать внешний репозиторий и отправить" -#: lib/remote_add.tcl:77 +#: lib/remote_add.tcl:75 msgid "Do Nothing Else Now" msgstr "Больше ничего не делать" -#: lib/remote_add.tcl:101 +#: lib/remote_add.tcl:100 msgid "Please supply a remote name." msgstr "Укажите название внешнего репозитория." -#: lib/remote_add.tcl:114 +#: lib/remote_add.tcl:113 #, tcl-format msgid "'%s' is not an acceptable remote name." msgstr "«%s» не является допустимым именем внешнего репозитория." -#: lib/remote_add.tcl:125 +#: lib/remote_add.tcl:124 #, tcl-format msgid "Failed to add remote '%s' of location '%s'." msgstr "Не удалось добавить «%s» из «%s»." -#: lib/remote_add.tcl:133 lib/transport.tcl:6 +#: lib/transport.tcl:6 lib/remote_add.tcl:132 #, tcl-format msgid "fetch %s" msgstr "извлечение %s" -#: lib/remote_add.tcl:134 +#: lib/remote_add.tcl:133 #, tcl-format msgid "Fetching the %s" msgstr "Извлечение %s" -#: lib/remote_add.tcl:157 +#: lib/remote_add.tcl:156 #, tcl-format msgid "Do not know how to initialize repository at location '%s'." msgstr "Невозможно инициализировать репозиторий в «%s»." -#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 -#: lib/transport.tcl:81 +#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110 +#: lib/remote_add.tcl:162 #, tcl-format msgid "push %s" msgstr "отправить %s" -#: lib/remote_add.tcl:164 +#: lib/remote_add.tcl:163 #, tcl-format msgid "Setting up the %s (at %s)" msgstr "Настройка %s (в %s)" -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 +#: lib/remote_branch_delete.tcl:34 msgid "Delete Branch Remotely" msgstr "Удаление ветки во внешнем репозитории" -#: lib/remote_branch_delete.tcl:47 +#: lib/remote_branch_delete.tcl:48 msgid "From Repository" msgstr "Из репозитория" -#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 +#: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51 msgid "Remote:" msgstr "внешний:" -#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 +#: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72 msgid "Arbitrary Location:" msgstr "Указанное положение:" -#: lib/remote_branch_delete.tcl:84 +#: lib/remote_branch_delete.tcl:88 msgid "Branches" msgstr "Ветки" -#: lib/remote_branch_delete.tcl:109 +#: lib/remote_branch_delete.tcl:110 msgid "Delete Only If" msgstr "Удалить только в случае, если" -#: lib/remote_branch_delete.tcl:111 +#: lib/remote_branch_delete.tcl:112 msgid "Merged Into:" msgstr "Слияние с:" -#: lib/remote_branch_delete.tcl:152 +#: lib/remote_branch_delete.tcl:153 msgid "A branch is required for 'Merged Into'." msgstr "Для операции «Слияние с» требуется указать ветку." -#: lib/remote_branch_delete.tcl:184 +#: lib/remote_branch_delete.tcl:185 #, tcl-format msgid "" "The following branches are not completely merged into %s:\n" @@ -2245,7 +2243,7 @@ "\n" " - %s" -#: lib/remote_branch_delete.tcl:189 +#: lib/remote_branch_delete.tcl:190 #, tcl-format msgid "" "One or more of the merge tests failed because you have not fetched the " @@ -2254,33 +2252,33 @@ "Некоторые тесты на слияние не прошли, потому что вы не извлекли необходимые " "коммиты. Попытайтесь извлечь их из %s." -#: lib/remote_branch_delete.tcl:207 +#: lib/remote_branch_delete.tcl:208 msgid "Please select one or more branches to delete." msgstr "Укажите одну или несколько веток для удаления." -#: lib/remote_branch_delete.tcl:226 +#: lib/remote_branch_delete.tcl:227 #, tcl-format msgid "Deleting branches from %s" msgstr "Удаление веток из %s" -#: lib/remote_branch_delete.tcl:292 +#: lib/remote_branch_delete.tcl:300 msgid "No repository selected." msgstr "Не указан репозиторий." -#: lib/remote_branch_delete.tcl:297 +#: lib/remote_branch_delete.tcl:305 #, tcl-format msgid "Scanning %s..." msgstr "Перечитывание %s…" -#: lib/search.tcl:21 +#: lib/search.tcl:48 msgid "Find:" msgstr "Поиск:" -#: lib/search.tcl:23 +#: lib/search.tcl:50 msgid "Next" msgstr "Дальше" -#: lib/search.tcl:24 +#: lib/search.tcl:51 msgid "Prev" msgstr "Обратно" @@ -2288,11 +2286,11 @@ msgid "Case-Sensitive" msgstr "Игн. большие/маленькие" -#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 +#: lib/shortcut.tcl:24 lib/shortcut.tcl:65 msgid "Cannot write shortcut:" msgstr "Невозможно записать ссылку:" -#: lib/shortcut.tcl:137 +#: lib/shortcut.tcl:140 msgid "Cannot write icon:" msgstr "Невозможно записать значок:" @@ -2333,32 +2331,32 @@ msgid "Spell Checker Failed" msgstr "Ошибка проверки правописания" -#: lib/sshkey.tcl:31 +#: lib/sshkey.tcl:34 msgid "No keys found." msgstr "Ключ не найден" -#: lib/sshkey.tcl:34 +#: lib/sshkey.tcl:37 #, tcl-format msgid "Found a public key in: %s" msgstr "Публичный ключ из %s" -#: lib/sshkey.tcl:40 +#: lib/sshkey.tcl:43 msgid "Generate Key" msgstr "Создать ключ" -#: lib/sshkey.tcl:56 +#: lib/sshkey.tcl:61 msgid "Copy To Clipboard" msgstr "Скопировать в буфер обмена" -#: lib/sshkey.tcl:70 +#: lib/sshkey.tcl:75 msgid "Your OpenSSH Public Key" msgstr "Ваш публичный ключ OpenSSH" -#: lib/sshkey.tcl:78 +#: lib/sshkey.tcl:83 msgid "Generating..." msgstr "Создание…" -#: lib/sshkey.tcl:84 +#: lib/sshkey.tcl:89 #, tcl-format msgid "" "Could not start ssh-keygen:\n" @@ -2369,50 +2367,50 @@ "\n" "%s" -#: lib/sshkey.tcl:111 +#: lib/sshkey.tcl:116 msgid "Generation failed." msgstr "Ключ не создан." -#: lib/sshkey.tcl:118 +#: lib/sshkey.tcl:123 msgid "Generation succeeded, but no keys found." msgstr "Создание ключа завершилось, но результат не был найден" -#: lib/sshkey.tcl:121 +#: lib/sshkey.tcl:126 #, tcl-format msgid "Your key is in: %s" msgstr "Ваш ключ находится в: %s" -#: lib/status_bar.tcl:83 +#: lib/status_bar.tcl:263 #, tcl-format msgid "%s ... %*i of %*i %s (%3i%%)" msgstr "%s … %*i из %*i %s (%3i%%)" -#: lib/tools.tcl:75 +#: lib/tools.tcl:76 #, tcl-format msgid "Running %s requires a selected file." msgstr "Запуск %s требует выбранного файла." -#: lib/tools.tcl:90 +#: lib/tools.tcl:96 #, tcl-format msgid "Are you sure you want to run %s?" msgstr "Действительно запустить %s?" -#: lib/tools.tcl:110 +#: lib/tools.tcl:118 #, tcl-format msgid "Tool: %s" msgstr "Вспомогательная операция: %s" -#: lib/tools.tcl:111 +#: lib/tools.tcl:119 #, tcl-format msgid "Running: %s" msgstr "Выполнение: %s" -#: lib/tools.tcl:149 +#: lib/tools.tcl:158 #, tcl-format msgid "Tool completed successfully: %s" msgstr "Программа %s завершилась успешно." -#: lib/tools.tcl:151 +#: lib/tools.tcl:160 #, tcl-format msgid "Tool failed: %s" msgstr "Ошибка выполнения программы: %s" @@ -2425,52 +2423,52 @@ msgid "Add New Tool Command" msgstr "Новая вспомогательная операция" -#: lib/tools_dlg.tcl:33 +#: lib/tools_dlg.tcl:34 msgid "Add globally" msgstr "Добавить для всех репозиториев" -#: lib/tools_dlg.tcl:45 +#: lib/tools_dlg.tcl:46 msgid "Tool Details" msgstr "Описание вспомогательной операции" -#: lib/tools_dlg.tcl:48 +#: lib/tools_dlg.tcl:49 msgid "Use '/' separators to create a submenu tree:" msgstr "Используйте «/» для создания подменю" -#: lib/tools_dlg.tcl:61 +#: lib/tools_dlg.tcl:60 msgid "Command:" msgstr "Команда:" -#: lib/tools_dlg.tcl:74 +#: lib/tools_dlg.tcl:71 msgid "Show a dialog before running" msgstr "Показать диалог перед запуском" -#: lib/tools_dlg.tcl:80 +#: lib/tools_dlg.tcl:77 msgid "Ask the user to select a revision (sets $REVISION)" msgstr "Запрос на выбор версии (устанавливает $REVISION)" -#: lib/tools_dlg.tcl:85 +#: lib/tools_dlg.tcl:82 msgid "Ask the user for additional arguments (sets $ARGS)" msgstr "Запрос дополнительных аргументов (устанавливает $ARGS)" -#: lib/tools_dlg.tcl:92 +#: lib/tools_dlg.tcl:89 msgid "Don't show the command output window" msgstr "Не показывать окно вывода команды" -#: lib/tools_dlg.tcl:97 +#: lib/tools_dlg.tcl:94 msgid "Run only if a diff is selected ($FILENAME not empty)" msgstr "Запуск только если показан список изменений ($FILENAME не пусто)" -#: lib/tools_dlg.tcl:121 +#: lib/tools_dlg.tcl:118 msgid "Please supply a name for the tool." msgstr "Укажите название вспомогательной операции." -#: lib/tools_dlg.tcl:129 +#: lib/tools_dlg.tcl:126 #, tcl-format msgid "Tool '%s' already exists." msgstr "Вспомогательная операция «%s» уже существует." -#: lib/tools_dlg.tcl:151 +#: lib/tools_dlg.tcl:148 #, tcl-format msgid "" "Could not add tool:\n" @@ -2483,28 +2481,28 @@ msgid "Remove Tool" msgstr "Удалить программу" -#: lib/tools_dlg.tcl:196 +#: lib/tools_dlg.tcl:193 msgid "Remove Tool Commands" msgstr "Удалить команды программы" -#: lib/tools_dlg.tcl:200 +#: lib/tools_dlg.tcl:198 msgid "Remove" msgstr "Удалить" -#: lib/tools_dlg.tcl:236 +#: lib/tools_dlg.tcl:231 msgid "(Blue denotes repository-local tools)" msgstr "(Синим выделены программы локальные репозиторию)" -#: lib/tools_dlg.tcl:297 +#: lib/tools_dlg.tcl:292 #, tcl-format msgid "Run Command: %s" msgstr "Запуск команды: %s" -#: lib/tools_dlg.tcl:311 +#: lib/tools_dlg.tcl:306 msgid "Arguments" msgstr "Аргументы" -#: lib/tools_dlg.tcl:348 +#: lib/tools_dlg.tcl:341 msgid "OK" msgstr "OK" @@ -2524,46 +2522,46 @@ msgid "Pruning tracking branches deleted from %s" msgstr "Чистка отслеживаемых веток, удалённых из %s" -#: lib/transport.tcl:26 +#: lib/transport.tcl:55 #, tcl-format msgid "Pushing changes to %s" msgstr "Отправка изменений в %s" -#: lib/transport.tcl:64 +#: lib/transport.tcl:93 #, tcl-format msgid "Mirroring to %s" msgstr "Точное копирование в %s" -#: lib/transport.tcl:82 +#: lib/transport.tcl:111 #, tcl-format msgid "Pushing %s %s to %s" msgstr "Отправка %s %s в %s" -#: lib/transport.tcl:100 +#: lib/transport.tcl:132 msgid "Push Branches" msgstr "Отправить ветки" -#: lib/transport.tcl:114 +#: lib/transport.tcl:147 msgid "Source Branches" msgstr "Исходные ветки" -#: lib/transport.tcl:131 +#: lib/transport.tcl:162 msgid "Destination Repository" msgstr "Репозиторий назначения" -#: lib/transport.tcl:169 +#: lib/transport.tcl:205 msgid "Transfer Options" msgstr "Настройки отправки" -#: lib/transport.tcl:171 +#: lib/transport.tcl:207 msgid "Force overwrite existing branch (may discard changes)" msgstr "" "Принудительно перезаписать существующую ветку (возможна потеря изменений)" -#: lib/transport.tcl:175 +#: lib/transport.tcl:211 msgid "Use thin pack (for slow network connections)" msgstr "Использовать thin pack (для медленных сетевых подключений)" -#: lib/transport.tcl:179 +#: lib/transport.tcl:215 msgid "Include tags" msgstr "Передать метки" diff -Nru language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/git.po language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/git.po --- language-pack-ru-18.04+20200123/data/ru/LC_MESSAGES/git.po 2020-01-23 16:52:17.000000000 +0000 +++ language-pack-ru-18.04+20200702/data/ru/LC_MESSAGES/git.po 2020-07-08 13:54:19.000000000 +0000 @@ -11,7 +11,7 @@ "Project-Id-Version: Git Russian Localization Project\n" "Report-Msgid-Bugs-To: Git Mailing List \n" "POT-Creation-Date: 2018-03-16 07:29+0800\n" -"PO-Revision-Date: 2019-12-10 21:06+0000\n" +"PO-Revision-Date: 2020-04-21 13:58+0000\n" "Last-Translator: Dimitriy Ryazantcev \n" "Language-Team: Russian (http://www.transifex.com/djm00n/git-po-" "ru/language/ru/)\n" @@ -21,45 +21,45 @@ "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || " "(n%100>=11 && n%100<=14)? 2 : 3);\n" -"X-Launchpad-Export-Date: 2020-01-23 11:17+0000\n" -"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n" +"X-Launchpad-Export-Date: 2020-07-02 11:06+0000\n" +"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n" "Language: ru\n" -#: advice.c:62 +#: advice.c:55 #, c-format msgid "hint: %.*s\n" msgstr "подсказка: %.*s\n" -#: advice.c:162 +#: advice.c:247 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" "Невозможно выполнить копирование коммита в текущую ветку, так как у вас " "имеются не слитые файлы." -#: advice.c:164 +#: advice.c:249 msgid "Committing is not possible because you have unmerged files." msgstr "Невозможно закоммитить, так как у вас имеются не слитые файлы." -#: advice.c:166 +#: advice.c:251 msgid "Merging is not possible because you have unmerged files." msgstr "Невозможно выполнить слияние, так как у вас имеются не слитые файлы." -#: advice.c:168 +#: advice.c:253 msgid "Pulling is not possible because you have unmerged files." msgstr "" "Невозможно выполнить получение, так как у вас имеются не слитые файлы." -#: advice.c:170 +#: advice.c:255 msgid "Reverting is not possible because you have unmerged files." msgstr "" "Невозможно обратить изменения, так как у вас имеются не слитые файлы." -#: advice.c:172 +#: advice.c:257 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "Невозможно выполнить %s, так как у вас имеются не слитые файлы." -#: advice.c:180 +#: advice.c:265 msgid "" "Fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution and make a commit." @@ -67,23 +67,23 @@ "Исправьте их в рабочем каталоге, затем запустите «git add/rm <файл>»,\n" "чтобы пометить исправление и сделайте коммит." -#: advice.c:188 +#: advice.c:273 msgid "Exiting because of an unresolved conflict." msgstr "Выход из-за неразрешенного конфликта." -#: advice.c:193 builtin/merge.c:1332 +#: advice.c:278 builtin/merge.c:1353 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD)." -#: advice.c:195 +#: advice.c:280 msgid "Please, commit your changes before merging." msgstr "Перед слиянием, выполните коммит ваших изменений." -#: advice.c:196 +#: advice.c:281 msgid "Exiting because of unfinished merge." msgstr "Выход из-за незавершенного слияния." -#: advice.c:130 +#: advice.c:192 #, c-format msgid "" "Note: checking out '%s'.\n" @@ -276,12 +276,12 @@ msgid "unable to open or read %s" msgstr "не удалось открыть или прочесть %s" -#: apply.c:2926 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "неправильное начало строки: «%c»" -#: apply.c:3047 +#: apply.c:3057 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -289,12 +289,12 @@ msgstr[1] "Часть #%d успешно применена на %d (со сдвигом в %d строки)." msgstr[2] "Часть #%d успешно применена на %d (со сдвигом в %d строк)." -#: apply.c:3059 +#: apply.c:3069 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Контекст сужен до (%ld/%ld), чтобы применить фрагмент на %d строке" -#: apply.c:3065 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" @@ -303,26 +303,26 @@ "при поиске:\n" "%.*s" -#: apply.c:3087 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "пропущены данные двоичного патча для «%s»" -#: apply.c:3095 +#: apply.c:3105 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "невозможно выполнить reverse-apply для двоичного патча, без обращения " "изменений блока «%s»" -#: apply.c:3142 +#: apply.c:3152 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "невозможно применить двоичный патч «%s» без строки с указанной полной " "версией индекса" -#: apply.c:3152 +#: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -330,232 +330,233 @@ "патч применятся к файлу «%s» (%s), но его текущее содержимое не соотвествует " "ожидаемому." -#: apply.c:3160 +#: apply.c:3171 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "патч применяется к пустому файлу «%s», но файл не пустой" -#: apply.c:3178 +#: apply.c:3189 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "не удалось прочитать необходимую посылку %s для «%s»" -#: apply.c:3191 +#: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "не удалось применить двоичный патч к «%s»" -#: apply.c:3197 +#: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "после применения двоичного патча для «%s» был получен неправильный результат " "(ожидалось %s, получено %s)" -#: apply.c:3218 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "ошибка применения изменений: %s:%ld" -#: apply.c:3341 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "не удалось переключить состояние на %s" -#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308 #, c-format msgid "failed to read %s" msgstr "не удалось прочитать %s" -#: apply.c:3401 +#: apply.c:3413 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "чтение из «%s» за символической ссылкой" -#: apply.c:3430 apply.c:3673 +#: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" msgstr "путь %s был переименован/удален" -#: apply.c:3516 apply.c:3688 +#: apply.c:3528 apply.c:3700 #, c-format msgid "%s: does not exist in index" msgstr "%s: нет в индексе" -#: apply.c:3525 apply.c:3696 +#: apply.c:3537 apply.c:3708 #, c-format msgid "%s: does not match index" msgstr "%s: не совпадает с индексом" -#: apply.c:3560 +#: apply.c:3572 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "в репозитории отсутствует необходимый двоичный объект для отката к " "трёхходовому слиянию." -#: apply.c:3563 +#: apply.c:3575 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Откат к трёхходовому слиянию…\n" -#: apply.c:3579 apply.c:3583 +#: apply.c:3591 apply.c:3595 #, c-format msgid "cannot read the current contents of '%s'" msgstr "не удалось прочитать текущее содержимое «%s»" -#: apply.c:3595 +#: apply.c:3607 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Не удалось откатиться к трёхходовому слиянию…\n" -#: apply.c:3609 +#: apply.c:3621 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Патч применен к «%s» с конфликтами.\n" -#: apply.c:3614 +#: apply.c:3626 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Патч применен к «%s» без ошибок.\n" -#: apply.c:3640 +#: apply.c:3652 msgid "removal patch leaves file contents" msgstr "патч удаления не удалил содержимое файла" -#: apply.c:3713 +#: apply.c:3725 #, c-format msgid "%s: wrong type" msgstr "%s: неправильный тип" -#: apply.c:3715 +#: apply.c:3727 #, c-format msgid "%s has type %o, expected %o" msgstr "%s имеет тип %o, а ожидался %o" -#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1309 +#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1325 #, c-format msgid "invalid path '%s'" msgstr "неправильный путь «%s»" -#: apply.c:3924 +#: apply.c:3936 #, c-format msgid "%s: already exists in index" msgstr "%s: уже содержится в индексе" -#: apply.c:3927 +#: apply.c:3939 #, c-format msgid "%s: already exists in working directory" msgstr "%s: уже содержится в рабочем каталоге" -#: apply.c:3947 +#: apply.c:3959 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o)" -#: apply.c:3952 +#: apply.c:3964 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o) " "для %s" -#: apply.c:3972 +#: apply.c:3984 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "затронутый файл «%s» находится за символической ссылкой" -#: apply.c:3976 +#: apply.c:3988 #, c-format msgid "%s: patch does not apply" msgstr "%s: не удалось применить патч" -#: apply.c:3991 +#: apply.c:4003 #, c-format msgid "Checking patch %s..." msgstr "Проверка патча %s…" -#: apply.c:4083 +#: apply.c:4095 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "информация об sha1 отсутствует или бесполезна для подмодуля %s" -#: apply.c:4090 +#: apply.c:4102 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "изменен режим для %s, который не находится в текущем HEAD" -#: apply.c:4093 +#: apply.c:4105 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "информация об sha1 отсутствует или бесполезна (%s)." -#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143 +#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294 +#: builtin/reset.c:145 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "сбой make_cache_entry для пути «%s»" -#: apply.c:4102 +#: apply.c:4114 #, c-format msgid "could not add %s to temporary index" msgstr "не удалось добавить %s во временный индекс" -#: apply.c:4112 +#: apply.c:4124 #, c-format msgid "could not write temporary index to %s" msgstr "не удалось записать временный индкекс в %s" -#: apply.c:4250 +#: apply.c:4262 #, c-format msgid "unable to remove %s from index" msgstr "не удалось удалить %s из индекса" -#: apply.c:4284 +#: apply.c:4296 #, c-format msgid "corrupt patch for submodule %s" msgstr "поврежденный патч для подмодуля %s" -#: apply.c:4290 +#: apply.c:4302 #, c-format msgid "unable to stat newly created file '%s'" msgstr "не удалось выполнить stat для созданного файла «%s»" -#: apply.c:4298 +#: apply.c:4310 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "не удалось создать вспомогательный файл для созданного файла %s" -#: apply.c:4304 apply.c:4449 +#: apply.c:4316 apply.c:4461 #, c-format msgid "unable to add cache entry for %s" msgstr "не удалось создать запись в кэше для %s" -#: apply.c:4347 +#: apply.c:4359 #, c-format msgid "failed to write to '%s'" msgstr "не удалось записать в «%s»" -#: apply.c:4351 +#: apply.c:4363 #, c-format msgid "closing file '%s'" msgstr "закрытие файла «%s»" -#: apply.c:4421 +#: apply.c:4433 #, c-format msgid "unable to write file '%s' mode %o" msgstr "не удалось записать файл «%s» с режимом доступа %o" -#: apply.c:4519 +#: apply.c:4531 #, c-format msgid "Applied patch %s cleanly." msgstr "Патч %s применен без ошибок." -#: apply.c:4527 +#: apply.c:4539 msgid "internal error" msgstr "внутренняя ошибка" -#: apply.c:4530 +#: apply.c:4542 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." @@ -563,45 +564,45 @@ msgstr[1] "Применение патча %%s с %d отказами…" msgstr[2] "Применение патча %%s с %d отказами…" -#: apply.c:4541 +#: apply.c:4553 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "усечение имени .rej файла до %.*s.rej" -#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194 +#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195 #, c-format msgid "cannot open %s" msgstr "не удалось открыть %s" -#: apply.c:4563 +#: apply.c:4575 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Блок №%d применен без ошибок." -#: apply.c:4567 +#: apply.c:4579 #, c-format msgid "Rejected hunk #%d." msgstr "Блок №%d отклонен." -#: apply.c:4686 +#: apply.c:4698 #, c-format msgid "Skipped patch '%s'." msgstr "Патч «%s» пропущен." -#: apply.c:4694 +#: apply.c:4706 msgid "unrecognized input" msgstr "не распознанный ввод" -#: apply.c:4714 +#: apply.c:4726 msgid "unable to read index file" msgstr "не удалось прочитать файл индекса" -#: apply.c:4871 +#: apply.c:4883 #, c-format msgid "can't open patch '%s': %s" msgstr "не удалось открыть патч «%s»: %s" -#: apply.c:4898 +#: apply.c:4910 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" @@ -609,7 +610,7 @@ msgstr[1] "пропущено %d ошибки в пробельных символах" msgstr[2] "пропущено %d ошибок в пробельных символах" -#: apply.c:4904 apply.c:4919 +#: apply.c:4916 apply.c:4931 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -617,7 +618,7 @@ msgstr[1] "%d строки добавили ошибки в пробельных символах." msgstr[2] "%d строк добавили ошибки в пробельных символах." -#: apply.c:4912 +#: apply.c:4924 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." @@ -625,144 +626,145 @@ msgstr[1] "%d строки добавлено после исправления ошибок в пробелах." msgstr[2] "%d строк добавлено после исправления ошибок в пробелах." -#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "Не удалось записать новый файл индекса" -#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200 -#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273 -#: builtin/pull.c:209 builtin/submodule--helper.c:407 -#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 -#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 -#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250 +#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145 +#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 +#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 +#: builtin/submodule--helper.c:2148 bugreport.c:129 +#: git-add--interactive.perl:213 msgid "path" msgstr "путь" -#: apply.c:4956 +#: apply.c:4968 msgid "don't apply changes matching the given path" msgstr "не применять изменения по указанному пути" -#: apply.c:4959 +#: apply.c:4971 msgid "apply changes matching the given path" msgstr "применять изменения по указанному пути" -#: apply.c:4961 builtin/am.c:2206 +#: apply.c:4973 builtin/am.c:2259 msgid "num" msgstr "количество" -#: apply.c:4962 +#: apply.c:4974 msgid "remove leading slashes from traditional diff paths" msgstr "" "удалить <количество> ведущих косых черт из традиционных путей списка " "изменений" -#: apply.c:4965 +#: apply.c:4977 msgid "ignore additions made by the patch" msgstr "игнорировать добавления, сделанные этим патчем" -#: apply.c:4967 +#: apply.c:4979 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "вместо применения патча вывести статистику добавлений и удалений для ввода" -#: apply.c:4971 +#: apply.c:4983 msgid "show number of added and deleted lines in decimal notation" msgstr "" "показать количество добавленных и удаленных строк в десятичном представлении" -#: apply.c:4973 +#: apply.c:4985 msgid "instead of applying the patch, output a summary for the input" msgstr "вместо применения патча вывести сводку изменений для ввода" -#: apply.c:4975 +#: apply.c:4987 msgid "instead of applying the patch, see if the patch is applicable" msgstr "вместо применения патча проверить подходит ли он" -#: apply.c:4977 +#: apply.c:4989 msgid "make sure the patch is applicable to the current index" msgstr "проверить, что патч применяется к текущему индексу" -#: apply.c:4981 +#: apply.c:4993 msgid "apply a patch without touching the working tree" msgstr "применить патч, не изменяя рабочий каталог" -#: apply.c:4983 +#: apply.c:4995 msgid "accept a patch that touches outside the working area" msgstr "принять патч, который затрагивает файлы за рабочим каталогом" -#: apply.c:4986 +#: apply.c:4998 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "а также применить патч (используйте с --stat/--summary/--check)" -#: apply.c:4988 +#: apply.c:5000 msgid "attempt three-way merge if a patch does not apply" msgstr "попытаться сделать трехходовое слияние, если патч не применяется" -#: apply.c:4990 +#: apply.c:5002 msgid "build a temporary index based on embedded index information" msgstr "" "построить временный индекс, основанный на встроенной информации об индексе" -#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525 msgid "paths are separated with NUL character" msgstr "пути, отделённые НУЛЕВЫМ символом" -#: apply.c:4995 +#: apply.c:5007 msgid "ensure at least lines of context match" msgstr "удостовериться, что по крайней мере строк контекста совпадают" -#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98 +#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3310 builtin/rebase.c:1445 +#: builtin/pack-objects.c:3458 builtin/rebase.c:1332 msgid "action" msgstr "действие" -#: apply.c:4997 +#: apply.c:5009 msgid "detect new or modified lines that have whitespace errors" msgstr "" "определять новые или модифицированные строки, у которых есть ошибки в " "пробельных символах" -#: apply.c:5000 apply.c:5003 +#: apply.c:5012 apply.c:5015 msgid "ignore changes in whitespace when finding context" msgstr "игнорировать изменения в пробельных символах при поиске контекста" -#: apply.c:5006 +#: apply.c:5018 msgid "apply the patch in reverse" msgstr "применить патч с обращением изменений" -#: apply.c:5008 +#: apply.c:5020 msgid "don't expect at least one line of context" msgstr "не ожидать как минимум одной строки контекста" -#: apply.c:5010 +#: apply.c:5022 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "оставить отклоненные блоки изменений в соответствующих *.rej файлах" -#: apply.c:5012 +#: apply.c:5024 msgid "allow overlapping hunks" msgstr "разрешить перекрывающиеся блоки изменений" -#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22 -#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 -#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 +#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775 +#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "быть многословнее" -#: apply.c:5015 +#: apply.c:5027 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "разрешить некорректно определенные пропущенные пустые строки в конце файла" -#: apply.c:5018 +#: apply.c:5030 msgid "do not trust the line counts in the hunk headers" msgstr "не доверять количеству строк из заголовка блока изменений" -#: apply.c:5020 builtin/am.c:2194 +#: apply.c:5032 builtin/am.c:2247 msgid "root" msgstr "корень" -#: apply.c:5021 +#: apply.c:5033 msgid "prepend to all filenames" msgstr "добавить <корень> спереди ко всем именам файлов" @@ -785,110 +787,110 @@ msgid "git archive --remote [--exec ] --list" msgstr "git archive --remote <репозиторий> [--exec <команда>] --list" -#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 +#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "спецификатор пути «%s» не соответствует ни одному файлу" -#: archive.c:457 +#: archive.c:464 msgid "fmt" msgstr "формат" -#: archive.c:457 +#: archive.c:464 msgid "archive format" msgstr "формат архива" -#: archive.c:458 builtin/log.c:1581 +#: archive.c:465 builtin/log.c:1674 msgid "prefix" msgstr "префикс" -#: archive.c:459 +#: archive.c:466 msgid "prepend prefix to each pathname in the archive" msgstr "добавлять префикс перед каждым путем файла в архиве" -#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162 -#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899 -#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 +#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 +#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907 +#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 -#: parse-options.h:186 +#: parse-options.h:190 msgid "file" msgstr "файл" -#: archive.c:461 builtin/archive.c:90 +#: archive.c:468 builtin/archive.c:90 msgid "write the archive to this file" msgstr "запись архива в этот файл" -#: archive.c:463 +#: archive.c:470 msgid "read .gitattributes in working directory" msgstr "читать .gitattributes в рабочем каталоге" -#: archive.c:464 +#: archive.c:471 msgid "report archived files on stderr" msgstr "отчет об архивированных файлах в stderr" -#: archive.c:465 +#: archive.c:472 msgid "store only" msgstr "только хранение" -#: archive.c:466 +#: archive.c:473 msgid "compress faster" msgstr "сжимать быстрее" -#: archive.c:474 +#: archive.c:481 msgid "compress better" msgstr "сжимать лучше" -#: archive.c:477 +#: archive.c:484 msgid "list supported archive formats" msgstr "перечислить поддерживаемые форматы архивов" -#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 +#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 +#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 msgid "repo" msgstr "репозиторий" -#: archive.c:480 builtin/archive.c:92 +#: archive.c:487 builtin/archive.c:92 msgid "retrieve the archive from remote repository " msgstr "получить архив из внешнего <репозитория>" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 +#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "команда" -#: archive.c:482 builtin/archive.c:94 +#: archive.c:489 builtin/archive.c:94 msgid "path to the remote git-upload-archive command" msgstr "путь к команде git-upload-archive на машине с внешним репозиторием" -#: archive.c:489 +#: archive.c:496 msgid "Unexpected option --remote" msgstr "Неожиданная опция --remote" -#: archive.c:491 +#: archive.c:498 msgid "Option --exec can only be used together with --remote" msgstr "Опция --exec может использоваться только вместе с --remote" -#: archive.c:493 +#: archive.c:500 msgid "Unexpected option --output" msgstr "Неожиданная опция --output" -#: archive.c:515 +#: archive.c:522 #, c-format msgid "Unknown archive format '%s'" msgstr "Неизвестный формат архива «%s»" -#: archive.c:522 +#: archive.c:529 #, c-format msgid "Argument not supported for format '%s': -%d" msgstr "Аргумент не поддерживается для формата «%s»: -%d" -#: attr.c:213 +#: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s не является допустимым именем атрибута" -#: attr.c:410 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -907,12 +909,12 @@ msgid "We cannot bisect more!\n" msgstr "Невозможно продолжить бинарный поиск!\n" -#: bisect.c:733 +#: bisect.c:745 #, c-format msgid "Not a valid commit name %s" msgstr "Недопустимое имя коммита %s" -#: bisect.c:758 +#: bisect.c:770 #, c-format msgid "" "The merge base %s is bad.\n" @@ -921,7 +923,7 @@ "База слияния %s является плохим коммитом.\n" "Это значит, что ошибка была исправлена где-то между %s и [%s].\n" -#: bisect.c:763 +#: bisect.c:775 #, c-format msgid "" "The merge base %s is new.\n" @@ -930,7 +932,7 @@ "База слияния %s является новой.\n" "Свойство было изменено где-то между %s и [%s].\n" -#: bisect.c:768 +#: bisect.c:780 #, c-format msgid "" "The merge base %s is %s.\n" @@ -939,7 +941,7 @@ "База слияния %s является %s.\n" "Это значит, что «%s» коммит находится где-то между %s и [%s].\n" -#: bisect.c:776 +#: bisect.c:788 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -950,7 +952,7 @@ "В этом случае git bisect не может работать правильно.\n" "Возможно, вы перепутали редакции %s и %s местами?\n" -#: bisect.c:789 +#: bisect.c:801 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -962,36 +964,36 @@ "%s.\n" "Но все же продолжаем поиск." -#: bisect.c:822 +#: bisect.c:840 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Бинарный поиск: база слияния должна быть проверена\n" -#: bisect.c:865 +#: bisect.c:890 #, c-format msgid "a %s revision is needed" msgstr "нужно указать %s редакцию" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255 #, c-format msgid "could not create file '%s'" msgstr "не удалось создать файл «%s»" -#: bisect.c:928 builtin/merge.c:148 +#: bisect.c:966 builtin/merge.c:151 #, c-format msgid "could not read file '%s'" msgstr "не удалось прочитать файл «%s»" -#: bisect.c:958 +#: bisect.c:997 msgid "reading bisect refs failed" msgstr "сбой при чтении ссылок двоичного поиска" -#: bisect.c:977 +#: bisect.c:1019 #, c-format msgid "%s was both %s and %s\n" msgstr "%s была одновременно и %s и %s\n" -#: bisect.c:985 +#: bisect.c:1028 #, c-format msgid "" "No testable commit found.\n" @@ -1000,7 +1002,7 @@ "Тестируемый коммит не найден.\n" "Возможно, вы начали поиск с указанием неправильного параметра пути?\n" -#: bisect.c:1004 +#: bisect.c:1057 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1011,7 +1013,7 @@ #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1010 +#: bisect.c:1063 #, c-format msgid "Bisecting: %d revision left to test after this %s\n" msgid_plural "Bisecting: %d revisions left to test after this %s\n" @@ -1019,41 +1021,41 @@ msgstr[1] "Бинарный поиск: %d редакции осталось проверить после этой %s\n" msgstr[2] "Бинарный поиск: %d редакций осталось проверить после этой %s\n" -#: blame.c:2700 +#: blame.c:2777 msgid "--contents and --reverse do not blend well." msgstr "--contents и --reverse не очень сочетаются." -#: blame.c:2714 +#: blame.c:2791 msgid "cannot use --contents with final commit object name" msgstr "нельзя использовать --contents с указанием финального имени объекта" -#: blame.c:2735 +#: blame.c:2812 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "при --reverse и --first-parent вместе нужно указывать конкретный последний " "коммит" -#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971 -#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964 -#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411 -#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143 +#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018 +#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405 +#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235 +#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "сбой инициализации прохода по редакциям" -#: blame.c:2762 +#: blame.c:2839 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "при указании --reverse и --first-parent вместе, требуется также указать " "диапазон по цепочке первого родителя" -#: blame.c:2773 +#: blame.c:2850 #, c-format msgid "no such path %s in %s" msgstr "нет такого пути %s в %s" -#: blame.c:2784 +#: blame.c:2861 #, c-format msgid "cannot read blob %s for path %s" msgstr "невозможно прочитать объект %s для пути %s" @@ -1190,12 +1192,12 @@ msgid "Not a valid branch point: '%s'." msgstr "Недопустимая точка ветки: «%s»." -#: branch.c:364 +#: branch.c:365 #, c-format msgid "'%s' is already checked out at '%s'" msgstr "«%s» уже находится на «%s»" -#: branch.c:387 +#: branch.c:388 #, c-format msgid "HEAD of working tree %s is not updated" msgstr "HEAD рабочего каталога %s не обновлён" @@ -1210,8 +1212,8 @@ msgid "unrecognized header: %s%s (%d)" msgstr "неопознанный заголовок: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962 -#: builtin/commit.c:791 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034 +#: builtin/commit.c:814 #, c-format msgid "could not open '%s'" msgstr "не удалось открыть «%s»" @@ -1240,58 +1242,58 @@ msgstr[1] "Пакет требует эти %d ссылки:" msgstr[2] "Пакет требует эти %d ссылок:" -#: bundle.c:279 +#: bundle.c:280 msgid "Could not spawn pack-objects" msgstr "Не удалось создать объекты пакета" -#: bundle.c:290 +#: bundle.c:291 msgid "pack-objects died" msgstr "критическая ошибка pack-objects" -#: bundle.c:332 +#: bundle.c:333 msgid "rev-list died" msgstr "критическая ошибка rev-list" -#: bundle.c:381 +#: bundle.c:382 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "ссылка «%s» исключена в соответствии с опциями rev-list" -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306 +#: bundle.c:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "неопознанный аргумент: %s" -#: bundle.c:468 +#: bundle.c:469 msgid "Refusing to create empty bundle." msgstr "Отклонение создания пустого пакета." -#: bundle.c:478 +#: bundle.c:479 #, c-format msgid "cannot create '%s'" msgstr "не удалось создать «%s»" -#: bundle.c:503 +#: bundle.c:504 msgid "index-pack died" msgstr "критическая ошибка index-pack" -#: color.c:296 +#: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "недопустимое значение цвета: %.*s" -#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398 -#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456 +#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403 +#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "не удалось разобрать %s" -#: commit.c:52 +#: commit.c:54 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s не является коммитом!" -#: commit.c:1391 +#: commit.c:1432 msgid "" "Warning: commit message did not conform to UTF-8.\n" "You may want to amend it after fixing the message, or set the config\n" @@ -1306,166 +1308,166 @@ msgid "memory exhausted" msgstr "память исчерпана" -#: config.c:197 +#: config.c:198 msgid "relative config include conditionals must come from files" msgstr "" "относительные условные включения конфигурации должны исходить из файлов" -#: config.c:821 +#: config.c:836 #, c-format msgid "bad config line %d in blob %s" msgstr "ошибка в %d строке двоичного объекта %s" -#: config.c:825 +#: config.c:840 #, c-format msgid "bad config line %d in file %s" msgstr "ошибка в %d строке файла %s" -#: config.c:829 +#: config.c:844 #, c-format msgid "bad config line %d in standard input" msgstr "ошибка в %d строке стандартного ввода" -#: config.c:833 +#: config.c:848 #, c-format msgid "bad config line %d in submodule-blob %s" msgstr "ошибка в %d строке двоичного объекта подмодуля %s" -#: config.c:837 +#: config.c:852 #, c-format msgid "bad config line %d in command line %s" msgstr "ошибка в %d строке коммандной строки %s" -#: config.c:841 +#: config.c:856 #, c-format msgid "bad config line %d in %s" msgstr "ошибка в %d строке в %s" -#: config.c:978 +#: config.c:993 msgid "out of range" msgstr "вне диапазона" -#: config.c:978 +#: config.c:993 msgid "invalid unit" msgstr "неправильное число" -#: config.c:979 +#: config.c:994 #, c-format msgid "bad numeric config value '%s' for '%s': %s" msgstr "неправильное числовое значение «%s» для «%s»: %s" -#: config.c:998 +#: config.c:1013 #, c-format msgid "bad numeric config value '%s' for '%s' in blob %s: %s" msgstr "" "неправильное числовое значение «%s» для «%s» в двоичном объекте %s: %s" -#: config.c:1001 +#: config.c:1016 #, c-format msgid "bad numeric config value '%s' for '%s' in file %s: %s" msgstr "неправильное числовое значение «%s» для «%s» в файле %s: %s" -#: config.c:1004 +#: config.c:1019 #, c-format msgid "bad numeric config value '%s' for '%s' in standard input: %s" msgstr "" "неправильное числовое значение «%s» для «%s» на стандартном вводе: %s" -#: config.c:1007 +#: config.c:1022 #, c-format msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" msgstr "" "неправильное числовое значение «%s» для «%s» в двоичном объекте подмодуля " "%s: %s" -#: config.c:1010 +#: config.c:1025 #, c-format msgid "bad numeric config value '%s' for '%s' in command line %s: %s" msgstr "" "неправильное числовое значение «%s» для «%s» на коммандной строке %s: %s" -#: config.c:1013 +#: config.c:1028 #, c-format msgid "bad numeric config value '%s' for '%s' in %s: %s" msgstr "неправильное числовое значение «%s» для «%s» в %s: %s" -#: config.c:1108 +#: config.c:1123 #, c-format msgid "failed to expand user dir in: '%s'" msgstr "сбой разворачивания пути каталога пользователя: «%s»" -#: config.c:1117 +#: config.c:1132 #, c-format msgid "'%s' for '%s' is not a valid timestamp" msgstr "«%s» для «%s» не является допустимой меткой даты/времени" -#: config.c:1222 config.c:1233 +#: config.c:1237 config.c:1248 #, c-format msgid "bad zlib compression level %d" msgstr "неправильный уровень сжатия zlib %d" -#: config.c:1358 +#: config.c:1373 #, c-format msgid "invalid mode for object creation: %s" msgstr "недопустимый режим создания объекта: %s" -#: config.c:1513 builtin/pack-objects.c:3394 +#: config.c:1533 builtin/pack-objects.c:3542 #, c-format msgid "bad pack compression level %d" msgstr "неправильный уровень сжатия пакета %d" -#: config.c:1740 +#: config.c:1759 msgid "unable to parse command-line config" msgstr "не удалось разобрать конфигурацию из командной строки" -#: config.c:2091 +#: config.c:2113 msgid "unknown error occurred while reading the configuration files" msgstr "произошла неизвестная ошибка при чтении файлов конфигурации" -#: config.c:2261 +#: config.c:2283 #, c-format msgid "Invalid %s: '%s'" msgstr "Недействительный %s: «%s»" -#: config.c:2144 +#: config.c:2250 #, c-format msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" msgstr "" "неизвестное значение «%s» для core.untrackedCache; использую стандартное " "значение «keep»" -#: config.c:2306 +#: config.c:2328 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "значение «%d» для splitIndex.maxPercentChange должно быть от 0 до 100" -#: config.c:2352 +#: config.c:2374 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "не удалось разобрать «%s» в конфигурации из командной строки" -#: config.c:2354 +#: config.c:2376 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "неправильная переменная конфигурации «%s» в файле «%s» на строке %d" -#: config.c:2467 +#: config.c:2489 #, c-format msgid "%s has multiple values" msgstr "%s имеет несколько значений" -#: config.c:2832 config.c:3085 +#: config.c:2854 config.c:3107 #, c-format msgid "fstat on %s failed" msgstr "сбой при выполнении fstat на файле %s" -#: config.c:2971 +#: config.c:2993 #, c-format msgid "could not set '%s' to '%s'" msgstr "не удалось установить «%s» в «%s»" -#: config.c:2973 builtin/remote.c:782 +#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 #, c-format msgid "could not unset '%s'" msgstr "не удалось сбросить значение для «%s»" @@ -1486,19 +1488,19 @@ "Удостоверьтесь, что у вас есть необходимые права доступа\n" "и репозиторий существует." -#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:107 builtin/fsck.c:209 builtin/prune.c:45 msgid "Checking connectivity" msgstr "Проверка соединения" -#: connected.c:100 +#: connected.c:119 msgid "Could not run 'git rev-list'" msgstr "Не удалось запустить «git rev-list»" -#: connected.c:120 +#: connected.c:139 msgid "failed write to rev-list" msgstr "сбой записи в rev-list" -#: connected.c:127 +#: connected.c:146 msgid "failed to close rev-list's stdin" msgstr "сбой закрытия стандартного ввода у rev-list" @@ -1612,11 +1614,11 @@ msgid "failed to read orderfile '%s'" msgstr "сбой чтения orderfile «%s»" -#: diffcore-rename.c:543 +#: diffcore-rename.c:592 msgid "Performing inexact rename detection" msgstr "Выполняется неточное определение переименования" -#: diff.c:74 +#: diff.c:108 #, c-format msgid "option '%s' requires a value" msgstr "параметр «%s» требует указания значения" @@ -1653,25 +1655,25 @@ "Найдены ошибки в переменной «diff.dirstat»:\n" "%s" -#: diff.c:4218 +#: diff.c:4238 #, c-format msgid "external diff died, stopping at %s" msgstr "критическая ошибка при внешнем сравнении, останов на %s" -#: diff.c:4563 +#: diff.c:4583 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" "--name-only, --name-status, --check и -s нельзя использовать одновременно" -#: diff.c:4566 +#: diff.c:4586 msgid "-G, -S and --find-object are mutually exclusive" msgstr "-G, -S и --find-object нельзя использовать одновременно" -#: diff.c:4644 +#: diff.c:4664 msgid "--follow requires exactly one pathspec" msgstr "--follow требует ровно одного спецификатора пути" -#: diff.c:4729 +#: diff.c:4749 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -1680,24 +1682,24 @@ "Сбой разбора параметра опции --dirstat/-X :\n" "%s" -#: diff.c:4417 +#: diff.c:4743 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Сбой разбора параметра опции --submodule: «%s»" -#: diff.c:6180 +#: diff.c:6200 msgid "inexact rename detection was skipped due to too many files." msgstr "" "неточное определение переименования было пропущено из-за слишком большого " "количества файлов." -#: diff.c:6183 +#: diff.c:6203 msgid "only found copies from modified paths due to too many files." msgstr "" "найдены только копии из измененных путей из-за слишком большого количества " "файлов." -#: diff.c:6186 +#: diff.c:6206 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -1705,12 +1707,12 @@ "возможно вы захотите установить переменную %s в как минимум значение %d и " "повторить вызов команды." -#: dir.c:1877 +#: dir.c:2275 #, c-format msgid "could not open directory '%s'" msgstr "не удалось открыть каталог «%s»" -#: dir.c:2128 +#: dir.c:2575 msgid "failed to get kernel name and information" msgstr "не удалось получить имя ядра и информацию" @@ -1719,17 +1721,17 @@ msgstr "" "Кэш неотслеживаемых файлов отключен на этой системе или в этом месте." -#: dir.c:3101 dir.c:3106 +#: dir.c:3526 dir.c:3531 #, c-format msgid "could not create directories for %s" msgstr "не удалось создать каталоги для %s" -#: dir.c:3135 +#: dir.c:3560 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "не удалось переместить каталог git с «%s» в «%s»" -#: editor.c:73 +#: editor.c:74 #, c-format msgid "hint: Waiting for your editor to close the file...%c" msgstr "подсказка: Ожидание, пока вы закроете редактор с файлом…%c" @@ -1738,20 +1740,20 @@ msgid "Filtering content" msgstr "Фильтруется содержимое" -#: entry.c:476 +#: entry.c:479 #, c-format msgid "could not stat file '%s'" msgstr "не удалось выполнить stat для файла «%s»" -#: promisor-remote.c:25 +#: promisor-remote.c:23 msgid "Remote with no URL" msgstr "Внешний репозиторий без URL" -#: fetch-pack.c:150 +#: fetch-pack.c:151 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: ожидается передача списка для получение части" -#: fetch-pack.c:164 +#: fetch-pack.c:165 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: ожидается ACK/NAK, а получен пустой пакет" @@ -1760,209 +1762,209 @@ msgid "remote error: %s" msgstr "ошибка внешнего репозитория: %s" -#: fetch-pack.c:184 +#: fetch-pack.c:185 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: ожидается ACK/NAK, а получено «%s»" -#: fetch-pack.c:257 +#: fetch-pack.c:258 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc требует multi_ack_detailed" -#: fetch-pack.c:356 fetch-pack.c:1280 +#: fetch-pack.c:357 fetch-pack.c:1364 #, c-format msgid "invalid shallow line: %s" msgstr "неправильная строка частичного получения: %s" -#: fetch-pack.c:362 fetch-pack.c:1286 +#: fetch-pack.c:363 fetch-pack.c:1370 #, c-format msgid "invalid unshallow line: %s" msgstr "неправильная строка полного получения: %s" -#: fetch-pack.c:364 fetch-pack.c:1288 +#: fetch-pack.c:365 fetch-pack.c:1372 #, c-format msgid "object not found: %s" msgstr "объект не найден: %s" -#: fetch-pack.c:367 fetch-pack.c:1291 +#: fetch-pack.c:368 fetch-pack.c:1375 #, c-format msgid "error in object: %s" msgstr "ошибка в объекте: %s" -#: fetch-pack.c:369 fetch-pack.c:1293 +#: fetch-pack.c:370 fetch-pack.c:1377 #, c-format msgid "no shallow found: %s" msgstr "частичный клон не найден: %s" -#: fetch-pack.c:372 fetch-pack.c:1297 +#: fetch-pack.c:373 fetch-pack.c:1381 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "ожидалось shallow/unshallow, а получено %s" -#: fetch-pack.c:414 +#: fetch-pack.c:415 #, c-format msgid "got %s %d %s" msgstr "получено %s %d %s" -#: fetch-pack.c:431 +#: fetch-pack.c:432 #, c-format msgid "invalid commit %s" msgstr "недопустимый коммит %s" -#: fetch-pack.c:462 +#: fetch-pack.c:463 msgid "giving up" msgstr "останавливаю дальнейшие попытки" -#: fetch-pack.c:475 progress.c:312 +#: fetch-pack.c:476 progress.c:336 msgid "done" msgstr "готово" -#: fetch-pack.c:487 +#: fetch-pack.c:488 #, c-format msgid "got %s (%d) %s" msgstr "получено %s (%d) %s" -#: fetch-pack.c:533 +#: fetch-pack.c:534 #, c-format msgid "Marking %s as complete" msgstr "Помечаю %s как завершенный" -#: fetch-pack.c:742 +#: fetch-pack.c:755 #, c-format msgid "already have %s (%s)" msgstr "уже есть %s (%s)" -#: fetch-pack.c:781 +#: fetch-pack.c:819 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "fetch-pack: не удалось запустить программу разбора данных" -#: fetch-pack.c:789 +#: fetch-pack.c:827 msgid "protocol error: bad pack header" msgstr "ошибка протокола: неправильный заголовок потока" -#: fetch-pack.c:857 +#: fetch-pack.c:901 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: не удалось запустить программу %s" -#: fetch-pack.c:873 +#: fetch-pack.c:917 #, c-format msgid "%s failed" msgstr "%s завершен с ошибкой" -#: fetch-pack.c:875 +#: fetch-pack.c:919 msgid "error in sideband demultiplexer" msgstr "произошла ошибка в программе разбора данных" -#: fetch-pack.c:914 +#: fetch-pack.c:973 msgid "Server does not support shallow clients" msgstr "Сервер не поддерживает клиентов с частичным клонированием" -#: fetch-pack.c:944 +#: fetch-pack.c:930 msgid "Server supports multi_ack_detailed" msgstr "Сервер поддерживает multi_ack_detailed" -#: fetch-pack.c:947 +#: fetch-pack.c:933 msgid "Server supports no-done" msgstr "Сервер поддерживает no-done" -#: fetch-pack.c:953 +#: fetch-pack.c:939 msgid "Server supports multi_ack" msgstr "Сервер поддерживает multi_ack" -#: fetch-pack.c:957 +#: fetch-pack.c:943 msgid "Server supports side-band-64k" msgstr "Сервер поддерживает side-band-64k" -#: fetch-pack.c:961 +#: fetch-pack.c:947 msgid "Server supports side-band" msgstr "Сервер поддерживает side-band" -#: fetch-pack.c:965 +#: fetch-pack.c:951 msgid "Server supports allow-tip-sha1-in-want" msgstr "Сервер поддерживает allow-tip-sha1-in-want" -#: fetch-pack.c:969 +#: fetch-pack.c:955 msgid "Server supports allow-reachable-sha1-in-want" msgstr "Сервер поддерживает allow-reachable-sha1-in-want" -#: fetch-pack.c:979 +#: fetch-pack.c:965 msgid "Server supports ofs-delta" msgstr "Сервер поддерживает ofs-delta" -#: fetch-pack.c:1157 +#: fetch-pack.c:1218 msgid "Server supports filter" msgstr "Сервер поддерживает фильтрацию" -#: fetch-pack.c:907 +#: fetch-pack.c:966 #, c-format msgid "Server version is %.*s" msgstr "Версия сервера %.*s" -#: fetch-pack.c:974 +#: fetch-pack.c:1033 msgid "Server does not support --shallow-since" msgstr "Сервер не поддерживает --shallow-since" -#: fetch-pack.c:979 +#: fetch-pack.c:1038 msgid "Server does not support --shallow-exclude" msgstr "Сервер не поддерживает --shallow-exclude" -#: fetch-pack.c:983 +#: fetch-pack.c:1042 msgid "Server does not support --deepen" msgstr "Сервер не поддерживает --deepen" -#: fetch-pack.c:1000 +#: fetch-pack.c:1059 msgid "no common commits" msgstr "не общих коммитов" -#: fetch-pack.c:1012 fetch-pack.c:1468 +#: fetch-pack.c:1071 fetch-pack.c:1563 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: ошибка при получении данных." -#: fetch-pack.c:1693 +#: fetch-pack.c:1789 msgid "no matching remote head" msgstr "нет соотвествующего внешнего указателя на ветку" -#: fetch-pack.c:1743 +#: fetch-pack.c:1839 #, c-format msgid "no such remote ref %s" msgstr "нет такой внешней ссылки %s" -#: fetch-pack.c:1746 +#: fetch-pack.c:1842 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Сервер не поддерживает запрос необъявленного объекта %s" -#: gpg-interface.c:321 +#: gpg-interface.c:457 msgid "gpg failed to sign the data" msgstr "gpg не удалось подписать данные" -#: gpg-interface.c:347 +#: gpg-interface.c:272 msgid "could not create temporary file" msgstr "не удалось создать временный файл" -#: gpg-interface.c:350 +#: gpg-interface.c:275 #, c-format msgid "failed writing detached signature to '%s'" msgstr "сбой записи отсоединенной подписи в «%s»" -#: graph.c:97 +#: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "игнорирую недопустимый цвет «%.*s» в log.graphColors" -#: grep.c:2124 +#: grep.c:2128 #, c-format msgid "'%s': unable to read %s" msgstr "«%s»: не удалось прочесть %s" -#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82 +#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "не удалось выполнить stat «%s»" -#: grep.c:2152 +#: grep.c:2156 #, c-format msgid "'%s': short read" msgstr "«%s»: слишком мало данных прочитано" @@ -1980,7 +1982,7 @@ msgid "These are common Git commands used in various situations:" msgstr "Стандартные команды Git используемые в различных ситуациях:" -#: help.c:596 +#: help.c:511 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -1989,31 +1991,31 @@ "«%s» похоже на команду git, но нам не удалось ее запустить. Возможно, git-%s " " не работает?" -#: help.c:655 +#: help.c:570 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Ой-ёй! Ваша система не сообщает ни о каких командах Git вообще." -#: help.c:677 +#: help.c:592 #, c-format msgid "WARNING: You called a Git command named '%s', which does not exist." msgstr "Внимание: Вы запустили не существующую команду Git «%s»." -#: help.c:682 +#: help.c:597 #, c-format msgid "Continuing under the assumption that you meant '%s'." msgstr "Продолжаю, предполагая, что вы имели в виду «%s»." -#: help.c:687 +#: help.c:602 #, c-format msgid "Continuing in %0.1f seconds, assuming that you meant '%s'." msgstr "Продолжу через %0.1f секунд, предполагая, что вы имели в виду «%s»." -#: help.c:695 +#: help.c:610 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: «%s» не является командой git. Смотрите «git --help»." -#: help.c:699 +#: help.c:614 msgid "" "\n" "The most similar command is" @@ -2030,16 +2032,16 @@ "\n" "Самые похожие команды:" -#: help.c:714 +#: help.c:653 msgid "git version []" msgstr "git version []" -#: help.c:783 +#: help.c:708 #, c-format msgid "%s: %s - %s" msgstr "%s: %s — %s" -#: help.c:787 +#: help.c:712 msgid "" "\n" "Did you mean this?" @@ -2112,7 +2114,7 @@ msgid "name consists only of disallowed characters: %s" msgstr "имя состоит только из неразрешенных симоволов: %s" -#: ident.c:436 builtin/commit.c:611 +#: ident.c:436 builtin/commit.c:634 #, c-format msgid "invalid date format: %s" msgstr "неправильный формат даты: %s" @@ -2121,11 +2123,11 @@ msgid "multiple filter-specs cannot be combined" msgstr "невозможно объединять фильтрацию с помощью нескольких спецификаций" -#: list-objects-filter-options.c:126 +#: list-objects-filter-options.c:137 msgid "cannot change partial clone promisor remote" msgstr "нельзя изменить внешний репозиторий при частичном клонировании" -#: lockfile.c:151 +#: lockfile.c:152 #, c-format msgid "" "Unable to create '%s.lock': %s.\n" @@ -2145,7 +2147,7 @@ "с ошибкой в этом репозитории: \n" "удалите файл вручную для продолжения." -#: lockfile.c:159 +#: lockfile.c:160 #, c-format msgid "Unable to create '%s.lock': %s" msgstr "Не удалось создать «%s.lock»: %s" @@ -2154,79 +2156,79 @@ msgid "failed to read the cache" msgstr "сбой чтения кэша" -#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908 -#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785 -#: builtin/stash.c:264 +#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912 +#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816 +#: builtin/stash.c:265 msgid "unable to write new index file" msgstr "не удалось записать новый файл индекса" -#: merge-recursive.c:367 +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "(плохой коммит)\n" -#: merge-recursive.c:257 merge-recursive.c:265 +#: merge-recursive.c:209 #, c-format msgid "addinfo_cache failed for path '%s'" msgstr "сбой addinfo_cache для пути «%s»" -#: merge-recursive.c:329 +#: merge-recursive.c:435 msgid "error building trees" msgstr "ошибка при построении деревьев" -#: merge-recursive.c:885 +#: merge-recursive.c:874 #, c-format msgid "failed to create path '%s'%s" msgstr "не удалось создать путь «%s»%s" -#: merge-recursive.c:896 +#: merge-recursive.c:885 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Удаление %s, чтобы освободить место для подкаталогов\n" -#: merge-recursive.c:910 merge-recursive.c:929 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" msgstr ": возможно, конфликт каталогов/файлов?" -#: merge-recursive.c:919 +#: merge-recursive.c:908 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "отказ потери неотслеживаемого файла в «%s»" -#: merge-recursive.c:960 builtin/cat-file.c:41 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "невозможно прочитать объект %s «%s»" -#: merge-recursive.c:965 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "ожидается двоичный объект для %s «%s»" -#: merge-recursive.c:990 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "не удалось открыть «%s»: %s" -#: merge-recursive.c:1001 +#: merge-recursive.c:990 #, c-format msgid "failed to symlink '%s': %s" msgstr "не удалось создать символьную ссылку «%s»: %s" -#: merge-recursive.c:1006 +#: merge-recursive.c:995 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "не понятно, что делать с %06o %s «%s»" -#: merge-recursive.c:1349 +#: merge-recursive.c:1341 msgid "Failed to execute internal merge" msgstr "Не удалось запустить внутреннее слияние" -#: merge-recursive.c:1354 +#: merge-recursive.c:1346 #, c-format msgid "Unable to add %s to database" msgstr "Не удалось добавить %s в базу данных" -#: merge-recursive.c:1482 +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2235,7 +2237,7 @@ "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена " "в дереве." -#: merge-recursive.c:1487 +#: merge-recursive.c:1479 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2244,7 +2246,7 @@ "КОНФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Версия %s из %s " "оставлена в дереве." -#: merge-recursive.c:1494 +#: merge-recursive.c:1486 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -2253,7 +2255,7 @@ "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена " "в дереве на %s." -#: merge-recursive.c:1499 +#: merge-recursive.c:1491 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -2262,20 +2264,20 @@ "КОНФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Версия %s из %s " "оставлена в дереве на %s." -#: merge-recursive.c:1534 +#: merge-recursive.c:1526 msgid "rename" msgstr "переименование" -#: merge-recursive.c:1534 +#: merge-recursive.c:1526 msgid "renamed" msgstr "переименовано" -#: merge-recursive.c:1713 +#: merge-recursive.c:1676 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s — это каталог в %s, добавляем как %s вместо этого" -#: merge-recursive.c:1737 +#: merge-recursive.c:1708 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename " @@ -2284,98 +2286,98 @@ "КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке " "«%s» и переименование «%s»→«%s» в ветке «%s»%s" -#: merge-recursive.c:1742 +#: merge-recursive.c:1713 msgid " (left unresolved)" msgstr " (оставлено неразрешенным)" -#: merge-recursive.c:1851 +#: merge-recursive.c:1805 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке " "«%s» и переименование «%s»→«%s» в ветке «%s»" -#: merge-recursive.c:1379 +#: merge-recursive.c:1734 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Переименовываю %s в %s и %s в %s вместо этого" -#: merge-recursive.c:1582 +#: merge-recursive.c:2737 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "КОНФЛИКТ (переименование/добавление): Переименование «%s»→«%s» в ветке «%s» " "и добавление «%s» в ветке «%s»" -#: merge-recursive.c:1597 +#: merge-recursive.c:2763 #, c-format msgid "Adding merged %s" msgstr "Добавление слитого %s" -#: merge-recursive.c:3120 +#: merge-recursive.c:3132 #, c-format msgid "Adding as %s instead" msgstr "Добавление вместо этого как %s" -#: merge-recursive.c:2961 +#: merge-recursive.c:2973 #, c-format msgid "cannot read object %s" msgstr "невозможно прочитать объект «%s»" -#: merge-recursive.c:2964 +#: merge-recursive.c:2976 #, c-format msgid "object %s is not a blob" msgstr "объект %s не является двоичным объектом" -#: merge-recursive.c:3028 +#: merge-recursive.c:3040 msgid "modify" msgstr "изменение" -#: merge-recursive.c:3028 +#: merge-recursive.c:3040 msgid "modified" msgstr "изменено" -#: merge-recursive.c:3040 +#: merge-recursive.c:3052 msgid "content" msgstr "содержимое" -#: merge-recursive.c:3044 +#: merge-recursive.c:3056 msgid "add/add" msgstr "добавление/добавление" -#: merge-recursive.c:3067 +#: merge-recursive.c:3079 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Пропуск %s (слиты одинаковые изменения как существующие)" -#: merge-recursive.c:1386 +#: merge-recursive.c:1378 #, c-format msgid "Auto-merging %s" msgstr "Автослияние %s" -#: merge-recursive.c:3089 git-submodule.sh:937 +#: merge-recursive.c:3101 git-submodule.sh:985 msgid "submodule" msgstr "подмодуль" -#: merge-recursive.c:3090 +#: merge-recursive.c:3102 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "КОНФЛИКТ (%s): Конфликт слияния в %s" -#: merge-recursive.c:3327 +#: merge-recursive.c:3339 #, c-format msgid "Removing %s" msgstr "Удаление %s" -#: merge-recursive.c:3350 +#: merge-recursive.c:3362 msgid "file/directory" msgstr "файл/каталог" -#: merge-recursive.c:3355 +#: merge-recursive.c:3367 msgid "directory/file" msgstr "каталог/файл" -#: merge-recursive.c:3362 +#: merge-recursive.c:3374 #, c-format msgid "" "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" @@ -2383,7 +2385,7 @@ "КОНФЛИКТ (%s): Уже существует каталог с именем «%s» в «%s». Добавление «%s» " "как «%s»" -#: merge-recursive.c:3371 +#: merge-recursive.c:3383 #, c-format msgid "Adding %s" msgstr "Добавление %s" @@ -2393,20 +2395,20 @@ msgid "Dirty index: cannot merge (dirty: %s)" msgstr "Индекс не пустой: не могу слить (в индексе: %s)" -#: merge-recursive.c:3424 +#: merge-recursive.c:3436 msgid "Already up to date!" msgstr "Уже обновлено!" -#: merge-recursive.c:3433 +#: merge-recursive.c:3445 #, c-format msgid "merging of trees %s and %s failed" msgstr "сбой слияния деревьев «%s» и «%s»" -#: merge-recursive.c:3537 +#: merge-recursive.c:3549 msgid "Merging:" msgstr "Слияние:" -#: merge-recursive.c:3550 +#: merge-recursive.c:3562 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" @@ -2414,16 +2416,16 @@ msgstr[1] "найдено %u общих предка:" msgstr[2] "найдено %u общих предков:" -#: merge-recursive.c:3600 +#: merge-recursive.c:3612 msgid "merge returned no commit" msgstr "слияние не вернуло коммит" -#: merge-recursive.c:3756 +#: merge-recursive.c:3768 #, c-format msgid "Could not parse object '%s'" msgstr "Не удалось разобрать объект «%s»" -#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874 +#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885 msgid "Unable to write index." msgstr "Не удается записать индекс." @@ -2472,25 +2474,25 @@ msgid "unable to parse object: %s" msgstr "не удалось разобрать объект: %s" -#: packfile.c:641 +#: packfile.c:629 msgid "offset before end of packfile (broken .idx?)" msgstr "сдвиг до конца файла пакета (возможно, повреждён файл .idx?)" -#: packfile.c:1887 +#: packfile.c:1899 #, c-format msgid "offset before start of pack index for %s (corrupt index?)" msgstr "сдвиг до начала индекса пакета для %s (повреждён индекс?)" -#: packfile.c:1891 +#: packfile.c:1903 #, c-format msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "сдвиг за пределами индекса пакета для %s (обрезан индекс?)" -#: parse-options.c:888 +#: parse-options.c:882 msgid "..." msgstr "…" -#: parse-options.c:907 +#: parse-options.c:901 #, c-format msgid "usage: %s" msgstr "использование: %s" @@ -2498,17 +2500,17 @@ #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:913 +#: parse-options.c:907 #, c-format msgid " or: %s" msgstr " или: %s" -#: parse-options.c:916 +#: parse-options.c:910 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:955 +#: parse-options.c:949 msgid "-NUM" msgstr "-КОЛИЧЕСТВО" @@ -2517,36 +2519,36 @@ msgid "malformed object name '%s'" msgstr "Неправильное имя объекта «%s»" -#: path.c:897 +#: path.c:915 #, c-format msgid "Could not make %s writable by group" msgstr "Не удалось предоставить доступ к %s на запись" -#: pathspec.c:128 +#: pathspec.c:130 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" "Управляющий символ «\\» не разрешен как последний символ в значении attr" -#: pathspec.c:146 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "Разрешен только один спецификатор «attr:»." -#: pathspec.c:149 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "спецификатор attr не должен быть пустой" -#: pathspec.c:192 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "недопустимое имя атрибута %s" -#: pathspec.c:257 +#: pathspec.c:259 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "глобальные опции спецификаторов пути «glob» и «noglob» нельзя использовать " "одновременно" -#: pathspec.c:264 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -2554,57 +2556,57 @@ "глобальная опция спецификатора пути «literal» не совместима с другими " "глобальными спецификаторами доступа" -#: pathspec.c:304 +#: pathspec.c:306 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "" "неправильный параметр для магического слова «prefix» в спецификаторе пути" -#: pathspec.c:325 +#: pathspec.c:327 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "неправильное магическое слово «%.*s» в спецификаторе пути «%s»" -#: pathspec.c:330 +#: pathspec.c:332 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "Пропущено «)» в конце магического слова спецификатора пути «%s»" -#: pathspec.c:368 +#: pathspec.c:370 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Нереализованное магическое слово «%c» спецификатора пути «%s»" -#: pathspec.c:427 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: «literal» и «glob» не совместимы" -#: pathspec.c:440 +#: pathspec.c:442 #, c-format msgid "%s: '%s' is outside repository" msgstr "%s: «%s» вне репозитория" -#: pathspec.c:514 +#: pathspec.c:521 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "«%s» (мнемоника: «%c»)" -#: pathspec.c:524 +#: pathspec.c:531 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "" "%s: магические слова в спецификаторе пути не поддерживаются командой: %s" -#: pathspec.c:591 +#: pathspec.c:598 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "спецификатор пути «%s» находится за символической ссылкой" -#: pretty.c:966 +#: pretty.c:982 msgid "unable to parse --pretty format" msgstr "не удалось разобрать формат для --pretty" -#: read-cache.c:1635 +#: read-cache.c:1651 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -2613,7 +2615,7 @@ "index.version указан, но значение недействительное.\n" "Использую версию %i" -#: read-cache.c:1645 +#: read-cache.c:1661 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -2622,52 +2624,53 @@ "GIT_INDEX_VERSION указан, но значение недействительное.\n" "Использую версию %i" -#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119 +#: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130 #, c-format msgid "could not close '%s'" msgstr "не удалось закрыть «%s»" -#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917 +#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066 #, c-format msgid "could not stat '%s'" msgstr "не удалось выполнить stat для «%s»" -#: read-cache.c:3126 +#: read-cache.c:3142 #, c-format msgid "unable to open git dir: %s" msgstr "не удалось открыть каталог git: %s" -#: read-cache.c:3138 +#: read-cache.c:3154 #, c-format msgid "unable to unlink: %s" msgstr "не удалось отсоединить: %s" -#: refs.c:706 +#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973 +#: builtin/merge.c:983 #, c-format msgid "Could not open '%s' for writing" msgstr "Не удалось открыть «%s» для записи" -#: refs.c:2055 +#: refs.c:2011 msgid "ref updates forbidden inside quarantine environment" msgstr "обновление ссылок запрещено в изолированном окружении" -#: refs/files-backend.c:1234 +#: refs/files-backend.c:1233 #, c-format msgid "could not remove reference %s" msgstr "не удалось удалить ссылки %s" -#: refs/files-backend.c:1248 refs/packed-backend.c:1541 +#: refs/files-backend.c:1247 refs/packed-backend.c:1541 #: refs/packed-backend.c:1551 #, c-format msgid "could not delete reference %s: %s" msgstr "не удалось удалить ссылку %s: %s" -#: refs/files-backend.c:1251 refs/packed-backend.c:1554 +#: refs/files-backend.c:1250 refs/packed-backend.c:1554 #, c-format msgid "could not delete references: %s" msgstr "не удалось удалить ссылки: %s" -#: ref-filter.c:42 wt-status.c:1938 +#: ref-filter.c:42 wt-status.c:1936 msgid "gone" msgstr "исчез" @@ -2831,12 +2834,12 @@ msgid "malformed format string %s" msgstr "неправильная строка формата %s" -#: ref-filter.c:1313 +#: ref-filter.c:1424 #, c-format msgid "(no branch, rebasing %s)" msgstr "(нет ветки, перемещение %s)" -#: ref-filter.c:1316 +#: ref-filter.c:1430 #, c-format msgid "(no branch, bisect started on %s)" msgstr "(нет ветки, двоичный поиск начат на %s)" @@ -2844,7 +2847,7 @@ #. TRANSLATORS: make sure this matches "HEAD #. detached at " in wt-status.c #. -#: ref-filter.c:1324 +#: ref-filter.c:1438 #, c-format msgid "(HEAD detached at %s)" msgstr "(HEAD отделён на %s)" @@ -2852,140 +2855,140 @@ #. TRANSLATORS: make sure this matches "HEAD #. detached from " in wt-status.c #. -#: ref-filter.c:1331 +#: ref-filter.c:1445 #, c-format msgid "(HEAD detached from %s)" msgstr "(HEAD отделён начиная с %s)" -#: ref-filter.c:1335 +#: ref-filter.c:1449 msgid "(no branch)" msgstr "(нет ветки)" -#: ref-filter.c:1540 ref-filter.c:1749 +#: ref-filter.c:1538 ref-filter.c:1747 #, c-format msgid "missing object %s for %s" msgstr "не найден объект %s для %s" -#: ref-filter.c:1550 +#: ref-filter.c:1548 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "сбой при выполнении parse_object_buffer на %s для %s" -#: ref-filter.c:2004 +#: ref-filter.c:2001 #, c-format msgid "malformed object at '%s'" msgstr "Повреждённый объект «%s»" -#: ref-filter.c:2093 +#: ref-filter.c:2090 #, c-format msgid "ignoring ref with broken name %s" msgstr "игнорирую ссылку с неправильным именем %s" -#: refs.c:669 ref-filter.c:2098 +#: ref-filter.c:2095 refs.c:625 #, c-format msgid "ignoring broken ref %s" msgstr "игнорирую неправильную ссылку %s" -#: ref-filter.c:2389 +#: ref-filter.c:2395 #, c-format msgid "format: %%(end) atom missing" msgstr "format: пропущена частица %%(end)" -#: ref-filter.c:2502 +#: ref-filter.c:2508 #, c-format msgid "malformed object name %s" msgstr "неправильное имя объекта %s" -#: remote.c:611 +#: remote.c:594 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Нельзя извлечь одновременно %s и %s в %s" -#: remote.c:615 +#: remote.c:598 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s обычно отслеживает %s, а не %s" -#: remote.c:619 +#: remote.c:602 #, c-format msgid "%s tracks both %s and %s" msgstr "%s отслеживает и %s и %s" -#: remote.c:811 +#: remote.c:623 msgid "Internal error" msgstr "Внутренняя ошибка" -#: remote.c:1627 remote.c:1728 +#: remote.c:1610 remote.c:1711 msgid "HEAD does not point to a branch" msgstr "HEAD не указывает на ветку" -#: remote.c:1636 +#: remote.c:1619 #, c-format msgid "no such branch: '%s'" msgstr "нет такой ветки: «%s»" -#: remote.c:1639 +#: remote.c:1622 #, c-format msgid "no upstream configured for branch '%s'" msgstr "вышестоящая ветка не настроена для ветки «%s»" -#: remote.c:1645 +#: remote.c:1628 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "вышестоящая ветка «%s» не сохранена как отслеживаемая ветка" -#: remote.c:1660 +#: remote.c:1643 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "назначение для отправки «%s» на внешнем сервере «%s» не имеет локальной " "отслеживаемой ветки" -#: remote.c:1672 +#: remote.c:1655 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "ветка «%s» не имеет внешнего сервера для отправки" -#: remote.c:1682 +#: remote.c:1665 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "спецификаторы пути для отправки «%s» не включают в себя «%s»" -#: remote.c:1695 +#: remote.c:1678 msgid "push has no destination (push.default is 'nothing')" msgstr "" "отправка не имеет точки назначения (push.default выставлен в «nothing»)" -#: remote.c:1717 +#: remote.c:1700 msgid "cannot resolve 'simple' push to a single destination" msgstr "" "не удалось выполнить «simple» отправку в единственную точку назначения" -#: remote.c:2019 +#: remote.c:2002 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Ваша ветка базируется на «%s», но вышестоящий репозиторий исчез.\n" -#: remote.c:2023 +#: remote.c:2006 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (для исправления запустите «git branch --unset-upstream»)\n" -#: remote.c:2026 +#: remote.c:2009 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Ваша ветка обновлена в соответствии с «%s».\n" -#: remote.c:2030 +#: remote.c:2013 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Ваша ветка и «%s» указывают на разные коммиты.\n" -#: remote.c:2033 +#: remote.c:2016 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (используйте «%s» для просмотра описания)\n" -#: remote.c:2037 +#: remote.c:2020 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" @@ -2993,12 +2996,12 @@ msgstr[1] "Ваша ветка опережает «%s» на %d коммита.\n" msgstr[2] "Ваша ветка опережает «%s» на %d коммитов.\n" -#: remote.c:2043 +#: remote.c:2026 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" " (используйте «git push», чтобы опубликовать ваши локальные коммиты)\n" -#: remote.c:2046 +#: remote.c:2029 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -3010,11 +3013,11 @@ msgstr[2] "" "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n" -#: remote.c:2054 +#: remote.c:2037 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (используйте «git pull», чтобы обновить вашу локальную ветку)\n" -#: remote.c:2057 +#: remote.c:2040 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -3032,20 +3035,20 @@ "Ваша ветка и «%s» разделились\n" "и теперь имеют %d и %d разных коммитов в каждой соответственно.\n" -#: remote.c:2067 +#: remote.c:2050 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (используйте «git pull», чтобы слить внешнюю ветку в вашу)\n" -#: revision.c:2509 +#: revision.c:2655 msgid "your current branch appears to be broken" msgstr "похоже, ваша текущая ветка повреждена" -#: revision.c:2512 +#: revision.c:2658 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "ваша текущая ветка «%s» еще не содержит ни одного коммита" -#: revision.c:2720 +#: revision.c:2866 msgid "--first-parent is incompatible with --bisect" msgstr "опцию --first-parent нельзя использовать одновременно с --bisect" @@ -3064,29 +3067,29 @@ "Вы можете отключить это предупреждение с помощью команды «git config " "advice.ignoredHook false»." -#: send-pack.c:142 +#: send-pack.c:145 msgid "unexpected flush packet while reading remote unpack status" msgstr "неожиданный пустой пакет при чтении статуса внешней распаковки" -#: send-pack.c:144 +#: send-pack.c:147 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "не удалось разобрать статус внешней распаковки: %s" -#: send-pack.c:146 +#: send-pack.c:149 #, c-format msgid "remote unpack failed: %s" msgstr "сбой при внешней распаковке %s" -#: send-pack.c:307 +#: send-pack.c:308 msgid "failed to sign the push certificate" msgstr "сбой подписания сертификата отправки" -#: send-pack.c:421 +#: send-pack.c:399 msgid "the receiving end does not support --signed push" msgstr "принимающая сторона не поддерживает отправку с опцией --signed" -#: send-pack.c:423 +#: send-pack.c:401 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -3094,28 +3097,28 @@ "не отправляем сертификат для отправки, так как принимающая сторона не " "поддерживает отправку с опцией --signed" -#: send-pack.c:435 +#: send-pack.c:413 msgid "the receiving end does not support --atomic push" msgstr "принимающая сторона не поддерживает отправку с опцией --atomic" -#: send-pack.c:440 +#: send-pack.c:418 msgid "the receiving end does not support push options" msgstr "принимающая сторона не поддерживает отправку с опциями" -#: sequencer.c:187 +#: sequencer.c:192 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "неправильный режим очистки сообщения коммита «%s»" -#: sequencer.c:321 +#: sequencer.c:326 msgid "revert" msgstr "обратить изменения" -#: sequencer.c:323 +#: sequencer.c:328 msgid "cherry-pick" msgstr "копировать коммит" -#: sequencer.c:325 +#: sequencer.c:327 msgid "rebase -i" msgstr "rebase -i" @@ -3124,7 +3127,7 @@ msgid "Unknown action: %d" msgstr "Неизвестное действие: %d" -#: sequencer.c:385 +#: sequencer.c:390 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '" @@ -3132,7 +3135,7 @@ "после разрешения конфликтов, пометьте исправленные пути\n" "с помощью «git add <пути>» или «git rm <пути>»" -#: sequencer.c:388 +#: sequencer.c:393 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '\n" @@ -3142,66 +3145,66 @@ "с помощью «git add <пути>» или «git rm <пути>»\n" "и сделайте коммит с помощью «git commit»" -#: sequencer.c:401 sequencer.c:2847 +#: sequencer.c:406 sequencer.c:2921 #, c-format msgid "could not lock '%s'" msgstr "не удалось заблокировать «%s»" -#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851 -#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620 +#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925 +#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173 +#: wrapper.c:620 #, c-format msgid "could not write to '%s'" msgstr "не удалось записать в «%s»" -#: sequencer.c:408 +#: sequencer.c:413 #, c-format msgid "could not write eol to '%s'" msgstr "не удалось записать eol в «%s»" -#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867 -#: sequencer.c:3130 +#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941 +#: sequencer.c:3203 #, c-format msgid "failed to finalize '%s'" msgstr "не удалось завершить «%s»" -#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112 -#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117 -#: builtin/rebase.c:568 +#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185 +#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128 #, c-format msgid "could not read '%s'" msgstr "не удалось прочитать «%s»" -#: sequencer.c:462 +#: sequencer.c:457 #, c-format msgid "your local changes would be overwritten by %s." msgstr "ваши локальные изменения будут перезаписаны %s." -#: sequencer.c:466 +#: sequencer.c:461 msgid "commit your changes or stash them to proceed." msgstr "для продолжения закоммитьте ваши изменения или спрячьте их." -#: sequencer.c:498 +#: sequencer.c:493 #, c-format msgid "%s: fast-forward" msgstr "%s: перемотка вперед" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase -i". +#. "rebase". #. -#: sequencer.c:631 +#: sequencer.c:626 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Не удалось записать файл индекса" -#: sequencer.c:662 +#: sequencer.c:657 msgid "could not resolve HEAD commit" msgstr "не удалось распознать HEAD коммит" -#: sequencer.c:648 +#: sequencer.c:643 msgid "unable to update cache tree" msgstr "не удалось обновить дерево кэша" -#: sequencer.c:872 +#: sequencer.c:867 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -3231,11 +3234,11 @@ "\n" " git rebase --continue\n" -#: sequencer.c:1146 +#: sequencer.c:1141 msgid "'prepare-commit-msg' hook failed" msgstr "ошибка при вызове перехватчика «prepare-commit-msg»" -#: sequencer.c:1153 +#: sequencer.c:1147 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3263,7 +3266,7 @@ "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1166 +#: sequencer.c:1160 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3288,63 +3291,63 @@ "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1208 +#: sequencer.c:1202 msgid "couldn't look up newly created commit" msgstr "нельзя запросить новосозданный коммит" -#: sequencer.c:1210 +#: sequencer.c:1204 msgid "could not parse newly created commit" msgstr "нельзя разобрать новосозданный коммит" -#: sequencer.c:1256 +#: sequencer.c:1250 msgid "unable to resolve HEAD after creating commit" msgstr "не удалось найти HEAD после создания коммита" -#: sequencer.c:1258 +#: sequencer.c:1252 msgid "detached HEAD" msgstr "отделённый HEAD" -#: sequencer.c:1262 +#: sequencer.c:1256 msgid " (root-commit)" msgstr " (корневой коммит)" -#: sequencer.c:1283 +#: sequencer.c:1277 msgid "could not parse HEAD" msgstr "не удалось разобрать HEAD" -#: sequencer.c:1285 +#: sequencer.c:1279 #, c-format msgid "HEAD %s is not a commit!" msgstr "HEAD %s не является коммитом!" -#: sequencer.c:1289 builtin/commit.c:1571 +#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579 msgid "could not parse HEAD commit" msgstr "не удалось разобрать HEAD коммит" -#: sequencer.c:1341 sequencer.c:1933 +#: sequencer.c:1335 sequencer.c:1980 msgid "unable to parse commit author" msgstr "не удалось разобрать автора коммита" -#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684 +#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695 msgid "git write-tree failed to write a tree" msgstr "git write-tree не удалось записать дерево" -#: sequencer.c:1369 sequencer.c:1429 +#: sequencer.c:1379 sequencer.c:1450 #, c-format msgid "unable to read commit message from '%s'" msgstr "не удалось прочитать сообщение коммита из «%s»" -#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883 -#: builtin/merge.c:908 +#: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894 +#: builtin/merge.c:919 msgid "failed to write commit object" msgstr "сбой записи объекта коммита" -#: sequencer.c:1456 +#: sequencer.c:1481 #, c-format msgid "could not parse commit %s" msgstr "не удалось разобрать коммит %s" -#: sequencer.c:1461 +#: sequencer.c:1486 #, c-format msgid "could not parse parent commit %s" msgstr "не удалось разобрать родительский коммит %s" @@ -3371,248 +3374,250 @@ "\n" "\t%.*s" -#: sequencer.c:1592 sequencer.c:1617 +#: sequencer.c:1627 sequencer.c:1652 #, c-format msgid "This is a combination of %d commits." msgstr "Это объединение %d коммитов." -#: sequencer.c:1602 +#: sequencer.c:1637 msgid "need a HEAD to fixup" msgstr "нужен HEAD для исправления" -#: sequencer.c:1604 sequencer.c:3157 +#: sequencer.c:1639 sequencer.c:3230 msgid "could not read HEAD" msgstr "не удалось прочитать HEAD" -#: sequencer.c:1606 +#: sequencer.c:1641 msgid "could not read HEAD's commit message" msgstr "не удалось прочитать сообщение коммита текущего HEAD" -#: sequencer.c:1612 +#: sequencer.c:1647 #, c-format msgid "cannot write '%s'" msgstr "не удалось записать «%s»" -#: sequencer.c:1619 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1654 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Это 1-е сообщение коммита:" -#: sequencer.c:1627 +#: sequencer.c:1662 #, c-format msgid "could not read commit message of %s" msgstr "не удалось прочитать сообщение коммита для %s" -#: sequencer.c:1634 +#: sequencer.c:1669 #, c-format msgid "This is the commit message #%d:" msgstr "Это сообщение коммита номер #%d:" -#: sequencer.c:1640 +#: sequencer.c:1675 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Сообщение коммита номер #%d будет пропущено:" -#: sequencer.c:1535 sequencer.c:1645 +#: sequencer.c:1569 sequencer.c:1680 #, c-format msgid "unknown command: %d" msgstr "неизвестная команда: %d" -#: sequencer.c:1728 +#: sequencer.c:1763 msgid "your index file is unmerged." msgstr "ваш индекс не слит." -#: sequencer.c:1754 +#: sequencer.c:1789 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "коммит %s — это коммит-слияние, но опция -m не указана." -#: sequencer.c:1762 sequencer.c:1770 +#: sequencer.c:1797 sequencer.c:1805 #, c-format msgid "commit %s does not have parent %d" msgstr "у коммита %s нет предка %d" -#: sequencer.c:1510 +#: sequencer.c:1770 #, c-format msgid "mainline was specified but commit %s is not a merge." msgstr "основная ветка указана, но коммит %s не является слиянием." -#: sequencer.c:1776 +#: sequencer.c:1811 #, c-format msgid "cannot get commit message for %s" msgstr "не удалось получить сообщение коммита для %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1795 +#: sequencer.c:1830 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: не удалось разобрать родительский коммит для %s" -#: sequencer.c:1860 +#: sequencer.c:1895 #, c-format msgid "could not rename '%s' to '%s'" msgstr "не удалось переименовать «%s» в «%s»" -#: sequencer.c:1915 +#: sequencer.c:1952 #, c-format msgid "could not revert %s... %s" msgstr "не удалось обратить изменения коммита %s… %s" -#: sequencer.c:1916 +#: sequencer.c:1953 #, c-format msgid "could not apply %s... %s" msgstr "не удалось применить коммит %s… %s" -#: sequencer.c:2590 sequencer.c:4308 +#: sequencer.c:2664 sequencer.c:4469 msgid "empty commit set passed" msgstr "передан пустой набор коммитов" -#: sequencer.c:1983 +#: sequencer.c:2030 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: сбой чтения индекса" -#: sequencer.c:1990 +#: sequencer.c:2037 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: сбой обновления индекса" -#: sequencer.c:2066 +#: sequencer.c:2114 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "параметр %s не принимает аргументы: «%s»" -#: sequencer.c:2075 +#: sequencer.c:2123 #, c-format msgid "missing arguments for %s" msgstr "пропущены аргументы для %s" -#: sequencer.c:2166 +#: sequencer.c:2215 #, c-format msgid "invalid line %d: %.*s" msgstr "неправильная строка %d: %.*s" -#: sequencer.c:2177 +#: sequencer.c:2226 #, c-format msgid "cannot '%s' without a previous commit" msgstr "нельзя выполнить «%s» без указания предыдущего коммита" -#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178 -#: builtin/rebase.c:204 builtin/rebase.c:229 +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274 +#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227 +#: builtin/rebase.c:252 #, c-format msgid "could not read '%s'." msgstr "не удалось прочитать «%s»." -#: sequencer.c:2302 +#: sequencer.c:2361 msgid "please fix this using 'git rebase --edit-todo'." msgstr "пожалуйста исправьте это с помощью «git rebase --edit-todo»." -#: sequencer.c:2304 +#: sequencer.c:2363 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "непригодная для использования карта с инструкциями: «%s»" -#: sequencer.c:2309 +#: sequencer.c:2368 msgid "no commits parsed." msgstr "коммиты не разобраны." -#: sequencer.c:2320 +#: sequencer.c:2379 msgid "cannot cherry-pick during a revert." msgstr "нельзя скопировать коммит во время процесса обращения коммита." -#: sequencer.c:2322 +#: sequencer.c:2381 msgid "cannot revert during a cherry-pick." msgstr "нельзя обратить изменения коммита во время копирования коммита." -#: config.c:406 sequencer.c:2401 +#: config.c:408 sequencer.c:2456 #, c-format msgid "invalid key: %s" msgstr "недействительный ключ: %s" -#: sequencer.c:2404 +#: sequencer.c:2459 #, c-format msgid "invalid value for %s: %s" msgstr "неправильное значение %s: %s" -#: sequencer.c:2507 +#: sequencer.c:2576 #, c-format msgid "malformed options sheet: '%s'" msgstr "испорченная карта с опциями: «%s»" -#: sequencer.c:2100 +#: sequencer.c:2487 msgid "a cherry-pick or revert is already in progress" msgstr "копирование или обращение изменений коммита уже выполняются" -#: sequencer.c:2101 +#: sequencer.c:2488 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "попробуйте «git cherry-pick (--continue | --quit | --abort)»" -#: sequencer.c:2627 +#: sequencer.c:2701 #, c-format msgid "could not create sequencer directory '%s'" msgstr "не удалось создать каталог для указателя следования коммитов «%s»" -#: sequencer.c:2642 +#: sequencer.c:2716 msgid "could not lock HEAD" msgstr "не удалось заблокировать HEAD" -#: sequencer.c:2702 sequencer.c:4057 +#: sequencer.c:2776 sequencer.c:4206 msgid "no cherry-pick or revert in progress" msgstr "копирование или обращение изменений коммита уже выполняются" -#: sequencer.c:2704 sequencer.c:2715 +#: sequencer.c:2778 sequencer.c:2789 msgid "cannot resolve HEAD" msgstr "не удалось определить HEAD" -#: sequencer.c:2706 sequencer.c:2750 +#: sequencer.c:2780 sequencer.c:2824 msgid "cannot abort from a branch yet to be born" msgstr "нельзя отменить изменения с ветки, которая еще не создана" -#: sequencer.c:2736 builtin/grep.c:736 +#: sequencer.c:2810 builtin/grep.c:744 #, c-format msgid "cannot open '%s'" msgstr "не удалось открыть «%s»" -#: sequencer.c:2738 +#: sequencer.c:2812 #, c-format msgid "cannot read '%s': %s" msgstr "не удалось прочитать «%s»: %s" -#: sequencer.c:2739 +#: sequencer.c:2813 msgid "unexpected end of file" msgstr "неожиданный конец файла" -#: sequencer.c:2745 +#: sequencer.c:2819 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "сохраненный файл с HEAD перед копированием коммита «%s» поврежден" -#: sequencer.c:2756 +#: sequencer.c:2830 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Похоже, что вы переместили HEAD. Перемотка не выполняется, проверьте свой " "указатель HEAD!" -#: sequencer.c:2949 sequencer.c:3969 +#: sequencer.c:1433 sequencer.c:4118 #, c-format msgid "could not update %s" msgstr "не удалось обновить %s" -#: sequencer.c:2987 sequencer.c:3949 +#: sequencer.c:3060 sequencer.c:4098 msgid "cannot read HEAD" msgstr "не удалось прочитать HEAD" -#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641 +#: sequencer.c:3116 sequencer.c:3120 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "не удалось скопировать «%s» в «%s»" -#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613 -#: builtin/rebase.c:1987 builtin/rebase.c:2031 +#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142 +#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518 +#: builtin/rebase.c:1919 msgid "could not read index" msgstr "не удалось прочитать индекс" -#: sequencer.c:3074 +#: sequencer.c:3147 #, c-format msgid "" "execution failed: %s\n" @@ -3627,11 +3632,11 @@ " git rebase --continue\n" "\n" -#: sequencer.c:3080 +#: sequencer.c:3153 msgid "and made changes to the index and/or the working tree\n" msgstr "и были сделаны изменения в индексе и/или в рабочем каталоге\n" -#: sequencer.c:3086 +#: sequencer.c:3159 #, c-format msgid "" "execution succeeded: %s\n" @@ -3648,18 +3653,17 @@ " git rebase --continue\n" "\n" -#: sequencer.c:3623 builtin/rebase.c:712 +#: sequencer.c:3744 #, c-format msgid "Applied autostash.\n" msgstr "Применены автоматически спрятанные изменения.\n" -#: sequencer.c:3635 +#: sequencer.c:3756 #, c-format msgid "cannot store %s" msgstr "не удалось сохранить %s" -#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113 -#, c-format +#: git-rebase--preserve-merges.sh:113 msgid "" "Applying autostash resulted in conflicts.\n" "Your changes are safe in the stash.\n" @@ -3669,54 +3673,54 @@ "Ваши изменения спрятаны и в безопасности.\n" "Вы можете выполнить «git stash pop» или «git stash drop» в любой момент.\n" -#: sequencer.c:3827 +#: sequencer.c:3976 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Остановлено на %s … %.*s\n" -#: sequencer.c:3898 +#: sequencer.c:4047 #, c-format msgid "unknown command %d" msgstr "неизвестная команда %d" -#: sequencer.c:3957 +#: sequencer.c:4106 msgid "could not read orig-head" msgstr "не удалось прочитать orig-head" -#: sequencer.c:3962 +#: sequencer.c:4111 msgid "could not read 'onto'" msgstr "не удалось прочитать «onto»" -#: sequencer.c:3976 +#: sequencer.c:4125 #, c-format msgid "could not update HEAD to %s" msgstr "не удалось обновить HEAD на %s" -#: sequencer.c:4069 +#: sequencer.c:4218 msgid "cannot rebase: You have unstaged changes." msgstr "" "не удалось выполнить перемещение коммитов: У вас есть непроиндексированные " "изменения." -#: sequencer.c:4174 +#: sequencer.c:4324 msgid "could not remove CHERRY_PICK_HEAD" msgstr "не удалось удалить CHERRY_PICK_HEAD" -#: sequencer.c:4078 +#: sequencer.c:4227 msgid "cannot amend non-existing commit" msgstr "не удалось исправить несуществующий коммит" -#: sequencer.c:4080 +#: sequencer.c:4229 #, c-format msgid "invalid file: '%s'" msgstr "недопустимый файл: «%s»" -#: sequencer.c:4082 +#: sequencer.c:4231 #, c-format msgid "invalid contents: '%s'" msgstr "недопустимое содержимое: «%s»" -#: sequencer.c:4085 +#: sequencer.c:4234 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -3726,45 +3730,45 @@ "У вас имеются незакоммиченные изменения в рабочем каталоге. Сделайте коммит, " "а затем запустите «git rebase --continue» снова." -#: sequencer.c:4181 +#: sequencer.c:4331 msgid "could not commit staged changes." msgstr "не удалось закоммитить проиндексированные изменения." -#: sequencer.c:4285 +#: sequencer.c:4446 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: не удалось скопировать коммит %s" -#: sequencer.c:4289 +#: sequencer.c:4450 #, c-format msgid "%s: bad revision" msgstr "%s: плохая редакция" -#: sequencer.c:4324 +#: sequencer.c:4485 msgid "can't revert as initial commit" msgstr "нельзя возвратить изначальный коммит" -#: sequencer.c:4774 +#: sequencer.c:4962 msgid "make_script: unhandled options" msgstr "make_script: не обработанные опции" -#: sequencer.c:4777 +#: sequencer.c:4965 msgid "make_script: error preparing revisions" msgstr "make_script: ошибка при обновлении редакций" -#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#: builtin/rebase.c:181 builtin/rebase.c:205 builtin/rebase.c:232 #, c-format msgid "unusable todo list: '%s'" msgstr "непригодный для использования список дел: «%s»" -#: rebase-interactive.c:26 +#: rebase-interactive.c:33 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." msgstr "" "нераспознанная настройка %s для опции rebase.missingCommitsCheck. Игнорирую." -#: rebase-interactive.c:173 +#: rebase-interactive.c:193 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -3773,7 +3777,7 @@ "Внимание: некоторые коммиты могли быть отброшены по ошибке.\n" "Отброшенные коммиты (от новых к старым):\n" -#: rebase-interactive.c:180 +#: rebase-interactive.c:200 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -3791,7 +3795,7 @@ "Возможные значения: ignore, warn, error.\n" "\n" -#: sequencer.c:4935 +#: rebase-interactive.c:11 msgid "" "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" "continue'.\n" @@ -3801,18 +3805,18 @@ "«git rebase --continue».\n" "Или вы можете прервать процесс перемещения, выполнив «git rebase --abort»\n" -#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714 -#: builtin/rebase.c:1004 +#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719 +#: builtin/rebase.c:852 #, c-format msgid "could not open '%s' for writing" msgstr "не удалось открыть «%s» для записи" -#: range-diff.c:92 sequencer.c:4985 +#: range-diff.c:98 sequencer.c:5143 #, c-format msgid "could not parse commit '%s'" msgstr "не удалось разобрать коммит «%s»" -#: sequencer.c:5166 +#: sequencer.c:5336 msgid "the script was already rearranged." msgstr "сценарий уже был перестроен." @@ -3821,7 +3825,7 @@ msgid "'%s' is outside repository" msgstr "«%s» вне репозитория" -#: setup.c:174 +#: setup.c:185 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -3831,7 +3835,7 @@ "Используйте «git <команда> -- <путь>…» для указания путей, которые не " "существуют локально." -#: setup.c:187 +#: setup.c:198 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -3843,12 +3847,12 @@ "Используйте «--» для отделения путей от редакций, вот так:\n" "«git <команда> [<редакция>…] -- [<файл>…]»" -#: setup.c:236 +#: setup.c:264 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "" -#: setup.c:255 +#: setup.c:283 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -3860,92 +3864,92 @@ "Используйте «--» для отделения путей от редакций, вот так:\n" "«git <команда> [<редакция>…] -- [<файл>…]»" -#: setup.c:391 +#: setup.c:419 msgid "unable to set up work tree using invalid config" msgstr "" -#: setup.c:395 +#: setup.c:423 msgid "this operation must be run in a work tree" msgstr "" -#: setup.c:541 +#: setup.c:569 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Ожидаемая версия git репозитория <= %d, а обнаружена %d" -#: setup.c:549 +#: setup.c:577 msgid "unknown repository extensions found:" msgstr "обнаружены неизвестные расширения репозитория:" -#: setup.c:568 +#: setup.c:596 #, c-format msgid "error opening '%s'" msgstr "ошибка открытия «%s»" -#: setup.c:570 +#: setup.c:598 #, c-format msgid "too large to be a .git file: '%s'" msgstr "файл слишком большой как для .git файла: «%s»" -#: setup.c:572 +#: setup.c:600 #, c-format msgid "error reading %s" msgstr "ошибка чтения %s" -#: setup.c:574 +#: setup.c:602 #, c-format msgid "invalid gitfile format: %s" msgstr "неправильный формат файла gitfile: %s" -#: setup.c:576 +#: setup.c:604 #, c-format msgid "no path in gitfile: %s" msgstr "нет пути в gitfile: %s" -#: setup.c:578 +#: setup.c:606 #, c-format msgid "not a git repository: %s" msgstr "не является репозиторием git: %s" -#: setup.c:677 +#: setup.c:708 #, c-format msgid "'$%s' too big" msgstr "«$%s» слишком большой" -#: setup.c:691 +#: setup.c:722 #, c-format msgid "not a git repository: '%s'" msgstr "не является репозиторием git: «%s»" -#: setup.c:720 setup.c:722 setup.c:753 +#: setup.c:751 setup.c:753 setup.c:784 #, c-format msgid "cannot chdir to '%s'" msgstr "не удалось выполнить chdir в «%s»" -#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838 +#: setup.c:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869 msgid "cannot come back to cwd" msgstr "не удалось вернуться в cwd" -#: setup.c:1110 +#: setup.c:1141 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "не найден git репозиторий (или один из родительских каталогов): %s" -#: setup.c:852 +#: setup.c:883 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "не удалось выполнить stat для «%*s%s%s»" -#: setup.c:1090 +#: setup.c:1121 msgid "Unable to read current working directory" msgstr "Не удалось прочитать текущий рабочий каталог" -#: setup.c:1099 setup.c:1105 +#: setup.c:1130 setup.c:1136 #, c-format msgid "cannot change to '%s'" msgstr "не удалось изменить на «%s»" -#: setup.c:1116 +#: setup.c:1147 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -3956,61 +3960,61 @@ "Останавливаю поиск на границе файловой системы (так как " "GIT_DISCOVERY_ACROSS_FILESYSTEM не установлен)." -#: setup.c:1227 +#: setup.c:1258 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" "The owner of files must always have read and write permissions." msgstr "" -#: setup.c:1271 +#: setup.c:1304 msgid "open /dev/null or dup failed" msgstr "сбой открытия /dev/null или дублирования дескриптора" -#: setup.c:1286 +#: setup.c:1319 msgid "fork failed" msgstr "сбой при выполнении fork" -#: setup.c:1291 +#: setup.c:1324 msgid "setsid failed" msgstr "сбой при выполнении setsid" -#: sha1-file.c:685 +#: sha1-file.c:703 #, c-format msgid "path '%s' does not exist" msgstr "путь «%s» не существует" -#: sha1-file.c:711 +#: sha1-file.c:724 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "ссылаемый репозиторий «%s» как связанное состояние, пока не поддерживается." -#: sha1-file.c:717 +#: sha1-file.c:730 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "ссылаемый репозиторий «%s» не является локальным." -#: sha1-file.c:723 +#: sha1-file.c:736 #, c-format msgid "reference repository '%s' is shallow" msgstr "ссылаемый репозиторий «%s» является частичным" -#: sha1-file.c:731 +#: sha1-file.c:744 #, c-format msgid "reference repository '%s' is grafted" msgstr "ссылаемый репозиторий «%s» является сращенным" -#: sha1-name.c:487 +#: sha1-name.c:486 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "сокращённый SHA1 идентификатор %s неоднозначен" -#: sha1-name.c:498 +#: sha1-name.c:497 msgid "The candidates are:" msgstr "Возможно, вы имели в виду:" -#: sha1_name.c:693 +#: sha1-name.c:770 msgid "" "Git normally never creates a ref that ends with 40 hex characters\n" "because it will be ignored when you just specify 40-hex. These refs\n" @@ -4044,7 +4048,7 @@ msgid "Could not find section in .gitmodules where path=%s" msgstr "Не удалось найти раздел в .gitmodules, где путь равен %s" -#: submodule-config.c:761 +#: submodule-config.c:766 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Не удалось обновить .gitmodules запись %s" @@ -4073,31 +4077,31 @@ msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "запись подмодуля «%s» (%s) является %s, а не является коммитом" -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 +#: submodule.c:1147 builtin/branch.c:678 builtin/submodule--helper.c:2045 msgid "Failed to resolve HEAD as a valid ref." msgstr "Не удалось определить HEAD как действительную ссылку." -#: submodule.c:1651 +#: submodule.c:1662 #, c-format msgid "'%s' not recognized as a git repository" msgstr "«%s» не распознан как репозиторий git" -#: submodule.c:1789 +#: submodule.c:1800 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "не удалось запустить «git status» в подмодуле «%s»" -#: submodule.c:1802 +#: submodule.c:1813 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "не удалось запустить «git status» в подмодуле «%s»" -#: submodule.c:1907 +#: submodule.c:1918 #, c-format msgid "submodule '%s' has dirty index" msgstr "подмодуль «%s» имеет изменённый индекс" -#: submodule.c:2007 +#: submodule.c:2059 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -4105,18 +4109,18 @@ "relocate_gitdir для подмодуля «%s» с указанием более одного рабочего дерева " "не поддерживается" -#: submodule.c:2019 submodule.c:2074 +#: submodule.c:2071 submodule.c:2130 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "не удалось запросить имя подмодуля «%s»" -#: rerere.c:881 submodule.c:2023 builtin/log.c:1790 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1891 +#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 #, c-format msgid "could not create directory '%s'" msgstr "не удалось создать каталог «%s»" -#: submodule.c:2026 +#: submodule.c:2082 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -4127,12 +4131,12 @@ "«%s» в\n" "«%s»\n" -#: submodule.c:2109 +#: submodule.c:1855 submodule.c:2165 #, c-format msgid "could not recurse into submodule '%s'" msgstr "не удалось рекурсивно зайти в подмодуль «%s»" -#: submodule.c:2153 +#: submodule.c:2210 msgid "could not start ls-files in .." msgstr "не удалось выполнить stat ls-files в .." @@ -4140,16 +4144,16 @@ msgid "BUG: returned path string doesn't match cwd?" msgstr "ОШИБКА: возвращенная строка не соответсвует cwd?" -#: submodule.c:2192 +#: submodule.c:2250 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree вернул неожиданный код %d" -#: submodule-config.c:303 +#: submodule-config.c:304 msgid "negative values not allowed for submodule.fetchjobs" msgstr "нельзя использовать отрицательные значения для submodule.fetchjobs" -#: submodule-config.c:490 +#: submodule-config.c:499 #, c-format msgid "invalid value for %s" msgstr "неправильное значение %s" @@ -4165,7 +4169,7 @@ msgid "unknown value '%s' for key '%s'" msgstr "неизвестное значение «%s» для ключа «%s»" -#: trailer.c:539 trailer.c:544 builtin/remote.c:295 +#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 #, c-format msgid "more than one %s" msgstr "больше одного %s" @@ -4218,7 +4222,7 @@ msgid "transport: invalid depth option '%s'" msgstr "транспорт: неправильный параметр глубины «%s»" -#: transport.c:1044 +#: transport.c:1052 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -4227,7 +4231,7 @@ "Подмодули по указанным путям содержат изменения, которые не найдены ни на " "одном из внешних репозиториев:\n" -#: transport.c:1048 +#: transport.c:1056 #, c-format msgid "" "\n" @@ -4254,32 +4258,32 @@ "для их отправки на внешний репозиторий.\n" "\n" -#: transport.c:1056 +#: transport.c:1064 msgid "Aborting." msgstr "Прерываю." -#: transport-helper.c:1079 +#: transport-helper.c:1025 #, c-format msgid "Could not read ref %s" msgstr "Не удалось прочитать ссылку %s" -#: tree-walk.c:33 +#: tree-walk.c:32 msgid "too-short tree object" msgstr "слишком короткий объект дерева" -#: tree-walk.c:39 +#: tree-walk.c:38 msgid "malformed mode in tree entry" msgstr "неправильный режим в записи дерева" -#: tree-walk.c:43 +#: tree-walk.c:42 msgid "empty filename in tree entry" msgstr "пустое имя файла в записи дерева" -#: tree-walk.c:118 +#: tree-walk.c:117 msgid "too-short tree file" msgstr "слишком короткий файл дерева" -#: unpack-trees.c:110 +#: unpack-trees.c:113 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -4289,7 +4293,7 @@ "переключении на состояние:\n" "%%sСделайте коммит или спрячьте ваши изменения перед переключением веток." -#: unpack-trees.c:112 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -4299,7 +4303,7 @@ "переключении на состояние:\n" "%%s" -#: unpack-trees.c:115 +#: unpack-trees.c:118 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4308,7 +4312,7 @@ "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n" "%%sСделайте коммит или спрячьте ваши изменения перед слиянием веток." -#: unpack-trees.c:117 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -4317,7 +4321,7 @@ "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n" "%%s" -#: unpack-trees.c:120 +#: unpack-trees.c:123 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4326,7 +4330,7 @@ "Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n" "%%sСделайте коммит или спрячьте ваши изменения перед %s." -#: unpack-trees.c:122 +#: unpack-trees.c:125 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -4335,7 +4339,7 @@ "Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n" "%%s" -#: unpack-trees.c:127 +#: unpack-trees.c:130 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -4345,7 +4349,7 @@ "них:\n" "%s" -#: unpack-trees.c:131 +#: unpack-trees.c:134 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4355,7 +4359,7 @@ "переключении на состояние:\n" "%%sПереместите эти файлы или удалите их перед переключением веток." -#: unpack-trees.c:133 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -4365,7 +4369,7 @@ "переключении на состояние:\n" "%%s" -#: unpack-trees.c:136 +#: unpack-trees.c:139 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4375,7 +4379,7 @@ "слиянии:\n" "%%sПереместите эти файлы или удалите их перед переключением веток." -#: unpack-trees.c:138 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -4385,7 +4389,7 @@ "слиянии:\n" "%%s" -#: unpack-trees.c:141 +#: unpack-trees.c:144 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4394,7 +4398,7 @@ "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n" "%%sПереместите эти файлы или удалите их перед %s." -#: unpack-trees.c:143 +#: unpack-trees.c:146 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -4403,7 +4407,7 @@ "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n" "%%s" -#: unpack-trees.c:149 +#: unpack-trees.c:152 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4414,7 +4418,7 @@ "переключении на состояние:\n" "%%sПереместите эти файлы или удалите их перед переключением веток." -#: unpack-trees.c:151 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -4425,7 +4429,7 @@ "переключении на состояние:\n" "%%s" -#: unpack-trees.c:154 +#: unpack-trees.c:157 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4435,7 +4439,7 @@ "слиянии:\n" "%%sПереместите эти файлы или удалите их перед переключением веток." -#: unpack-trees.c:156 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -4445,7 +4449,7 @@ "слиянии:\n" "%%s" -#: unpack-trees.c:159 +#: unpack-trees.c:162 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4455,7 +4459,7 @@ "%s:\n" "%%sПереместите эти файлы или удалите их перед %s." -#: unpack-trees.c:161 +#: unpack-trees.c:164 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -4465,7 +4469,7 @@ "%s:\n" "%%s" -#: unpack-trees.c:169 +#: unpack-trees.c:172 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" @@ -4503,7 +4507,7 @@ "состояния:\n" "%s" -#: unpack-trees.c:178 +#: unpack-trees.c:175 #, c-format msgid "" "Cannot update submodule:\n" @@ -4512,12 +4516,12 @@ "Не удолось обновить подмодуль:\n" "%s" -#: unpack-trees.c:255 +#: unpack-trees.c:262 #, c-format msgid "Aborting\n" msgstr "Прерываю\n" -#: unpack-trees.c:333 +#: unpack-trees.c:336 msgid "Checking out files" msgstr "Распаковка файлов" @@ -4550,32 +4554,32 @@ msgid "invalid '..' path segment" msgstr "неправильная часть пути «..»" -#: worktree.c:258 builtin/am.c:2084 +#: worktree.c:262 builtin/am.c:2098 #, c-format msgid "failed to read '%s'" msgstr "не удалось прочитать «%s»" -#: worktree.c:304 +#: worktree.c:309 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" -#: worktree.c:315 +#: worktree.c:320 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" -#: worktree.c:327 +#: worktree.c:332 #, c-format msgid "'%s' does not exist" msgstr "«%s» не существует" -#: worktree.c:333 +#: worktree.c:338 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "" -#: worktree.c:341 +#: worktree.c:347 #, c-format msgid "'%s' does not point back to '%s'" msgstr "" @@ -4585,8 +4589,8 @@ msgid "could not open '%s' for reading and writing" msgstr "не удалось открыть «%s» для чтения и записи" -#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705 -#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046 +#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896 #, c-format msgid "could not open '%s' for reading" msgstr "не удалось открыть «%s» для чтения" @@ -4604,7 +4608,7 @@ msgid "Unmerged paths:" msgstr "Не слитые пути:" -#: wt-status.c:178 wt-status.c:205 +#: wt-status.c:181 wt-status.c:208 #, c-format msgid " (use \"git reset %s ...\" to unstage)" msgstr " (используйте «git reset %s <файл>…», чтобы убрать из индекса)" @@ -4629,11 +4633,11 @@ msgstr "" " (используйте «git rm <файл>…», чтобы пометить разрешение конфликта)" -#: wt-status.c:211 wt-status.c:1074 +#: wt-status.c:211 wt-status.c:1072 msgid "Changes to be committed:" msgstr "Изменения, которые будут включены в коммит:" -#: wt-status.c:234 wt-status.c:1083 +#: wt-status.c:234 wt-status.c:1081 msgid "Changes not staged for commit:" msgstr "Изменения, которые не в индексе для коммита:" @@ -4647,7 +4651,7 @@ " (используйте «git add/rm <файл>…», чтобы добавить или удалить файл из " "индекса)" -#: wt-status.c:224 +#: wt-status.c:227 msgid "" " (use \"git checkout -- ...\" to discard changes in working directory)" msgstr "" @@ -4739,7 +4743,7 @@ msgid "untracked content, " msgstr "неотслеживаемое содержимое, " -#: wt-status.c:906 +#: wt-status.c:904 #, c-format msgid "Your stash currently has %d entry" msgid_plural "Your stash currently has %d entries" @@ -4747,15 +4751,15 @@ msgstr[1] "У вас сейчас спрятаны %d записи" msgstr[2] "У вас сейчас спрятано %d записей" -#: wt-status.c:938 +#: wt-status.c:936 msgid "Submodules changed but not updated:" msgstr "Измененные, но не обновленные подмодули:" -#: wt-status.c:940 +#: wt-status.c:938 msgid "Submodule changes to be committed:" msgstr "Изменения в подмодулях, которые будут закоммичены:" -#: wt-status.c:1022 +#: wt-status.c:1020 msgid "" "Do not modify or remove the line above.\n" "Everything below it will be ignored." @@ -4763,57 +4767,57 @@ "Не изменяйте или удаляйте строку выше этой.\n" "Всё, что ниже — будет проигнорировано." -#: wt-status.c:1144 +#: wt-status.c:1142 msgid "You have unmerged paths." msgstr "У вас есть не слитые пути." -#: wt-status.c:1147 +#: wt-status.c:1145 msgid " (fix conflicts and run \"git commit\")" msgstr " (разрешите конфликты, затем запустите «git commit»)" -#: wt-status.c:1149 +#: wt-status.c:1147 msgid " (use \"git merge --abort\" to abort the merge)" msgstr "" " (используйте «git merge --abort», чтобы остановить операцию слияния)" -#: wt-status.c:1153 +#: wt-status.c:1151 msgid "All conflicts fixed but you are still merging." msgstr "Все конфликты исправлены, но вы все еще в процессе слияния." -#: wt-status.c:1156 +#: wt-status.c:1154 msgid " (use \"git commit\" to conclude merge)" msgstr " (используйте «git commit», чтобы завершить слияние)" -#: wt-status.c:1165 +#: wt-status.c:1163 msgid "You are in the middle of an am session." msgstr "Вы в процессе сессии am." -#: wt-status.c:1168 +#: wt-status.c:1166 msgid "The current patch is empty." msgstr "Текущий патч пустой." -#: wt-status.c:1172 +#: wt-status.c:1170 msgid " (fix conflicts and then run \"git am --continue\")" msgstr " (разрешите конфликты, затем запустите «git am --continue»)" -#: wt-status.c:1174 +#: wt-status.c:1172 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (используйте «git am --skip», чтобы пропустить этот патч)" -#: wt-status.c:1176 +#: wt-status.c:1174 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" " (используйте «git am --abort», чтобы восстановить оригинальную ветку)" -#: wt-status.c:1309 +#: wt-status.c:1307 msgid "git-rebase-todo is missing." msgstr "git-rebase-todo отсутствует." -#: wt-status.c:1311 +#: wt-status.c:1309 msgid "No commands done." msgstr "Команды не выполнены." -#: wt-status.c:1314 +#: wt-status.c:1312 #, c-format msgid "Last command done (%d command done):" msgid_plural "Last commands done (%d commands done):" @@ -4821,16 +4825,16 @@ msgstr[1] "Последняя команда выполнена (%d команды выполнено):" msgstr[2] "Последняя команда выполнена (%d команд выполнено):" -#: wt-status.c:1325 +#: wt-status.c:1323 #, c-format msgid " (see more in file %s)" msgstr " (смотрите дополнительно в файле %s)" -#: wt-status.c:1330 +#: wt-status.c:1328 msgid "No commands remaining." msgstr "Команд больше не осталось." -#: wt-status.c:1333 +#: wt-status.c:1331 #, c-format msgid "Next command to do (%d remaining command):" msgid_plural "Next commands to do (%d remaining commands):" @@ -4838,168 +4842,168 @@ msgstr[1] "Следующая команда для выполнения (%d команды осталось):" msgstr[2] "Следующая команда для выполнения (%d команд осталось):" -#: wt-status.c:1341 +#: wt-status.c:1339 msgid " (use \"git rebase --edit-todo\" to view and edit)" msgstr "" " (используйте «git rebase --edit-todo», чтобы просмотреть и изменить)" -#: wt-status.c:1353 +#: wt-status.c:1351 #, c-format msgid "You are currently rebasing branch '%s' on '%s'." msgstr "Вы сейчас перемещаете ветку «%s» над «%s»." -#: wt-status.c:1358 +#: wt-status.c:1356 msgid "You are currently rebasing." msgstr "Вы сейчас перемещаете ветку." -#: wt-status.c:1371 +#: wt-status.c:1369 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (разрешите конфликты, затем запустите «git rebase --continue»)" -#: wt-status.c:1373 +#: wt-status.c:1371 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (используйте «git rebase --skip», чтобы пропустить этот патч)" -#: wt-status.c:1375 +#: wt-status.c:1373 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" " (используйте «git rebase --abort», чтобы перейти на оригинальную ветку)" -#: wt-status.c:1382 +#: wt-status.c:1380 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (все конфликты разрешены: запустите «git rebase --continue»)" -#: wt-status.c:1386 +#: wt-status.c:1384 #, c-format msgid "" "You are currently splitting a commit while rebasing branch '%s' on '%s'." msgstr "Вы сейчас разделяете коммит при перемещении ветки «%s» над «%s»." -#: wt-status.c:1391 +#: wt-status.c:1389 msgid "You are currently splitting a commit during a rebase." msgstr "Вы сейчас разделяете коммит при перемещении ветки." -#: wt-status.c:1394 +#: wt-status.c:1392 msgid "" " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Как только ваш рабочий каталог будет чистый, запустите «git rebase --" "continue»)" -#: wt-status.c:1398 +#: wt-status.c:1396 #, c-format msgid "" "You are currently editing a commit while rebasing branch '%s' on '%s'." msgstr "Вы сейчас редактируете коммит при перемещении ветки «%s» над «%s»." -#: wt-status.c:1403 +#: wt-status.c:1401 msgid "You are currently editing a commit during a rebase." msgstr "Вы сейчас редактируете коммит при перемещении ветки." -#: wt-status.c:1406 +#: wt-status.c:1404 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " (используйте «git commit --amend», чтобы исправить текущий коммит)" -#: wt-status.c:1408 +#: wt-status.c:1406 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (используйте «git rebase --continue», когда будете довольны изменениями)" -#: wt-status.c:1422 +#: wt-status.c:1420 #, c-format msgid "You are currently cherry-picking commit %s." msgstr "Вы копируете коммит %s." -#: wt-status.c:1429 +#: wt-status.c:1427 msgid " (fix conflicts and run \"git cherry-pick --continue\")" msgstr "" " (разрешите конфликты, затем запустите «git cherry-pick --continue»)" -#: wt-status.c:1435 +#: wt-status.c:1433 msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" msgstr " (все конфликты разрешены: запустите «git cherry-pick --continue»)" -#: wt-status.c:1439 +#: wt-status.c:1437 msgid "" " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (используйте «git cherry-pick --abort», чтобы отменить копирования коммита)" -#: wt-status.c:1452 +#: wt-status.c:1450 #, c-format msgid "You are currently reverting commit %s." msgstr "Вы сейчас обращаете изменения коммита %s." -#: wt-status.c:1458 +#: wt-status.c:1456 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (разрешите конфликты, затем запустите «git revert --continue»)" -#: wt-status.c:1464 +#: wt-status.c:1462 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr " (все конфликты разрешены: запустите «git revert --continue»)" -#: wt-status.c:1468 +#: wt-status.c:1466 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" " (используйте «git revert --abort», чтобы отменить операцию обращения " "изменений коммита)" -#: wt-status.c:1478 +#: wt-status.c:1476 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Вы сейчас в процессе двоичного поиска, начатого с ветки «%s»." -#: wt-status.c:1482 +#: wt-status.c:1480 msgid "You are currently bisecting." msgstr "Вы сейчас в процессе двоичного поиска." -#: wt-status.c:1485 +#: wt-status.c:1483 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (используйте «git bisect reset», чтобы вернуться на исходную ветку)" -#: wt-status.c:1694 +#: wt-status.c:1692 msgid "On branch " msgstr "На ветке " -#: wt-status.c:1701 +#: wt-status.c:1699 msgid "interactive rebase in progress; onto " msgstr "интерактивное перемещение в процессе; над " -#: wt-status.c:1703 +#: wt-status.c:1701 msgid "rebase in progress; onto " msgstr "перемещение в процессе; над " -#: wt-status.h:67 +#: wt-status.h:80 msgid "HEAD detached at " msgstr "HEAD отделён на " -#: wt-status.h:68 +#: wt-status.h:81 msgid "HEAD detached from " msgstr "HEAD отделён начиная с " -#: wt-status.c:1713 +#: wt-status.c:1711 msgid "Not currently on any branch." msgstr "Сейчас ни на одной из веток" -#: wt-status.c:1730 +#: wt-status.c:1728 msgid "Initial commit" msgstr "Начальный коммит" -#: wt-status.c:1731 +#: wt-status.c:1729 msgid "No commits yet" msgstr "Еще нет коммитов" -#: wt-status.c:1745 +#: wt-status.c:1743 msgid "Untracked files" msgstr "Неотслеживаемые файлы" -#: wt-status.c:1747 +#: wt-status.c:1745 msgid "Ignored files" msgstr "Игнорируемые файлы" -#: wt-status.c:1751 +#: wt-status.c:1749 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -5010,20 +5014,20 @@ "возможно может ускорить это, но будьте внимательны, и не забудьте добавить " "новые файлы вручную (смотрите «git help status» для подробностей)." -#: wt-status.c:1757 +#: wt-status.c:1755 #, c-format msgid "Untracked files not listed%s" msgstr "Неотслеживаемые файлы не показаны%s" -#: wt-status.c:1759 +#: wt-status.c:1757 msgid " (use -u option to show untracked files)" msgstr " (используйте опцию «-u», чтобы показать неотслеживаемые файлы)" -#: wt-status.c:1765 +#: wt-status.c:1763 msgid "No changes" msgstr "Нет изменений" -#: wt-status.c:1770 +#: wt-status.c:1768 #, c-format msgid "" "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" @@ -5031,12 +5035,12 @@ "нет изменений добавленных для коммита\n" "(используйте «git add» и/или «git commit -a»)\n" -#: wt-status.c:1773 +#: wt-status.c:1771 #, c-format msgid "no changes added to commit\n" msgstr "нет изменений добавленных для коммита\n" -#: wt-status.c:1776 +#: wt-status.c:1774 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -5045,204 +5049,204 @@ "ничего не добавлено в коммит, но есть неотслеживаемые файлы (используйте " "«git add», чтобы отслеживать их)\n" -#: wt-status.c:1779 +#: wt-status.c:1777 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы\n" -#: wt-status.c:1782 +#: wt-status.c:1780 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "нечего коммитить (создайте/скопируйте файлы, затем запустите «git add», " "чтобы отслеживать их)\n" -#: wt-status.c:1785 wt-status.c:1790 +#: wt-status.c:1783 wt-status.c:1788 #, c-format msgid "nothing to commit\n" msgstr "нечего коммитить\n" -#: wt-status.c:1788 +#: wt-status.c:1786 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "нечего коммитить (используйте опцию «-u», чтобы показать неотслеживаемые " "файлы)\n" -#: wt-status.c:1792 +#: wt-status.c:1790 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "нечего коммитить, нет изменений в рабочем каталоге\n" -#: wt-status.c:1905 +#: wt-status.c:1903 msgid "No commits yet on " msgstr "Еще нет коммитов в " -#: wt-status.c:1909 +#: wt-status.c:1907 msgid "HEAD (no branch)" msgstr "HEAD (нет ветки)" -#: wt-status.c:1940 +#: wt-status.c:1938 msgid "different" msgstr "отличается" -#: wt-status.c:1942 wt-status.c:1950 +#: wt-status.c:1940 wt-status.c:1948 msgid "behind " msgstr "позади " -#: wt-status.c:1945 wt-status.c:1948 +#: wt-status.c:1943 wt-status.c:1946 msgid "ahead " msgstr "впереди " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2470 +#: wt-status.c:2468 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "не удалось выполнить %s: У вас есть непроиндексированные изменения." -#: wt-status.c:2476 +#: wt-status.c:2474 msgid "additionally, your index contains uncommitted changes." msgstr "к тому же, в вашем индексе есть незакоммиченные изменения." -#: wt-status.c:2478 +#: wt-status.c:2476 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" "не удалось выполнить %s: В вашем индексе есть незакоммиченные изменения." -#: compat/precompose_utf8.c:58 builtin/clone.c:452 +#: compat/precompose_utf8.c:58 builtin/clone.c:456 #, c-format msgid "failed to unlink '%s'" msgstr "сбой отсоединения «%s»" -#: builtin/add.c:25 +#: builtin/add.c:26 msgid "git add [] [--] ..." msgstr "git add [<опции>] [--] <спецификатор-пути>…" -#: builtin/add.c:84 +#: builtin/add.c:88 #, c-format msgid "unexpected diff status %c" msgstr "неожиданный статус утилиты сравнения %c" -#: builtin/add.c:89 builtin/commit.c:288 +#: builtin/add.c:93 builtin/commit.c:285 msgid "updating files failed" msgstr "сбой при обновлении файлов" -#: builtin/add.c:99 +#: builtin/add.c:103 #, c-format msgid "remove '%s'\n" msgstr "удалить «%s»\n" -#: builtin/add.c:174 +#: builtin/add.c:178 msgid "Unstaged changes after refreshing the index:" msgstr "Непроиндексированные изменения после обновления индекса:" -#: builtin/add.c:234 builtin/rev-parse.c:897 +#: builtin/add.c:266 builtin/rev-parse.c:904 msgid "Could not read the index" msgstr "Не удалось прочитать индекс" -#: builtin/add.c:245 +#: builtin/add.c:277 #, c-format msgid "Could not open '%s' for writing." msgstr "Не удалось открыть «%s» для записи." -#: builtin/add.c:249 +#: builtin/add.c:281 msgid "Could not write patch" msgstr "Не удалось записать патч" -#: builtin/add.c:252 +#: builtin/add.c:284 msgid "editing patch failed" msgstr "сбой при редактировании патча" -#: builtin/add.c:255 +#: builtin/add.c:287 #, c-format msgid "Could not stat '%s'" msgstr "Не удалось выполнить stat для «%s»" -#: builtin/add.c:257 +#: builtin/add.c:289 msgid "Empty patch. Aborted." msgstr "Пустой патч. Операция прервана." -#: builtin/add.c:262 +#: builtin/add.c:294 #, c-format msgid "Could not apply '%s'" msgstr "Не удалось применить «%s»" -#: builtin/add.c:270 +#: builtin/add.c:302 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Следующие пути игнорируются одним из ваших файлов .gitignore:\n" -#: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547 -#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 +#: builtin/add.c:322 builtin/clean.c:904 builtin/fetch.c:164 builtin/mv.c:124 +#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:548 +#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 msgid "dry run" msgstr "пробный запуск" -#: builtin/add.c:293 +#: builtin/add.c:325 msgid "interactive picking" msgstr "интерактивный выбор" -#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 +#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308 msgid "select hunks interactively" msgstr "интерактивный выбор блоков" -#: builtin/add.c:295 +#: builtin/add.c:327 msgid "edit current diff and apply" msgstr "отредактировать текущий файл списка изменений и применить его" -#: builtin/add.c:296 +#: builtin/add.c:328 msgid "allow adding otherwise ignored files" msgstr "разрешить добавление игнорируемых иначе файлов" -#: builtin/add.c:297 +#: builtin/add.c:329 msgid "update tracked files" msgstr "обновить отслеживаемые файлы" -#: builtin/add.c:298 +#: builtin/add.c:330 msgid "renormalize EOL of tracked files (implies -u)" msgstr "" "перенормализировать концы строк (EOL) отслеживаемых файлов (подразумевает -u)" -#: builtin/add.c:299 +#: builtin/add.c:331 msgid "record only the fact that the path will be added later" msgstr "записать только факт, что путь будет добавлен позже" -#: builtin/add.c:300 +#: builtin/add.c:332 msgid "add changes from all tracked and untracked files" msgstr "добавить изменения из всех отслеживаемых и неотслеживаемых файлов" -#: builtin/add.c:303 +#: builtin/add.c:335 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "" "игнорировать пути удаленные из рабочего каталога (тоже, что и --no-all)" -#: builtin/add.c:305 +#: builtin/add.c:337 msgid "don't add, only refresh the index" msgstr "не добавлять, только обновить индекс" -#: builtin/add.c:306 +#: builtin/add.c:338 msgid "just skip files which cannot be added because of errors" msgstr "пропускать файлы, которые не могут быть добавлены из-за ошибок" -#: builtin/add.c:307 +#: builtin/add.c:339 msgid "check if - even missing - files are ignored in dry run" msgstr "" "удостовериться, что даже недостающие файлы будут проигнорированы при " "пробном запуске" -#: builtin/add.c:309 builtin/update-index.c:964 +#: builtin/update-index.c:946 msgid "(+/-)x" msgstr "(+/-)x" -#: builtin/add.c:309 builtin/update-index.c:1002 +#: builtin/add.c:341 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "переопределить бит выполнения на указанных файлах" -#: builtin/add.c:311 +#: builtin/add.c:343 msgid "warn when adding an embedded repository" msgstr "предупреждать при добавлении встроенного git репозитория" -#: builtin/add.c:326 +#: builtin/add.c:363 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -5273,155 +5277,156 @@ "\n" "Для дополнительной информации смотрите «git help submodule»." -#: builtin/add.c:354 +#: builtin/add.c:391 #, c-format msgid "adding embedded git repository: %s" msgstr "добавление встроенного git репозитория: %s" -#: builtin/add.c:372 +#: builtin/add.c:393 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Используйте -f, если вы действительно хотите добавить их.\n" -#: builtin/add.c:379 +#: builtin/add.c:419 msgid "adding files failed" msgstr "ошибка при добавлении файлов" -#: builtin/add.c:419 +#: builtin/add.c:476 msgid "-A and -u are mutually incompatible" msgstr "-A и -u нельзя использовать одновременно" -#: builtin/add.c:426 +#: builtin/add.c:479 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" "Опция --ignore-missing может использоваться только вместе с --dry-run" -#: builtin/add.c:430 +#: builtin/add.c:483 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "параметр --chmod «%s» должен быть -x или +x" -#: builtin/add.c:445 +#: builtin/add.c:512 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Ничего не указано, ничего не добавлено.\n" -#: builtin/add.c:446 +#: builtin/add.c:483 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Возможно, вы имели в виду «git add .»?\n" -#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468 -#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347 -#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 -#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 +#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 +#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961 +#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507 +#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "файл индекса поврежден" -#: builtin/am.c:347 +#: builtin/am.c:352 msgid "could not parse author script" msgstr "не удалось разобрать сценарий авторства" -#: builtin/am.c:431 +#: builtin/am.c:436 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "«%s» был удален перехватчиком applypatch-msg" -#: builtin/am.c:473 +#: builtin/am.c:478 #, c-format msgid "Malformed input line: '%s'." msgstr "Неправильная строка ввода: «%s»." -#: builtin/am.c:511 +#: builtin/am.c:516 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Не удалось скопировать заметку из «%s» в «%s»" -#: builtin/am.c:537 +#: builtin/am.c:542 msgid "fseek failed" msgstr "сбой при выполнении fseek" -#: builtin/am.c:725 +#: builtin/am.c:730 #, c-format msgid "could not parse patch '%s'" msgstr "не удалось разобрать патч «%s»" -#: builtin/am.c:790 +#: builtin/am.c:795 msgid "Only one StGIT patch series can be applied at once" msgstr "Только серия патчей StGIT может быть применена за раз" -#: builtin/am.c:838 +#: builtin/am.c:843 msgid "invalid timestamp" msgstr "недопустимая метка даты/времени" -#: builtin/am.c:843 builtin/am.c:855 +#: builtin/am.c:848 builtin/am.c:860 msgid "invalid Date line" msgstr "недопустимая строка даты" -#: builtin/am.c:850 +#: builtin/am.c:855 msgid "invalid timezone offset" msgstr "недопустимое смещение часового пояса" -#: builtin/am.c:943 +#: builtin/am.c:948 msgid "Patch format detection failed." msgstr "Сбой определения формата патча." -#: builtin/am.c:948 builtin/clone.c:406 +#: builtin/am.c:953 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "не удалось создать каталог «%s»" -#: builtin/am.c:953 +#: builtin/am.c:958 msgid "Failed to split patches." msgstr "Не удалось разделить патчи на части." -#: builtin/am.c:1695 builtin/commit.c:374 +#: builtin/am.c:1699 builtin/commit.c:395 msgid "unable to write index file" msgstr "не удалось записать индекс" -#: builtin/am.c:1084 +#: builtin/am.c:1089 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Когда вы устраните эту проблему, запустите «%s --continue»." -#: builtin/am.c:1085 +#: builtin/am.c:1090 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Если вы хотите пропустить этот патч, то запустите «%s --skip»." -#: builtin/am.c:1086 +#: builtin/am.c:1091 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Чтобы вернуться на предыдущую ветку и остановить применение изменений, " "запустите «%s --abort»." -#: builtin/am.c:1197 +#: builtin/am.c:1202 msgid "Patch is empty." msgstr "Патч пустой." -#: builtin/am.c:1265 +#: builtin/am.c:1270 #, c-format msgid "invalid ident line: %.*s" msgstr "неправильная строка идентификации: %.*s" -#: commit-graph.c:855 builtin/am.c:1287 +#: commit-graph.c:948 builtin/am.c:1292 #, c-format msgid "unable to parse commit %s" msgstr "не удалось разобрать коммит %s" -#: builtin/am.c:1484 +#: builtin/am.c:1489 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "В репозитории отсутствуют двоичные объекты, необходимые для отката к " "трехходовому слиянию." -#: builtin/am.c:1486 +#: builtin/am.c:1491 msgid "Using index info to reconstruct a base tree..." msgstr "Использую индекс для реконструкции базового дерева…" -#: builtin/am.c:1505 +#: builtin/am.c:1510 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -5430,32 +5435,32 @@ "Он не накладывается без ошибок на двоичные объекты, записанные в его " "заголовке." -#: builtin/am.c:1511 +#: builtin/am.c:1516 msgid "Falling back to patching base and 3-way merge..." msgstr "" "Откат к применению изменений к базовому коммиту с помощью трехходового " "слияния…" -#: builtin/am.c:1537 +#: builtin/am.c:1542 msgid "Failed to merge in the changes." msgstr "Не удалось слить изменения." -#: builtin/am.c:1569 +#: builtin/am.c:1574 msgid "applying to an empty history" msgstr "применение к пустой истории" -#: builtin/am.c:1616 builtin/am.c:1620 +#: builtin/am.c:1621 builtin/am.c:1625 #, c-format msgid "cannot resume: %s does not exist." msgstr "нельзя продолжнить: %s не существует" -#: builtin/am.c:1703 +#: builtin/am.c:1659 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "не удалось использовать интерактивное поведение, без stdin подключенного к " "терминалу." -#: builtin/am.c:1638 +#: builtin/am.c:1643 msgid "Commit Body is:" msgstr "Тело коммита:" @@ -5463,28 +5468,28 @@ #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1648 +#: builtin/am.c:1653 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Применить? [y] - да/[n] - нет/[e] - редактировать/[v] - просмотреть патч/[a] " "- применить всё: " -#: builtin/am.c:1699 +#: builtin/am.c:1703 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Индекс изменён: нельзя применять патчи (изменено: %s)" -#: builtin/am.c:1739 builtin/am.c:1807 +#: builtin/am.c:1743 builtin/am.c:1811 #, c-format msgid "Applying: %.*s" msgstr "Применение: %.*s" -#: builtin/am.c:1756 +#: builtin/am.c:1760 msgid "No changes -- Patch already applied." msgstr "Нет изменений — Патч уже применен." -#: builtin/am.c:1762 +#: builtin/am.c:1766 #, c-format msgid "Patch failed at %s %.*s" msgstr "Ошибка применения изменений на %s %.*s" @@ -5493,7 +5498,7 @@ msgid "Use 'git am --show-current-patch' to see the failed patch" msgstr "" -#: builtin/am.c:1810 +#: builtin/am.c:1814 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -5503,7 +5508,7 @@ "Если ничего не осталось для индексации, то, скорее всего, что-то другое уже " "сделало те же изменения; возможно, вам следует пропустить этот патч." -#: builtin/am.c:1817 +#: builtin/am.c:1821 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -5516,17 +5521,17 @@ "Вы можете запустить «git rm» с именем файла, чтобы пометить его как «удалено " "ими»." -#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329 -#: builtin/reset.c:337 +#: builtin/am.c:1928 builtin/am.c:1932 builtin/am.c:1944 builtin/reset.c:347 +#: builtin/reset.c:355 #, c-format msgid "Could not parse object '%s'." msgstr "Не удалось разобрать объект «%s»." -#: builtin/am.c:1976 +#: builtin/am.c:1980 msgid "failed to clean index" msgstr "не удалось очистить индекс" -#: builtin/am.c:2020 +#: builtin/am.c:2024 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -5534,116 +5539,118 @@ "Похоже, что вы переместили HEAD с момента последней ошибки выполнения «am».\n" "Перемотка на ORIG_HEAD не выполняется" -#: builtin/am.c:2117 +#: builtin/am.c:2131 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Неправильное значение для --patch-format: %s" -#: builtin/am.c:2153 +#: builtin/am.c:2206 msgid "git am [] [( | )...]" msgstr "git am [<опции>] [( | )…]" -#: builtin/am.c:2154 +#: builtin/am.c:2207 msgid "git am [] (--continue | --skip | --abort)" msgstr "git am [<опции>] (--continue | --skip | --abort)" -#: builtin/am.c:2160 +#: builtin/am.c:2213 msgid "run interactively" msgstr "запустить в интерактивном режиме" -#: builtin/am.c:2162 +#: builtin/am.c:2215 msgid "historical option -- no-op" msgstr "историческая опция — ничего не делает" -#: builtin/am.c:2164 +#: builtin/am.c:2217 msgid "allow fall back on 3way merging if needed" msgstr "разрешить откатиться к трехходовому слиянию, если нужно" -#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:297 builtin/stash.c:812 +#: builtin/am.c:2218 builtin/init-db.c:541 builtin/prune-packed.c:16 +#: builtin/repack.c:306 builtin/stash.c:816 msgid "be quiet" msgstr "тихий режим" -#: builtin/am.c:2167 +#: builtin/am.c:2220 msgid "add a Signed-off-by line to the commit message" msgstr "добавить строку Signed-off-by к сообщению коммита" -#: builtin/am.c:2170 +#: builtin/am.c:2223 msgid "recode into utf8 (default)" msgstr "перекодировать в utf8 (по умолчанию)" -#: builtin/am.c:2172 +#: builtin/am.c:2225 msgid "pass -k flag to git-mailinfo" msgstr "передать флаг -k в git-mailinfo" -#: builtin/am.c:2174 +#: builtin/am.c:2227 msgid "pass -b flag to git-mailinfo" msgstr "передать флаг -b в git-mailinfo" -#: builtin/am.c:2176 +#: builtin/am.c:2229 msgid "pass -m flag to git-mailinfo" msgstr "передать флаг -m в git-mailinfo" -#: builtin/am.c:2178 +#: builtin/am.c:2231 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "передать флаг --keep-cr в git-mailsplit для формата mbox" -#: builtin/am.c:2181 +#: builtin/am.c:2234 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "не передавать --keep-cr флаг в git-mailsplit вне зависимости от am.keepcr" -#: builtin/am.c:2184 +#: builtin/am.c:2237 msgid "strip everything before a scissors line" msgstr "обрезать все до строки обрезки" -#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195 -#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207 -#: builtin/am.c:2213 +#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248 +#: builtin/am.c:2251 builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260 +#: builtin/am.c:2266 msgid "pass it through git-apply" msgstr "передать его в git-apply" -#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249 -#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442 -#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314 -#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:150 parse-options.h:171 parse-options.h:312 +#: builtin/am.c:2256 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17 +#: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252 +#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217 +#: builtin/rebase.c:1329 builtin/repack.c:317 builtin/repack.c:321 +#: builtin/repack.c:323 builtin/show-branch.c:650 builtin/show-ref.c:172 +#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175 +#: parse-options.h:316 msgid "n" msgstr "n" -#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38 +#: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38 +#: bugreport.c:131 msgid "format" msgstr "формат" -#: builtin/am.c:2210 +#: builtin/am.c:2263 msgid "format the patch(es) are in" msgstr "формат, в котором находятся патчи" -#: builtin/am.c:2216 +#: builtin/am.c:2269 msgid "override error message when patch failure occurs" msgstr "" "переопределить сообщение об ошибке, если не удалось наложить изменения" -#: builtin/am.c:2218 +#: builtin/am.c:2271 msgid "continue applying patches after resolving a conflict" msgstr "продолжить применение изменений после разрешения конфиликта" -#: builtin/am.c:2221 +#: builtin/am.c:2274 msgid "synonyms for --continue" msgstr "синоним для --continue" -#: builtin/am.c:2224 +#: builtin/am.c:2277 msgid "skip the current patch" msgstr "пропустить текущий патч" -#: builtin/am.c:2227 +#: builtin/am.c:2280 msgid "restore the original branch and abort the patching operation." msgstr "" "восстановить оригинальную ветку и отменить операцию применения изменений." -#: builtin/am.c:2230 +#: builtin/am.c:2283 msgid "abort the patching operation but keep HEAD where it is." msgstr "" @@ -5651,29 +5658,29 @@ msgid "show the patch being applied." msgstr "" -#: builtin/am.c:2237 +#: builtin/am.c:2292 msgid "lie about committer date" msgstr "соврать о дате коммитера" -#: builtin/am.c:2239 +#: builtin/am.c:2294 msgid "use current timestamp for author date" msgstr "использовать текущее время как время авторства" -#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511 -#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490 -#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2296 builtin/commit-tree.c:120 builtin/commit.c:1517 +#: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524 +#: builtin/rebase.c:1380 builtin/revert.c:117 builtin/tag.c:419 msgid "key-id" msgstr "key-id" -#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484 +#: builtin/am.c:2297 builtin/rebase.c:525 builtin/rebase.c:1381 msgid "GPG-sign commits" msgstr "подписать коммиты с помощью GPG" -#: builtin/am.c:2245 +#: builtin/am.c:2300 msgid "(internal use for git-rebase)" msgstr "(внутреннее использование для git-rebase)" -#: builtin/am.c:2263 +#: builtin/am.c:2318 msgid "" "The -b/--binary option has been a no-op for long time, and\n" "it will be removed. Please do not use it anymore." @@ -5681,16 +5688,16 @@ "Опция -b/--binary уже долгое время ничего не делает и будет удалена с " "следующих версиях Git. Пожалуйста, не используйте ее." -#: builtin/am.c:2270 +#: builtin/am.c:2325 msgid "failed to read the index" msgstr "сбой чтения индекса" -#: builtin/am.c:2285 +#: builtin/am.c:2340 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "предыдущий каталог перемещения %s еще существует, но передан mbox." -#: builtin/am.c:2309 +#: builtin/am.c:2364 #, c-format msgid "" "Stray %s directory found.\n" @@ -5699,7 +5706,7 @@ "Найден забытый каталог %s.\n" "Используйте «git am --abort», чтобы удалить его." -#: builtin/am.c:2315 +#: builtin/am.c:2370 msgid "Resolve operation not in progress, we are not resuming." msgstr "" "Операция разрешения конфликтов не в процессе выполнения, не продолжаем." @@ -5774,31 +5781,31 @@ msgid "could not open the file BISECT_TERMS" msgstr "не удалось открыть файл BISECT_TERMS" -#: builtin/bisect--helper.c:630 +#: builtin/bisect--helper.c:633 msgid "perform 'git bisect next'" msgstr "выполнить «git bisect next»" -#: builtin/bisect--helper.c:632 +#: builtin/bisect--helper.c:635 msgid "write the terms to .git/BISECT_TERMS" msgstr "записать определения в .git/BISECT_TERMS" -#: builtin/bisect--helper.c:634 +#: builtin/bisect--helper.c:637 msgid "cleanup the bisection state" msgstr "очистить состояние двоичного поиска" -#: builtin/bisect--helper.c:636 +#: builtin/bisect--helper.c:639 msgid "check for expected revs" msgstr "проверить ожидаемые редакции" -#: builtin/bisect--helper.c:650 +#: builtin/bisect--helper.c:653 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "обновить BISECT_HEAD вместо перехода на текущий коммит" -#: builtin/bisect--helper.c:669 +#: builtin/bisect--helper.c:673 msgid "--write-terms requires two arguments" msgstr "--write-terms требует указания двух параметров" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:677 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state не требует указания параметров" @@ -5881,45 +5888,45 @@ msgid "Ignore whitespace differences" msgstr "Игнорировать различия в пробелах" -#: builtin/blame.c:870 +#: builtin/blame.c:817 msgid "Use an experimental heuristic to improve diffs" msgstr "" "Использовать эксперементальную эвристику, чтобы улучшить файлы списка " "изменений" -#: builtin/blame.c:872 +#: builtin/blame.c:864 msgid "Spend extra cycles to find better match" msgstr "Потратить больше времени, для нахождения лучших совпадений" -#: builtin/blame.c:873 +#: builtin/blame.c:865 msgid "Use revisions from instead of calling git-rev-list" msgstr "Использовать редакции из <файла> вместо вызова git-rev-list" -#: builtin/blame.c:874 +#: builtin/blame.c:866 msgid "Use 's contents as the final image" msgstr "Использовать содержимое <файла> как финальный снимок" -#: builtin/blame.c:875 builtin/blame.c:876 +#: builtin/blame.c:867 builtin/blame.c:868 msgid "score" msgstr "мин-длина" -#: builtin/blame.c:875 +#: builtin/blame.c:867 msgid "Find line copies within and across files" msgstr "Найти копирование строк в пределах и между файлами" -#: builtin/blame.c:876 +#: builtin/blame.c:868 msgid "Find line movements within and across files" msgstr "Найти перемещения строк в пределах и между файлами" -#: builtin/blame.c:877 +#: builtin/blame.c:869 msgid "n,m" msgstr "начало,конец" -#: builtin/blame.c:877 +#: builtin/blame.c:869 msgid "Process only line range n,m, counting from 1" msgstr "Обработать только строки в диапазоне начало,конец, начиная с 1" -#: builtin/blame.c:929 +#: builtin/blame.c:921 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress нельзя использовать одновременно с --incremental или " @@ -5933,7 +5940,7 @@ #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:980 +#: builtin/blame.c:972 msgid "4 years, 11 months ago" msgstr "4 года и 11 месяцев назад" @@ -6149,7 +6156,7 @@ msgid "do not use" msgstr "не используйте" -#: builtin/branch.c:626 builtin/rebase.c:486 +#: builtin/branch.c:626 builtin/rebase.c:520 msgid "upstream" msgstr "вышестоящая" @@ -6157,7 +6164,7 @@ msgid "change the upstream info" msgstr "изменить информацию о вышестоящей ветке" -#: builtin/branch.c:627 +#: builtin/branch.c:603 msgid "Unset the upstream info" msgstr "Убрать информацию о вышестоящей ветке" @@ -6246,68 +6253,68 @@ msgid "field name to sort on" msgstr "имя поля, по которому выполнить сортировку" -#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415 +#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584 -#: builtin/tag.c:433 +#: builtin/tag.c:434 msgid "object" msgstr "объект" -#: builtin/branch.c:658 +#: builtin/branch.c:657 msgid "print only branches of the object" msgstr "вывод только веток, определенного объекта" -#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440 +#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441 msgid "sorting and filtering are case insensitive" msgstr "сортировка и фильтрация не зависят от регистра" -#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438 +#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439 #: builtin/verify-tag.c:38 msgid "format to use for the output" msgstr "использовать формат для вывода" -#: builtin/branch.c:684 builtin/clone.c:760 +#: builtin/branch.c:682 builtin/clone.c:789 msgid "HEAD not found below refs/heads!" msgstr "HEAD не найден в refs/heads!" -#: builtin/branch.c:708 +#: builtin/branch.c:706 msgid "--column and --verbose are incompatible" msgstr "--column и --verbose нельзя использовать одновременно" -#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786 +#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784 msgid "branch name required" msgstr "требуется имя ветки" -#: builtin/branch.c:753 +#: builtin/branch.c:751 msgid "Cannot give description to detached HEAD" msgstr "Нельзя дать описание отделённому HEAD" -#: builtin/branch.c:758 +#: builtin/branch.c:756 msgid "cannot edit description of more than one branch" msgstr "нельзя изменить описание более одной ветки за раз" -#: builtin/branch.c:765 +#: builtin/branch.c:763 #, c-format msgid "No commit on branch '%s' yet." msgstr "Еще нет коммита на ветке «%s»." -#: builtin/branch.c:768 +#: builtin/branch.c:766 #, c-format msgid "No branch named '%s'." msgstr "Нет ветки с именем «%s»." -#: builtin/branch.c:783 +#: builtin/branch.c:781 msgid "too many branches for a copy operation" msgstr "слишком много веток для операции копирования" -#: builtin/branch.c:792 +#: builtin/branch.c:790 msgid "too many arguments for a rename operation" msgstr "слишком много аргументов для операции переименования" -#: builtin/branch.c:797 +#: builtin/branch.c:795 msgid "too many arguments to set new upstream" msgstr "слишком много аргументов для указания новой вышестоящей ветки" -#: builtin/branch.c:801 +#: builtin/branch.c:799 #, c-format msgid "" "could not set upstream of HEAD to %s when it does not point to any branch." @@ -6315,39 +6322,39 @@ "невозможно установить вышестоящий репозиторий для HEAD на %s, так как он не " "указывает ни на одну ветку." -#: builtin/branch.c:804 builtin/branch.c:827 +#: builtin/branch.c:802 builtin/branch.c:825 #, c-format msgid "no such branch '%s'" msgstr "нет такой ветки «%s»" -#: builtin/branch.c:808 +#: builtin/branch.c:806 #, c-format msgid "branch '%s' does not exist" msgstr "ветка «%s» не существует" -#: builtin/branch.c:821 +#: builtin/branch.c:819 msgid "too many arguments to unset upstream" msgstr "слишком много аргументов для сброса указания вышестоящей ветки" -#: builtin/branch.c:825 +#: builtin/branch.c:823 msgid "" "could not unset upstream of HEAD when it does not point to any branch." msgstr "" "невозможно убрать вышестоящий репозиторий для HEAD, так как он не указывает " "ни на одну ветку." -#: builtin/branch.c:831 +#: builtin/branch.c:829 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Ветка «%s» не имеет информации о вышестоящей ветке" -#: builtin/branch.c:810 +#: builtin/branch.c:812 msgid "" "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "параметры -a и -r для «git branch» не имеют смысла с указанием имени ветки" -#: builtin/branch.c:845 +#: builtin/branch.c:843 msgid "" "the '--set-upstream' option is no longer supported. Please use '--track' or " "'--set-upstream-to' instead." @@ -6355,20 +6362,20 @@ "опция --set-upstream больше не поддерживается. Вместо неё используйте «--" "track» или «--set-upstream-to»" -#: builtin/bundle.c:45 +#: builtin/bundle.c:119 #, c-format msgid "%s is okay\n" msgstr "%s в порядке\n" -#: builtin/bundle.c:58 +#: builtin/bundle.c:93 msgid "Need a repository to create a bundle." msgstr "Требуется репозиторий для создания пакета." -#: builtin/bundle.c:62 +#: builtin/bundle.c:160 msgid "Need a repository to unbundle." msgstr "Требуется репозиторий для распаковки." -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:598 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | | --textconv | --filters) [--path=] " @@ -6376,7 +6383,7 @@ "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <тип> | --textconv | --filters) [--path=<путь>] <объект>" -#: builtin/cat-file.c:596 +#: builtin/cat-file.c:599 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -6384,66 +6391,66 @@ "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:638 msgid " can be one of: blob, tree, commit, tag" msgstr "<тип> может быть одним из: blob, tree, commit, tag" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:639 msgid "show object type" msgstr "показать тип объекта" -#: builtin/cat-file.c:637 +#: builtin/cat-file.c:640 msgid "show object size" msgstr "показать размер объекта" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:642 msgid "exit with zero when there's no error" msgstr "выйти с нулевым кодом возврата, если нет ошибки" -#: builtin/cat-file.c:640 +#: builtin/cat-file.c:643 msgid "pretty-print object's content" msgstr "структурированный вывод содержимого объекта" -#: builtin/cat-file.c:642 +#: builtin/cat-file.c:645 msgid "for blob objects, run textconv on object's content" msgstr "запустить texconv на содержимом двоичных объектов" -#: builtin/cat-file.c:644 +#: builtin/cat-file.c:647 msgid "for blob objects, run filters on object's content" msgstr "запуск фильтров на содержимом двоичных объектов" -#: builtin/cat-file.c:645 git-submodule.sh:936 +#: builtin/cat-file.c:648 git-submodule.sh:984 msgid "blob" msgstr "двоичный объект" -#: builtin/cat-file.c:646 +#: builtin/cat-file.c:649 msgid "use a specific path for --textconv/--filters" msgstr "использовать определенный путь для --textconv/--filters" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:651 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "разрешить -s и -t работать с повреждёнными объектами" -#: builtin/cat-file.c:649 +#: builtin/cat-file.c:652 msgid "buffer --batch output" msgstr "буфферировать вывод --batch" -#: builtin/cat-file.c:651 +#: builtin/cat-file.c:654 msgid "show info and content of objects fed from the standard input" msgstr "" "показать информацию и содержимое объектов, переданных из стандартного ввода" -#: builtin/cat-file.c:655 +#: builtin/cat-file.c:658 msgid "show info about objects fed from the standard input" msgstr "показать информацию об объектах, переданных из стандартного ввода" -#: builtin/cat-file.c:659 +#: builtin/cat-file.c:662 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "переходить по символьным ссылкам внутри дерева (используется с опциями --" "batch и --batch-check)" -#: builtin/cat-file.c:661 +#: builtin/cat-file.c:664 msgid "show all objects with --batch or --batch-check" msgstr "показать все объекты с опциями --batch или --batch-check" @@ -6471,8 +6478,8 @@ msgid "terminate input and output records by a NUL character" msgstr "окончание ввода и вывода записей по НУЛЕВОМУ символу" -#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:537 -#: builtin/worktree.c:506 +#: builtin/check-ignore.c:21 builtin/checkout.c:1488 builtin/gc.c:537 +#: builtin/worktree.c:502 msgid "suppress progress reporting" msgstr "не выводить прогресс выполнения" @@ -6484,27 +6491,27 @@ msgid "ignore index when checking" msgstr "игнорировать индекс при проверке" -#: builtin/check-ignore.c:160 +#: builtin/check-ignore.c:163 msgid "cannot specify pathnames with --stdin" msgstr "нельзя указывать пути вместе с параметром --stdin" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:166 msgid "-z only makes sense with --stdin" msgstr "-z имеет смысл только вместе с параметром --stdin" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:168 msgid "no path specified" msgstr "не указан путь" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:172 msgid "--quiet is only valid with a single pathname" msgstr "--quiet можно использовать только при указании одного пути" -#: builtin/check-ignore.c:171 +#: builtin/check-ignore.c:174 msgid "cannot have both --quiet and --verbose" msgstr "нельзя использовать одновременно --quiet и --verbose" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:177 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching можно использовать только вместе с --verbose" @@ -6563,9 +6570,9 @@ msgstr "записать содержимое во временные файлы" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 -#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 -#: builtin/worktree.c:679 +#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 +#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 +#: builtin/worktree.c:675 msgid "string" msgstr "строка" @@ -6585,105 +6592,105 @@ msgid "git checkout [] [] -- ..." msgstr "git checkout [<опции>] [<ветка>] -- <файл>…" -#: builtin/checkout.c:173 builtin/checkout.c:212 +#: builtin/checkout.c:188 builtin/checkout.c:227 #, c-format msgid "path '%s' does not have our version" msgstr "путь «%s» не имеет нашей версии" -#: builtin/checkout.c:175 builtin/checkout.c:214 +#: builtin/checkout.c:190 builtin/checkout.c:229 #, c-format msgid "path '%s' does not have their version" msgstr "путь «%s» не имеет их версии" -#: builtin/checkout.c:191 +#: builtin/checkout.c:206 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "путь «%s» не имеет всех необходимых версий" -#: builtin/checkout.c:241 +#: builtin/checkout.c:256 #, c-format msgid "path '%s' does not have necessary versions" msgstr "путь «%s» не имеет необходимых версий" -#: builtin/checkout.c:259 +#: builtin/checkout.c:274 #, c-format msgid "path '%s': cannot merge" msgstr "путь «%s»: не удалось слить" -#: builtin/checkout.c:275 +#: builtin/checkout.c:290 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Не удалось добавить результат слияния «%s»" -#: builtin/checkout.c:410 builtin/checkout.c:413 builtin/checkout.c:416 -#: builtin/checkout.c:420 +#: builtin/checkout.c:430 builtin/checkout.c:433 builtin/checkout.c:436 +#: builtin/checkout.c:440 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "«%s» нельзя использовать при обновлении путей" -#: builtin/checkout.c:423 builtin/checkout.c:426 +#: builtin/checkout.c:443 builtin/checkout.c:446 #, c-format msgid "'%s' cannot be used with %s" msgstr "«%s» нельзя использовать одновременно с %s" -#: builtin/checkout.c:430 +#: builtin/checkout.c:450 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "Нельзя обновлять пути и переключаться на ветку «%s» одновременно." -#: builtin/checkout.c:507 builtin/checkout.c:514 +#: builtin/checkout.c:527 builtin/checkout.c:534 #, c-format msgid "path '%s' is unmerged" msgstr "путь «%s» не слит" -#: builtin/checkout.c:680 +#: builtin/checkout.c:704 msgid "you need to resolve your current index first" msgstr "сначала нужно разрешить конфликты в вашем текущем индексе" -#: builtin/checkout.c:833 +#: builtin/checkout.c:861 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Не удалось создать журнал ссылок для «%s»: %s\n" -#: builtin/checkout.c:875 +#: builtin/checkout.c:903 msgid "HEAD is now at" msgstr "HEAD сейчас на" -#: builtin/checkout.c:879 builtin/clone.c:713 +#: builtin/checkout.c:907 builtin/clone.c:720 msgid "unable to update HEAD" msgstr "не удалось обновить HEAD" -#: builtin/checkout.c:883 +#: builtin/checkout.c:911 #, c-format msgid "Reset branch '%s'\n" msgstr "Сброс ветки «%s»\n" -#: builtin/checkout.c:886 +#: builtin/checkout.c:914 #, c-format msgid "Already on '%s'\n" msgstr "Уже на «%s»\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:918 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Переключение и сброс ветки «%s»\n" -#: builtin/checkout.c:892 builtin/checkout.c:1289 +#: builtin/checkout.c:920 builtin/checkout.c:1344 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Переключено на новую ветку «%s»\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:922 #, c-format msgid "Switched to branch '%s'\n" msgstr "Переключено на ветку «%s»\n" -#: builtin/checkout.c:945 +#: builtin/checkout.c:973 #, c-format msgid " ... and %d more.\n" msgstr " … и еще %d.\n" -#: builtin/checkout.c:951 +#: builtin/checkout.c:979 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -6711,7 +6718,7 @@ "\n" "%s\n" -#: builtin/checkout.c:970 +#: builtin/checkout.c:998 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -6747,163 +6754,164 @@ " git branch <имя-новой-ветки> %s\n" "\n" -#: builtin/checkout.c:1005 +#: builtin/checkout.c:1033 msgid "internal error in revision walk" msgstr "внутренняя ошибка при хождении по редакциям" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1037 msgid "Previous HEAD position was" msgstr "Предыдущая позиция HEAD была" -#: builtin/checkout.c:1049 builtin/checkout.c:1284 +#: builtin/checkout.c:1077 builtin/checkout.c:1339 msgid "You are on a branch yet to be born" msgstr "Вы находитесь на еще не созданной ветке" -#: builtin/checkout.c:1193 +#: builtin/checkout.c:1252 #, c-format msgid "only one reference expected, %d given." msgstr "ожидается только одна ссылка, а передано %d." -#: builtin/checkout.c:1243 builtin/worktree.c:290 builtin/worktree.c:455 +#: builtin/checkout.c:1298 builtin/worktree.c:283 builtin/worktree.c:451 #, c-format msgid "invalid reference: %s" msgstr "неправильная ссылка: %s" -#: builtin/checkout.c:1256 builtin/checkout.c:1618 +#: builtin/checkout.c:1311 builtin/checkout.c:1677 #, c-format msgid "reference is not a tree: %s" msgstr "в дереве нет такой ссылки: %s" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1407 msgid "paths cannot be used with switching branches" msgstr "нельзя использовать пути при переключении веток" -#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 +#: builtin/checkout.c:1410 builtin/checkout.c:1414 builtin/checkout.c:1418 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "нельзя использовать «%s» при переключении веток" -#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 -#: builtin/checkout.c:1378 builtin/checkout.c:1383 +#: builtin/checkout.c:1422 builtin/checkout.c:1425 builtin/checkout.c:1428 +#: builtin/checkout.c:1433 builtin/checkout.c:1438 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "«%s» нельзя использовать одновременно с «%s»" -#: builtin/checkout.c:1388 +#: builtin/checkout.c:1443 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Нельзя переключить ветку на не коммит «%s»" -#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742 -#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169 -#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501 +#: builtin/checkout.c:1751 builtin/checkout.c:1753 builtin/checkout.c:1802 +#: builtin/checkout.c:1804 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/worktree.c:495 builtin/worktree.c:497 msgid "branch" msgstr "ветка" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1752 msgid "create and checkout a new branch" msgstr "создать и переключиться на новую ветку" -#: builtin/checkout.c:1694 +#: builtin/checkout.c:1754 msgid "create/reset and checkout a branch" msgstr "создать/сбросить и перключиться на новую ветку" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1755 msgid "create reflog for new branch" msgstr "создать журнал ссылок для новой ветки" -#: builtin/checkout.c:1452 builtin/worktree.c:503 +#: builtin/checkout.c:1507 builtin/worktree.c:499 msgid "detach HEAD at named commit" msgstr "отсоединить HEAD на указанном коммите" -#: builtin/checkout.c:1453 +#: builtin/checkout.c:1508 msgid "set upstream info for new branch" msgstr "установить информацию о вышестоящей ветке для новой ветки" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1512 msgid "new-branch" msgstr "новая-ветка" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1512 msgid "new unparented branch" msgstr "новая ветка без родителей" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1530 msgid "checkout our version for unmerged files" msgstr "переключиться на нашу версию для не слитых файлов" -#: builtin/checkout.c:1478 +#: builtin/checkout.c:1533 msgid "checkout their version for unmerged files" msgstr "переключиться на их версию для не слитых файлов" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1510 msgid "force checkout (throw away local modifications)" msgstr "" "принудительное переключение на состояние (отбрасывает все локальные " "изменения)" -#: builtin/checkout.c:1438 +#: builtin/checkout.c:1493 msgid "perform a 3-way merge with the new branch" msgstr "выполнить трехходовое слияние с новой веткой" -#: builtin/checkout.c:1459 builtin/merge.c:288 +#: builtin/checkout.c:1514 builtin/merge.c:292 msgid "update ignored files (default)" msgstr "обновить игнорируемые файлы (по умолчанию)" -#: builtin/checkout.c:1439 builtin/log.c:1618 parse-options.h:318 +#: builtin/checkout.c:1494 builtin/log.c:1709 parse-options.h:322 msgid "style" msgstr "стиль" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1495 msgid "conflict style (merge or diff3)" msgstr "стиль конфликтов слияния (merge или diff3)" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1537 msgid "do not limit pathspecs to sparse entries only" msgstr "не ограничивать спецификаторы пути только частичными записями" -#: builtin/checkout.c:1132 +#: builtin/checkout.c:1262 msgid "second guess 'git checkout '" msgstr "пересмотр «git checkout <нет-такой-ветки>»" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1517 msgid "do not check if another worktree is holding the given ref" msgstr "не проверять, что другое дерево уже содержит указанную ссылку" -#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59 -#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285 -#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174 +#: builtin/checkout.c:1492 builtin/clone.c:91 builtin/commit-graph.c:80 +#: builtin/commit-graph.c:164 builtin/fetch.c:168 builtin/merge.c:288 +#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561 +#: builtin/send-pack.c:173 msgid "force progress reporting" msgstr "принудительно выводить прогресс" -#: builtin/checkout.c:1533 +#: builtin/checkout.c:1565 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B и --orphan нельзя использовать одновременно" -#: builtin/checkout.c:1573 +#: builtin/checkout.c:1633 msgid "--track needs a branch name" msgstr "--track требует имя ветки" -#: builtin/checkout.c:1190 +#: builtin/checkout.c:1213 msgid "Missing branch name; try -b" msgstr "Пропущено имя ветки; попробуйте -b" -#: builtin/checkout.c:1631 +#: builtin/checkout.c:1686 msgid "invalid path specification" msgstr "недопустимый спецификатор пути" -#: builtin/checkout.c:1638 +#: builtin/checkout.c:1693 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" "«%s» не является коммитом, поэтому невозможно создать из него ветку «%s»" -#: builtin/checkout.c:1642 +#: builtin/checkout.c:1697 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach не принимает путь «%s» как аргумент" -#: builtin/checkout.c:1646 +#: builtin/checkout.c:1720 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -6911,38 +6919,38 @@ "git checkout: --ours/--theirs, --force and --merge нельзя использовать " "одновременно при применении состояния индекса." -#: builtin/clean.c:28 +#: builtin/clean.c:29 msgid "" "git clean [-d] [-f] [-i] [-n] [-q] [-e ] [-x | -X] [--] ..." msgstr "" "git clean [-d] [-f] [-i] [-n] [-q] [-e <шаблон>] [-x | -X] [--] <пути>…" -#: builtin/clean.c:32 +#: builtin/clean.c:33 #, c-format msgid "Removing %s\n" msgstr "Удаление %s\n" -#: builtin/clean.c:33 +#: builtin/clean.c:34 #, c-format msgid "Would remove %s\n" msgstr "Будет удалено %s\n" -#: builtin/clean.c:34 +#: builtin/clean.c:35 #, c-format msgid "Skipping repository %s\n" msgstr "Пропуск репозитория %s\n" -#: builtin/clean.c:35 +#: builtin/clean.c:36 #, c-format msgid "Would skip repository %s\n" msgstr "Будет пропущен репозиторий %s\n" -#: builtin/clean.c:36 +#: builtin/clean.c:37 #, c-format msgid "failed to remove %s" msgstr "сбой удаления %s" -#: builtin/clean.c:301 git-add--interactive.perl:593 +#: builtin/clean.c:302 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -6955,7 +6963,7 @@ "foo - выбрать элемент с указанным префиксом\n" " - (пусто) не выбирать ничего\n" -#: builtin/clean.c:305 git-add--interactive.perl:602 +#: builtin/clean.c:306 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -6976,38 +6984,38 @@ "* - выбрать все элементы\n" " - (пусто) завершить выделение\n" -#: builtin/clean.c:521 git-add--interactive.perl:568 -#: git-add--interactive.perl:573 +#: builtin/clean.c:521 git-add--interactive.perl:570 +#: git-add--interactive.perl:575 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Хм (%s)?\n" -#: builtin/clean.c:663 +#: builtin/clean.c:661 #, c-format msgid "Input ignore patterns>> " msgstr "Шаблоны игнорирования ввода>> " -#: builtin/clean.c:700 +#: builtin/clean.c:696 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ПРЕДУПРЕЖДЕНИЕ: Не удалось найти элементы соответствующие: %s" -#: builtin/clean.c:721 +#: builtin/clean.c:717 msgid "Select items to delete" msgstr "Укажите элементы для удаления" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:762 +#: builtin/clean.c:758 #, c-format msgid "Remove %s [y/N]? " msgstr "Удалить %s [y - да/N - нет]? " -#: builtin/clean.c:787 git-add--interactive.perl:1763 +#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1765 #, c-format msgid "Bye.\n" msgstr "До свидания.\n" -#: builtin/clean.c:795 +#: builtin/clean.c:789 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -7026,65 +7034,65 @@ "help - этот экран\n" "? - справка по выделению" -#: builtin/clean.c:822 git-add--interactive.perl:1849 +#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1851 msgid "*** Commands ***" msgstr "*** Команды ***" -#: builtin/clean.c:823 git-add--interactive.perl:1846 +#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1848 msgid "What now" msgstr "Что теперь" -#: builtin/clean.c:831 +#: builtin/clean.c:825 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Удалить следующие элементы:" msgstr[1] "Удалить следующие элементы:" msgstr[2] "Удалить следующие элементы:" -#: builtin/clean.c:847 +#: builtin/clean.c:841 msgid "No more files to clean, exiting." msgstr "Больше нет файлов для очистки, выходим." -#: builtin/clean.c:909 +#: builtin/clean.c:903 msgid "do not print names of files removed" msgstr "не выводить имена удаляемых файлов" -#: builtin/clean.c:911 +#: builtin/clean.c:905 msgid "force" msgstr "принудительно" -#: builtin/clean.c:912 +#: builtin/clean.c:906 msgid "interactive cleaning" msgstr "интерактивная очистка" -#: builtin/clean.c:914 +#: builtin/clean.c:908 msgid "remove whole directories" msgstr "удалить каталоги полностью" -#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550 -#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178 -#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419 +#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567 +#: builtin/grep.c:909 builtin/log.c:182 builtin/log.c:184 +#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "шаблон" -#: builtin/clean.c:916 +#: builtin/clean.c:910 msgid "add to ignore rules" msgstr "добавить <шаблон> в правила игнорирования" -#: builtin/clean.c:917 +#: builtin/clean.c:911 msgid "remove ignored files, too" msgstr "также удалить игнорируемые файлы" -#: builtin/clean.c:919 +#: builtin/clean.c:913 msgid "remove only ignored files" msgstr "удалить только игнорируемые файлы" -#: builtin/clean.c:937 +#: builtin/clean.c:931 msgid "-x and -X cannot be used together" msgstr "нельзя использовать одновременно -x и -X" -#: builtin/clean.c:941 +#: builtin/clean.c:935 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -7092,7 +7100,7 @@ "clean.requireForce установлен как true и ни одна из опций -i, -n или -f не " "указана; отказ очистки" -#: builtin/clean.c:944 +#: builtin/clean.c:938 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -7104,27 +7112,27 @@ msgid "git clone [] [--] []" msgstr "git clone [<опции>] [--] <репозиторий> [<каталог>]" -#: builtin/clone.c:92 +#: builtin/clone.c:93 msgid "don't create a checkout" msgstr "не переключать рабочую копию на HEAD" -#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489 +#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:536 msgid "create a bare repository" msgstr "создать голый репозиторий" -#: builtin/clone.c:97 +#: builtin/clone.c:98 msgid "create a mirror repository (implies bare)" msgstr "создать зеркало репозитория (включает в себя и параметр bare)" -#: builtin/clone.c:99 +#: builtin/clone.c:100 msgid "to clone from a local repository" msgstr "для клонирования из локального репозитория" -#: builtin/clone.c:101 +#: builtin/clone.c:102 msgid "don't use local hardlinks, always copy" msgstr "не использовать жесткие ссылки, всегда копировать файлы" -#: builtin/clone.c:103 +#: builtin/clone.c:104 msgid "setup as shared repository" msgstr "настроить как общедоступный репозиторий" @@ -7136,113 +7144,115 @@ msgid "initialize submodules in the clone" msgstr "инициализировать подмодули в клоне" -#: builtin/clone.c:109 +#: builtin/clone.c:110 msgid "number of submodules cloned in parallel" msgstr "количество подмодулей, которые будут клонированы парралельно" -#: builtin/clone.c:110 builtin/init-db.c:486 +#: builtin/clone.c:111 builtin/init-db.c:533 msgid "template-directory" msgstr "каталог-шаблонов" -#: builtin/clone.c:111 builtin/init-db.c:487 +#: builtin/clone.c:112 builtin/init-db.c:534 msgid "directory from which templates will be used" msgstr "каталог, шаблоны из которого будут использованы" -#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1380 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1912 msgid "reference repository" msgstr "ссылаемый репозиторий" -#: builtin/clone.c:117 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:118 builtin/submodule--helper.c:1409 +#: builtin/submodule--helper.c:1914 msgid "use --reference only while cloning" msgstr "используйте --reference только при клонировании" -#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3294 builtin/repack.c:320 +#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 +#: builtin/pack-objects.c:3442 builtin/repack.c:329 msgid "name" msgstr "имя" -#: builtin/clone.c:119 +#: builtin/clone.c:120 msgid "use instead of 'origin' to track upstream" msgstr "" "использовать <имя> вместо «origin» для отслеживания вышестоящего репозитория" -#: builtin/clone.c:121 +#: builtin/clone.c:122 msgid "checkout instead of the remote's HEAD" msgstr "переключиться на <ветку>, вместо HEAD внешнего репозитория" -#: builtin/clone.c:123 +#: builtin/clone.c:124 msgid "path to git-upload-pack on the remote" msgstr "путь к git-upload-pack на внешнем репозитории" -#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840 -#: builtin/pull.c:227 +#: builtin/clone.c:125 builtin/fetch.c:169 builtin/grep.c:848 +#: builtin/pull.c:208 msgid "depth" msgstr "глубина" -#: builtin/clone.c:125 +#: builtin/clone.c:126 msgid "create a shallow clone of that depth" msgstr "сделать частичный клон указанной глубины" -#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283 +#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3431 +#: builtin/pull.c:211 msgid "time" msgstr "время" -#: builtin/clone.c:127 +#: builtin/clone.c:128 msgid "create a shallow clone since a specific time" msgstr "сделать частичный клон до определенного времени" -#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194 -#: builtin/rebase.c:1417 +#: builtin/clone.c:129 builtin/fetch.c:173 builtin/fetch.c:196 +#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1304 msgid "revision" msgstr "редакция" -#: builtin/clone.c:129 builtin/fetch.c:172 +#: builtin/clone.c:130 builtin/fetch.c:174 builtin/pull.c:215 msgid "deepen history of shallow clone, excluding rev" msgstr "углубить историю частичного клона исключая редакцию" -#: builtin/clone.c:131 +#: builtin/clone.c:132 builtin/submodule--helper.c:1419 +#: builtin/submodule--helper.c:1928 msgid "clone only one branch, HEAD or --branch" msgstr "клонировать только одну ветку, HEAD или --branch" -#: builtin/clone.c:133 +#: builtin/clone.c:134 msgid "don't clone any tags, and make later fetches not to follow them" msgstr "" "не клонировать метки, а также настроить, чтобы не клонировались и в " "дальнейшем" -#: builtin/clone.c:135 +#: builtin/clone.c:136 msgid "any cloned submodules will be shallow" msgstr "все склонированные подмодули будут частичными клонами" -#: builtin/clone.c:136 builtin/init-db.c:495 +#: builtin/clone.c:137 builtin/init-db.c:542 msgid "gitdir" msgstr "каталог-git" -#: builtin/clone.c:137 builtin/init-db.c:496 +#: builtin/clone.c:138 builtin/init-db.c:543 msgid "separate git dir from working tree" msgstr "разместить каталог git отдельно от рабочей копии" -#: builtin/clone.c:138 +#: builtin/clone.c:139 msgid "key=value" msgstr "ключ=значение" -#: builtin/clone.c:139 +#: builtin/clone.c:140 msgid "set config inside the new repository" msgstr "установить параметры внутри нового репозитория" -#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240 -#: builtin/push.c:573 +#: builtin/clone.c:143 builtin/fetch.c:192 builtin/pull.c:234 +#: builtin/push.c:571 msgid "use IPv4 addresses only" msgstr "использовать только IPv4 адреса" -#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243 -#: builtin/push.c:575 +#: builtin/clone.c:145 builtin/fetch.c:194 builtin/pull.c:237 +#: builtin/push.c:573 msgid "use IPv6 addresses only" msgstr "использовать только IPv6 адреса" -#: builtin/clone.c:284 +#: builtin/clone.c:287 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -7250,42 +7260,42 @@ "Имя каталога не может быть угадано.\n" "Укажите имя каталога с помощью параметра командной строки" -#: builtin/clone.c:337 +#: builtin/clone.c:340 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "информация: Не удалось добавить альтернативу для «%s»: %s\n" -#: builtin/clone.c:401 +#: builtin/sparse-checkout.c:326 #, c-format msgid "failed to open '%s'" msgstr "не удалось открыть «%s»" -#: builtin/clone.c:410 +#: builtin/clone.c:413 #, c-format msgid "%s exists and is not a directory" msgstr "%s уже существует и не является каталогом" -#: builtin/clone.c:423 +#: builtin/clone.c:426 #, c-format msgid "failed to stat %s\n" msgstr "не удалось выполнить stat %s\n" -#: builtin/clone.c:457 +#: builtin/clone.c:462 #, c-format msgid "failed to create link '%s'" msgstr "не удалось создать ссылку «%s»" -#: builtin/clone.c:461 +#: builtin/clone.c:466 #, c-format msgid "failed to copy file to '%s'" msgstr "не удалось копировать файл в «%s»" -#: builtin/clone.c:491 +#: builtin/clone.c:498 #, c-format msgid "done.\n" msgstr "готово.\n" -#: builtin/clone.c:489 +#: builtin/clone.c:492 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -7298,101 +7308,101 @@ "а с помощью «git checkout -f HEAD» можно повторить попытку переключения на " "ветку\n" -#: builtin/clone.c:582 +#: builtin/clone.c:589 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Не удалось найти внешнюю ветку %s для клонирования." -#: fetch-pack.c:1716 builtin/clone.c:685 +#: fetch-pack.c:1812 builtin/clone.c:692 msgid "remote did not send all necessary objects" msgstr "внешний репозиторий прислал не все необходимые объекты" -#: builtin/clone.c:701 +#: builtin/clone.c:708 #, c-format msgid "unable to update %s" msgstr "не удалось обновить %s" -#: builtin/clone.c:751 +#: builtin/clone.c:779 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "внешний HEAD ссылается на несуществующую ссылку, нельзя переключиться на " "такую версию.\n" -#: builtin/clone.c:782 +#: builtin/clone.c:811 msgid "unable to checkout working tree" msgstr "не удалось переключиться на версию в рабочем каталоге" -#: builtin/clone.c:832 +#: builtin/clone.c:868 msgid "unable to write parameters to config file" msgstr "не удалось записать параметры в файл конфигурации" -#: builtin/clone.c:895 +#: builtin/clone.c:931 msgid "cannot repack to clean up" msgstr "не удалось выполнить перепаковку для очистки" -#: builtin/clone.c:897 +#: builtin/clone.c:933 msgid "cannot unlink temporary alternates file" msgstr "не удалось отсоединить временные альтернативные файлы" -#: builtin/clone.c:937 builtin/receive-pack.c:1948 +#: builtin/clone.c:971 builtin/receive-pack.c:1972 msgid "Too many arguments." msgstr "Слишком много аргументов." -#: builtin/clone.c:941 +#: builtin/clone.c:975 msgid "You must specify a repository to clone." msgstr "Вы должны указать репозиторий для клонирования." -#: builtin/clone.c:954 +#: builtin/clone.c:988 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare и --origin %s нельзя использовать одновременно." -#: builtin/clone.c:957 +#: builtin/clone.c:991 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare и --separate-git-dir нельзя использовать одновременно." -#: builtin/clone.c:970 +#: builtin/clone.c:1004 #, c-format msgid "repository '%s' does not exist" msgstr "репозиторий «%s» не существует" -#: builtin/clone.c:976 builtin/fetch.c:1790 +#: builtin/clone.c:1010 builtin/fetch.c:1789 #, c-format msgid "depth %s is not a positive number" msgstr "глубина %s не является положительным числом" -#: builtin/clone.c:986 +#: builtin/clone.c:1020 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "целевой путь «%s» уже существует и не является пустым каталогом." -#: builtin/clone.c:996 +#: builtin/clone.c:1030 #, c-format msgid "working tree '%s' already exists." msgstr "рабочий каталог «%s» уже существует." -#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271 -#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334 +#: builtin/clone.c:1045 builtin/clone.c:1066 builtin/difftool.c:271 +#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327 #, c-format msgid "could not create leading directories of '%s'" msgstr "не удалось создать родительские каталоги для «%s»" -#: builtin/clone.c:1016 +#: builtin/clone.c:1050 #, c-format msgid "could not create work tree dir '%s'" msgstr "не удалось создать рабочий каталог «%s»" -#: builtin/clone.c:1036 +#: builtin/clone.c:1070 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Клонирование в голый репозиторий «%s»…\n" -#: builtin/clone.c:1038 +#: builtin/clone.c:1072 #, c-format msgid "Cloning into '%s'...\n" msgstr "Клонирование в «%s»…\n" -#: builtin/clone.c:1062 +#: builtin/clone.c:1096 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -7400,41 +7410,41 @@ "клонирование с параметром --recursive нельзя использовать одновременно ни с -" "-reference, ни с --reference-if-able" -#: builtin/clone.c:1123 +#: builtin/clone.c:1160 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" "--depth игнорируется на локальных клонах; вместо этого используйте file://." -#: builtin/clone.c:1125 +#: builtin/clone.c:1162 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "" "--shallow-since игнорируется на локальных клонах; используйте file:// вместо " "этого." -#: builtin/clone.c:1127 +#: builtin/clone.c:1164 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "" "--shallow-exclude игнорируется на локальных клонах; используйте file:// " "вместо этого." -#: builtin/clone.c:1129 +#: builtin/clone.c:1166 msgid "--filter is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:1132 +#: builtin/clone.c:1169 msgid "source repository is shallow, ignoring --local" msgstr "исходный репозиторий является частичным, --local игнорируется" -#: builtin/clone.c:1137 +#: builtin/clone.c:1174 msgid "--local is ignored" msgstr "--local игнорируется" -#: builtin/clone.c:1212 builtin/clone.c:1220 +#: builtin/clone.c:1249 builtin/clone.c:1257 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Внешняя ветка %s не найдена в вышестоящем репозитории %s" -#: builtin/clone.c:1223 +#: builtin/clone.c:1260 msgid "You appear to have cloned an empty repository." msgstr "Похоже, что вы клонировали пустой репозиторий." @@ -7503,11 +7513,11 @@ " git commit --allow-empty\n" "\n" -#: builtin/commit.c:59 +#: builtin/commit.c:62 msgid "Otherwise, please use 'git reset'\n" msgstr "В противном случае, используйте «git reset»\n" -#: builtin/commit.c:62 +#: builtin/commit.c:65 msgid "" "If you wish to skip this commit, use:\n" "\n" @@ -7523,61 +7533,61 @@ "После этого «git cherry-pick --continue» продолжит копирование оставшихся " "коммитов.\n" -#: builtin/commit.c:315 +#: builtin/commit.c:312 msgid "failed to unpack HEAD tree object" msgstr "сбой распаковки объекта дерева HEAD" -#: builtin/commit.c:356 +#: builtin/commit.c:373 msgid "unable to create temporary index" msgstr "не удалось создать временный индекс" -#: builtin/commit.c:362 +#: builtin/commit.c:382 msgid "interactive add failed" msgstr "сбой интерактивного добавления" -#: builtin/commit.c:376 +#: builtin/commit.c:397 msgid "unable to update temporary index" msgstr "не удалось обновить временный индекс" -#: builtin/commit.c:378 +#: builtin/commit.c:399 msgid "Failed to update main cache tree" msgstr "Сбой при обновлении основного кэша дерева" -#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 +#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495 msgid "unable to write new_index file" msgstr "не удалось записать файл new_index" -#: builtin/commit.c:455 +#: builtin/commit.c:476 msgid "cannot do a partial commit during a merge." msgstr "нельзя создать частичный коммит во время слияния." -#: builtin/commit.c:457 +#: builtin/commit.c:478 msgid "cannot do a partial commit during a cherry-pick." msgstr "нельзя создать частичный коммит во время копирования коммита." -#: builtin/commit.c:465 +#: builtin/commit.c:488 msgid "cannot read the index" msgstr "не удалось прочитать индекс" -#: builtin/commit.c:484 +#: builtin/commit.c:507 msgid "unable to write temporary index file" msgstr "не удалось записать временный файл индекса" -#: builtin/commit.c:582 +#: builtin/commit.c:605 #, c-format msgid "commit '%s' lacks author header" msgstr "у коммита «%s» отсутствует автор в заголовке" -#: builtin/commit.c:584 +#: builtin/commit.c:607 #, c-format msgid "commit '%s' has malformed author line" msgstr "у коммита «%s» строка автора в неправильном формате" -#: builtin/commit.c:603 +#: builtin/commit.c:626 msgid "malformed --author parameter" msgstr "параметр --author в неправильном формате" -#: builtin/commit.c:656 +#: builtin/commit.c:679 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -7585,38 +7595,38 @@ "нельзя выбрать символ комментария, который\n" "не используется в текущем сообщении коммита" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 +#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1099 #, c-format msgid "could not lookup commit %s" msgstr "не удалось запросить коммит %s" -#: builtin/commit.c:706 builtin/shortlog.c:319 +#: builtin/commit.c:729 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(чтение файла журнала из стандартного ввода)\n" -#: builtin/commit.c:708 +#: builtin/commit.c:731 msgid "could not read log from standard input" msgstr "не удалось прочитать файл журнала из стандартного ввода" -#: builtin/commit.c:712 +#: builtin/commit.c:735 #, c-format msgid "could not read log file '%s'" msgstr "не удалось прочитать файл журнала «%s»" -#: builtin/commit.c:743 builtin/commit.c:759 +#: builtin/commit.c:766 builtin/commit.c:782 msgid "could not read SQUASH_MSG" msgstr "не удалось прочитать SQUASH_MSG" -#: builtin/commit.c:750 +#: builtin/commit.c:773 msgid "could not read MERGE_MSG" msgstr "не удалось прочитать MERGE_MSG" -#: builtin/commit.c:810 +#: builtin/commit.c:833 msgid "could not write commit template" msgstr "не удалось записать шаблон описания коммита" -#: builtin/commit.c:829 +#: builtin/commit.c:852 #, c-format msgid "" "\n" @@ -7631,7 +7641,7 @@ "\t%s\n" "и попробуйте снова.\n" -#: builtin/commit.c:834 +#: builtin/commit.c:857 #, c-format msgid "" "\n" @@ -7646,7 +7656,7 @@ "\t%s\n" "и попробуйте снова.\n" -#: builtin/commit.c:847 +#: builtin/commit.c:870 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7656,7 +7666,7 @@ "начинающиеся с «%c» будут проигнорированы, а пустое сообщение\n" "отменяет процесс коммита.\n" -#: builtin/commit.c:855 +#: builtin/commit.c:878 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -7667,155 +7677,155 @@ "начинающиеся с «%c» будут оставлены; вы можете удалить их вручную,\n" "если хотите. Пустое сообщение отменяет процесс коммита.\n" -#: builtin/commit.c:872 +#: builtin/commit.c:895 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sАвтор: %.*s <%.*s>" -#: builtin/commit.c:880 +#: builtin/commit.c:903 #, c-format msgid "%sDate: %s" msgstr "%sДата: %s" -#: builtin/commit.c:887 +#: builtin/commit.c:910 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sКоммитер: %.*s <%.*s>" -#: builtin/commit.c:905 +#: builtin/commit.c:928 msgid "Cannot read index" msgstr "Не удалось прочитать индекс" -#: builtin/commit.c:972 +#: builtin/commit.c:999 msgid "Error building trees" msgstr "Ошибка при построении деревьев" -#: builtin/commit.c:986 builtin/tag.c:275 +#: builtin/commit.c:1013 builtin/tag.c:276 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Пожалуйста, укажите сообщение, при указании опций -m или -F.\n" -#: builtin/commit.c:1030 +#: builtin/commit.c:1057 #, c-format msgid "--author '%s' is not 'Name ' and matches no existing author" msgstr "" "--author «%s» не в формате «Имя <почта>» и не совпадает с существующим " "автором" -#: builtin/commit.c:1044 +#: builtin/commit.c:1071 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Недопустимый режим показа игнорируемых файлов «%s»" -#: builtin/commit.c:1062 builtin/commit.c:1304 +#: builtin/commit.c:1089 builtin/commit.c:1333 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Неправильный режим неотслеживаемых файлов «%s»" -#: builtin/commit.c:1102 +#: builtin/commit.c:1129 msgid "--long and -z are incompatible" msgstr "--long и -z нельзя использовать одновременно" -#: builtin/commit.c:1146 +#: builtin/commit.c:1173 msgid "Using both --reset-author and --author does not make sense" msgstr "" "Указание одновременно опций --reset-author и --author не имеет смысла" -#: builtin/commit.c:1155 +#: builtin/commit.c:1182 msgid "You have nothing to amend." msgstr "Нечего исправлять." -#: builtin/commit.c:1158 +#: builtin/commit.c:1185 msgid "You are in the middle of a merge -- cannot amend." msgstr "Вы в процессе слияния — сейчас нельзя исправлять." -#: builtin/commit.c:1160 +#: builtin/commit.c:1187 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Вы в процессе копирования коммита — сейчас нельзя исправлять." -#: builtin/commit.c:1163 +#: builtin/commit.c:1192 msgid "Options --squash and --fixup cannot be used together" msgstr "Опции --squash и --fixup не могут использоваться одновременно" -#: builtin/commit.c:1173 +#: builtin/commit.c:1202 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Может использоваться только одна из опций -c/-C/-F/--fixup." -#: builtin/commit.c:1175 +#: builtin/commit.c:1204 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "" -#: builtin/commit.c:1183 +#: builtin/commit.c:1213 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" "--reset-author может использоваться только одновременно с опциями -C, -c или " "--amend." -#: builtin/commit.c:1200 +#: builtin/commit.c:1231 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Может использоваться только одна из опций --include/--only/--all/--" "interactive/--patch." -#: builtin/commit.c:1202 +#: builtin/commit.c:361 msgid "No paths with --include/--only does not make sense." msgstr "Указание путей каталогов с опциями --include/--only не имеет смысла." -#: sequencer.c:537 builtin/tag.c:565 +#: sequencer.c:532 builtin/tag.c:566 #, c-format msgid "Invalid cleanup mode %s" msgstr "Неправильное значение режима очистки %s" -#: builtin/commit.c:1160 +#: builtin/commit.c:1185 msgid "Paths with -a does not make sense." msgstr "С опцией -a указание пути не имеет смысла." -#: builtin/commit.c:1339 builtin/commit.c:1523 +#: builtin/commit.c:1368 builtin/commit.c:1529 msgid "show status concisely" msgstr "кратко показать статус" -#: builtin/commit.c:1341 builtin/commit.c:1525 +#: builtin/commit.c:1370 builtin/commit.c:1531 msgid "show branch information" msgstr "показать информацию о версии" -#: builtin/commit.c:1343 +#: builtin/commit.c:1372 msgid "show stash information" msgstr "показать информацию о спрятанном" -#: builtin/commit.c:1345 builtin/commit.c:1527 +#: builtin/commit.c:1374 builtin/commit.c:1533 msgid "compute full ahead/behind values" msgstr "" -#: builtin/commit.c:1347 +#: builtin/commit.c:1376 msgid "version" msgstr "версия" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548 -#: builtin/worktree.c:650 +#: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549 +#: builtin/worktree.c:646 msgid "machine-readable output" msgstr "машиночитаемый вывод" -#: builtin/commit.c:1350 builtin/commit.c:1531 +#: builtin/commit.c:1379 builtin/commit.c:1537 msgid "show status in long format (default)" msgstr "показать статус в длинном формате (по умолчанию)" -#: builtin/commit.c:1353 builtin/commit.c:1534 +#: builtin/commit.c:1382 builtin/commit.c:1540 msgid "terminate entries with NUL" msgstr "завершать записи НУЛЕВЫМ байтом" -#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 +#: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543 #: builtin/fast-export.c:1153 builtin/fast-export.c:1156 -#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332 +#: builtin/fast-export.c:1159 builtin/rebase.c:1392 parse-options.h:336 msgid "mode" msgstr "режим" -#: builtin/commit.c:1356 builtin/commit.c:1537 +#: builtin/commit.c:1385 builtin/commit.c:1543 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "показать неотслеживаемые файлы, опциональные режимы: all (все), normal (как " "обычно), no (нет). (По умолчанию: all)" -#: builtin/commit.c:1360 +#: builtin/commit.c:1389 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -7824,11 +7834,11 @@ "(традиционный), matching (только совпадающие), no (не показывать). (По " "умолчанию: traditional)" -#: builtin/commit.c:1362 parse-options.h:188 +#: builtin/commit.c:1391 parse-options.h:192 msgid "when" msgstr "когда" -#: builtin/commit.c:1363 +#: builtin/commit.c:1392 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -7836,190 +7846,190 @@ "игнорировать изменения в подмодулях, опционально когда: all (всегда), dirty " "(изменённые), untracked (неотслеживаемые). (По умолчанию: all)" -#: builtin/commit.c:1365 +#: builtin/commit.c:1394 msgid "list untracked files in columns" msgstr "показать неотслеживаемые файлы по столбцам" -#: builtin/commit.c:1388 +#: builtin/commit.c:1417 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Неподдерживаемая комбинация аргументов отображения игнорируемых и " "неотслеживаемых файлов" -#: builtin/commit.c:1493 +#: builtin/commit.c:1499 msgid "suppress summary after successful commit" msgstr "не выводить сводку изменений после успешного коммита" -#: builtin/commit.c:1494 +#: builtin/commit.c:1500 msgid "show diff in commit message template" msgstr "добавить список изменений в шаблон сообщения коммита" -#: builtin/commit.c:1496 +#: builtin/commit.c:1502 msgid "Commit message options" msgstr "Опции сообщения коммита" -#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1503 builtin/merge.c:277 builtin/tag.c:415 msgid "read message from file" msgstr "прочитать сообщение из файла" -#: builtin/commit.c:1498 +#: builtin/commit.c:1504 msgid "author" msgstr "автор" -#: builtin/commit.c:1498 +#: builtin/commit.c:1504 msgid "override author for commit" msgstr "подменить автора коммита" -#: builtin/commit.c:1499 builtin/gc.c:538 +#: builtin/commit.c:1505 builtin/gc.c:538 msgid "date" msgstr "дата" -#: builtin/commit.c:1499 +#: builtin/commit.c:1505 msgid "override date for commit" msgstr "подменить дату коммита" -#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469 -#: builtin/tag.c:412 +#: builtin/commit-tree.c:114 builtin/commit.c:1506 builtin/merge.c:273 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474 +#: builtin/tag.c:413 msgid "message" msgstr "сообщение" -#: builtin/commit-tree.c:115 builtin/commit.c:1500 +#: builtin/commit-tree.c:115 builtin/commit.c:1506 msgid "commit message" msgstr "сообщение коммита" -#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 -#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 +#: builtin/commit.c:1507 builtin/commit.c:1508 builtin/commit.c:1509 +#: builtin/commit.c:1510 parse-options.h:328 ref-filter.h:92 msgid "commit" msgstr "коммит" -#: builtin/commit.c:1501 +#: builtin/commit.c:1507 msgid "reuse and edit message from specified commit" msgstr "использовать и отредактировать сообщение от указанного коммита" -#: builtin/commit.c:1502 +#: builtin/commit.c:1508 msgid "reuse message from specified commit" msgstr "использовать сообщение указанного коммита" -#: builtin/commit.c:1503 +#: builtin/commit.c:1509 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "использовать форматированное сообщение автоуплотнения для исправления " "указанного коммита" -#: builtin/commit.c:1504 +#: builtin/commit.c:1510 msgid "use autosquash formatted message to squash specified commit" msgstr "" "использовать форматированное сообщение автоуплотнения для уплотнения " "указанного коммита" -#: builtin/commit.c:1505 +#: builtin/commit.c:1511 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "коммит теперь за моим авторством (используется с -C/-c/--amend)" -#: builtin/commit.c:1506 builtin/log.c:1565 builtin/merge.c:289 -#: builtin/pull.c:164 builtin/revert.c:110 +#: builtin/commit.c:1512 builtin/log.c:1655 builtin/merge.c:293 +#: builtin/pull.c:145 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "добавить Signed-off-by:" -#: builtin/commit.c:1507 +#: builtin/commit.c:1513 msgid "use specified template file" msgstr "использовать указанный файл шаблона" -#: builtin/commit.c:1508 +#: builtin/commit.c:1514 msgid "force edit of commit" msgstr "принудительно редактировать коммит" -#: builtin/commit.c:1429 +#: builtin/commit.c:1481 msgid "default" msgstr "по-умолчанию" -#: parse-options.h:332 +#: parse-options.h:336 msgid "how to strip spaces and #comments from message" msgstr "как удалять пробелы и #комментарии из сообщения коммита" -#: builtin/commit.c:1510 +#: builtin/commit.c:1516 msgid "include status in commit message template" msgstr "включить статус файлов в шаблон сообщения коммита" -#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 -#: builtin/pull.c:195 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1518 builtin/merge.c:290 +#: builtin/pull.c:176 builtin/revert.c:118 msgid "GPG sign commit" msgstr "подписать коммит с помощью GPG" -#: builtin/commit.c:1515 +#: builtin/commit.c:1521 msgid "Commit contents options" msgstr "Опции содержимого коммита" -#: builtin/commit.c:1516 +#: builtin/commit.c:1522 msgid "commit all changed files" msgstr "закоммитить все измененные файлы" -#: builtin/commit.c:1517 +#: builtin/commit.c:1523 msgid "add specified files to index for commit" msgstr "добавить указанные файлы в индекс для коммита" -#: builtin/commit.c:1518 +#: builtin/commit.c:1524 msgid "interactively add files" msgstr "интерактивное добавление файлов" -#: builtin/commit.c:1519 +#: builtin/commit.c:1525 msgid "interactively add changes" msgstr "интерактивное добавление изменений" -#: builtin/commit.c:1520 +#: builtin/commit.c:1526 msgid "commit only specified files" msgstr "закоммитить только указанные файлы" -#: builtin/commit.c:1521 +#: builtin/commit.c:1527 msgid "bypass pre-commit and commit-msg hooks" msgstr "пропустить перехватчик pre-commit и commit-msg" -#: builtin/commit.c:1522 +#: builtin/commit.c:1528 msgid "show what would be committed" msgstr "показать, что будет закоммичено" -#: builtin/commit.c:1535 +#: builtin/commit.c:1541 msgid "amend previous commit" msgstr "исправить предыдущий коммит" -#: builtin/commit.c:1536 +#: builtin/commit.c:1542 msgid "bypass post-rewrite hook" msgstr "пропустить перехватчик post-rewrite" -#: builtin/commit.c:1541 +#: builtin/commit.c:1549 msgid "ok to record an empty change" msgstr "разрешить запись пустого коммита" -#: builtin/commit.c:1543 +#: builtin/commit.c:1551 msgid "ok to record a change with an empty message" msgstr "разрешить запись изменений с пустым сообщением" -#: builtin/commit.c:1616 +#: builtin/commit.c:1624 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Файл MERGE_HEAD поврежден (%s)" -#: builtin/commit.c:1623 +#: builtin/commit.c:1631 msgid "could not read MERGE_MODE" msgstr "не удалось прочитать MERGE_MODE" -#: builtin/commit.c:1642 +#: builtin/commit.c:1652 #, c-format msgid "could not read commit message: %s" msgstr "не удалось открыть сообщение коммита: %s" -#: builtin/commit.c:1649 +#: builtin/commit.c:1659 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Отмена коммита из-за пустого сообщения коммита.\n" -#: builtin/commit.c:1654 +#: builtin/commit.c:1664 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Отмена коммита; вы не изменили сообщение.\n" -#: builtin/commit.c:1613 +#: builtin/commit.c:1788 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -8033,146 +8043,146 @@ msgid "git config []" msgstr "git config [<опции>]" -#: builtin/config.c:124 +#: builtin/config.c:125 msgid "Config file location" msgstr "Размещение файла конфигурации" -#: builtin/config.c:125 +#: builtin/config.c:126 msgid "use global config file" msgstr "использовать глобальный файл конфигурации" -#: builtin/config.c:126 +#: builtin/config.c:127 msgid "use system config file" msgstr "использовать системный файл конфигурации" -#: builtin/config.c:127 +#: builtin/config.c:128 msgid "use repository config file" msgstr "использовать файл конфигурации репозитория" -#: builtin/config.c:129 +#: builtin/config.c:130 msgid "use given config file" msgstr "использовать указанный файл конфигурации" -#: builtin/config.c:130 +#: builtin/config.c:131 msgid "blob-id" msgstr "идент-двоичн-объекта" -#: builtin/config.c:130 +#: builtin/config.c:131 msgid "read config from given blob object" msgstr "прочитать настройки из указанного двоичного объекта" -#: builtin/config.c:131 +#: builtin/config.c:132 msgid "Action" msgstr "Действие" -#: builtin/config.c:132 +#: builtin/config.c:133 msgid "get value: name [value-regex]" msgstr "получить значение: имя [шаблон-значений]" -#: builtin/config.c:133 +#: builtin/config.c:134 msgid "get all values: key [value-regex]" msgstr "получить все значения: ключ [шаблон-значений]" -#: builtin/config.c:134 +#: builtin/config.c:135 msgid "get values for regexp: name-regex [value-regex]" msgstr "получить значения по шаблону: шаблон-имен [шаблон-значений]" -#: builtin/config.c:135 +#: builtin/config.c:136 msgid "get value specific for the URL: section[.var] URL" msgstr "получить значение, специфичное для URL: раздел[.переменная] URL" -#: builtin/config.c:136 +#: builtin/config.c:137 msgid "replace all matching variables: name value [value_regex]" msgstr "" "заменить все соответствующие переменные: имя значение [шаблон-значений]" -#: builtin/config.c:137 +#: builtin/config.c:138 msgid "add a new variable: name value" msgstr "добавить новую переменную: имя значение" -#: builtin/config.c:138 +#: builtin/config.c:139 msgid "remove a variable: name [value-regex]" msgstr "удалить переменную: имя [шаблон-значений]" -#: builtin/config.c:139 +#: builtin/config.c:140 msgid "remove all matches: name [value-regex]" msgstr "удалить все совпадающие: имя [шаблон-значений]" -#: builtin/config.c:140 +#: builtin/config.c:141 msgid "rename section: old-name new-name" msgstr "переименовать раздел: старое-имя новое-имя" -#: builtin/config.c:141 +#: builtin/config.c:142 msgid "remove a section: name" msgstr "удалить раздел: имя" -#: builtin/config.c:142 +#: builtin/config.c:143 msgid "list all" msgstr "показать весь список" -#: builtin/config.c:143 +#: builtin/config.c:144 msgid "open an editor" msgstr "открыть в редакторе" -#: builtin/config.c:144 +#: builtin/config.c:145 msgid "find the color configured: slot [default]" msgstr "найти настроенный цвет: раздел [по-умолчанию]" -#: builtin/config.c:145 +#: builtin/config.c:146 msgid "find the color setting: slot [stdout-is-tty]" msgstr "проверить, существует ли настроенный цвет: раздел [stdout-есть-tty]" -#: builtin/config.c:146 +#: builtin/config.c:147 msgid "Type" msgstr "Тип" -#: builtin/config.c:148 +#: builtin/config.c:149 msgid "value is \"true\" or \"false\"" msgstr "значение — это «true» (правда) или «false» (ложь)" -#: builtin/config.c:149 +#: builtin/config.c:150 msgid "value is decimal number" msgstr "значение — это десятичное число" -#: builtin/config.c:150 +#: builtin/config.c:151 msgid "value is --bool or --int" msgstr "значение — это --bool или --int" -#: builtin/config.c:151 +#: builtin/config.c:152 msgid "value is a path (file or directory name)" msgstr "значение — это путь (к файлу или каталогу)" -#: builtin/config.c:152 +#: builtin/config.c:153 msgid "value is an expiry date" msgstr "значение - это дата окончания срока действия" -#: builtin/config.c:153 +#: builtin/config.c:154 msgid "Other" msgstr "Другое" -#: builtin/config.c:154 +#: builtin/config.c:155 msgid "terminate values with NUL byte" msgstr "завершать значения НУЛЕВЫМ байтом" -#: builtin/config.c:155 +#: builtin/config.c:156 msgid "show variable names only" msgstr "показывать только имена переменных" -#: builtin/config.c:156 +#: builtin/config.c:157 msgid "respect include directives on lookup" msgstr "учитывать директивы include (включения файлов) при запросе" -#: builtin/config.c:157 +#: builtin/config.c:158 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "показать источник настройки (файл, стандартный ввод, двоичный объект, " "командная строка)" -#: builtin/config.c:443 +#: builtin/config.c:459 msgid "unable to parse default color value" msgstr "не удалось разобрать значение цвета по умолчанию" -#: builtin/config.c:587 +#: builtin/config.c:603 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -8187,16 +8197,16 @@ "#\tuser = %s\n" "#\temail = %s\n" -#: builtin/config.c:616 +#: builtin/config.c:632 msgid "--local can only be used inside a git repository" msgstr "--local можно использовать только внутри git репозитория" -#: builtin/config.c:760 +#: builtin/config.c:786 #, c-format msgid "cannot create configuration file %s" msgstr "не удалось создать файл конфигурации %s" -#: builtin/config.c:773 +#: builtin/config.c:799 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -8222,19 +8232,19 @@ msgid "git describe [] --dirty" msgstr "git describe [<опции>] --dirty" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "head" msgstr "указатель на ветку" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "lightweight" msgstr "легковесный" -#: builtin/describe.c:62 +#: builtin/describe.c:63 msgid "annotated" msgstr "аннотированный" -#: builtin/describe.c:275 +#: builtin/describe.c:277 #, c-format msgid "annotated tag %s not available" msgstr "аннотированная метка %s не доступна" @@ -8249,22 +8259,22 @@ msgid "tag '%s' is really '%s' here" msgstr "метка «%s» уже здесь «%s»" -#: builtin/describe.c:325 +#: builtin/describe.c:328 #, c-format msgid "no tag exactly matches '%s'" msgstr "нет меток, точно соответствующих «%s»" -#: builtin/describe.c:327 +#: builtin/describe.c:330 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "Нет точных совпадений по ссылкам или тегам, ищу описания\n" -#: builtin/describe.c:381 +#: builtin/describe.c:397 #, c-format msgid "finished search at %s\n" msgstr "поиск окончен на %s\n" -#: builtin/describe.c:407 +#: builtin/describe.c:424 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -8273,7 +8283,7 @@ "Нет аннотированных меток, которые могут описать «%s».\n" "Но имеются неаннотированные метки: попробуйте добавить параметр --tags." -#: builtin/describe.c:411 +#: builtin/describe.c:428 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -8282,12 +8292,12 @@ "Нет меток, которые могут описать «%s….\n" "Попробуйте добавить параметр --always или создать какие-нибудь метки." -#: builtin/describe.c:441 +#: builtin/describe.c:458 #, c-format msgid "traversed %lu commits\n" msgstr "посещено %lu коммитов\n" -#: builtin/describe.c:444 +#: builtin/describe.c:461 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -8296,92 +8306,92 @@ "более %i меток найдено; показано последние %i\n" "остановлен поиск после %s\n" -#: builtin/describe.c:512 +#: builtin/describe.c:529 #, c-format msgid "describe %s\n" msgstr "описать %s\n" -#: builtin/describe.c:515 +#: builtin/describe.c:532 #, c-format msgid "Not a valid object name %s" msgstr "Недопустимое имя объекта %s" -#: builtin/describe.c:523 +#: builtin/describe.c:540 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s не является коммитом или двоичным объектом" -#: builtin/describe.c:537 +#: builtin/describe.c:554 msgid "find the tag that comes after the commit" msgstr "поиск метки, которая идет после коммита" -#: builtin/describe.c:538 +#: builtin/describe.c:555 msgid "debug search strategy on stderr" msgstr "вывод отладочной информации стратегии поиска на стандартный вывод" -#: builtin/describe.c:539 +#: builtin/describe.c:556 msgid "use any ref" msgstr "использовать любую ссылку" -#: builtin/describe.c:540 +#: builtin/describe.c:557 msgid "use any tag, even unannotated" msgstr "использовать любую метку, даже неаннотированную" -#: builtin/describe.c:541 +#: builtin/describe.c:558 msgid "always use long format" msgstr "всегда использовать длинный формат вывода" -#: builtin/describe.c:542 +#: builtin/describe.c:559 msgid "only follow first parent" msgstr "следовать только за первым родителем" -#: builtin/describe.c:545 +#: builtin/describe.c:562 msgid "only output exact matches" msgstr "выводить только точные совпадения" -#: builtin/describe.c:547 +#: builtin/describe.c:564 msgid "consider most recent tags (default: 10)" msgstr "рассматривать последние меток (по умолчанию: 10)" -#: builtin/describe.c:549 +#: builtin/describe.c:566 msgid "only consider tags matching " msgstr "рассматривать только метки по <шаблону>" -#: builtin/describe.c:551 +#: builtin/describe.c:568 msgid "do not consider tags matching " msgstr "не учитывать метки, которые соответствуют <шаблону>" -#: builtin/describe.c:553 builtin/name-rev.c:426 +#: builtin/describe.c:570 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "если не найдено, показать сокращенный номер редакции коммита" -#: builtin/describe.c:554 builtin/describe.c:557 +#: builtin/describe.c:571 builtin/describe.c:574 msgid "mark" msgstr "пометка" -#: builtin/describe.c:555 +#: builtin/describe.c:572 msgid "append on dirty working tree (default: \"-dirty\")" msgstr "" "добавить <пометку> при изменённом рабочем каталоге (по умолчанию: «-dirty»)" -#: builtin/describe.c:558 +#: builtin/describe.c:575 msgid "append on broken working tree (default: \"-broken\")" msgstr "" "добавить <пометку> на повреждённое рабочее дерево (по умолчанию: «-broken»)" -#: builtin/describe.c:576 +#: builtin/describe.c:593 msgid "--long is incompatible with --abbrev=0" msgstr "--long несовместимо с --abbrev=0" -#: builtin/describe.c:605 +#: builtin/describe.c:622 msgid "No names found, cannot describe anything." msgstr "Имена не найдены, не могу ничего описать." -#: builtin/describe.c:656 +#: builtin/describe.c:673 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty несовместимо с указанием указателей коммитов" -#: builtin/describe.c:658 +#: builtin/describe.c:675 msgid "--broken is incompatible with commit-ishes" msgstr "--broken несовместимо с указанием указателей коммитов" @@ -8557,7 +8567,7 @@ msgid "Skip output of blob data" msgstr "Пропустить вывод данных двоичных объектов" -#: builtin/fast-export.c:1177 builtin/log.c:1633 +#: builtin/fast-export.c:1177 builtin/log.c:1724 msgid "refspec" msgstr "спецификатор ссылки" @@ -8569,102 +8579,102 @@ msgid "anonymize output" msgstr "сделать вывод анонимным" -#: builtin/fetch.c:34 +#: builtin/fetch.c:35 msgid "git fetch [] [ [...]]" msgstr "git fetch [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]" -#: builtin/fetch.c:35 +#: builtin/fetch.c:36 msgid "git fetch [] " msgstr "git fetch [<опции>] <группа>" -#: builtin/fetch.c:36 +#: builtin/fetch.c:37 msgid "git fetch --multiple [] [( | )...]" msgstr "git fetch --multiple [<опции>] [(<репозиторий> | <группа>)…]" -#: builtin/fetch.c:37 +#: builtin/fetch.c:38 msgid "git fetch --all []" msgstr "git fetch --all [<опции>]" -#: builtin/fetch.c:138 builtin/pull.c:204 +#: builtin/fetch.c:140 builtin/pull.c:185 msgid "fetch from all remotes" msgstr "извлечь со всех внешних репозиториев" -#: builtin/fetch.c:142 builtin/pull.c:207 +#: builtin/fetch.c:144 builtin/pull.c:188 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "дописать к .git/FETCH_HEAD вместо перезаписи" -#: builtin/fetch.c:144 builtin/pull.c:210 +#: builtin/fetch.c:146 builtin/pull.c:191 msgid "path to upload pack on remote end" msgstr "путь к программе упаковки пакета на машине с внешним репозиторием" -#: builtin/pull.c:212 +#: builtin/pull.c:193 msgid "force overwrite of local branch" msgstr "принудительная перезапись локальной ветки" -#: builtin/fetch.c:147 +#: builtin/fetch.c:149 msgid "fetch from multiple remotes" msgstr "извлечь с нескольких внешних репозиториев" -#: builtin/fetch.c:149 builtin/pull.c:214 +#: builtin/fetch.c:151 builtin/pull.c:195 msgid "fetch all tags and associated objects" msgstr "извлечь все метки и связанные объекты" -#: builtin/fetch.c:151 +#: builtin/fetch.c:153 msgid "do not fetch all tags (--no-tags)" msgstr "не извлекать все метки (--no-tags)" -#: builtin/fetch.c:153 +#: builtin/fetch.c:155 msgid "number of submodules fetched in parallel" msgstr "количество подмодулей, которые будут скачаны парралельно" -#: builtin/fetch.c:155 builtin/pull.c:217 +#: builtin/fetch.c:157 builtin/pull.c:198 msgid "prune remote-tracking branches no longer on remote" msgstr "" "почистить отслеживаемые внешние ветки, которых уже нет на внешнем репозитории" -#: builtin/fetch.c:157 +#: builtin/fetch.c:159 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" -#: builtin/fetch.c:158 builtin/fetch.c:181 builtin/pull.c:141 +#: builtin/fetch.c:160 builtin/fetch.c:183 builtin/pull.c:122 msgid "on-demand" msgstr "по требованию" -#: builtin/fetch.c:159 +#: builtin/fetch.c:161 msgid "control recursive fetching of submodules" msgstr "управление рекурсивным извлечением подмодулей" -#: builtin/fetch.c:163 builtin/pull.c:225 +#: builtin/fetch.c:165 builtin/pull.c:206 msgid "keep downloaded pack" msgstr "оставить загруженный пакет данных" -#: builtin/fetch.c:165 +#: builtin/fetch.c:167 msgid "allow updating of HEAD ref" msgstr "разрешить обновление ссылки HEAD" -#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228 +#: builtin/fetch.c:170 builtin/fetch.c:176 builtin/pull.c:209 +#: builtin/pull.c:218 msgid "deepen history of shallow clone" msgstr "улугубить историю частичного клона" -#: builtin/fetch.c:170 +#: builtin/fetch.c:172 builtin/pull.c:212 msgid "deepen history of shallow repository based on time" msgstr "углубить историю частичного клона основываясь на времени" -#: builtin/fetch.c:176 builtin/pull.c:231 +#: builtin/fetch.c:178 builtin/pull.c:221 msgid "convert to a complete repository" msgstr "преобразовать в полный репозиторий" -#: builtin/commit-graph.c:55 builtin/commit-graph.c:107 -#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178 -#: builtin/log.c:1585 +#: builtin/commit-graph.c:76 builtin/commit-graph.c:152 +#: builtin/commit-graph.c:257 builtin/fetch.c:180 builtin/log.c:1678 msgid "dir" msgstr "каталог" -#: builtin/fetch.c:179 +#: builtin/fetch.c:181 msgid "prepend this to submodule path output" msgstr "присоединять это спереди к выводу путей подмодуля" -#: builtin/fetch.c:182 +#: builtin/fetch.c:184 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -8672,84 +8682,84 @@ "настроить по умолчанию рекурсивное извлечение подмодулей (более низкий " "приоритет, чем файлы конфигурации)" -#: builtin/fetch.c:186 builtin/pull.c:234 +#: builtin/fetch.c:188 builtin/pull.c:224 msgid "accept refs that update .git/shallow" msgstr "принимать ссылки, которые обновляют .git/shallow" -#: builtin/fetch.c:187 builtin/pull.c:236 +#: builtin/fetch.c:189 builtin/pull.c:226 msgid "refmap" msgstr "соответствие-ссылок" -#: builtin/fetch.c:188 builtin/pull.c:237 +#: builtin/fetch.c:190 builtin/pull.c:227 msgid "specify fetch refmap" msgstr "указать соответствие ссылок при извлечении" -#: builtin/fetch.c:510 +#: builtin/fetch.c:514 msgid "Couldn't find remote ref HEAD" msgstr "Не удалось найти ссылку HEAD на внешнем репозитории" -#: builtin/fetch.c:650 +#: builtin/fetch.c:654 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "опция fetch.output содержит неправильное значение для %s" -#: builtin/fetch.c:748 +#: builtin/fetch.c:752 #, c-format msgid "object %s not found" msgstr "объект %s не найден" -#: builtin/fetch.c:752 +#: builtin/fetch.c:756 msgid "[up to date]" msgstr "[актуально]" -#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853 +#: builtin/fetch.c:769 builtin/fetch.c:785 builtin/fetch.c:857 msgid "[rejected]" msgstr "[отклонено]" -#: builtin/fetch.c:766 +#: builtin/fetch.c:770 msgid "can't fetch in current branch" msgstr "нельзя извлечь текущую ветку" -#: builtin/fetch.c:776 +#: builtin/fetch.c:780 msgid "[tag update]" msgstr "[обновление метки]" -#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836 -#: builtin/fetch.c:848 +#: builtin/fetch.c:781 builtin/fetch.c:818 builtin/fetch.c:840 +#: builtin/fetch.c:852 msgid "unable to update local ref" msgstr "не удалось обновить локальную ссылку" -#: builtin/fetch.c:803 +#: builtin/fetch.c:807 msgid "[new tag]" msgstr "[новая метка]" -#: builtin/fetch.c:806 +#: builtin/fetch.c:810 msgid "[new branch]" msgstr "[новая ветка]" -#: builtin/fetch.c:809 +#: builtin/fetch.c:813 msgid "[new ref]" msgstr "[новая ссылка]" -#: builtin/fetch.c:848 +#: builtin/fetch.c:852 msgid "forced update" msgstr "принудительное обновление" -#: builtin/fetch.c:853 +#: builtin/fetch.c:857 msgid "non-fast-forward" msgstr "без перемотки вперед" -#: builtin/fetch.c:908 +#: builtin/fetch.c:914 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s не отправил все необходимые объекты\n" -#: builtin/fetch.c:929 +#: builtin/fetch.c:935 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "%s отклонено из-за того, что частичные корни не разрешено обновлять" -#: builtin/fetch.c:1020 builtin/fetch.c:1157 +#: builtin/fetch.c:1020 builtin/fetch.c:1158 #, c-format msgid "From %.*s\n" msgstr "Из %.*s\n" @@ -8763,55 +8773,55 @@ "не удалось обновить некоторые локальные ссылки; попробуйте запустить «git " "remote prune %s», чтобы почистить старые, конфликтующие ветки" -#: builtin/fetch.c:1127 +#: builtin/fetch.c:1128 #, c-format msgid " (%s will become dangling)" msgstr " (%s будет висящей веткой)" -#: builtin/fetch.c:1128 +#: builtin/fetch.c:1129 #, c-format msgid " (%s has become dangling)" msgstr " (%s стала висящей веткой)" -#: builtin/fetch.c:1160 +#: builtin/fetch.c:1161 msgid "[deleted]" msgstr "[удалено]" -#: builtin/fetch.c:1161 builtin/remote.c:1036 +#: builtin/fetch.c:1162 builtin/remote.c:1112 msgid "(none)" msgstr "(нет)" -#: builtin/fetch.c:1184 +#: builtin/fetch.c:1185 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "Отказ получения в текущую ветку %s не голого репозитория" -#: builtin/fetch.c:1203 +#: builtin/fetch.c:1204 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Неправильное значение «%2$s» для параметра «%1$s» для %3$s" -#: builtin/fetch.c:1206 +#: builtin/fetch.c:1207 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Параметр «%s» игнорируется для %s\n" -#: builtin/fetch.c:1561 builtin/fetch.c:1623 +#: builtin/fetch.c:1562 builtin/fetch.c:1625 #, c-format msgid "Fetching %s\n" msgstr "Извлечение из %s\n" -#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100 +#: builtin/fetch.c:1572 builtin/fetch.c:1627 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "Не удалось извлечь %s" -#: builtin/fetch.c:1325 builtin/fetch.c:1498 +#: builtin/fetch.c:1481 builtin/fetch.c:1649 msgid "" "--filter can only be used with the remote configured in core.partialClone" msgstr "" -#: builtin/fetch.c:1685 +#: builtin/fetch.c:1687 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -8819,66 +8829,66 @@ "Не указан внешний репозиторий. Укажите URL или имя внешнего репозитория из " "которого должны извлекаться новые редакции." -#: builtin/fetch.c:1722 +#: builtin/fetch.c:1724 msgid "You need to specify a tag name." msgstr "Вам нужно указать имя метки." -#: builtin/fetch.c:1774 +#: builtin/fetch.c:1773 msgid "Negative depth in --deepen is not supported" msgstr "Отрицательная грубина для --deepen не поддерживается" -#: builtin/fetch.c:1776 +#: builtin/fetch.c:1775 msgid "--deepen and --depth are mutually exclusive" msgstr "--deepen и --depth нельзя использовать одновременно" -#: builtin/fetch.c:1781 +#: builtin/fetch.c:1780 msgid "--depth and --unshallow cannot be used together" msgstr "нельзя использовать одновременно --depth и --unshallow" -#: builtin/fetch.c:1783 +#: builtin/fetch.c:1782 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow не имеет смысла на полном репозитории" -#: builtin/fetch.c:1799 +#: builtin/fetch.c:1798 msgid "fetch --all does not take a repository argument" msgstr "fetch --all не принимает имя репозитория как аргумент" -#: builtin/fetch.c:1801 +#: builtin/fetch.c:1800 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all не имеет смысла при указании спецификаторов ссылок" -#: builtin/fetch.c:1810 +#: builtin/fetch.c:1809 #, c-format msgid "No such remote or remote group: %s" msgstr "Нет такого внешнего репозитория или группы: %s" -#: builtin/fetch.c:1817 +#: builtin/fetch.c:1816 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Получение группы и указание спецификаций ссылок не имеет смысла" -#: builtin/fmt-merge-msg.c:18 +#: builtin/fmt-merge-msg.c:7 msgid "" "git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" msgstr "" "git fmt-merge-msg [-m <сообщение>] [--log[=] | --no-log] [--file <файл>]" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:18 msgid "populate log with at most entries from shortlog" msgstr "отправить в журнал записей из короткого журнала" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:21 msgid "alias for --log (deprecated)" msgstr "сокращение для --log (устаревшее)" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:24 msgid "text" msgstr "текст" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:25 msgid "use as start of message" msgstr "использовать <текст> как начальное сообщение" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:26 msgid "file to read from" msgstr "файл для чтения" @@ -8920,7 +8930,7 @@ msgid "show only matched refs" msgstr "показать только совпадающих ссылок" -#: builtin/for-each-ref.c:39 builtin/tag.c:439 +#: builtin/for-each-ref.c:39 builtin/tag.c:440 msgid "respect format colors" msgstr "использовать цвета из формата" @@ -8944,63 +8954,63 @@ msgid "print only refs which don't contain the commit" msgstr "вывод только ссылок, которые не содержат коммит" -#: builtin/fsck.c:685 +#: builtin/fsck.c:676 msgid "Checking object directories" msgstr "Проверка каталогов объектов" -#: builtin/fsck.c:781 +#: builtin/fsck.c:770 msgid "git fsck [] [...]" msgstr "git fsck [<опции>] [<объект>…]" -#: builtin/fsck.c:787 +#: builtin/fsck.c:776 msgid "show unreachable objects" msgstr "показать недоступные объекты" -#: builtin/fsck.c:788 +#: builtin/fsck.c:777 msgid "show dangling objects" msgstr "показать объекты, на которые нет ссылок" -#: builtin/fsck.c:789 +#: builtin/fsck.c:778 msgid "report tags" msgstr "вывести отчет по меткам" -#: builtin/fsck.c:790 +#: builtin/fsck.c:779 msgid "report root nodes" msgstr "вывести отчет по корневым узлам" -#: builtin/fsck.c:791 +#: builtin/fsck.c:780 msgid "make index objects head nodes" msgstr "воспринимать объекты в индексе как корневые узлы" -#: builtin/fsck.c:792 +#: builtin/fsck.c:781 msgid "make reflogs head nodes (default)" msgstr "создать корневые узлы журналов ссылок (по умолчанию)" -#: builtin/fsck.c:793 +#: builtin/fsck.c:782 msgid "also consider packs and alternate objects" msgstr "также проверять пакеты и альтернативные объекты" -#: builtin/fsck.c:794 +#: builtin/fsck.c:783 msgid "check only connectivity" msgstr "только проверить соединение" -#: builtin/fsck.c:795 +#: builtin/fsck.c:784 msgid "enable more strict checking" msgstr "использовать более строгую проверку" -#: builtin/fsck.c:797 +#: builtin/fsck.c:786 msgid "write dangling objects in .git/lost-found" msgstr "записать объекты на которые нет ссылок в .git/lost-found" -#: builtin/fsck.c:798 builtin/prune.c:132 +#: builtin/fsck.c:787 builtin/prune.c:134 msgid "show progress" msgstr "показать прогресс выполнения" -#: builtin/fsck.c:799 +#: builtin/fsck.c:788 msgid "show verbose names for reachable objects" msgstr "показать подробные имена для недоступных объектов" -#: builtin/fsck.c:859 builtin/index-pack.c:225 +#: builtin/fsck.c:847 builtin/index-pack.c:225 msgid "Checking objects" msgstr "Проверка объектов" @@ -9088,7 +9098,7 @@ "Имеется слишком много объектов, на которые нет ссылок; запустите «git prune» " "для их удаления." -#: builtin/grep.c:29 +#: builtin/grep.c:30 msgid "git grep [] [-e] [...] [[--] ...]" msgstr "git grep [<опции>] [-e] <шаблон> [<редакция>…] [[--] <путь>…]" @@ -9106,228 +9116,228 @@ #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2708 +#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1730 +#: builtin/pack-objects.c:2855 #, c-format msgid "no threads support, ignoring %s" msgstr "нет поддержки потоков, игнорирование %s" -#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635 +#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640 #, c-format msgid "unable to read tree (%s)" msgstr "не удалось прочитать дерево (%s)" -#: builtin/grep.c:650 +#: builtin/grep.c:655 #, c-format msgid "unable to grep from object of type %s" msgstr "не удалось выполнить grep из объекта типа %s" -#: builtin/grep.c:716 +#: builtin/grep.c:724 #, c-format msgid "switch `%c' expects a numerical value" msgstr "параметр «%c» ожидает числовое значение" -#: builtin/grep.c:815 +#: builtin/grep.c:823 msgid "search in index instead of in the work tree" msgstr "искать в индексе, а не в рабочем каталоге" -#: builtin/grep.c:817 +#: builtin/grep.c:825 msgid "find in contents not managed by git" msgstr "искать в содержимом не управляемым git" -#: builtin/grep.c:819 +#: builtin/grep.c:827 msgid "search in both tracked and untracked files" msgstr "искать и в отслеживаемых, и в неотслеживаемых файлах" -#: builtin/grep.c:821 +#: builtin/grep.c:829 msgid "ignore files specified via '.gitignore'" msgstr "игнорировать файлы указанные в «.gitignore»" -#: builtin/grep.c:823 +#: builtin/grep.c:831 msgid "recursively search in each submodule" msgstr "рекурсивный поиск по всем подмодулям" -#: builtin/grep.c:826 +#: builtin/grep.c:834 msgid "show non-matching lines" msgstr "искать в несовпадающих строках" -#: builtin/grep.c:828 +#: builtin/grep.c:836 msgid "case insensitive matching" msgstr "без учета регистра" -#: builtin/grep.c:830 +#: builtin/grep.c:838 msgid "match patterns only at word boundaries" msgstr "искать совпадения шаблона только на границах слов" -#: builtin/grep.c:832 +#: builtin/grep.c:840 msgid "process binary files as text" msgstr "обработка двоичных файлов как текста" -#: builtin/grep.c:834 +#: builtin/grep.c:842 msgid "don't match patterns in binary files" msgstr "не искать совпадения шаблона в двоичных файлах" -#: builtin/grep.c:837 +#: builtin/grep.c:845 msgid "process binary files with textconv filters" msgstr "обрабатываться двоичные файлы с помощью фильтров textconv" -#: builtin/grep.c:841 +#: builtin/grep.c:849 msgid "descend at most levels" msgstr "на глубине максиму <глубина> уровней" -#: builtin/grep.c:845 +#: builtin/grep.c:853 msgid "use extended POSIX regular expressions" msgstr "использовать расширенные регулярные выражения POSIX" -#: builtin/grep.c:848 +#: builtin/grep.c:856 msgid "use basic POSIX regular expressions (default)" msgstr "использовать базовые регулярные выражения POSIX (по умолчанию)" -#: builtin/grep.c:851 +#: builtin/grep.c:859 msgid "interpret patterns as fixed strings" msgstr "интерпретировать шаблоны как фиксированные строки" -#: builtin/grep.c:854 +#: builtin/grep.c:862 msgid "use Perl-compatible regular expressions" msgstr "использовать Perl-совместимые регулярные выражения" -#: builtin/grep.c:857 +#: builtin/grep.c:865 msgid "show line numbers" msgstr "вывести номера строк" -#: builtin/grep.c:859 +#: builtin/grep.c:867 msgid "don't show filenames" msgstr "не выводить имена файлов" -#: builtin/grep.c:860 +#: builtin/grep.c:868 msgid "show filenames" msgstr "выводить имена файлов" -#: builtin/grep.c:862 +#: builtin/grep.c:870 msgid "show filenames relative to top directory" msgstr "выводить имена файлов относительно каталога репозитория" -#: builtin/grep.c:864 +#: builtin/grep.c:872 msgid "show only filenames instead of matching lines" msgstr "выводить только имена файлов, а не совпадающие строки" -#: builtin/grep.c:866 +#: builtin/grep.c:874 msgid "synonym for --files-with-matches" msgstr "синоним для --files-with-matches" -#: builtin/grep.c:869 +#: builtin/grep.c:877 msgid "show only the names of files without match" msgstr "выводить только несовпадающие имена файлов" -#: builtin/grep.c:871 +#: builtin/grep.c:879 msgid "print NUL after filenames" msgstr "выводить двоичный НОЛЬ после списка имен файлов" -#: builtin/grep.c:876 +#: builtin/grep.c:884 msgid "show the number of matches instead of matching lines" msgstr "выводить количество совпадений, а не совпадающие строки" -#: builtin/grep.c:877 +#: builtin/grep.c:885 msgid "highlight matches" msgstr "подсвечивать совпадения" -#: builtin/grep.c:879 +#: builtin/grep.c:887 msgid "print empty line between matches from different files" msgstr "выводить пустую строку после совпадений из разных файлов" -#: builtin/grep.c:881 +#: builtin/grep.c:889 msgid "show filename only once above matches from same file" msgstr "выводить имя файла только раз на несколько совпадений в одном файле" -#: builtin/grep.c:884 +#: builtin/grep.c:892 msgid "show context lines before and after matches" msgstr "показать строк контекста перед и после совпадения" -#: builtin/grep.c:887 +#: builtin/grep.c:895 msgid "show context lines before matches" msgstr "показать строк контекста перед совпадением" -#: builtin/grep.c:889 +#: builtin/grep.c:897 msgid "show context lines after matches" msgstr "показать строк контекста после совпадения" -#: builtin/grep.c:891 +#: builtin/grep.c:899 msgid "use worker threads" msgstr "использовать <кол> рабочих потоков" -#: builtin/grep.c:892 +#: builtin/grep.c:900 msgid "shortcut for -C NUM" msgstr "тоже, что и -C КОЛИЧЕСТВО" -#: builtin/grep.c:895 +#: builtin/grep.c:903 msgid "show a line with the function name before matches" msgstr "показать строку с именем функции перед совпадением" -#: builtin/grep.c:897 +#: builtin/grep.c:905 msgid "show the surrounding function" msgstr "показать окружающую функцию" -#: builtin/grep.c:900 +#: builtin/grep.c:908 msgid "read patterns from file" msgstr "прочитать шаблоны из файла" -#: builtin/grep.c:902 +#: builtin/grep.c:910 msgid "match " msgstr "поиск соответствий с <шаблоном>" -#: builtin/grep.c:904 +#: builtin/grep.c:912 msgid "combine patterns specified with -e" msgstr "объединить шаблоны указанные с помощью -e" -#: builtin/grep.c:916 +#: builtin/grep.c:924 msgid "indicate hit with exit status without output" msgstr "ничего не выводить, указать на совпадение с помощью кода выхода" -#: builtin/grep.c:918 +#: builtin/grep.c:926 msgid "show only matches from files that match all patterns" msgstr "показать только совпадения из файлов в которых совпадают все шаблоны" -#: builtin/grep.c:920 +#: builtin/grep.c:928 msgid "show parse tree for grep expression" msgstr "показать дерево разбора для выражения поиска" -#: builtin/grep.c:924 +#: builtin/grep.c:932 msgid "pager" msgstr "пейджер" -#: builtin/grep.c:924 +#: builtin/grep.c:932 msgid "show matching files in the pager" msgstr "показать совпадающие файлы с помощью программы-пейджера" -#: builtin/grep.c:928 +#: builtin/grep.c:936 msgid "allow calling of grep(1) (ignored by this build)" msgstr "разрешить вызов grep(1) (игнорируется в этой сборке)" -#: builtin/grep.c:962 +#: builtin/grep.c:793 msgid "no pattern given." msgstr "не задан шаблон." -#: builtin/grep.c:1028 +#: builtin/grep.c:1039 msgid "--no-index or --untracked cannot be used with revs" msgstr "" "--no-index или --untracked нельзя использовать одновременно с указанием " "ревизии" -#: builtin/grep.c:1036 +#: builtin/grep.c:1047 #, c-format msgid "unable to resolve revision: %s" msgstr "не удалось определить редакцию: %s" -#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705 +#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2852 #, c-format msgid "invalid number of threads specified (%d)" msgstr "указано неправильное количество потоков (%d)" -#: builtin/grep.c:1070 builtin/pack-objects.c:3400 +#: builtin/grep.c:1084 builtin/pack-objects.c:3548 msgid "no threads support, ignoring --threads" msgstr "нет поддержки потоков, игнорирование --threads" -#: builtin/grep.c:1096 +#: builtin/grep.c:1121 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager работает только в рабочем каталоге" @@ -9335,18 +9345,18 @@ msgid "option not supported with --recurse-submodules." msgstr "опция не поддерживается одновременно с --recurse-submodules." -#: builtin/grep.c:1094 +#: builtin/grep.c:877 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" "--cached или --untracked нельзя использовать одновременно с --no-index." -#: builtin/grep.c:1100 +#: builtin/grep.c:885 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" "--[no-]exclude-standard не может использоваться для отслеживаемого " "содержимого." -#: builtin/grep.c:1108 +#: builtin/grep.c:893 msgid "both --cached and trees are given." msgstr "указано одновременно --cached и дерево." @@ -9392,58 +9402,58 @@ msgid "process file as it were from this path" msgstr "обработать файл так, будто он находится по указанному пути" -#: builtin/help.c:46 +#: builtin/help.c:47 msgid "print all available commands" msgstr "вывести список всех доступных команд" -#: builtin/help.c:47 +#: builtin/help.c:48 msgid "exclude guides" msgstr "исключить руководства" -#: builtin/help.c:48 +#: builtin/help.c:49 msgid "print list of useful guides" msgstr "вывести список полезных руководств" -#: builtin/help.c:51 +#: builtin/help.c:52 msgid "show man page" msgstr "открыть руководство в формате man" -#: builtin/help.c:52 +#: builtin/help.c:53 msgid "show manual in web browser" msgstr "открыть руководство в веб-браузере" -#: builtin/help.c:54 +#: builtin/help.c:55 msgid "show info page" msgstr "открыть руководство в формате info" -#: builtin/help.c:61 +#: builtin/help.c:62 msgid "git help [--all] [--guides] [--man | --web | --info] []" msgstr "git help [--all] [--guides] [--man | --web | --info] [<команда>]" -#: builtin/help.c:77 +#: builtin/help.c:163 #, c-format msgid "unrecognized help format '%s'" msgstr "неопознанный формат руководства «%s»" -#: builtin/help.c:104 +#: builtin/help.c:190 msgid "Failed to start emacsclient." msgstr "Сбой при запуске emacsclient." -#: builtin/help.c:117 +#: builtin/help.c:203 msgid "Failed to parse emacsclient version." msgstr "Сбой при определении версии emacsclient." -#: builtin/help.c:125 +#: builtin/help.c:211 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "версия emacsclient «%d» слишком старая (< 22)." -#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183 +#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269 #, c-format msgid "failed to exec '%s'" msgstr "сбой при запуске «%s»" -#: builtin/help.c:221 +#: builtin/help.c:307 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -9452,7 +9462,7 @@ "«%s»: путь для неподдерживаемой программы просмотра man.\n" "Вместо этого используйте «man.<программа>.cmd»." -#: builtin/help.c:233 +#: builtin/help.c:319 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -9461,66 +9471,66 @@ "«%s»: команда для неподдерживаемой программы просмотра man.\n" "Вместо этого используйте «man.<программа>.path»." -#: builtin/help.c:350 +#: builtin/help.c:436 #, c-format msgid "'%s': unknown man viewer." msgstr "«%s»: неизвестная программа просмотра man." -#: builtin/help.c:367 +#: builtin/help.c:453 msgid "no man viewer handled the request" msgstr "программа просмотра man не обработала запрос" -#: builtin/help.c:375 +#: builtin/help.c:461 msgid "no info viewer handled the request" msgstr "программа просмотра info не обработала запрос" -#: command-list.h:195 +#: command-list.h:197 msgid "Defining attributes per path" msgstr "Определение атрибутов для путей файлов или каталогов" -#: builtin/help.c:408 +#: builtin/help.c:412 msgid "Everyday Git With 20 Commands Or So" msgstr "Повседневный Git с 20 командами или около того" -#: builtin/help.c:409 +#: builtin/help.c:413 msgid "A Git glossary" msgstr "Глоссарий Git" -#: command-list.h:203 +#: command-list.h:206 msgid "Specifies intentionally untracked files to ignore" msgstr "Указание специально игнорируемых файлов" -#: command-list.h:204 +#: command-list.h:207 msgid "Defining submodule properties" msgstr "Определение свойств подмодулей" -#: command-list.h:207 +#: command-list.h:210 msgid "Specifying revisions and ranges for Git" msgstr "Указание редакций и диапазонов для Git" -#: builtin/help.c:413 +#: builtin/help.c:417 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "Учебное введение в Git (для версии 1.5.1 или новее)" -#: command-list.h:210 +#: command-list.h:214 msgid "An overview of recommended workflows with Git" msgstr "Обзор рекомендуемых последовательностей выполняемых действий с Git" -#: builtin/help.c:426 +#: builtin/help.c:430 msgid "The common Git guides are:\n" msgstr "Основные руководства Git:\n" -#: builtin/help.c:434 builtin/help.c:445 git.c:336 +#: builtin/help.c:520 builtin/help.c:531 git.c:337 #, c-format msgid "'%s' is aliased to '%s'" msgstr "«%s» — это сокращение для «%s»" -#: builtin/help.c:477 builtin/help.c:507 +#: builtin/help.c:563 builtin/help.c:593 #, c-format msgid "usage: %s%s" msgstr "использование: %s%s" -#: sha1-file.c:2213 builtin/index-pack.c:155 +#: sha1-file.c:2275 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "не удалось открыть %s" @@ -9560,15 +9570,15 @@ msgid "used more bytes than were available" msgstr "использовано больше байт, чем было доступно" -#: builtin/index-pack.c:288 builtin/pack-objects.c:604 +#: builtin/index-pack.c:288 builtin/pack-objects.c:607 msgid "pack too large for current definition of off_t" msgstr "пакет слишком большой для текущего определения off_t" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "размер пакета превышает максимальный допустимый" -#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241 +#: builtin/index-pack.c:306 builtin/repack.c:250 #, c-format msgid "unable to create '%s'" msgstr "не удалось создать «%s»" @@ -9629,89 +9639,89 @@ msgid "serious inflate inconsistency" msgstr "серьезное несоответствие при распаковке" -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 -#: builtin/index-pack.c:803 builtin/index-pack.c:812 +#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 +#: builtin/index-pack.c:804 builtin/index-pack.c:813 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "НАЙДЕНА КОЛЛИЗИЯ SHA1 С %s !" -#: builtin/index-pack.c:738 builtin/pack-objects.c:157 -#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 +#: builtin/index-pack.c:738 builtin/pack-objects.c:159 +#: builtin/pack-objects.c:219 builtin/pack-objects.c:314 #, c-format msgid "unable to read %s" msgstr "не удалось прочитать %s" -#: builtin/index-pack.c:801 +#: builtin/index-pack.c:802 #, c-format msgid "cannot read existing object info %s" msgstr "не удалось прочитать информацию существующего объекта %s" -#: builtin/index-pack.c:809 +#: builtin/index-pack.c:810 #, c-format msgid "cannot read existing object %s" msgstr "не удалось прочитать существующий объект %s" -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:824 #, c-format msgid "invalid blob object %s" msgstr "неправильный файл двоичного объекта %s" -#: builtin/fsck.c:705 builtin/index-pack.c:842 +#: builtin/fsck.c:696 builtin/index-pack.c:843 #, c-format msgid "invalid %s" msgstr "неправильный %s" -#: builtin/index-pack.c:856 +#: builtin/index-pack.c:843 msgid "Error in object" msgstr "Ошибка в объекте" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:848 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Не все дочерние объекты %s достижимы" -#: builtin/index-pack.c:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:920 builtin/index-pack.c:951 msgid "failed to apply delta" msgstr "сбой при применении дельты" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1121 msgid "Receiving objects" msgstr "Получение объектов" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1121 msgid "Indexing objects" msgstr "Индексирование объектов" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1155 msgid "pack is corrupted (SHA1 mismatch)" msgstr "пакет поврежден (несоответствие SHA1)" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1160 msgid "cannot fstat packfile" msgstr "не удалось выполнить fstat для файла пакета" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1163 msgid "pack has junk at the end" msgstr "файл пакета содержит мусор в конце" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1175 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "безумная путаница в parse_pack_objects()" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1198 msgid "Resolving deltas" msgstr "Определение изменений" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481 +#: builtin/index-pack.c:1208 builtin/pack-objects.c:2616 #, c-format msgid "unable to create thread: %s" msgstr "не удалось создать поток: %s" -#: builtin/index-pack.c:1246 +#: builtin/index-pack.c:1249 msgid "confusion beyond insanity" msgstr "безумная путаница" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1255 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" @@ -9719,12 +9729,12 @@ msgstr[1] "завершено с %d локальными объектами" msgstr[2] "завершено с %d локальными объектами" -#: builtin/index-pack.c:1264 +#: builtin/index-pack.c:1267 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Неожиданная контрольная сумма в конце %s (диск поврежден?)" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1271 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" @@ -9732,59 +9742,59 @@ msgstr[1] "пакет содержит %d неразрешенные дельты" msgstr[2] "пакет содержит %d неразрешенных дельт" -#: builtin/index-pack.c:1292 +#: builtin/index-pack.c:1295 #, c-format msgid "unable to deflate appended object (%d)" msgstr "нельзя сжать присоединенный объект (%d)" -#: builtin/index-pack.c:1388 +#: builtin/index-pack.c:1391 #, c-format msgid "local object %s is corrupt" msgstr "локальный объект %s поврежден" -#: builtin/index-pack.c:1402 +#: builtin/index-pack.c:1405 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "имя пакета «%s» не оканчивается на «.pack»" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1430 #, c-format msgid "cannot write %s file '%s'" msgstr "" -#: builtin/index-pack.c:1435 +#: builtin/index-pack.c:1438 #, c-format msgid "cannot close written %s file '%s'" msgstr "" -#: builtin/index-pack.c:1459 +#: builtin/index-pack.c:1462 msgid "error while closing pack file" msgstr "ошибка при закрытии файла пакета" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1476 msgid "cannot store pack file" msgstr "не удалось сохранить файл пакета" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1484 msgid "cannot store index file" msgstr "не удалось сохранить файл индекса" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716 +#: builtin/index-pack.c:1528 builtin/pack-objects.c:2863 #, c-format msgid "bad pack.indexversion=%" msgstr "плохой pack.indexversion=%" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1596 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Не удалось открыть существующий файл пакета «%s»" -#: builtin/index-pack.c:1595 +#: builtin/index-pack.c:1598 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Не удалось открыть существующий файл индекса для «%s»" -#: builtin/index-pack.c:1643 +#: builtin/index-pack.c:1646 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" @@ -9792,7 +9802,7 @@ msgstr[1] "не дельты: %d объекта" msgstr[2] "не дельты: %d объектов" -#: builtin/index-pack.c:1650 +#: builtin/index-pack.c:1653 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" @@ -9800,109 +9810,109 @@ msgstr[1] "длина цепочки = %d: %lu объекта" msgstr[2] "длина цепочки = %d: %lu объектов" -#: builtin/index-pack.c:1689 +#: builtin/index-pack.c:1692 msgid "Cannot come back to cwd" msgstr "Не удалось вернуться в текущий рабочий каталог" -#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 -#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 +#: builtin/index-pack.c:1741 builtin/index-pack.c:1744 +#: builtin/index-pack.c:1760 builtin/index-pack.c:1764 #, c-format msgid "bad %s" msgstr "плохой %s" -#: builtin/index-pack.c:1777 +#: builtin/index-pack.c:1780 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin нельзя использовать без --stdin" -#: builtin/index-pack.c:1779 +#: builtin/index-pack.c:1782 msgid "--stdin requires a git repository" msgstr "опция --stdin требует наличия репозитория git" -#: builtin/index-pack.c:1785 +#: builtin/index-pack.c:1788 msgid "--verify with no packfile name given" msgstr "--verify без указания имени файла пакета" -#: builtin/gc.c:475 builtin/init-db.c:55 +#: builtin/gc.c:475 builtin/init-db.c:57 #, c-format msgid "cannot stat '%s'" msgstr "не удалось выполнить stat для «%s»" -#: builtin/init-db.c:61 +#: builtin/init-db.c:63 #, c-format msgid "cannot stat template '%s'" msgstr "не удалось выполнить stat для шаблона «%s»" -#: builtin/init-db.c:66 +#: builtin/init-db.c:68 #, c-format msgid "cannot opendir '%s'" msgstr "не удалось выполнить opendir для «%s»" -#: builtin/init-db.c:78 +#: builtin/init-db.c:80 #, c-format msgid "cannot readlink '%s'" msgstr "не удалось выполнить readlink для «%s»" -#: builtin/init-db.c:80 +#: builtin/init-db.c:82 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "не удалось создать символьную ссылку «%s» на «%s»" -#: builtin/init-db.c:86 +#: builtin/init-db.c:88 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "не удалось скопировать файл «%s» в «%s»" -#: builtin/init-db.c:90 +#: builtin/init-db.c:92 #, c-format msgid "ignoring template %s" msgstr "игнорирование шаблона %s" -#: builtin/init-db.c:120 +#: builtin/init-db.c:118 #, c-format msgid "templates not found %s" msgstr "шаблоны не найдены %s" -#: builtin/init-db.c:136 +#: builtin/init-db.c:138 #, c-format msgid "not copying templates from '%s': %s" msgstr "не копирую шаблоны из «%s»: %s" -#: builtin/init-db.c:334 +#: builtin/init-db.c:356 #, c-format msgid "unable to handle file type %d" msgstr "не удается обработать файл типа %d" -#: builtin/init-db.c:337 +#: builtin/init-db.c:359 #, c-format msgid "unable to move %s to %s" msgstr "не удается переместить файл %s в %s" -#: builtin/init-db.c:354 builtin/init-db.c:357 +#: builtin/init-db.c:397 builtin/init-db.c:400 #, c-format msgid "%s already exists" msgstr "%s уже существует" -#: builtin/init-db.c:413 +#: builtin/init-db.c:458 #, c-format msgid "Reinitialized existing shared Git repository in %s%s\n" msgstr "Переинициализирован существующий общий репозиторий Git в %s%s\n" -#: builtin/init-db.c:414 +#: builtin/init-db.c:459 #, c-format msgid "Reinitialized existing Git repository in %s%s\n" msgstr "Переинициализирован существующий репозиторий Git в %s%s\n" -#: builtin/init-db.c:418 +#: builtin/init-db.c:463 #, c-format msgid "Initialized empty shared Git repository in %s%s\n" msgstr "Инициализирован пустой общий репозиторий Git в %s%s\n" -#: builtin/init-db.c:419 +#: builtin/init-db.c:464 #, c-format msgid "Initialized empty Git repository in %s%s\n" msgstr "Инициализирован пустой репозиторий Git в %s%s\n" -#: builtin/init-db.c:468 +#: builtin/init-db.c:513 msgid "" "git init [-q | --quiet] [--bare] [--template=] [--" "shared[=]] []" @@ -9910,26 +9920,26 @@ "git init [-q | --quiet] [--bare] [--template=<каталог-шаблонов>] [--" "shared[=<права-доступа>]] [<каталог>]" -#: builtin/init-db.c:491 +#: builtin/init-db.c:538 msgid "permissions" msgstr "права-доступа" -#: builtin/init-db.c:492 +#: builtin/init-db.c:539 msgid "specify that the git repository is to be shared amongst several users" msgstr "" "укажите, если репозиторий git будет использоваться несколькими пользователями" -#: builtin/init-db.c:529 builtin/init-db.c:534 +#: builtin/init-db.c:578 builtin/init-db.c:583 #, c-format msgid "cannot mkdir %s" msgstr "не удалось выполнить mkdir %s" -#: builtin/init-db.c:538 +#: builtin/init-db.c:587 #, c-format msgid "cannot chdir to %s" msgstr "не удалось выполнить chdir в %s" -#: builtin/init-db.c:559 +#: builtin/init-db.c:614 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" @@ -9938,7 +9948,7 @@ "%s (или --work-tree=<каталог>) нельзя использовать без указания %s (или --" "git-dir=<каталог>)" -#: builtin/init-db.c:587 +#: builtin/init-db.c:642 #, c-format msgid "Cannot access work tree '%s'" msgstr "Не удалось получить доступ к рабочему каталогу «%s»" @@ -10003,120 +10013,120 @@ msgid "no input file given for in-place editing" msgstr "ничего не передано, для редактирования файлов на месте" -#: builtin/log.c:55 +#: builtin/log.c:57 msgid "git log [] [] [[--] ...]" msgstr "git log [<опции>] [<диапазон-редакций>] [[--] <путь>…]" -#: builtin/log.c:56 +#: builtin/log.c:58 msgid "git show [] ..." msgstr "git show [<опции>] <объект>…" -#: builtin/log.c:109 +#: builtin/log.c:111 #, c-format msgid "invalid --decorate option: %s" msgstr "неправильный параметр для --decorate: %s" -#: diff.c:5278 builtin/log.c:172 +#: diff.c:5298 builtin/log.c:177 msgid "suppress diff output" msgstr "не выводить список изменений" -#: builtin/log.c:173 +#: builtin/log.c:178 msgid "show source" msgstr "показать источник" -#: builtin/log.c:174 +#: builtin/log.c:179 msgid "Use mail map file" msgstr "Использовать файл соответствия почтовых адресов" -#: builtin/log.c:176 +#: builtin/log.c:182 msgid "only decorate refs that match " msgstr "декорировать только ссылки соответствующие <шаблону>" -#: builtin/log.c:178 +#: builtin/log.c:184 msgid "do not decorate refs that match " msgstr "не декорировать ссылки соответствующие <шаблону>" -#: builtin/log.c:179 +#: builtin/log.c:185 msgid "decorate options" msgstr "опции формата вывода ссылок" -#: builtin/log.c:182 +#: builtin/log.c:188 msgid "Process line range n,m in file, counting from 1" msgstr "Обработать диапазон строк n,m из файла, начиная с 1" -#: builtin/log.c:280 +#: builtin/log.c:298 #, c-format msgid "Final output: %d %s\n" msgstr "Финальный вывод: %d %s\n" -#: builtin/log.c:534 +#: builtin/log.c:556 #, c-format msgid "git show %s: bad file" msgstr "git show %s: плохой файл" -#: builtin/log.c:525 builtin/log.c:619 +#: builtin/log.c:537 builtin/log.c:631 #, c-format msgid "Could not read object %s" msgstr "Не удалось прочитать объект %s" -#: builtin/log.c:643 +#: builtin/log.c:655 #, c-format msgid "Unknown type: %d" msgstr "Неизвестный тип объекта: %d" -#: builtin/log.c:792 +#: builtin/log.c:842 msgid "format.headers without value" msgstr "в format.headers не указано значение" -#: builtin/log.c:909 +#: builtin/log.c:957 msgid "name of output directory is too long" msgstr "слишком длинное имя выходного каталога" -#: builtin/log.c:881 +#: builtin/log.c:893 #, c-format msgid "Cannot open patch file %s" msgstr "Ну удалось открыть файл изменений %s" -#: builtin/log.c:898 +#: builtin/log.c:910 msgid "Need exactly one range." msgstr "Нужен только один диапазон." -#: builtin/log.c:908 +#: builtin/log.c:920 msgid "Not a range." msgstr "Не является диапазоном." -#: builtin/log.c:1014 +#: builtin/log.c:1043 msgid "Cover letter needs email format" msgstr "Сопроводительное письмо должно быть в формате электронной почты" -#: builtin/log.c:1160 +#: builtin/log.c:1249 #, c-format msgid "insane in-reply-to: %s" msgstr "ошибка в поле in-reply-to: %s" -#: builtin/log.c:1187 +#: builtin/log.c:1276 msgid "git format-patch [] [ | ]" msgstr "git format-patch [<опции>] [<начиная-с> | <диапазон-редакций>]" -#: builtin/log.c:1172 +#: builtin/log.c:1204 msgid "Two output directories?" msgstr "Два выходных каталога?" -#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946 +#: builtin/log.c:1311 builtin/log.c:2054 builtin/log.c:2056 builtin/log.c:2068 #, c-format msgid "Unknown commit %s" msgstr "Неизвестный коммит %s" -#: builtin/notes.c:897 builtin/tag.c:545 +#: builtin/notes.c:897 builtin/tag.c:546 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Не удалось разрешить «%s» как ссылку." -#: builtin/log.c:1294 +#: builtin/log.c:1326 msgid "Could not find exact merge base." msgstr "Не удалось найти точную базу слияния." -#: builtin/log.c:1298 +#: builtin/log.c:1330 msgid "" "Failed to get upstream, if you want to record base commit automatically,\n" "please use git branch --set-upstream-to to track a remote branch.\n" @@ -10128,184 +10138,184 @@ "Или же вы можете указать базовый коммит указанием --base=<идентификатор-" "базового-коммита> вручную." -#: builtin/log.c:1318 +#: builtin/log.c:1350 msgid "Failed to find exact merge base" msgstr "Не удалось найти точную базу слияния" -#: builtin/log.c:1406 +#: builtin/log.c:1495 msgid "base commit should be the ancestor of revision list" msgstr "базовый коммит должен быть предком списка редакций" -#: builtin/log.c:1410 +#: builtin/log.c:1499 msgid "base commit shouldn't be in revision list" msgstr "базовый коммит не должен быть в списке редакций" -#: builtin/log.c:1463 +#: builtin/log.c:1552 msgid "cannot get patch id" msgstr "не удалось получить идентификатор патча" -#: builtin/log.c:1560 +#: builtin/log.c:1650 msgid "use [PATCH n/m] even with a single patch" msgstr "выводить [PATCH n/m] даже когда один патч" -#: builtin/log.c:1563 +#: builtin/log.c:1653 msgid "use [PATCH] even with multiple patches" msgstr "выводить [PATCH] даже когда несколько патчей" -#: builtin/log.c:1567 +#: builtin/log.c:1657 msgid "print patches to standard out" msgstr "выводить патчи на стандартный вывод" -#: builtin/log.c:1569 +#: builtin/log.c:1659 msgid "generate a cover letter" msgstr "создать сопроводительное письмо" -#: builtin/log.c:1571 +#: builtin/log.c:1661 msgid "use simple number sequence for output file names" msgstr "" "использовать простую последовательность чисел для имен выходных файлов" -#: builtin/log.c:1572 +#: builtin/log.c:1662 msgid "sfx" msgstr "суффикс" -#: builtin/log.c:1573 +#: builtin/log.c:1663 msgid "use instead of '.patch'" msgstr "использовать суффикс <суффикс> вместо «.patch»" -#: builtin/log.c:1575 +#: builtin/log.c:1665 msgid "start numbering patches at instead of 1" msgstr "начать нумерацию патчей с , а не с 1" -#: builtin/log.c:1577 +#: builtin/log.c:1667 msgid "mark the series as Nth re-roll" msgstr "пометить серию как энную попытку" -#: builtin/log.c:1579 +#: builtin/log.c:1669 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Использовать [RFC PATCH] вместо [PATCH]" -#: builtin/log.c:1582 +#: builtin/log.c:1675 msgid "Use [] instead of [PATCH]" msgstr "Использовать [<префикс>] вместо [PATCH]" -#: builtin/log.c:1585 +#: builtin/log.c:1678 msgid "store resulting files in " msgstr "сохранить результирующие файлы в <каталог>" -#: builtin/log.c:1588 +#: builtin/log.c:1681 msgid "don't strip/add [PATCH]" msgstr "не обрезать/добавлять [PATCH]" -#: builtin/log.c:1591 +#: builtin/log.c:1684 msgid "don't output binary diffs" msgstr "не выводить двоичные изменения" -#: builtin/log.c:1593 +#: builtin/log.c:1686 msgid "output all-zero hash in From header" msgstr "выводить нулевую хеш-сумму в заголовке From" -#: builtin/log.c:1595 +#: builtin/log.c:1688 msgid "don't include a patch matching a commit upstream" msgstr "не включать патч, если коммит уже есть в вышестоящей ветке" -#: builtin/log.c:1597 +#: builtin/log.c:1690 msgid "show patch format instead of default (patch + stat)" msgstr "выводить в формате патча, а не в стандартном (патч + статистика)" -#: builtin/log.c:1599 +#: builtin/log.c:1692 msgid "Messaging" msgstr "Передача сообщений" -#: builtin/log.c:1600 +#: builtin/log.c:1693 msgid "header" msgstr "заголовок" -#: builtin/log.c:1601 +#: builtin/log.c:1694 msgid "add email header" msgstr "добавить заголовок сообщения" -#: builtin/log.c:1602 builtin/log.c:1604 +#: builtin/log.c:1695 builtin/log.c:1696 msgid "email" msgstr "почта" -#: builtin/log.c:1602 +#: builtin/log.c:1695 msgid "add To: header" msgstr "добавить заголовок To:" -#: builtin/log.c:1604 +#: builtin/log.c:1696 msgid "add Cc: header" msgstr "добавить заголовок Cc:" -#: builtin/log.c:1606 +#: builtin/log.c:1697 msgid "ident" msgstr "идентификатор" -#: builtin/log.c:1607 +#: builtin/log.c:1698 msgid "set From address to (or committer ident if absent)" msgstr "" "установить адрес отправителя на <идентификатор> (или на идентификатор " "коммитера, если отсутствует)" -#: builtin/log.c:1609 +#: builtin/log.c:1700 msgid "message-id" msgstr "идентификатор-сообщения" -#: builtin/log.c:1610 +#: builtin/log.c:1701 msgid "make first mail a reply to " msgstr "сделать первое письмо ответом на <идентификатор-сообщения>" -#: builtin/log.c:1611 builtin/log.c:1614 +#: builtin/log.c:1702 builtin/log.c:1705 msgid "boundary" msgstr "вложение" -#: builtin/log.c:1612 +#: builtin/log.c:1703 msgid "attach the patch" msgstr "приложить патч" -#: builtin/log.c:1615 +#: builtin/log.c:1706 msgid "inline the patch" msgstr "включить патч в текст письма" -#: builtin/log.c:1619 +#: builtin/log.c:1710 msgid "enable message threading, styles: shallow, deep" msgstr "" "включить в письмах иерархичность, стили: shallow (частичную), deep (глубокую)" -#: builtin/log.c:1621 +#: builtin/log.c:1712 msgid "signature" msgstr "подпись" -#: builtin/log.c:1622 +#: builtin/log.c:1713 msgid "add a signature" msgstr "добавить подпись" -#: builtin/log.c:1623 +#: builtin/log.c:1714 msgid "base-commit" msgstr "базовый коммит" -#: builtin/log.c:1624 +#: builtin/log.c:1715 msgid "add prerequisite tree info to the patch series" msgstr "добавить информацию о требовании дерева к серии патчей" -#: builtin/log.c:1626 +#: builtin/log.c:1717 msgid "add a signature from a file" msgstr "добавить подпись из файла" -#: builtin/log.c:1627 +#: builtin/log.c:1718 msgid "don't print the patch filenames" msgstr "не выводить имена файлов патчей" -#: builtin/log.c:1629 +#: builtin/log.c:1720 msgid "show progress while generating patches" msgstr "показать прогресс выполнения во создания патчей" -#: builtin/log.c:1711 +#: builtin/log.c:1812 #, c-format msgid "invalid ident line: %s" msgstr "неправильная строка идентификации: %s" -#: builtin/log.c:1600 +#: builtin/log.c:1362 msgid "-n and -k are mutually exclusive." msgstr "-n и -k нельзя использовать одновременно" @@ -10313,45 +10323,45 @@ msgid "--subject-prefix/--rfc and -k are mutually exclusive." msgstr "--subject-prefix/--rfc и -k нельзя использовать одновременно." -#: builtin/log.c:1736 +#: builtin/log.c:1837 msgid "--name-only does not make sense" msgstr "--name-only не имеет смысла" -#: builtin/log.c:1738 +#: builtin/log.c:1839 msgid "--name-status does not make sense" msgstr "--name-status не имеет смысла" -#: builtin/log.c:1740 +#: builtin/log.c:1841 msgid "--check does not make sense" msgstr "--check не имеет смысла" -#: builtin/log.c:1773 +#: builtin/log.c:1874 msgid "standard output, or directory, which one?" msgstr "стандартный вывод или каталог?" -#: builtin/log.c:1648 +#: builtin/log.c:1729 #, c-format msgid "Could not create directory '%s'" msgstr "Не удалось создать каталог «%s»" -#: builtin/log.c:1912 +#: builtin/log.c:2013 #, c-format msgid "unable to read signature file '%s'" msgstr "не удалось прочитать файл подписи «%s»" -#: builtin/log.c:1948 +#: builtin/log.c:2049 msgid "Generating patches" msgstr "Создание патчей" -#: builtin/log.c:1817 +#: builtin/log.c:1931 msgid "Failed to create output files" msgstr "Сбой при создании выходных файлов" -#: builtin/log.c:2051 +#: builtin/log.c:2152 msgid "git cherry [-v] [ [ []]]" msgstr "git cherry [-v] [<вышестоящая-ветка> [<редакция> [<ограничение>]]]" -#: builtin/log.c:2105 +#: builtin/log.c:2206 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" @@ -10359,110 +10369,110 @@ "Не удалось найти отслеживаемую внешнюю ветку, укажите <вышестоящую-ветку> " "вручную.\n" -#: builtin/ls-files.c:470 +#: builtin/ls-files.c:471 msgid "git ls-files [] [...]" msgstr "git ls-files [<опции>] [<файл>…]" -#: builtin/ls-files.c:526 +#: builtin/ls-files.c:527 msgid "identify the file status with tags" msgstr "выводить имена файлов с метками" -#: builtin/ls-files.c:528 +#: builtin/ls-files.c:529 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" "использовать символы в нижнем регистре для «предположительно без изменений» " "файлов" -#: builtin/ls-files.c:530 +#: builtin/ls-files.c:531 msgid "use lowercase letters for 'fsmonitor clean' files" msgstr "использовать символы нижнего регистра для файлов «fsmonitor clean»" -#: builtin/ls-files.c:532 +#: builtin/ls-files.c:533 msgid "show cached files in the output (default)" msgstr "показывать кэшированные файлы при выводе (по умолчанию)" -#: builtin/ls-files.c:534 +#: builtin/ls-files.c:535 msgid "show deleted files in the output" msgstr "показывать удаленные файлы при выводе" -#: builtin/ls-files.c:536 +#: builtin/ls-files.c:537 msgid "show modified files in the output" msgstr "показывать измененные файлы при выводе" -#: builtin/ls-files.c:538 +#: builtin/ls-files.c:539 msgid "show other files in the output" msgstr "показывать другие файлы при выводе" -#: builtin/ls-files.c:540 +#: builtin/ls-files.c:541 msgid "show ignored files in the output" msgstr "показывать игнорируемые файлы при выводе" -#: builtin/ls-files.c:543 +#: builtin/ls-files.c:544 msgid "show staged contents' object name in the output" msgstr "показывать имя индексированного объекта на выводе" -#: builtin/ls-files.c:545 +#: builtin/ls-files.c:546 msgid "show files on the filesystem that need to be removed" msgstr "показывать файлы в файловой системе, которые должны быть удалены" -#: builtin/ls-files.c:547 +#: builtin/ls-files.c:548 msgid "show 'other' directories' names only" msgstr "показывать только имена у «других» каталогов" -#: builtin/ls-files.c:549 +#: builtin/ls-files.c:550 msgid "show line endings of files" msgstr "показать концы строк файлов" -#: builtin/ls-files.c:551 +#: builtin/ls-files.c:552 msgid "don't show empty directories" msgstr "не показывать пустые каталоги" -#: builtin/ls-files.c:554 +#: builtin/ls-files.c:555 msgid "show unmerged files in the output" msgstr "показывать не слитые файлы на выводе" -#: builtin/ls-files.c:556 +#: builtin/ls-files.c:557 msgid "show resolve-undo information" msgstr "показывать информации о разрешении конфликтов и отмене" -#: builtin/ls-files.c:558 +#: builtin/ls-files.c:559 msgid "skip files matching pattern" msgstr "пропустить файлы, соответствующие шаблону" -#: builtin/ls-files.c:561 +#: builtin/ls-files.c:562 msgid "exclude patterns are read from " msgstr "прочитать шаблоны исключения из <файл>" -#: builtin/ls-files.c:564 +#: builtin/ls-files.c:565 msgid "read additional per-directory exclude patterns in " msgstr "прочитать дополнительные покаталожные шаблоны исключения из <файл>" -#: builtin/ls-files.c:566 +#: builtin/ls-files.c:567 msgid "add the standard git exclusions" msgstr "добавить стандартные исключения git" -#: builtin/ls-files.c:570 +#: builtin/ls-files.c:571 msgid "make the output relative to the project top directory" msgstr "выводить пути относительно корневого каталога проекта" -#: builtin/ls-files.c:573 +#: builtin/ls-files.c:574 msgid "recurse through submodules" msgstr "рекурсивно по подмодулям" -#: builtin/ls-files.c:575 +#: builtin/ls-files.c:576 msgid "if any is not in the index, treat this as an error" msgstr "если какой-либо <файл> не в индексе, считать это ошибкой" -#: builtin/ls-files.c:576 +#: builtin/ls-files.c:577 msgid "tree-ish" msgstr "указатель-дерева" -#: builtin/ls-files.c:577 +#: builtin/ls-files.c:578 msgid "pretend that paths removed since are still present" msgstr "" "притвориться, что пути удалены, т.к. <указатель-дерева> еще существует" -#: builtin/ls-files.c:579 +#: builtin/ls-files.c:580 msgid "show debugging data" msgstr "показать отладочную информацию" @@ -10480,7 +10490,7 @@ msgid "do not print remote URL" msgstr "не выводить URL внешних репозиториев" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1384 msgid "exec" msgstr "запуск" @@ -10557,184 +10567,184 @@ msgid "empty mbox: '%s'" msgstr "пустой mbox: «%s»" -#: builtin/merge.c:55 +#: builtin/merge.c:56 msgid "git merge [] [...]" msgstr "git merge [<опции>] [<коммит>…]" -#: builtin/merge.c:56 +#: builtin/merge.c:57 msgid "git merge --abort" msgstr "git merge --abort" -#: builtin/merge.c:57 +#: builtin/merge.c:58 msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:118 +#: builtin/merge.c:121 msgid "switch `m' requires a value" msgstr "при указании параметра «m» требуется указать значение" -#: builtin/merge.c:187 +#: builtin/merge.c:190 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Не удалось найти стратегию слияния «%s».\n" -#: builtin/merge.c:188 +#: builtin/merge.c:191 #, c-format msgid "Available strategies are:" msgstr "Доступные стратегии:" -#: builtin/merge.c:193 +#: builtin/merge.c:196 #, c-format msgid "Available custom strategies are:" msgstr "Доступные пользовательские стратегии:" -#: builtin/merge.c:244 builtin/pull.c:152 +#: builtin/merge.c:247 builtin/pull.c:133 msgid "do not show a diffstat at the end of the merge" msgstr "не выводить статистику изменений после окончания слияния" -#: builtin/merge.c:247 builtin/pull.c:155 +#: builtin/merge.c:250 builtin/pull.c:136 msgid "show a diffstat at the end of the merge" msgstr "вывести статистику изменений после окончания слияния" -#: builtin/merge.c:248 builtin/pull.c:158 +#: builtin/merge.c:251 builtin/pull.c:139 msgid "(synonym to --stat)" msgstr "(синоним для --stat)" -#: builtin/merge.c:250 builtin/pull.c:161 +#: builtin/merge.c:253 builtin/pull.c:142 msgid "add (at most ) entries from shortlog to merge commit message" msgstr "" "добавить (максимум ) записей из короткого журнала в сообщение коммита у " "слияния" -#: builtin/merge.c:253 builtin/pull.c:167 +#: builtin/merge.c:256 builtin/pull.c:148 msgid "create a single commit instead of doing a merge" msgstr "создать один коммит, вместо выполнения слияния" -#: builtin/merge.c:255 builtin/pull.c:170 +#: builtin/merge.c:258 builtin/pull.c:151 msgid "perform a commit if the merge succeeds (default)" msgstr "сделать коммит, если слияние прошло успешно (по умолчанию)" -#: builtin/merge.c:257 builtin/pull.c:173 +#: builtin/merge.c:260 builtin/pull.c:154 msgid "edit message before committing" msgstr "отредактировать сообщение перед выполнением коммита" -#: builtin/merge.c:259 +#: builtin/merge.c:262 msgid "allow fast-forward (default)" msgstr "разрешить перемотку вперед (по умолчанию)" -#: builtin/merge.c:261 builtin/pull.c:180 +#: builtin/merge.c:264 builtin/pull.c:161 msgid "abort if fast-forward is not possible" msgstr "отменить выполнение слияния, если перемотка вперед невозможна" -#: builtin/merge.c:265 builtin/pull.c:183 +#: builtin/merge.c:268 builtin/pull.c:164 msgid "verify that the named commit has a valid GPG signature" msgstr "проверить, что указанный коммит имеет верную электронную подпись GPG" -#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187 -#: builtin/rebase.c:493 builtin/rebase.c:1501 builtin/revert.c:114 +#: builtin/merge.c:269 builtin/notes.c:787 builtin/pull.c:168 +#: builtin/rebase.c:527 builtin/rebase.c:1398 builtin/revert.c:114 msgid "strategy" msgstr "стратегия" -#: builtin/merge.c:267 builtin/pull.c:188 +#: builtin/merge.c:270 builtin/pull.c:169 msgid "merge strategy to use" msgstr "используемая стратегия слияния" -#: builtin/merge.c:268 builtin/pull.c:191 +#: builtin/merge.c:271 builtin/pull.c:172 msgid "option=value" msgstr "опция=значение" -#: builtin/merge.c:269 builtin/pull.c:192 +#: builtin/merge.c:272 builtin/pull.c:173 msgid "option for selected merge strategy" msgstr "опции для выбранной стратегии слияния" -#: builtin/merge.c:271 +#: builtin/merge.c:274 msgid "merge commit message (for a non-fast-forward merge)" msgstr "сообщение коммита для слияния (для слияния без перемотки вперед)" -#: builtin/merge.c:278 +#: builtin/merge.c:281 msgid "abort the current in-progress merge" msgstr "отменить выполнение происходящего слияния" -#: builtin/merge.c:282 +#: builtin/merge.c:285 msgid "continue the current in-progress merge" msgstr "продолжить выполнение происходящего слияния" -#: builtin/merge.c:284 builtin/pull.c:199 +#: builtin/merge.c:287 builtin/pull.c:180 msgid "allow merging unrelated histories" msgstr "разрешить слияние несвязанных историй изменений" -#: builtin/merge.c:241 +#: builtin/merge.c:277 msgid "verify commit-msg hook" msgstr "проверить перехватчик commit-msg" -#: builtin/merge.c:307 +#: builtin/merge.c:311 msgid "could not run stash." msgstr "не удалось выполнить stash." -#: builtin/merge.c:312 +#: builtin/merge.c:316 msgid "stash failed" msgstr "сбой при выполнении stash" -#: builtin/merge.c:317 +#: builtin/merge.c:321 #, c-format msgid "not a valid object: %s" msgstr "неправильный объект: %s" -#: builtin/merge.c:339 builtin/merge.c:356 +#: builtin/merge.c:343 builtin/merge.c:360 msgid "read-tree failed" msgstr "сбой при выполнении read-tree" -#: builtin/merge.c:386 +#: builtin/merge.c:390 msgid " (nothing to squash)" msgstr " (нечего уплотнять)" -#: builtin/merge.c:397 +#: builtin/merge.c:401 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Уплотнение коммита — не обновляя HEAD\n" -#: builtin/merge.c:447 +#: builtin/merge.c:451 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Нет сообщения слияния — не обновляем HEAD\n" -#: builtin/merge.c:498 +#: builtin/merge.c:502 #, c-format msgid "'%s' does not point to a commit" msgstr "«%s» не указывает на коммит" -#: builtin/merge.c:585 +#: builtin/merge.c:589 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Неправильная строка branch.%s.mergeoptions: %s" -#: builtin/merge.c:705 +#: builtin/merge.c:716 msgid "Not handling anything other than two heads merge." msgstr "Не обрабатываю ничего, кроме слияния двух указателей на ветки." -#: builtin/merge.c:719 +#: builtin/merge.c:730 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Неизвестный параметр merge-recursive: -X%s" -#: builtin/merge.c:734 +#: builtin/merge.c:745 #, c-format msgid "unable to write %s" msgstr "не удалось записать %s" -#: builtin/merge.c:786 +#: builtin/merge.c:797 #, c-format msgid "Could not read from '%s'" msgstr "Не удалось прочесть из «%s»" -#: builtin/merge.c:795 +#: builtin/merge.c:806 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Не выполняю коммит слияния; используйте «git commit» для завершения " "слияния.\n" -#: builtin/merge.c:764 +#: builtin/merge.c:797 #, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" @@ -10750,70 +10760,70 @@ "Строки, начинающиеся с «%c» будут проигнорированы, а пустое\n" "сообщение отменяет процесс коммита.\n" -#: builtin/merge.c:862 +#: builtin/merge.c:873 msgid "Empty commit message." msgstr "Пустое сообщение коммита." -#: builtin/merge.c:877 +#: builtin/merge.c:888 #, c-format msgid "Wonderful.\n" msgstr "Прекрасно.\n" -#: builtin/merge.c:938 +#: builtin/merge.c:949 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Не удалось провести автоматическое слияние; исправьте конфликты и сделайте " "коммит результата.\n" -#: builtin/merge.c:977 +#: builtin/merge.c:988 msgid "No current branch." msgstr "Нет текущей ветки." -#: builtin/merge.c:979 +#: builtin/merge.c:990 msgid "No remote for the current branch." msgstr "У текущей ветки нет внешнего репозитория." -#: builtin/merge.c:981 +#: builtin/merge.c:992 msgid "No default upstream defined for the current branch." msgstr "Для текущей ветки не указана вышестоящая ветка по умолчанию." -#: builtin/merge.c:986 +#: builtin/merge.c:997 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Не указана внешняя отслеживаемая ветка для %s на %s" -#: builtin/merge.c:1043 +#: builtin/merge.c:1054 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Плохое значение «%s» в переменной окружения «%s»" -#: builtin/merge.c:1146 +#: builtin/merge.c:1157 #, c-format msgid "not something we can merge in %s: %s" msgstr "не является тем, что можно слить в %s: %s" -#: builtin/merge.c:1180 +#: builtin/merge.c:1191 msgid "not something we can merge" msgstr "не является тем, что можно слить" -#: builtin/merge.c:1283 +#: builtin/merge.c:1295 msgid "--abort expects no arguments" msgstr "опция --abort не принимает аргументы" -#: builtin/merge.c:1287 +#: builtin/merge.c:1299 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Нет слияния, которое можно отменить (отсутствует файл MERGE_HEAD)." -#: builtin/merge.c:1309 +#: builtin/merge.c:1330 msgid "--continue expects no arguments" msgstr "опция --continue не принимает аргументы" -#: builtin/merge.c:1313 +#: builtin/merge.c:1334 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Сейчас не происходит слияние (отсутствует файл MERGE_HEAD)." -#: builtin/merge.c:1329 +#: builtin/merge.c:1350 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10821,7 +10831,7 @@ "Вы не завершили слияние (присутствует файл MERGE_HEAD).\n" "Выполните коммит ваших изменений, перед слиянием." -#: builtin/merge.c:1336 +#: builtin/merge.c:1357 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -10829,115 +10839,115 @@ "Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD).\n" "Пожалуйста, закоммитьте ваши изменения, перед слиянием." -#: builtin/merge.c:1339 +#: builtin/merge.c:1360 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD)." -#: builtin/merge.c:1353 +#: builtin/merge.c:1374 msgid "You cannot combine --squash with --no-ff." msgstr "Нельзя использовать одновременно --squash и --no-ff." -#: builtin/merge.c:1371 +#: builtin/merge.c:1392 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Коммит не указан и параметр merge.defaultToUpstream не установлен." -#: builtin/merge.c:1388 +#: builtin/merge.c:1409 msgid "Squash commit into empty head not supported yet" msgstr "Уплотнение коммита в пустую ветку еще не поддерживается" -#: builtin/merge.c:1390 +#: builtin/merge.c:1411 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" "Коммит, не являющийся перемоткой вперед, нет смысла делать в пустую ветку." -#: builtin/merge.c:1395 +#: builtin/merge.c:1416 #, c-format msgid "%s - not something we can merge" msgstr "%s не является тем, что можно слить" -#: builtin/merge.c:1397 +#: builtin/merge.c:1418 msgid "Can merge only exactly one commit into empty head" msgstr "Можно только один коммит в пустую ветку." -#: commit.c:1128 +#: commit.c:1168 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "" "Коммит %s содержит не доверенную GPG подпись, предположительно от %s." -#: commit.c:1131 +#: commit.c:1172 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Коммит %s содержит плохую GPG подпись, предположительно от %s." -#: commit.c:1134 +#: commit.c:1175 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Коммит %s не содержит GPG подпись." -#: commit.c:1137 +#: commit.c:1178 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Коммит %s содержит действительную GPG подпись, от %s.\n" -#: builtin/merge.c:1476 +#: builtin/merge.c:1499 msgid "refusing to merge unrelated histories" msgstr "отказ слияния несвязанных историй изменений" -#: builtin/merge.c:1485 +#: builtin/merge.c:1508 msgid "Already up to date." msgstr "Уже обновлено." -#: builtin/merge.c:1495 +#: builtin/merge.c:1518 #, c-format msgid "Updating %s..%s\n" msgstr "Обновление %s..%s\n" -#: builtin/merge.c:1537 +#: builtin/merge.c:1564 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Попытка тривиального слияния в индексе…\n" -#: builtin/merge.c:1544 +#: builtin/merge.c:1571 #, c-format msgid "Nope.\n" msgstr "Не вышло.\n" -#: builtin/merge.c:1569 +#: builtin/merge.c:1596 msgid "Already up to date. Yeeah!" msgstr "Уже обновлено. Круто!" -#: builtin/merge.c:1575 +#: builtin/merge.c:1602 msgid "Not possible to fast-forward, aborting." msgstr "Перемотка вперед невозможна, отмена." -#: builtin/merge.c:1598 builtin/merge.c:1663 +#: builtin/merge.c:1630 builtin/merge.c:1695 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Перемотка дерева к исходному состоянию…\n" -#: builtin/merge.c:1602 +#: builtin/merge.c:1634 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Попытка слияния с помощью стратегии %s…\n" -#: builtin/merge.c:1654 +#: builtin/merge.c:1686 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ни одна стратегия слияния не обработала слияние.\n" -#: builtin/merge.c:1656 +#: builtin/merge.c:1688 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Сбой при слиянии с помощью стратегии %s.\n" -#: builtin/merge.c:1665 +#: builtin/merge.c:1697 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Использую %s для подготовки ручного разрешения конфликтов.\n" -#: builtin/merge.c:1677 +#: builtin/merge.c:1711 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -10964,23 +10974,23 @@ msgid "git merge-base --fork-point []" msgstr "git merge-base --fork-point <ссылка> [<коммит>]" -#: builtin/merge-base.c:153 +#: builtin/merge-base.c:143 msgid "output all common ancestors" msgstr "вывести всех общих предков" -#: builtin/merge-base.c:155 +#: builtin/merge-base.c:145 msgid "find ancestors for a single n-way merge" msgstr "вывести предков для одного многоходового слияния" -#: builtin/merge-base.c:157 +#: builtin/merge-base.c:147 msgid "list revs not reachable from others" msgstr "вывести список редаций, которые не достижимы из друг друга" -#: builtin/merge-base.c:159 +#: builtin/merge-base.c:149 msgid "is the first one ancestor of the other?" msgstr "является первым предком второго указанного коммита?" -#: builtin/merge-base.c:161 +#: builtin/merge-base.c:151 msgid "find where forked from reflog of " msgstr "найти журнале ссылок <ссылка> где именно <коммит> разветвился" @@ -11161,52 +11171,52 @@ msgid "Renaming %s to %s\n" msgstr "Переименование %s в %s\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511 +#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:520 #, c-format msgid "renaming '%s' failed" msgstr "сбой при переименовании «%s»" -#: builtin/name-rev.c:356 +#: builtin/name-rev.c:465 msgid "git name-rev [] ..." msgstr "git name-rev [<опции>] <коммит>…" -#: builtin/name-rev.c:357 +#: builtin/name-rev.c:466 msgid "git name-rev [] --all" msgstr "git name-rev [<опции>] --all" -#: builtin/name-rev.c:358 +#: builtin/name-rev.c:467 msgid "git name-rev [] --stdin" msgstr "git name-rev [<опции>] --stdin" -#: builtin/name-rev.c:415 +#: builtin/name-rev.c:524 msgid "print only names (no SHA-1)" msgstr "выводить только имена (без SHA-1)" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:525 msgid "only use tags to name the commits" msgstr "использовать только метки для именования коммитов" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:527 msgid "only use refs matching " msgstr "использовать только ссылки, соответствующие <шаблону>" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:529 msgid "ignore refs matching " msgstr "игнорировать ссылки, соответствующие <шаблону>" -#: builtin/name-rev.c:422 +#: builtin/name-rev.c:531 msgid "list all commits reachable from all refs" msgstr "вывести список всех коммитов, достижимых со всех ссылок" -#: builtin/name-rev.c:423 +#: builtin/name-rev.c:532 msgid "read from stdin" msgstr "прочитать из стандартного ввода" -#: builtin/name-rev.c:424 +#: builtin/name-rev.c:533 msgid "allow to print `undefined` names (default)" msgstr "разрешить вывод «undefined», если не найдено (по умолчанию)" -#: builtin/name-rev.c:430 +#: builtin/name-rev.c:539 msgid "dereference tags in the input (internal use)" msgstr "разыменовывать введенные метки (для внутреннего использования)" @@ -11354,12 +11364,12 @@ msgid "the note contents have been left in %s" msgstr "содержимое заметки осталось в %s" -#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:530 #, c-format msgid "cannot read '%s'" msgstr "не удалось прочитать «%s»" -#: builtin/notes.c:242 builtin/tag.c:532 +#: builtin/notes.c:242 builtin/tag.c:533 #, c-format msgid "could not open or read '%s'" msgstr "не удалось открыть или прочитать «%s»" @@ -11606,7 +11616,7 @@ msgid "read object names from the standard input" msgstr "прочитать имена объектов из стандартного ввода" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 +#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:164 msgid "do not remove, show only" msgstr "не удалять, только показать список" @@ -11622,211 +11632,211 @@ msgid "use notes from " msgstr "использовать заметку из <ссылка-на-заметку>" -#: builtin/notes.c:1034 builtin/stash.c:1607 +#: builtin/notes.c:1034 builtin/stash.c:1608 #, c-format msgid "unknown subcommand: %s" msgstr "неизвестная подкоманда: %s" -#: builtin/pack-objects.c:52 +#: builtin/pack-objects.c:53 msgid "" "git pack-objects --stdout [...] [< | < ]" msgstr "" "git pack-objects --stdout [<опции>…] [< <список-ссылок> | < <список-" "объектов>]" -#: builtin/pack-objects.c:53 +#: builtin/pack-objects.c:54 msgid "" "git pack-objects [...] [< | < ]" msgstr "" "git pack-objects [<опции>…] <имя-базы> [< <список-ссылок> | < <список-" "объектов>]" -#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 +#: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235 #, c-format msgid "deflate error (%d)" msgstr "ошибка сжатия (%d)" -#: builtin/pack-objects.c:841 +#: builtin/pack-objects.c:973 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "отключение записи битовых карт, так как карты были разбиты на части из-за " "pack.packSizeLimit" -#: builtin/pack-objects.c:854 +#: builtin/pack-objects.c:986 msgid "Writing objects" msgstr "Запись объектов" -#: builtin/pack-objects.c:1164 +#: builtin/pack-objects.c:1298 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "отключение записи битовых карт, так как некоторые объекты не были упакованы" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2802 msgid "Compressing objects" msgstr "Сжатие объектов" -#: builtin/pack-objects.c:2846 +#: builtin/pack-objects.c:2993 msgid "invalid value for --missing" msgstr "недопустимое значение для --missing" -#: builtin/pack-objects.c:3194 +#: builtin/pack-objects.c:3342 #, c-format msgid "unsupported index version %s" msgstr "неподдерживаемая версия индекса %s" -#: builtin/pack-objects.c:3198 +#: builtin/pack-objects.c:3346 #, c-format msgid "bad index version '%s'" msgstr "плохая версия индекса «%s»" -#: builtin/pack-objects.c:3228 +#: builtin/bundle.c:66 builtin/pack-objects.c:3376 msgid "do not show progress meter" msgstr "не выводить прогресс выполнения" -#: builtin/pack-objects.c:3230 +#: builtin/bundle.c:68 builtin/pack-objects.c:3378 msgid "show progress meter" msgstr "показать прогресс выполнения" -#: builtin/pack-objects.c:3232 +#: builtin/bundle.c:70 builtin/pack-objects.c:3380 msgid "show progress meter during object writing phase" msgstr "показать прогресс выполнения во время записи объектов" -#: builtin/pack-objects.c:3235 +#: builtin/bundle.c:73 builtin/pack-objects.c:3383 msgid "similar to --all-progress when progress meter is shown" msgstr "похоже на --all-progress при включенном прогрессе выполнения" -#: builtin/pack-objects.c:2970 +#: builtin/pack-objects.c:2610 msgid "version[,offset]" msgstr "версия[,смещение]" -#: builtin/pack-objects.c:3237 +#: builtin/pack-objects.c:3385 msgid "write the pack index file in the specified idx format version" msgstr "записать файл индекса пакета в указанной версии формата" -#: builtin/pack-objects.c:3240 +#: builtin/pack-objects.c:3388 msgid "maximum size of each output pack file" msgstr "максимальный размер каждого выходного файла пакета" -#: builtin/pack-objects.c:3242 +#: builtin/pack-objects.c:3390 msgid "ignore borrowed objects from alternate object store" msgstr "" "игнорировать чужие объекты, взятые из альтернативного хранилища объектов" -#: builtin/pack-objects.c:3244 +#: builtin/pack-objects.c:3392 msgid "ignore packed objects" msgstr "игнорировать упакованные объекты" -#: builtin/pack-objects.c:3246 +#: builtin/pack-objects.c:3394 msgid "limit pack window by objects" msgstr "ограничить окно пакета по количеству объектов" -#: builtin/pack-objects.c:3248 +#: builtin/pack-objects.c:3396 msgid "limit pack window by memory in addition to object limit" msgstr "дополнительно к количеству объектов ограничить окно пакета по памяти" -#: builtin/pack-objects.c:3250 +#: builtin/pack-objects.c:3398 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "максимальная разрешенная длина цепочки дельт в результирующем пакете" -#: builtin/pack-objects.c:3252 +#: builtin/pack-objects.c:3400 msgid "reuse existing deltas" msgstr "использовать повторно существующие дельты" -#: builtin/pack-objects.c:3254 +#: builtin/pack-objects.c:3402 msgid "reuse existing objects" msgstr "использовать повторно существующие объекты" -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3404 msgid "use OFS_DELTA objects" msgstr "использовать объекты OFS_DELTA" -#: builtin/pack-objects.c:3258 +#: builtin/pack-objects.c:3406 msgid "use threads when searching for best delta matches" msgstr "использовать многопоточность при поиске лучших совпадений дельт" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3408 msgid "do not create an empty pack output" msgstr "не создавать пустые выходные пакеты" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3410 msgid "read revision arguments from standard input" msgstr "прочитать аргументы редакций из стандартного ввода" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3412 msgid "limit the objects to those that are not yet packed" msgstr "ограничиться объектами, которые еще не упакованы" -#: builtin/pack-objects.c:3267 +#: builtin/pack-objects.c:3415 msgid "include objects reachable from any reference" msgstr "включить объекты, которые достижимы по любой из ссылок" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3418 msgid "include objects referred by reflog entries" msgstr "включить объекты, на которые ссылаются записи журнала ссылок" -#: builtin/pack-objects.c:3273 +#: builtin/pack-objects.c:3421 msgid "include objects referred to by the index" msgstr "включить объекты, на которые ссылается индекс" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3424 msgid "output pack to stdout" msgstr "вывести пакет на стандартный вывод" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3426 msgid "include tag objects that refer to objects to be packed" msgstr "включить объекты меток, которые ссылаются на упаковываемые объекты" -#: builtin/pack-objects.c:3280 +#: builtin/pack-objects.c:3428 msgid "keep unreachable objects" msgstr "сохранять ссылки на недоступные объекты" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3430 msgid "pack loose unreachable objects" msgstr "паковать недостижимые объекты" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3432 msgid "unpack unreachable objects newer than