fix add cert to trusted, modified methods help view

console/application/cert_func.py

@@ -119,7 +119,7 @@ def client_post_request (cert_path, args):
                                           (None, None, cert_path))
     except (KeyboardInterrupt, urllib2.URLError), e:
         print '\n'+_("Close. Connecting Error.")
-        print _("Error code: %s") %e
+        print _("Error: %s") %e
         return 0
     
     server_host_name = client.service.get_server_host_name()

console/application/cert_verify.py

@@ -88,9 +88,9 @@ def get_CRL(path_to_cert):
     print 'update CRL'
     """ get new CRL (Certificate Revocation List) from all CA """
     # local CRL
-    CRL_path = path_to_cert + 'ca/crl/'
+    CRL_path = os.path.join(path_to_cert, 'ca/crl/')
     if not os.path.exists(CRL_path):
-        if not os.path.exists(path_to_cert + '/ca'):
+        if not os.path.exists(os.path.join(path_to_cert, 'ca')):
             if not os.path.exists(path_to_cert):
                 try:
                     os.makedirs(path_to_cert)
@@ -98,9 +98,10 @@ def get_CRL(path_to_cert):
                     print _("error creating directory %s") %path_to_cert
                     sys.exit()
             try:
-                os.makedirs(path_to_cert + '/ca')
+                os.makedirs(os.path.join(path_to_cert, 'ca'))
             except OSError:
-                print _("error creating directory %s") %(path_to_cert + '/ca')
+                print _("error creating directory %s") \
+                        %(os.path.join(path_to_cert, 'ca'))
                 sys.exit()
         os.makedirs(CRL_path)
     
@@ -140,7 +141,7 @@ def get_CRL(path_to_cert):
                 url = "https://" + subj[1] +"/?wsdl"
             if subj[0] == 'CN':
                 CN = subj[1]
-        
+
         if url:
             from client_class import Client_suds
             from client_class import HTTPSClientCertTransport
@@ -199,7 +200,8 @@ def find_ca_in_crl (CRL_path, all_ca_certs_list):
             crl = "".join(_crl_file.readlines())
         
         try:
-            crl_object = OpenSSL.crypto.load_crl(OpenSSL.crypto.FILETYPE_PEM, crl)
+            crl_object = OpenSSL.crypto.load_crl \
+                                    (OpenSSL.crypto.FILETYPE_PEM, crl)
         except:
             continue
         revoked_objects = crl_object.get_revoked()

console/application/cl_client.py

@@ -30,7 +30,7 @@ from cert_func import client_post_auth, client_post_request, client_get_cert, \
 from sid_func import session_clean, client_session_info, client_session_list
 from cert_verify import get_CRL, VerifyError
 
-import argparse
+import argparse, datetime
 import M2Crypto, OpenSSL
 from calculate.core.datavars import DataVarsCore
 
@@ -325,6 +325,7 @@ def main():
                 fit_cert_list.append(client_cert_name)
         fit_cert_list.sort(key = len)
         Connect_Error = 1
+        crypto_Error = 0
 #        now = datetime.datetime.now()
 #        print '3 ===> %ds %dms' %(now.second, now.microsecond)
         for i in range (0, len(fit_cert_list)):
@@ -339,12 +340,15 @@ def main():
                 store_passwd = getpass.getpass(_('Password: '))
                 if not store_passwd:
                     store_passwd = None
-
+            if 'store_passwd' in locals():
+                key_passwd = store_passwd
+            else:
+                key_passwd = None
             try:
 #                print 111111111
                 client = Client_suds(url,\
                     transport = HTTPSClientCertTransport(CERT_KEY, CERT_FILE,\
-                                         path_to_cert, password=store_passwd))
+                                         path_to_cert, password=key_passwd))
                 client.set_parameters (path_to_cert, CERT_FILE, CERT_KEY)
                 client_post_cert(client, clVarsCore)
                 Connect_Error = 0
@@ -356,6 +360,8 @@ def main():
                 crypto_Error = 1
             except urllib2.URLError, e:
                 Connect_Error = 1
+            except Exception, e:
+                Connect_Error = 1
             if Connect_Error == 0:
                 break
 #        now = datetime.datetime.now()
@@ -366,6 +372,9 @@ def main():
                 if store_passwd:
                     print _('Password is invalid')
                     return 1
+            if 'e' in locals():
+                print _('Error: '), e
+                return 1
             print 'CONNECT ERROR'
             CERT_FILE = None
             CERT_KEY = None
@@ -378,9 +387,13 @@ def main():
         client.port = port
 #        now = datetime.datetime.now()
 #        print '5 ===> %ds %dms' %(now.second, now.microsecond)
-        return https_server(client, args, unknown_args, url, clVarsCore)
+        try:
+            return_val = https_server(client, args, unknown_args, url, clVarsCore)
+        except urllib2.URLError, e:
+            print _('Error: '), e
 #        now = datetime.datetime.now()
 #        print 'END ===> %ds %dms' %(now.second, now.microsecond)
+        return return_val
 #----------------------------------------------------
     except WebFault, f:
         print _("Exception: %s") %f

console/application/client_class.py

@@ -23,8 +23,8 @@ from calculate.lib.datavars import DataVars
 from sudsds.client import Client
 from cert_verify import verify, get_CRL
 from sudsds.transport.http import HttpTransport, SUDSHTTPRedirectHandler, \
-            CheckingHTTPSConnection, CheckingHTTPSHandler, \
-            PYOPENSSL_AVAILABLE, PyOpenSSLSocket
+                           CheckingHTTPSConnection, CheckingHTTPSHandler, \
+                           PYOPENSSL_AVAILABLE, PyOpenSSLSocket
 from sudsds.transport import Transport
 from sudsds.properties import Unskin
 from cookielib import CookieJar, DefaultCookiePolicy
@@ -110,27 +110,27 @@ class CheckingClientHTTPSConnection(CheckingHTTPSConnection):
         clVarsCore.flIniFile()
         
         list_ca_certs.reverse()
+        system_ca_db = clVarsCore.Get('cl_glob_root_cert')
+
+        clVars = DataVars()
+        clVars.flIniFile()
+        homePath = clVars.Get('ur_home_path')
+        cl_client_cert_dir = clVarsCore.Get('cl_client_cert_dir')
+        cl_client_cert_dir = cl_client_cert_dir.replace("~",homePath)
+        root_cert_md5 = cl_client_cert_dir + "/ca/cert_list"
+
+        user_root_cert = clVarsCore.Get('cl_user_root_cert')
+        user_root_cert = user_root_cert.replace("~",homePath)
+
         for cert in list_ca_certs:
-            system_ca_db = clVarsCore.Get('cl_glob_root_cert')
             if os.path.exists(system_ca_db):
                 if cert in open(system_ca_db, 'r').read():
                     continue
-            
-            clVars = DataVars()
-            clVars.flIniFile()
-            homePath = clVars.Get('ur_home_path') 
-            
-            user_root_cert = clVarsCore.Get('cl_user_root_cert')
-            user_root_cert = user_root_cert.replace("~",homePath)
+
             if os.path.exists(user_root_cert):
                 if cert in open(user_root_cert, 'r').read():
                     continue
-            
-            cl_client_cert_dir = clVarsCore.Get('cl_client_cert_dir')
-            
-            cl_client_cert_dir = cl_client_cert_dir.replace("~",homePath)
-            root_cert_md5 = cl_client_cert_dir + "/ca/cert_list"
-            
+
             md5 = hashlib.md5()
             md5.update(cert)
             md5sum = md5.hexdigest()
@@ -166,7 +166,7 @@ class CheckingClientHTTPSConnection(CheckingHTTPSConnection):
                     print _('Not found field "CN" in certificate!')
                     return 1
                     
-                fd = open(cl_client_cert_dir + '/ca/' + filename, 'w')
+                fd = open(os.path.join(cl_client_cert_dir,'ca/',filename),'w')
                 fd.write(cert)
                 fd.close()
                 
@@ -177,13 +177,12 @@ class CheckingClientHTTPSConnection(CheckingHTTPSConnection):
                 print _("CERTIFICATE ADD")
             else:
                 print _("file with ca certificates exists")
-        get_CRL(cl_client_cert_dir + '/')
-    
-    
+        get_CRL(cl_client_cert_dir)
+
     def add_ca_cert(self, cert, list_ca_certs):
         url = 'https://%s:%s/?wsdl' %(self.host, self.port)
-        client = Client_suds(url, \
-                transport = HTTPSClientCertTransport(None,None, self.cert_path))
+        client = Client_suds(url, transport = HTTPSClientCertTransport \
+                                              (None, None, self.cert_path))
         cert = client.service.get_ca()
         if cert == '1':
             print _('Server certificate is not valid')
@@ -215,7 +214,6 @@ class CheckingClientHTTPSConnection(CheckingHTTPSConnection):
             self.add_all_ca_cert(list_ca_certs)
         else:
             print _("Certificate not added to trusted")
-        sys.exit()
 
     # add certificate server in trusted
     def add_server_cert(self, cert):
@@ -238,7 +236,7 @@ class CheckingClientHTTPSConnection(CheckingHTTPSConnection):
         choice = raw_input (_("Quit (q)? s/c/[q]: "))
         if choice.lower() in ['s', 'c']:
             #self.sock = ssl.wrap_socket(sock)
-            ca_certs = self.trusted_path + "cert.list"
+            ca_certs = os.path.join(self.trusted_path, "cert.list")
             
             if not os.path.exists(ca_certs):
                 fc = open(ca_certs,"w")
@@ -265,6 +263,8 @@ class CheckingClientHTTPSConnection(CheckingHTTPSConnection):
             fcl = open(ca_certs,"a")
             fcl.write(host + ' ' + filename + '\n')
             fcl.close()
+            if choice.lower() != 'c':
+                return 3
         if choice.lower() == 'c':
             clVars = DataVarsCore()
             clVars.importCore()
@@ -284,11 +284,10 @@ class CheckingClientHTTPSConnection(CheckingHTTPSConnection):
             print '\n' + _("Try add CA and ROOT certificates")
             self.list_ca_certs = []
             self.add_ca_cert(cert, self.list_ca_certs)
-            sys.exit()
-        else:
-            sys.exit()
+            return 3
+        elif not choice.lower() in ['c','s']:
+            return 4
 
-    
     def connect_trusted_root(self, sock, root_cert, crl_certs):
         self.ca_path = self.cert_path + "ca/"
         server_cert = ssl.get_server_certificate(addr = (self.host, self.port))
@@ -381,8 +380,8 @@ class CheckingClientHTTPSConnection(CheckingHTTPSConnection):
 
         while True:
             if os.path.exists(user_root_cert):
-                result_user_root = self.connect_trusted_root(sock, user_root_cert,\
-                                                              self.CRL_PATH)
+                result_user_root = self.connect_trusted_root(sock, \
+                                            user_root_cert, self.CRL_PATH)
             if result_user_root == 1:
                 glob_root_cert = self.Vars.Get('cl_glob_root_cert')
                 result_root_con = 1
@@ -393,7 +392,7 @@ class CheckingClientHTTPSConnection(CheckingHTTPSConnection):
                         self.sock = sock
                         self._tunnel()
                     result_root_con = self.connect_trusted_root(sock, \
-                                                    glob_root_cert, self.CRL_PATH)
+                                               glob_root_cert, self.CRL_PATH)
                 if result_root_con == 1:
                     sock = socket.create_connection((self.host, self.port),
                                         self.timeout, self.source_address)

console/application/methods_func.py

@@ -41,6 +41,8 @@ def get_method_argparser(client, args):
     for Group in view.groups.GroupField:
         if not Group.fields:
             continue
+#        if Group.name:
+        group = parser.add_argument_group(Group.name)
         for field in Group.fields.Field:
             if field.opt:
                 action = None
@@ -61,29 +63,29 @@ def get_method_argparser(client, args):
 
                 if arg_type == str:
                     if opt.shortopt and opt.longopt:
-                        parser.add_argument(opt.shortopt, opt.longopt, 
+                        group.add_argument(opt.shortopt, opt.longopt, 
                                  type = arg_type, dest=field.name, metavar = \
                                  metavalue, action = action, help = opt.help)
                     elif opt.shortopt and not opt.longopt:
-                        parser.add_argument(opt.shortopt,
+                        group.add_argument(opt.shortopt,
                                  type = arg_type, dest=field.name, metavar = \
                                  metavalue, action = action, help = opt.help)
                     elif opt.longopt and not opt.shortopt:
-                        parser.add_argument(opt.longopt,
+                        group.add_argument(opt.longopt,
                                  type = arg_type, dest=field.name, metavar = \
                                  metavalue, action = action, help = opt.help)
 
                 elif arg_type == bool:
                     if opt.shortopt and opt.longopt:
-                        parser.add_argument(opt.shortopt, opt.longopt, 
+                        group.add_argument(opt.shortopt, opt.longopt, 
                                         action='store_true', dest=field.name, 
                                         default=None, help = opt.help)
                     elif opt.shortopt and not opt.longopt:
-                        parser.add_argument(opt.shortopt,
+                        group.add_argument(opt.shortopt,
                                         action='store_true', dest=field.name, 
                                         default=None, help = opt.help)
                     elif opt.longopt and not opt.shortopt:
-                        parser.add_argument(opt.longopt, 
+                        group.add_argument(opt.longopt, 
                                         action='store_true', dest=field.name, 
                                         default=None, help = opt.help)
     return parser, view
@@ -115,7 +117,7 @@ def call_method(client, args):
         print_brief(view, steps.label)
         while True:
             try:
-                ask = raw_input('\n'+_('Run process? (yes/no): '))
+                ask = raw_input('\n' + _('Run process? (yes/no): '))
             except KeyboardInterrupt:
                 ask = 'no'
             if ask.lower() in ['n', 'no']:
@@ -150,14 +152,14 @@ def collect_object(client, param_object, view, args):
                     val = 0
                 param_object[field.name] = val
 
-            elif field.element in ['input', 'combo', 'comboEdit', 'openfile', \
+            elif field.element in ['input', 'combo', 'comboEdit', 'openfile',\
                                  'file', 'password', 'radio']:
                 param_object[field.name] = _getattr(args, field.name)
             elif field.element in ['multichoice', 'multichoice_add', \
                                    'selecttable', 'selecttable_add']:
                 val = _getattr(args, field.name)
 
-                param_object[field.name] = listToArray(client, val.split(','))\
+                param_object[field.name] = listToArray(client,val.split(','))\
                                     if val else None
 
             elif field.element == 'table' and field.type != 'steps':
@@ -168,7 +170,6 @@ def collect_object(client, param_object, view, args):
                 steps = field
 
     return param_object, steps
-#                print result_table
 
 def collect_table(field, val_list, client):
     if not val_list:

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-05-25 15:41+0300\n"
-"PO-Revision-Date: 2012-06-05 09:17+0300\n"
+"POT-Creation-Date: 2012-06-05 14:33+0300\n"
+"PO-Revision-Date: 2012-06-05 14:33+0300\n"
 "Last-Translator: Denis <ds@mail.ru>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -47,54 +47,54 @@ msgid "Process has been 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:136
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:138
 msgid "Process killed"
 msgstr "Процесс убит"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:53
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:70
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:55
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:72
 msgid "Not found pid for this session!"
 msgstr "Не найдены процессы для вашей сессии!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:59
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:76
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:61
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:78
 msgid "Server get pids error"
 msgstr "Ошибка списка процессов с сервера"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:101
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:105
+#: /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"
 msgstr "Нет доступных методов"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:109
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:111
 msgid "You can execute:"
 msgstr "Вы можете запускать:"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:109
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:111
 msgid "use key"
 msgstr "используйте ключ"
 
-#: /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 "Execute sessions:"
 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
 msgid "Process is completed"
 msgstr "Процесс завершён"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:138
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:140
 msgid "Process not found"
 msgstr "Процесс не найден"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:140
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:142
 msgid "Certificate not found in server database"
 msgstr "Сертификат не найден в БД сервера"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:142
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:144
 msgid "Session doesn't belong to your certificate"
 msgstr "Сессия не соответствует Вашему сертификату"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:144
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:146
 msgid "It was not possible to kill process"
 msgstr "Не удалось завершить процесс"
 
@@ -117,189 +117,206 @@ 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:353
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:281
 #, python-format
 msgid "error creating directory %s"
 msgstr "Ошибка при создании директории %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:180
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:181
 msgid "CRL add"
 msgstr "CRL добавлен"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:268
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:270
 msgid "CA certificate delete from user trusted certificate"
 msgstr "Сертификат Центра Авторизации удалён из пользовательского списка доверенных сертификатов"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:287
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:289
 msgid "CA certificate delete from system trusted certificate"
 msgstr "Сертификат Центра Авторизации удалён из системного списка доверенных сертификатов"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:46
+#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:48
 msgid "Enter certificate data by hand? y/[n]: "
 msgstr "Ввести данные сертификата вручную? y/[n]: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:65
+#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:67
 #, python-format
 msgid "Host Name [%s] : "
 msgstr "Имя хоста [%s] : "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:69
+#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:71
 #, python-format
 msgid "User Name [%s]: "
 msgstr "Имя пользователя [%s]: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:72
+#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:74
 msgid "Organization Name: "
 msgstr "Название организации: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:73
+#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:75
 #, python-format
 msgid "Network address (hostname or IP) [%s]: "
 msgstr "Сетевой адрес (hostname или IP) [%s]: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:75
+#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:77
 msgid "State Name: "
 msgstr "Город: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:76
+#: /var/calculate/mydir/git/calculate-console/console/application/create_cert.py:78
 #, python-format
 msgid "Country (2 words): [%s]"
 msgstr "Страна (2 символа): [%s]"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:51
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:52
 msgid "Clear Cache error! "
 msgstr "Ошибка очистки кэша!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:154
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:180
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:155
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:181
 msgid "yes"
 msgstr "да"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:156
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:182
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:157
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:183
 msgid "no"
 msgstr "нет"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:158
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:184
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:159
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:185
 msgid "auto"
 msgstr "авто"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:203
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:204
 msgid "Not used"
 msgstr "Не используется"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:346
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:306
 msgid "Error"
 msgstr "Ошибка"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:352
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:312
 msgid "Warning"
 msgstr "Предепреждение"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:390
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:350
 msgid "Method not found: "
 msgstr "Метод не найден: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:422
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:382
 msgid "server send pid = "
 msgstr "сервер послал идентификатор процесса = "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:512
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:472
 msgid "Process not exist or not belong to your session"
 msgstr "Процесс не существует или принадлежит не вашей сессии"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:564
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:524
 #, python-format
 msgid "Error task by %s"
 msgstr "Ошибка задачи на %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:60
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:62
 msgid "no connection to server!"
 msgstr "нет соединения с сервером!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:131
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:133
 msgid "show this help message and exit"
 msgstr "просмотр данной справки и выход"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:134
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:136
 msgid "call method"
 msgstr "вызов метода"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:137
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:139
 msgid "language for translate"
 msgstr "язык для перевода"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:140
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:142
 msgid "port number"
 msgstr "номер порта"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:143
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:145
 msgid "host destination"
 msgstr "хост назначения"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:146
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:148
 msgid "post request a signed certificate by server"
 msgstr "послать запрос подписания сертификата на сервер"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:149
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:151
 msgid "get signed certificate from server"
 msgstr "забрать подписанный сертификат с сервера"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:152
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:154
 msgid "path to cert and key files"
 msgstr "путь к файлам сертификата и ключа"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:155
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:157
 msgid "view a list of running processes"
 msgstr "просмотр списка запущенных процессов"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:158
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:160
 msgid "dump (using with key --list-pid)"
 msgstr "дамп (используйте с ключом --list-pid)"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:161
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:163
 msgid "view result of process"
 msgstr "просмотр результата работы процесса"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:164
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:166
 msgid "kill selected process"
 msgstr "завершить выбранный процесс"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:167
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:169
 msgid "clear cache session"
 msgstr "очистить кэш сессии"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:170
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:172
 msgid "view session information"
 msgstr "просмотр информации о сессии"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:173
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:175
+msgid "view information about session with sid = SID"
+msgstr "Просмотр информации о сессии с номером SID"
+
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:179
 msgid "view list active session on server"
 msgstr "просмотр списка активных сессий на сервере"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:176
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:182
 msgid "update the certificate revocation lists"
 msgstr "обновить список отзыва сертификатов"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:306
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:340
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:313
 #: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:28
 msgid "Failed to connect"
 msgstr "Не удалось подключиться"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:365
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:368
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:370
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:340
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:97
+msgid "Password: "
+msgstr "Пароль: "
+
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:373
+msgid "Password is invalid"
+msgstr "Неверный пароль"
+
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:376
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:393
+msgid "Error: "
+msgstr "Ошибка: "
+
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:399
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:402
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:404
 #, python-format
 msgid "Exception: %s"
 msgstr "Исключение: %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:118
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:120
 msgid "Run process? (yes/no): "
 msgstr "Запустить процесс? (yes/no): "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:123
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:125
 msgid "Interrupted by user"
 msgstr "Прервано пользователем"
 
@@ -321,12 +338,12 @@ msgid "No access to file!"
 msgstr "Нет доступа к файлу!"
 
 #: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:47
-#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:70
+#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:72
 msgid "Failed to obtain certificate data!"
 msgstr "Не удалось получить данные сертификата!"
 
 #: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:50
-#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:73
+#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:75
 #, python-format
 msgid "Permission denied %s"
 msgstr "Доступ запрещён %s"
@@ -339,299 +356,250 @@ msgstr "Сессия удалена!"
 msgid "Server delete sid error"
 msgstr "Ошибка удаления сессии на сервере"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:67
+#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:69
 msgid "This session not registered on server!"
 msgstr "Данная сессия не зарегистрирована на сервере!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:76
+#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:78
 msgid "Session information: "
 msgstr "Информация о сессии: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:78
+#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:79
 #, python-format
 msgid "Session number - %s"
 msgstr "Номер сессии = %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:83
+#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:80
 #, python-format
 msgid "Certificate number - %s"
 msgstr "Номер сертификата - %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:84
+#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:81
 #, python-format
 msgid "Date issue of certificate - %s"
 msgstr "Дата подписания сертификата - %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:103
+#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:101
 msgid "Active session on server: "
 msgstr "Активные сессии  на сервере:"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:107
+#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:106
 msgid "No active session on server"
 msgstr "нет активных сессий на сервере"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:115
+#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:114
 msgid "Error clearing session cache"
 msgstr "Ошибка очистки кэша сессии"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:117
+#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:116
 msgid "Session cache is cleared"
 msgstr "Кэш сессии очищен"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:38
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:39
 msgid "Certificate not found in Server Database!"
 msgstr "Сертификат не найден в БД сервера!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:39
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:40
 msgid "Add certificate to 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 "Your certificate ID = %s"
 msgstr "Номер Вашего сертификата = %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:47
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:48
 msgid "Certificate not send!"
 msgstr "Сертификат не отправлен!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:50
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:51
 #, python-format
 msgid " Your certifitate id = %d"
 msgstr "Номер Вашего сертификата = %d"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:53
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:54
 msgid "expiry date certificate has passed"
 msgstr "Время жизни сертификата истекло"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:56
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:57
 #, python-format
 msgid "shelf life expires after %d days"
 msgstr "Время жизни сертификата истекает через %d дней"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:91
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:98
+msgid "Repeat: "
+msgstr "Повтор: "
+
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:100
+msgid "Passwords do not match"
+msgstr "Пароли не совпадают"
+
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:108
 msgid "You have sent a request to sign the certificate."
 msgstr "У Вас уже есть отправленный запрос на подписание сертификата."
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:92
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:109
 #, python-format
 msgid "request id = %s"
 msgstr "Номер запроса = %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:93
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:110
 msgid "Send new request? y/[n]: "
 msgstr "Отправить навый запрос на подпись сертификата? y/[n]: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:97
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:150
-msgid "Enter port: "
-msgstr "Введите номер порта:"
-
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:101
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:154
-msgid "Port must be int"
-msgstr "Порт должен быть целочисленным"
-
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:104
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:157
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:115
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:164
 msgid "connect..."
 msgstr "подключение..."
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:119
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:121
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:171
+msgid "Close. Connecting Error."
+msgstr "Ошибка соединения. Закрываюсь."
+
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:122
+#, python-format
+msgid "Error: %s"
+msgstr "Ошибка: %s"
+
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:130
 msgid "secret key and request exists"
 msgstr "секретный ключ и запрос на подпись сертификата созданы"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:120
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:131
 msgid "Create new secret key and request? y/[n]: "
 msgstr "Создать новые Секретный Ключ и Запрос на подпись сертификата? y/[n]: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:131
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:146
 msgid "This server can not sign certificate!"
 msgstr "Сервер не подписал сертификат!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:136
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:185
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:151
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:192
 #, python-format
 msgid "Your request id = %s"
 msgstr "Номер Вашего запроса = %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:141
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:156
 #, python-format
 msgid "request was not sent or deleted file %s"
 msgstr "Запрос не был послан или удалён файл %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:148
-msgid "URL has form"
-msgstr "URL имеет вид"
-
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:164
-msgid "Close. Connecting Error."
-msgstr "Ошибка соединения. Закрываюсь."
-
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:169
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:176
 #, python-format
 msgid "Request %s not found on client side"
 msgstr "Запрос %s не найден на стороне клиента"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:181
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:188
 msgid "Request to sign is rejected!"
 msgstr "Запрос на подпись сертификата отвергнут!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:184
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:191
 msgid "Request for the signing has not yet reviewed."
 msgstr "Запрос на подписание сертификата ещё не рассмотрен."
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:188
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:195
 msgid "Request on signature does not match sent earlier."
 msgstr "Запрос или подпись не соответствуют отправленным ранее."
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:191
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:198
 msgid "Request was sent from another ip."
 msgstr "Запрос был послан с другого адреса."
 
-#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:246
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:172
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:253
+#: /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:259
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:182
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:266
+#: /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:260
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:183
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:267
+#: /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:262
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:185
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:269
+#: /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:274
+#: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:281
 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:100
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:94
 msgid "Certificate not found in client"
 msgstr "Сертификат не найден на стороне клиента"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:109
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:103
 msgid "Error open file"
 msgstr "Ошибка при открытии файла"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:195
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:188
 msgid "Server certificate is not valid"
 msgstr "Сертификат сервера недействителен!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:199
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:192
 msgid "CA not found on server"
 msgstr "Сертификат Центра Авторизации не найден на сервере"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:206
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:199
 msgid "Error. Certificate not added to trusted"
 msgstr "Ошибка! Сертификат не добавлен в доверенные"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:208
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:297
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:201
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:223
 #, python-format
 msgid "Fingerprint = %s"
 msgstr "Отпечаток = %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:209
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:298
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:202
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:224
 msgid "Serial Number = "
 msgstr "Серийный номер = "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:211
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:300
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:204
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:226
 msgid "Issuer"
 msgstr "Подписчик"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:215
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:304
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:208
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:230
 msgid "Subject"
 msgstr "Субъект"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:218
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:211
 msgid "Add CA certificates to trusted? y/[n]:"
 msgstr "Добавить сертификат Центра Авторизации в доверенные? y/[n]:"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:223
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:216
 msgid "Certificate not added to trusted"
 msgstr "Сертификат не добавлен в доверенные"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:294
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:220
 msgid "Untrusted Server Certificate!"
 msgstr "Недоверенный сертификат сервера!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:308
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:234
 msgid "Add this Servers certificate to trusted (s) or"
 msgstr "Добавить сертификат этого сервера в доверенные (s) или"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:309
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:235
 msgid "Try add CA and ROOT certificates to trusted (c) or"
 msgstr "Попытаться добавить сертификат ЦА и корневой в доверенные (c) или"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:310
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:236
 msgid "Quit (q)? s/c/[q]: "
 msgstr "Выйти (q)? s/c/[q]: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:356
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:284
 msgid "Try add CA and ROOT certificates"
 msgstr "Добавить Корневой и сертификат ЦА"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:391
-#, python-format
-msgid ""
-"\n"
-"WARNING! %s trying to replace certificate!\n"
-msgstr ""
-"\n"
-"Внимание! %s пытается подменить сертификат!\n"
-
-#~ msgid "Certificate not found in server!"
-#~ msgstr "Сертификат не найден на сервере!"
-
-#~ msgid "Error input certificate ID!"
-#~ msgstr "Ошибка ввода идентификатора сертификата!"
-
-#~ msgid "Certificate with ID %d can execute:"
-#~ msgstr "Сертификат  номер %d может запускать:"
-
-#~ msgid "Certificate ID: "
-#~ msgstr "Номер сертификата:"
-
-#~ msgid "Error certificate id"
-#~ msgstr "Ошибка номера сертификата"
-
-#~ msgid "Enter correctly cert id!"
-#~ msgstr "Введите корректный идентичикатор сертификата!"
-
-#~ msgid "session is active"
-#~ msgstr "сессия активна"
-
-#~ msgid "session is inactive"
-#~ msgstr "сессия неактивна"
-
-#~ msgid "Client type - %s"
-#~ msgstr "Тип клиента - %s"
-
-#~ msgid "Error sid"
-#~ msgstr "Ошибка sid (идентификатора сессии)"
-
-#~ msgid "Enter correctly sid!"
-#~ msgstr "Введите корректный идентификатор сессии!"
-
-#~ msgid "Error get data"
-#~ msgstr "Ошибка при получении данных"
-
-#~ msgid "PID for kill:"
-#~ msgstr "Процесс для завершения: "
-
-#~ msgid "Error pid"
-#~ msgstr "Ошибка идентификатора процесса"
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:409
+msgid "This server is not trusted"
+msgstr "Сервер не является доверенным"
 
-#~ msgid "Killed successfully"
-#~ msgstr "Успешно убит"