add wait_thread

console/application/cert_func.py

@@ -43,7 +43,7 @@ def client_post_cert (client, clVars, show_info = False):
         print ip, mac, client_type
         cert_id = client.service.cert_add(mac, client_type)
         print _("Your certificate ID = %s") %cert_id
-        sys.exit(1)
+        raise Exception(1)
     client_sid(sid, client, cert_id = results[0][0], clVars = clVars)
     if results[0][0] == -3:
         print _("Certificate not send!")
@@ -310,11 +310,11 @@ def client_post_auth(client):
             print _("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.")
-            sys.exit()
+            raise Exception(1)
 #        print client.service.versions(sid, VERSION)
     except VerifyError, e:
         print e.value
-        sys.exit()
+        raise Exception(1)
         
 ########## Get password
 def getRunProc():

console/application/cert_verify.py

@@ -96,13 +96,13 @@ def get_CRL(path_to_cert):
                     os.makedirs(path_to_cert)
                 except OSError:
                     print _("error creating directory %s") %path_to_cert
-                    sys.exit()
+                    raise Exception(1)
             try:
                 os.makedirs(os.path.join(path_to_cert, 'ca'))
             except OSError:
                 print _("error creating directory %s") \
                         %(os.path.join(path_to_cert, 'ca'))
-                sys.exit()
+                raise Exception(1)
         os.makedirs(CRL_path)
     
     clVars = DataVarsCore()
@@ -156,7 +156,7 @@ def get_CRL(path_to_cert):
             except VerifyError, e:
                 print e.value
                 #rm_ca_from_trusted(ca)
-                sys.exit()
+                raise Exception(1)
             except:
                 pass
             if 'new_crl' in locals():

console/application/cl_client.py

@@ -60,7 +60,7 @@ def client_signal(client):
             client.service.active_client(sid)
         except:
             print _('no connection to server!')
-            sys.exit()
+            raise Exception(1)
         time.sleep(float(client_active))
 
 def test(client, com=None):
@@ -185,23 +185,28 @@ def parse():
         dest='stop_consoled', help=_("stop cl-consoled"))
     return parser
 
-def https_server(client, args, unknown_args, url, clVarsCore):
+def https_server(client, args, unknown_args, url, clVarsCore, wait_thread):
     client_post_auth(client)
 
     if args.stop_consoled:
+        wait_thread.stop()
         os.system('cl-consoled --stop')
         return 0
 
     if args.session_clean:
+        wait_thread.stop()
         session_clean(client)
 
     if args.session_info or args.session_num_info:
+        wait_thread.stop()
         client_session_info(client, args.session_num_info)
 
     if args.session_list:
+        wait_thread.stop()
         client_session_list(client)
 
     if args.list_pid:
+        wait_thread.stop()
         if args.dump:
             from pid_information import client_pid_info
             client_pid_info(client)
@@ -210,14 +215,17 @@ def https_server(client, args, unknown_args, url, clVarsCore):
             client_list_pid(client)
 
     if args.pid_res:
+        wait_thread.stop()
         get_entire_frame(client, args.pid_res)
         return 0
 
     if args.pid_kill:
+        wait_thread.stop()
         from pid_information import client_pid_kill
         return client_pid_kill(client, args.pid_kill)
 
     if not args.method:
+        wait_thread.stop()
         client_list_methods(client)
         return 1
 
@@ -225,6 +233,7 @@ def https_server(client, args, unknown_args, url, clVarsCore):
 #        now = datetime.datetime.now()
 #        print '6 ===> %ds %dms' %(now.second, now.microsecond)
         method_parser, view = get_method_argparser(client, args)
+        wait_thread.stop()
         method_parser.print_help()
 #        now = datetime.datetime.now()
 #        print '7 ===> %ds %dms' %(now.second, now.microsecond)
@@ -234,12 +243,30 @@ def https_server(client, args, unknown_args, url, clVarsCore):
             client.frame_period = clVarsCore.Get('cl_core_get_frame_period')
         except:
             client.frame_period = 2
-        method_result = call_method(client, args)
+        method_result = call_method(client, args, wait_thread)
         if method_result:
             try:
                 analysis(client, client.sid, method_result)
             except urllib2.URLError, e:
                 print e
+            except KeyboardInterrupt:
+                try:
+                    print
+                    mess = method_result[0][0]
+                    pid = int(mess.message)
+                    result = client.service.pid_kill(pid, client.sid)
+                    if result in [0,2]:
+                        print _('Process is terminated')
+                    elif result == -1:
+                        print _("Certificate not found in server database")
+                    elif result == -2:
+                        print _("Session doesn't belong to your certificate")
+                    elif result == 1:
+                        print _("It was not possible to kill process")
+#                    get_entire_frame(client, pid)
+                    analysis(client, client.sid, method_result)
+                except Exception, e:
+                    print e.message 
 
             try:
                 mess = method_result[0][0]
@@ -249,15 +276,47 @@ def https_server(client, args, unknown_args, url, clVarsCore):
 
             client.service.clear_pid_cache(client.sid, pid)
         client.service.clear_method_cache(client.sid, args.method)
+    wait_thread.stop()
     return 0
 
+class StoppableThread(threading.Thread):
+    """Thread class with a stop() method. The thread itself has to check
+    regularly for the stopped() condition."""
+
+    def __init__(self):
+        super(StoppableThread, self).__init__()
+        self._stop = threading.Event()
+
+    def run(self):
+        l = ['|','/','-','\\','|','/','-','\\']
+        i = 0
+        while True:
+            for i in l:
+                sys.stdout.write("\r\r" + i)
+                sys.stdout.flush()
+                time.sleep(.02)
+                if self.stopped():
+                    sys.stdout.write("\b")
+                    sys.stdout.flush()
+                    return 0
+
+    def stop(self):
+        self._stop.set()
+
+    def stopped(self):
+        return self._stop.isSet()
+
 def main():
 #    now = datetime.datetime.now()
 #    print '1 ===> %ds %dms' %(now.second, now.microsecond)
+    wait_thread = StoppableThread()
+    wait_thread.start()
+
     parser = parse()
     args, unknown_args = parser.parse_known_args()
 
     if not args.method and args.help:
+        wait_thread.stop()
         parser.print_help()
 #        now = datetime.datetime.now()
 #        print '1/2 ===> %ds %dms' %(now.second, now.microsecond)
@@ -290,10 +349,12 @@ def main():
         dir_path = os.path.join(path_to_cert, dirs)
         if not os.path.isdir(dir_path):
             if not makeDirectory(dir_path):
+                wait_thread.stop()
                 print _("cannot create directory %s") %dir_path
                 return 1
 
     if args.update_crl:
+        wait_thread.stop()
         getCRL = threading.Thread(target=get_CRL, args = (path_to_cert, ))
         getCRL.start()
         getCRL.join()
@@ -301,9 +362,11 @@ def main():
         return 0
 
     if args.by_host:
+        wait_thread.stop()
         client_post_request (path_to_cert, args)
         return 0
     if args.from_host:
+        wait_thread.stop()
         client_get_cert (path_to_cert, args)
         return 0
 
@@ -324,8 +387,9 @@ def main():
 #        print '2/2 ===> %ds %dms' %(now.second, now.microsecond)
         del (client)
     except urllib2.URLError, e:
+        wait_thread.stop()
         print _('Failed to connect')+':', e
-        sys.exit(1)
+        raise Exception(1)
 #    server_host_name = 'dspiridonov.local.calculate.ru'
         
     try:
@@ -361,7 +425,6 @@ def main():
             else:
                 key_passwd = None
             try:
-#                print 111111111
                 client = Client_suds(url,\
                     transport = HTTPSClientCertTransport(CERT_KEY, CERT_FILE,\
                                          path_to_cert, password=key_passwd))
@@ -385,11 +448,13 @@ def main():
         #If the certificate file misses
         if Connect_Error:
             if crypto_Error and 'store_passwd' in locals():
+                wait_thread.stop()
                 print _('Password is invalid')
                 # delete password from daemon list
                 clear_password(host, port)
                 return 1
             if 'e' in locals():
+                wait_thread.stop()
                 print _('Error: '), e
                 return 1
 #            print 'Connect Error'
@@ -404,11 +469,17 @@ def main():
 #        print '5 ===> %ds %dms' %(now.second, now.microsecond)
         try:
             return_val = https_server(client, args, unknown_args, url, \
-                                      clVarsCore)
+                                      clVarsCore, wait_thread)
         except urllib2.URLError, e:
             print _('Error: '), e
+        except Exception, e:
+            wait_thread.stop()
+            if type(e.message) != int:
+                print e.message
+            return 1
 #        now = datetime.datetime.now()
 #        print 'END ===> %ds %dms' %(now.second, now.microsecond)
+        wait_thread.stop()
         return return_val
 #----------------------------------------------------
     except WebFault, f:
@@ -419,3 +490,4 @@ def main():
     except Exception, e:
         print _("Exception: %s") %e
         tb.print_exc()
+    wait_thread.stop()

console/application/client_class.py

@@ -186,18 +186,18 @@ class CheckingClientHTTPSConnection(CheckingHTTPSConnection):
         cert = client.service.get_ca()
         if cert == '1':
             print _('Server certificate is not valid')
-            sys.exit()
+            raise Exception(1)
             
         if cert == '2':
             print _('CA not found on server')
-            sys.exit()
+            raise Exception(1)
             
         try:
             certobj = OpenSSL.crypto.load_certificate \
                     (OpenSSL.SSL.FILETYPE_PEM, cert)
         except:
             print _("Error. Certificate not added to trusted")
-            sys.exit()
+            raise Exception(1)
         print '\n', _("Fingerprint = %s") % certobj.digest('SHA1')
         print _("Serial Number = "), certobj.get_serial_number()
         Issuer = certobj.get_issuer().get_components()
@@ -279,7 +279,7 @@ class CheckingClientHTTPSConnection(CheckingHTTPSConnection):
                     os.makedirs(root_cert_dir)
                 except OSError:
                     print _("error creating directory %s") %root_cert_dir
-                    sys.exit()
+                    raise Exception(1)
             
             print '\n' + _("Try add CA and ROOT certificates")
             self.list_ca_certs = []
@@ -298,7 +298,7 @@ class CheckingClientHTTPSConnection(CheckingHTTPSConnection):
             if not f:
                 flag = 1
             elif f == 1:
-                sys.exit()
+                raise Exception(1)
         else:
             import time
             time.sleep(0.1)
@@ -333,7 +333,7 @@ class CheckingClientHTTPSConnection(CheckingHTTPSConnection):
             if not f:
                 flag = 1
             elif f == 1:
-                sys.exit()
+                raise Exception(1)
         #if not hasattr(HTTPSClientCertTransport, 'filename') or \
                                     #HTTPSClientCertTransport.filename == None:
         HTTPSClientCertTransport.filename = self.cert_list \

console/application/function.py

@@ -235,6 +235,7 @@ class switch(object):
 
 #################API FUNCTION###############################
 def show_view(view):
+    return
     print "+====== show view! ======+"
 
 def printTable(data, header=None ):
@@ -285,35 +286,32 @@ def show_table(table, item):
     sys.stdout.write(res)
 
 def show_error(item):
-    red = '\033[91m * \033[0m'
-#    FAIL = '\033[31m'
-#    ENDC = '\033[0m'
-    print red + _("Error")
-    print red + item.message
-#    print ENDC
+    if item.message:
+        red = '\033[91m * \033[0m'
+        print red + _("Error")
+        print red + item.message
     
 def show_warning(item):
-    yellow = '\033[93m * \033[0m'
-#    WARNING = '\033[91m'
-    print yellow + _("Warning")
-    print yellow + item.message
-#    ENDC = '\033[0m'
-#    print ENDC
+    if item.message:
+        yellow = '\033[93m * \033[0m'
+        print yellow + _("Warning")
+        print yellow + item.message
     
 def show_group(item):
-    print "Group"
-    print item.message
+    if item.message:
+        print item.message
 
 def show_result(result):
-    print "Result = ", result.message
+    if result.message:
+        print "Result = ", result.message
 
 def startTask(item):
-    print "start Task"
-    print item.message
+    if item.message:
+        print item.message
 
 def endTask(item):
-    print item.message
-    print "end Task\n\n"
+    if item.message:
+        print item.message
     
 def beginFrame(item):
     pass
@@ -334,7 +332,7 @@ def _create_obj(client, method):
         if method.endswith('_view'):
             method = method[:-5]
         print _('Method not found: ') + method
-        sys.exit(1)
+        raise Exception(1)
     return view_params
 
 def get_view_params(client, method, step = None, expert = None, brief = None):

console/application/methods_func.py

@@ -27,7 +27,7 @@ def get_view(client, method, sid, view_params):
         view = client.service[0][method + '_view'](client.sid, view_params)
     except urllib2.URLError, e:
         print _('Failed to connect')+':', e
-        sys.exit(1)
+        raise Exception(1)
     return view
 
 def get_method_argparser(client, args):
@@ -91,7 +91,7 @@ def get_method_argparser(client, args):
                                         default=None, help = opt.help)
     return parser, view
 
-def call_method(client, args):
+def call_method(client, args, wait_thread):
     method = args.method
     method_parser, view = get_method_argparser(client, args)
     param_object = _create_obj(client, method)
@@ -116,6 +116,7 @@ def call_method(client, args):
         view_params = get_view_params(client, method + '_view', step = None, \
                                   expert = True, brief = True)
         view = get_view(client, method, client.sid, view_params)
+        wait_thread.stop()
         print_brief(view, steps.label)
         while True:
             try:
@@ -141,7 +142,7 @@ def call_method(client, args):
             red = '\033[91m * \033[0m'
             print red + error.message
         return None
-
+    wait_thread.stop()
     return method_result
 
 def _getattr(obj, attr):

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-08 12:12+0300\n"
-"PO-Revision-Date: 2012-06-08 12:12+0300\n"
+"POT-Creation-Date: 2012-06-09 12:31+0300\n"
+"PO-Revision-Date: 2012-06-09 12:32+0300\n"
 "Last-Translator: Denis <ds@mail.ru>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -87,14 +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:260
 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:262
 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:264
 msgid "It was not possible to kill process"
 msgstr "Не удалось завершить процесс"
 
@@ -126,11 +129,11 @@ msgstr "Ошибка при создании директории %s"
 msgid "CRL add"
 msgstr "CRL добавлен"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:270
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:273
 msgid "CA certificate delete from user trusted certificate"
 msgstr "Сертификат Центра Авторизации удалён из пользовательского списка доверенных сертификатов"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:289
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:292
 msgid "CA certificate delete from system trusted certificate"
 msgstr "Сертификат Центра Авторизации удалён из системного списка доверенных сертификатов"
 
@@ -166,50 +169,50 @@ msgstr "Город: "
 msgid "Country (2 words): [%s]"
 msgstr "Страна (2 символа): [%s]"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:52
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:55
 msgid "Clear Cache error! "
 msgstr "Ошибка очистки кэша!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:132
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:166
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:135
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:169
 msgid "yes"
 msgstr "да"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:134
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:168
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:137
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:171
 msgid "no"
 msgstr "нет"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:136
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:170
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:139
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:173
 msgid "auto"
 msgstr "авто"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:189
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:192
 msgid "Not used"
 msgstr "Не используется"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:288
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:291
 msgid "Error"
 msgstr "Ошибка"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:295
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:297
 msgid "Warning"
 msgstr "Предепреждение"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:333
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:334
 msgid "Method not found: "
 msgstr "Метод не найден: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:365
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:366
 msgid "server send pid = "
 msgstr "сервер послал идентификатор процесса = "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:455
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:456
 msgid "Process not exist or not belong to your session"
 msgstr "Процесс не существует или принадлежит не вашей сессии"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:507
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:508
 #, python-format
 msgid "Error task by %s"
 msgstr "Ошибка задачи на %s"
@@ -290,46 +293,55 @@ msgstr "обновить список отзыва сертификатов"
 msgid "stop cl-consoled"
 msgstr "остановить cl-consoled"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:293
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:258
+msgid "Process is terminated"
+msgstr "Процесс завершён"
+
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:352
 #, python-format
 msgid "cannot create directory %s"
 msgstr "Не удалось создать директорию %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:327
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:390
 #: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:29
 msgid "Failed to connect"
 msgstr "Не удалось подключиться"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:388
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:451
 msgid "Password is invalid"
 msgstr "Неверный пароль"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:393
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:409
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:457
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:473
 msgid "Error: "
 msgstr "Ошибка: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:415
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:418
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:420
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:485
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:488
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:490
 #, python-format
 msgid "Exception: %s"
 msgstr "Исключение: %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:120
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:107
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:137
+msgid "method is not available"
+msgstr "Метод не доступен"
+
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:123
 msgid "Run process? (yes/no): "
 msgstr "Запустить процесс? (yes/no): "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:126
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:129
 msgid "Interrupted by user"
 msgstr "Прервано пользователем"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:197
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:212
 #, python-format
 msgid "Password for %s: "
 msgstr "Пароль для %s: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:198
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:213
 #, python-format
 msgid "Repeat password for %s: "
 msgstr "Повтор пароля для %s: "
@@ -440,111 +452,111 @@ msgstr "Время жизни сертификата истекло"
 msgid "shelf life expires after %d days"
 msgstr "Время жизни сертификата истекает через %d дней"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:104
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:107
 msgid "Password: "
 msgstr "Пароль: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:106
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:109
 msgid "Repeat: "
 msgstr "Повтор: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:114
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:117
 msgid "Passwords do not match"
 msgstr "Пароли не совпадают"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:122
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:125
 msgid "You have sent a request to sign the certificate."
 msgstr "У Вас уже есть отправленный запрос на подписание сертификата."
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:123
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:126
 #, python-format
 msgid "request id = %s"
 msgstr "Номер запроса = %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:124
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:127
 msgid "Send new request? y/[n]: "
 msgstr "Отправить навый запрос на подпись сертификата? y/[n]: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:129
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:178
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:132
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:181
 msgid "connect..."
 msgstr "подключение..."
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:135
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:185
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:138
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:188
 msgid "Close. Connecting Error."
 msgstr "Ошибка соединения. Закрываюсь."
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:136
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:139
 #, python-format
 msgid "Error: %s"
 msgstr "Ошибка: %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:144
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:147
 msgid "secret key and request exists"
 msgstr "секретный ключ и запрос на подпись сертификата созданы"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:145
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:148
 msgid "Create new secret key and request? y/[n]: "
 msgstr "Создать новые Секретный Ключ и Запрос на подпись сертификата? y/[n]: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:160
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:163
 msgid "This server can not sign certificate!"
 msgstr "Сервер не подписал сертификат!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:165
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:206
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:168
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:209
 #, python-format
 msgid "Your request id = %s"
 msgstr "Номер Вашего запроса = %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:170
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:173
 #, python-format
 msgid "request was not sent or deleted file %s"
 msgstr "Запрос не был послан или удалён файл %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:190
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:193
 #, python-format
 msgid "Request %s not found on client side"
 msgstr "Запрос %s не найден на стороне клиента"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:202
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:205
 msgid "Request to sign is rejected!"
 msgstr "Запрос на подпись сертификата отвергнут!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:205
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:208
 msgid "Request for the signing has not yet reviewed."
 msgstr "Запрос на подписание сертификата ещё не рассмотрен."
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:209
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:212
 msgid "Request on signature does not match sent earlier."
 msgstr "Запрос или подпись не соответствуют отправленным ранее."
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:212
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:215
 msgid "Request was sent from another ip."
 msgstr "Запрос был послан с другого адреса."
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:276
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:282
 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:166
 msgid "Not found field \"CN\" in certificate!"
 msgstr "Не найдено поле \"CN\" в сертификате!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:289
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:295
 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:176
 msgid "filename = "
 msgstr "Имя файла ="
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:290
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:296
 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:177
 msgid "CERTIFICATE ADD"
 msgstr "Сертификат добавлен"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:292
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:298
 #: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:179
 msgid "file with ca certificates exists"
 msgstr "Файл с сертификатом удостоверяющего центра создан"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:304
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:310
 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 чтобы забрать сертификат с сервера."
 
@@ -621,3 +633,17 @@ msgstr "Добавить Корневой и сертификат ЦА"
 msgid "This server is not trusted"
 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 "Процесс убит"