diff --git a/console/application/cert_func.py b/console/application/cert_func.py index 8d2b786..84c09a6 100644 --- a/console/application/cert_func.py +++ b/console/application/cert_func.py @@ -40,10 +40,10 @@ def client_post_cert (client, clVars, show_info = False): result_sid = _result_sid[1].integer if result_post_cert[0] == -4: - print _("Certificate not found in the server") - print _('client use certificate %s') %client.CERT_FILE - print _('You can generate a new certificate using the keys ' - '--gen-cert-by and --get-cert-from') + print _("Certificate not found on the server") + print _('client uses certificate %s') %client.CERT_FILE + print _('You can generate a new certificate using --gen-cert-by and '\ + '--get-cert-from') raise Exception(3) # client_sid(sid, client, cert_id = results[0][0], clVars = clVars) @@ -71,7 +71,7 @@ def client_post_cert (client, clVars, show_info = False): if result_sid[1] == 1: print _(" New Session") else: print _(" Old Session") - print _(" Your session id = %s") %sid + print _(" Your session ID = %s") %sid #Creation of secret key of the client def new_key_req(key, cert_path, server_host_name, private_key_passwd = None, \ @@ -117,7 +117,8 @@ def delete_old_cert(client): def client_post_request (cert_path, args): if os.path.exists(cert_path + 'req_id'): - print _("You have already sent a request to sign the certificate.") + print \ + _("You have already sent a signature request for the certificate.") _print (_("Request ID = %s") %open(cert_path + 'req_id', 'r').read()) ans = raw_input (_("Send a new request? y/[n]: ")) if not ans.lower() in ['y','yes']: @@ -140,8 +141,8 @@ def client_post_request (cert_path, args): key = os.path.join(cert_path, server_host_name + '.key') csr_file = os.path.join(cert_path, server_host_name +'.csr') if os.path.exists(key) and os.path.exists(csr_file): - print _('secret key and request now exist') - ask = raw_input(_("Create a new secret key and request? y/[n]: ")) + print _('private key and request now exist') + ask = raw_input(_("Create a new private key and request? y/[n]: ")) if ask.lower() in ['y','yes']: passwd = get_password() new_key_req(key, cert_path, server_host_name, @@ -213,7 +214,7 @@ def client_get_cert(cert_path, args): '\n'+'cl-core --sign-client ID_CLIENT_REQUEST' return 1 elif cert == '3': - print _("Signature request does not match earlier data.") + print _("Signature request not matching earlier data.") return 1 elif cert == '4': print _("The request was sent from another IP.") @@ -226,7 +227,7 @@ def client_get_cert(cert_path, args): os.unlink(cert_path + 'req_id') except OSError, e: _print (e.message) - print _('Certificate save. Your certificate id - %s') %req_id + print _('Certificate saved. Your certificate ID: %s') %req_id user_name = pwd.getpwuid(os.getuid()).pw_name try: pwdObj = pwd.getpwnam(user_name) @@ -311,9 +312,9 @@ def client_post_auth(client): pass#client_post_cert(client) else: #client_post_request(client) - print _("You do not have a certificate. Use --gen-cert-by HOST to"\ - " generate new request or --get-cert-from HOST to get a "\ - "new certificate from the server.") + print _("You do not have a certificate. Use --gen-cert-by HOST " + "to generate a new request or --get-cert-from HOST to " + "get a new certificate from the server.") raise Exception(1) # print client.service.versions(sid, VERSION) except VerifyError, e: diff --git a/console/application/cert_verify.py b/console/application/cert_verify.py index 8baf9d0..f885ffa 100644 --- a/console/application/cert_verify.py +++ b/console/application/cert_verify.py @@ -76,7 +76,7 @@ def verify(server_cert, crl_path, flag): for rvk in revoked_objects: if serverSerial == int(rvk.get_serial(), 16): - print _("This certificate is revoked!") + print _("This certificate has been revoked!") print _("Serial")+ ': %s\n' %rvk.get_serial() + _("Revoke date") + \ ': %s' %rvk.get_rev_date() @@ -271,7 +271,8 @@ def rm_ca_from_trusted(ca_cert): if ca_cert != cert: new_user_ca_certs.append(cert) else: - print _("CA certificate deleted from user trusted certificate") + print _("CA certificate deleted from the list of user " \ + "trusted certificates") fd = open(user_ca_db, 'w') for cert in new_user_ca_certs: @@ -290,8 +291,8 @@ def rm_ca_from_trusted(ca_cert): if ca_cert != cert: new_system_ca_certs.append(cert) else: - print \ - _("CA certificate deleted from system trusted certificates") + print _("CA certificate deleted from the list of system " \ + "trusted certificates") fd = open(system_ca_db, 'w') for cert in new_system_ca_certs: diff --git a/console/application/cl_client.py b/console/application/cl_client.py index 2176fc1..d09b675 100644 --- a/console/application/cl_client.py +++ b/console/application/cl_client.py @@ -188,7 +188,7 @@ def https_server(client, args, unknown_args, url, clVarsCore, wait_thread): find_flag = True break if not find_flag: - _print (_('Not found method for %s') %sym_link) + _print (_('Method not found for %s') %sym_link) if args.stop_consoled: wait_thread.stop() @@ -265,7 +265,7 @@ def https_server(client, args, unknown_args, url, clVarsCore, wait_thread): if result in [0,2]: print _('Process terminated') elif result == -1: - print _("Certificate not found in the server") + print _("Certificate not found on the server") elif result == -2: print _("Session not matching your certificate") elif result == 1: diff --git a/console/application/function.py b/console/application/function.py index 06dfc2a..1469668 100644 --- a/console/application/function.py +++ b/console/application/function.py @@ -522,7 +522,7 @@ def print_progressbar(returnProgr, pbar, last_msg = None, error = False): def print_progress(returnProgr, last_msg = None, error = False): if error: - cout_progress (red + '\n'+_("Error task by %s") \ + cout_progress (red + '\n'+_("Task error by %s") \ %str(0 - returnProgr.percent).rjust(5) + '%\n') return '' elif returnProgr.long_message: diff --git a/console/application/methods_func.py b/console/application/methods_func.py index cef0403..ea86c16 100644 --- a/console/application/methods_func.py +++ b/console/application/methods_func.py @@ -76,7 +76,7 @@ def parse(): parser.add_argument( '--session-list', action='store_true', default=False, dest='session_list', - help=_("view the active session list on the server")) + help=_("view the active sessions list on the server")) parser.add_argument( '--update-crl', action='store_true', default=False, dest='update_crl', help=_("update the revocation list")) @@ -85,10 +85,10 @@ def parse(): dest='stop_consoled', help=_("stop cl-consoled")) parser.add_argument( '--no-progress', action='store_true', default=False, - dest = 'no_progress', help=_('do not display progress bar')) + dest = 'no_progress', help=_('do not display the progress bar')) parser.add_argument( '-f', '--force', action='store_true', default=False, - dest = 'no_questions', help=_('no questions during the process')) + dest = 'no_questions', help=_('silent during the process')) return parser def get_view(client, method, sid, view_params): diff --git a/console/application/pid_information.py b/console/application/pid_information.py index 29998a1..b4c31b6 100644 --- a/console/application/pid_information.py +++ b/console/application/pid_information.py @@ -100,11 +100,11 @@ def client_list_methods(client): TR_METH = 2 # Translate method name results = client.service.get_methods(client.sid, client_types) if not results: - print _('no methods available') + print _('No methods available') return 1 try: if results[DAT][RES][RES][COM] == '0': - print _('no methods available') + print _('No methods available') return 1 except: pass @@ -129,7 +129,7 @@ def client_pid_kill(client, pid): elif result == 3: print _("Process not found") elif result == -1: - print _("Certificate not found in the server") + print _("Certificate not found on the server") elif result == -2: print _("Session not matching your certificate") elif result == 1: diff --git a/console/application/sid_func.py b/console/application/sid_func.py index f2f0527..c7ce0d2 100644 --- a/console/application/sid_func.py +++ b/console/application/sid_func.py @@ -32,7 +32,7 @@ setLocalTranslate('calculate_console',sys.modules[__name__]) # if new_sid[0][1] == 1: # print _(" New Session") # else: print _(" Old Session") -# print _(" Your session id = %s") %sid +# print _(" Your session ID = %s") %sid def client_del_sid(client): """ delete this session """ @@ -66,7 +66,7 @@ def sid_inf(client, sid): """ get information about selected session """ s = client.service.sid_info(sid) if s[0][0] == "-1": - print red + _("This session not registered on the server!") + print red + _("Session non registered on the server!") return -1 if s[0][0] == "-2": print red + _("Failed to obtain certificate data!") @@ -115,7 +115,7 @@ def client_session_list(client): print green + session_id print return 0 - print red + _('No active session on the server') + print red + _('No active sessions on the server') def session_clean(client): try: @@ -127,6 +127,6 @@ def session_clean(client): else: print e if res: - print _('Error clearing session cache') + print _('Error clearing the session cache') else: print _('Session cache cleared') diff --git a/ru/calculate_console.po b/ru/calculate_console.po index 5725f0d..ce6a1c3 100644 --- a/ru/calculate_console.po +++ b/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-07-09 09:43+0300\n" -"PO-Revision-Date: 2012-07-09 09:44+0300\n" +"POT-Creation-Date: 2012-07-18 10:04+0300\n" +"PO-Revision-Date: 2012-07-18 10:04+0300\n" "Last-Translator: Denis Spiridonov \n" "Language-Team: \n" "Language: \n" @@ -43,12 +43,12 @@ msgid "Process active" msgstr "Процесс активен" #: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:41 -#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:124 +#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:126 msgid "Process completed" msgstr "Процесс завершён" #: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:43 -#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:126 +#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:128 msgid "Process killed" msgstr "Процесс убит" @@ -64,7 +64,7 @@ msgstr "Ошибка списка процессов с сервера" #: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:103 #: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:107 -msgid "no methods available" +msgid "No methods available" msgstr "Нет доступных методов" #: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:111 @@ -75,22 +75,22 @@ msgstr "Вы можете запускать:" msgid "use" msgstr "используйте ключ" -#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:128 +#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:130 msgid "Process not found" msgstr "Процесс не найден" -#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:130 +#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:132 #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:268 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:43 -msgid "Certificate not found in the server" +msgid "Certificate not found on the server" msgstr "Не найден сертификат на сервере" -#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:132 +#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:134 #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:270 msgid "Session not matching your certificate" msgstr "Сессия не соответствует Вашему сертификату" -#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:134 +#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:136 #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:272 msgid "Failed to kill the process" msgstr "Не удалось завершить процесс" @@ -101,7 +101,7 @@ msgid "fields CN and L in the CA certificate are incorrect!" msgstr "поля CN и L в сертификате CA некорректны!" #: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:79 -msgid "This certificate is revoked!" +msgid "This certificate has been revoked!" msgstr "Данный сертификат отозван!" #: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:80 @@ -125,11 +125,11 @@ msgid "CRL added" msgstr "CRL добавлен" #: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:274 -msgid "CA certificate deleted from user trusted certificate" +msgid "CA certificate deleted from the list of user trusted certificates" msgstr "Сертификат Центра авторизации удалён из пользовательского списка доверенных сертификатов" #: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:294 -msgid "CA certificate deleted from system trusted certificates" +msgid "CA certificate deleted from the list of system trusted certificates" msgstr "Сертификат Центра авторизации удалён из системного списка доверенных сертификатов" #: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:47 @@ -201,7 +201,7 @@ msgstr "Процесс не существует или принадлежит #: /var/calculate/mydir/git/calculate-console/console/application/function.py:525 #, python-format -msgid "Error task by %s" +msgid "Task error by %s" msgstr "Ошибка задачи на %s" #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:60 @@ -210,7 +210,7 @@ msgstr "нет соединения с сервером!" #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:191 #, python-format -msgid "Not found method for %s" +msgid "Method not found for %s" msgstr "Не найден метод для %s" #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:266 @@ -234,7 +234,7 @@ msgstr "Ошибка: " #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:440 #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:501 #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:522 -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:175 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:166 msgid "Interrupted by the user" msgstr "Прервано пользователем" @@ -249,105 +249,105 @@ msgid "Exception: %s" msgstr "Исключение: %s" #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:435 -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:106 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:98 msgid "Failed to connect" msgstr "Не удалось подключиться" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:40 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:32 msgid "show this help message and exit" msgstr "просмотр данной справки и выход" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:42 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:34 msgid "call method" msgstr "вызов метода" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:45 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:37 msgid "language for translation" msgstr "язык для перевода" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:48 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:40 msgid "port number" msgstr "номер порта" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:51 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:43 msgid "destination host" msgstr "хост назначения" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:55 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:47 msgid "post a request on the server for the certificate to be signed" msgstr "послать запрос подписания сертификата на сервер" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:58 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:50 msgid "get the signed certificate from the server" msgstr "забрать подписанный сертификат с сервера" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:61 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:53 msgid "path to the cert and key files" msgstr "путь к файлам сертификата и ключа" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:64 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:56 msgid "view the list of running processes" msgstr "просмотр списка запущенных процессов" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:67 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:59 msgid "dump (to be used with --list-pid)" msgstr "дамп (используйте с ключом --list-pid)" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:70 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:62 msgid "view the result of the process" msgstr "просмотр результата работы процесса" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:73 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:65 msgid "kill the selected process" msgstr "завершить выбранный процесс" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:76 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:68 msgid "clear the session cache" msgstr "очистить кэш сессии" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:79 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:71 msgid "view the session information" msgstr "просмотр информации о сессии" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:83 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:75 msgid "view information about session = SID" msgstr "Просмотр информации о сессии с номером SID" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:87 -msgid "view the active session list on the server" +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:79 +msgid "view the active sessions list on the server" msgstr "просмотр списка активных сессий на сервере" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:90 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:82 msgid "update the revocation list" msgstr "обновить список отзыва сертификатов" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:93 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:85 msgid "stop cl-consoled" msgstr "остановить cl-consoled" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:96 -msgid "do not display progress bar" +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:88 +msgid "do not display the progress bar" msgstr "не отображать прогрессбар" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:99 -msgid "no questions during the process" +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:91 +msgid "silent during the process" msgstr "не задавать вопросы во время процесса" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:129 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:121 msgid "Unknown parameter" msgstr "Неизвестный параметр" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:140 -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:183 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:131 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:174 msgid "Method not available" msgstr "Метод не доступен" -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:151 -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:193 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:142 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:184 msgid "Wrong option " msgstr "Ошибка в параметре " -#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:169 +#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:160 msgid "Run the process? (yes/no): " msgstr "Запустить процесс? (yes/no): " @@ -375,7 +375,7 @@ msgid "SID deletion error" msgstr "Ошибка удаления сессии на сервере" #: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:69 -msgid "This session not registered on the server!" +msgid "Session non registered on the server!" msgstr "Данная сессия не зарегистрирована на сервере!" #: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:78 @@ -399,6 +399,7 @@ msgstr "Дата подписания сертификата - %s" #: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:94 #: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:107 +#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:126 msgid "Access Forbidden!" msgstr "Доступ запрещён!" @@ -407,24 +408,24 @@ msgid "Active sessions on the server: " msgstr "Активные сессии на сервере:" #: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:118 -msgid "No active session on the server" +msgid "No active sessions on the server" msgstr "Нет активных сессий на сервере" -#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:126 -msgid "Error clearing session cache" +#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:130 +msgid "Error clearing the session cache" msgstr "Ошибка очистки кэша сессии" -#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:128 +#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:132 msgid "Session cache cleared" msgstr "Кэш сессии очищен" #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:44 #, python-format -msgid "client use certificate %s" +msgid "client uses certificate %s" msgstr "клиент использует сертификат %s" #: /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" +msgid "You can generate a new certificate using --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:51 @@ -455,116 +456,116 @@ msgstr "Предыдущая сессия" #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:74 #, python-format -msgid " Your session id = %s" +msgid " Your session ID = %s" msgstr "Номер Вашей сессии = %s" -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:120 -msgid "You have already sent a request to sign the certificate." +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:121 +msgid "You have already sent a signature request for the certificate." msgstr "У Вас уже есть отправленный запрос на подписание сертификата." -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:121 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:122 #, python-format msgid "Request ID = %s" msgstr "Номер запроса = %s" -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:122 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:123 msgid "Send a new request? y/[n]: " msgstr "Отправить навый запрос на подпись сертификата? y/[n]: " -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:127 -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:179 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:128 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:180 msgid "connecting..." msgstr "подключение..." -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:133 -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:186 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:134 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:187 msgid "Closing. Connection error." msgstr "Ошибка соединения. Закрываюсь." -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:134 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:135 #, python-format msgid "Error: %s" msgstr "Ошибка: %s" -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:143 -msgid "secret key and request now exist" +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:144 +msgid "private key and request now exist" msgstr "секретный ключ и запрос на подпись сертификата созданы" -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:144 -msgid "Create a new secret key and request? y/[n]: " +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:145 +msgid "Create a new private key and request? y/[n]: " msgstr "Создать новые секретный ключ и запрос на подпись сертификата? y/[n]: " -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:159 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:160 msgid "This server has not signed the certificate!" msgstr "Сервер не подписал сертификат!" -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:164 -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:211 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:165 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:212 #, python-format msgid "Your request ID = %s" msgstr "Номер Вашего запроса = %s" -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:165 -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:212 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:166 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:213 msgid "To sign the certificate in the server use command" msgstr "Для подписания сертификата на сервере используется команда" -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:171 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:172 #, python-format msgid "Request not sent or file %s deleted" msgstr "Запрос не был послан или удалён файл %s" -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:192 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:193 #, python-format msgid "Request %s not found on the client's side" 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:208 msgid "Request to sign is rejected!" msgstr "Запрос на подпись сертификата отвергнут!" -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:210 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:211 msgid "Signature request not reviewed yet." msgstr "Запрос на подписание сертификата ещё не рассмотрен." -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:216 -msgid "Signature request does not match earlier data." +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:217 +msgid "Signature request not matching earlier data." msgstr "Запрос или подпись не соответствуют отправленным ранее." -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:219 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:220 msgid "The request was sent from another IP." msgstr "Запрос был послан с другого адреса." -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:229 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:230 #, python-format -msgid "Certificate save. Your certificate id - %s" +msgid "Certificate saved. Your certificate ID: %s" msgstr "Сертификат сохранён. Номер вашего сертификата - %s" -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:286 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:287 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:170 msgid "Field \"CN\" not found in the certificate!" msgstr "Не найдено поле \"CN\" в сертификате!" -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:299 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:300 #: /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:300 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:301 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:181 msgid "Certificate added" msgstr "Сертификат добавлен" -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:302 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:303 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:183 msgid "A file with CA certificates now exists" msgstr "Файл с сертификатом удостоверяющего центра создан" -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:314 -msgid "You do not have a certificate. Use --gen-cert-by HOST to generate new request or --get-cert-from HOST to get a new certificate from the server." +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:315 +msgid "You do not have a certificate. Use --gen-cert-by HOST to generate a new request or --get-cert-from HOST to get a new certificate from the server." msgstr "У Вас нет сертификата. Используйте ключ --gen-cert-by HOST для генерации запроса на сертитфикат или ключ --get-cert-from HOST чтобы забрать сертификат с сервера." -#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:386 +#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:387 msgid "Password: " msgstr "Пароль: " @@ -641,339 +642,3 @@ msgstr "Добавить Корневой и сертификат ЦА" msgid "This server is not trusted" msgstr "Сервер не является доверенным" -#~ msgid "Running sessions:" -#~ msgstr "Запущенные сессии:" - -#~ msgid "Process name - %s" -#~ msgstr "Имя процесса - %s" - -#~ msgid "Process id - %s" -#~ msgstr "Идентификатор процесса - %s" - -#~ msgid "Process started %s" -#~ msgstr "Процесс запущен %s" - -#~ msgid "Process is active" -#~ msgstr "Процесс активен" - -#~ msgid "Process has been completed" -#~ msgstr "Процесс завершён" - -#~ msgid "Not found pid for this session!" -#~ msgstr "Не найдены процессы для вашей сессии!" - -#~ msgid "Server get pids error" -#~ msgstr "Ошибка списка процессов с сервера" - -#~ msgid "use key" -#~ msgstr "используйте ключ" - -#~ msgid "Execute sessions:" -#~ msgstr "Запущенные сессии:" - -#~ msgid "Process is completed" -#~ msgstr "Процесс завершён" - -#~ msgid "Session doesn't belong to your certificate" -#~ msgstr "Сессия не соответствует Вашему сертификату" - -#~ msgid "It was not possible to kill process" -#~ msgstr "Не удалось завершить процесс" - -#~ msgid "field CN and L in CA certificate are incorrect!" -#~ msgstr "поля CN и L в сертификате CA некорректны!" - -#~ msgid "error creating directory %s" -#~ msgstr "Ошибка при создании директории %s" - -#~ msgid "CRL add" -#~ msgstr "CRL добавлен" - -#~ msgid "CA certificate delete from user trusted certificate" -#~ msgstr "" -#~ "Сертификат Центра Авторизации удалён из пользовательского списка " -#~ "доверенных сертификатов" - -#~ msgid "CA certificate delete from system trusted certificate" -#~ msgstr "" -#~ "Сертификат Центра Авторизации удалён из системного списка доверенных " -#~ "сертификатов" - -#~ msgid "Enter certificate data by hand? y/[n]: " -#~ msgstr "Ввести данные сертификата вручную? y/[n]: " - -#~ msgid "Country (2 words): [%s]" -#~ msgstr "Страна (2 символа): [%s]" - -#~ msgid "Clear Cache error! " -#~ msgstr "Ошибка очистки кэша!" - -#~ msgid "server send pid = " -#~ msgstr "сервер послал идентификатор процесса = " - -#~ msgid "Process not exist or not belong to your session" -#~ msgstr "Процесс не существует или принадлежит не вашей сессии" - -#~ msgid "no connection to server!" -#~ msgstr "нет соединения с сервером!" - -#~ msgid "Process is terminated" -#~ msgstr "Процесс завершён" - -#~ msgid "cannot create directory %s" -#~ msgstr "Не удалось создать директорию %s" - -#~ msgid "Password is invalid" -#~ msgstr "Неверный пароль" - -#~ msgid "language for translate" -#~ msgstr "язык для перевода" - -#~ msgid "host destination" -#~ msgstr "хост назначения" - -#~ msgid "post request a signed certificate by server" -#~ msgstr "послать запрос подписания сертификата на сервер" - -#~ msgid "get signed certificate from server" -#~ msgstr "забрать подписанный сертификат с сервера" - -#~ msgid "path to cert and key files" -#~ msgstr "путь к файлам сертификата и ключа" - -#~ msgid "view a list of running processes" -#~ msgstr "просмотр списка запущенных процессов" - -#~ msgid "dump (using with key --list-pid)" -#~ msgstr "дамп (используйте с ключом --list-pid)" - -#~ msgid "view result of process" -#~ msgstr "просмотр результата работы процесса" - -#~ msgid "kill selected process" -#~ msgstr "завершить выбранный процесс" - -#~ msgid "clear cache session" -#~ msgstr "очистить кэш сессии" - -#~ msgid "view session information" -#~ msgstr "просмотр информации о сессии" - -#~ msgid "view information about session with sid = SID" -#~ msgstr "Просмотр информации о сессии с номером SID" - -#~ msgid "view list active session on server" -#~ msgstr "просмотр списка активных сессий на сервере" - -#~ msgid "update the certificate revocation lists" -#~ msgstr "обновить список отзыва сертификатов" - -#~ msgid "method is not available" -#~ msgstr "Метод не доступен" - -#~ msgid "Error in parameter " -#~ msgstr "Ошибка в параметре " - -#~ msgid "Run process? (yes/no): " -#~ msgstr "Запустить процесс? (yes/no): " - -#~ msgid "Interrupted by user" -#~ msgstr "Прервано пользователем" - -#~ msgid "No access to file!" -#~ msgstr "Нет доступа к файлу!" - -#~ msgid "Permission denied %s" -#~ msgstr "Доступ запрещён %s" - -#~ msgid "Sid Deleted!" -#~ msgstr "Сессия удалена!" - -#~ msgid "Server delete sid error" -#~ msgstr "Ошибка удаления сессии на сервере" - -#~ msgid "This session not registered on server!" -#~ msgstr "Данная сессия не зарегистрирована на сервере!" - -#~ msgid "Session number - %s" -#~ msgstr "Номер сессии = %s" - -#~ msgid "Certificate number - %s" -#~ msgstr "Номер сертификата - %s" - -#~ msgid "Active session on server: " -#~ msgstr "Активные сессии на сервере:" - -#~ msgid "No active session on server" -#~ msgstr "нет активных сессий на сервере" - -#~ msgid "Session cache is cleared" -#~ msgstr "Кэш сессии очищен" - -#~ msgid " Your certifitate id - %d" -#~ msgstr "Номер Вашего сертификата - %d" - -#~ msgid "expiry date certificate has passed" -#~ msgstr "Время жизни сертификата истекло" - -#~ msgid "shelf life expires after %d days" -#~ msgstr "Время жизни сертификата истекает через %d дней" - -#~ msgid "You have sent a request to sign the certificate." -#~ msgstr "У Вас уже есть отправленный запрос на подписание сертификата." - -#~ msgid "request id - %s" -#~ msgstr "Номер запроса - %s" - -#~ msgid "Send new request? y/[n]: " -#~ msgstr "Отправить навый запрос на подпись сертификата? y/[n]: " - -#~ msgid "connect..." -#~ msgstr "подключение..." - -#~ msgid "Close. Connecting Error." -#~ msgstr "Ошибка соединения. Закрываюсь." - -#~ msgid "secret key and request exists" -#~ msgstr "секретный ключ и запрос на подпись сертификата созданы" - -#~ msgid "Create new secret key and request? y/[n]: " -#~ msgstr "" -#~ "Создать новые Секретный Ключ и Запрос на подпись сертификата? y/[n]: " - -#~ msgid "This server can not sign certificate!" -#~ msgstr "Сервер не подписал сертификат!" - -#~ msgid "Your request id - %s" -#~ msgstr "Номер Вашего запроса - %s" - -#~ msgid "request was not sent or deleted file %s" -#~ msgstr "Запрос не был послан или удалён файл %s" - -#~ msgid "Request %s not found on client side" -#~ msgstr "Запрос %s не найден на стороне клиента" - -#~ msgid "Request for the signing has not yet reviewed." -#~ msgstr "Запрос на подписание сертификата ещё не рассмотрен." - -#~ msgid "Request on signature does not match sent earlier." -#~ msgstr "Запрос или подпись не соответствуют отправленным ранее." - -#~ msgid "Request was sent from another ip." -#~ msgstr "Запрос был послан с другого адреса." - -#~ msgid "Not found field \"CN\" in certificate!" -#~ msgstr "Не найдено поле \"CN\" в сертификате!" - -#~ msgid "CERTIFICATE ADD" -#~ msgstr "Сертификат добавлен" - -#~ msgid "file with ca certificates exists" -#~ msgstr "Файл с сертификатом удостоверяющего центра создан" - -#~ 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 чтобы забрать " -#~ "сертификат с сервера." - -#~ msgid "Certificate not found in client" -#~ msgstr "Сертификат не найден на стороне клиента" - -#~ msgid "Error open file" -#~ msgstr "Ошибка при открытии файла" - -#~ msgid "Server certificate is not valid" -#~ msgstr "Сертификат сервера недействителен!" - -#~ msgid "CA not found on server" -#~ msgstr "Сертификат Центра Авторизации не найден на сервере" - -#~ msgid "Add CA certificates to trusted? y/[n]:" -#~ msgstr "Добавить сертификат Центра Авторизации в доверенные? y/[n]:" - -#~ msgid "Untrusted Server Certificate!" -#~ msgstr "Недоверенный сертификат сервера!" - -#~ msgid "Add this Servers certificate to trusted (s) or" -#~ msgstr "Добавить сертификат этого сервера в доверенные (s) или" - -#~ msgid "Try add CA and ROOT certificates to trusted (c) or" -#~ msgstr "Попытаться добавить сертификат ЦА и корневой в доверенные (c) или" - -#~ msgid "Try add CA and ROOT certificates" -#~ msgstr "Добавить Корневой и сертификат ЦА" - -#~ msgid "Certificate not found in Server Database!" -#~ msgstr "Сертификат не найден в базе сервера!" - -#~ msgid "Time" -#~ msgstr "Время" - -#~ msgid "client use %s" -#~ msgstr "клиент использует %s" - -#~ msgid "Add certificate to server Database..." -#~ msgstr "Добавление сертификата в БД сервера..." - -#~ msgid "Certificate not found in server database!" -#~ msgstr "Сертификат не найден в БД сервера!" - -#, fuzzy -#~ msgid "Session doesn't belong to your certificate!" -#~ msgstr "Сессия не соответствует Вашему сертификату" - -#, fuzzy -#~ msgid "It was not possible to kill process!" -#~ msgstr "Не удалось завершить процесс" - -#, fuzzy -#~ msgid "Process kill" -#~ msgstr "Процесс убит" - -#~ msgid "Error" -#~ msgstr "Ошибка" - -#~ msgid "Warning" -#~ msgstr "Предепреждение" - -#~ msgid "Password for %s: " -#~ msgstr "Пароль для %s: " - -#~ msgid "Repeat password for %s: " -#~ msgstr "Повтор пароля для %s: " - -#~ msgid "Repeat: " -#~ msgstr "Повтор: " - -#~ msgid "Passwords do not match" -#~ msgstr "Пароли не совпадают" - -#~ msgid "Your certificate ID = %s" -#~ msgstr "Номер Вашего сертификата = %s" - -#~ msgid "Certificate not found in the server database" -#~ msgstr "Сертификат не найден в БД сервера" - -#~ msgid " Your session ID = %s" -#~ msgstr "Номер Вашей сессии = %s" - -#~ msgid "Certificate not found in the server database!" -#~ msgstr "Сертификат не найден в БД сервера!" - -#~ msgid "CERTIFICATE ADDED" -#~ msgstr "Сертификат добавлен" - -#~ msgid "Certificate not found in server database" -#~ msgstr "Сертификат не найден в БД сервера" - -#, fuzzy -#~ msgid "Session does not match your certificate" -#~ msgstr "Сессия не соответствует Вашему сертификату" - -#, fuzzy -#~ msgid "Failed to kill process" -#~ msgstr "Не удалось завершить процесс"