diff --git a/ru/cl_builder3.po b/ru/cl_builder3.po
index 0a28767..ad7adbb 100644
--- a/ru/cl_builder3.po
+++ b/ru/cl_builder3.po
@@ -16,7 +16,7 @@ msgstr ""
msgid "%s is unavailable for the Grub"
msgstr "%s недоступен для Grub"
-#: ../calculate-builder/pym/builder/builder.py:2039
+#: ../calculate-builder/pym/builder/builder.py:2044
#, python-brace-format
msgid "({num} of {nummax}) Inject dependences for {package} package"
msgstr "({num} of {nummax}) Добавление зависимостей для пакета {package}"
@@ -37,12 +37,12 @@ msgstr "Определение пакетов по файлам"
msgid "Auto"
msgstr "Авто"
-#: ../calculate-builder/pym/builder/builder.py:1969
+#: ../calculate-builder/pym/builder/builder.py:1974
#, python-brace-format
msgid "Auto depends for package {pkg} from {pkgs} will be cleared"
msgstr "Автоматические зависимости для пакета {pkg} от пакетов {pkgs} будут удалены"
-#: ../calculate-builder/pym/builder/builder.py:1963
+#: ../calculate-builder/pym/builder/builder.py:1968
#, python-brace-format
msgid "Auto depends for package {pkg} from {pkgs} will be used"
msgstr "Автоматические зависимости для пакета {pkg} от пакетов {pkgs} будут использованы"
@@ -182,7 +182,7 @@ msgstr "Вычисление зависимостей для %s"
msgid "Change the Build Profile"
msgstr "Изменить профиль сборки"
-#: ../calculate-builder/pym/builder/builder.py:1907
+#: ../calculate-builder/pym/builder/builder.py:1912
#, python-brace-format
msgid "Check ({cur} of {maxval}) {package}"
msgstr "Проверка ({cur} of {maxval}) {package}"
@@ -345,8 +345,8 @@ msgstr "Извлечение ядер из ISO образов"
msgid "Failed to clean /boot directory on Flash drive"
msgstr "Не удалось очистить /boot директорию на Flash-устройстве"
-#: ../calculate-builder/pym/builder/builder.py:2125
-#: ../calculate-builder/pym/builder/builder.py:2153
+#: ../calculate-builder/pym/builder/builder.py:2130
+#: ../calculate-builder/pym/builder/builder.py:2158
#, python-format
msgid "Failed to clear binary directory: %s"
msgstr "Не удалось очистить директорию бинарных пакетов: %s"
@@ -370,7 +370,7 @@ msgstr "Не удалось определить isoscan путь"
msgid "Failed to execute %s"
msgstr "Не удалось выполнить %s"
-#: ../calculate-builder/pym/builder/builder.py:1653
+#: ../calculate-builder/pym/builder/builder.py:1658
#, python-format
msgid "Failed to extract kernel from %s"
msgstr "Не удалось извлечь ядро из %s"
@@ -383,7 +383,7 @@ msgstr "Не удалось получить файлы для %s"
#: ../calculate-builder/pym/builder/builder.py:1095
#: ../calculate-builder/pym/builder/builder.py:1109
#: ../calculate-builder/pym/builder/builder.py:1132
-#: ../calculate-builder/pym/builder/builder.py:2072
+#: ../calculate-builder/pym/builder/builder.py:2077
#, python-format
msgid "Failed to find the %s command"
msgstr "Не удалось найти %s команду"
@@ -401,7 +401,7 @@ msgstr "Не удалось получить %s"
msgid "Failed to get distributive information"
msgstr "Не удалось получить информацию о дистрибутиве"
-#: ../calculate-builder/pym/builder/builder.py:1873
+#: ../calculate-builder/pym/builder/builder.py:1878
msgid "Failed to hide package database"
msgstr "Не удалось скрыть пакеты"
@@ -410,21 +410,21 @@ msgstr "Не удалось скрыть пакеты"
msgid "Failed to index %s"
msgstr "Не удалось проиндексировать %s"
-#: ../calculate-builder/pym/builder/builder.py:2159
+#: ../calculate-builder/pym/builder/builder.py:2164
#, python-format
msgid "Failed to merge prepared binaries: %s"
msgstr "Не удалось объединить подготовленные бинарные пакеты: %s"
-#: ../calculate-builder/pym/builder/builder.py:2025
+#: ../calculate-builder/pym/builder/builder.py:2030
#, python-brace-format
msgid "Failed to merge {package} without {hidden_pkgs}"
msgstr "Не удалось собрать {package} без {hidden_pkgs}"
-#: ../calculate-builder/pym/builder/builder.py:1681
+#: ../calculate-builder/pym/builder/builder.py:1686
msgid "Failed to move the ISO images directory on the Flash"
msgstr "Не удалось перенести директорию ISO образов на Flash"
-#: ../calculate-builder/pym/builder/builder.py:2139
+#: ../calculate-builder/pym/builder/builder.py:2144
#, python-format
msgid "Failed to prepare stable binaries: %s"
msgstr "Не удалось подготовить стабильную ветку бинарных пакетов: %s"
@@ -433,7 +433,7 @@ msgstr "Не удалось подготовить стабильную ветк
msgid "Failed to prepare variables for synchronization"
msgstr "Не удалось подготовить переменные для синхронизации"
-#: ../calculate-builder/pym/builder/builder.py:1917
+#: ../calculate-builder/pym/builder/builder.py:1922
msgid "Failed to receive the package list"
msgstr "Не удалось получить список пакетов"
@@ -441,12 +441,12 @@ msgstr "Не удалось получить список пакетов"
msgid "Failed to remount Flash drive"
msgstr "Не удалось переподключить Flash-устройство"
-#: ../calculate-builder/pym/builder/builder.py:1759
+#: ../calculate-builder/pym/builder/builder.py:1764
#, python-format
msgid "Failed to remove %s"
msgstr "Не удалось удалить %s"
-#: ../calculate-builder/pym/builder/builder.py:2022
+#: ../calculate-builder/pym/builder/builder.py:2027
msgid "Failed to save build log"
msgstr "Не удалось сохранить журнал сборки"
@@ -455,7 +455,7 @@ msgstr "Не удалось сохранить журнал сборки"
msgid "Failed to set the profile: %s"
msgstr "Не удалось установить профиль: %s"
-#: ../calculate-builder/pym/builder/builder.py:1947
+#: ../calculate-builder/pym/builder/builder.py:1952
msgid "Failed to unhide package database"
msgstr "Не удалось восстановить скрытые пакеты"
@@ -476,12 +476,12 @@ msgstr "Не удалось обновить систему"
msgid "Failed to update the {rname} repository"
msgstr "Не удалось обновить репозиторий {rname}"
-#: ../calculate-builder/pym/builder/builder.py:2132
+#: ../calculate-builder/pym/builder/builder.py:2137
#, python-format
msgid "Failed to update trunk binaries: %s"
msgstr "Не удалось обновить trunk ветку бинарных пакетов: %s"
-#: ../calculate-builder/pym/builder/builder.py:1749
+#: ../calculate-builder/pym/builder/builder.py:1754
#, python-format
msgid "Failed to write %s"
msgstr "Не удалось записать %s"
@@ -852,7 +852,7 @@ msgstr "Настройка профиля"
msgid "Source image"
msgstr "Исходный образ"
-#: ../calculate-builder/pym/builder/builder.py:1975
+#: ../calculate-builder/pym/builder/builder.py:1980
#, python-brace-format
msgid "Specified depends for package {pkg} from {pkgs} are obsolete"
msgstr "Указанные зависимости для пакета {pkg} от пакетов {pkgs} устарели"
@@ -1054,7 +1054,7 @@ msgstr "Вы хотите установить эти пакеты?"
msgid "Would you like to unmerge these unused packages (recommended)?"
msgstr "Вы хотите удалить неиспользуемые пакеты (рекомендуется)?"
-#: ../calculate-builder/pym/builder/builder.py:1847
+#: ../calculate-builder/pym/builder/builder.py:1852
msgid "Wrong build state: /var/db/pkg not found"
msgstr "Некорректное состояние сборки: /var/db/pkg не найден"
diff --git a/ru/cl_client3.po b/ru/cl_client3.po
index b2fbd1f..090f5e8 100644
--- a/ru/cl_client3.po
+++ b/ru/cl_client3.po
@@ -16,14 +16,14 @@ msgstr ""
msgid ":"
msgstr ":"
-#: ../calculate-client/pym/client/client_cache.py:56
-#: ../calculate-client/pym/client/client_cache.py:63
#: ../calculate-client/pym/client/client.py:231
#: ../calculate-client/pym/client/client.py:1023
#: ../calculate-client/pym/client/client.py:1036
#: ../calculate-client/pym/client/client.py:1052
#: ../calculate-client/pym/client/client.py:1166
#: ../calculate-client/pym/client/client.py:1264
+#: ../calculate-client/pym/client/client_cache.py:56
+#: ../calculate-client/pym/client/client_cache.py:63
msgid ": "
msgstr ": "
diff --git a/ru/cl_console3.po b/ru/cl_console3.po
index a148123..56c45af 100644
--- a/ru/cl_console3.po
+++ b/ru/cl_console3.po
@@ -38,12 +38,12 @@ msgstr "Доступ запрещён %s"
msgid "'list' for displaying possible values"
msgstr "'list' для отображения возможных значений"
-#: ../calculate-console/pym/console/application/cert_verify.py:86
+#: ../calculate-console/pym/console/application/cert_verify.py:87
#, python-format
msgid ": %s"
msgstr ": %s"
-#: ../calculate-console/pym/console/application/cert_verify.py:85
+#: ../calculate-console/pym/console/application/cert_verify.py:86
#, python-format
msgid ": %s\n"
msgstr ": %s\n"
@@ -62,15 +62,15 @@ msgstr "Активен"
msgid "Active sessions on the server: "
msgstr "Активные сессии на сервере: "
-#: ../calculate-console/pym/console/application/client_class.py:307
+#: ../calculate-console/pym/console/application/client_class.py:308
msgid "Add the CA and root certificates"
msgstr "Добавить корневой сертификат и сертификат ЦА"
-#: ../calculate-console/pym/console/application/client_class.py:232
+#: ../calculate-console/pym/console/application/client_class.py:233
msgid "Add the CA certificate to trusted? y/[n]:"
msgstr "Добавить сертификат Центра авторизации в доверенные? y/[n]:"
-#: ../calculate-console/pym/console/application/client_class.py:256
+#: ../calculate-console/pym/console/application/client_class.py:257
msgid "Add this server certificate to trusted (s) or"
msgstr "Добавить сертификат этого сервера в доверенные (s) или"
@@ -86,7 +86,7 @@ msgstr "Сертификат Центра авторизации удалён и
msgid "CA certificate deleted from the list of user trusted certificates"
msgstr "Сертификат Центра авторизации удалён из пользовательского списка доверенных сертификатов"
-#: ../calculate-console/pym/console/application/client_class.py:213
+#: ../calculate-console/pym/console/application/client_class.py:214
msgid "CA certificate not found on the server"
msgstr "Сертификат Центра авторизации не найден на сервере"
@@ -95,7 +95,7 @@ msgid "CRL added"
msgstr "CRL добавлен"
#: ../calculate-console/pym/console/application/cert_func.py:330
-#: ../calculate-console/pym/console/application/client_class.py:197
+#: ../calculate-console/pym/console/application/client_class.py:198
msgid "Certificate added"
msgstr "Сертификат добавлен"
@@ -104,17 +104,17 @@ msgstr "Сертификат добавлен"
msgid "Certificate issued: %s"
msgstr "Дата подписания сертификата: %s"
-#: ../calculate-console/pym/console/application/client_class.py:237
+#: ../calculate-console/pym/console/application/client_class.py:238
msgid "Certificate not added to trusted"
msgstr "Сертификат не добавлен в доверенные"
-#: ../calculate-console/pym/console/application/client_class.py:113
+#: ../calculate-console/pym/console/application/client_class.py:114
msgid "Certificate not found on the client`s side"
msgstr "Сертификат не найден на стороне клиента"
-#: ../calculate-console/pym/console/application/cert_func.py:55
#: ../calculate-console/pym/console/application/cl_client.py:320
#: ../calculate-console/pym/console/application/pid_information.py:150
+#: ../calculate-console/pym/console/application/cert_func.py:55
msgid "Certificate not found on the server"
msgstr "Не найден сертификат на сервере"
@@ -167,7 +167,7 @@ msgstr "Ошибка очистки кэша сессии"
msgid "Error fetching the PID list from the server"
msgstr "Ошибка получения списка процессов с сервера"
-#: ../calculate-console/pym/console/application/client_class.py:220
+#: ../calculate-console/pym/console/application/client_class.py:221
msgid "Error. Certificate not added to trusted"
msgstr "Ошибка! Сертификат не добавлен в доверенные"
@@ -193,7 +193,7 @@ msgstr "Ошибка: %s"
msgid "Exception: %s"
msgstr "Исключение: %s"
-#: ../calculate-console/pym/console/application/function.py:53
+#: ../calculate-console/pym/console/application/function.py:54
msgid "Failed to clear the cache! "
msgstr "Не удалось очистить кэша!"
@@ -202,10 +202,10 @@ msgstr "Не удалось очистить кэша!"
msgid "Failed to connect"
msgstr "Не удалось подключиться"
-#: ../calculate-console/pym/console/application/cert_verify.py:103
-#: ../calculate-console/pym/console/application/cert_verify.py:108
#: ../calculate-console/pym/console/application/cl_client.py:411
-#: ../calculate-console/pym/console/application/client_class.py:304
+#: ../calculate-console/pym/console/application/client_class.py:305
+#: ../calculate-console/pym/console/application/cert_verify.py:104
+#: ../calculate-console/pym/console/application/cert_verify.py:109
#, python-format
msgid "Failed to create directory %s"
msgstr "Ошибка при создании директории %s"
@@ -214,7 +214,7 @@ msgstr "Ошибка при создании директории %s"
msgid "Failed to obtain certificate data!"
msgstr "Не удалось получить данные сертификата!"
-#: ../calculate-console/pym/console/application/client_class.py:122
+#: ../calculate-console/pym/console/application/client_class.py:123
msgid "Failed to open the file"
msgstr "Ошибка при открытии файла"
@@ -224,12 +224,12 @@ msgid "Failed to terminate the process"
msgstr "Не удалось завершить процесс"
#: ../calculate-console/pym/console/application/cert_func.py:317
-#: ../calculate-console/pym/console/application/client_class.py:185
+#: ../calculate-console/pym/console/application/client_class.py:186
msgid "Field \"CN\" not found in the certificate!"
msgstr "Не найдено поле \"CN\" в сертификате!"
-#: ../calculate-console/pym/console/application/client_class.py:222
-#: ../calculate-console/pym/console/application/client_class.py:245
+#: ../calculate-console/pym/console/application/client_class.py:223
+#: ../calculate-console/pym/console/application/client_class.py:246
#, python-format
msgid "Fingerprint = %s"
msgstr "Отпечаток = %s"
@@ -250,12 +250,12 @@ msgstr "ID: %s"
msgid "Invalid password"
msgstr "Неверный пароль"
-#: ../calculate-console/pym/console/application/client_class.py:209
+#: ../calculate-console/pym/console/application/client_class.py:210
msgid "Invalid server certificate!"
msgstr "Сертификат сервера недействителен!"
-#: ../calculate-console/pym/console/application/client_class.py:225
-#: ../calculate-console/pym/console/application/client_class.py:248
+#: ../calculate-console/pym/console/application/client_class.py:226
+#: ../calculate-console/pym/console/application/client_class.py:249
msgid "Issuer"
msgstr "Подписчик"
@@ -278,7 +278,7 @@ msgstr "Прервано пользователем"
msgid "Method not available"
msgstr "Метод недоступен"
-#: ../calculate-console/pym/console/application/function.py:116
+#: ../calculate-console/pym/console/application/function.py:117
msgid "Method not found: "
msgstr "Метод не найден: "
@@ -338,7 +338,7 @@ msgstr "Процесс не найден"
msgid "Process terminated"
msgstr "Процесс завершён"
-#: ../calculate-console/pym/console/application/client_class.py:258
+#: ../calculate-console/pym/console/application/client_class.py:259
msgid "Quit (q)? s/c/[q]: "
msgstr "Выйти (q)? s/c/[q]: "
@@ -361,7 +361,7 @@ msgstr "Запрос не был послан или удалён файл %s"
msgid "Request or signature not matching earlier data."
msgstr "Запрос или подпись не соответствуют отправленным ранее."
-#: ../calculate-console/pym/console/application/cert_verify.py:86
+#: ../calculate-console/pym/console/application/cert_verify.py:87
msgid "Revoke date"
msgstr "Дата отзыва"
@@ -373,12 +373,12 @@ msgstr "Запустить процесс? "
msgid "Send a new request? y/[n]: "
msgstr "Отправить навый запрос на подпись сертификата? y/[n]: "
-#: ../calculate-console/pym/console/application/cert_verify.py:85
+#: ../calculate-console/pym/console/application/cert_verify.py:86
msgid "Serial"
msgstr "Серийный номер"
-#: ../calculate-console/pym/console/application/client_class.py:223
-#: ../calculate-console/pym/console/application/client_class.py:246
+#: ../calculate-console/pym/console/application/client_class.py:224
+#: ../calculate-console/pym/console/application/client_class.py:247
msgid "Serial Number = "
msgstr "Серийный номер = "
@@ -417,8 +417,8 @@ msgstr "Время запуска: %s"
msgid "Status: %s"
msgstr "Статус: %s"
-#: ../calculate-console/pym/console/application/client_class.py:229
-#: ../calculate-console/pym/console/application/client_class.py:252
+#: ../calculate-console/pym/console/application/client_class.py:230
+#: ../calculate-console/pym/console/application/client_class.py:253
msgid "Subject"
msgstr "Субъект"
@@ -437,11 +437,11 @@ msgid "The client uses certificate {certfile} (server ID {cert_id})"
msgstr "Клиент использует сертификат {certfile} (ID сервера {cert_id})"
#: ../calculate-console/pym/console/application/cert_func.py:332
-#: ../calculate-console/pym/console/application/client_class.py:199
+#: ../calculate-console/pym/console/application/client_class.py:200
msgid "The file containing the CA certificate now exists"
msgstr "Файл с сертификатом удостоверяющего центра создан"
-#: ../calculate-console/pym/console/application/function.py:165
+#: ../calculate-console/pym/console/application/function.py:166
msgid "The process does not exist or does not belong to your session"
msgstr "Процесс не существует или принадлежит не вашей сессии"
@@ -453,11 +453,11 @@ msgstr "Запрос был послан с другого адреса."
msgid "The server has not signed the certificate!"
msgstr "Сервер не подписал сертификат!"
-#: ../calculate-console/pym/console/application/cert_verify.py:84
+#: ../calculate-console/pym/console/application/cert_verify.py:85
msgid "This certificate has been revoked!"
msgstr "Данный сертификат отозван!"
-#: ../calculate-console/pym/console/application/client_class.py:436
+#: ../calculate-console/pym/console/application/client_class.py:437
msgid "This server is not trusted"
msgstr "Сервер не является доверенным"
@@ -466,7 +466,7 @@ msgstr "Сервер не является доверенным"
msgid "To submit the certificate request on the server use command"
msgstr "Для подписания сертификата на сервере используется команда"
-#: ../calculate-console/pym/console/application/client_class.py:257
+#: ../calculate-console/pym/console/application/client_class.py:258
msgid "Try to add the CA and root certificates to trusted (c) or"
msgstr "Попытаться добавить сертификат ЦА и корневой в доверенные (c) или"
@@ -474,7 +474,7 @@ msgstr "Попытаться добавить сертификат ЦА и ко
msgid "Unknown parameter"
msgstr "Неизвестный параметр"
-#: ../calculate-console/pym/console/application/client_class.py:242
+#: ../calculate-console/pym/console/application/client_class.py:243
msgid "Untrusted server certificate!"
msgstr "Недоверенный сертификат сервера!"
@@ -534,13 +534,13 @@ msgstr "хост назначения"
msgid "do not display the progress bar"
msgstr "не отображать индикатор прогресса"
-#: ../calculate-console/pym/console/application/cert_verify.py:59
-#: ../calculate-console/pym/console/application/cert_verify.py:64
+#: ../calculate-console/pym/console/application/cert_verify.py:60
+#: ../calculate-console/pym/console/application/cert_verify.py:65
msgid "fields CN and L in the CA certificate are incorrect!"
msgstr "поля CN и L в сертификате CA некорректны!"
#: ../calculate-console/pym/console/application/cert_func.py:329
-#: ../calculate-console/pym/console/application/client_class.py:196
+#: ../calculate-console/pym/console/application/client_class.py:197
msgid "filename = "
msgstr "имя файла ="
@@ -589,7 +589,7 @@ msgstr "клиент использует сертификат %s"
msgid "the private key and request now exist"
msgstr "секретный ключ и запрос на подпись сертификата созданы"
-#: ../calculate-console/pym/console/application/function.py:183
+#: ../calculate-console/pym/console/application/function.py:184
msgid "the server sent PID = "
msgstr "сервер послал идентификатор процесса = "
diff --git a/ru/cl_consolegui3.po b/ru/cl_consolegui3.po
index 9038509..8569d0c 100644
--- a/ru/cl_consolegui3.po
+++ b/ru/cl_consolegui3.po
@@ -46,7 +46,7 @@ msgstr "0 - скрыть изображения"
msgid "Apply them?"
msgstr "Применить их?"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:384
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:375
msgid "A file with the CA certificate now exists"
msgstr "Файл с сертификатом Центра авторизации создан"
@@ -63,27 +63,27 @@ msgstr "О программе"
msgid "Add a row"
msgstr "Добавить строку"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:113
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:114
msgid "Add the CA and root certificates"
msgstr "Добавить корневой сертификат и сертификат ЦА"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:435
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:426
msgid "Add the CA certificate to trusted? "
msgstr "Добавить сертификат Центра авторизации в доверенные? "
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:125
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:126
msgid "Add the certificate to trusted"
msgstr "Добавить сертификат в доверенные"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:107
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:108
msgid "Add the server certificate"
msgstr "Добавить сертификат сервера"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:94
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:95
msgid "Add this server certificate to trusted or "
msgstr "Добавить сертификат этого сервера в доверенные или"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:437
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:428
msgid "Adding the certificate"
msgstr "Добавление сертификата"
@@ -133,28 +133,28 @@ msgstr "Авто"
msgid "Break the process"
msgstr "Прервать процесс"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:405
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:396
msgid "CA certificate not found on the server"
msgstr "Сертификат Центра авторизации не найден на сервере"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:829
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:818
msgid "CA certificate removed from system trusted"
msgstr "Сертификат Центра авторизации удалён из пользовательского списка доверенных сертификатов"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:810
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:800
msgid "CA certificate removed from user trusted"
msgstr "Сертификат Центра авторизации удалён из пользовательского списка доверенных сертификатов"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:721
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:711
msgid "CRL added"
msgstr "Список отзыва сертификатов добавлен"
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:117
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:160
#: ../calculate-console-gui/pym/consolegui/application/TrayIcon.py:170
#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1440
#: ../calculate-console-gui/pym/consolegui/application/DisplayMethod.py:232
#: ../calculate-console-gui/pym/consolegui/application/LeftMenu.py:438
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:119
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:162
msgid "Calculate Console"
msgstr "Calculate Console"
@@ -168,15 +168,15 @@ msgid "Calculate company"
msgstr "Компания \"Калкулэйт\""
#: ../calculate-console-gui/pym/consolegui/application/Box.py:441
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:120
#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:118
-#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:246
#: ../calculate-console-gui/pym/consolegui/application/tools.py:86
#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:50
#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:132
#: ../calculate-console-gui/pym/consolegui/application/more.py:929
#: ../calculate-console-gui/pym/consolegui/application/more.py:1134
#: ../calculate-console-gui/pym/consolegui/application/more.py:2112
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:121
+#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:246
msgid "Cancel"
msgstr "Отмена"
@@ -184,8 +184,8 @@ msgstr "Отмена"
msgid "Certificate Directory"
msgstr "Директория с сертификатами"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:172
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:382
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:170
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:373
msgid "Certificate added"
msgstr "Сертификат добавлен"
@@ -194,7 +194,7 @@ msgstr "Сертификат добавлен"
msgid "Certificate expired"
msgstr "Время жизни сертификата истекло"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:440
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:431
msgid "Certificate not added to trusted"
msgstr "Сертификат не добавлен в доверенные"
@@ -205,7 +205,7 @@ msgstr "Сертификат не добавлен в доверенные"
msgid "Certificate not found in the server!"
msgstr "Не найден сертификат на сервере!"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:302
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:299
msgid "Certificate not found on the client's side"
msgstr "Сертификат не найден на стороне клиента"
@@ -219,14 +219,14 @@ msgstr "Сертификат не отправлен!"
msgid "Certificate saved. Your certificate ID = %s"
msgstr "Сертификат сохранён! Номер Вашего сертификата = %s"
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:74
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:75
msgid "Certificate signature request"
msgstr "Запрос на подпись сертификата"
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:90
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:205
#: ../calculate-console-gui/pym/consolegui/application/mainmenu.py:90
#: ../calculate-console-gui/pym/consolegui/application/mainmenu.py:160
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:91
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:206
msgid "Certificates"
msgstr "Сертификаты"
@@ -264,10 +264,10 @@ msgstr "Очистить таблицу"
#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:57
#: ../calculate-console-gui/pym/consolegui/application/helpwidget.py:143
+#: ../calculate-console-gui/pym/consolegui/application/session_function.py:127
+#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:205
#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:244
#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:364
-#: ../calculate-console-gui/pym/consolegui/application/session_function.py:127
-#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:204
msgid "Close"
msgstr "Закрыть"
@@ -279,8 +279,8 @@ msgstr "Закрыть данную сессию"
msgid "Closing session"
msgstr "Закрытие сессии"
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:134
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:137
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:136
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:139
#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:230
msgid "Closing. Connection error."
msgstr "Ошибка соединения. Закрываюсь."
@@ -318,7 +318,7 @@ msgstr "Соединение потеряно!"
msgid "Country (a two-character tag)"
msgstr "Страна (2 символа)"
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:158
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:160
msgid "Create a new private key and signature request?"
msgstr "Создать новые секретный ключ и запрос на подпись сертификата?"
@@ -375,8 +375,8 @@ msgstr "Английский"
msgid "Enter a valid email!"
msgstr "Введите существующий адрес электронной почты!"
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:99
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:140
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:100
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:142
#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:213
#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:234
msgid "Enter the hostname or the IP address"
@@ -386,7 +386,7 @@ msgstr "Введите имя хоста или IP-адрес"
msgid "Enter the port correctly!"
msgstr "Введите корректный порт!"
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:105
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:106
#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:219
msgid "Enter the port number"
msgstr "Введите номер порта"
@@ -412,14 +412,14 @@ msgstr "Ошибка закрытия процесса"
msgid "Error code: %s"
msgstr "Код ошибки: %s"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:189
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:639
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:644
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:187
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:630
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:635
#, python-format
msgid "Error creating directory %s"
msgstr "Ошибка при создании директории %s"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:313
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:308
msgid "Error opening file"
msgstr "Ошибка при открытии файла"
@@ -427,7 +427,7 @@ msgstr "Ошибка при открытии файла"
msgid "Error removing the session from the server"
msgstr "Ошибка удаления сессии на сервере"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:417
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:408
msgid "Error. Certificate not added to trusted"
msgstr "Ошибка! Сертификат не добавлен в доверенные"
@@ -465,7 +465,7 @@ msgstr "Не удалось получить данные сертификата
msgid "Failed to send the message (password) to the server"
msgstr "Ошибка отправки сообщения (пароля) на сервер"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:372
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:365
msgid "Field \"CN\" not found in the certificate!"
msgstr "Не найдено поле \"CN\" в сертификате!"
@@ -481,13 +481,13 @@ msgstr "Файл с сертификатом Центра авторизации
msgid "Filename = "
msgstr "имя файла ="
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:382
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:373
#, python-format
msgid "Filename = %s"
msgstr "Имя файла = %s"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:57
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:423
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:58
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:414
#, python-format
msgid "Fingerprint = %s"
msgstr "Отпечаток = %s"
@@ -502,7 +502,7 @@ msgstr "Французский"
msgid "GUI"
msgstr "GUI"
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:58
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:59
msgid "Get the certificate"
msgstr "Получить сертификат"
@@ -513,8 +513,8 @@ msgstr "Получить сертификат"
msgid "Help"
msgstr "Помощь"
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:40
#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:83
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:41
msgid "Host"
msgstr "Хост"
@@ -527,12 +527,12 @@ msgstr "Если электронная почта не существует, т
msgid "Image height"
msgstr "Высота изображений"
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:100
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:101
#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:214
msgid "Incorrect \"Host\" value!"
msgstr "Ошибка в поле \"Хост\"!"
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:105
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:106
#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:219
msgid "Incorrect \"Port\" value!"
msgstr "Ошибка в поле \"Порт\"!"
@@ -541,9 +541,9 @@ msgstr "Ошибка в поле \"Порт\"!"
msgid "Info"
msgstr "Справка"
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:141
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:235
#: ../calculate-console-gui/pym/consolegui/application/create_cert.py:143
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:143
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:235
msgid "Input error"
msgstr "Ошибка ввода"
@@ -551,12 +551,12 @@ msgstr "Ошибка ввода"
msgid "Invalid password"
msgstr "Пароль неверен"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:400
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:391
msgid "Invalid server certificate!"
msgstr "Сертификат сервера недействителен!"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:73
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:427
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:74
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:418
msgid "Issuer"
msgstr "Подписчик"
@@ -581,8 +581,8 @@ msgstr "Сообщение:"
msgid "Network address"
msgstr "Сетевой адрес"
-#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:421
-#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:494
+#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:422
+#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:495
msgid "New connection"
msgstr "Новое соединение"
@@ -593,11 +593,11 @@ msgstr "Далее"
#: ../calculate-console-gui/pym/consolegui/application/Box.py:440
#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1917
#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2270
+#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1182
#: ../calculate-console-gui/pym/consolegui/application/more.py:722
#: ../calculate-console-gui/pym/consolegui/application/more.py:2012
#: ../calculate-console-gui/pym/consolegui/application/more.py:2364
-#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1182
-#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:210
+#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:211
msgid "No"
msgstr "Нет"
@@ -613,23 +613,23 @@ msgstr "Нет доступных методов!"
msgid "No running processes in the current session"
msgstr "Нет запущенных процессов в текущей сессии"
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:150
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:184
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:242
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:259
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:410
#: ../calculate-console-gui/pym/consolegui/application/session_function.py:85
#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:281
#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:284
#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:291
#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:791
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:152
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:186
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:242
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:259
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:401
msgid "Not connected!"
msgstr "Соединение отсутствует!"
-#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:300
#: ../calculate-console-gui/pym/consolegui/application/tools.py:76
#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:43
#: ../calculate-console-gui/pym/consolegui/application/more.py:2106
+#: ../calculate-console-gui/pym/consolegui/application/ControlButton.py:300
msgid "Ok"
msgstr "Ok"
@@ -686,8 +686,8 @@ msgstr "Пожалуйста, разорвите"
msgid "Please enter a valid email. "
msgstr "Пожалуйста, введите существующий адрес электронной почты."
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:44
#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:84
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:45
msgid "Port"
msgstr "Порт"
@@ -721,7 +721,7 @@ msgstr "Процессы"
msgid "Program settings"
msgstr "Настройки программы"
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:63
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:64
msgid "Quit"
msgstr "Выход"
@@ -738,9 +738,9 @@ msgstr "Выполняется повторное подключение к се
msgid "Recover the table"
msgstr "Восстановить таблицу"
+#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1054
#: ../calculate-console-gui/pym/consolegui/application/more.py:1882
#: ../calculate-console-gui/pym/consolegui/application/more.py:2101
-#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1054
msgid "Repeat"
msgstr "Повтор"
@@ -752,7 +752,7 @@ msgstr "Повтор"
msgid "Report a Bug"
msgstr "Сообщить об ошибке"
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:197
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:198
#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:276
msgid "Request"
msgstr "Запрос"
@@ -762,12 +762,12 @@ msgstr "Запрос"
msgid "Request %s not found on the client`s side"
msgstr "Запрос %s не найден на стороне клиента"
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:113
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:115
#, python-format
msgid "Request ID: %s"
msgstr "Номер Вашего запроса - %s"
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:203
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:204
#, python-format
msgid "Request not sent, or file %s deleted"
msgstr "Запрос не был послан, или удалён файл %s"
@@ -813,11 +813,11 @@ msgstr "Отправить"
msgid "Send a Bug"
msgstr "Отправить ошибку"
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:115
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:117
msgid "Send a new request?"
msgstr "Отправить навый запрос на подпись сертификата?"
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:53
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:54
msgid "Send a request"
msgstr "Отправить запрос"
@@ -825,17 +825,17 @@ msgstr "Отправить запрос"
msgid "Sending error"
msgstr "Ошибка отправки"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:59
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:60
#, python-format
msgid "Serial Number = %s"
msgstr "Серийный номер = %s"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:424
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:415
#, python-format
msgid "Serial Number = %s"
msgstr "Серийный номер = %s"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:171
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:169
msgid "Server certificate added to trusted"
msgstr "Сертификат сервера добавлен в доверенные"
@@ -877,8 +877,8 @@ msgstr "Время запуска"
msgid "Status"
msgstr "Статус"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:85
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:431
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:86
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:422
msgid "Subject"
msgstr "Субъект"
@@ -904,7 +904,7 @@ msgstr "Поле \"Страна\" должно состоять из двух с
msgid "The certificate expires after %d days"
msgstr "Время жизни сертификата истекает через %d дней"
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:156
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:158
msgid "The private key and the request now exist!"
msgstr "Секретный ключ и запрос на подпись сертификата созданы!"
@@ -912,7 +912,7 @@ msgstr "Секретный ключ и запрос на подпись серт
msgid "The request has not been reviewed yet."
msgstr "Запрос на подписание сертификата ещё не рассмотрен."
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:188
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:190
msgid "The server has not signed the certificate!"
msgstr "Сервер не подписал сертификат!"
@@ -933,12 +933,12 @@ msgstr "Пользователь должен быть не root"
msgid "There are unsaved changes in tab %s"
msgstr "На вкладке %s имеются несохранённые изменения"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:268
#: ../calculate-console-gui/pym/consolegui/application/conf_connection.py:281
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:266
msgid "This server is not trusted"
msgstr "Данный сервер не является доверенным"
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:195
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:196
#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:274
msgid "To submit the certificate request on the server use command"
msgstr "Для подписания сертификата на сервере используется команда"
@@ -951,7 +951,7 @@ msgstr "Настройки"
msgid "Ukrainian"
msgstr "Украинский"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:52
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:53
msgid "Untrusted Server Certificate!"
msgstr "Недоверенный сертификат сервера!"
@@ -1002,11 +1002,11 @@ msgstr "Успешно убит!"
#: ../calculate-console-gui/pym/consolegui/application/Box.py:439
#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:1915
#: ../calculate-console-gui/pym/consolegui/application/mainframe.py:2268
+#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1180
#: ../calculate-console-gui/pym/consolegui/application/more.py:720
#: ../calculate-console-gui/pym/consolegui/application/more.py:2010
#: ../calculate-console-gui/pym/consolegui/application/more.py:2363
-#: ../calculate-console-gui/pym/consolegui/application/MainFrameResult.py:1180
-#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:209
+#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:210
msgid "Yes"
msgstr "Да"
@@ -1028,7 +1028,7 @@ msgstr "У вас нет сертификата или ваш сертифика
msgid "You do not have a certificate. Please generate a new request and get the new certificate from the server."
msgstr "У Вас нет сертификата. Пожалуйста, сгенерируйте запрос на сертификат и получите сертификат с сервера."
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:112
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:114
msgid "You have already sent a signature request!"
msgstr "У Вас уже есть запрос на подписание сертификата!"
@@ -1052,7 +1052,7 @@ msgstr "Ваш email:"
msgid "Your name:"
msgstr "Ваше имя:"
-#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:194
+#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:195
#: ../calculate-console-gui/pym/consolegui/application/CertificateClass.py:273
#, python-format
msgid "Your request ID: %s"
@@ -1062,15 +1062,15 @@ msgstr "Номер Вашего запроса: %s"
msgid "Your session ID: "
msgstr "Номер Вашей сессии: "
-#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:242
+#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:243
msgid "call method"
msgstr "вызов метода"
-#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:252
+#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:253
msgid "destination host"
msgstr "хост назначения"
-#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:249
+#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:250
msgid "port number"
msgstr "номер порта"
@@ -1078,19 +1078,19 @@ msgstr "номер порта"
msgid "previous connection!"
msgstr "предыдущее соединение!"
-#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:246
+#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:247
msgid "run the method without options"
msgstr "запустить метод без параметров"
-#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:236
+#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:237
msgid "show this help message and exit"
msgstr "вывод этой справки и выход"
-#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:239
+#: ../calculate-console-gui/pym/consolegui/application/ConnectionTabs.py:240
msgid "translation language"
msgstr "язык для перевода"
-#: ../calculate-console-gui/pym/consolegui/application/client_class.py:95
+#: ../calculate-console-gui/pym/consolegui/application/client_class.py:96
msgid "try adding the CA and root certificates to trusted?"
msgstr "попытаться добавить сертификат ЦА и корневой в доверенные?"
diff --git a/ru/cl_core3.po b/ru/cl_core3.po
index 10d6093..ecb68ab 100644
--- a/ru/cl_core3.po
+++ b/ru/cl_core3.po
@@ -39,7 +39,7 @@ msgstr "Процесс завершён!"
msgid " Session not matching your certificate!"
msgstr "Сессия не принадлежит Вашему сертификату!"
-#: ../calculate-core/pym/core/client/cert_func.py:48
+#: ../calculate-core/pym/core/client/cert_func.py:49
#, python-format
msgid " Your certifitate ID = %d"
msgstr " Номер Вашего сертификата = %d"
@@ -49,7 +49,7 @@ msgstr " Номер Вашего сертификата = %d"
msgid " Your session ID = %s"
msgstr "Номер Вашей сессии = %s"
-#: ../calculate-core/pym/core/server/func.py:1520
+#: ../calculate-core/pym/core/server/func.py:1522
msgid " is a file, not a link!"
msgstr " файл, не ссылка!"
@@ -90,9 +90,9 @@ msgstr "%s:"
msgid "%s: "
msgstr "%s: "
-#: ../calculate-core/pym/core/client/cert_func.py:290
#: ../calculate-core/pym/core/client/sid_func.py:55
#: ../calculate-core/pym/core/client/sid_func.py:79
+#: ../calculate-core/pym/core/client/cert_func.py:291
#, python-format
msgid "%s: Permission denied"
msgstr "Доступ запрещён %s"
@@ -124,7 +124,7 @@ msgstr "(включено по умолчанию)"
msgid "({one} of {_all}) -- {fname}"
msgstr "({one} из {_all}) -- {fname}"
-#: ../calculate-core/pym/core/server/cert_cmd.py:604
+#: ../calculate-core/pym/core/server/cert_cmd.py:599
msgid ", except:"
msgstr ", кроме:"
@@ -139,7 +139,7 @@ msgstr ":"
msgid ": "
msgstr ": "
-#: ../calculate-core/pym/core/client/cert_verify.py:87
+#: ../calculate-core/pym/core/client/cert_verify.py:88
#: ../calculate-core/pym/core/backup.py:235
#: ../calculate-core/pym/core/backup.py:292
#, python-format
@@ -173,15 +173,15 @@ msgstr "Добавление группы"
msgid "Add a group"
msgstr "Добавление группы"
-#: ../calculate-core/pym/core/client/client_class.py:291
+#: ../calculate-core/pym/core/client/client_class.py:292
msgid "Add the CA and root certificates"
msgstr "Попробовать добавить корневой и сертификат центра авторизации"
-#: ../calculate-core/pym/core/client/client_class.py:216
+#: ../calculate-core/pym/core/client/client_class.py:217
msgid "Add the CA certificate to trusted? y/[n]:"
msgstr "Добавить сертификат центра авторизации в доверенные? y/[n]:"
-#: ../calculate-core/pym/core/client/client_class.py:242
+#: ../calculate-core/pym/core/client/client_class.py:243
msgid "Add this server certificate to trusted (s) or"
msgstr "Добавить данный сертификат сервера в доверенные (s) или"
@@ -193,7 +193,7 @@ msgstr "Добавление прервано пользователем"
msgid "All"
msgstr "Все"
-#: ../calculate-core/pym/core/server/baseClass.py:199
+#: ../calculate-core/pym/core/server/baseClass.py:200
msgid "All processes are closed."
msgstr "Все процессы закрыты."
@@ -210,7 +210,7 @@ msgstr "Применение исправлений к исходному код
msgid "Archive created: {core.cl_backup_file}"
msgstr "Создан архивный файл: {core.cl_backup_file}"
-#: ../calculate-core/pym/core/server/cert_cmd.py:666
+#: ../calculate-core/pym/core/server/cert_cmd.py:661
msgid "Are you sure? Delete all client certificates?"
msgstr "Вы уверены? Удалить все клиентские сертификаты?"
@@ -254,11 +254,11 @@ msgstr "Создание резервной копии успешно завер
msgid "CA certificate deleted from the system trusted certificates list"
msgstr "Сертификат центра авторизации удалён из системных доверенных сертификатов"
-#: ../calculate-core/pym/core/client/cert_verify.py:282
+#: ../calculate-core/pym/core/client/cert_verify.py:283
msgid "CA certificate deleted from the user's trusted certificates list"
msgstr "Сертификат центра авторизации удалён из доверенных сертификатов пользователя"
-#: ../calculate-core/pym/core/client/client_class.py:195
+#: ../calculate-core/pym/core/client/client_class.py:196
msgid "CA certificate not found on the server"
msgstr "Сертификат центра авторизации не найден на сервере"
@@ -266,15 +266,15 @@ msgstr "Сертификат центра авторизации не найде
msgid "CONTENTS file not found"
msgstr "Файл CONTENTS не найден"
-#: ../calculate-core/pym/core/client/cert_verify.py:180
+#: ../calculate-core/pym/core/client/cert_verify.py:181
msgid "CRL added"
msgstr "Список отзыва сертификатов (CRL) добавлен"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1072
+#: ../calculate-core/pym/core/server/cert_cmd.py:1067
msgid "CRL deleted"
msgstr "Список отзыва сертификатов удалён"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1074
+#: ../calculate-core/pym/core/server/cert_cmd.py:1069
msgid "CRL does not exist"
msgstr "Список отзыва сертификатов не создан"
@@ -290,7 +290,7 @@ msgstr "Настройка"
msgid "Calculating checksums"
msgstr "Вычисление файловых контрольных сумм"
-#: ../calculate-core/pym/core/server/cert_cmd.py:967
+#: ../calculate-core/pym/core/server/cert_cmd.py:962
msgid "Certificate \t"
msgstr "Сертификат \t"
@@ -299,25 +299,25 @@ msgstr "Сертификат \t"
msgid "Certificate %s has been signed"
msgstr "Сертифика %s подписан"
-#: ../calculate-core/pym/core/server/cert_cmd.py:764
+#: ../calculate-core/pym/core/server/cert_cmd.py:759
#, python-format
msgid "Certificate %s has not been signed"
msgstr "Сертификат %s не подписан"
-#: ../calculate-core/pym/core/server/cert_cmd.py:762
-#: ../calculate-core/pym/core/server/cert_cmd.py:818
+#: ../calculate-core/pym/core/server/cert_cmd.py:757
+#: ../calculate-core/pym/core/server/cert_cmd.py:813
#, python-format
msgid "Certificate %s is signed"
msgstr "Сертификат %s подписан"
+#: ../calculate-core/pym/core/server/cert_cmd.py:1080
#: ../calculate-core/pym/core/server/bootstrap.py:57
-#: ../calculate-core/pym/core/server/cert_cmd.py:1085
#, python-format
msgid "Certificate %s not found"
msgstr "Сертификат %s не найден"
-#: ../calculate-core/pym/core/server/cert_cmd.py:715
-#: ../calculate-core/pym/core/server/cert_cmd.py:791
+#: ../calculate-core/pym/core/server/cert_cmd.py:710
+#: ../calculate-core/pym/core/server/cert_cmd.py:786
#, python-format
msgid "Certificate %s now exists"
msgstr "Сертификат %s уже существует"
@@ -326,17 +326,17 @@ msgstr "Сертификат %s уже существует"
msgid "Certificate Details"
msgstr "Просмотр сертификата"
-#: ../calculate-core/pym/core/server/cert_cmd.py:654
+#: ../calculate-core/pym/core/server/cert_cmd.py:649
#, python-format
msgid "Certificate ID = %s"
msgstr "Номер сертификата = %s"
-#: ../calculate-core/pym/core/client/cert_func.py:300
+#: ../calculate-core/pym/core/client/cert_func.py:301
msgid "Certificate ID: "
msgstr "Номер сертификата: "
-#: ../calculate-core/pym/core/client/cert_func.py:255
-#: ../calculate-core/pym/core/client/client_class.py:180
+#: ../calculate-core/pym/core/client/cert_func.py:256
+#: ../calculate-core/pym/core/client/client_class.py:181
msgid "Certificate added"
msgstr "Сертификат добавлен"
@@ -352,7 +352,7 @@ msgstr "Сертификат удалён"
msgid "Certificate details"
msgstr "Просмотр сертификата"
-#: ../calculate-core/pym/core/client/cert_func.py:51
+#: ../calculate-core/pym/core/client/cert_func.py:52
#: ../calculate-core/pym/core/server/bootstrap.py:90
msgid "Certificate expired"
msgstr "Срок годности сертификата истёк"
@@ -376,32 +376,32 @@ msgstr "Идентификатор сертификата"
msgid "Certificate issued on %s"
msgstr "Дата подписания сертификата - %s"
-#: ../calculate-core/pym/core/client/client_class.py:221
+#: ../calculate-core/pym/core/client/client_class.py:222
msgid "Certificate not added to trusted"
msgstr "Сертификат не добавлен в доверенные"
-#: ../calculate-core/pym/core/server/cert_cmd.py:680
+#: ../calculate-core/pym/core/server/cert_cmd.py:675
msgid "Certificate not found"
msgstr "Сертификат не найден"
-#: ../calculate-core/pym/core/client/cert_func.py:42
+#: ../calculate-core/pym/core/client/cert_func.py:43
msgid "Certificate not found in the server database!"
msgstr "Сертификат не найден в базе данных на сервере!"
-#: ../calculate-core/pym/core/client/client_class.py:96
+#: ../calculate-core/pym/core/client/client_class.py:97
#: ../calculate-core/pym/core/server/client_class.py:65
msgid "Certificate not found on the client's side"
msgstr "Сертификат не найден на стороне клиента"
-#: ../calculate-core/pym/core/client/cert_func.py:284
+#: ../calculate-core/pym/core/client/cert_func.py:285
msgid "Certificate not found on the server!"
msgstr "Сертификат не найден на сервере!"
-#: ../calculate-core/pym/core/server/cert_cmd.py:866
+#: ../calculate-core/pym/core/server/cert_cmd.py:861
msgid "Certificate not found!"
msgstr "Сертификат не найден!"
-#: ../calculate-core/pym/core/client/cert_func.py:46
+#: ../calculate-core/pym/core/client/cert_func.py:47
msgid "Certificate not sent!"
msgstr "Сертификат не отправлен!"
@@ -410,8 +410,8 @@ msgstr "Сертификат не отправлен!"
msgid "Certificate number: %s"
msgstr "Номер сертификата - %s"
-#: ../calculate-core/pym/core/server/cert_cmd.py:938
-#: ../calculate-core/pym/core/server/cert_cmd.py:976
+#: ../calculate-core/pym/core/server/cert_cmd.py:933
+#: ../calculate-core/pym/core/server/cert_cmd.py:971
msgid "Certificate or request not found!"
msgstr "Сертификат или запрос не найден!"
@@ -420,7 +420,7 @@ msgstr "Сертификат или запрос не найден!"
msgid "Certificate permissions"
msgstr "Права сертификата"
-#: ../calculate-core/pym/core/server/cert_cmd.py:267
+#: ../calculate-core/pym/core/server/cert_cmd.py:264
#, python-format
msgid "Certificate saved. Your certificate ID = %s"
msgstr "Сертификат сохранён. Номер Вашего сертификата = %s"
@@ -449,8 +449,8 @@ msgid "Choose a configuration action:"
msgstr "Выберите действие для настройки:"
#: ../calculate-core/pym/core/client/create_cert.py:83
-#: ../calculate-core/pym/core/server/cert_cmd.py:103
#: ../calculate-core/pym/core/server/create_cert.py:90
+#: ../calculate-core/pym/core/server/cert_cmd.py:104
msgid "City: "
msgstr "Город: "
@@ -463,16 +463,16 @@ msgstr "Очистка временных файлов"
msgid "Client type: %s"
msgstr "Тип клиента - %s"
-#: ../calculate-core/pym/core/server/cert_cmd.py:191
-#: ../calculate-core/pym/core/server/cert_cmd.py:239
+#: ../calculate-core/pym/core/server/cert_cmd.py:192
+#: ../calculate-core/pym/core/server/cert_cmd.py:237
msgid "Close. Connection Error."
msgstr "Закрыто. Ошибка соединения."
-#: ../calculate-core/pym/core/client/cert_func.py:160
+#: ../calculate-core/pym/core/client/cert_func.py:161
msgid "Closed. Connection error."
msgstr "Закрыто. Ошибка соединения."
-#: ../calculate-core/pym/core/server/baseClass.py:180
+#: ../calculate-core/pym/core/server/baseClass.py:181
msgid "Closing all processes"
msgstr "Завершаю все процессы"
@@ -528,7 +528,7 @@ msgstr "Подтвердить"
msgid "Confirm the Request"
msgstr "Подтвердить запрос"
-#: ../calculate-core/pym/core/server/cert_cmd.py:108
+#: ../calculate-core/pym/core/server/cert_cmd.py:109
#, python-format
msgid "Country (two letters only!) [%s]: "
msgstr "Страна (только 2 символа!) [%s]: "
@@ -542,15 +542,15 @@ msgstr "Страна (только 2 символа!): "
msgid "Country: [%s]"
msgstr "Страна: [%s]"
-#: ../calculate-core/pym/core/server/cert_cmd.py:198
+#: ../calculate-core/pym/core/server/cert_cmd.py:199
msgid "Create a new private key and request?"
msgstr "Создать новый секретный ключ и запрос?"
-#: ../calculate-core/pym/core/client/cert_func.py:115
+#: ../calculate-core/pym/core/client/cert_func.py:116
msgid "Create a new private key and request? y/[n]: "
msgstr "Создать новый секретный ключ и запрос? y/[n]: "
-#: ../calculate-core/pym/core/server/cert_cmd.py:1260
+#: ../calculate-core/pym/core/server/cert_cmd.py:1255
msgid "Create symlinks for methods"
msgstr "Создание ссылок для методов"
@@ -582,11 +582,11 @@ msgstr "Удаление группы"
msgid "Delete the Request"
msgstr "Удаление запроса"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1020
+#: ../calculate-core/pym/core/server/cert_cmd.py:1015
msgid "Delete the certificate and the signature request? y/[n]: "
msgstr "Удалить сертификат и запрос на подпись? y/[n]: "
-#: ../calculate-core/pym/core/server/cert_cmd.py:689
+#: ../calculate-core/pym/core/server/cert_cmd.py:684
#, python-format
msgid "Delete the client certificate with ID %d? y/[n]: "
msgstr "Удалить сертификат клиента с ID %d? y/[n]: "
@@ -600,7 +600,7 @@ msgstr "Удаление группы"
msgid "Delete the request"
msgstr "Удаление запроса"
-#: ../calculate-core/pym/core/server/cert_cmd.py:692
+#: ../calculate-core/pym/core/server/cert_cmd.py:687
msgid "Deleted"
msgstr "Удалено"
@@ -622,8 +622,8 @@ msgstr "Обновление конфигурационных файлов вр
msgid "Dispatching manually interrupted"
msgstr "Обновление конфигурационных файлов прервано пользователем"
-#: ../calculate-core/pym/core/server/cert_cmd.py:84
#: ../calculate-core/pym/core/server/create_cert.py:57
+#: ../calculate-core/pym/core/server/cert_cmd.py:85
msgid "Do not use spaces or tabs."
msgstr "Не используйте символы пробела и табуляции."
@@ -635,8 +635,8 @@ msgstr "Вы действительно хотите удалить все се
msgid "Done"
msgstr "Готово"
-#: ../calculate-core/pym/core/server/cert_cmd.py:63
#: ../calculate-core/pym/core/server/create_cert.py:46
+#: ../calculate-core/pym/core/server/cert_cmd.py:64
msgid "Enter the certificate date manually? [y]/n: "
msgstr "Ввести дату сертификата вручную? y/[n]: "
@@ -644,22 +644,22 @@ msgstr "Ввести дату сертификата вручную? y/[n]: "
msgid "Enter the certificate date manually? y/[n]: "
msgstr "Ввести дату сертификата вручную? y/[n]: "
-#: ../calculate-core/pym/core/server/cert_cmd.py:722
+#: ../calculate-core/pym/core/server/cert_cmd.py:717
msgid "Enter the group of the new certificate (group name or 'all'): "
msgstr "Введите группу нового сертификата (имя группы или 'all'): "
-#: ../calculate-core/pym/core/client/cert_func.py:92
-#: ../calculate-core/pym/core/client/cert_func.py:145
+#: ../calculate-core/pym/core/client/cert_func.py:93
+#: ../calculate-core/pym/core/client/cert_func.py:146
msgid "Enter the port number: "
msgstr "Введите номер порта: "
-#: ../calculate-core/pym/core/server/func.py:843
+#: ../calculate-core/pym/core/server/func.py:844
msgid "Error"
msgstr "Ошибка"
-#: ../calculate-core/pym/core/client/cert_verify.py:103
-#: ../calculate-core/pym/core/client/cert_verify.py:108
-#: ../calculate-core/pym/core/client/client_class.py:288
+#: ../calculate-core/pym/core/client/cert_verify.py:104
+#: ../calculate-core/pym/core/client/cert_verify.py:109
+#: ../calculate-core/pym/core/client/client_class.py:289
#, python-format
msgid "Error creating directory %s"
msgstr "Ошибка создания директории %s"
@@ -682,7 +682,7 @@ msgstr "Ошибка чтения файлов с идентификаторам
msgid "Error writing to variable %s:"
msgstr "Ошибка записи переменной %s :"
-#: ../calculate-core/pym/core/client/client_class.py:204
+#: ../calculate-core/pym/core/client/client_class.py:205
msgid "Error. Certificate not added to the trusted list."
msgstr "Ошибка. Сертификат не добавлен в доверенные."
@@ -722,7 +722,7 @@ msgstr "Не удалось настроить систему!"
msgid "Failed to connect"
msgstr "Не удалось подключиться"
-#: ../calculate-core/pym/core/server/func.py:141
+#: ../calculate-core/pym/core/server/func.py:142
#, python-brace-format
msgid "Failed to copy {ffrom} to {fto}"
msgstr "Не удалось скопировать {ffrom} в {fto}"
@@ -732,7 +732,7 @@ msgstr "Не удалось скопировать {ffrom} в {fto}"
msgid "Failed to create directory %s"
msgstr "Не удалось создать директорию %s"
-#: ../calculate-core/pym/core/client/cert_func.py:287
+#: ../calculate-core/pym/core/client/cert_func.py:288
msgid "Failed to create the certificate ID!"
msgstr "Ошибка создания номера сертификата!"
@@ -797,7 +797,7 @@ msgstr "Невозможно импортировать %s"
msgid "Failed to obtain the certificate data!"
msgstr "Не удалось получить данные сертификата!"
-#: ../calculate-core/pym/core/client/client_class.py:104
+#: ../calculate-core/pym/core/client/client_class.py:105
#: ../calculate-core/pym/core/server/client_class.py:74
msgid "Failed to open the file"
msgstr "Ошибка открытия файла"
@@ -815,7 +815,7 @@ msgstr "Не удалось выполнить действие!"
msgid "Failed to perform backup!"
msgstr "Не удалось создать резервную копию!"
-#: ../calculate-core/pym/core/server/func.py:154
+#: ../calculate-core/pym/core/server/func.py:155
#, python-format
msgid "Failed to remove %s"
msgstr "Не удалось удалить %s"
@@ -853,8 +853,8 @@ msgstr "Не удалось запустить сервис {name}"
msgid "Failed to stop {name} service"
msgstr "Не удалось остановить сервис {name}"
-#: ../calculate-core/pym/core/server/func.py:1081
#: ../calculate-core/pym/core/server/local_call.py:156
+#: ../calculate-core/pym/core/server/func.py:1082
#, python-format
msgid "Failed to write the PID file %s!"
msgstr "Ошибка записи файла с идентификаторами процессов %s!"
@@ -864,8 +864,8 @@ msgstr "Ошибка записи файла с идентификаторами
msgid "Failed to zap {name} service"
msgstr "Не удалось сбросить сервис {name}"
-#: ../calculate-core/pym/core/client/cert_func.py:243
-#: ../calculate-core/pym/core/client/client_class.py:169
+#: ../calculate-core/pym/core/client/cert_func.py:244
+#: ../calculate-core/pym/core/client/client_class.py:170
#: ../calculate-core/pym/core/server/bootstrap.py:414
msgid "Field \"CN\" not found in the certificate!"
msgstr "Нет поля \"CN\" в сертификате!"
@@ -878,24 +878,24 @@ msgstr "Восстановление из резервной копии успе
msgid "Filter"
msgstr "Фильтр"
-#: ../calculate-core/pym/core/server/cert_cmd.py:543
-#: ../calculate-core/pym/core/server/cert_cmd.py:836
+#: ../calculate-core/pym/core/server/cert_cmd.py:538
+#: ../calculate-core/pym/core/server/cert_cmd.py:831
msgid "Fingerprint = "
msgstr "Отпечаток = "
-#: ../calculate-core/pym/core/client/client_class.py:206
-#: ../calculate-core/pym/core/client/client_class.py:231
+#: ../calculate-core/pym/core/client/client_class.py:207
+#: ../calculate-core/pym/core/client/client_class.py:232
#: ../calculate-core/pym/core/server/client_class.py:85
#, python-format
msgid "Fingerprint = %s"
msgstr "Отпечаток = %s"
-#: ../calculate-core/pym/core/server/cert_cmd.py:99
#: ../calculate-core/pym/core/server/create_cert.py:86
+#: ../calculate-core/pym/core/server/cert_cmd.py:100
msgid "Full network address (host:port)"
msgstr "Полный сетевой адрес (хост:порт)"
-#: ../calculate-core/pym/core/server/baseClass.py:162
+#: ../calculate-core/pym/core/server/baseClass.py:163
msgid "General monitoring started"
msgstr "Общий мониторинг запущен"
@@ -917,8 +917,8 @@ msgstr "Группа"
msgid "Group %s already exists!"
msgstr "Группа %s уже существует!"
-#: ../calculate-core/pym/core/variables/groups.py:80
#: ../calculate-core/pym/core/variables/request.py:344
+#: ../calculate-core/pym/core/variables/groups.py:80
#, python-format
msgid "Group %s does not exist"
msgstr "Группа %s не существует"
@@ -971,8 +971,8 @@ msgid "Groups"
msgstr "Группы"
#: ../calculate-core/pym/core/client/create_cert.py:73
-#: ../calculate-core/pym/core/server/cert_cmd.py:86
#: ../calculate-core/pym/core/server/create_cert.py:73
+#: ../calculate-core/pym/core/server/cert_cmd.py:87
#, python-format
msgid "Hostname [%s] : "
msgstr "Имя хоста [%s]: "
@@ -982,11 +982,11 @@ msgstr "Имя хоста [%s]: "
msgid "IP: %s"
msgstr "IP - %s"
-#: ../calculate-core/pym/core/server/baseClass.py:169
+#: ../calculate-core/pym/core/server/baseClass.py:170
msgid "Inactive watchdog failed"
msgstr "Не удалось запустить отслеживание осутствия активности"
-#: ../calculate-core/pym/core/server/baseClass.py:168
+#: ../calculate-core/pym/core/server/baseClass.py:169
msgid "Inactive watchdog started"
msgstr "Отслеживание отсутвия активности запущено"
@@ -994,19 +994,19 @@ msgstr "Отслеживание отсутвия активности запу
msgid "Invalid SID"
msgstr "Ошибка сессии"
-#: ../calculate-core/pym/core/client/cert_func.py:304
+#: ../calculate-core/pym/core/client/cert_func.py:305
msgid "Invalid certificate ID"
msgstr "Ошибка номера сертификата"
-#: ../calculate-core/pym/core/client/client_class.py:191
+#: ../calculate-core/pym/core/client/client_class.py:192
msgid "Invalid server certificate!"
msgstr "Сертификат сервера недействителен"
-#: ../calculate-core/pym/core/client/client_class.py:209
-#: ../calculate-core/pym/core/client/client_class.py:234
-#: ../calculate-core/pym/core/server/cert_cmd.py:546
-#: ../calculate-core/pym/core/server/cert_cmd.py:839
+#: ../calculate-core/pym/core/client/client_class.py:210
+#: ../calculate-core/pym/core/client/client_class.py:235
#: ../calculate-core/pym/core/server/client_class.py:88
+#: ../calculate-core/pym/core/server/cert_cmd.py:541
+#: ../calculate-core/pym/core/server/cert_cmd.py:834
msgid "Issuer"
msgstr "Подписчик"
@@ -1069,7 +1069,7 @@ msgstr "Метод для %s не найден: "
msgid "Method not found: "
msgstr "Метод не найден: "
-#: ../calculate-core/pym/core/server/func.py:455
+#: ../calculate-core/pym/core/server/func.py:456
#, python-brace-format
msgid "Method {method} for {obj} not found"
msgstr "Метод {method} для {obj} не найден"
@@ -1095,7 +1095,7 @@ msgstr "Изменить группу"
msgid "Modifying manually interrupted"
msgstr "Изменение прервано пользователем"
-#: ../calculate-core/pym/core/server/baseClass.py:163
+#: ../calculate-core/pym/core/server/baseClass.py:164
msgid "Monitoring error"
msgstr "Ошибка мониторинга"
@@ -1130,7 +1130,7 @@ msgstr "Нет групп"
#: ../calculate-core/pym/core/client/pid_information.py:121
#: ../calculate-core/pym/core/client/pid_information.py:125
-#: ../calculate-core/pym/core/server/cert_cmd.py:618
+#: ../calculate-core/pym/core/server/cert_cmd.py:613
msgid "No methods available"
msgstr "Нет доступных методов"
@@ -1144,7 +1144,7 @@ msgstr "Нет модуля %s"
msgid "No requests"
msgstr "Нет запросов"
-#: ../calculate-core/pym/core/server/cl_server.py:332
+#: ../calculate-core/pym/core/server/cl_server.py:333
msgid "No socket could be created"
msgstr "Не получается создать сокет"
@@ -1152,7 +1152,7 @@ msgstr "Не получается создать сокет"
msgid "No such variables"
msgstr "Нет таких переменных"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1022
+#: ../calculate-core/pym/core/server/cert_cmd.py:1017
msgid "Not deleted"
msgstr "Не удалён"
@@ -1164,24 +1164,24 @@ msgstr "Нет запросов"
msgid "Not signed"
msgstr "Не подписан"
-#: ../calculate-core/pym/core/server/cert_cmd.py:151
-#: ../calculate-core/pym/core/server/cert_cmd.py:176
+#: ../calculate-core/pym/core/server/cert_cmd.py:152
+#: ../calculate-core/pym/core/server/cert_cmd.py:177
msgid "OK"
msgstr "OK"
-#: ../calculate-core/pym/core/server/func.py:452
+#: ../calculate-core/pym/core/server/func.py:453
#, python-format
msgid "Object %s not found"
msgstr "Объект %s не найден"
#: ../calculate-core/pym/core/client/create_cert.py:80
-#: ../calculate-core/pym/core/server/cert_cmd.py:94
#: ../calculate-core/pym/core/server/create_cert.py:81
+#: ../calculate-core/pym/core/server/cert_cmd.py:95
msgid "Organization name: "
msgstr "Название организации: "
-#: ../calculate-core/pym/core/server/cert_cmd.py:89
#: ../calculate-core/pym/core/server/create_cert.py:76
+#: ../calculate-core/pym/core/server/cert_cmd.py:90
msgid "Organization unit: "
msgstr "Название отдела: "
@@ -1290,8 +1290,8 @@ msgstr "Путь %s не существует"
msgid "Path for configuration"
msgstr "Путь для настройки"
-#: ../calculate-core/pym/core/client/cert_func.py:314
#: ../calculate-core/pym/core/client/pid_information.py:37
+#: ../calculate-core/pym/core/client/cert_func.py:315
msgid "Permission denied"
msgstr "Доступ запрещён"
@@ -1300,7 +1300,7 @@ msgstr "Доступ запрещён"
msgid "Permissions"
msgstr "Права"
-#: ../calculate-core/pym/core/server/cert_cmd.py:554
+#: ../calculate-core/pym/core/server/cert_cmd.py:549
msgid "Permissions: "
msgstr "Права: "
@@ -1324,11 +1324,11 @@ msgstr "Пожалуйста, выберите версию"
msgid "Please enter a correct SID"
msgstr "Введите корректный идентификатор сессии"
-#: ../calculate-core/pym/core/client/cert_func.py:311
+#: ../calculate-core/pym/core/client/cert_func.py:312
msgid "Please enter a valid certificate ID!"
msgstr "Введите корректный номер сертификата!"
-#: ../calculate-core/pym/core/server/cl_server.py:333
+#: ../calculate-core/pym/core/server/cl_server.py:334
#, python-format
msgid "Port %d already in use"
msgstr "Порт %d уже используется"
@@ -1364,7 +1364,7 @@ msgstr "Процесс убит"
msgid "Process name: %s"
msgstr "Имя процесса - %s"
-#: ../calculate-core/pym/core/client/client_class.py:244
+#: ../calculate-core/pym/core/client/client_class.py:245
msgid "Quit (q)? s/c/[q]: "
msgstr "Выйти (q)? s/c/[q]: "
@@ -1390,19 +1390,19 @@ msgstr "Повтор пароля: "
msgid "Repeat: "
msgstr "Повтор: "
-#: ../calculate-core/pym/core/server/cert_cmd.py:935
-#: ../calculate-core/pym/core/server/cert_cmd.py:973
+#: ../calculate-core/pym/core/server/cert_cmd.py:930
+#: ../calculate-core/pym/core/server/cert_cmd.py:968
#, python-format
msgid "Request \t%s"
msgstr "Запрос \t%s"
-#: ../calculate-core/pym/core/server/cert_cmd.py:933
-#: ../calculate-core/pym/core/server/cert_cmd.py:971
+#: ../calculate-core/pym/core/server/cert_cmd.py:928
+#: ../calculate-core/pym/core/server/cert_cmd.py:966
#, python-format
msgid "Request \t%s: not signed"
msgstr "Запрос \t%s - не подписан"
-#: ../calculate-core/pym/core/client/cert_func.py:166
+#: ../calculate-core/pym/core/client/cert_func.py:167
#: ../calculate-core/pym/core/server/bootstrap.py:318
#, python-format
msgid "Request %s not found"
@@ -1417,7 +1417,7 @@ msgstr "Запрос %s не найден"
msgid "Request Details"
msgstr "Подробности запроса на подпись сертификата"
-#: ../calculate-core/pym/core/client/cert_func.py:87
+#: ../calculate-core/pym/core/client/cert_func.py:88
#, python-format
msgid "Request ID = %s"
msgstr "Номер запроса = %s"
@@ -1434,11 +1434,11 @@ msgstr "MAC-адрес"
msgid "Request date"
msgstr "Дата запроса"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1018
+#: ../calculate-core/pym/core/server/cert_cmd.py:1013
msgid "Request duly signed"
msgstr "Запрос успешно подписан"
-#: ../calculate-core/pym/core/server/cert_cmd.py:905
+#: ../calculate-core/pym/core/server/cert_cmd.py:900
msgid "Request for signature not found!"
msgstr "Запрос на подпись не найден!"
@@ -1450,8 +1450,8 @@ msgstr "Идентификатор запроса"
msgid "Request location"
msgstr "Расположение"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1011
#: ../calculate-core/pym/core/server/request.py:126
+#: ../calculate-core/pym/core/server/cert_cmd.py:1006
#, python-format
msgid "Request or certificate with ID = %s not found!"
msgstr "Запрос или сертификат с идентификатором = %s не найден!"
@@ -1468,11 +1468,11 @@ msgstr "Запрос подписан"
msgid "Restart calculate-core"
msgstr "Перезапуск calculate-core"
-#: ../calculate-core/pym/core/server/baseClass.py:167
+#: ../calculate-core/pym/core/server/baseClass.py:168
msgid "Restart watchdog failed"
msgstr "Не удалось запустить отслеживание перезагрузки"
-#: ../calculate-core/pym/core/server/baseClass.py:166
+#: ../calculate-core/pym/core/server/baseClass.py:167
msgid "Restart watchdog started"
msgstr "Отслеживание перезагрузки запущено"
@@ -1516,11 +1516,11 @@ msgstr "Восстановление сервисов"
msgid "Restoring user accounts"
msgstr "Восстановление учётных записей"
-#: ../calculate-core/pym/core/client/cert_verify.py:87
+#: ../calculate-core/pym/core/client/cert_verify.py:88
msgid "Revoke date"
msgstr "Дата отзыва"
-#: ../calculate-core/pym/core/server/cert_cmd.py:774
+#: ../calculate-core/pym/core/server/cert_cmd.py:769
msgid "Root certificate or private key not found"
msgstr "Корневой сертификат или секретный ключ не найден"
@@ -1545,8 +1545,8 @@ msgstr "Запуск остановленных сервисов"
msgid "SID deleted!"
msgstr "Сессия закрыта!"
-#: ../calculate-core/pym/core/client/client_class.py:316
-#: ../calculate-core/pym/core/client/client_class.py:356
+#: ../calculate-core/pym/core/client/client_class.py:317
+#: ../calculate-core/pym/core/client/client_class.py:357
#: ../calculate-core/pym/core/server/client_class.py:133
#: ../calculate-core/pym/core/server/client_class.py:189
msgid "SSL library is not support TLSv1_2"
@@ -1556,23 +1556,23 @@ msgstr "SSL библиотека не поддерживает TLSv1_2"
msgid "Save"
msgstr "Сохранить"
-#: ../calculate-core/pym/core/client/cert_func.py:88
+#: ../calculate-core/pym/core/client/cert_func.py:89
msgid "Send a new request? y/[n]: "
msgstr "Отправить новый запрос? y/[n]: "
-#: ../calculate-core/pym/core/client/cert_verify.py:86
+#: ../calculate-core/pym/core/client/cert_verify.py:87
msgid "Serial"
msgstr "Серийный номер"
-#: ../calculate-core/pym/core/client/client_class.py:207
-#: ../calculate-core/pym/core/client/client_class.py:232
-#: ../calculate-core/pym/core/server/cert_cmd.py:544
-#: ../calculate-core/pym/core/server/cert_cmd.py:837
+#: ../calculate-core/pym/core/client/client_class.py:208
+#: ../calculate-core/pym/core/client/client_class.py:233
#: ../calculate-core/pym/core/server/client_class.py:86
+#: ../calculate-core/pym/core/server/cert_cmd.py:539
+#: ../calculate-core/pym/core/server/cert_cmd.py:832
msgid "Serial number = "
msgstr "Серийный номер = "
-#: ../calculate-core/pym/core/server/cl_server.py:341
+#: ../calculate-core/pym/core/server/cl_server.py:342
msgid "Server certificate not found"
msgstr "Сертификат сервера не найден"
@@ -1580,11 +1580,11 @@ msgstr "Сертификат сервера не найден"
msgid "Server certificate now exists."
msgstr "Сертификат сервера создан."
-#: ../calculate-core/pym/core/server/cl_server.py:311
+#: ../calculate-core/pym/core/server/cl_server.py:312
msgid "Server started"
msgstr "Сервер запущен"
-#: ../calculate-core/pym/core/server/cl_server.py:327
+#: ../calculate-core/pym/core/server/cl_server.py:328
msgid "Server stopped"
msgstr "Сервер остановлен"
@@ -1596,11 +1596,11 @@ msgstr "Сессия активна"
msgid "Session inactive"
msgstr "Сессия неактивна"
-#: ../calculate-core/pym/core/server/baseClass.py:165
+#: ../calculate-core/pym/core/server/baseClass.py:166
msgid "Session monitoring failed"
msgstr "Ошибка мониторинга сессий"
-#: ../calculate-core/pym/core/server/baseClass.py:164
+#: ../calculate-core/pym/core/server/baseClass.py:165
msgid "Session monitoring started"
msgstr "Запущен мониторинг сессий"
@@ -1659,9 +1659,9 @@ msgstr "Просмотр запросов"
msgid "Show the value"
msgstr "Показать значение"
-#: ../calculate-core/pym/core/server/cert_cmd.py:711
-#: ../calculate-core/pym/core/server/cert_cmd.py:787
#: ../calculate-core/pym/core/server/request.py:87
+#: ../calculate-core/pym/core/server/cert_cmd.py:706
+#: ../calculate-core/pym/core/server/cert_cmd.py:782
#, python-format
msgid "Signature request %s not found"
msgstr "Запрос на подпись %s не найден"
@@ -1674,20 +1674,20 @@ msgstr "Запрос на подпись сертификата удалён"
msgid "Signing manually interrupted"
msgstr "Процесс подписывания прерван пользователем"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1153
+#: ../calculate-core/pym/core/server/cert_cmd.py:1148
msgid "Specify the location of the PID file"
msgstr "Указать расположение PID файла"
-#: ../calculate-core/pym/core/client/client_class.py:213
-#: ../calculate-core/pym/core/client/client_class.py:238
-#: ../calculate-core/pym/core/server/cert_cmd.py:550
-#: ../calculate-core/pym/core/server/cert_cmd.py:843
-#: ../calculate-core/pym/core/server/cert_cmd.py:883
+#: ../calculate-core/pym/core/client/client_class.py:214
+#: ../calculate-core/pym/core/client/client_class.py:239
#: ../calculate-core/pym/core/server/client_class.py:92
+#: ../calculate-core/pym/core/server/cert_cmd.py:545
+#: ../calculate-core/pym/core/server/cert_cmd.py:838
+#: ../calculate-core/pym/core/server/cert_cmd.py:878
msgid "Subject"
msgstr "Субъект"
-#: ../calculate-core/pym/core/server/func.py:1531
+#: ../calculate-core/pym/core/server/func.py:1532
#, python-format
msgid "Symlink %s created"
msgstr "Создана ссылка %s"
@@ -1715,8 +1715,8 @@ msgstr "Конфигурация утилитами Calculate системных
msgid "System restore"
msgstr "Восстановление системы"
-#: ../calculate-core/pym/core/server/func.py:777
-#: ../calculate-core/pym/core/server/func.py:839
+#: ../calculate-core/pym/core/server/func.py:778
+#: ../calculate-core/pym/core/server/func.py:840
#: ../calculate-core/pym/core/core_main.py:60
msgid "Task interrupted"
msgstr "Задача прервана"
@@ -1725,16 +1725,16 @@ msgstr "Задача прервана"
msgid "Templates preparing for backup"
msgstr "Подготовка резервной копии шаблонами"
-#: ../calculate-core/pym/core/client/cert_verify.py:60
-#: ../calculate-core/pym/core/client/cert_verify.py:66
+#: ../calculate-core/pym/core/client/cert_verify.py:61
+#: ../calculate-core/pym/core/client/cert_verify.py:67
msgid "The CN and L fields in the CA certificate are incorrect!"
msgstr "Поля CN и L в сертификате центра авторизации некорректны!"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1002
+#: ../calculate-core/pym/core/server/cert_cmd.py:997
msgid "The ID must be int."
msgstr "идентификатор должен быть целочисленным."
-#: ../calculate-core/pym/core/server/cert_cmd.py:1080
+#: ../calculate-core/pym/core/server/cert_cmd.py:1075
msgid "The ID of a certificate to be revoked must be integer!"
msgstr "Номер отзываемого сертификата должен быть целочисленным!"
@@ -1750,13 +1750,13 @@ msgstr "Номер сертификата должен быть целочисл
msgid "The certificate does not match the private key"
msgstr "Сертификат не соответствует секретному ключу"
-#: ../calculate-core/pym/core/client/cert_func.py:53
+#: ../calculate-core/pym/core/client/cert_func.py:54
#, python-format
msgid "The certificate expires after %d days"
msgstr "Срок годности истекает через %d дней"
-#: ../calculate-core/pym/core/server/cert_cmd.py:706
-#: ../calculate-core/pym/core/server/cert_cmd.py:782
+#: ../calculate-core/pym/core/server/cert_cmd.py:701
+#: ../calculate-core/pym/core/server/cert_cmd.py:777
msgid "The certificate number must be int"
msgstr "Номер сертификата должен быть целочисленным"
@@ -1765,7 +1765,7 @@ msgstr "Номер сертификата должен быть целочисл
msgid "The certificate with ID %s not exists"
msgstr "Сертификата с номером %s не существует"
-#: ../calculate-core/pym/core/client/cert_func.py:293
+#: ../calculate-core/pym/core/client/cert_func.py:294
#, python-format
msgid "The certificate with ID = %d can execute:"
msgstr "Сертификат с номером = %d может запускать:"
@@ -1782,8 +1782,8 @@ msgstr "Имя группы должно состоять из 2 - 20 симво
msgid "The limit number must be int"
msgstr "Предел должен быть целочисленным"
-#: ../calculate-core/pym/core/client/cert_func.py:96
-#: ../calculate-core/pym/core/client/cert_func.py:149
+#: ../calculate-core/pym/core/client/cert_func.py:97
+#: ../calculate-core/pym/core/client/cert_func.py:150
msgid "The port number must be int"
msgstr "Номер порта должен быть целочисленным"
@@ -1795,27 +1795,27 @@ msgstr "ID запроса - обязательный параметр"
msgid "The request ID must be int"
msgstr "Идентификатор запроса должен быть целочисленным"
-#: ../calculate-core/pym/core/client/cert_func.py:188
+#: ../calculate-core/pym/core/client/cert_func.py:189
+#: ../calculate-core/pym/core/server/cert_cmd.py:259
#: ../calculate-core/pym/core/server/bootstrap.py:346
-#: ../calculate-core/pym/core/server/cert_cmd.py:261
msgid "The request was sent from another IP."
msgstr "Запрос был послан с другого IP."
-#: ../calculate-core/pym/core/client/cert_func.py:185
+#: ../calculate-core/pym/core/client/cert_func.py:186
+#: ../calculate-core/pym/core/server/cert_cmd.py:256
#: ../calculate-core/pym/core/server/bootstrap.py:343
-#: ../calculate-core/pym/core/server/cert_cmd.py:258
msgid "The signature request does not match earlier data."
msgstr "Запрос на подпись сертификата не соответствует отправленному ранее."
-#: ../calculate-core/pym/core/client/cert_func.py:181
+#: ../calculate-core/pym/core/client/cert_func.py:182
+#: ../calculate-core/pym/core/server/cert_cmd.py:252
#: ../calculate-core/pym/core/server/bootstrap.py:339
-#: ../calculate-core/pym/core/server/cert_cmd.py:254
msgid "The signature request has not been examined yet."
msgstr "Запрос на подписание до сих пор не рассмотрены."
-#: ../calculate-core/pym/core/client/cert_func.py:178
+#: ../calculate-core/pym/core/client/cert_func.py:179
+#: ../calculate-core/pym/core/server/cert_cmd.py:249
#: ../calculate-core/pym/core/server/bootstrap.py:336
-#: ../calculate-core/pym/core/server/cert_cmd.py:251
msgid "The signature request was rejected!"
msgstr "Запрос на подпись отвергнут!"
@@ -1823,25 +1823,25 @@ msgstr "Запрос на подпись отвергнут!"
msgid "The system is being configured"
msgstr "Конфигурирование системы"
-#: ../calculate-core/pym/core/client/cert_verify.py:71
+#: ../calculate-core/pym/core/client/cert_verify.py:72
msgid "This certificate cannot be verified in the CRL."
msgstr "Этот сертификат не может быть проверен в списке отзыва (CRL)."
-#: ../calculate-core/pym/core/client/cert_verify.py:85
+#: ../calculate-core/pym/core/client/cert_verify.py:86
msgid "This certificate has been revoked!"
msgstr "Сертификат отозван!"
-#: ../calculate-core/pym/core/client/cert_func.py:126
-#: ../calculate-core/pym/core/server/cert_cmd.py:211
+#: ../calculate-core/pym/core/client/cert_func.py:127
+#: ../calculate-core/pym/core/server/cert_cmd.py:212
msgid "This server is not enabled to sign certificates!"
msgstr "Данный сервер не может подписывать сертификаты!"
-#: ../calculate-core/pym/core/server/cert_cmd.py:662
+#: ../calculate-core/pym/core/server/cert_cmd.py:657
#, python-format
msgid "Total: %d certificates."
msgstr "Всего %d сертификатов."
-#: ../calculate-core/pym/core/client/client_class.py:243
+#: ../calculate-core/pym/core/client/client_class.py:244
msgid "Try to add the CA and root certificates to trusted (c) or"
msgstr "Попробовать добавить корневой и сертификат центра авторизации для доверенных (с) или"
@@ -1875,7 +1875,7 @@ msgstr "Распаковка резервной копии"
msgid "Unpacking configuration files"
msgstr "Распаковка конфигурационных файлов"
-#: ../calculate-core/pym/core/client/client_class.py:228
+#: ../calculate-core/pym/core/client/client_class.py:229
#: ../calculate-core/pym/core/server/client_class.py:80
msgid "Untrusted server certificate!"
msgstr "Ненадёжный сертификат сервера!"
@@ -1945,7 +1945,7 @@ msgstr "Имя пользователя [%s]: "
msgid "Using patches for the {nameProgram} package by Calculate Utilities"
msgstr "Применение патчей Calculate утилитами для {nameProgram}"
-#: ../calculate-core/pym/core/server/cert_cmd.py:160
+#: ../calculate-core/pym/core/server/cert_cmd.py:161
msgid "Using the root certificate as the server certificate"
msgstr "Использование корневого сертификата в качестве серверного сертификата"
@@ -1999,7 +1999,7 @@ msgstr "Просмотреть переменные"
msgid "Viewing manually interrupted"
msgstr "Просмотр прерван пользователем"
-#: ../calculate-core/pym/core/client/client_class.py:332
+#: ../calculate-core/pym/core/client/client_class.py:333
#, python-format
msgid "WARNING! %s trying to replace the certificate!"
msgstr "Внимание! %s пытается подменить сертификат!"
@@ -2027,7 +2027,7 @@ msgstr "Неправильный %s синтаксис у значения"
msgid "Wrong expert varaiables list"
msgstr "Неправильный список экспертных переменных"
-#: ../calculate-core/pym/core/server/func.py:449
+#: ../calculate-core/pym/core/server/func.py:450
#, python-format
msgid "Wrong method for task %s"
msgstr "Неправильный метод для задачи %s"
@@ -2044,7 +2044,7 @@ msgstr "Неправильный параметр "
msgid "X session users not found"
msgstr "Не найден X сессия пользователей"
-#: ../calculate-core/pym/core/client/cert_func.py:86
+#: ../calculate-core/pym/core/client/cert_func.py:87
msgid "You already sent a certificate signature request."
msgstr "Вы уже отправили запрос на подписание сертификата."
@@ -2057,7 +2057,7 @@ msgstr "Вы можете запускать:"
msgid "You cannot change the certificate permissions"
msgstr "Вы не можете изменить права сертификата"
-#: ../calculate-core/pym/core/client/cert_func.py:269
+#: ../calculate-core/pym/core/client/cert_func.py:270
msgid "You do not have a certificate. Use option --gen-cert-by HOST to generate a new certificate or --get-cert-from HOST to get the certificate from the server."
msgstr "У вас нет сертификата. Используйте ключ --gen-cert-by HOST для генерации нового сертификата или ключ --get-cert-from HOST для получения нового сертификата с сервера."
@@ -2065,11 +2065,11 @@ msgstr "У вас нет сертификата. Используйте ключ
msgid "You must not choose only clt location for desktop templates"
msgstr "Вы не можете выбрать только clt расположение для desktop шаблонов"
-#: ../calculate-core/pym/core/client/cert_func.py:131
-#: ../calculate-core/pym/core/client/cert_func.py:182
-#: ../calculate-core/pym/core/server/bootstrap.py:340
+#: ../calculate-core/pym/core/client/cert_func.py:132
+#: ../calculate-core/pym/core/client/cert_func.py:183
#: ../calculate-core/pym/core/server/cert_cmd.py:216
-#: ../calculate-core/pym/core/server/cert_cmd.py:255
+#: ../calculate-core/pym/core/server/cert_cmd.py:253
+#: ../calculate-core/pym/core/server/bootstrap.py:340
#, python-format
msgid "Your request ID = %s"
msgstr "Номер Вашего запроса = %s"
@@ -2078,7 +2078,7 @@ msgstr "Номер Вашего запроса = %s"
msgid "Zap new"
msgstr "Удалить новый"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1197
+#: ../calculate-core/pym/core/server/cert_cmd.py:1192
msgid "add permissions for a certificate (or certificates, comma-separated) (use with option -c [ID])"
msgstr "добавить права для сертификата (или списка через ',') (используйте с ключом -c [ID])"
@@ -2086,7 +2086,7 @@ msgstr "добавить права для сертификата (или спи
msgid "add this certificate to trusted and continue? y/[n]: "
msgstr "add this certificate to trusted and continue? y/[n]: "
-#: ../calculate-core/pym/core/server/cert_cmd.py:601
+#: ../calculate-core/pym/core/server/cert_cmd.py:596
msgid "all methods"
msgstr "все методы"
@@ -2095,37 +2095,37 @@ msgstr "все методы"
msgid "auto"
msgstr "авто"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1171
+#: ../calculate-core/pym/core/server/cert_cmd.py:1166
msgid "bootstrap action"
msgstr "начальные загрузки"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1234
+#: ../calculate-core/pym/core/server/cert_cmd.py:1229
msgid "call method"
msgstr "запуск метода"
-#: ../calculate-core/pym/core/server/cert_cmd.py:284
-#: ../calculate-core/pym/core/server/cert_cmd.py:293
-#: ../calculate-core/pym/core/server/cert_cmd.py:299
-#: ../calculate-core/pym/core/server/cert_cmd.py:331
-#: ../calculate-core/pym/core/server/func.py:1508
+#: ../calculate-core/pym/core/server/cert_cmd.py:280
+#: ../calculate-core/pym/core/server/cert_cmd.py:288
+#: ../calculate-core/pym/core/server/cert_cmd.py:294
+#: ../calculate-core/pym/core/server/cert_cmd.py:326
+#: ../calculate-core/pym/core/server/func.py:1509
#, python-format
msgid "cannot create directory %s"
msgstr "не удаётся создать директорию %s"
-#: ../calculate-core/pym/core/server/cert_cmd.py:944
-#: ../calculate-core/pym/core/server/cert_cmd.py:982
+#: ../calculate-core/pym/core/server/cert_cmd.py:939
+#: ../calculate-core/pym/core/server/cert_cmd.py:977
msgid "certificate (request) number not int and not 'all'"
msgstr "номер сертификата (запроса) не целочисленный и не 'all'"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1055
+#: ../calculate-core/pym/core/server/cert_cmd.py:1050
msgid "certificate deleted"
msgstr "сертификат удалён"
-#: ../calculate-core/pym/core/server/cert_cmd.py:674
+#: ../calculate-core/pym/core/server/cert_cmd.py:669
msgid "certificate number not int and not 'all'"
msgstr "номер сертификата не целочисленный и не 'all'"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1257
+#: ../calculate-core/pym/core/server/cert_cmd.py:1252
msgid "configuration check"
msgstr "проверка конфигурации"
@@ -2133,35 +2133,35 @@ msgstr "проверка конфигурации"
msgid "configure the dependent packages in the same directory as the specified package, instead of root"
msgstr "настраивать зависимые пакеты в той же, где и указанный пакет, директории, вместо корня"
-#: ../calculate-core/pym/core/client/cert_func.py:99
-#: ../calculate-core/pym/core/client/cert_func.py:152
-#: ../calculate-core/pym/core/server/cert_cmd.py:182
-#: ../calculate-core/pym/core/server/cert_cmd.py:230
+#: ../calculate-core/pym/core/client/cert_func.py:100
+#: ../calculate-core/pym/core/client/cert_func.py:153
+#: ../calculate-core/pym/core/server/cert_cmd.py:183
+#: ../calculate-core/pym/core/server/cert_cmd.py:228
msgid "connecting..."
msgstr "соединение..."
-#: ../calculate-core/pym/core/server/cert_cmd.py:1174
+#: ../calculate-core/pym/core/server/cert_cmd.py:1169
msgid "create certificate for local user"
msgstr "создать сертификат для локального пользователя"
-#: ../calculate-core/pym/core/server/cert_cmd.py:862
-#: ../calculate-core/pym/core/server/cert_cmd.py:902
+#: ../calculate-core/pym/core/server/cert_cmd.py:857
+#: ../calculate-core/pym/core/server/cert_cmd.py:897
msgid "date"
msgstr "дата"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1189
+#: ../calculate-core/pym/core/server/cert_cmd.py:1184
msgid "debug"
msgstr "режим отладки (debug)"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1228
+#: ../calculate-core/pym/core/server/cert_cmd.py:1223
msgid "decline client's request for signature"
msgstr "отвергнуть клиентский запрос на подпись сертификата"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1237
+#: ../calculate-core/pym/core/server/cert_cmd.py:1232
msgid "display all available methods"
msgstr "отобразить все доступные методы"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1243
+#: ../calculate-core/pym/core/server/cert_cmd.py:1238
msgid "display the GUI progress bar"
msgstr "отображать индикатор прогресса GUI"
@@ -2169,56 +2169,56 @@ msgstr "отображать индикатор прогресса GUI"
msgid "display variables ('userset' displays user set variables, 'writable' displays only writable variables, 'system' displays user set variables from the system env file, 'local' displays user set variables from the local env file, 'remote' displays user set variables from the remote env file, 'all' displays all variables or filters them by part of name)"
msgstr "отобразить переменные ('userset' - отобразить изменённые переменные, 'writable' - отобразить только доступные для записи переменные, 'system' - отобразить изменённые переменные из системного конфигурационного файла, 'local' - отобразить изменённые переменные из локального конфигурационного файла, 'remote' - отобразить изменённые переменные из удалённого конфигурационного файла, 'all' - отобразить все переменные или фильтр по имени переменной"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1246
+#: ../calculate-core/pym/core/server/cert_cmd.py:1241
msgid "display warnings at the end"
msgstr "отобразить предупреждения в конце"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1240
+#: ../calculate-core/pym/core/server/cert_cmd.py:1235
msgid "do not display the progress bar"
msgstr "не отображать индикатор прогресса"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1186
+#: ../calculate-core/pym/core/server/cert_cmd.py:1181
msgid "dump (use with option -c [ID])"
msgstr "дамп (используйте с ключом -c [ID])"
-#: ../calculate-core/pym/core/server/cert_cmd.py:148
+#: ../calculate-core/pym/core/server/cert_cmd.py:150
#, python-format
msgid "error writing to (reading from) files in directory %s"
msgstr "ошибка записи (чтения) файла в директории %s"
-#: ../calculate-core/pym/core/server/cl_server.py:301
+#: ../calculate-core/pym/core/server/cl_server.py:302
#, python-format
msgid "failed to create PID file %s"
msgstr "не удаётся создать PID файл %s"
-#: ../calculate-core/pym/core/server/cert_cmd.py:403
+#: ../calculate-core/pym/core/server/cert_cmd.py:398
msgid "failed to delete the certificate!"
msgstr "ошибка удаления сертификата!"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1057
+#: ../calculate-core/pym/core/server/cert_cmd.py:1052
msgid "failed to delete the file!"
msgstr "ошибка удаления файла!"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1211
+#: ../calculate-core/pym/core/server/cert_cmd.py:1206
msgid "fetch the signed certificate from the server"
msgstr "получить подписанный сертификат с сервера (хост сервера)"
-#: ../calculate-core/pym/core/server/cert_cmd.py:522
-#: ../calculate-core/pym/core/server/cert_cmd.py:530
+#: ../calculate-core/pym/core/server/cert_cmd.py:517
+#: ../calculate-core/pym/core/server/cert_cmd.py:525
#, python-format
msgid "file %s not found!"
msgstr "файл %s не найден!"
-#: ../calculate-core/pym/core/client/cert_func.py:257
-#: ../calculate-core/pym/core/client/client_class.py:182
+#: ../calculate-core/pym/core/client/cert_func.py:258
+#: ../calculate-core/pym/core/client/client_class.py:183
msgid "file containing the CA certificate now exists"
msgstr "файл с сертификатом Центра авторизации создан"
-#: ../calculate-core/pym/core/client/client_class.py:179
+#: ../calculate-core/pym/core/client/client_class.py:180
msgid "filename = "
msgstr "имя файла = "
-#: ../calculate-core/pym/core/server/cert_cmd.py:1205
+#: ../calculate-core/pym/core/server/cert_cmd.py:1200
msgid "generate a root (or CA) certificate"
msgstr "генерировать корневой сертификат (сертификат удостоверяющего центра)"
@@ -2240,7 +2240,7 @@ msgstr "нет"
msgid "no path to the client certificate"
msgstr "не создан путь к сертификату клиента"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1160
+#: ../calculate-core/pym/core/server/cert_cmd.py:1155
msgid "operations with certificates (number or \"all\"). Server not running."
msgstr "операции с сертификатами (номер или \"all\"). Сервер не запускается."
@@ -2267,35 +2267,35 @@ msgstr "версия пакета с ревизией"
msgid "page %d from "
msgstr "страница %d из "
-#: ../calculate-core/pym/core/server/cert_cmd.py:1263
+#: ../calculate-core/pym/core/server/cert_cmd.py:1258
msgid "path to log files"
msgstr "путь к файлам логов"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1150
+#: ../calculate-core/pym/core/server/cert_cmd.py:1145
msgid "port number"
msgstr "номер порта"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1266
+#: ../calculate-core/pym/core/server/cert_cmd.py:1261
msgid "print the version number, then exit"
msgstr "вывод версии программы и выход"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1224
+#: ../calculate-core/pym/core/server/cert_cmd.py:1219
msgid "refuse to sign the certificate at the server's request"
msgstr "отвергнуть серверный запрос на подпись сертификата"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1178
+#: ../calculate-core/pym/core/server/cert_cmd.py:1173
msgid "remove all local user certificates"
msgstr "удалить все локальные пользовательские сертификаты"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1201
+#: ../calculate-core/pym/core/server/cert_cmd.py:1196
msgid "remove permissions for a certificate (use with option -c [ID])"
msgstr "удаление прав сертификата (используйте с -c [ID])"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1194
+#: ../calculate-core/pym/core/server/cert_cmd.py:1189
msgid "remove the selected certificate (use with option -c [ID])"
msgstr "удалить выбранный сертификат (используйте с ключом -c [ID])"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1015
+#: ../calculate-core/pym/core/server/cert_cmd.py:1010
#, python-format
msgid "request %s not found!"
msgstr "запрос %s не найден!"
@@ -2320,9 +2320,9 @@ msgstr "идентификатор запроса"
msgid "request location"
msgstr "расположение"
-#: ../calculate-core/pym/core/client/cert_func.py:137
-#: ../calculate-core/pym/core/server/bootstrap.py:305
+#: ../calculate-core/pym/core/client/cert_func.py:138
#: ../calculate-core/pym/core/server/cert_cmd.py:222
+#: ../calculate-core/pym/core/server/bootstrap.py:305
#, python-format
msgid "request not sent or file %s deleted"
msgstr "запрос не был отправлен, или удалён файл %s"
@@ -2331,16 +2331,16 @@ msgstr "запрос не был отправлен, или удалён фай
msgid "request owner username"
msgstr "имя владельца запроса"
-#: ../calculate-core/pym/core/server/cert_cmd.py:859
-#: ../calculate-core/pym/core/server/cert_cmd.py:899
+#: ../calculate-core/pym/core/server/cert_cmd.py:854
+#: ../calculate-core/pym/core/server/cert_cmd.py:894
msgid "request sent from:"
msgstr "запрос на подпись отправлен от:"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1231
+#: ../calculate-core/pym/core/server/cert_cmd.py:1226
msgid "revoke an earlier signed server (or CA) certificate. Run rm to remove the CRL"
msgstr "отозвать ранее подписанный сертификат сервера (удостоверяющего центра). rm для удаления списка отзыва"
-#: ../calculate-core/pym/core/server/cert_cmd.py:156
+#: ../calculate-core/pym/core/server/cert_cmd.py:157
msgid "root certificate not found (use cl-core with option --gen-root-cert)"
msgstr "корневой сертификат не найден (используйте cl-core с ключом --gen-root-cert)"
@@ -2348,16 +2348,16 @@ msgstr "корневой сертификат не найден (использ
msgid "root path for saving the updated configuration files"
msgstr "корневой путь для сохранения обновлённых конфигурационных файлов"
-#: ../calculate-core/pym/core/server/cert_cmd.py:775
+#: ../calculate-core/pym/core/server/cert_cmd.py:770
#, python-format
msgid "see %s"
msgstr "смотрите %s"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1208
+#: ../calculate-core/pym/core/server/cert_cmd.py:1203
msgid "send a signature request for the root certificate"
msgstr "отправить запрос на подписание корневого сертификата"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1147
+#: ../calculate-core/pym/core/server/cert_cmd.py:1142
msgid "server started"
msgstr "сервер запущен"
@@ -2385,37 +2385,37 @@ msgstr "установить смещение для страницы"
msgid "show the variable value"
msgstr "показать значение переменной"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1143
+#: ../calculate-core/pym/core/server/cert_cmd.py:1138
msgid "show this help message and exit"
msgstr "вывод этой справки и выход"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1218
+#: ../calculate-core/pym/core/server/cert_cmd.py:1213
msgid "sign the client's request with the server certificate"
msgstr "подписать запрос на подписание сертификата клиента сертификатом сервера"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1221
+#: ../calculate-core/pym/core/server/cert_cmd.py:1216
msgid "sign the server's request with the root certificate"
msgstr "подписать запрос на подписание сертификата сервера корневым сертификатом"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1052
+#: ../calculate-core/pym/core/server/cert_cmd.py:1047
msgid "signature request deleted"
msgstr "запрос на подпись сертификата удалён"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1249
#: ../calculate-core/pym/core/server/methods_func.py:283
+#: ../calculate-core/pym/core/server/cert_cmd.py:1244
msgid "silent during the process"
msgstr "не задавать вопросы во время процесса"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1157
+#: ../calculate-core/pym/core/server/cert_cmd.py:1152
msgid "stop the server if there are no active sessions"
msgstr "остановить сервер если нет активной сессии"
-#: ../calculate-core/pym/core/client/cert_func.py:143
+#: ../calculate-core/pym/core/client/cert_func.py:144
msgid "the URL looks like"
msgstr "URL имеет вид"
-#: ../calculate-core/pym/core/client/cert_func.py:114
-#: ../calculate-core/pym/core/server/cert_cmd.py:197
+#: ../calculate-core/pym/core/client/cert_func.py:115
+#: ../calculate-core/pym/core/server/cert_cmd.py:198
msgid "the private key and request now exist"
msgstr "секретный ключ и запрос созданы"
@@ -2424,7 +2424,7 @@ msgstr "секретный ключ и запрос созданы"
msgid "the value may be {0}"
msgstr "значение может быть {0}"
-#: ../calculate-core/pym/core/server/cert_cmd.py:503
+#: ../calculate-core/pym/core/server/cert_cmd.py:498
msgid "to change permissions, the certificate number must be integer"
msgstr "для изменения прав сертификата используйте целочисленное значение"
@@ -2436,19 +2436,19 @@ msgstr "обновление пользовательских конфигура
msgid "updating system configuration files"
msgstr "обновление системных конфигурационных файлов"
-#: ../calculate-core/pym/core/server/cl_server.py:342
+#: ../calculate-core/pym/core/server/cl_server.py:343
msgid "use cl-core with option --gen-cert-by HOST (--get-cert-from HOST) or --use-root-as-server)"
msgstr "используйте cl-core с ключом --gen-cert-by HOST (--get-cert-from HOST) или --use-root-as-server)"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1253
+#: ../calculate-core/pym/core/server/cert_cmd.py:1248
msgid "use passwords from standard input for users accounts"
msgstr "использовать пароли для пользовательских учетных записей из стандартного ввода"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1214
+#: ../calculate-core/pym/core/server/cert_cmd.py:1209
msgid "use the root certificate as the server certificate"
msgstr "использовать корневой сертификат как сертификат сервера"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1182
+#: ../calculate-core/pym/core/server/cert_cmd.py:1177
msgid "use with option --bootstrap to remove all certificates, requests and config files on the server"
msgstr "используйте с ключом --bootstrap, удаление всех сертификатов, запросов и конфигурационных файлов на сервере"
@@ -2456,11 +2456,11 @@ msgstr "используйте с ключом --bootstrap, удаление в
msgid "verbose output"
msgstr "подробный вывод"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1164
+#: ../calculate-core/pym/core/server/cert_cmd.py:1159
msgid "view client requests (number or \"all\")"
msgstr "просмотр клиентских запросов (номер или \"all\")"
-#: ../calculate-core/pym/core/server/cert_cmd.py:1167
+#: ../calculate-core/pym/core/server/cert_cmd.py:1162
msgid "view servers certificates (number or \"all\"). Server not running."
msgstr "просмотр серверных сертификатов (номер или \"all\"). Сервер не запускается."
diff --git a/ru/cl_install3.po b/ru/cl_install3.po
index 0846d01..f72f862 100644
--- a/ru/cl_install3.po
+++ b/ru/cl_install3.po
@@ -11,7 +11,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../calculate-install/pym/install/variables/disk.py:2433
+#: ../calculate-install/pym/install/variables/disk.py:2447
#, python-format
msgid "%s is not mounted"
msgstr "%s не подключен"
@@ -21,7 +21,7 @@ msgstr "%s не подключен"
msgid "'%s' not found"
msgstr "Не удалось найти '%s'"
-#: ../calculate-install/pym/install/variables/autopartition.py:477
+#: ../calculate-install/pym/install/variables/autopartition.py:520
msgid "/var/calculate partition"
msgstr "Раздел /var/calculate"
@@ -55,26 +55,26 @@ msgstr "Адреса"
msgid "Administrator"
msgstr "Администратор"
-#: ../calculate-install/pym/install/variables/autopartition.py:417
+#: ../calculate-install/pym/install/variables/autopartition.py:460
msgid "Allocate drive space"
msgstr "Распределение места на диске"
-#: ../calculate-install/pym/install/variables/disk.py:2083
+#: ../calculate-install/pym/install/variables/disk.py:2093
msgid "Architecture of the target system must be x86_64"
msgstr "Архитектура устанавливаемой системы должна быть x86_64"
-#: ../calculate-install/pym/install/variables/autopartition.py:490
+#: ../calculate-install/pym/install/variables/autopartition.py:533
msgid "Architecture of the target system must be x86_64 for using the UEFI bootloader"
msgstr "Для использования UEFI загрузчика архитектура устанавливаемой системы должна быть x86_64"
-#: ../calculate-install/pym/install/distr.py:1389
+#: ../calculate-install/pym/install/distr.py:1398
#, python-format
msgid "Archive type '%s' is not supported"
msgstr "Архив типа '%s' не поддерживается"
-#: ../calculate-install/pym/install/wsdl_install.py:127
-#: ../calculate-install/pym/install/wsdl_install.py:321
-#: ../calculate-install/pym/install/wsdl_install.py:334
+#: ../calculate-install/pym/install/wsdl_install.py:131
+#: ../calculate-install/pym/install/wsdl_install.py:325
+#: ../calculate-install/pym/install/wsdl_install.py:338
msgid "Audio"
msgstr "Аудио"
@@ -117,12 +117,12 @@ msgstr "Автовход не возможен для пользователя %
msgid "Autopartition options are not available with manual partitioning"
msgstr "Параметры авторазметки не доступны при ручной разметке"
-#: ../calculate-install/pym/install/variables/disk.py:1460
+#: ../calculate-install/pym/install/variables/disk.py:1470
msgid "Bind mount points should not be formatted"
msgstr "Bind-точка монтирования не должна форматироваться"
-#: ../calculate-install/pym/install/wsdl_install.py:207
-#: ../calculate-install/pym/install/wsdl_install.py:220
+#: ../calculate-install/pym/install/wsdl_install.py:211
+#: ../calculate-install/pym/install/wsdl_install.py:224
msgid "Boot"
msgstr "Загрузка"
@@ -130,7 +130,7 @@ msgstr "Загрузка"
msgid "Boot configuration is not available on a LiveCD"
msgstr "Настройка загрузки не доступна на LiveCD"
-#: ../calculate-install/pym/install/variables/disk.py:2139
+#: ../calculate-install/pym/install/variables/disk.py:2149
msgid "Boot disk"
msgstr "Загрузочный диск"
@@ -138,7 +138,7 @@ msgstr "Загрузочный диск"
msgid "Boot parameters configured!"
msgstr "Параметры загрузки настроены!"
-#: ../calculate-install/pym/install/variables/disk.py:1950
+#: ../calculate-install/pym/install/variables/disk.py:1960
msgid "Bootloader"
msgstr "Загрузчик"
@@ -150,11 +150,11 @@ msgstr "CIDR"
msgid "Checking the video driver"
msgstr "Определение видеодрайвера"
-#: ../calculate-install/pym/install/wsdl_install.py:116
+#: ../calculate-install/pym/install/wsdl_install.py:120
msgid "Click to select network settings"
msgstr "Нажмите для выбора сетевых параметров"
-#: ../calculate-install/pym/install/wsdl_install.py:94
+#: ../calculate-install/pym/install/wsdl_install.py:98
msgid "Click to select partitions to be created"
msgstr "Нажмите для выбора создаваемых разделов"
@@ -162,13 +162,13 @@ msgstr "Нажмите для выбора создаваемых раздело
msgid "Composite"
msgstr "Композит"
-#: ../calculate-install/pym/install/wsdl_install.py:206
-#: ../calculate-install/pym/install/wsdl_install.py:236
-#: ../calculate-install/pym/install/wsdl_install.py:267
-#: ../calculate-install/pym/install/wsdl_install.py:292
-#: ../calculate-install/pym/install/wsdl_install.py:320
-#: ../calculate-install/pym/install/wsdl_install.py:345
-#: ../calculate-install/pym/install/wsdl_install.py:372
+#: ../calculate-install/pym/install/wsdl_install.py:210
+#: ../calculate-install/pym/install/wsdl_install.py:240
+#: ../calculate-install/pym/install/wsdl_install.py:271
+#: ../calculate-install/pym/install/wsdl_install.py:296
+#: ../calculate-install/pym/install/wsdl_install.py:324
+#: ../calculate-install/pym/install/wsdl_install.py:349
+#: ../calculate-install/pym/install/wsdl_install.py:376
msgid "Configuration"
msgstr "Настройка"
@@ -233,7 +233,7 @@ msgstr "Диск %s уже используется текущей систем
msgid "Device '%s' is used more than once"
msgstr "Устройство '%s' используется более одного раза"
-#: ../calculate-install/pym/install/variables/disk.py:2231
+#: ../calculate-install/pym/install/variables/disk.py:2241
#, python-brace-format
msgid "Device {device} has not BIOS Boot partition"
msgstr "На устройстве {device} нет BIOS Boot раздела"
@@ -260,7 +260,7 @@ msgstr "Директория уже смонтирована"
msgid "Disabled"
msgstr "Выключен"
-#: ../calculate-install/pym/install/variables/disk.py:2199
+#: ../calculate-install/pym/install/variables/disk.py:2209
#, python-format
msgid "Disk '%s' needs a partition table for the boot record"
msgstr "Диск '%s' без таблицы разделов не может содержать загрузчик"
@@ -290,7 +290,7 @@ msgstr "Сервер доменных имен"
msgid "Encrypt user profiles"
msgstr "Шифровать пользовательские профили"
-#: ../calculate-install/pym/install/variables/autopartition.py:422
+#: ../calculate-install/pym/install/variables/autopartition.py:465
#, python-format
msgid "Erase disk and install %s"
msgstr "Очистить диск и установить %s"
@@ -342,20 +342,20 @@ msgstr "Не удалось копировать"
msgid "Failed to copy files from"
msgstr "Не удалось копировать файлы из"
-#: ../calculate-install/pym/install/variables/disk.py:2440
+#: ../calculate-install/pym/install/variables/disk.py:2454
msgid "Failed to create data in /run"
msgstr "Не удалось создать данные в /run"
-#: ../calculate-install/pym/install/distr.py:1581
+#: ../calculate-install/pym/install/distr.py:1590
msgid "Failed to create squash"
msgstr "Не удалось создать squash"
-#: ../calculate-install/pym/install/distr.py:1601
+#: ../calculate-install/pym/install/distr.py:1610
msgid "Failed to create squashfs"
msgstr "Не удалось создать squashfs"
-#: ../calculate-install/pym/install/distr.py:1733
-#: ../calculate-install/pym/install/distr.py:1788
+#: ../calculate-install/pym/install/distr.py:1742
+#: ../calculate-install/pym/install/distr.py:1797
msgid "Failed to create the ISO image"
msgstr "Не удалось создать ISO-образ"
@@ -363,8 +363,8 @@ msgstr "Не удалось создать ISO-образ"
msgid "Failed to create the UEFI boot record"
msgstr "Не удалось создать загрузочную запись UEFI"
-#: ../calculate-install/pym/install/distr.py:1433
-#: ../calculate-install/pym/install/distr.py:1498
+#: ../calculate-install/pym/install/distr.py:1442
+#: ../calculate-install/pym/install/distr.py:1507
msgid "Failed to create the archive"
msgstr "Не удалось создать архив"
@@ -386,18 +386,18 @@ msgid "Failed to determine the boot disk"
msgstr "Не удалось определить загрузочный диск"
#: ../calculate-install/pym/install/install.py:105
-#: ../calculate-install/pym/install/distr.py:1240
+#: ../calculate-install/pym/install/distr.py:1248
#, python-format
msgid "Failed to determine the parent device for %s"
msgstr "Не удалось определить родительское устройство для %s"
#: ../calculate-install/pym/install/install.py:127
-#: ../calculate-install/pym/install/distr.py:1251
+#: ../calculate-install/pym/install/distr.py:1259
#, python-format
msgid "Failed to determine the partition number for %s"
msgstr "Не удалось определить номер раздела для %s"
-#: ../calculate-install/pym/install/distr.py:1288
+#: ../calculate-install/pym/install/distr.py:1296
#, python-format
msgid "Failed to execute 'mkswap %s': the swap partition is used by the current system"
msgstr "Не удалось выполнить 'mkswap %s', раздел подкачки используется текущей системой"
@@ -407,38 +407,38 @@ msgstr "Не удалось выполнить 'mkswap %s', раздел под
msgid "Failed to find partition %s after changing the activity"
msgstr "Не удалось найти раздел %s после смены флага активности"
-#: ../calculate-install/pym/install/distr.py:1199
-#: ../calculate-install/pym/install/distr.py:1292
-#: ../calculate-install/pym/install/distr.py:1864
+#: ../calculate-install/pym/install/distr.py:1207
+#: ../calculate-install/pym/install/distr.py:1301
+#: ../calculate-install/pym/install/distr.py:1873
#, python-format
msgid "Failed to format %s: this partition is mounted"
msgstr "Не удалось форматировать раздел %s, раздел используется как точка монтирования"
-#: ../calculate-install/pym/install/distr.py:1210
+#: ../calculate-install/pym/install/distr.py:1218
#, python-format
msgid "Failed to format %s: this partition is used as swap"
msgstr "Не удалось форматировать раздел %s, раздел используется как диск подкачки"
-#: ../calculate-install/pym/install/distr.py:1213
-#: ../calculate-install/pym/install/distr.py:1220
+#: ../calculate-install/pym/install/distr.py:1221
+#: ../calculate-install/pym/install/distr.py:1228
msgid "Failed to format the partition"
msgstr "Не удалось форматировать раздел"
-#: ../calculate-install/pym/install/distr.py:1296
+#: ../calculate-install/pym/install/distr.py:1305
msgid "Failed to format the swap partition"
msgstr "Не удалось отформатировать раздел подкачки"
-#: ../calculate-install/pym/install/distr.py:1280
+#: ../calculate-install/pym/install/distr.py:1288
#, python-format
msgid "Failed to found partition %s after changing the system ID"
msgstr "Не удалось найти раздел %s после смены ID"
-#: ../calculate-install/pym/install/install.py:632
+#: ../calculate-install/pym/install/install.py:633
#, python-format
msgid "Failed to found partition %s after creating the partition table"
msgstr "Не удалось найти раздел %s после создания таблицы разделов"
-#: ../calculate-install/pym/install/distr.py:1677
+#: ../calculate-install/pym/install/distr.py:1686
msgid "Failed to get size of the squash image"
msgstr "Не удалось получить размер squash образа"
@@ -463,7 +463,7 @@ msgstr "Не удалось установить загрузчик"
msgid "Failed to install the system!"
msgstr "Не удалось установить систему!"
-#: ../calculate-install/pym/install/install.py:756
+#: ../calculate-install/pym/install/install.py:757
msgid "Failed to migrate users onto the new system"
msgstr "Не удалось перенести пользователей в новую систему"
@@ -480,11 +480,11 @@ msgstr "Не удалось смонтировать в директорию: %s
msgid "Failed to read files"
msgstr "Не удалось прочитать файлы"
-#: ../calculate-install/pym/install/distr.py:1770
+#: ../calculate-install/pym/install/distr.py:1779
msgid "Failed to remove"
msgstr "Не удалось удалить"
-#: ../calculate-install/pym/install/distr.py:1882
+#: ../calculate-install/pym/install/distr.py:1891
#, python-format
msgid "Failed to remove %s"
msgstr "Не удалось удалить %s"
@@ -494,7 +494,7 @@ msgstr "Не удалось удалить %s"
msgid "Failed to remove the directory from"
msgstr "Не удалось удалить директорию"
-#: ../calculate-install/pym/install/distr.py:997
+#: ../calculate-install/pym/install/distr.py:1002
msgid "Failed to set btrfs compression for {}"
msgstr "Не удалось установить сжатие btrfs для {}"
@@ -531,7 +531,7 @@ msgstr ""
msgid "Failed to write to files"
msgstr "Не удалось записать в файлы"
-#: ../calculate-install/pym/install/distr.py:1361
+#: ../calculate-install/pym/install/distr.py:1370
#, python-format
msgid "File '%s' not found"
msgstr "Файл '%s' не найден"
@@ -540,11 +540,19 @@ msgstr "Файл '%s' не найден"
msgid "Filesystem"
msgstr "Файловая система"
-#: ../calculate-install/pym/install/variables/disk.py:1457
+#: ../calculate-install/pym/install/variables/disk.py:1467
#, python-format
msgid "Filesystem '%s' is not available"
msgstr "Файловая система '%s' недоступна"
+#: ../calculate-install/pym/install/variables/autopartition.py:438
+msgid "Filesystem for data partition"
+msgstr "Файловая система для раздела с данными"
+
+#: ../calculate-install/pym/install/variables/autopartition.py:423
+msgid "Filesystem for root partition"
+msgstr "Файловая система для корневого раздела"
+
#: ../calculate-install/pym/install/variables/distr.py:401
#: ../calculate-install/pym/install/variables/distr.py:429
#: ../calculate-install/pym/install/variables/distr.py:454
@@ -552,15 +560,15 @@ msgstr "Файловая система '%s' недоступна"
msgid "Filter"
msgstr "Фильтр"
-#: ../calculate-install/pym/install/wsdl_install.py:148
+#: ../calculate-install/pym/install/wsdl_install.py:152
msgid "Flash Install"
msgstr "Установка на Flash"
-#: ../calculate-install/pym/install/wsdl_install.py:167
+#: ../calculate-install/pym/install/wsdl_install.py:171
msgid "Flash install"
msgstr "Установка на Flash"
-#: ../calculate-install/pym/install/distr.py:1937
+#: ../calculate-install/pym/install/distr.py:1946
#, python-format
msgid "Flash install does not support %s"
msgstr "Установка на Flash не поддерживает %s"
@@ -573,7 +581,7 @@ msgstr "Установка на несколько разделов не под
msgid "Flash install does not support swap disks"
msgstr "Установка на Flash-диск не поддерживает диски подкачки"
-#: ../calculate-install/pym/install/variables/disk.py:2183
+#: ../calculate-install/pym/install/variables/disk.py:2193
msgid "For Flash install, you need only one disk"
msgstr "Для установки на Flash необходим только один диск"
@@ -586,11 +594,11 @@ msgstr "Вы должны установить пакет %s для PXE-уста
msgid "For autopartition, please select the device"
msgstr "Для авторазметки необходимо выбрать диск"
-#: ../calculate-install/pym/install/variables/disk.py:1389
+#: ../calculate-install/pym/install/variables/disk.py:1399
msgid "Format"
msgstr "Форматировать"
-#: ../calculate-install/pym/install/variables/disk.py:2515
+#: ../calculate-install/pym/install/variables/disk.py:2529
msgid "Format the USB Flash"
msgstr "Форматировать USB Flash"
@@ -641,7 +649,7 @@ msgstr "Пароль Grub"
msgid "Grub terminal"
msgstr "Grub терминал"
-#: ../calculate-install/pym/install/variables/disk.py:2295
+#: ../calculate-install/pym/install/variables/disk.py:2305
msgid "Hard disk"
msgstr "Жёсткий диск"
@@ -666,12 +674,12 @@ msgstr "I/O планировщик недоступен при установк
msgid "IP address"
msgstr "IP-адрес"
-#: ../calculate-install/pym/install/distr.py:1707
+#: ../calculate-install/pym/install/distr.py:1716
#, python-format
msgid "ISO %s contains no live image"
msgstr "ISO %s не содержит live-образ"
-#: ../calculate-install/pym/install/distr.py:1660
+#: ../calculate-install/pym/install/distr.py:1669
#, python-format
msgid "ISO image %s"
msgstr "ISO-образ %s"
@@ -680,7 +688,7 @@ msgstr "ISO-образ %s"
msgid "ISO image for installation"
msgstr "ISO-образ для установки"
-#: ../calculate-install/pym/install/variables/disk.py:1558
+#: ../calculate-install/pym/install/variables/disk.py:1568
msgid "Impossible to use UUID for Flash install"
msgstr "Использование UUID недоступно при установке на Flash"
@@ -698,19 +706,19 @@ msgstr "Установите %s драйвер командой:"
msgid "Install the newer image only"
msgstr "Установить только более новый образ"
-#: ../calculate-install/pym/install/distr.py:2062
+#: ../calculate-install/pym/install/distr.py:2071
#, python-format
msgid "Install with layers does not support %s"
msgstr "Установка в несколько слоев не поддерживает %s"
#: ../calculate-install/pym/install/wsdl_install.py:42
-#: ../calculate-install/pym/install/wsdl_install.py:147
-#: ../calculate-install/pym/install/wsdl_install.py:177
-#: ../calculate-install/pym/install/wsdl_install.py:194
+#: ../calculate-install/pym/install/wsdl_install.py:151
+#: ../calculate-install/pym/install/wsdl_install.py:181
+#: ../calculate-install/pym/install/wsdl_install.py:198
msgid "Installation"
msgstr "Установка"
-#: ../calculate-install/pym/install/variables/disk.py:2454
+#: ../calculate-install/pym/install/variables/disk.py:2468
msgid "Installation disk"
msgstr "Диск для установки"
@@ -726,7 +734,7 @@ msgstr "Установка прервана пользователем"
msgid "Installation path"
msgstr "Путь для установки"
-#: ../calculate-install/pym/install/variables/disk.py:2275
+#: ../calculate-install/pym/install/variables/disk.py:2285
#: ../calculate-install/pym/install/wsdl_install.py:82
msgid "Installation type"
msgstr "Тип установки"
@@ -744,7 +752,7 @@ msgstr "Intel (intel)"
msgid "Interface"
msgstr "Интерфейс"
-#: ../calculate-install/pym/install/distr.py:1826
+#: ../calculate-install/pym/install/distr.py:1835
msgid "Keyboard interruption"
msgstr "Прерывание с клавиатуры"
@@ -756,11 +764,11 @@ msgstr "Раскладка клавиатуры"
msgid "Language and locale"
msgstr "Язык и локаль"
-#: ../calculate-install/pym/install/wsdl_install.py:96
+#: ../calculate-install/pym/install/wsdl_install.py:100
msgid "Layout"
msgstr "Разметка диска"
-#: ../calculate-install/pym/install/variables/disk.py:2248
+#: ../calculate-install/pym/install/variables/disk.py:2258
msgid "Legacy grub requires a separate /boot partition to support boot from a RAID or a LVM"
msgstr "Legacy grub не поддерживает загрузки с RAID или LVM без выделенного раздела /boot"
@@ -769,8 +777,8 @@ msgid "Letting go the source distribution"
msgstr "Отключение устанавливаемого дистрибутива"
#: ../calculate-install/pym/install/variables/locale.py:132
-#: ../calculate-install/pym/install/wsdl_install.py:346
-#: ../calculate-install/pym/install/wsdl_install.py:359
+#: ../calculate-install/pym/install/wsdl_install.py:350
+#: ../calculate-install/pym/install/wsdl_install.py:363
msgid "Locale"
msgstr "Локализация"
@@ -782,7 +790,7 @@ msgstr "Конфигурация локали недоступна при уст
msgid "MAC"
msgstr "MAC"
-#: ../calculate-install/pym/install/variables/disk.py:2185
+#: ../calculate-install/pym/install/variables/disk.py:2195
msgid "MBR is not used with the UEFI bootloader"
msgstr "MBR не используется вместе с UEFI загрузчиком"
@@ -829,8 +837,8 @@ msgstr "Название"
#: ../calculate-install/pym/install/variables/net.py:92
#: ../calculate-install/pym/install/variables/net.py:401
#: ../calculate-install/pym/install/variables/net.py:554
-#: ../calculate-install/pym/install/wsdl_install.py:237
-#: ../calculate-install/pym/install/wsdl_install.py:252
+#: ../calculate-install/pym/install/wsdl_install.py:241
+#: ../calculate-install/pym/install/wsdl_install.py:256
msgid "Network"
msgstr "Сеть"
@@ -861,7 +869,7 @@ msgstr "Менеджер сети"
msgid "Network routing configuration is not available if all interfaces are set to DHCP"
msgstr "Если все интерфейсы настроены на DHCP, параметры маршрутизации недоступны"
-#: ../calculate-install/pym/install/wsdl_install.py:106
+#: ../calculate-install/pym/install/wsdl_install.py:110
msgid "Network settings"
msgstr "Сетевые настройки"
@@ -881,7 +889,7 @@ msgstr "NetworkManager"
msgid "No autologin"
msgstr "Без автовхода"
-#: ../calculate-install/pym/install/variables/disk.py:1453
+#: ../calculate-install/pym/install/variables/disk.py:1463
#, python-brace-format
msgid "No need to format unused device {dev}"
msgstr "Нет необходимости форматировать неиспользуемый диск {dev}"
@@ -890,19 +898,19 @@ msgstr "Нет необходимости форматировать неисп
msgid "Not available"
msgstr "Не доступно"
-#: ../calculate-install/pym/install/variables/disk.py:2555
+#: ../calculate-install/pym/install/variables/disk.py:2569
msgid "Not enough free space on the USB Flash"
msgstr "Не достаточно свободного места на USB Flash"
#: ../calculate-install/pym/install/variables/net.py:841
#: ../calculate-install/pym/install/variables/net.py:875
-#: ../calculate-install/pym/install/variables/system.py:575
#: ../calculate-install/pym/install/variables/distr.py:410
#: ../calculate-install/pym/install/variables/distr.py:415
#: ../calculate-install/pym/install/variables/distr.py:433
#: ../calculate-install/pym/install/variables/distr.py:444
#: ../calculate-install/pym/install/variables/distr.py:458
#: ../calculate-install/pym/install/variables/distr.py:472
+#: ../calculate-install/pym/install/variables/system.py:575
msgid "Not used"
msgstr "Не используется"
@@ -927,15 +935,15 @@ msgstr "Доступны только драйвера %s"
msgid "OpenRC"
msgstr "OpenRC"
-#: ../calculate-install/pym/install/wsdl_install.py:178
+#: ../calculate-install/pym/install/wsdl_install.py:182
msgid "PXE Install"
msgstr "Установка PXE"
-#: ../calculate-install/pym/install/wsdl_install.py:198
+#: ../calculate-install/pym/install/wsdl_install.py:202
msgid "PXE install"
msgstr "Установка PXE"
-#: ../calculate-install/pym/install/distr.py:1965
+#: ../calculate-install/pym/install/distr.py:1974
#, python-format
msgid "PXE install does not support %s"
msgstr "Установка PXE не поддерживается %s"
@@ -952,21 +960,21 @@ msgstr "PXE установка доступна только при настро
msgid "PXE server IP"
msgstr "IP адрес PXE сервера"
-#: ../calculate-install/pym/install/variables/autopartition.py:573
+#: ../calculate-install/pym/install/variables/autopartition.py:616
msgid "Partition table"
msgstr "Таблица разделов"
-#: ../calculate-install/pym/install/variables/disk.py:2097
+#: ../calculate-install/pym/install/variables/disk.py:2107
#, python-brace-format
msgid "Partition {disk} already used by the current system"
msgstr "Раздел {disk} уже используется текущей системой"
-#: ../calculate-install/pym/install/variables/disk.py:2111
+#: ../calculate-install/pym/install/variables/disk.py:2121
#, python-brace-format
msgid "Partition {disk} already used for installation"
msgstr "Раздел {disk} уже используется для установки"
-#: ../calculate-install/pym/install/variables/autopartition.py:460
+#: ../calculate-install/pym/install/variables/autopartition.py:503
msgid "Partitions options"
msgstr "Параметры разделов"
@@ -980,7 +988,7 @@ msgstr "Пароль"
msgid "Password for user %s missing"
msgstr "Пропущен пароль для пользователя %s"
-#: ../calculate-install/pym/install/distr.py:1214
+#: ../calculate-install/pym/install/distr.py:1222
msgid "Permission denied"
msgstr "Нет доступа"
@@ -996,13 +1004,13 @@ msgstr "Пожалуйста, укажите EFI раздел через UEFI п
msgid "Please specify a root password for Grub"
msgstr "Пожалуйста, укажите root-пароль для меню Grub"
-#: ../calculate-install/pym/install/variables/disk.py:1469
+#: ../calculate-install/pym/install/variables/disk.py:1479
#, python-brace-format
msgid "Please unmount disk {device} to use it for install"
msgstr "Пожалуйста, отключите диск {device} для использования его в установке"
-#: ../calculate-install/pym/install/variables/disk.py:1443
-#: ../calculate-install/pym/install/variables/disk.py:2104
+#: ../calculate-install/pym/install/variables/disk.py:1453
+#: ../calculate-install/pym/install/variables/disk.py:2114
#, python-brace-format
msgid "Please unmount {device}, as it will be used for installation"
msgstr "Пожалуйста, отключите диск {device} для использования его в установке"
@@ -1036,7 +1044,7 @@ msgstr "Восстановление не поддерживается"
msgid "Remove the password protection on Grub"
msgstr "Удалить пароль на меню Grub"
-#: ../calculate-install/pym/install/variables/autopartition.py:535
+#: ../calculate-install/pym/install/variables/autopartition.py:578
msgid "Root partition size"
msgstr "Размер корневого раздела"
@@ -1048,21 +1056,21 @@ msgstr "Пароль пользователя root"
msgid "Routing"
msgstr "Маршрутизация"
-#: ../calculate-install/pym/install/wsdl_install.py:141
-#: ../calculate-install/pym/install/wsdl_install.py:171
-#: ../calculate-install/pym/install/wsdl_install.py:172
-#: ../calculate-install/pym/install/wsdl_install.py:202
+#: ../calculate-install/pym/install/wsdl_install.py:145
+#: ../calculate-install/pym/install/wsdl_install.py:175
+#: ../calculate-install/pym/install/wsdl_install.py:176
+#: ../calculate-install/pym/install/wsdl_install.py:206
msgid "Run"
msgstr "Выполнить"
-#: ../calculate-install/pym/install/wsdl_install.py:232
-#: ../calculate-install/pym/install/wsdl_install.py:263
-#: ../calculate-install/pym/install/wsdl_install.py:288
-#: ../calculate-install/pym/install/wsdl_install.py:316
-#: ../calculate-install/pym/install/wsdl_install.py:341
-#: ../calculate-install/pym/install/wsdl_install.py:368
-#: ../calculate-install/pym/install/wsdl_install.py:393
-#: ../calculate-install/pym/install/wsdl_install.py:417
+#: ../calculate-install/pym/install/wsdl_install.py:236
+#: ../calculate-install/pym/install/wsdl_install.py:267
+#: ../calculate-install/pym/install/wsdl_install.py:292
+#: ../calculate-install/pym/install/wsdl_install.py:320
+#: ../calculate-install/pym/install/wsdl_install.py:345
+#: ../calculate-install/pym/install/wsdl_install.py:372
+#: ../calculate-install/pym/install/wsdl_install.py:397
+#: ../calculate-install/pym/install/wsdl_install.py:421
msgid "Save"
msgstr "Сохранить"
@@ -1082,9 +1090,9 @@ msgstr "На выбранных устройствах нет BIOS boot разд
msgid "Selected devices have not EFI partition"
msgstr "На выбранных устройствах нет EFI раздела"
-#: ../calculate-install/pym/install/wsdl_install.py:373
-#: ../calculate-install/pym/install/wsdl_install.py:386
-#: ../calculate-install/pym/install/wsdl_install.py:411
+#: ../calculate-install/pym/install/wsdl_install.py:377
+#: ../calculate-install/pym/install/wsdl_install.py:390
+#: ../calculate-install/pym/install/wsdl_install.py:415
msgid "Session"
msgstr "Сессия"
@@ -1092,7 +1100,7 @@ msgstr "Сессия"
msgid "Session settings configured!"
msgstr "Настройка сессии выполнена!"
-#: ../calculate-install/pym/install/variables/disk.py:1511
+#: ../calculate-install/pym/install/variables/disk.py:1521
msgid "Size"
msgstr "Размер"
@@ -1110,13 +1118,13 @@ msgstr "Директория-источник %(src)s уже используе
msgid "Squash size unsupported for %s"
msgstr "Размер squash не поддерживается для %s"
-#: ../calculate-install/pym/install/wsdl_install.py:143
-#: ../calculate-install/pym/install/wsdl_install.py:173
-#: ../calculate-install/pym/install/wsdl_install.py:196
+#: ../calculate-install/pym/install/wsdl_install.py:147
+#: ../calculate-install/pym/install/wsdl_install.py:177
+#: ../calculate-install/pym/install/wsdl_install.py:200
msgid "Start installing"
msgstr "Начать установку"
-#: ../calculate-install/pym/install/variables/autopartition.py:475
+#: ../calculate-install/pym/install/variables/autopartition.py:518
msgid "Swap partition"
msgstr "Раздел подкачки"
@@ -1124,7 +1132,7 @@ msgstr "Раздел подкачки"
msgid "Swap partition size"
msgstr "Размер раздела подкачки"
-#: ../calculate-install/pym/install/wsdl_install.py:268
+#: ../calculate-install/pym/install/wsdl_install.py:272
msgid "System"
msgstr "Система"
@@ -1157,7 +1165,7 @@ msgstr "Настройка аудио параметров"
msgid "The autologin is not available with domain workstations"
msgstr "Автовход не доступен для доменных рабочих станций"
-#: ../calculate-install/pym/install/variables/disk.py:1364
+#: ../calculate-install/pym/install/variables/disk.py:1374
msgid "The bind mount point does not use filesystem"
msgstr "Bind-точка монтирования не использует файловую систему"
@@ -1169,7 +1177,7 @@ msgstr "Настройка параметров загрузки"
msgid "The builder mode is no longer supported"
msgstr "Режим сборки больше не поддерживается"
-#: ../calculate-install/pym/install/variables/disk.py:1374
+#: ../calculate-install/pym/install/variables/disk.py:1384
#, python-format
msgid "The filesystem for '%(mp)s' should not be '%(opt)s'"
msgstr "'%(opt)s' не может быть файловой системой для '%(mp)s'"
@@ -1193,8 +1201,8 @@ msgid "The image is not compatible with the current kernel"
msgstr "Образ не совместим с текущим ядром"
#: ../calculate-install/pym/install/variables/disk.py:859
-#: ../calculate-install/pym/install/variables/disk.py:2120
-#: ../calculate-install/pym/install/variables/disk.py:2261
+#: ../calculate-install/pym/install/variables/disk.py:2130
+#: ../calculate-install/pym/install/variables/disk.py:2271
msgid "The layout is not available with autopartitioning"
msgstr "Разметка не доступна при авторазметке"
@@ -1206,15 +1214,15 @@ msgstr "Настройка локализации и времени"
msgid "The network settings are being configured"
msgstr "Настройка параметров сети"
-#: ../calculate-install/pym/install/variables/autopartition.py:476
+#: ../calculate-install/pym/install/variables/autopartition.py:519
msgid "The partition for the update"
msgstr "Раздел для обновлений"
-#: ../calculate-install/pym/install/variables/autopartition.py:494
+#: ../calculate-install/pym/install/variables/autopartition.py:537
msgid "The partition table must be GPT for using UEFI bootloader"
msgstr "Для использования UEFI загрузчика таблица разделов должна быть GPT"
-#: ../calculate-install/pym/install/variables/disk.py:2482
+#: ../calculate-install/pym/install/variables/disk.py:2496
#, python-brace-format
msgid "The partition {dev} is already in use as {mp}"
msgstr "Раздел {dev} уже используется как {mp}"
@@ -1224,7 +1232,7 @@ msgstr "Раздел {dev} уже используется как {mp}"
msgid "The root partition should be at least %s"
msgstr "Корневой раздел должен быть не менее %s"
-#: ../calculate-install/pym/install/variables/autopartition.py:556
+#: ../calculate-install/pym/install/variables/autopartition.py:599
#, python-brace-format
msgid "The root partition should be at least {size}"
msgstr "Размер корневого раздела не может быть меньше {size}"
@@ -1233,12 +1241,12 @@ msgstr "Размер корневого раздела не может быть
msgid "The session settings are being configured"
msgstr "Настройка параметров сессии"
-#: ../calculate-install/pym/install/distr.py:1205
+#: ../calculate-install/pym/install/distr.py:1213
#, python-format
msgid "The specified format of '%s' is not supported"
msgstr "Указанный формат '%s' не поддерживается"
-#: ../calculate-install/pym/install/variables/disk.py:1381
+#: ../calculate-install/pym/install/variables/disk.py:1391
#, python-brace-format
msgid "The swap partition {dev} must be formatted as swap"
msgstr "Раздел подкачки {dev} должен быть отформатирован как swap"
@@ -1255,7 +1263,7 @@ msgstr "Настройка тем"
msgid "Theme configuration failed!"
msgstr "Не удалось настроить темы!"
-#: ../calculate-install/pym/install/wsdl_install.py:398
+#: ../calculate-install/pym/install/wsdl_install.py:402
msgid "Themes"
msgstr "Темы"
@@ -1272,8 +1280,8 @@ msgstr "Устанавливаемый дистрибутив не содерж
msgid "This distribution does not provide the ALSA sound"
msgstr "Устанавливаемый дистрибутив не поддерживает звуковую систему ALSA"
-#: ../calculate-install/pym/install/variables/autopartition.py:445
-#: ../calculate-install/pym/install/variables/disk.py:2123
+#: ../calculate-install/pym/install/variables/disk.py:2133
+#: ../calculate-install/pym/install/variables/autopartition.py:488
msgid "This option not used for Flash install"
msgstr "Этот параметр не используется при установке на Flash"
@@ -1298,59 +1306,59 @@ msgstr "Вы может изменить файловую систему, ука
msgid "To install the system, you need to specify the root device"
msgstr "Для установки необходимо указать корневое устройство"
-#: ../calculate-install/pym/install/variables/disk.py:2252
+#: ../calculate-install/pym/install/variables/disk.py:2262
#, python-format
msgid "To support booting from %s, legacy grub needs a separate /boot partition"
msgstr "Legacy grub не поддерживает загрузки с %s без выделенного /boot раздела"
-#: ../calculate-install/pym/install/variables/disk.py:1960
+#: ../calculate-install/pym/install/variables/disk.py:1970
msgid "UEFI"
msgstr "UEFI"
-#: ../calculate-install/pym/install/variables/disk.py:2007
+#: ../calculate-install/pym/install/variables/disk.py:2017
msgid "UEFI boot"
msgstr "UEFI загрузка"
-#: ../calculate-install/pym/install/variables/disk.py:2075
+#: ../calculate-install/pym/install/variables/disk.py:2085
#, python-format
msgid "UEFI installation is unavailable, because '%s' command not found"
msgstr "UEFI установка недоступна, так как не найдена команда '%s'"
-#: ../calculate-install/pym/install/variables/disk.py:2296
+#: ../calculate-install/pym/install/variables/disk.py:2306
msgid "USB Flash"
msgstr "USB Flash"
-#: ../calculate-install/pym/install/variables/disk.py:2297
+#: ../calculate-install/pym/install/variables/disk.py:2307
msgid "USB Hard Disk"
msgstr "Жёсткий диск USB"
-#: ../calculate-install/pym/install/distr.py:1887
+#: ../calculate-install/pym/install/distr.py:1896
#, python-format
msgid "USB flash %s"
msgstr "USB-flash %s"
-#: ../calculate-install/pym/install/install.py:566
+#: ../calculate-install/pym/install/install.py:567
msgid "Unable to change the I/O scheduler"
msgstr "Не удалось изменить I/O планировщик"
-#: ../calculate-install/pym/install/install.py:736
+#: ../calculate-install/pym/install/install.py:737
#, python-format
msgid "Unable to remove directory %s"
msgstr "Не удалось удалить директорию %s"
-#: ../calculate-install/pym/install/install.py:730
+#: ../calculate-install/pym/install/install.py:731
#, python-format
msgid "Unable to umount %s"
msgstr "Не удалось отмонтировать %s"
#: ../calculate-install/pym/install/variables/disk.py:1252
-#: ../calculate-install/pym/install/variables/disk.py:2498
+#: ../calculate-install/pym/install/variables/disk.py:2512
#, python-format
msgid "Unable to use CDROM %s for installation"
msgstr "Невозможно использовать CDROM %s для установки"
#: ../calculate-install/pym/install/variables/disk.py:1243
-#: ../calculate-install/pym/install/variables/disk.py:2495
+#: ../calculate-install/pym/install/variables/disk.py:2509
#, python-format
msgid "Unable to use extended partition %s for installation"
msgstr "Невозможно использовать расширенный раздел %s для установки"
@@ -1361,18 +1369,18 @@ msgid "Unable to use {part} partition used by active {typepart} for installation
msgstr "Невозможно использовать раздел {part}, используемый активным {typepart} для установки"
#: ../calculate-install/pym/install/variables/net.py:299
+#: ../calculate-install/pym/install/variables/disk.py:2076
+#: ../calculate-install/pym/install/variables/disk.py:2178
+#: ../calculate-install/pym/install/variables/disk.py:2478
#: ../calculate-install/pym/install/variables/autopartition.py:157
-#: ../calculate-install/pym/install/variables/disk.py:2066
-#: ../calculate-install/pym/install/variables/disk.py:2168
-#: ../calculate-install/pym/install/variables/disk.py:2464
msgid "Unknown"
msgstr "Неизвестный"
-#: ../calculate-install/pym/install/distr.py:1534
+#: ../calculate-install/pym/install/distr.py:1543
msgid "Unknown Container"
msgstr "Неизвестный контейнер"
-#: ../calculate-install/pym/install/distr.py:1386
+#: ../calculate-install/pym/install/distr.py:1395
#, python-format
msgid "Unknown archive type '%s'"
msgstr "Неизвестный тип архива '%s'"
@@ -1381,7 +1389,7 @@ msgstr "Неизвестный тип архива '%s'"
msgid "Unmounting the target system volume"
msgstr "Отмонтирование ресурсов устанавливаемой системы"
-#: ../calculate-install/pym/install/distr.py:1401
+#: ../calculate-install/pym/install/distr.py:1410
#, python-format
msgid ""
"Unpacking error\n"
@@ -1394,11 +1402,11 @@ msgstr ""
msgid "Unpacking the system image to the target"
msgstr "Распаковка образа системы"
-#: ../calculate-install/pym/install/distr.py:1410
+#: ../calculate-install/pym/install/distr.py:1419
msgid "Unsupported"
msgstr "Не поддерживается"
-#: ../calculate-install/pym/install/wsdl_install.py:135
+#: ../calculate-install/pym/install/wsdl_install.py:139
msgid "Update"
msgstr "Обновление"
@@ -1406,7 +1414,7 @@ msgstr "Обновление"
msgid "Update configuration unavailable for Flash install"
msgstr "Настройка обновлений недоступна при установке на Flash"
-#: ../calculate-install/pym/install/wsdl_install.py:281
+#: ../calculate-install/pym/install/wsdl_install.py:285
msgid "Update system settings"
msgstr "Обновить настройки системы"
@@ -1414,19 +1422,19 @@ msgstr "Обновить настройки системы"
msgid "Updating the configuration"
msgstr "Обновление конфигурации"
-#: ../calculate-install/pym/install/variables/autopartition.py:479
+#: ../calculate-install/pym/install/variables/autopartition.py:522
msgid "Use LVM"
msgstr "Использовать LVM"
-#: ../calculate-install/pym/install/variables/disk.py:1550
+#: ../calculate-install/pym/install/variables/disk.py:1560
msgid "Use UUID"
msgstr "Использовать UUID"
-#: ../calculate-install/pym/install/variables/autopartition.py:423
+#: ../calculate-install/pym/install/variables/autopartition.py:466
msgid "Use current partitions"
msgstr "Использовать существующие разделы"
-#: ../calculate-install/pym/install/variables/autopartition.py:478
+#: ../calculate-install/pym/install/variables/autopartition.py:521
msgid "Use the UEFI bootloader"
msgstr "Использовать UEFI загрузчик"
@@ -1460,13 +1468,13 @@ msgstr "Шифрование пользовательских профилей
msgid "Username is missing"
msgstr "Имя пользователя пропущено"
-#: ../calculate-install/pym/install/wsdl_install.py:118
+#: ../calculate-install/pym/install/wsdl_install.py:122
msgid "Users"
msgstr "Пользователи"
-#: ../calculate-install/pym/install/wsdl_install.py:130
-#: ../calculate-install/pym/install/wsdl_install.py:293
-#: ../calculate-install/pym/install/wsdl_install.py:308
+#: ../calculate-install/pym/install/wsdl_install.py:134
+#: ../calculate-install/pym/install/wsdl_install.py:297
+#: ../calculate-install/pym/install/wsdl_install.py:312
msgid "Video"
msgstr "Видео"
@@ -1491,7 +1499,7 @@ msgstr "Настройка параметров видео выполнена!"
msgid "Would you like to reboot your computer now to complete the installation?"
msgstr "Вы хотите перезагрузить компьютер сейчас, чтобы завершить установку?"
-#: ../calculate-install/pym/install/variables/disk.py:2088
+#: ../calculate-install/pym/install/variables/disk.py:2098
#, python-format
msgid "Wrong EFI device %s"
msgstr "Неправильное EFI устройство %s"
@@ -1516,8 +1524,8 @@ msgid "Wrong bind mount point '%s'"
msgstr "Неправильная bind точка монтирования '%s'"
#: ../calculate-install/pym/install/variables/disk.py:1077
-#: ../calculate-install/pym/install/variables/disk.py:2472
-#: ../calculate-install/pym/install/variables/disk.py:2477
+#: ../calculate-install/pym/install/variables/disk.py:2486
+#: ../calculate-install/pym/install/variables/disk.py:2491
#, python-format
msgid "Wrong device '%s'"
msgstr "Неправильное устройство '%s'"
@@ -1571,11 +1579,11 @@ msgstr "Неверный исходный IP %s"
msgid "Wrong timezone %s"
msgstr "Неправильный часовой пояс %s"
-#: ../calculate-install/pym/install/variables/disk.py:2536
+#: ../calculate-install/pym/install/variables/disk.py:2550
msgid "You cannot format the USB Flash which contains the current system"
msgstr "Вы не может отформатировать USB Flash, которая содержит текущую систему"
-#: ../calculate-install/pym/install/variables/disk.py:2490
+#: ../calculate-install/pym/install/variables/disk.py:2504
msgid "You cannot install the new system instead current"
msgstr "Вы не можете установить новую систему вместо текущей"
@@ -1588,8 +1596,8 @@ msgstr "Установка пароля несовместима с удален
msgid "You may not use the current root partition %s for installation"
msgstr "Текущий корневой раздел %s не может использоваться для установки"
-#: ../calculate-install/pym/install/variables/disk.py:2203
-#: ../calculate-install/pym/install/variables/disk.py:2501
+#: ../calculate-install/pym/install/variables/disk.py:2213
+#: ../calculate-install/pym/install/variables/disk.py:2515
msgid "You need a disk with a dos table for Flash install"
msgstr "Для установки на Flash необходим диск с таблицей разделов dos"
@@ -1597,14 +1605,14 @@ msgstr "Для установки на Flash необходим диск с та
msgid "You need to select a distribution image"
msgstr "Необходимо выбрать образ дистрибутива"
-#: ../calculate-install/pym/install/variables/disk.py:2218
-#: ../calculate-install/pym/install/variables/disk.py:2226
+#: ../calculate-install/pym/install/variables/disk.py:2228
+#: ../calculate-install/pym/install/variables/disk.py:2236
#, python-brace-format
msgid "Your boot device must have a BIOS Boot partition ({minsize})"
msgstr "На загрузочном диске должен присутствовать BIOS Boot раздел ({minsize})"
-#: ../calculate-install/pym/install/variables/autopartition.py:486
-#: ../calculate-install/pym/install/variables/disk.py:2079
+#: ../calculate-install/pym/install/variables/disk.py:2089
+#: ../calculate-install/pym/install/variables/autopartition.py:529
msgid "Your system must be loaded in UEFI for using this bootloader"
msgstr "Система должна быть загружена как UEFI для того, чтобы использовать этот загрузчик"
@@ -1616,7 +1624,7 @@ msgstr "добавить правило маршрутизации (формат
msgid "add a user to the installed system. USER is username. ADMIN is administrator rights (none, all, update, none by default). GROUPS is list user supplimentary groups (comma delimeter). Use 'none' value to discard user migration"
msgstr "добавить пользователя в устанавливаемую систему. USER - имя пользователя. ADMIN - права администратора (none, all, update, none по умолчанию). GROUPS список пользовательских дополнительных групп (через запятую). Используйте 'none' значение для отмены переноса пользователей"
-#: ../calculate-install/pym/install/distr.py:1333
+#: ../calculate-install/pym/install/distr.py:1342
#, python-format
msgid "archive %s"
msgstr "архив %s"
@@ -1625,11 +1633,11 @@ msgstr "архив %s"
msgid "audio parameters"
msgstr "звуковые параметры"
-#: ../calculate-install/pym/install/variables/autopartition.py:459
+#: ../calculate-install/pym/install/variables/autopartition.py:502
msgid "autopartition options"
msgstr "параметры авторазметки"
-#: ../calculate-install/pym/install/variables/disk.py:2140
+#: ../calculate-install/pym/install/variables/disk.py:2150
msgid "boot disk for the system bound for install"
msgstr "загрузочный диск для устанавливаемой системы"
@@ -1654,8 +1662,8 @@ msgid "by version"
msgstr "по версии"
#: ../calculate-install/pym/install/distr.py:858
-#: ../calculate-install/pym/install/distr.py:1582
-#: ../calculate-install/pym/install/distr.py:1734
+#: ../calculate-install/pym/install/distr.py:1591
+#: ../calculate-install/pym/install/distr.py:1743
#, python-format
msgid "command '%s' not found"
msgstr "команда '%s' не найдена"
@@ -1664,7 +1672,7 @@ msgstr "команда '%s' не найдена"
msgid "configure dynamic options only"
msgstr "конфигурировать только динамические параметры"
-#: ../calculate-install/pym/install/variables/disk.py:2274
+#: ../calculate-install/pym/install/variables/disk.py:2284
msgid "device type for the system bound for install"
msgstr "тип устройства для устанавливаемой системы"
@@ -1685,7 +1693,7 @@ msgstr "пусто"
msgid "encrypt user profiles"
msgstr "шифровать пользовательские профили"
-#: ../calculate-install/pym/install/variables/disk.py:1376
+#: ../calculate-install/pym/install/variables/disk.py:1386
#, python-brace-format
msgid "for {typedisk} install"
msgstr "для {typedisk} установки"
@@ -1694,7 +1702,7 @@ msgstr "для {typedisk} установки"
msgid "grub terminal"
msgstr "grub терминал"
-#: ../calculate-install/pym/install/distr.py:1658
+#: ../calculate-install/pym/install/distr.py:1667
#, python-format
msgid "image directory %s"
msgstr "директория с образом %s"
@@ -1703,12 +1711,12 @@ msgstr "директория с образом %s"
msgid "install the newer image only"
msgstr "установить только более новый образ"
-#: ../calculate-install/pym/install/distr.py:1998
+#: ../calculate-install/pym/install/distr.py:2007
#, python-brace-format
msgid "layered '{file} {diff}'"
msgstr "со слоями '{file} {diff}'"
-#: ../calculate-install/pym/install/distr.py:1656
+#: ../calculate-install/pym/install/distr.py:1665
#, python-format
msgid "live image %s"
msgstr "live-образ %s"
@@ -1725,7 +1733,7 @@ msgstr "менеджер сети"
msgid "network settings"
msgstr "сетевые параметры"
-#: ../calculate-install/pym/install/distr.py:1043
+#: ../calculate-install/pym/install/distr.py:1048
#, python-format
msgid "partition '%s'"
msgstr "раздел '%s'"
@@ -1734,7 +1742,7 @@ msgstr "раздел '%s'"
msgid "path for PXE install"
msgstr "путь для PXE-установки"
-#: ../calculate-install/pym/install/variables/disk.py:2516
+#: ../calculate-install/pym/install/variables/disk.py:2530
msgid "perform the formatting of the USB Flash drive"
msgstr "выполнить форматирование USB Flash"
@@ -1770,7 +1778,7 @@ msgstr "выбор архитектуры процессора"
msgid "session settings"
msgstr "настройки сессии"
-#: ../calculate-install/pym/install/variables/disk.py:2008
+#: ../calculate-install/pym/install/variables/disk.py:2018
msgid "set UEFI boot disks"
msgstr "установить диски для UEFI загрузки"
@@ -1782,6 +1790,14 @@ msgstr "установить автоматический вход в систе
msgid "set either the short or the full hostname"
msgstr "установить короткое или полное имя хоста"
+#: ../calculate-install/pym/install/variables/autopartition.py:439
+msgid "set filesystem for data partititon"
+msgstr "установить файловую систему для раздела с данными"
+
+#: ../calculate-install/pym/install/variables/autopartition.py:424
+msgid "set filesystem for root partititon"
+msgstr "установить файловую систему для корневого раздела"
+
#: ../calculate-install/pym/install/variables/system.py:219
msgid "set grub password"
msgstr "установить пароль на grub"
@@ -1794,7 +1810,7 @@ msgstr "установить тип аппаратных часов"
msgid "set the NTP server for the system"
msgstr "установка NTP сервера для системы"
-#: ../calculate-install/pym/install/variables/disk.py:2455
+#: ../calculate-install/pym/install/variables/disk.py:2469
msgid "set the USB Flash device"
msgstr "установить USB Flash"
@@ -1826,11 +1842,11 @@ msgstr "установить раскладку клавиатуры"
msgid "set the locale"
msgstr "установить локаль"
-#: ../calculate-install/pym/install/variables/autopartition.py:574
+#: ../calculate-install/pym/install/variables/autopartition.py:617
msgid "set the partition table for autopartition"
msgstr "установить таблицу разделов для авторазметки"
-#: ../calculate-install/pym/install/variables/autopartition.py:536
+#: ../calculate-install/pym/install/variables/autopartition.py:579
msgid "set the root partition size for autopartition"
msgstr "установить размер корневого раздела для авторазметки"
@@ -1850,7 +1866,7 @@ msgstr "установить видеодрайвер"
msgid "specify the root password"
msgstr "указать пароль пользователя root"
-#: ../calculate-install/pym/install/distr.py:1549
+#: ../calculate-install/pym/install/distr.py:1558
#, python-format
msgid "squash image %s"
msgstr "squash-образ %s"
@@ -1872,11 +1888,11 @@ msgstr "установить I/O планировщик"
msgid "update themes"
msgstr "обновить темы"
-#: ../calculate-install/pym/install/variables/disk.py:1551
+#: ../calculate-install/pym/install/variables/disk.py:1561
msgid "use UUID"
msgstr "использовать UUID"
-#: ../calculate-install/pym/install/variables/autopartition.py:418
+#: ../calculate-install/pym/install/variables/autopartition.py:461
msgid "use the autopartition"
msgstr "использовать авторазметку"
@@ -1905,14 +1921,14 @@ msgstr "%s видеодрайвер недоступен"
msgid "video settings"
msgstr "параметры видео"
-#: ../calculate-install/pym/install/variables/disk.py:1448
-#: ../calculate-install/pym/install/variables/disk.py:2541
+#: ../calculate-install/pym/install/variables/disk.py:1458
+#: ../calculate-install/pym/install/variables/disk.py:2555
#, python-brace-format
msgid "{device} must be formatted"
msgstr "Диск {device} должен быть отформатирован"
-#: ../calculate-install/pym/install/variables/disk.py:1438
-#: ../calculate-install/pym/install/variables/disk.py:1464
+#: ../calculate-install/pym/install/variables/disk.py:1448
+#: ../calculate-install/pym/install/variables/disk.py:1474
#, python-brace-format
msgid "{device} must but cannot be formatted, as it is mounted to {mountpoint} on the current system"
msgstr "Диск {device} должен быть отформатирован, но не может, потому что подключен к {mountpoint} в текущей системе"
diff --git a/ru/cl_lib3.po b/ru/cl_lib3.po
index d91f03b..ec6ebe2 100644
--- a/ru/cl_lib3.po
+++ b/ru/cl_lib3.po
@@ -11,12 +11,12 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:3504
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:3505
#, python-format
msgid "%(name)s does not match %(nameElement)s in size"
msgstr "размер %(name)s не равен размеру %(nameElement)s"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:1916
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:1917
#, python-format
msgid "%d argumens"
msgstr "%d аргументов"
@@ -28,23 +28,23 @@ msgstr "%d аргументов"
msgid "%s command not found"
msgstr "Команда не найдена %s"
-#: ../calculate-lib/pym/calculate/lib/utils/files.py:1339
+#: ../calculate-lib/pym/calculate/lib/utils/files.py:1301
#, python-format
msgid "%s is not directory"
msgstr "%s не директория"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:3432
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:3433
#, python-format
msgid "'%s' is not a number"
msgstr "'%s' не число"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:1918
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:1919
msgid "1 argument"
msgstr "1 аргумент"
-#: ../calculate-lib/pym/calculate/lib/utils/mount.py:245
-#: ../calculate-lib/pym/calculate/lib/utils/mount.py:255
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4516
+#: ../calculate-lib/pym/calculate/lib/utils/mount.py:246
+#: ../calculate-lib/pym/calculate/lib/utils/mount.py:256
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4517
msgid ":"
msgstr ":"
@@ -56,8 +56,8 @@ msgstr ":"
#: ../calculate-lib/pym/calculate/lib/cl_template.py:1028
#: ../calculate-lib/pym/calculate/lib/cl_template.py:1216
#: ../calculate-lib/pym/calculate/lib/cl_template.py:1218
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2266
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4481
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2267
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4482
#: ../calculate-lib/pym/calculate/lib/cl_template.py:4968
#: ../calculate-lib/pym/calculate/lib/cl_template.py:5001
#: ../calculate-lib/pym/calculate/lib/cl_template.py:5023
@@ -73,50 +73,50 @@ msgstr ":"
#: ../calculate-lib/pym/calculate/lib/cl_template.py:5390
#: ../calculate-lib/pym/calculate/lib/cl_template.py:5423
#: ../calculate-lib/pym/calculate/lib/cl_template.py:5430
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5438
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5440
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5455
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5457
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5466
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5468
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5499
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5439
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5441
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5456
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5458
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5467
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5469
#: ../calculate-lib/pym/calculate/lib/cl_template.py:5501
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5512
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5503
#: ../calculate-lib/pym/calculate/lib/cl_template.py:5514
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5523
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5516
#: ../calculate-lib/pym/calculate/lib/cl_template.py:5525
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5546
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5549
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5576
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5527
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5548
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5551
#: ../calculate-lib/pym/calculate/lib/cl_template.py:5578
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5586
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5580
#: ../calculate-lib/pym/calculate/lib/cl_template.py:5588
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5598
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5627
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5644
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5666
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5683
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5694
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5700
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5731
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5733
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5745
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5590
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5599
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5628
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5645
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5667
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5684
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5695
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5701
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5732
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5734
#: ../calculate-lib/pym/calculate/lib/cl_template.py:5746
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6063
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5747
#: ../calculate-lib/pym/calculate/lib/cl_template.py:6065
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6096
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6140
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6067
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6098
#: ../calculate-lib/pym/calculate/lib/cl_template.py:6142
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6170
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6144
#: ../calculate-lib/pym/calculate/lib/cl_template.py:6172
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6199
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6174
#: ../calculate-lib/pym/calculate/lib/cl_template.py:6201
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6234
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6270
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6280
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6297
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6203
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6236
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6272
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6282
#: ../calculate-lib/pym/calculate/lib/cl_template.py:6299
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6309
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6301
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6311
msgid ": "
msgstr ": "
@@ -138,7 +138,7 @@ msgstr "Неопредёленность в этом шаблоне: одни и
msgid "Ambiguous choice:%s"
msgstr "Неоднозначный выбор: %s"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6052
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6054
msgid "Appling patch"
msgstr "Применение патча"
@@ -176,7 +176,7 @@ msgstr "Ветка {branch} не найдена в {rpath} репозитори
msgid "Branch {branch} not found in repository {url}"
msgstr "Ветка {branch} не найдена в {url} репозитории"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4516
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4517
msgid "Calculate Utilities have changed files"
msgstr "Утилиты Calculate изменили файлы"
@@ -184,12 +184,12 @@ msgstr "Утилиты Calculate изменили файлы"
msgid "Click for advanced settings"
msgstr "Нажмите для дополнительных настроек"
-#: ../calculate-lib/pym/calculate/lib/utils/files.py:171
-#: ../calculate-lib/pym/calculate/lib/utils/files.py:912
#: ../calculate-lib/pym/calculate/lib/utils/partition.py:427
#: ../calculate-lib/pym/calculate/lib/utils/partition.py:530
#: ../calculate-lib/pym/calculate/lib/utils/partition.py:537
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2237
+#: ../calculate-lib/pym/calculate/lib/utils/files.py:171
+#: ../calculate-lib/pym/calculate/lib/utils/files.py:874
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2238
#, python-format
msgid "Command not found '%s'"
msgstr "Команда не найдена '%s'"
@@ -216,12 +216,12 @@ msgstr "Пропущено создание изображения с разре
msgid "Custom action"
msgstr "Произвольное действие"
-#: ../calculate-lib/pym/calculate/lib/utils/mount.py:188
+#: ../calculate-lib/pym/calculate/lib/utils/mount.py:189
#, python-format
msgid "Device %s must be mounted"
msgstr "Диск %s должен быть подключен"
-#: ../calculate-lib/pym/calculate/lib/utils/mount.py:269
+#: ../calculate-lib/pym/calculate/lib/utils/mount.py:270
msgid "Device not found"
msgstr "Устройство не найдено"
@@ -264,26 +264,26 @@ msgstr "Ошибка в calculate.env профиле"
msgid "Error in profile calculate.env"
msgstr "Ошибка в профиле calculate.env"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6266
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6268
#, python-format
msgid "Error in template %s"
msgstr "Ошибка в шаблоне %s"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4300
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4301
msgid "Example:"
msgstr "Пример:"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4886
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4894
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4887
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4895
#, python-format
msgid "Failed to apply template file %s"
msgstr "Ошибка при применении файла шаблона %s"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5630
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5631
msgid "Failed to change the current directory to"
msgstr "Не удалось изменить текущую директорию на"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4818
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4819
#, python-format
msgid "Failed to change version of %s"
msgstr "Не удалось изменить версию %s"
@@ -293,7 +293,7 @@ msgstr "Не удалось изменить версию %s"
msgid "Failed to clean the {rpath} repository"
msgstr "Не удалось очистить {rpath} репозиторий"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5440
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5441
msgid "Failed to clear the file"
msgstr "Не удалось очистить файл"
@@ -309,12 +309,12 @@ msgstr "Не удалось клонировать {url} репозиторий"
msgid "Failed to convert the text template to XML"
msgstr "Не удалось преобразовать текстовый шаблон в XML"
-#: ../calculate-lib/pym/calculate/lib/utils/files.py:1091
+#: ../calculate-lib/pym/calculate/lib/utils/files.py:1053
#, python-format
msgid "Failed to copy '%(src)s' to '%(dst)s'"
msgstr "Не удалось скопировать '%(src)s' в '%(dst)s'"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4600
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4601
#, python-brace-format
msgid "Failed to copy {ffrom} to {fto}"
msgstr "Не удалось скопировать {ffrom} в {fto}"
@@ -331,15 +331,15 @@ msgstr "Не удалось создать GPT таблицу разделов"
msgid "Failed to create LVM"
msgstr "Не удалось создать LVM"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5746
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5747
msgid "Failed to create a symbolic link"
msgstr "Не удалось создать символическую ссылку"
-#: ../calculate-lib/pym/calculate/lib/utils/files.py:1375
-#: ../calculate-lib/pym/calculate/lib/utils/files.py:1388
-#: ../calculate-lib/pym/calculate/lib/utils/files.py:1391
-#: ../calculate-lib/pym/calculate/lib/utils/files.py:1406
-#: ../calculate-lib/pym/calculate/lib/utils/files.py:1423
+#: ../calculate-lib/pym/calculate/lib/utils/files.py:1337
+#: ../calculate-lib/pym/calculate/lib/utils/files.py:1350
+#: ../calculate-lib/pym/calculate/lib/utils/files.py:1353
+#: ../calculate-lib/pym/calculate/lib/utils/files.py:1368
+#: ../calculate-lib/pym/calculate/lib/utils/files.py:1385
#, python-format
msgid "Failed to create tarball: %s"
msgstr "Не удалось создать tar: %s"
@@ -350,8 +350,8 @@ msgid "Failed to create the directory: "
msgstr "Не удалось создать директорию: "
#: ../calculate-lib/pym/calculate/lib/cl_ini_parser.py:142
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5501
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5600
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5503
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5601
msgid "Failed to create the file"
msgstr "Не удалось создать файл"
@@ -365,16 +365,16 @@ msgstr "Не удалось создать том %s"
msgid "Failed to delete the directory: "
msgstr "Не удалось удалить директорию: "
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5468
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5525
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5549
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5588
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5733
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5469
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5527
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5551
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5590
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5734
msgid "Failed to delete the file"
msgstr "Не удалось удалить файл"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5457
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5514
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5458
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5516
msgid "Failed to delete the link"
msgstr "Не удалось удалить ссылку"
@@ -400,13 +400,13 @@ msgstr "Не удалось определить имя домена %s"
msgid "Failed to determine the system profile"
msgstr "Не удалось определить профиль системы"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2266
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4481
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6065
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6142
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6172
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6201
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6299
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2267
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4482
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6067
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6144
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6174
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6203
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6301
msgid "Failed to execute"
msgstr "Не удалось выполнить"
@@ -415,12 +415,12 @@ msgstr "Не удалось выполнить"
msgid "Failed to execute %s"
msgstr "Не удалось выполнить %s"
-#: ../calculate-lib/pym/calculate/lib/utils/binhosts.py:289
+#: ../calculate-lib/pym/calculate/lib/utils/binhosts.py:295
#, python-format
msgid "Failed to fetch Packages from binary host %s"
msgstr "Не удалось получить Packages из бинарного хоста %s"
-#: ../calculate-lib/pym/calculate/lib/utils/binhosts.py:313
+#: ../calculate-lib/pym/calculate/lib/utils/binhosts.py:320
msgid "Failed to fetch Packages signature"
msgstr "Не удалось получить подпись Packages"
@@ -429,7 +429,7 @@ msgstr "Не удалось получить подпись Packages"
msgid "Failed to find %s volume"
msgstr "Не удалось найти %s том"
-#: ../calculate-lib/pym/calculate/lib/utils/mount.py:304
+#: ../calculate-lib/pym/calculate/lib/utils/mount.py:305
msgid "Failed to get btrfs compression"
msgstr "Не удалось получить сжатие btrfs"
@@ -469,17 +469,17 @@ msgstr "Не удалось импортировать модуль %s"
msgid "Failed to join the template"
msgstr "Не удалось объединить шаблон"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4613
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4614
#, python-format
msgid "Failed to modify %s contents"
msgstr "Не удалось изменить содержимое %s"
-#: ../calculate-lib/pym/calculate/lib/utils/mount.py:242
+#: ../calculate-lib/pym/calculate/lib/utils/mount.py:243
#, python-brace-format
msgid "Failed to mount {source} to {target}"
msgstr "Не удалось подключить {source} к {target}"
-#: ../calculate-lib/pym/calculate/lib/utils/files.py:1630
+#: ../calculate-lib/pym/calculate/lib/utils/files.py:1592
#, python-format
msgid "Failed to move data: %s"
msgstr "Не удалось переместить данные: %s"
@@ -489,7 +489,7 @@ msgstr "Не удалось переместить данные: %s"
msgid "Failed to move to branch {branch} in the {rpath} repository"
msgstr "Не удалось сменить ветку на {branch} в {rpath} репозитории"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5578
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5580
msgid "Failed to open the file"
msgstr "Не удалось открыть файл"
@@ -504,52 +504,52 @@ msgstr "Ошибка открытия шаблона"
msgid "Failed to optimize repository %s"
msgstr "Не удалось оптимизировать репозиторий %s"
-#: ../calculate-lib/pym/calculate/lib/utils/common.py:539
+#: ../calculate-lib/pym/calculate/lib/utils/common.py:541
msgid "Failed to parse Private.sig"
msgstr "Не удалось распознать Private.sig"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4653
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4753
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4654
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4754
#, python-format
msgid "Failed to read templates directory %s"
msgstr "Не удалось прочитать директорию с шаблонами %s"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4843
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4844
#, python-format
msgid "Failed to reconfigure package %s"
msgstr "Не удалось перенастроить пакет %s"
#: ../calculate-lib/pym/calculate/lib/format/backgrounds.py:258
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4609
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4610
#, python-format
msgid "Failed to remove %s"
msgstr "Не удалось удалить %s"
-#: ../calculate-lib/pym/calculate/lib/utils/files.py:1624
+#: ../calculate-lib/pym/calculate/lib/utils/files.py:1586
#, python-format
msgid "Failed to rename data: %s"
msgstr "Не удалось переименовать данные: %s"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5792
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5793
#, python-format
msgid "Failed to restart %s service"
msgstr "Не удалось перезапустить %s сервис"
-#: ../calculate-lib/pym/calculate/lib/utils/files.py:1464
+#: ../calculate-lib/pym/calculate/lib/utils/files.py:1426
#, python-brace-format
msgid "Failed to rsync {src} to {dst}: {error}"
msgstr "Не удалось выполнить rsync {src} to {dst}: {error}"
-#: ../calculate-lib/pym/calculate/lib/utils/mount.py:321
+#: ../calculate-lib/pym/calculate/lib/utils/mount.py:322
msgid "Failed to set btrfs compression"
msgstr "Не удалось установить btrfs сжатие"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5794
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5795
#, python-format
msgid "Failed to start %s service"
msgstr "Не удалось запустить %s сервис"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5793
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5794
#, python-format
msgid "Failed to stop %s service"
msgstr "Не удалось остановить %s сервис"
@@ -565,7 +565,7 @@ msgstr "Нет поддержки алгоритма шифрования '%s'"
msgid "Failed to synchronize directory {dn}: {error}"
msgstr "Не удалось синхронизировать директорию {dn}: {error}"
-#: ../calculate-lib/pym/calculate/lib/utils/mount.py:253
+#: ../calculate-lib/pym/calculate/lib/utils/mount.py:254
#, python-brace-format
msgid "Failed to umount {target}"
msgstr "Не удалось отключить {target}"
@@ -580,7 +580,7 @@ msgstr "Не удалось восстановить спрятанные пак
msgid "Failed to unhide: {error}"
msgstr "Не удалось восстановить спрятанные: {error}"
-#: ../calculate-lib/pym/calculate/lib/utils/common.py:525
+#: ../calculate-lib/pym/calculate/lib/utils/common.py:527
msgid "Failed to unwrap the passphrase"
msgstr "Не удалось расшифровать фразу-пароль"
@@ -590,12 +590,12 @@ msgstr "Не удалось расшифровать фразу-пароль"
msgid "Failed to update the repository in {rpath}"
msgstr "Не удалось обновить репозиторий в {rpath}"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6046
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6048
#, python-format
msgid "Failed to use %s "
msgstr "Не удалось использовать %s "
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6048
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6050
msgid "Failed to use patch "
msgstr "Не удалось применить патч "
@@ -608,28 +608,28 @@ msgstr "Не удалось записать в файл"
msgid "Field variable got not iterable value"
msgstr "Field variable got not iterable value"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:3313
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:3314
#, python-brace-format
msgid "Function '{funcname}' used by {template} is deprecated and will be removed in the future"
msgstr "Функция '{funcname}', использующаяся шаблоном {template} , устарела и будет удалена в будущем"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:1937
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:1938
#, python-brace-format
msgid "Function takes at least {num}"
msgstr "Функция принимает не менее {num}"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:1947
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:1948
#, python-brace-format
msgid "Function takes at most {num}"
msgstr "Функция принимает не более {num}"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:1941
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:1951
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:1942
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:1952
#, python-brace-format
msgid "Function takes exactly {num}"
msgstr "Функция принимает ровно {num}"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:1933
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:1934
msgid "Function takes no arguments"
msgstr "Функция не принимает аргументов"
@@ -643,11 +643,11 @@ msgid "Group ID %s not found"
msgstr "Не удалось найти идентификатор группы %s"
#: ../calculate-lib/pym/calculate/lib/cl_template.py:5132
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5680
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5681
msgid "Group not found on the system: "
msgstr "Отсутствует группа в системе: "
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4297
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4298
msgid "Headers of directory templates and headers of files on the first level should include an action variable"
msgstr "Заголовки шаблонов директорий и файлов первого уровня должны включать в себя переменную действия."
@@ -739,7 +739,7 @@ msgstr "Отметить как изменено человеком"
msgid "Method for updating config files"
msgstr "Метод обновления конфигурационных файлов"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5619
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5620
#, python-format
msgid "Missed source link in template '%s'"
msgstr "Пропущено исходное имя ссылки в шаблоне '%s'"
@@ -765,7 +765,7 @@ msgstr "Далее"
msgid "No access to the directory: "
msgstr "Нет доступа к директории:"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4281
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4282
msgid "No conditions for checking the value of an action variable"
msgstr "Нет условий проверки значения переменной действия"
@@ -773,12 +773,12 @@ msgstr "Нет условий проверки значения переменн
msgid "No custom action on this system"
msgstr "В системе нет ни одного пользовательского действия"
-#: ../calculate-lib/pym/calculate/lib/utils/files.py:1330
+#: ../calculate-lib/pym/calculate/lib/utils/files.py:1292
#, python-format
msgid "No directory name available for %s"
msgstr "Не удалось найти доступное имя директории для %s"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2263
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2264
#, python-format
msgid "No packages in %s category"
msgstr "В категории %s нет пакетов"
@@ -793,7 +793,7 @@ msgid "No space left on device"
msgstr "На устройстве не свободного места"
#: ../calculate-lib/pym/calculate/lib/cl_template.py:5121
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5663
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5664
msgid "No such user on the system: "
msgstr "Не найден пользователь в системе: "
@@ -811,17 +811,17 @@ msgstr "Пакет {package} не найден в world"
msgid "Number of processors"
msgstr "Число процессоров"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5983
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5985
#, python-format
msgid "Option %s should be used for format=backgrounds only"
msgstr "Параметр %s должен быть использован только с format=backgrounds"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5975
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5977
#, python-format
msgid "Option %s should be used for format=dconf only"
msgstr "Параметр %s должен быть использован только для format=dconf"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5967
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5969
#, python-format
msgid "Option %s should be used for format=patch only"
msgstr "Параметр %s должен быть использован только для format=patch"
@@ -876,17 +876,17 @@ msgstr "Корень на всё свободное место не должен
msgid "Select the profile with command {cmd}"
msgstr "Выберите профиль с помощью команды {cmd}"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5787
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5788
#, python-format
msgid "Service %s has been restarted"
msgstr "Сервис %s перезапущен"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5789
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5790
#, python-format
msgid "Service %s has been started"
msgstr "Сервис %s запущен"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5788
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5789
#, python-format
msgid "Service %s has been stopped"
msgstr "Сервис %s остановлен"
@@ -895,15 +895,15 @@ msgstr "Сервис %s остановлен"
msgid "Skip the update of config files"
msgstr "Пропустить обновление конфигурационных файлов"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4293
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4294
msgid "Skipped directories:"
msgstr "Пропущенные директории:"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4289
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4290
msgid "Skipped templates:"
msgstr "Пропущенные шаблоны:"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4618
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4619
msgid "Some config files need updating. Perform run dispatch-conf."
msgstr "Некоторые конфигурационные файлы нуждаются в обновлении. Выполните dispatch-conf."
@@ -917,23 +917,23 @@ msgstr "Исходный путь %s не является директорие
msgid "Source variable %s does not contain a list"
msgstr "Исходная переменная %s не содержит список"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5438
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5455
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5466
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5499
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5512
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5523
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5546
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5576
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5586
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5598
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5627
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5731
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5745
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5439
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5456
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5467
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5501
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5514
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5525
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5548
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5578
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5588
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5599
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5628
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5732
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5746
msgid "Template error"
msgstr "Ошибка в шаблоне"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6312
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6314
msgid "Template type not found: "
msgstr "Тип шаблона не найден: "
@@ -961,7 +961,7 @@ msgstr "Утилита Git не найдена"
msgid "The function value is not a version"
msgstr "Значение функции не является версией"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2380
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2381
msgid "The second argument of the function is not 'root'"
msgstr "Второй аргумент функции не 'root'"
@@ -1009,7 +1009,7 @@ msgstr "Текст не является правильным gconf-XML-форм
msgid "The text is not a valid gconf-XML format (not found '...')"
msgstr "Текст не является правильным gconf-XML форматом (не найдено '...')"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2435
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2436
msgid "The third argument of the function is not 'root'"
msgstr "Третий аргумент функции не 'root'"
@@ -1034,9 +1034,6 @@ msgstr "Значение для {varname} может быть только '{var
msgid "The value of variable '{varname}' must be integer"
msgstr "Значение для {varname} должно быть целым числом"
-msgid "There is not enough space on this device to perform the autopartition"
-msgstr "На устройстве не хватает свободного места для выполнения авторазметки"
-
#: ../calculate-lib/pym/calculate/lib/utils/partition.py:215
#, python-brace-format
msgid "There is not enough space on this device, to perform the autopartition need {need}"
@@ -1125,7 +1122,7 @@ msgstr "Неправильное правило формата 'contents': %s"
msgid "Wrong GIDs {gid1} {gid2}"
msgstr "Неправильные идентификаторы групп {gid1} {gid2}"
-#: ../calculate-lib/pym/calculate/lib/utils/binhosts.py:302
+#: ../calculate-lib/pym/calculate/lib/utils/binhosts.py:308
msgid "Wrong Packages signature"
msgstr "Неправильная подпись Packages"
@@ -1134,7 +1131,7 @@ msgstr "Неправильная подпись Packages"
msgid "Wrong UIDs {uid1} {uid2}"
msgstr "Неправильные идентификаторы пользователей {uid1} {uid2}"
-#: ../calculate-lib/pym/calculate/lib/utils/mount.py:198
+#: ../calculate-lib/pym/calculate/lib/utils/mount.py:199
#, python-format
msgid ""
"Wrong df output:\n"
@@ -1143,7 +1140,7 @@ msgstr ""
"Неправильный вывод df:\n"
"%s"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:3366
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:3367
#, python-brace-format
msgid "Wrong entry '{data}' for {var_name}"
msgstr "Неправильная запись '{data}' для '{var_name}'"
@@ -1153,14 +1150,14 @@ msgstr "Неправильная запись '{data}' для '{var_name}'"
msgid "Wrong entry '{entry}' for table variable '{varname}'"
msgstr "Неправильная запись '{entry}' для табличной переменной '{varname}'"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6027
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6029
#, python-format
msgid "Wrong header parameter 'format=%s' in template"
msgstr "Неправильный параметр заголовка 'format=%s' в шаблоне"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6089
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6217
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6227
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6091
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6219
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6229
#, python-brace-format
msgid "Wrong header parameter '{var}={val}' in template"
msgstr "Неправильный параметр заголовка '{var}={val}' в шаблоне"
@@ -1176,18 +1173,18 @@ msgstr "Неправильный формат изображения '%s'"
msgid "Wrong interval operator"
msgstr "Неправильный оператор интервалов"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5992
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5994
#, python-format
msgid "Wrong option '%(param)s=%(type)s' in template %(file)s"
msgstr "Неправильный параметр '%(param)s=%(type)s' в шаблоне %(file)s"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6154
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6184
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6156
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6186
#, python-brace-format
msgid "Wrong option '{var}={val}' in template {fn}"
msgstr "Неправильный параметр '{var}={val}' в шаблоне {fn}"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2594
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2595
msgid "Wrong regular expression"
msgstr "Неправильное регулярное выражение"
@@ -1197,19 +1194,19 @@ msgstr "Неправильное регулярное выражение"
msgid "Wrong repository in the {rpath} directory"
msgstr "Не правильный репозиторий в {rpath} директории"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6063
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6096
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6140
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6170
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6199
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6234
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6270
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6280
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6297
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6065
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6098
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6142
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6172
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6201
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6236
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6272
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6282
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6299
msgid "Wrong template"
msgstr "Ошибка шаблона"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6308
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6310
msgid "Wrong template option (type append)"
msgstr "Неправильный параметр (type append) шаблона"
@@ -1223,11 +1220,11 @@ msgstr "Неправильный параметр (type append) шаблона"
#: ../calculate-lib/pym/calculate/lib/cl_template.py:5377
#: ../calculate-lib/pym/calculate/lib/cl_template.py:5389
#: ../calculate-lib/pym/calculate/lib/cl_template.py:5422
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5643
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5665
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5682
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5693
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:5699
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5644
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5666
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5683
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5694
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:5700
#, python-format
msgid "Wrong value '%s' in the template"
msgstr "Неправильное значение '%s' в шаблоне"
@@ -1264,59 +1261,59 @@ msgstr "пароль пуст"
#: ../calculate-lib/pym/calculate/lib/datavars.py:1316
#: ../calculate-lib/pym/calculate/lib/cl_template.py:3695
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4887
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4895
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4888
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4896
msgid "error"
msgstr "ошибка"
#: ../calculate-lib/pym/calculate/lib/cl_template.py:288
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2735
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:3574
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2736
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:3575
#, python-format
msgid "error in template %s"
msgstr "ошибка в шаблоне %s"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:3575
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:3576
#, python-format
msgid "error, template term '%s'"
msgstr "ошибка, часть шаблона '%s'"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2828
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2829
msgid "error: global variables stack empty"
msgstr "ошибка: стек глобальных переменных пуст"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2166
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2167
#, python-format
msgid "error: local variable %s not defined"
msgstr "ошибка: локальная переменная %s не определена"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2172
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2173
#, python-format
msgid "error: template term %s, incorrect data"
msgstr "ошибка: часть шаблона %s, неправильные данные"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2314
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2766
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2801
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:3439
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:3482
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:3493
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2315
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2767
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2802
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:3440
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:3483
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:3494
#, python-format
msgid "error: variable %s does not exist"
msgstr "ошибка: переменная %s не существует"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2795
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2796
#, python-format
msgid "error: variable %s exists"
msgstr "ошибка: переменная %s существует"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2155
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2162
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2156
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2163
#, python-format
msgid "error: variable %s is not integer"
msgstr "ошибка: переменная %s не является числом"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2736
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2737
#, python-format
msgid "error: variable %s not found"
msgstr "ошибка: переменная %s не найдена"
@@ -1326,20 +1323,20 @@ msgstr "ошибка: переменная %s не найдена"
msgid "failed. (socket error: '%s')"
msgstr "неудача. (ошибка сокета: '%s')"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2642
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2643
msgid "first parameter must be number"
msgstr "первый параметр должен быть числом"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:3631
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:3632
#, python-format
msgid "function of templates '%s' not found"
msgstr "не найдена функция шаблонов '%s'"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2670
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2671
msgid "function rnd support one or two arguments only"
msgstr "функция rnd поддерживает только один или два аргумента"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:3015
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:3016
msgid "function support two or three parameters"
msgstr "функция поддерживает только два или три параметра"
@@ -1378,7 +1375,7 @@ msgstr "шаблон содержит ошибку: "
msgid "invalid template name: "
msgstr "имя шаблона неправильно:"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2682
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2683
#, python-brace-format
msgid "length of UUID must not be above {maxlen}"
msgstr "длина UUID не должна превышать {maxlen}"
@@ -1391,14 +1388,11 @@ msgstr "обновить конфигурационные файлы вручн
msgid "mark as human modification"
msgstr "отметить как изменено человеком"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:3518
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:3519
#, python-format
msgid "mount point '/' or '/%s' not found in the value of variable os_disk_install"
msgstr "в значении переменной os_disk_install не найдена точка монтирования '' или '\\%s'"
-msgid "need {need}"
-msgstr "необходимо {need}"
-
#: ../calculate-lib/pym/calculate/lib/utils/text.py:391
msgid "or"
msgstr "или"
@@ -1431,45 +1425,45 @@ msgstr "пропустить обновление конфигурационны
msgid "template header not valid"
msgstr "неправильный заголовок шаблона"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:3224
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:3225
#, python-format
msgid "template variable '%s' not found"
msgstr "не найдена переменная шаблонов '%s'"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4766
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4767
#, python-brace-format
msgid "templates in {tempath} are skipped"
msgstr "шаблоны в {tempath} пропущены"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2724
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2725
msgid "the first argument of the function is neither 'upper' or 'lower' or 'capitalize'"
msgstr "первый аргумент функции не 'upper' или 'lower' или 'capitalize'"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2439
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2440
msgid "the first argument of the function is neither 'ver' or 'num' or 'char' or 'empty'"
msgstr "первый аргумент функции не 'ver' или 'num' или 'char' или 'empty'"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2693
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2694
msgid "the first argument of the function must be 'num', 'pas' or 'uuid'"
msgstr "первый аргумент функции должен быть 'num', 'pas' или 'uuid'"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:3026
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:3027
msgid "the first parameter must be the resolution"
msgstr "первый параметр должен быть разрешением"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2566
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2567
msgid "the option name should not starts with CONFIG_"
msgstr "имя параметра не должно начинаться с CONFIG_"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2675
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2676
msgid "the second argument of the function is not a number"
msgstr "второй аргумент функции не является числом"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:3151
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:3152
msgid "the third argument of the function is neither 'url' or 'purl' or 'unicode'"
msgstr "третий аргумент функции не 'url', не 'purl' и не 'unicode'"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:3010
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:3011
msgid "third parameter may be 'file' only"
msgstr "третий параметр может быть только 'file'"
@@ -1488,8 +1482,8 @@ msgstr "не удалось открыть директорию как файл:
msgid "unable to open the file:"
msgstr "не удалось открыть файл:"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4329
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:6530
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4330
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:6532
msgid "undefined variable: "
msgstr "не определена переменная:"
@@ -1501,8 +1495,8 @@ msgstr "использовать новые конфигурационные ф
msgid "username"
msgstr "имя пользователя"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:3443
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:3501
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:3444
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:3502
#, python-format
msgid "value of %s is not a list or a tuple"
msgstr "значение %s не является списком или кортежем"
@@ -1515,8 +1509,8 @@ msgstr "подробный вывод"
msgid "without py-smbpasswd"
msgstr "без py-smbpasswd"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:3475
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:3492
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:3476
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:3493
#, python-format
msgid "wrong %s"
msgstr "%s ошибочно"
@@ -1526,7 +1520,7 @@ msgstr "%s ошибочно"
msgid "wrong dict value: %s"
msgstr "неправильное значение словаря: %s"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:3603
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:3604
#, python-format
msgid "wrong function syntax %s"
msgstr "неправильный синтаксис функции %s"
@@ -1536,16 +1530,13 @@ msgstr "неправильный синтаксис функции %s"
msgid "wrong list value: %s"
msgstr "неправильное значение списка: %s"
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2386
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:2451
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2387
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:2452
#, python-format
msgid "wrong path '%s'"
msgstr "неправильный путь '%s'"
-msgid "{avail} available, need at {need} more"
-msgstr "{avail} доступно, необходимо на {need} больше"
-
-#: ../calculate-lib/pym/calculate/lib/cl_template.py:4764
+#: ../calculate-lib/pym/calculate/lib/cl_template.py:4765
#, python-brace-format
msgid "{dirpath} is a file"
msgstr "{dirpath} файл"
@@ -1555,6 +1546,15 @@ msgstr "{dirpath} файл"
msgid "{url} does not appear to be a git repository"
msgstr "{url} не является git репозиторием"
-#: ../calculate-lib/pym/calculate/lib/utils/mount.py:283
+#: ../calculate-lib/pym/calculate/lib/utils/mount.py:284
msgid "{} is not btrfs"
msgstr "{} не btrfs"
+
+#~ msgid "There is not enough space on this device to perform the autopartition"
+#~ msgstr "На устройстве не хватает свободного места для выполнения авторазметки"
+
+#~ msgid "need {need}"
+#~ msgstr "необходимо {need}"
+
+#~ msgid "{avail} available, need at {need} more"
+#~ msgstr "{avail} доступно, необходимо на {need} больше"