add --force key

console/application/methods_func.py

@@ -82,6 +82,9 @@ def parse():
     parser.add_argument(
         '--no-progress', action='store_true', default=False,
         dest = 'no_progress', help=_('do not display progress bar'))
+    parser.add_argument(
+        '-f', '--force', action='store_true', default=False,
+        dest = 'no_questions', help=_('no questions during the process'))
     return parser
 
 def get_view(client, method, sid, view_params):
@@ -149,18 +152,19 @@ def call_method(client, args, wait_thread):
         sys.stdout.write('\r')
         sys.stdout.flush()
         print_brief(view, steps.label)
-        while True:
+        if not args.without_brief:
-            try:
+            while True:
-                ask = raw_input('\n' + _('Run process? (yes/no): '))
+                try:
-                red = '\033[31m * \033[0m'
+                    ask = raw_input('\n' + _('Run process? (yes/no): '))
-            except KeyboardInterrupt:
+                    red = '\033[31m * \033[0m'
-                ask = 'no'
+                except KeyboardInterrupt:
-                red = '\n'+'\033[31m * \033[0m'
+                    ask = 'no'
-            if ask.lower() in ['n', 'no']:
+                    red = '\n'+'\033[31m * \033[0m'
-                print red + _('Interrupted by user')
+                if ask.lower() in ['n', 'no']:
-                return None
+                    print red + _('Interrupted by user')
-            if ask.lower() in ['y', 'yes']:
+                    return None
-                break
+                if ask.lower() in ['y', 'yes']:
+                    break
 
         param_object['CheckOnly'] = False
     method_result = client.service[0][method](client.sid, param_object)

ru/calculate_console.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: console_gui_translate\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-20 09:22+0300\n"
+"POT-Creation-Date: 2012-06-27 09:28+0300\n"
-"PO-Revision-Date: 2012-06-20 09:22+0300\n"
+"PO-Revision-Date: 2012-06-27 09:28+0300\n"
 "Last-Translator: Denis <ds@mail.ru>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -15,11 +15,6 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-SearchPath-0: /var/calculate/mydir/git/calculate-console/console/application\n"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/progressbar.py:25
-#: /var/calculate/mydir/git/calculate-console/console/application/progressbar.py:28
-msgid "Time"
-msgstr "Время"
-
 #: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:29
 msgid "PID not found"
 msgstr "Процесс не найден"
@@ -92,17 +87,17 @@ msgid "Process not found"
 msgstr "Процесс не найден"
 
 #: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:142
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:258
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:267
 msgid "Certificate not found in server database"
 msgstr "Сертификат не найден в базе сервера"
 
 #: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:144
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:260
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:269
 msgid "Session doesn't belong to your certificate"
 msgstr "Сессия не соответствует Вашему сертификату"
 
 #: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:146
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:262
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:271
 msgid "It was not possible to kill process"
 msgstr "Не удалось завершить процесс"
 
@@ -125,7 +120,7 @@ msgstr "Дата отзыва"
 
 #: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:98
 #: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:103
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:286
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:287
 #, python-format
 msgid "error creating directory %s"
 msgstr "Ошибка при создании директории %s"
@@ -142,82 +137,74 @@ msgstr "Сертификат Центра Авторизации удалён и
 msgid "CA certificate delete from system trusted certificate"
 msgstr "Сертификат Центра Авторизации удалён из системного списка доверенных сертификатов"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:48
+#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:47
 msgid "Enter certificate data by hand? y/[n]: "
 msgstr "Ввести данные сертификата вручную? y/[n]: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:67
+#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:66
 #, python-format
 msgid "Host Name [%s] : "
 msgstr "Имя хоста [%s] : "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:71
+#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:70
 #, python-format
 msgid "User Name [%s]: "
 msgstr "Имя пользователя [%s]: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:74
+#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:73
 msgid "Organization Name: "
 msgstr "Название организации: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:75
+#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:74
 #, python-format
 msgid "Network address (hostname or IP) [%s]: "
 msgstr "Сетевой адрес (hostname или IP) [%s]: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:77
+#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:76
 msgid "State Name: "
 msgstr "Город: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:78
+#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:77
 #, python-format
 msgid "Country (2 words): [%s]"
 msgstr "Страна (2 символа): [%s]"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:59
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:64
 msgid "Clear Cache error! "
 msgstr "Ошибка очистки кэша!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:139
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:142
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:173
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:176
 msgid "yes"
 msgstr "да"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:141
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:144
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:175
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:178
 msgid "no"
 msgstr "нет"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:143
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:146
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:177
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:180
 msgid "auto"
 msgstr "авто"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:196
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:199
 msgid "Not used"
 msgstr "Не используется"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:295
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:328
-msgid "Error"
-msgstr "Ошибка"
-
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:301
-msgid "Warning"
-msgstr "Предепреждение"
-
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:338
 msgid "Method not found: "
 msgstr "Метод не найден: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:370
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:359
 msgid "server send pid = "
 msgstr "сервер послал идентификатор процесса = "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:460
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:450
 msgid "Process not exist or not belong to your session"
 msgstr "Процесс не существует или принадлежит не вашей сессии"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:535
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:524
 #, python-format
 msgid "Error task by %s"
 msgstr "Ошибка задачи на %s"
@@ -226,48 +213,48 @@ msgstr "Ошибка задачи на %s"
 msgid "no connection to server!"
 msgstr "нет соединения с сервером!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:188
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:192
 #, python-format
 msgid "Not found method for %s"
 msgstr "Не найден метод для %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:256
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:265
 msgid "Process is terminated"
 msgstr "Процесс завершён"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:328
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:337
 #, python-format
 msgid "cannot create directory %s"
 msgstr "Не удалось создать директорию %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:367
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:376
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:447
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:457
 msgid "Password is invalid"
 msgstr "Неверный пароль"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:373
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:382
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:384
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:393
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:453
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:464
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:469
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:480
 msgid "Error: "
 msgstr "Ошибка: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:396
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:405
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:399
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:408
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:401
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:410
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:482
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:493
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:485
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:496
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:487
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:498
 #, python-format
 msgid "Exception: %s"
 msgstr "Исключение: %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:415
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:424
-#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:88
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:94
 msgid "Failed to connect"
 msgstr "Не удалось подключиться"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:29
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:30
 msgid "show this help message and exit"
 msgstr "просмотр данной справки и выход"
 
@@ -339,38 +326,36 @@ msgstr "обновить список отзыва сертификатов"
 msgid "stop cl-consoled"
 msgstr "остановить cl-consoled"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:167
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:84
+msgid "do not display progress bar"
+msgstr "не отображать прогрессбар"
+
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:87
+msgid "no questions during the process"
+msgstr "не задавать вопросы во время процесса"
+
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:116
 msgid "Unknown parameter"
 msgstr "Неизвестный параметр"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:179
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:128
-#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:222
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:172
 msgid "method is not available"
 msgstr "Метод не доступен"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:190
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:139
-#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:232
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:182
 msgid "Error in parameter "
 msgstr "Ошибка в параметре "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:208
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:158
 msgid "Run process? (yes/no): "
 msgstr "Запустить процесс? (yes/no): "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:214
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:164
 msgid "Interrupted by user"
 msgstr "Прервано пользователем"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:309
-#, python-format
-msgid "Password for %s: "
-msgstr "Пароль для %s: "
-
-#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:310
-#, python-format
-msgid "Repeat password for %s: "
-msgstr "Повтор пароля для %s: "
-
 #: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:44
 msgid "No access to file!"
 msgstr "Нет доступа к файлу!"
@@ -433,231 +418,243 @@ msgstr "Ошибка очистки кэша сессии"
 msgid "Session cache is cleared"
 msgstr "Кэш сессии очищен"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:42
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:43
 msgid "Certificate not found in Server Database!"
 msgstr "Сертификат не найден в базе сервера!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:43
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:44
 #, python-format
 msgid "client use certificate %s"
 msgstr "клиент использует сертификат %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:44
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:45
 msgid "You can generate a new certificate using the keys --gen-cert-by and --get-cert-from"
 msgstr "Вы можете сгенерировать новый сертификат, используя ключи --gen-cert-by и --get-cert-from"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:50
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:51
 msgid "Certificate not send!"
 msgstr "Сертификат не отправлен!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:53
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:54
 #, python-format
 msgid " Your certifitate id - %d"
 msgstr "Номер Вашего сертификата - %d"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:56
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:57
 msgid "expiry date certificate has passed"
 msgstr "Время жизни сертификата истекло"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:59
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:60
 #, python-format
 msgid "shelf life expires after %d days"
 msgstr "Время жизни сертификата истекает через %d дней"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:71
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:72
 msgid " New Session"
 msgstr "Новая сессия"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:72
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:73
 msgid " Old Session"
 msgstr "Старая сессия"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:73
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:74
 #, python-format
 msgid " Your session id = %s"
 msgstr "Номер Вашей сессии = %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:119
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:120
-msgid "Password: "
-msgstr "Пароль: "
-
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:121
-msgid "Repeat: "
-msgstr "Повтор: "
-
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:129
-msgid "Passwords do not match"
-msgstr "Пароли не совпадают"
-
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:137
 msgid "You have sent a request to sign the certificate."
 msgstr "У Вас уже есть отправленный запрос на подписание сертификата."
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:138
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:121
 #, python-format
 msgid "request id - %s"
 msgstr "Номер запроса - %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:139
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:122
 msgid "Send new request? y/[n]: "
 msgstr "Отправить навый запрос на подпись сертификата? y/[n]: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:144
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:127
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:194
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:177
 msgid "connect..."
 msgstr "подключение..."
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:150
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:133
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:201
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:184
 msgid "Close. Connecting Error."
 msgstr "Ошибка соединения. Закрываюсь."
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:151
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:134
 #, python-format
 msgid "Error: %s"
 msgstr "Ошибка: %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:160
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:143
 msgid "secret key and request exists"
 msgstr "секретный ключ и запрос на подпись сертификата созданы"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:161
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:144
 msgid "Create new secret key and request? y/[n]: "
 msgstr "Создать новые Секретный Ключ и Запрос на подпись сертификата? y/[n]: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:176
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:159
 msgid "This server can not sign certificate!"
 msgstr "Сервер не подписал сертификат!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:181
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:164
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:223
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:206
 #, python-format
 msgid "Your request id - %s"
 msgstr "Номер Вашего запроса - %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:186
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:169
 #, python-format
 msgid "request was not sent or deleted file %s"
 msgstr "Запрос не был послан или удалён файл %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:207
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:190
 #, python-format
 msgid "Request %s not found on client side"
 msgstr "Запрос %s не найден на стороне клиента"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:219
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:202
 msgid "Request to sign is rejected!"
 msgstr "Запрос на подпись сертификата отвергнут!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:222
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:205
 msgid "Request for the signing has not yet reviewed."
 msgstr "Запрос на подписание сертификата ещё не рассмотрен."
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:226
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:209
 msgid "Request on signature does not match sent earlier."
 msgstr "Запрос или подпись не соответствуют отправленным ранее."
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:229
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:212
 msgid "Request was sent from another ip."
 msgstr "Запрос был послан с другого адреса."
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:296
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:279
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:169
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:170
 msgid "Not found field \"CN\" in certificate!"
 msgstr "Не найдено поле \"CN\" в сертификате!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:309
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:292
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:179
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:180
 msgid "filename = "
 msgstr "Имя файла ="
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:310
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:293
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:180
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:181
 msgid "CERTIFICATE ADD"
 msgstr "Сертификат добавлен"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:312
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:295
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:182
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:183
 msgid "file with ca certificates exists"
 msgstr "Файл с сертификатом удостоверяющего центра создан"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:324
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:307
 msgid "You do not have a certificate. Use key --gen-cert-by HOST for generate new request or key --get-cert-from HOST for get new certificate from server."
 msgstr "У Вас нет сертификата. Используйте ключ --gen-cert-by HOST для генерации запроса на сертитфикат или ключ --get-cert-from HOST чтобы забрать сертификат с сервера."
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:97
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:98
 msgid "Certificate not found in client"
 msgstr "Сертификат не найден на стороне клиента"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:106
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:107
 msgid "Error open file"
 msgstr "Ошибка при открытии файла"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:192
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:193
 msgid "Server certificate is not valid"
 msgstr "Сертификат сервера недействителен!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:196
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:197
 msgid "CA not found on server"
 msgstr "Сертификат Центра Авторизации не найден на сервере"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:203
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:204
 msgid "Error. Certificate not added to trusted"
 msgstr "Ошибка! Сертификат не добавлен в доверенные"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:205
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:206
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:228
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:229
 #, python-format
 msgid "Fingerprint = %s"
 msgstr "Отпечаток = %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:206
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:207
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:229
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:230
 msgid "Serial Number = "
 msgstr "Серийный номер = "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:208
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:209
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:231
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:232
 msgid "Issuer"
 msgstr "Подписчик"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:212
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:213
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:235
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:236
 msgid "Subject"
 msgstr "Субъект"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:215
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:216
 msgid "Add CA certificates to trusted? y/[n]:"
 msgstr "Добавить сертификат Центра Авторизации в доверенные? y/[n]:"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:220
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:221
 msgid "Certificate not added to trusted"
 msgstr "Сертификат не добавлен в доверенные"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:225
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:226
 msgid "Untrusted Server Certificate!"
 msgstr "Недоверенный сертификат сервера!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:239
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:240
 msgid "Add this Servers certificate to trusted (s) or"
 msgstr "Добавить сертификат этого сервера в доверенные (s) или"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:240
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:241
 msgid "Try add CA and ROOT certificates to trusted (c) or"
 msgstr "Попытаться добавить сертификат ЦА и корневой в доверенные (c) или"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:241
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:242
 msgid "Quit (q)? s/c/[q]: "
 msgstr "Выйти (q)? s/c/[q]: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:289
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:290
 msgid "Try add CA and ROOT certificates"
 msgstr "Добавить Корневой и сертификат ЦА"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:414
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:415
 msgid "This server is not trusted"
 msgstr "Сервер не является доверенным"
 
+#~ msgid "Time"
+#~ msgstr "Время"
+
+#~ msgid "Error"
+#~ msgstr "Ошибка"
+
+#~ msgid "Warning"
+#~ msgstr "Предепреждение"
+
+#~ msgid "Password for %s: "
+#~ msgstr "Пароль для %s: "
+
+#~ msgid "Repeat password for %s: "
+#~ msgstr "Повтор пароля для %s: "
+
+#~ msgid "Password: "
+#~ msgstr "Пароль: "
+
+#~ msgid "Repeat: "
+#~ msgstr "Повтор: "
+
+#~ msgid "Passwords do not match"
+#~ msgstr "Пароли не совпадают"
+
 #~ msgid "client use %s"
 #~ msgstr "клиент использует %s"