add work with process

console/application/cl_client.py

@@ -22,14 +22,14 @@ from client_class import Client_suds
 import traceback as tb
 import time, logging
 import os, sys
-import threading
-from function import create_obj, get_sid, analysis, clear
+import threading, urllib2
+from function import create_obj, get_sid, analysis, clear, get_entire_frame
 from pid_information import client_list_methods
 from cert_func import client_post_auth, client_post_request, client_get_cert, \
                       client_post_cert
 from cert_verify import get_CRL, VerifyError
 
-import argparse
+import argparse, datetime
 from calculate.core.datavars import DataVarsCore
 
 from client_class import HTTPSClientCertTransport
@@ -131,7 +131,7 @@ def test(client, com=None):
 def parse():
     parser = argparse.ArgumentParser(add_help=False)
     parser.add_argument(
-        '-h', '--help', action='store_true', default=False, \
+        '-h', '--help', action='store_true', default=False,
         dest='help', help=_("show this help message and exit"))
     parser.add_argument(
         '--method', type=str, dest='method', 
@@ -146,28 +146,62 @@ def parse():
         '--host', type=str, default = 'localhost', dest='host',
         help=_('host destination'))
     parser.add_argument(
-        '--gen-cert-by', type=str, dest='by_host', 
+        '--gen-cert-by', type=str, dest='by_host', metavar = 'HOST',
         help=_('post request a signed certificate by server'))
     parser.add_argument(
-        '--get-cert-from', type=str, dest='from_host', 
+        '--get-cert-from', type=str, dest='from_host', metavar = 'HOST',
         help=_('get signed certificate from server'))
     parser.add_argument(
-        '--cert-path', type=str, dest='path_to_cert',
+        '--cert-path', type=str, dest='path_to_cert', metavar = 'PATH',
         help=_('path to cert and key files'))
     parser.add_argument(
-        '--update-crl', action='store_true', default=False, \
-        dest='update_crl', help=_("Update the certificate revocation lists"))
+        '--list-pid', action='store_true', default=False,
+        dest='list_pid', help=_("view a list of running processes"))
+    parser.add_argument(
+        '-d', '--dump',  action='store_true', default=False, dest = 'dump',
+        help=_('dump (using with key --list-pid)'))
+    parser.add_argument(
+        '--pid-result',  type=int, metavar = 'PID',
+        dest='pid_res', help=_("view result of process"))
+    parser.add_argument(
+        '--pid-kill',  type=int, metavar = 'PID',
+        dest='pid_kill', help=_("kill selected process"))
+    parser.add_argument(
+        '--update-crl', action='store_true', default=False,
+        dest='update_crl', help=_("update the certificate revocation lists"))
     return parser
 
 def https_server(client, args, unknown_args, url, clVarsCore):
     client_post_auth(client)
+
+    if args.list_pid:
+        if args.dump:
+            from pid_information import client_pid_info
+            client_pid_info(client)
+        else:
+            from pid_information import client_list_pid
+            client_list_pid(client)
+        return 0
+
+    if args.pid_res:
+        get_entire_frame(client, args.pid_res)
+        return 0
+
+    if args.pid_kill:
+        from pid_information import client_pid_kill
+        return client_pid_kill(client, args.pid_kill)
+
     if not args.method:
         client_list_methods(client)
-        return
+        return 1
 
     elif args.method and args.help:
+        now = datetime.datetime.now()
+        print '6 ===> %ds %dms' %(now.second, now.microsecond)
         method_parser, view = get_method_argparser(client, args)
         method_parser.print_help()
+        now = datetime.datetime.now()
+        print '7 ===> %ds %dms' %(now.second, now.microsecond)
 
     else:
         try:
@@ -187,11 +221,15 @@ def https_server(client, args, unknown_args, url, clVarsCore):
 #    signaling.start()
 
 def main():
+    now = datetime.datetime.now()
+    print '1 ===> %ds %dms' %(now.second, now.microsecond)
     parser = parse()
     args, unknown_args = parser.parse_known_args()
 
     if not args.method and args.help:
         parser.print_help()
+        now = datetime.datetime.now()
+        print '1/2 ===> %ds %dms' %(now.second, now.microsecond)
         return 0
 
     logging.basicConfig(level=logging.FATAL)
@@ -230,19 +268,28 @@ def main():
     if args.from_host:
         client_get_cert (path_to_cert, args)
         return 0
-    
+
     url = "https://%s:%d/?wsdl" %(host, port)
 #    print "url = %s" %url
 
     clear()
     try:
+        now = datetime.datetime.now()
+        print '2 ===> %ds %dms' %(now.second, now.microsecond)
         client = Client_suds(url, \
                 transport = HTTPSClientCertTransport(None,None, path_to_cert))
+        now = datetime.datetime.now()
+        print '2/1 ===> %ds %dms' %(now.second, now.microsecond)
         server_host_name = client.service.get_server_host_name()
+        print server_host_name
+        now = datetime.datetime.now()
+        print '2/2 ===> %ds %dms' %(now.second, now.microsecond)
         del (client)
-    except Exception, e:
-        print 'get host name error', e
+    except urllib2.URLError, e:
+        print _('Failed to connect')+':', e
         sys.exit(1)
+#    server_host_name = 'dspiridonov.local.calculate.ru'
+        
     try:
         import glob
         all_cert_list = glob.glob(os.path.join(path_to_cert, '*.crt'))
@@ -254,12 +301,15 @@ def main():
                 fit_cert_list.append(client_cert_name)
         fit_cert_list.sort(key = len)
         Connect_Error = 1
+        now = datetime.datetime.now()
+        print '3 ===> %ds %dms' %(now.second, now.microsecond)
         for i in range (0, len(fit_cert_list)):
             #print 'fit_cert_list = ',fit_cert_list
             cert_name = fit_cert_list.pop()
             CERT_FILE = path_to_cert + cert_name + '.crt'
             CERT_KEY = path_to_cert + cert_name + '.key'
             try:
+                print 111111111
                 client = Client_suds(url,\
                     transport = HTTPSClientCertTransport(CERT_KEY, CERT_FILE,\
                                                 path_to_cert))
@@ -269,12 +319,13 @@ def main():
             except VerifyError, e:
                 print e.value
                 Connect_Error = 1
-            except Exception, e:
-                print e
-                Connect_Error = 1
-                #sys.exit()
+            except urllib2.URLError, e:
+                print _('Failed to connect')+':', e
+                sys.exit(1)
             if Connect_Error == 0:
                 break
+        now = datetime.datetime.now()
+        print '4 ===> %ds %dms' %(now.second, now.microsecond)
         #If the certificate file misses
         if Connect_Error:
             print 'CONNECT ERROR'
@@ -287,6 +338,8 @@ def main():
             client.set_parameters (path_to_cert, CERT_FILE, CERT_KEY)
 
         client.port = port
+        now = datetime.datetime.now()
+        print '5 ===> %ds %dms' %(now.second, now.microsecond)
         https_server(client, args, unknown_args, url, clVarsCore)
 #----------------------------------------------------
     except WebFault, f:

console/application/client_class.py

@@ -30,12 +30,21 @@ from suds.options import Options
 #import cert_func.verify
 
 flag = 0
+import datetime
         
 class Client_suds(Client):
     def __init__(self, url, **kwargs):
+        now = datetime.datetime.now()
+        print 'suds1 ===> %ds %dms' %(now.second, now.microsecond)
         Client.__init__(self, url, **kwargs)
+        now = datetime.datetime.now()
+        print 'suds1/2 ===> %ds %dms' %(now.second, now.microsecond)
         options = Options()
-        options.cache = ObjectCache(days=0)
+        now = datetime.datetime.now()
+        print 'suds1/3 ===> %ds %dms' %(now.second, now.microsecond)
+        options.cache = ObjectCache(days=5)
+        now = datetime.datetime.now()
+        print 'suds2 ===> %ds %dms' %(now.second, now.microsecond)
         
     def set_parameters (self, path_to_cert, CERT_FILE, PKEY_FILE):
         self.path_to_cert = path_to_cert
@@ -52,13 +61,14 @@ class Client_suds(Client):
 class clientHTTPSConnection (httplib.HTTPSConnection):
     def __init__(self, host, port=None, key_file=None, cert_file=None,
                 strict=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
-                source_address=None, cert_path=None):
+                source_address=None, cert_path=None, set_timeout = None):
         HTTPConnection.__init__(self, host, port, strict, timeout,
                             source_address)
         self.key_file = key_file
         self.cert_file = cert_file
         self.cert_path = cert_path
         self.CRL_PATH = cert_path + 'ca/crl/'
+        self.set_timeout = set_timeout
     
     # get filename store cert server
     def cert_list (self, host, ca_certs, server_cert):
@@ -445,16 +455,19 @@ class clientHTTPSConnection (httplib.HTTPSConnection):
         if self._tunnel_host:
             self.sock = sock
             self._tunnel()
-        
+
+        if self.set_timeout:
+            sock.settimeout(self.set_timeout)        
+
         clVars = DataVarsCore()
         clVars.importCore()
         clVars.flIniFile()
-        
+
         user_root_cert = clVars.Get('cl_user_root_cert')
         homePath = clVars.Get('ur_home_path')
         user_root_cert = user_root_cert.replace("~",homePath)
         result_user_root = 1
-        
+
         if os.path.exists(user_root_cert):
             result_user_root = self.connect_trusted_root (sock, user_root_cert,\
                                                           self.CRL_PATH)
@@ -490,13 +503,13 @@ class clientHTTPSConnection (httplib.HTTPSConnection):
             #sys.exit(1)
             raise Exception
 
-
 class HTTPSClientAuthHandler(u2.HTTPSHandler):  
-    def __init__(self, key, cert, cert_path):  
+    def __init__(self, key, cert, cert_path, timeout = None):  
         u2.HTTPSHandler.__init__(self)
         self.key = key
         self.cert = cert
         self.cert_path = cert_path
+        self.timeout = timeout
 
     def https_open(self, req):
         #Rather than pass in a reference to a connection class, we pass in  
@@ -505,17 +518,19 @@ class HTTPSClientAuthHandler(u2.HTTPSHandler):
         return self.do_open(self.getConnection, req) 
 
     def getConnection(self, host, timeout=300):
-        
+
         #return httplib.HTTPSConnection(host, key_file=self.key, cert_file=self.cert)  
         return clientHTTPSConnection(host, key_file=self.key,\
-                                cert_file=self.cert, cert_path = self.cert_path)  
+                             cert_file=self.cert, cert_path = self.cert_path, \
+                             set_timeout = self.timeout)
 
 class HTTPSClientCertTransport(HttpTransport):
-    def __init__(self, key, cert, path_to_cert, *args, **kwargs):
+    def __init__(self, key, cert, path_to_cert, timeout=None, *args, **kwargs):
         HttpTransport.__init__(self, *args, **kwargs)
         self.key = key
         self.cert = cert
         self.cert_path = path_to_cert
+        self.timeout = timeout
 
     def u2open(self, u2request):
         """
@@ -527,10 +542,12 @@ class HTTPSClientCertTransport(HttpTransport):
         """
         tm = self.options.timeout
         url = u2.build_opener(HTTPSClientAuthHandler(self.key, self.cert,\
-                                                     self.cert_path))  
-                                                     
+                                            self.cert_path, self.timeout))
+
         #from urllib2 import URLError
         #try:
+        if self.timeout:
+            tm = self.timeout
         if self.u2ver() < 2.6:
             socket.setdefaulttimeout(tm)
             return url.open(u2request)

console/application/function.py

@@ -375,51 +375,93 @@ def get_Frame(client, sid, pid):
         for item in current_frame[0]:
             end_frame = get_message(client, item, sid, pid)
             
-def get_entire_frame(client):
+def get_entire_frame(client, pid):
     """ get entire frame, from beginning (if client disconnected) """
     sid = get_sid(client.SID_FILE)
     list_pid = client.service.list_pid(sid = sid)
-    
-    if list_pid[0] == [0]:
-        return 0
-    for pid in list_pid[0]:
-        end_frame = 1
-        while end_frame:
-            current_frame = client.service.get_entire_frame(sid, pid)
-            while current_frame in [None, [], ""]:
-                time.sleep(1)
-                current_frame = client.service.get_frame(sid, pid)
-            for item in current_frame[0]:
-                end_frame = get_message(client, item, sid, pid)
+    if hasattr (list_pid, 'integer'):
+        if not pid in list_pid.integer:
+            print _('Process not exist or not belong to your session')
+#    if list_pid[0] == [0]:
+#        return 0
+#    for pid in list_pid[0]:
+    end_frame = 1
+    while end_frame:
+        current_frame = client.service.get_entire_frame(sid, pid)
+        while current_frame in [None, [], ""]:
+            time.sleep(1)
+            current_frame = client.service.get_frame(sid, pid)
+        for item in current_frame[0]:
+            end_frame = get_message(client, item, sid, pid)
 
 def get_Progress(client, sid, pid, id):
     """ get progress for the current job """
     returnProgr = client.service.get_progress(sid, pid, id)
     temp_progress = -1
+    last_message = ''
     percent = returnProgr.percent
     while percent <= 100 and percent >= 0 :
         if temp_progress != percent:
-            print_progress(returnProgr)
+            last_message = print_progress(returnProgr, last_msg = last_message)
             if percent == 100:
+                print
                 return
             temp_progress = percent
         time.sleep(1)
         returnProgr = client.service.get_progress(sid, pid, id)
         percent = returnProgr.percent
     if percent < 0:
-        print_progress(returnProgr, True)
+        print_progress(returnProgr, error = True)
     else:
         print_progress(returnProgr)
 
-def print_progress(returnProgr, error = False):
+#def cout(string):
+#    sys.stdout.write(string)
+#    sys.stdout.flush()
+#    
+#for perc in xrange(101) :
+#    cout ('\r' + str(perc / 1.0).rjust(5) + '% ')
+#    time.sleep(.2)
+
+def cout_progress(string):
+    sys.stdout.write('\b\b\b\b\b\b' + string)
+    sys.stdout.flush()
+
+def cout(string):
+    sys.stdout.write(string)
+    sys.stdout.flush()
+
+def print_progress(returnProgr, last_msg = None, error = False):
     if error:
-        print _("Error task by") %(0 - returnProgr.percent) + ' %d%%'
+        cout_progress ('\n'+_("Error task by %s") \
+                            %str(0 - returnProgr.percent).rjust(5) + '%\n')
+        return ''
     elif returnProgr.long_message:
-        print '%s %d%%' %(returnProgr.long_message, returnProgr.percent)
+        if last_msg == returnProgr.long_message:
+            cout_progress('%s%%' %str(returnProgr.percent).rjust(5))
+        else:
+            if not last_msg:
+                cout_progress('')
+            else:
+                cout_progress('OK'.rjust(6) + '\n')
+            cout_progress('%s %s%%' %(returnProgr.long_message, \
+                                   str(returnProgr.percent).rjust(5)))
+        return returnProgr.long_message
     elif returnProgr.short_message:
-        print '%s %d%%' %(returnProgr.short_message, returnProgr.percent)
+        if last_msg == returnProgr.short_message:
+            cout_progress('%s%%' %str(returnProgr.percent).rjust(5))
+        else:
+            if not last_msg:
+                cout_progress('')
+            else:
+                cout_progress('OK'.rjust(6) + '\n')
+            cout_progress('%s %s%%' %(returnProgr.short_message, \
+                                   str(returnProgr.percent).rjust(5)))
+        return returnProgr.short_message
     else:
-        print '%d%%' %returnProgr.percent
+#        print '%s' %str(returnProgr.percent).rjust(5) + '%'
+        cout_progress ('%s' %str(returnProgr.percent).rjust(5) + '%')
+        return ''
 
 def get_Table(client, sid, pid, item):
     table = client.service.get_table(sid, pid, item.id)

console/application/methods_func.py

@@ -19,6 +19,7 @@ from suds import MethodNotFound
 from function import create_obj, listToArray, listToArrayArray
 from calculate.lib.cl_lang import setLocalTranslate
 setLocalTranslate('calculate_console',sys.modules[__name__])
+import urllib2
 
 def _create_obj(client, method):
     try:
@@ -36,7 +37,11 @@ def get_view_params(client, method, step = None, expert = None, brief = None):
     return view_params
 
 def get_view(client, method, sid, view_params):
-    view = client.service[0][method + '_view'](client.sid, view_params)
+    try:
+        view = client.service[0][method + '_view'](client.sid, view_params)
+    except urllib2.URLError, e:
+        print _('Failed to connect')+':', e
+        sys.exit(1)
     return view
 
 def get_method_argparser(client, args):
@@ -177,16 +182,12 @@ def collect_table(field, val_list, client):
                 if len (val_table[i]) < j + 1:
                     temp_row.append('')
                     continue
-                try:
-                    if val_table[i][j].lower() in ['on', 'yes']:
-                        temp_row.append('on')
-                    elif val_table[i][j].lower() in ['off', 'no']:
-                        temp_row.append('off')
-                    else:
-                        temp_row.append(val_table[i][j])
-                except:
-                    import ipdb
-                    ipdb.set_trace()
+                if val_table[i][j].lower() in ['on', 'yes']:
+                    temp_row.append('on')
+                elif val_table[i][j].lower() in ['off', 'no']:
+                    temp_row.append('off')
+                else:
+                    temp_row.append(val_table[i][j])
 
             elif typefield in ['input', 'combo', 'comboEdit', 'openfile', \
                                'file', 'password', 'radio']:

console/application/pid_information.py

@@ -14,7 +14,7 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from function import get_sid, _, _print
+from function import get_sid
 import sys
 from calculate.lib.cl_lang import setLocalTranslate
 setLocalTranslate('calculate_console',sys.modules[__name__])
@@ -23,7 +23,6 @@ client_types = "console"
 
 def pid_inf(client, sid, pids):
     """ get and show information about process """
-    print "============================"
     for pid in pids:
         s = client.service.pid_info(sid, pid)
         if s == "":
@@ -32,19 +31,18 @@ def pid_inf(client, sid, pids):
         if s[0][0] == "Permission denied":
             print _("Permission denied")
             return 1
-        
-        print '\n', _(u"Process name - %s") %s[0][3]
+
+        print '\n', _(u"Process name - %s") %s[0][4]
         print _(u"Process id - %s") %s[0][0]
+        print _(u"Process started %s") %s[0][2]
         if s[0][1] == '1':
             print _(u"Process is active")
         elif s[0][1] == '0':
             print _(u"Process has been completed")
         else:
             print _(u"Process killed")
-        print _(u"Process started %s") %s[0][2]
-    print "============================"
     return 0
-    
+
 def client_list_pid(client):
     """ get all process id for this session """
     sid = get_sid(client.SID_FILE)
@@ -62,10 +60,10 @@ def client_list_pid(client):
         return 1
     return len(list_pid[0])
 
-def gen_pid_ls(client, pid_ls):
+def gen_pid_ls(client):
     """ generation list with pid for this session """
     sid = get_sid(client.SID_FILE)
-    
+    pid_ls = []
     try:
         list_pid = client.service.list_pid(sid = sid)
         if list_pid[0][0] == 0:
@@ -81,27 +79,16 @@ def gen_pid_ls(client, pid_ls):
 
 def client_pid_info(client):
     """ get information about selected process (or about all) """
-    pid = raw_input ("PID: ")
-    try:
-        pid = int (pid)
-    except:
-        print _("Error pid")
-        return 1
-    try:
-        pid_ls = []
-        pid_get = []
-        pid_get.append(pid)
-        sid = get_sid(client.SID_FILE)
-        if pid > 0:
-            pid_inf(client, sid, pid_get)
-        elif pid == 0:
-            if gen_pid_ls(client, pid_ls):
-                pid_inf(client, sid, pid_ls)
-    except:
-        print _("Error get data")
-        return 1
-    return 0
-    
+#    try:
+    sid = get_sid(client.SID_FILE)
+    pid_ls = gen_pid_ls(client)
+    if pid_ls:
+        pid_inf(client, sid, pid_ls)
+#    except:
+#        print _("Error get data")
+#        return 1
+#    return 0
+
 def client_list_methods(client):
     """ get & show all available methods for this certificate """
     DAT = 0 # Access to data soap structure
@@ -134,31 +121,26 @@ def client_list_sessions(client):
     if results[0][0] == "Permission denied":
         print results[0][0]
         return 1
-        
+
     print _("Execute sessions:")
     for sess in results[0]:
         print " - %s" %sess
     return 0
 
-def client_pid_kill(client):
-    """ kill process on server """
-    pid = raw_input (_("PID for kill:"))
-    try:
-        pid = int (pid)
-    except:
-        print _("Error pid")
-        return 1        
-
+def client_pid_kill(client, pid):
     sid = get_sid(client.SID_FILE)
 
     result = client.service.pid_kill(pid, sid)
     if result == 0:
-        print _("Killed successfully")
-    elif result == 2:
         print _("Process is completed")
+    elif result == 2:
+        print _("Process killed")
+    elif result == 3:
+        print _("Process not found")
     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")
+    return 0

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-22 14:00+0300\n"
-"PO-Revision-Date: 2012-05-22 14:01+0300\n"
+"POT-Creation-Date: 2012-05-23 11:13+0300\n"
+"PO-Revision-Date: 2012-05-23 11:14+0300\n"
 "Last-Translator: Denis <ds@mail.ru>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -15,26 +15,31 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-SearchPath-0: /var/calculate/mydir/git/calculate-console/console/application\n"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:30
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:29
 msgid "PID not found"
 msgstr "Процесс не найден"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:33
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:32
 #: /var/calculate/mydir/git/calculate-console/console/application/template.py:31
 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:316
 msgid "Permission denied"
 msgstr "Доступ запрещён"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:36
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:35
 #, python-format
 msgid "Process name - %s"
 msgstr "Имя процесса - %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:37
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:36
 #, python-format
 msgid "Process id - %s"
 msgstr "Идентификатор процесса - %s"
 
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:37
+#, python-format
+msgid "Process started %s"
+msgstr "Процесс запущен %s"
+
 #: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:39
 msgid "Process is active"
 msgstr "Процесс активен"
@@ -44,72 +49,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:137
 msgid "Process killed"
 msgstr "Процесс убит"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:44
-#, python-format
-msgid "Process started %s"
-msgstr "Процесс запущен %s"
-
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:55
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:72
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:53
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:70
 msgid "Not found pid for this session!"
-msgstr "Не наёден идентификатор процесса для данной сессии!"
+msgstr "Не найдены процессы для вашей сессии!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:61
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:78
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:59
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:76
 msgid "Server get pids error"
 msgstr "Ошибка списка процессов с сервера"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:88
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:149
-msgid "Error pid"
-msgstr "Ошибка идентификатора процесса"
-
 #: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:101
-#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:104
-msgid "Error get data"
-msgstr "Ошибка при получении данных"
-
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:114
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:118
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:105
 msgid "no methods available"
 msgstr "Нет доступных методов"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:122
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:109
 msgid "You can execute:"
 msgstr "Вы можете запускать:"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:122
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:109
 msgid "use key"
 msgstr "используйте ключ"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:138
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:125
 msgid "Execute sessions:"
 msgstr "Запущенные сессии:"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:145
-msgid "PID for kill:"
-msgstr "Процесс для завершения: "
-
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:156
-msgid "Killed successfully"
-msgstr "Успешно убит"
-
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:158
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:135
 msgid "Process is completed"
 msgstr "Процесс завершён"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:160
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:139
+msgid "Process not found"
+msgstr "Процесс не найден"
+
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:141
 msgid "Certificate not found in server database"
 msgstr "Сертификат не найден в БД сервера"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:162
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:143
 msgid "Session doesn't belong to your certificate"
 msgstr "Сессия не соответствует Вашему сертификату"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:164
+#: /var/calculate/mydir/git/calculate-console/console/application/pid_information.py:145
 msgid "It was not possible to kill process"
 msgstr "Не удалось завершить процесс"
 
@@ -132,7 +119,7 @@ msgstr "Дата отзыва"
 
 #: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:98
 #: /var/calculate/mydir/git/calculate-console/console/application/cert_verify.py:103
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:343
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:353
 #, python-format
 msgid "error creating directory %s"
 msgstr "Ошибка при создании директории %s"
@@ -181,21 +168,26 @@ msgstr "Город: "
 msgid "Country (2 words): [%s]"
 msgstr "Страна (2 символа): [%s]"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:54
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:51
 msgid "Clear Cache error! "
 msgstr "Ошибка очистки кэша!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:240
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:237
 msgid "Error"
 msgstr "Ошибка"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:246
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:243
 msgid "Warning"
 msgstr "Предепреждение"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/function.py:419
-msgid "Error task by"
-msgstr "Ошибка задачи на"
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:384
+msgid "Process not exist or not belong to your session"
+msgstr "Процесс не существует или принадлежит не вашей сессии"
+
+#: /var/calculate/mydir/git/calculate-console/console/application/function.py:436
+#, python-format
+msgid "Error task by %s"
+msgstr "Ошибка задачи на %s"
 
 #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:59
 msgid "no connection to server!"
@@ -227,24 +219,46 @@ msgstr "послать запрос подписания сертификата
 
 #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:153
 msgid "get signed certificate from server"
-msgstr "Забрать подписанный сертификат с сервера"
+msgstr "забрать подписанный сертификат с сервера"
 
 #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:156
 msgid "path to cert and key files"
 msgstr "путь к файлам сертификата и ключа"
 
 #: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:159
-msgid "Update the certificate revocation lists"
-msgstr "Обновить список отзыва сертификатов"
-
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:293
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:296
-#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:298
+msgid "view a list of running processes"
+msgstr "просмотр списка запущенных процессов"
+
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:162
+msgid "dump (using with key --list-pid)"
+msgstr "дамп (используйте с ключом --list-pid)"
+
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:165
+msgid "view result of process"
+msgstr "просмотр результата работы процесса"
+
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:168
+msgid "kill selected process"
+msgstr "завершить выбранный процесс"
+
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:171
+msgid "update the certificate revocation lists"
+msgstr "обновить список отзыва сертификатов"
+
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:289
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:323
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:43
+msgid "Failed to connect"
+msgstr "Не удалось подключиться"
+
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:346
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:349
+#: /var/calculate/mydir/git/calculate-console/console/application/cl_client.py:351
 #, python-format
 msgid "Exception: %s"
 msgstr "Исключение: %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:27
+#: /var/calculate/mydir/git/calculate-console/console/application/methods_func.py:28
 msgid "Method not found: "
 msgstr "Метод не найден: "
 
@@ -325,6 +339,10 @@ msgstr "Ошибка sid (идентификатора сессии)"
 msgid "Enter correctly sid!"
 msgstr "Введите корректный идентификатор сессии!"
 
+#: /var/calculate/mydir/git/calculate-console/console/application/sid_func.py:104
+msgid "Error get data"
+msgstr "Ошибка при получении данных"
+
 #: /var/calculate/mydir/git/calculate-console/console/application/cert_func.py:38
 msgid "Certificate not found in Server Database!"
 msgstr "Сертификат не найден в БД сервера!"
@@ -437,22 +455,22 @@ 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:162
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:172
 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:172
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:182
 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:173
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:183
 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:175
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:185
 msgid "file with ca certificates exists"
 msgstr "Файл с сертификатом удостоверяющего центра создан"
 
@@ -485,76 +503,76 @@ msgstr "Ошибка номера сертификата"
 msgid "Enter correctly cert id!"
 msgstr "Введите корректный идентичикатор сертификата!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:90
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:100
 msgid "Certificate not found in client"
 msgstr "Сертификат не найден на стороне клиента"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:99
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:109
 msgid "Error open file"
 msgstr "Ошибка при открытии файла"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:185
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:195
 msgid "Server certificate is not valid"
 msgstr "Сертификат сервера недействителен!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:189
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:199
 msgid "CA not found on server"
 msgstr "Сертификат Центра Авторизации не найден на сервере"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:196
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:206
 msgid "Error. Certificate not added to trusted"
 msgstr "Ошибка! Сертификат не добавлен в доверенные"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:198
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:287
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:208
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:297
 #, python-format
 msgid "Fingerprint = %s"
 msgstr "Отпечаток = %s"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:199
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:288
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:209
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:298
 msgid "Serial Number = "
 msgstr "Серийный номер = "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:201
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:290
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:211
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:300
 msgid "Issuer"
 msgstr "Подписчик"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:205
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:294
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:215
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:304
 msgid "Subject"
 msgstr "Субъект"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:208
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:218
 msgid "Add CA certificates to trusted? y/[n]:"
 msgstr "Добавить сертификат Центра Авторизации в доверенные? y/[n]:"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:213
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:223
 msgid "Certificate not added to trusted"
 msgstr "Сертификат не добавлен в доверенные"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:284
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:294
 msgid "Untrusted Server Certificate!"
 msgstr "Недоверенный сертификат сервера!"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:298
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:308
 msgid "Add this Servers certificate to trusted (s) or"
 msgstr "Добавить сертификат этого сервера в доверенные (s) или"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:299
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:309
 msgid "Try add CA and ROOT certificates to trusted (c) or"
 msgstr "Попытаться добавить сертификат ЦА и корневой в доверенные (c) или"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:300
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:310
 msgid "Quit (q)? s/c/[q]: "
 msgstr "Выйти (q)? s/c/[q]: "
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:346
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:356
 msgid "Try add CA and ROOT certificates"
 msgstr "Добавить Корневой и сертификат ЦА"
 
-#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:381
+#: /var/calculate/mydir/git/calculate-console/console/application/client_class.py:391
 #, python-format
 msgid ""
 "\n"
@@ -563,533 +581,11 @@ msgstr ""
 "\n"
 "Внимание! %s пытается подменить сертификат!\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Fingerprint = %s"
-#~ msgstr "Отпечаток = %s"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Issuer"
-#~ msgstr "Подписчик"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Subject"
-#~ msgstr "Субъект"
-
-#~ msgid "Enter \"Yes\" or \"No\"!"
-#~ msgstr "Введите \"Yes\" или \"No\"!"
-
-#, fuzzy
-#~ msgid "Select one: "
-#~ msgstr "Выбор цвета"
-
-#, fuzzy
-#~ msgid "input error"
-#~ msgstr "Ошибка Ввода"
-
-#~ msgid "create error"
-#~ msgstr "ошибка создания"
-
-#, fuzzy
-#~ msgid "deleted error"
-#~ msgstr "Ошибка удаления сессии на сервере"
-
-#~ msgid "Server shutting down..."
-#~ msgstr "Server shutting down..."
-
-#, fuzzy
-#~ msgid "Connection error! "
-#~ msgstr "Ошибка соединения"
-
-#~ msgid "Connection lost!"
-#~ msgstr "Соединение потеряно!"
-
-#~ msgid "Server was restarted."
-#~ msgstr "Сервер был перезапущен."
-
-#~ msgid "Please, connect to server again."
-#~ msgstr "Пожалуйста, подключитесь к серверу снова."
-
-#~ msgid "Close your session"
-#~ msgstr "Закрыть данную сессию"
-
-#~ msgid "with %s?"
-#~ msgstr "c %s?"
-
-#~ msgid "at closing session, data %d process will be deleted!"
-#~ msgstr "При закрытии сессии данные %d процессa будут удалены!"
-
-#~ msgid "at closing session, data %d processes will be deleted!"
-#~ msgstr "При закрытии сессии данные %d процессов будут удалены!"
-
-#~ msgid "Yes"
-#~ msgstr "Да"
-
-#~ msgid "No"
-#~ msgstr "Нет"
-
-#~ msgid "Cancel"
-#~ msgstr "Отмена"
-
-#~ msgid "Back"
-#~ msgstr "Назад"
-
-#~ msgid "View information about running processes"
-#~ msgstr "Просмотр информации о запущенных процессах"
-
-#~ msgid "Session"
-#~ msgstr "Сессия"
-
-#~ msgid "View information about current session"
-#~ msgstr "Просмотр информации о текущей сессии"
-
-#~ msgid "Disconnect"
-#~ msgstr "Отсоединиться"
-
-#~ msgid "Connect"
-#~ msgstr "Соединиться"
-
-#~ msgid "Window work with certificates"
-#~ msgstr "Окно работы с сертификатами"
-
-#~ msgid "Tool"
-#~ msgstr "Настройки"
-
-#~ msgid "Application settings"
-#~ msgstr "Настройки приложения"
-
-#~ msgid "Help"
-#~ msgstr "Помощь"
-
-#~ msgid "About Application"
-#~ msgstr "О приложении"
-
-#~ msgid "Error get list pid from server"
-#~ msgstr "Ошибка получения списка идентификаторов процессов с сервера"
-
-#~ msgid "User@Server_HostName"
-#~ msgstr "Пользователь@Имя_сервера"
-
-#~ msgid "Network address"
-#~ msgstr "Сетевой адрес"
-
-#~ msgid "Create Request"
-#~ msgstr "Создать Запрос на подпись сертификата"
-
-#~ msgid "Field \"Country\" must be two-character"
-#~ msgstr "Поле \"Страна\" должно состоять из двух символов"
-
-#~ msgid "Kill process? (Process is active)"
-#~ msgstr "Убить процесс? (Процесс активен)"
-
-#~ msgid "View result of process id %s"
-#~ msgstr "Просмотреть результат работы процесса id %s"
-
-#~ msgid "No running processes in current session."
-#~ msgstr "Нет запущенных процессов в текущей сессии."
-
-#~ msgid "Task name"
-#~ msgstr "Имя задачи"
-
-#~ msgid "Start time"
-#~ msgstr "Время запуска"
-
-#~ msgid "Status"
-#~ msgstr "Статус"
-
-#~ msgid "Result"
-#~ msgstr "Результат"
-
-#~ msgid "Close"
-#~ msgstr "Закрыть"
-
-#~ msgid "New connection"
-#~ msgstr "Новое соединение"
-
-#~ msgid "At closing program all connects will be close!"
-#~ msgstr "При закрытии программы все соединения будут закрыты!"
-
-#~ msgid "Are you sure want to close program?"
-#~ msgstr "Вы точно хотите закрыть программу?"
-
-#~ msgid "At current step has mistake."
-#~ msgstr "На текущем шаге есть ошибка."
-
-#~ msgid "Do you want to continue?"
-#~ msgstr "Вы хотите продолжить?"
-
-#~ msgid "Composed of Calculate Utilities 3.0.0\n"
-#~ msgstr "Входит в состав Calculate Utilities 3.0.0\n"
-
-#~ msgid "Calculate Utilities developed company "
-#~ msgstr "Calculate Utilities Разрабатываются компанией "
-
-#~ msgid "Calculate. (c) 2007-%s"
-#~ msgstr "Калкулэйт. (c) 2007-%s"
-
-#~ msgid "Company website"
-#~ msgstr "Сайт Компании"
-
-#~ msgid "Distributive website"
-#~ msgstr "Сайт Дистрибутива"
-
-#~ msgid "Quit"
-#~ msgstr "Выход"
-
-#~ msgid "Calculate Utilities"
-#~ msgstr "Calculate Utilities"
-
-#~ msgid "Your name:"
-#~ msgstr "Ваше имя:"
-
-#~ msgid "Your email:"
-#~ msgstr "Ваш email:"
-
-#~ msgid "Please, enter valid email. "
-#~ msgstr "Пожалуйста, введите существующий адрес электронной почты! "
-
-#~ msgid "If email does not exist, letter will not reach."
-#~ msgstr "Если электронная почта не существует, то письмо не дойдет."
-
-#~ msgid "Subject:"
-#~ msgstr "Тема:"
-
-#~ msgid "Message:"
-#~ msgstr "Сообщение:"
-
-#~ msgid "Send Bug"
-#~ msgstr "Отправить ошибку"
-
-#~ msgid "Enter valid email!"
-#~ msgstr "Введите существующий адрес электронной почты!"
-
-#~ msgid "Email sent!"
-#~ msgstr "Письмо отправлено!"
-
-#~ msgid "Previous"
-#~ msgstr "Назад"
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "Next"
-#~ msgstr "Далее"
-
-#~ msgid "Error close process"
-#~ msgstr "Ошибка закрытия процесса"
-
-#~ msgid "Certificate added to database server. "
-#~ msgstr "Сертификат добавлен в базу сервера. "
-
-#~ msgid "Must restart the program."
-#~ msgstr "Необходимо перезапустить программу."
-
-#~ msgid "Not connected!"
-#~ msgstr "Соединение отсутствует!"
-
-#~ msgid "Your IP adress - "
-#~ msgstr "Ваш IP адрес - "
-
-#~ msgid "Your MAC adress - "
-#~ msgstr "Ваш MAC адрес - "
-
-#~ msgid "Your certificate ID = "
-#~ msgstr "Номер Вашего сертификата = "
-
-#~ msgid "Your session id = "
-#~ msgstr "Номер Вашей сессии = "
-
-#~ msgid "Error clearing session cache"
-#~ msgstr "Ошибка удаления кэша сессии"
-
-#~ msgid "Session cache is cleared"
-#~ msgstr "Кэш сессии удалён"
-
-#~ msgid "About Program"
-#~ msgstr "О программе"
-
-#~ msgid "System Settings Handbook"
-#~ msgstr "Руководство пользователя"
-
-#~ msgid "Report Bug"
-#~ msgstr "Сообщить об ошибке"
-
-#~ msgid "Open"
-#~ msgstr "Открыть"
-
-#~ msgid "Clear Table"
-#~ msgstr "Очистить таблицу"
-
-#~ msgid "Add row"
-#~ msgstr "Добавить строку"
-
-#~ msgid "Recover Table"
-#~ msgstr "Восстановить таблицу"
-
-#~ msgid "Check all"
-#~ msgstr "Отметить все"
-
-#~ msgid "Password"
-#~ msgstr "Пароль"
-
-#~ msgid "Repeat"
-#~ msgstr "Повтор"
-
-#~ msgid "Break process"
-#~ msgstr "Прервать процесс"
-
-#~ msgid "Host"
-#~ msgstr "Хост"
-
-#~ msgid "Port"
-#~ msgstr "Порт"
-
-#~ msgid "Send"
-#~ msgstr "Отправить"
-
-#~ msgid "Send certificate signing request"
-#~ msgstr "Отправить запрос на подпись сертификата"
-
-#~ msgid "Get"
-#~ msgstr "Получить"
-
-#~ msgid "Enter Hostname or IP adress"
-#~ msgstr "Введите имя хоста или IP адрес"
-
-#~ msgid "Field \"Host\" Error!"
-#~ msgstr "Ошибка в поле \"Хост\"!"
-
-#~ msgid "Field \"Port\" Error!"
-#~ msgstr "Ошибка в поле \"Порт\"!"
-
-#~ msgid "Error code: %s"
-#~ msgstr "Код ошибки: %s"
-
-#~ msgid "OK. Certificate save. Your certificate id = %s"
-#~ msgstr "Сертификат сохранён! Номер Вашего сертификата = %s"
-
-#~ msgid "Not found field \"CN\" in root certificate!"
-#~ msgstr "Не найдено поле \"CN\" в корневом сертификате!"
-
-#~ msgid "Root Certificate Add\n"
-#~ msgstr "Корневой сертификат добавлен\n"
-
-#~ msgid "Please break "
-#~ msgstr "Пожалуйста разорвите "
-
-#~ msgid "previous connection!"
-#~ msgstr "предыдущее соединение!"
-
-#~ msgid "You already connected to localhost!"
-#~ msgstr "Вы уже подсоединены к локальному серверу!"
-
-#~ msgid "This server is not trusted"
-#~ msgstr "Данный сервер не является доверенным"
-
-#~ msgid "Verify Error"
-#~ msgstr "Ошибка проверки сертификата сервера"
-
-#~ msgid "Write cl_api_get_frame_period Error!"
-#~ msgstr "Ошибка чтения переменной cl_api_get_frame_period!"
-
-#~ msgid "Error clear process cache on server"
-#~ msgstr "Ошибка удаления кэша процесса на сервере"
-
-#~ msgid "Error get frame from Server."
-#~ msgstr "Ошибка получения фрейма с сервера."
-
-#~ msgid "Please, resfesh this Page later."
-#~ msgstr "Пожалуйста, обновите эту страницу позже."
-
-#~ msgid "Error get progress from Server."
-#~ msgstr "Ошибка получения значения прогресса с сервера."
-
-#~ msgid "Percent = %s"
-#~ msgstr "Процент = %s"
-
-#~ msgid "Error send password to Server"
-#~ msgstr "Ошибка отправки сообщения (пароля) на сервер"
-
-#~ msgid "Tools"
-#~ msgstr "Настройки"
-
-#~ msgid "Clear config"
-#~ msgstr "Очистить файл конфигурации"
-
-#~ msgid "Gui Tools"
-#~ msgstr "Настройки интерфейса"
-
-#~ msgid "Other Tools"
-#~ msgstr "Прочие настройки"
-
-#~ msgid "In the %s tab has unsaved changes"
-#~ msgstr "На вкладке %s имеются несохранённые изменения"
-
-#~ msgid "<center>Apply them?</center>"
-#~ msgstr "<center>Применить их?</center>"
-
-#~ msgid "Format RGB (Red Green Blue)"
-#~ msgstr "Формат RGB (Красный Зелёный Синий)"
-
-#~ msgid "Path to bg Image"
-#~ msgstr "Фоновое изображение"
-
-#~ msgid "Select Background Image"
-#~ msgstr "Выберите фоновое изображение"
-
-#~ msgid "Enter \"No\" to remove Background"
-#~ msgstr "Введите  \"No\" для удаления фона"
-
-#~ msgid "Select repeat background"
-#~ msgstr "Повтор фона"
-
-#~ msgid "no repeat"
-#~ msgstr "не повторять"
-
-#~ msgid "repeat for x and y"
-#~ msgstr "повторять по x и по y"
-
-#~ msgid "repeat for x"
-#~ msgstr "повторять по x"
-
-#~ msgid "repeat for y"
-#~ msgstr "повторять по y"
-
-#~ msgid "Set opacity "
-#~ msgstr "Прозрачность "
-
-#~ msgid "Height image"
-#~ msgstr "Высота изображений"
-
-#~ msgid "Set fixed height image for actions"
-#~ msgstr "Установка фиксированной высоты изображений для действий"
-
-#~ msgid "0 - hide images"
-#~ msgstr "0 - скрыть изображения"
-
-#~ msgid "Apply"
-#~ msgstr "Применить"
-
-#~ msgid "Select Language"
-#~ msgstr "Выбор языка"
-
-#~ msgid "English"
-#~ msgstr "Английский"
-
-#~ msgid "Russian"
-#~ msgstr "Русский"
-
-#~ msgid "Certificate Directory"
-#~ msgstr "Директория с сертификатами"
-
-#~ msgid "Enter \"No\" to default path"
-#~ msgstr "Введите  \"No\" для выбора стандартного пути"
-
-#~ msgid "Timeout"
-#~ msgstr "Таймаут"
-
-#~ msgid "Expert view"
-#~ msgstr "Расширенный просмотр"
-
-#~ msgid "Expert mode view results"
-#~ msgstr "Расширенный режим просмотра результатов"
-
-#~ msgid "Count Row in result Table"
-#~ msgstr "Кол-во строк в таблице"
-
-#~ msgid "You are not connected to localhost server"
-#~ msgstr "Вы не подсоединены к локальному серверу!"
-
-#~ msgid "Update running"
-#~ msgstr "Обновление запущено"
-
-#~ msgid "Update aborted"
-#~ msgstr "Обновление прервано"
-
-#~ msgid "Update successfully completed"
-#~ msgstr "Обновление успешно завершено"
-
-#~ msgid "System control"
-#~ msgstr "Управление системой"
-
-#~ msgid "Show/Hide Window"
-#~ msgstr "Показать/спрятать окно"
-
-#~ msgid "Update system"
-#~ msgstr "Обновить систему"
-
-#~ msgid "Exit program"
-#~ msgstr "Выйти из программы"
-
-#~ msgid "Program settings"
-#~ msgstr "Настройки программы"
-
-#~ msgid "The system is updated"
-#~ msgstr "Система обновляется"
-
-#~ msgid "Stop updating and exit?"
-#~ msgstr "Остановить обновление и выйти?"
-
-#~ msgid "Update is already running"
-#~ msgstr "Обновление уже запущено"
-
-#~ msgid "Serial Number =  %s"
-#~ msgstr "Серийный номер = %s"
-
-#~ msgid "Add Servers certificate"
-#~ msgstr "Добавить сертификат сервера"
-
-#~ msgid ""
-#~ "Server certificate add to trusted \n"
-#~ "%s"
-#~ msgstr ""
-#~ "Сертификат сервера добавлен в доверенные \n"
-#~ "%s"
-
-#~ msgid "Certificate add"
-#~ msgstr "Сертификат добавлен"
-
-#~ msgid "filename = %s"
-#~ msgstr "Имя файла = %s"
-
-#~ msgid "File with ca certificates exists"
-#~ msgstr "Файл с сертификатом удостоверяющего центра создан"
-
-#~ msgid "Press for advanced settings."
-#~ msgstr "Нажмите для дополнительных настроек"
-
-#~ msgid "Clean expert parameters?"
-#~ msgstr "Очистить экспертные параметры?"
-
-#~ msgid "Delete selected rows"
-#~ msgstr "Удалить выделенные строки"
-
-#~ msgid "Delete row"
-#~ msgstr "Удалить строку"
-
-#~ msgid " Step "
-#~ msgstr " Шаг "
-
-#~ msgid "Run"
-#~ msgstr "Выполнение"
-
-#~ msgid "Unknown Error"
-#~ msgstr "Неизвестная ошибка"
-
-#, fuzzy
-#~ msgid "Add Row"
-#~ msgstr "Добавить строку"
-
-#~ msgid "Closed"
-#~ msgstr "Закрыт"
+#~ msgid "PID for kill:"
+#~ msgstr "Процесс для завершения: "
 
-#~ msgid "Delete information about this process"
-#~ msgstr "Удалить информацию о данном процессе"
+#~ msgid "Error pid"
+#~ msgstr "Ошибка идентификатора процесса"
 
-#~ msgid "Process cache deleted"
-#~ msgstr "Кэш процесса удалён"
+#~ msgid "Killed successfully"
+#~ msgstr "Успешно убит"

scripts/cl-console

@@ -15,8 +15,12 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-import sys
+import sys, datetime
 from calculate.console.application.cl_client import main
+reload(sys)
+sys.setdefaultencoding("utf-8")
 
 if __name__=='__main__':
+    now = datetime.datetime.now()
+    print 'BEGIN ===> %dm %ds %dms' %(now.minute, now.second, now.microsecond)
     sys.exit(main())