diff --git a/consolegui/application/Box.py b/consolegui/application/Box.py index fcb5cca..a7dd16f 100755 --- a/consolegui/application/Box.py +++ b/consolegui/application/Box.py @@ -118,9 +118,9 @@ class MainWgt(QtGui.QMainWindow): def hand_book(self): if self.ClientObj.lang == 'ru': - site="http://www.calculate-linux.ru/main/ru/calculate_console_gui" + site="http://www.calculate-linux.ru/main/ru/calculate-console-gui" else: - site="http://www.calculate-linux.org/main/en/calculate_console_gui" + site="http://www.calculate-linux.org/main/en/calculate-console-gui" QtGui.QDesktopServices.openUrl(QtCore.QUrl(site)) def bug_report(self): @@ -381,9 +381,10 @@ class MainWgt(QtGui.QMainWindow): if hasattr (self, 'con_lost_lbl'): self.con_lost_lbl.hide() self.con_lost_lbl.close() - self.con_lost_lbl = ConnectLostLabel(_('Server was restarted.')+ \ - '\n' + _('Please, connect to server again.'), \ - self, True) + self.con_lost_lbl = ConnectLostLabel \ + (_('The Server was restarted.') + '\n' + \ + _('Please try reconnecting to the server.'), + self, True) self.topmenu.Processes.setDisabled(True) self.topmenu.Session.setDisabled(True) self.topmenu.Back.setDisabled(True) @@ -400,15 +401,15 @@ class MainWgt(QtGui.QMainWindow): msgBox = QMessageBox(self) msgBox.setWindowTitle(_('Closing session')) - msgBox.setText(_("Close your session") +' ' +_('with %s?') \ + msgBox.setText(_("Close this session") +' ' +_('with %s?') \ %self.ClientObj.host_name + '\t') if len(list_pid): if str(len(list_pid)).endswith('1'): - msgBox.setInformativeText(_('at closing session, '\ - 'data %d process will be deleted!') %len(list_pid)) + msgBox.setInformativeText(_('Once the session is closed, '\ + 'data on %d process will be lost!') %len(list_pid)) if len(list_pid) > 1: - msgBox.setInformativeText(_('at closing session, '\ - 'data %d processes will be deleted!') %len(list_pid)) + msgBox.setInformativeText(_('Once the session is closed, '\ + 'data on %d processes will be lost!') %len(list_pid)) msgBox.setStandardButtons(QMessageBox.Yes | QMessageBox.No | \ QMessageBox.Cancel) diff --git a/consolegui/application/CertificateClass.py b/consolegui/application/CertificateClass.py index 86e90ab..d5ba577 100755 --- a/consolegui/application/CertificateClass.py +++ b/consolegui/application/CertificateClass.py @@ -50,12 +50,12 @@ class CertClass (QtGui.QWidget): layout_button = QtGui.QHBoxLayout() - Send_button = QtGui.QPushButton(_("Send request"), self) + Send_button = QtGui.QPushButton(_("Send a request"), self) # Send_button.setFixedWidth(140) Send_button.clicked.connect(self.send) layout_button.addWidget(Send_button) - Get_button = QtGui.QPushButton(_("Get certificate"), self) + Get_button = QtGui.QPushButton(_("Get a certificate"), self) # Get_button.setFixedWidth(140) Get_button.clicked.connect(self.get) layout_button.addWidget(Get_button) @@ -71,7 +71,7 @@ class CertClass (QtGui.QWidget): self.sendlayout.setColumnStretch(1,1) self.sendlayout.setColumnStretch(2,1) - self.GroupBoxSend = QtGui.QGroupBox(_('Certificate signing request')) + self.GroupBoxSend = QtGui.QGroupBox(_('Certificate signature request')) # self.GroupBoxSend.setContentsMargins(10,0,0,0) self.GroupBoxSend.setLayout(self.sendlayout) @@ -96,23 +96,23 @@ class CertClass (QtGui.QWidget): by_host = self.send_host.text() if by_host == '': - show_msg (_('Enter Hostname or IP adress'), \ - _('Field "Host" Error!')) + show_msg (_('Enter the hostname or the IP address'), \ + _('Incorrect "Host" value!')) return 1 port = self.send_port.text() if port == '' or not port.isdigit(): - show_msg (_('Enter Port'), _('Field "Port" Error!')) + show_msg (_('Enter the port number'), _('Incorrect "Port" value!')) return 1 # send request cert_path = self.default_cert_path if os.path.exists(cert_path + 'req_id'): - text = _("You have sent a request to sign the certificate!") + text=_("You have already sent a request to sign the certificate!") informative_text = _("request id - %s") \ %open(cert_path + 'req_id', 'r').read()+'\n' \ - + _("Send new request?") + + _("Send a new request?") reply = show_question(self, text, informative_text, title = _('Calculate Console')) @@ -131,13 +131,14 @@ class CertClass (QtGui.QWidget): except (KeyboardInterrupt, urllib2.URLError), e: try: show_msg(e.reason.strerror.decode('utf-8') \ - , _("Close. Connecting Error."), self) + , _("Closing. Connection error."), self) except (UnicodeDecodeError, UnicodeEncodeError): show_msg(e.reason.strerror, \ - _("Close. Connecting Error."), self) + _("Closing. Connection error."), self) return 1 except (UnicodeDecodeError, UnicodeEncodeError): - show_msg (_('Enter Hostname or IP adress'), _('Input Error'), self) + show_msg (_('Enter the hostname or the IP address'), + _('Input error'), self) return 1 self.client.wsdl.services[0].setlocation(url) try: @@ -152,8 +153,9 @@ class CertClass (QtGui.QWidget): self.csr_file = cert_path + server_host_name +'.csr' if os.path.exists(key) and os.path.exists(self.csr_file): - text = _('Private Key and Request exists!') - informative_text = _("Create new Private Key and Request?") + text = _('The private key and the request now exist!') + informative_text = \ + _("Create a new private key and signature request?") reply = show_question(self, text, informative_text, title = _('Calculate Console')) @@ -183,18 +185,19 @@ class CertClass (QtGui.QWidget): return 1 del (self.client) if int(res) < 0: - show_msg (_("This server can not sign certificate!"), parent=self) + show_msg (_("This server has not signed the certificate!"), + parent=self) return 1 fc = open(self.default_cert_path + 'req_id', 'w') fc.write(res) fc.close() - show_msg ( _("Your request id - %s") %res, parent = self) + show_msg ( _("Your request ID = %s") %res, parent = self) return 0 def get(self): cert_path = self.default_cert_path if not os.path.exists(cert_path + 'req_id'): - show_msg (_("request was not sent or deleted file %s") \ + show_msg (_("Request not sent, or file %s deleted") \ %(cert_path + 'req_id'), self) return 1 fc = open(cert_path + 'req_id', 'r') @@ -203,13 +206,14 @@ class CertClass (QtGui.QWidget): from_host = self.send_host.text() if from_host == '': - show_msg (_('Enter Hostname or IP adress'), \ - _('Field "Host" Error!'), self) + show_msg (_('Enter the hostname or the IP address'), \ + _('Incorrect "Host" value!'), self) return 1 port = self.send_port.text() if port == '' or not port.isdigit(): - show_msg (_('Enter Port'), _('Field "Port" Error!'), self) + show_msg (_('Enter the port number'), _('Incorrect "Port" value!'), + self) return 1 url = "https://%s:%s/?wsdl" %(from_host, port) @@ -219,12 +223,12 @@ class CertClass (QtGui.QWidget): transport = HTTPSClientCertTransport(None, None, \ cert_path, parent = self.ClientObj)) except (KeyboardInterrupt, urllib2.URLError), e: - show_msg(_("Error code: %s") %e, _("Close. Connecting Error."), \ + show_msg(_("Error code: %s") %e, _("Closing. Connection error."),\ self) return 1 except (UnicodeDecodeError, UnicodeEncodeError): - show_msg (_('Enter Hostname or IP adress'), \ - _('Input Error'), self) + show_msg (_('Enter the hostname or the IP address'), \ + _('Input error'), self) return 1 client.wsdl.services[0].setlocation(url) try: @@ -235,7 +239,7 @@ class CertClass (QtGui.QWidget): return 1 if not os.path.exists(cert_path + server_host_name + '.csr'): - show_msg(_('Request %s not found on client side') \ + show_msg(_('Request %s not found on the client’s side') \ %(cert_path + server_host_name + '.csr')) return 1 @@ -258,20 +262,21 @@ class CertClass (QtGui.QWidget): ca_root = None # show_msg(e.message) if cert == '1': - show_msg (_('Request to sign is rejected!')) + show_msg (_('Signature request rejected!')) return 1 elif cert == '2': - show_msg (_("Request for the signing has not yet reviewed.\n") + \ - _("Your request id - %s") %req_id) + show_msg (_("The request has not been reviewed yet.") + '\n' + \ + _("Your request ID = %s") %req_id) return 1 elif cert == '3': - show_msg (_("Request on signature does not match sent earlier.")) + show_msg (_('Either the request or the signature does not match ' + 'the earlier ones.')) return 1 fc = open(cert_path + server_host_name + '.crt', 'w') fc.write(cert) fc.close() os.unlink(cert_path + 'req_id') - show_msg (_('OK. Certificate save. Your certificate id = %s') %req_id) + show_msg (_('Certificate saved. Your certificate ID = %s') %req_id) if ca_root: system_ca_db = self.ClientObj.VarsApi.Get('cl_glob_root_cert') @@ -321,20 +326,22 @@ class CertClass (QtGui.QWidget): fc.close() if not filename: - show_msg (_('Not found field "CN" in root certificate!')) + show_msg \ + (_('Field "CN" not found in the root certificate!')) return 1 fd = open(cl_client_cert_dir + '/ca/' + filename, 'w') fd.write(ca_root) fd.close() - user_root_cert = self.ClientObj.VarsApi.Get('cl_user_root_cert') + user_root_cert = self.ClientObj.VarsApi.Get \ + ('cl_user_root_cert') user_root_cert = user_root_cert.replace("~",homePath) fa = open(user_root_cert, 'a') fa.write(ca_root) fa.close() - _print (_("filename = "), filename) - show_msg (_("Root Certificate Add") + '\n' + filename) + _print (_("Filename = "), filename) + show_msg (_("Root certificate added") + '\n' + filename) else: - _print (_("file with ca certificates exists")) + _print (_("File with CA certificates now exists")) return 0 diff --git a/consolegui/application/ConnectionTabs.py b/consolegui/application/ConnectionTabs.py index e78950f..bee05fe 100644 --- a/consolegui/application/ConnectionTabs.py +++ b/consolegui/application/ConnectionTabs.py @@ -14,6 +14,8 @@ from more import get_sid, get_view_params from MainClass import ApiClient from calculate.consolegui.datavars import DataVarsGui from pid_information import client_pid_info +from calculate.lib.cl_lang import setLocalTranslate +setLocalTranslate('console_gui',sys.modules[__name__]) class SelectedMethodWgt(QtGui.QWidget): def __init__(self, app, args): @@ -51,7 +53,7 @@ class SelectedMethodWgt(QtGui.QWidget): self.resize(900,560) else: self.resize(900, 726) - self.setMinimumHeight(300) + self.setMinimumHeight(100) self.setMinimumWidth(300) self.show() @@ -181,10 +183,13 @@ class SelectedMethodWgt(QtGui.QWidget): def parse(): import argparse - parser = argparse.ArgumentParser() + parser = argparse.ArgumentParser(add_help=False) + parser.add_argument( + '-h', '--help', action='store_true', default=False, + dest='help', help=_("show this help message and exit")) parser.add_argument( '-l', '--lang', type=str, dest='lang', - help=_('language for translate')) + help=_('language for translation')) parser.add_argument( '--method', type=str, dest='method', help=_('call method')) @@ -193,8 +198,8 @@ def parse(): help=_('port number')) parser.add_argument( '--host', type=str, default = 'localhost', dest='host', - help=_('host destination')) - return parser.parse_args() + help=_('destination host')) + return parser class DBusWidget(dbus.service.Object): def __init__(self, name, session, parent): @@ -275,7 +280,7 @@ class ToolTabWidget(QtGui.QTabWidget): self.resize(900,560) else: self.resize(900, 700) - self.setMinimumHeight(450) + self.setMinimumHeight(100) self.setMinimumWidth(450) self.setWindowTitle(self.Name) diff --git a/consolegui/application/ControlButton.py b/consolegui/application/ControlButton.py index 0efb824..e422589 100644 --- a/consolegui/application/ControlButton.py +++ b/consolegui/application/ControlButton.py @@ -238,7 +238,7 @@ class ControlButtonWgt(QtGui.QWidget): sid = int(self.ClientObj.sid) res = self.ClientObj.client.service.clear_pid_cache(sid, self.pid) if res: - _print (_('Error close process')) + _print (_('Error when closing the process')) from calculate.consolegui.application.ConnectionTabs \ import SelectedMethodWgt diff --git a/consolegui/application/LeftMenu.py b/consolegui/application/LeftMenu.py index 3ff2c6d..668141b 100755 --- a/consolegui/application/LeftMenu.py +++ b/consolegui/application/LeftMenu.py @@ -441,7 +441,7 @@ class LeftMenu(QtGui.QScrollArea): if self._parent.ClientObj.param_objects[method_name]['error']: if self._parent.ClientObj.param_objects[method_name]['step'] < \ self.step: - text = _('At current step has mistake.') + text = _('Error at this step.') informative_text = _('Do you want to continue?') reply = show_question(self._parent, text, informative_text, \ not_move = True, title = _('Calculate Console')) diff --git a/consolegui/application/MainFrameResult.py b/consolegui/application/MainFrameResult.py index 3354d03..e922fd4 100755 --- a/consolegui/application/MainFrameResult.py +++ b/consolegui/application/MainFrameResult.py @@ -362,7 +362,7 @@ class MainFrameRes(QtGui.QWidget): # sid = int(self.ClientObj.sid) # res = self.client.service.clear_pid_cache(sid, self.cur_pid) # if res: -# _print (_('Error close process')) +# _print (_('Error when closing the process')) # self._parent.back() def startGroup(self, item): @@ -392,11 +392,11 @@ class MainFrameRes(QtGui.QWidget): if result in [0,2]: return 0 elif result == -1: - msg = _("Certificate not found in server database!") + msg = _("Certificate not found in the server database!") elif result == -2: - msg = _("Session doesn't belong to your certificate!") + msg = _("Session not matching your certificate!") elif result == 1: - msg = _("It was not possible to kill process!") + msg = _("Failed to kill the process!") else: msg = 'error' @@ -510,9 +510,9 @@ class MainFrameRes(QtGui.QWidget): def get_Frame_cycle(self, current_frame, through_object): if type(current_frame) == Exception: - _print (_('Error get frame from Server...')) - show_msg(_('Error get frame from Server.') +'\n'+ \ - _('Please, resfesh this Page later.'),'get frame error') + _print (_('Failed to get the frame from the server.')) + show_msg(_('Failed to get the frame from the server.') +'\n'+ \ + _('Try resfeshing this page later.'),'get frame error') return 1 sid, pid = through_object if current_frame in [None, [], ""]: @@ -585,9 +585,9 @@ class MainFrameRes(QtGui.QWidget): def get_entire_frame_after(self, current_frame, through_object): if type(current_frame) == Exception: - _print (_('Error get entire frame from Server...')) -# show_msg(_('Error get frame from Server.') +'\n'+ \ -# _('Please, resfesh this Page later.'),'get frame error') + _print (_('Failed to get the complete frame from the server.')) +# show_msg(_('Failed to get the frame from the server.') +'\n'+ \ +# _('Try resfeshing this page later.'),'get frame error') return 1 sid, pid = through_object end_frame = 1 @@ -635,9 +635,10 @@ class MainFrameRes(QtGui.QWidget): def get_Progress_cycle(self, returnProgr, through_object): if type(returnProgr) == Exception: - _print (_('Error get progress from Server.')) -# show_msg(_('Error get progress from Server.') +'\n'+ \ -# _('Please, resfesh this Page later.'),'get progress error') + _print (_('Failed to get progress status from the server')) +# show_msg(_('Failed to get progress status from the server') + \ +# '\n'+ \ +# _('Try resfeshing this page later.'),'get progress error') return 1 sid, pid, id, temp_progress, progressBar = through_object ######################################## @@ -815,7 +816,7 @@ class MessageDialog(QtGui.QWidget): def send_password_after(self, result): if type(result) == Exception: - show_msg(_('Error send password to Server')) + show_msg(_('Failed to send the message (password) to the server')) self.close() return 1 self._parent.show_result(result) diff --git a/consolegui/application/ShortFrameResult.py b/consolegui/application/ShortFrameResult.py index 5a01adb..becdaa9 100644 --- a/consolegui/application/ShortFrameResult.py +++ b/consolegui/application/ShortFrameResult.py @@ -253,11 +253,11 @@ class ShortFrameRes(QtGui.QWidget): if result in [0,2]: return 0 elif result == -1: - msg = _("Certificate not found in server database!") + msg = _("Certificate not found in the server database!") elif result == -2: - msg = _("Session doesn't belong to your certificate!") + msg = _("Session not matching your certificate!") elif result == 1: - msg = _("It was not possible to kill process!") + msg = _("Failed to kill the process!") else: msg = 'error' show_msg(msg) @@ -364,9 +364,9 @@ class ShortFrameRes(QtGui.QWidget): def get_Frame_cycle(self, current_frame, through_object): if type(current_frame) == Exception: - _print (_('Error get frame from Server...')) - show_msg(_('Error get frame from Server.') +'\n'+ \ - _('Please, resfesh this Page later.'),'get frame error') + _print (_('Failed to get the frame from the server.')) + show_msg(_('Failed to get the frame from the server.') +'\n'+ \ + _('Try resfeshing this page later.'),'get frame error') return 1 sid, pid = through_object if current_frame in [None, [], ""]: @@ -438,9 +438,9 @@ class ShortFrameRes(QtGui.QWidget): def get_entire_frame_after(self, current_frame, through_object): if type(current_frame) == Exception: - _print (_('Error get entire frame from Server...')) - show_msg(_('Error get frame from Server.') +'\n'+ \ - _('Please, resfesh this Page later.'),'get frame error') + _print (_('Failed to get the complete frame from the server.')) + show_msg(_('Failed to get the frame from the server.') +'\n'+ \ + _('Try resfeshing this page later.'),'get frame error') return 1 sid, pid = through_object end_frame = 1 @@ -480,9 +480,9 @@ class ShortFrameRes(QtGui.QWidget): def get_Progress_cycle(self, returnProgr, through_object): if type(returnProgr) == Exception: - _print (_('Error get progress from Server.')) - show_msg(_('Error get progress from Server.') +'\n'+ \ - _('Please, resfesh this Page later.'),'get progress error') + _print (_('Failed to get progress status from the server')) + show_msg(_('Failed to get progress status from the server')+'\n'+\ + _('Try resfeshing this page later.'),'get progress error') return 1 sid, pid, id, temp_progress = through_object ######################################## @@ -626,7 +626,7 @@ class MessageDialog(QtGui.QWidget): def send_password_after(self, result): if type(result) == Exception: - show_msg(_('Error send password to Server')) + show_msg(_('Failed to send the message (password) to the server')) self.close() return 1 self._parent.show_result(result) diff --git a/consolegui/application/TrayIcon.py b/consolegui/application/TrayIcon.py index 9596e58..c4a3a60 100644 --- a/consolegui/application/TrayIcon.py +++ b/consolegui/application/TrayIcon.py @@ -161,7 +161,7 @@ class TrayIcon (QtGui.QSystemTrayIcon): self.left_menu.exit_action.setText(_('Exit program')) # Translate right click menu - self.right_menu.about_action.setText(_('About Program')) + self.right_menu.about_action.setText(_('About')) self.right_menu.bug_action.setText(_('Report Bug')) self.right_menu.tools_action.setText(_('Program settings')) # self.right_menu.sys_update.setText(_('Update system')) @@ -328,7 +328,7 @@ class RightButtonMenu(QtGui.QMenu): if not About_icon.isNull(): break - self.about_action = QtGui.QAction(About_icon, _("About Program"), + self.about_action = QtGui.QAction(About_icon, _("About"), self, triggered=parent.help) self.addAction(self.about_action) diff --git a/consolegui/application/View_Process.py b/consolegui/application/View_Process.py index 2179fa9..67e0696 100755 --- a/consolegui/application/View_Process.py +++ b/consolegui/application/View_Process.py @@ -84,7 +84,7 @@ class ViewProc(QtGui.QWidget): # add status button if self.ClientObj.process_dict[str(list_pid[num])]['status'] == '1': - kill_but_text = _('Kill process? (Process is active)') + kill_but_text = _('Kill the process? (The process is active)') kill_button = QtGui.QPushButton(kill_but_text, self) kill_button.clicked.connect(self.kill_process \ (int(list_pid[num]), num+2, 2)) @@ -92,7 +92,7 @@ class ViewProc(QtGui.QWidget): if self.ClientObj.process_dict[str(list_pid[num])]['status'] =='0': self.status_list.append(LabelWordWrap \ - (_('Process is completed'), self)) + (_('Process completed'), self)) if self.ClientObj.process_dict[str(list_pid[num])]['status'] =='2': self.status_list.append(LabelWordWrap \ (_('Process killed'), self)) @@ -100,7 +100,7 @@ class ViewProc(QtGui.QWidget): self.grid_layout.addWidget(self.status_list[num], num+2, 2) # add 'View result' button - button_text = _('View result of process id %s') %str(list_pid[num]) + button_text = _('View the result, PID %s') %str(list_pid[num]) Button = QtGui.QPushButton(button_text, self) @@ -111,8 +111,8 @@ class ViewProc(QtGui.QWidget): self.grid_layout.addWidget(self.button_list[num], num+2, 3) if not len(list_pid): - self.grid_layout.addWidget(LabelWordWrap \ - (_('No running processes in current session.'), self)) + self.grid_layout.addWidget(LabelWordWrap(_('No running processes' + ' in the current session'), self)) else: self.grid_layout.addWidget(LabelWordWrap(_('Task name'), self),1,0) @@ -175,15 +175,15 @@ class ViewProc(QtGui.QWidget): def kill_process_after(self, result): if result == 0: - msg = _("Killed successfully!") + msg = _("Well killed!") elif result == 2: - msg = _("Process is completed") + msg = _("Process completed") elif result == -1: - msg = _("Certificate not found in server database!") + msg = _("Certificate not found in the server database!") elif result == -2: - msg = _("Session doesn't belong to your certificate!") + msg = _("Session not matching your certificate!") elif result == 1: - msg = _("It was not possible to kill process!") + msg = _("Failed to kill the process!") else: msg = 'error' diff --git a/consolegui/application/client_class.py b/consolegui/application/client_class.py index 276d3d0..61980a3 100755 --- a/consolegui/application/client_class.py +++ b/consolegui/application/client_class.py @@ -370,7 +370,7 @@ class CheckingClientHTTPSConnection(CheckingHTTPSConnection): fa = open(user_root_cert, 'a') fa.write(cert+'\n') fa.close() - show_msg (_("filename = %s") %filename, _('CERTIFICATE ADD')) + show_msg (_("Filename = %s") %filename, _('CERTIFICATE ADD')) else: show_msg (_('File with ca certificates exists')) get_CRL(cl_client_cert_dir) diff --git a/consolegui/application/conf_connection.py b/consolegui/application/conf_connection.py index 9e260b5..f2785bf 100755 --- a/consolegui/application/conf_connection.py +++ b/consolegui/application/conf_connection.py @@ -169,8 +169,8 @@ class FrameConnection(QtGui.QWidget): def onClick(self): self.setDisabled(True) if self.ClientObj.client: - show_msg(_('You are connected to server!')+'\n' + \ - _('Please break ') + _('previous connection!'), \ + show_msg(_('You are connected to the server!')+'\n' + \ + _('Please break') +' '+ _('previous connection!'), \ _('Connection Error')) return 1 @@ -236,7 +236,7 @@ class FrameConnection(QtGui.QWidget): try: int_port = int(self.str_port) except: - show_msg(_("Enter correctly port!")) + show_msg(_("Enter the port correctly!")) return 1 self.connect_to_host(self.str_host, int_port) @@ -337,7 +337,7 @@ class FrameConnection(QtGui.QWidget): self.ClientObj.lang) Connect_Error = 0 except VerifyError, e: - show_msg (e.value, _("Verify Error"), self) + show_msg (e.value,_("Certificate verification error"),self) e.message = 'VerifyError' Connect_Error = 1 except OpenSSL.crypto.Error, e: @@ -352,22 +352,22 @@ class FrameConnection(QtGui.QWidget): if Connect_Error: self.ClientObj.client = None if crypto_Error and 'passwd' in locals(): - show_msg (_('Password is invalid'), \ + show_msg (_('Invalid password'), \ _('Connection Error'), self) return # self.close() if not locals().has_key('e'): - mess = _('You do not have a certificate. Please, ' - 'generate new request and get new certificate ' - 'from server.') + mess = _('You do not have a certificate. Please generate ' + 'a new request and get a new certificate from ' + 'the server.') show_msg (mess, parent = self) elif e.message == 'VerifyError': pass elif e.message == 1: mess = _('You do not have a certificate or your ' - 'certificate does not match the server ' - 'certificate. Please, generate new request and' - 'get new certificate from server.') + 'certificate does not match the server certificate.' + ' Please generate a new request and get a new ' + 'certificate from the server.') show_msg (mess, parent = self) else: if e.message or e.args: diff --git a/consolegui/application/create_cert.py b/consolegui/application/create_cert.py index b42d3a2..7100c2b 100755 --- a/consolegui/application/create_cert.py +++ b/consolegui/application/create_cert.py @@ -84,8 +84,9 @@ class RequestCreate (QtGui.QWidget): self.mainlayout.addWidget(self.state_name, 4,1) # Add Country field - self.mainlayout.addWidget(LabelWordWrap(_('Country (2 words)'), self),\ - 5,0,QtCore.Qt.AlignRight) + self.mainlayout.addWidget(LabelWordWrap \ + (_('Country (a two-character tag)'), self), + 5,0,QtCore.Qt.AlignRight) self.country = QtGui.QLineEdit('Ru', self) # only 2 words rx = QtCore.QRegExp ("^[a-zA-Z]{0,2}$") @@ -105,7 +106,8 @@ class RequestCreate (QtGui.QWidget): self.mainlayout.addWidget(self.passwd_lineedit, 6,1) # Add create button - self.CreateButton = QtGui.QPushButton(_('Create Request'), self) + self.CreateButton = QtGui.QPushButton(_('Create a signature request'), + self) self.CreateButton.setFixedWidth(self.CreateButton.sizeHint().width()) self.CreateButton.clicked.connect(self.create_req) button_layout.addWidget(self.CreateButton) @@ -123,7 +125,7 @@ class RequestCreate (QtGui.QWidget): # for clear memory after closed this window self.setAttribute(QtCore.Qt.WA_DeleteOnClose) - self.setWindowTitle (_('Create Request')) + self.setWindowTitle (_('Create a signature request')) self.setWindowIcon (QtGui.QIcon.fromTheme("view-certificate")) self.setFocus() @@ -135,8 +137,8 @@ class RequestCreate (QtGui.QWidget): def create_req(self): if len(self.country.text()) != 2: - show_msg(_('Field "Country" must be two-character'), \ - _('Input Error')) + show_msg(_('The \"Country\" field must be two-character'), \ + _('Input error')) return ######################################### diff --git a/consolegui/application/helpwidget.py b/consolegui/application/helpwidget.py index a3df788..647c959 100755 --- a/consolegui/application/helpwidget.py +++ b/consolegui/application/helpwidget.py @@ -18,7 +18,7 @@ from PySide import QtGui, QtCore from more import LabelWordWrap, show_msg import datetime -_('User should be not root') +_('The user should not be root') class HelpWgt(QtGui.QWidget): def __init__(self, parent): QtGui.QWidget.__init__(self) @@ -28,7 +28,7 @@ class HelpWgt(QtGui.QWidget): motto = 'Easy Linux from the Source.
' help_text = '%s v%s. \n' %(parent.ClientObj.Name, \ parent.ClientObj.Version) + \ - _('Composed of Calculate Utilities 3.0.0.') + '
' + \ + _('Makes part of Calculate Utilities 3.0.0') + '
' + \ _('Company') + ' Calculate %s 2007-%s' %(copy_right,cur_year) html_help = ("" + \ @@ -118,11 +118,11 @@ class BugWgt(QtGui.QWidget): self.name_edit = QtGui.QLineEdit(self) send_mail_lbl = QtGui.QLabel(_('Your email:') + ' *', self) - send_mail_lbl.setToolTip(_('Please, enter valid email. ') + '\n' + \ - _('If email does not exist, letter will not reach.')) + send_mail_lbl.setToolTip(_('Please enter a valid email. ') + '\n' + \ + _('If the email does not exist, you will receive no letter')) self.send_mail_edit = QtGui.QLineEdit(self) - self.send_mail_edit.setToolTip(_('Please, enter valid email. ') + \ - '\n' + _('If email does not exist, letter will not reach.')) + self.send_mail_edit.setToolTip(_('Please enter a valid email. ')+'\n'+\ + _('If the email does not exist, you will receive no letter')) subject_lbl = QtGui.QLabel(_('Subject:'), self) self.subject_edit = QtGui.QLineEdit(self) @@ -130,7 +130,7 @@ class BugWgt(QtGui.QWidget): message_lbl = QtGui.QLabel(_('Message:'), self) self.message_edit = QtGui.QTextEdit(self) - Send_button = QtGui.QPushButton(_("Send Bug"), self) + Send_button = QtGui.QPushButton(_("Send a Bug"), self) Send_button.setShortcut(QtGui.QKeySequence(QtCore.Qt.Key_Return)) Send_button.setMinimumWidth(Send_button.sizeHint().width()) Send_button.clicked.connect(self.send_bug) @@ -202,7 +202,7 @@ class BugWgt(QtGui.QWidget): mail_re = re.compile("^[a-zA-Z_0-9\.\-]{1,32}[\@]{1}[a-zA-Z_0-9]"+\ "{1,16}[\.]{1}[a-zA-Z]{1,3}$") if not mail_re.findall(sender): - show_msg (_('Enter valid email!')) + show_msg (_('Enter a valid email!')) return 1 to_name = 'calculate bug report' diff --git a/consolegui/application/mainframe.py b/consolegui/application/mainframe.py index 7de77b0..be4fb2b 100755 --- a/consolegui/application/mainframe.py +++ b/consolegui/application/mainframe.py @@ -1351,7 +1351,7 @@ class MainFrame(QtGui.QWidget): except: plus_but.setText('+') - plus_but.setToolTip(_('Add row')) + plus_but.setToolTip(_('Add a row')) plus_but.setFixedWidth(30) self.view_dict[field.name].minus_but = QtGui.QPushButton(self) @@ -1371,7 +1371,7 @@ class MainFrame(QtGui.QWidget): except: refresh_but.setText('R') - refresh_but.setToolTip(_('Recover Table')) + refresh_but.setToolTip(_('Recover the table')) refresh_but.setFixedWidth(30) clear_but = QtGui.QPushButton(self) @@ -1380,7 +1380,7 @@ class MainFrame(QtGui.QWidget): except: clear_but.setText('C') - clear_but.setToolTip(_('Clear Table')) + clear_but.setToolTip(_('Clear the table')) clear_but.setFixedWidth(30) plus_but.clicked.connect(self.plus_row(self.view_dict[field.name],\ @@ -1782,10 +1782,35 @@ class MainFrame(QtGui.QWidget): if not Group.fields: return grid_x # self.group_name_label = LabelWordWrap(Group.name, self) - GroupBox = QGroupBox(Group.name, self) - GroupBox.setStyleSheet("QGroupBox{" -# "font-size: 18px;" - "font-weight: bold;}") + GroupBox = QGroupBox(Group.name) + GroupBox.setObjectName('GroupBoxBrief') +# brief_widget.setStyleSheet("#Brief_w " + GroupBox.setStyleSheet('#GroupBoxBrief {' +# "QGroupBox {" + 'font-weight: bold; font-color: red;' + 'padding-top: 24px; padding-bottom: 0px;' + 'padding-left: 5px; padding-right: 5px;' + 'border: 1px solid transparent;' + 'border-top-color: gray;' + 'border-left-color: qlineargradient ' + '(x1: 0, y1: 0, x2: 0, y2: 1,' + 'stop: 0 gray, stop: 0.7 gray, stop: 1 transparent);' + + 'border-right-color: qlineargradient' + '(x1: 0, y1: 0, x2: 0, y2: 1,' + 'stop: 0 gray, stop: 0.7 gray, stop: 1 transparent);' + + 'background-color: qlineargradient ' + '(x1: 0, y1: 0, x2: 0, y2: 1,' + 'stop: 0 #eeeeee, stop: 0.8 transparent, stop: 1 transparent);' + 'border-bottom: 0px;' + 'border-top-left-radius: 4px;' + 'border-top-right-radius: 4px;}' + + 'QGroupBox::title {' + 'background-color: transparent;' + 'subcontrol-position: top center;' + 'margin-top: 6px;}') else: return grid_x gb_layout = QtGui.QGridLayout(GroupBox) diff --git a/consolegui/application/mainmenu.py b/consolegui/application/mainmenu.py index 1a68b1d..5328a3e 100755 --- a/consolegui/application/mainmenu.py +++ b/consolegui/application/mainmenu.py @@ -56,8 +56,10 @@ class MainMenu(QtGui.QWidget): ######### View information about current session self.Session = TopMenu(_('Session'), ['document-edit-verify', \ 'document-revert','edit-find'], self) - self.Session.setStatusTip(_('View information about current session')) - self.Session.setToolTip(_('View information about current session')) + self.Session.setStatusTip \ + (_('View information about the current session')) + self.Session.setToolTip \ + (_('View information about the current session')) self.Session.clicked.connect(parent.view_session_info) self.Session.setVisible(False) self.hlayout.addWidget(self.Session) @@ -66,7 +68,7 @@ class MainMenu(QtGui.QWidget): self.Disconnect = TopMenu(_('Disconnect'), \ ['network-disconnect', 'connect_no'], self) self.Disconnect.setStatusTip(_('Disconnect')) - self.Disconnect.setToolTip(_('Disconnect from current server')) + self.Disconnect.setToolTip(_('Disconnect from the current server')) self.Disconnect.clicked.connect(parent.disconnect) self.Disconnect.setVisible(False) self.hlayout.addWidget(self.Disconnect) @@ -82,13 +84,13 @@ class MainMenu(QtGui.QWidget): ######### Window work with certificates self.Certificates = TopMenu(_('Certificates'), \ ['view-certificate', 'application-certificate'], self) - self.Certificates.setStatusTip(_('Window work with certificates')) - self.Certificates.setToolTip(_('Window work with certificates')) + self.Certificates.setStatusTip(_('Certificates manager')) + self.Certificates.setToolTip(_('Certificates manager')) self.Certificates.clicked.connect(parent.work_with_certificates) self.hlayout.addWidget(self.Certificates) ######### Tools dialog - self.Tool = TopMenu(_('Tool'),['preferences-other', \ + self.Tool = TopMenu(_('Tools'),['preferences-other', \ 'preferences-system'], self) self.Tool.setStatusTip(_('Application settings')) self.Tool.setToolTip(_('Application settings')) @@ -132,13 +134,15 @@ class MainMenu(QtGui.QWidget): ######### View information about current session self.Session.setText(_('Session')) - self.Session.setStatusTip(_('View information about current session')) - self.Session.setToolTip(_('View information about current session')) + self.Session.setStatusTip \ + (_('View information about the current session')) + self.Session.setToolTip \ + (_('View information about the current session')) ######### Exit this session self.Disconnect.setText(_('Disconnect')) self.Disconnect.setStatusTip(_('Disconnect')) - self.Disconnect.setToolTip(_('Disconnect from current server')) + self.Disconnect.setToolTip(_('Disconnect from the current server')) ######### Connection self.Connect.setText(_('Connect')) @@ -147,11 +151,11 @@ class MainMenu(QtGui.QWidget): ######### Window work with certificates self.Certificates.setText(_('Certificates')) - self.Certificates.setStatusTip(_('Window work with certificates')) - self.Certificates.setToolTip(_('Window work with certificates')) + self.Certificates.setStatusTip(_('Certificates manager')) + self.Certificates.setToolTip(_('Certificates manager')) ######### Tools dialog - self.Tool.setText(_('Tool')) + self.Tool.setText(_('Tools')) self.Tool.setStatusTip(_('Application settings')) self.Tool.setToolTip(_('Application settings')) diff --git a/consolegui/application/more.py b/consolegui/application/more.py index 48c116a..76ee415 100755 --- a/consolegui/application/more.py +++ b/consolegui/application/more.py @@ -141,7 +141,7 @@ class HelpMenu(TopMenu): if not About_icon.isNull(): break - about = QtGui.QAction(About_icon, _("About Program"), self, \ + about = QtGui.QAction(About_icon, _("About"), self, \ triggered=self.actions.help) menu.addAction(about) @@ -158,7 +158,7 @@ class HelpMenu(TopMenu): if not handbook_icon.isNull(): break - handbook = QtGui.QAction(handbook_icon,_("Information"),\ + handbook = QtGui.QAction(handbook_icon,_("Info"),\ self, triggered=self.actions.hand_book) menu.addAction(handbook) @@ -1022,7 +1022,7 @@ class MultipleChoice (QtGui.QWidget): self.clear_button.setIcon(QtGui.QIcon.fromTheme('edit-clear')) except: self.clear_button.setText('C') - self.clear_button.setToolTip(_('Clear Table')) + self.clear_button.setToolTip(_('Clear the table')) self.clear_button.setStyleSheet("border: none;") self.clear_button.setFixedWidth(24) self.clear_button.clicked.connect(self.default_value) @@ -1123,7 +1123,7 @@ class SelectTable(QtGui.QWidget): except: plus_but.setText('+') - plus_but.setToolTip(_('Add row')) + plus_but.setToolTip(_('Add a row')) plus_but.setFixedWidth(30) plus_but.clicked.connect(self.line_add) unit_layout.addWidget(plus_but) @@ -1134,7 +1134,7 @@ class SelectTable(QtGui.QWidget): except: self.recover_but.setText('R') - self.recover_but.setToolTip(_('Recover Table')) + self.recover_but.setToolTip(_('Recover the table')) self.recover_but.setFixedWidth(30) self.recover_but.clicked.connect(self.recover_table) @@ -1262,7 +1262,7 @@ class SelectTable(QtGui.QWidget): self.resize_table() def line_add(self): - self.addLineWgt = AddLineWidget(self, _('Add row')) + self.addLineWgt = AddLineWidget(self, _('Add a row')) def resize_table(self): # Resize table @@ -1328,7 +1328,7 @@ class SelectList(QtGui.QGroupBox): self.plus_but.setIcon(QtGui.QIcon.fromTheme('list-add')) except: self.plus_but.setText('+') - self.plus_but.setToolTip(_('Add row')) + self.plus_but.setToolTip(_('Add a row')) self.plus_but.clicked.connect(self.line_add) self.plus_but.setDisabled(True) buttons_layout.addWidget(self.plus_but) @@ -1341,7 +1341,7 @@ class SelectList(QtGui.QGroupBox): except: self.recover_but.setText('R') - self.recover_but.setToolTip(_('Reset changes')) + self.recover_but.setToolTip(_('Reset')) self.recover_but.clicked.connect(self.recover_list) if default: self.recover_but.setDisabled(True) @@ -1441,7 +1441,7 @@ class SelectList(QtGui.QGroupBox): item.clicked.connect(self.selected_row) def line_add(self): - self.addLineWgt = AddLineWidget(self, _('Add row')) + self.addLineWgt = AddLineWidget(self, _('Add a row')) def recover_list(self): if hasattr (self, 'plus_but'): @@ -2150,7 +2150,7 @@ class ResultLayout(QtGui.QVBoxLayout): self.setContentsMargins(28,28,28,10) self.setSpacing(10) - self.kill_process_button = QtGui.QPushButton(_('Break process')) + self.kill_process_button = QtGui.QPushButton(_('Break the process')) self.kill_process_button.setFixedWidth(144) self.kill_process_button.setContentsMargins(0,10,0,0) self.addWidget(self.kill_process_button) @@ -2314,8 +2314,8 @@ def client_post_auth(client): """ authorization client or post request """ try: if not os.path.exists(client.CERT_FILE): - show_msg (_("You do not have a certificate. Please, generate new" - " request and get new certificate from server.")) + show_msg (_('You do not have a certificate. Please generate a ' + 'new request and get a new certificate from the server.')) return 1 except VerifyError, e: show_msg (e.value) @@ -2420,9 +2420,11 @@ def client_del_sid(client): sid = get_sid(client) try: s = client.service.del_sid(sid) + fd = open(client.SID_FILE, 'w') + fd.close() if s[0][0] == "-1": - _print (_("No access to file!")) + _print (_("No access to the file!")) return -1 if s[0][0] == "1": _print (_("Failed to obtain certificate data!")) @@ -2431,14 +2433,15 @@ def client_del_sid(client): _print (_("Permission denied %s") % s[1][1]) return -3 if s[0][0] == '0': - _print (_("Sid Deleted!")) + pass +# _print (_("SID deleted!")) except urllib2.URLError as e: if e.__str__() == '': _print ('Closing process...') - _print (_("Sid Deleted!")) +# _print (_("SID deleted!")) return 0 except Exception, e: - _print (_("Server delete sid error"), e) + _print (_("Error removing the session from the server"), e) return 1 return 0 diff --git a/consolegui/application/pid_information.py b/consolegui/application/pid_information.py index 4ba7b24..f4c1768 100755 --- a/consolegui/application/pid_information.py +++ b/consolegui/application/pid_information.py @@ -56,7 +56,7 @@ def client_list_pid(client): else: return list_pid[0] except: - _print (_("Error get list pid from server")) + _print (_("Failed to get the PID list from the server")) return [] def gen_pid_ls(client): diff --git a/consolegui/application/session_function.py b/consolegui/application/session_function.py index ed8aabb..72e61d8 100755 --- a/consolegui/application/session_function.py +++ b/consolegui/application/session_function.py @@ -55,19 +55,18 @@ def client_post_cert (client, lang): raise Exception() sid, new_session = client_sid(sid, client, results[0][0], lang) if new_session: - _print (_(" New Session")) - else: _print (_(" Old Session")) - _print (_(" Your session id = %s") %sid) + _print (_(" New session")) + else: _print (_(" Old session")) + _print (_(" Your session ID = %s") %sid) if results[0][0] == -3: - _print (_("Certificate not send!")) + _print (_("Certificate not sent!")) else: - _print (_(" Your certifitate id = %d") %(results[0][0])) + _print (_(" Your certifitate ID = %d") %(results[0][0])) try: if results[0][1] == -2: - _print (_("expiry date certificate has passed")) + _print (_("Certificate expired")) elif results[0][1] > 0: - _print (_("shelf life expires after %d days") \ - %(results[0][1])) + _print (_("Expires after %d days")%(results[0][1])) except: pass @@ -93,32 +92,32 @@ class ViewSessionInfo (QtGui.QWidget): return 1 sid = get_sid(client) - self.layout.addWidget(LabelWordWrap(_('Your session id = ')+str(sid), + self.layout.addWidget(LabelWordWrap(_('Your session ID = ')+str(sid), self), 4,0,1,2) if results[0][0] == -3: - self.layout.addWidget(LabelWordWrap(_('Certificate not send!'), + self.layout.addWidget(LabelWordWrap(_('Certificate not sent!'), self), 5,0,1,2) else: self.layout.addWidget(LabelWordWrap(_('Your certifitate id = ') \ + str(results[0][0]), self), 5,0,1,2) try: if results[0][1] == -2: - self.layout.addWidget(LabelWordWrap(_('expiry date ' + self.layout.addWidget(LabelWordWrap(_('expiry ' 'certificate has passed'), self), 6,0,1,2) elif results[0][1] > 0: self.layout.addWidget(LabelWordWrap(_('shelf life expires' ' after %d days')%(results[0][1]), self), 6,0,1,2) except: pass - self.layout.addWidget(LabelWordWrap(_('Your IP adress - ') + ip, + self.layout.addWidget(LabelWordWrap(_('Your IP address: ') + ip, self), 7,0,1,2) - self.layout.addWidget(LabelWordWrap(_('Your MAC adress - ') + mac, + self.layout.addWidget(LabelWordWrap(_('Your MAC address: ') + mac, self), 8,0,1,2) # Add clear cache Button self.clear_cache_button = QtGui.QPushButton \ - (_('Clear session cache'), self) + (_('Clear your session cache'), self) self.clear_cache_button.clicked.connect(self.clear_cache(client, sid)) self.layout.addWidget(self.clear_cache_button, 9,0) @@ -148,7 +147,7 @@ class ViewSessionInfo (QtGui.QWidget): show_msg(e, 'Error') return 1 if res: - show_msg(_('Error clearing session cache'), parent = self) + show_msg(_('Error clearing the session cache'), parent = self) else: - show_msg(_('Session cache is cleared'), parent = self) + show_msg(_('Session cache cleared'), parent = self) return wrapper \ No newline at end of file diff --git a/consolegui/application/tools.py b/consolegui/application/tools.py index 141590a..208fffa 100755 --- a/consolegui/application/tools.py +++ b/consolegui/application/tools.py @@ -59,7 +59,8 @@ class ToolsWidget (QtGui.QWidget): # Add clear config button clear_icon = QtGui.QIcon.fromTheme("edit-delete-page") - clear_button = QtGui.QPushButton (clear_icon, _('Clear config'),self) + clear_button = QtGui.QPushButton (clear_icon, + _('Clear the configuration file'),self) clear_button.clicked.connect(self.clear_config(parent, ClientObj)) self.vlayout.addWidget(clear_button) @@ -138,7 +139,7 @@ class ToolTabWidget(QtGui.QTabWidget): if self.other_icon.isNull(): self.other_icon = QtGui.QIcon.fromTheme("preferences-desctop") - self.addTab(self.GuiWidget, self.gui_icon ,_('Gui Tools')) + self.addTab(self.GuiWidget, self.gui_icon ,_('GUI Tools')) self.addTab(self.OtherWidget, self.other_icon, _('Other Tools')) # message about save @@ -153,10 +154,10 @@ class ToolTabWidget(QtGui.QTabWidget): def save_mess(self, tab_num): # change tab with unsaved changes - tab_list = [_('Gui Tools'),_('Other Tools')] + tab_list = [_('GUI Tools'),_('Other Tools')] if self.changed_flag: - text = _('In the %s tab has unsaved changes') \ + text = _('There are unsaved changes on tab %s') \ %tab_list[self.cur_tab_num] informative_text = _('
Apply them?
') @@ -179,7 +180,7 @@ class ToolTabWidget(QtGui.QTabWidget): if self.cur_tab_num == 0: self.GuiWidget = ToolGui(self, self.ClientObj) self.insertTab(self.cur_tab_num, self.GuiWidget, \ - self.gui_icon, _('Gui Tools')) + self.gui_icon, _('GUI Tools')) elif self.cur_tab_num == 1: self.OtherWidget = ToolOther(self, self.ClientObj) self.insertTab(self.cur_tab_num, self.OtherWidget, \ diff --git a/ru/console_gui.po b/ru/console_gui.po old mode 100755 new mode 100644 index fafac12..4d81434 --- a/ru/console_gui.po +++ b/ru/console_gui.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: console_gui_translate\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-20 09:24+0300\n" -"PO-Revision-Date: 2012-06-20 09:24+0300\n" +"POT-Creation-Date: 2012-06-25 16:41+0300\n" +"PO-Revision-Date: 2012-06-25 16:42+0300\n" "Last-Translator: Denis \n" "Language-Team: \n" "Language: \n" @@ -15,62 +15,62 @@ msgstr "" "X-Poedit-SourceCharset: utf-8\n" "X-Poedit-SearchPath-0: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application\n" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:361 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:362 msgid "Connection lost!" msgstr "Соединение потеряно!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:383 -msgid "Server was restarted." +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:385 +msgid "The Server was restarted." msgstr "Сервер был перезапущен." -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:384 -msgid "Please, connect to server again." +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:386 +msgid "Please try reconnecting to the server." msgstr "Пожалуйста, подключитесь к серверу снова." -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:401 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:403 msgid "Closing session" msgstr "Закрытие сессии" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:402 -msgid "Close your session" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:404 +msgid "Close this session" msgstr "Закрыть данную сессию" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:402 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:404 #, python-format msgid "with %s?" msgstr "c %s?" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:406 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:408 #, python-format -msgid "at closing session, data %d process will be deleted!" +msgid "Once the session is closed, data on %d process will be lost!" msgstr "При закрытии сессии данные %d процессa будут удалены!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:409 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:411 #, python-format -msgid "at closing session, data %d processes will be deleted!" -msgstr "При закрытии сессии данные %d процессов будут удалены!" - -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:416 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:131 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:702 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1959 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2286 +msgid "Once the session is closed, data on %d processes will be lost!" +msgstr "При закрытии сессии данные %d процессa будут удалены!" + +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:418 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:173 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:699 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1956 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2283 msgid "Yes" msgstr "Да" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:417 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:132 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:704 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1961 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2287 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:419 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:174 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:701 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1958 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2284 msgid "No" msgstr "Нет" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:422 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:114 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:893 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1077 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2052 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:424 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:116 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:890 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1074 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2049 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:50 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:132 msgid "Cancel" @@ -79,94 +79,94 @@ msgstr "Отмена" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:29 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:30 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:31 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:136 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:137 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:138 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:124 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:125 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:126 msgid "Back" msgstr "Назад" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:47 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:141 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:46 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:129 msgid "Processes" msgstr "Процессы" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:49 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:48 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:50 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:142 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:143 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:130 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:132 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/View_Process.py:36 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/View_Process.py:44 msgid "View information about running processes" msgstr "Просмотр информации о запущенных процессах" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:57 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:146 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:136 msgid "Session" msgstr "Сессия" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:59 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:60 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:147 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:148 -msgid "View information about current session" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:62 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:138 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:140 +msgid "View information about the current session" msgstr "Просмотр информации о текущей сессии" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:67 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:69 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:151 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:152 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:68 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:70 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:143 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:144 msgid "Disconnect" msgstr "Отсоединиться" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:70 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:153 -msgid "Disconnect from current server" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:71 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:145 +msgid "Disconnect from the current server" msgstr "Отсоединиться от текущего сервера" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:77 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:79 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:80 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:156 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:157 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:158 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:148 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:149 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:150 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:125 msgid "Connect" msgstr "Соединиться" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:87 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:161 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:85 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:153 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:90 msgid "Certificates" msgstr "Сертификаты" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:89 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:90 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:162 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:163 -msgid "Window work with certificates" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:87 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:88 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:154 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:155 +msgid "Certificates manager" msgstr "Окно работы с сертификатами" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:96 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:166 -msgid "Tool" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:93 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:158 +msgid "Tools" msgstr "Настройки" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:98 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:99 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:167 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:168 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:95 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:96 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:159 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:160 msgid "Application settings" msgstr "Настройки приложения" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:105 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:107 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:171 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:172 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:101 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:103 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:163 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainmenu.py:164 msgid "Help" msgstr "Помощь" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/pid_information.py:59 -msgid "Error get list pid from server" +msgid "Failed to get the PID list from the server" msgstr "Ошибка получения списка идентификаторов процессов с сервера" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/pid_information.py:81 @@ -199,40 +199,40 @@ msgstr "Сетевой адрес" msgid "State Name" msgstr "Город" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:87 -msgid "Country (2 words)" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:88 +msgid "Country (a two-character tag)" msgstr "Страна (2 символа)" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:101 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1832 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2036 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:102 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1829 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2033 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:36 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:85 msgid "Password" msgstr "Пароль" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:108 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:126 -msgid "Create Request" -msgstr "Создать Запрос на подпись сертификата" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:109 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:128 +msgid "Create a signature request" +msgstr "Создать запрос на подпись сертификата" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:138 -msgid "Field \"Country\" must be two-character" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:140 +msgid "The \"Country\" field must be two-character" msgstr "Поле \"Страна\" должно состоять из двух символов" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:139 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:140 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:227 -msgid "Input Error" -msgstr "Ошибка Ввода" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:141 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:141 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:231 +msgid "Input error" +msgstr "Ошибка ввода" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/View_Process.py:87 -msgid "Kill process? (Process is active)" +msgid "Kill the process? (The process is active)" msgstr "Убить процесс? (Процесс активен)" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/View_Process.py:95 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/View_Process.py:181 -msgid "Process is completed" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/View_Process.py:180 +msgid "Process completed" msgstr "Процесс завершён" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/View_Process.py:98 @@ -241,12 +241,12 @@ msgstr "Процесс убит" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/View_Process.py:103 #, python-format -msgid "View result of process id %s" -msgstr "Просмотреть результат работы процесса id %s" +msgid "View the result, PID %s" +msgstr "Просмотреть результат работы процесса ID %s" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/View_Process.py:115 -msgid "No running processes in current session." -msgstr "Нет запущенных процессов в текущей сессии." +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/View_Process.py:114 +msgid "No running processes in the current session" +msgstr "Нет запущенных процессов в текущей сессии" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/View_Process.py:118 msgid "Task name" @@ -264,53 +264,57 @@ msgstr "Статус" msgid "Result" msgstr "Результат" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/View_Process.py:179 -msgid "Killed successfully!" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/View_Process.py:178 +msgid "Well killed!" msgstr "Успешно убит!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/View_Process.py:183 -msgid "Certificate not found in server database!" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/View_Process.py:182 +msgid "Certificate not found in the server database!" msgstr "Сертификат не найден в БД сервера!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/View_Process.py:185 -msgid "Session doesn't belong to your certificate!" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/View_Process.py:184 +msgid "Session not matching your certificate!" msgstr "Сессия не соответствует Вашему сертификату!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/View_Process.py:187 -msgid "It was not possible to kill process!" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/View_Process.py:186 +msgid "Failed to kill the process!" msgstr "Не удалось завершить процесс!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:126 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:168 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:53 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:138 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:224 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:125 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:124 msgid "Close" msgstr "Закрыть" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:147 -msgid "language for translate" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:189 +msgid "show this help message and exit" +msgstr "вывод этой справки и выход" + +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:192 +msgid "language for translation" msgstr "язык для перевода" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:150 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:195 msgid "call method" msgstr "вызов метода" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:153 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:198 msgid "port number" msgstr "номер порта" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:156 -msgid "host destination" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:201 +msgid "destination host" msgstr "хост назначения" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:283 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:356 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:347 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:420 msgid "New connection" msgstr "Новое соединение" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/LeftMenu.py:444 -msgid "At current step has mistake." +msgid "Error at this step." msgstr "На текущем шаге есть ошибка." #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/LeftMenu.py:445 @@ -319,17 +323,17 @@ msgstr "Вы хотите продолжить?" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/LeftMenu.py:447 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:117 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:158 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:160 msgid "Calculate Console" msgstr "Calculate Console" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:21 -msgid "User should be not root" +msgid "The user should not be root" msgstr "Пользователь должен быть не root" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:31 -msgid "Composed of Calculate Utilities 3.0.0." -msgstr "Входит в состав Calculate Utilities 3.0.0." +msgid "Makes part of Calculate Utilities 3.0.0" +msgstr "Входит в состав Calculate Utilities 3.0.0" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:32 msgid "Company" @@ -340,8 +344,8 @@ msgid "Company website" msgstr "Сайт Компании" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:43 -msgid "Distributive website" -msgstr "Сайт Дистрибутива" +msgid "Distribution website" +msgstr "Сайт дистрибутива" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:88 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:168 @@ -358,13 +362,13 @@ msgstr "Ваш email:" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:121 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:124 -msgid "Please, enter valid email. " -msgstr "Пожалуйста, введите существующий адрес электронной почты! " +msgid "Please enter a valid email. " +msgstr "Пожалуйста, введите существующий адрес электронной почты." #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:122 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:125 -msgid "If email does not exist, letter will not reach." -msgstr "Если электронная почта не существует, то письмо не дойдет." +msgid "If the email does not exist, you will receive no letter" +msgstr "Если электронная почта не существует, то письмо не дойдет" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:127 msgid "Subject:" @@ -375,18 +379,18 @@ msgid "Message:" msgstr "Сообщение:" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:133 -msgid "Send Bug" +msgid "Send a Bug" msgstr "Отправить ошибку" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:183 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:180 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:332 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:395 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:178 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:329 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:392 msgid "Report Bug" msgstr "Сообщить об ошибке" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:205 -msgid "Enter valid email!" +msgid "Enter a valid email!" msgstr "Введите существующий адрес электронной почты!" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:230 @@ -402,7 +406,7 @@ msgid "Previous" msgstr "Назад" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:163 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2047 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2044 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:43 msgid "Ok" msgstr "Ok" @@ -412,11 +416,11 @@ msgid "Next" msgstr "Далее" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:241 -msgid "Error close process" +msgid "Error when closing the process" msgstr "Ошибка закрытия процесса" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:54 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:90 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:89 msgid "Certificate not found in Server Database!" msgstr "Сертификат не найден в БД сервера!" @@ -425,161 +429,168 @@ msgid "Error" msgstr "Ошибка" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:58 -msgid " New Session" +msgid " New session" msgstr "Новая сессия" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:59 -msgid " Old Session" -msgstr "Старая сессия" +msgid " Old session" +msgstr "Предыдущая сессия" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:60 #, python-format -msgid " Your session id = %s" +msgid " Your session ID = %s" msgstr "Номер Вашей сессии = %s" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:62 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:100 -msgid "Certificate not send!" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:99 +msgid "Certificate not sent!" msgstr "Сертификат не отправлен!" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:64 #, python-format -msgid " Your certifitate id = %d" +msgid " Your certifitate ID = %d" msgstr "Номер Вашего сертификата = %d" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:67 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:107 -msgid "expiry date certificate has passed" +msgid "Certificate expired" msgstr "Время жизни сертификата истекло" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:69 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:110 #, python-format -msgid "shelf life expires after %d days" +msgid "Expires after %d days" msgstr "Время жизни сертификата истекает через %d дней" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:83 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:149 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:182 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:234 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:251 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:82 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:150 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:184 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:238 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:255 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:275 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:278 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:285 msgid "Not connected!" msgstr "Соединение отсутствует!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:96 -msgid "Your session id = " +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:95 +msgid "Your session ID = " msgstr "Номер Вашей сессии = " -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:103 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:102 msgid "Your certifitate id = " msgstr "Номер Вашего сертификата = " -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:114 -msgid "Your IP adress - " +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:106 +msgid "expiry certificate has passed" +msgstr "Время жизни сертификата истекло" + +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:109 +#, python-format +msgid "shelf life expires after %d days" +msgstr "Время жизни сертификата истекает через %d дней" + +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:113 +msgid "Your IP address: " msgstr "Ваш IP адрес - " -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:116 -msgid "Your MAC adress - " +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:115 +msgid "Your MAC address: " msgstr "Ваш MAC адрес - " -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:121 -msgid "Clear session cache" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:120 +msgid "Clear your session cache" msgstr "Очистить кэш сессии" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:136 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:135 msgid "Session information" msgstr "Информация о сессии" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:151 -msgid "Error clearing session cache" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:150 +msgid "Error clearing the session cache" msgstr "Ошибка удаления кэша сессии" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:153 -msgid "Session cache is cleared" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:152 +msgid "Session cache cleared" msgstr "Кэш сессии удалён" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:146 -msgid "About Program" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:144 +msgid "About" msgstr "О программе" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:163 -msgid "Information" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:161 +msgid "Info" msgstr "Справка" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:490 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:601 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:487 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:598 msgid "Open" msgstr "Открыть" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:700 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1963 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:697 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1960 msgid "Auto" msgstr "Авто" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1028 -msgid "Clear Table" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1025 +msgid "Clear the table" msgstr "Очистить таблицу" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1129 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1268 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1334 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1447 -msgid "Add row" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1126 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1265 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1331 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1444 +msgid "Add a row" msgstr "Добавить строку" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1140 -msgid "Recover Table" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1137 +msgid "Recover the table" msgstr "Восстановить таблицу" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1184 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1181 msgid "Check all" msgstr "Отметить все" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1347 -msgid "Reset changes" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1344 +msgid "Reset" msgstr "Сбросить изменения" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1835 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2042 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1832 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2039 msgid "Repeat" msgstr "Повтор" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2156 -msgid "Break process" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2153 +msgid "Break the process" msgstr "Прервать процесс" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2320 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2317 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:360 -msgid "You do not have a certificate. Please, generate new request and get new certificate from server." +msgid "You do not have a certificate. Please generate a new request and get a new certificate from the server." msgstr "У Вас нет сертификата. Пожалуйста, сгенерируйте запрос на сертитфикат и получите сертификат с сервера." -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2388 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2398 msgid "No methods available!" msgstr "Нет доступных методов!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2415 -msgid "No access to file!" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2425 +msgid "No access to the file!" msgstr "Нет доступа к файлу!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2418 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2428 msgid "Failed to obtain certificate data!" msgstr "Не удалось получить данные сертификата!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2421 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2431 #, python-format msgid "Permission denied %s" msgstr "Доступ запрещён %s" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2424 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2428 -msgid "Sid Deleted!" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2434 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2438 +msgid "SID deleted!" msgstr "Сессия удалена!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2431 -msgid "Server delete sid error" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2441 +msgid "Error removing the session from the server" msgstr "Ошибка удаления сессии на сервере" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:41 @@ -593,11 +604,11 @@ msgid "Port" msgstr "Порт" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:53 -msgid "Send request" +msgid "Send a request" msgstr "Отправить запрос" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:58 -msgid "Get certificate" +msgid "Get a certificate" msgstr "Получить сертификат" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:63 @@ -605,33 +616,33 @@ msgid "Quit" msgstr "Выход" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:74 -msgid "Certificate signing request" +msgid "Certificate signature request" msgstr "Запрос на подпись сертификата" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:99 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:140 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:206 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:226 -msgid "Enter Hostname or IP adress" -msgstr "Введите имя хоста или IP адрес" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:209 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:230 +msgid "Enter the hostname or the IP address" +msgstr "Введите имя хоста или IP-адрес" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:100 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:207 -msgid "Field \"Host\" Error!" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:210 +msgid "Incorrect \"Host\" value!" msgstr "Ошибка в поле \"Хост\"!" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:105 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:212 -msgid "Enter Port" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:215 +msgid "Enter the port number" msgstr "Введите номер порта" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:105 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:212 -msgid "Field \"Port\" Error!" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:215 +msgid "Incorrect \"Port\" value!" msgstr "Ошибка в поле \"Порт\"!" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:112 -msgid "You have sent a request to sign the certificate!" +msgid "You have already sent a request to sign the certificate!" msgstr "У Вас уже есть запрос на подписание сертификата!" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:113 @@ -640,79 +651,79 @@ msgid "request id - %s" msgstr "Номер Вашего запроса - %s" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:115 -msgid "Send new request?" +msgid "Send a new request?" msgstr "Отправить навый запрос на подпись сертификата?" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:134 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:137 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:222 -msgid "Close. Connecting Error." +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:226 +msgid "Closing. Connection error." msgstr "Ошибка соединения. Закрываюсь." -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:155 -msgid "Private Key and Request exists!" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:156 +msgid "The private key and the request now exist!" msgstr "Секретный ключ и запрос на подпись сертификата созданы!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:156 -msgid "Create new Private Key and Request?" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:158 +msgid "Create a new private key and signature request?" msgstr "Создать новые Секретный Ключ и Запрос на подпись сертификата?" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:186 -msgid "This server can not sign certificate!" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:188 +msgid "This server has not signed the certificate!" msgstr "Сервер не подписал сертификат!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:191 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:265 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:194 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:269 #, python-format -msgid "Your request id - %s" -msgstr "Номер Вашего запроса - %s" +msgid "Your request ID = %s" +msgstr "Номер Вашего запроса = %s" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:197 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:200 #, python-format -msgid "request was not sent or deleted file %s" -msgstr "Запрос не был послан или удалён файл %s" +msgid "Request not sent, or file %s deleted" +msgstr "Запрос не был послан, или удалён файл %s" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:222 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:226 #, python-format msgid "Error code: %s" msgstr "Код ошибки: %s" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:238 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:242 #, python-format -msgid "Request %s not found on client side" +msgid "Request %s not found on the client’s side" msgstr "Запрос %s не найден на стороне клиента" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:261 -msgid "Request to sign is rejected!" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:265 +msgid "Signature request rejected!" msgstr "Запрос на подпись сертификата отвергнут!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:264 -msgid "Request for the signing has not yet reviewed.\n" -msgstr "Запрос на подписание сертификата ещё не рассмотрен.\n" - #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:268 -msgid "Request on signature does not match sent earlier." +msgid "The request has not been reviewed yet." +msgstr "Запрос на подписание сертификата ещё не рассмотрен." + +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:272 +msgid "Either the request or the signature does not match the earlier ones." msgstr "Запрос или подпись не соответствуют отправленным ранее." -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:274 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:279 #, python-format -msgid "OK. Certificate save. Your certificate id = %s" +msgid "Certificate saved. Your certificate ID = %s" msgstr "Сертификат сохранён! Номер Вашего сертификата = %s" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:324 -msgid "Not found field \"CN\" in root certificate!" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:330 +msgid "Field \"CN\" not found in the root certificate!" msgstr "Не найдено поле \"CN\" в корневом сертификате!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:336 -msgid "filename = " +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:343 +msgid "Filename = " msgstr "Имя файла =" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:337 -msgid "Root Certificate Add" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:344 +msgid "Root certificate added" msgstr "Корневой сертификат добавлен" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:339 -msgid "file with ca certificates exists" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:346 +msgid "File with CA certificates now exists" msgstr "Файл с сертификатом удостоверяющего центра создан" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:160 @@ -720,12 +731,12 @@ msgid "Connection" msgstr "Соединение" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:172 -msgid "You are connected to server!" +msgid "You are connected to the server!" msgstr "Вы подсоединены к серверу!" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:173 -msgid "Please break " -msgstr "Пожалуйста разорвите " +msgid "Please break" +msgstr "Пожалуйста разорвите" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:173 msgid "previous connection!" @@ -737,7 +748,7 @@ msgid "Connection Error" msgstr "Ошибка соединения" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:239 -msgid "Enter correctly port!" +msgid "Enter the port correctly!" msgstr "Введите корректный порт!" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:275 @@ -745,139 +756,132 @@ msgid "This server is not trusted" msgstr "Данный сервер не является доверенным" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:340 -msgid "Verify Error" +msgid "Certificate verification error" msgstr "Ошибка проверки сертификата сервера" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:355 -msgid "Password is invalid" +msgid "Invalid password" msgstr "Пароль неверен" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:367 -msgid "You do not have a certificate or your certificate does not match the server certificate. Please, generate new request andget new certificate from server." -msgstr "У вас нет сертификата или ваш сертификат не соответствует серверному сертификату. Пожалуйста, сгенерируйте запрос на сертитфикат и получите сертификат с сервера." +msgid "You do not have a certificate or your certificate does not match the server certificate. Please generate a new request and get a new certificate from the server." +msgstr "У вас нет сертификата или ваш сертификат не соответствует серверному сертификату. Пожалуйста, сгенерируйте запрос на сертификат и получите сертификат с сервера." #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:367 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:513 -msgid "Error get frame from Server..." -msgstr "Ошибка получения фрейма с сервера." - #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:368 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:442 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:513 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:514 -msgid "Error get frame from Server." +msgid "Failed to get the frame from the server." msgstr "Ошибка получения фрейма с сервера." #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:369 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:443 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:485 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:515 -msgid "Please, resfesh this Page later." +msgid "Try resfeshing this page later." msgstr "Пожалуйста, обновите эту страницу позже." #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:441 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:588 -msgid "Error get entire frame from Server..." +msgid "Failed to get the complete frame from the server." msgstr "Ошибка получения полного фрейма с сервера." #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:483 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:484 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:638 -msgid "Error get progress from Server." -msgstr "Ошибка получения значения прогресса с сервера." +msgid "Failed to get progress status from the server" +msgstr "Ошибка получения значения прогресса с сервера" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:596 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:785 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:786 msgid "Send" msgstr "Отправить" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:629 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:818 -msgid "Error send password to Server" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:819 +msgid "Failed to send the message (password) to the server" msgstr "Ошибка отправки сообщения (пароля) на сервер" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:36 -msgid "Tools" -msgstr "Настройки" - -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:62 -msgid "Clear config" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:63 +msgid "Clear the configuration file" msgstr "Очистить файл конфигурации" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:84 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:85 msgid "Apply" msgstr "Применить" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:141 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:156 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:182 -msgid "Gui Tools" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:142 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:157 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:183 +msgid "GUI Tools" msgstr "Настройки интерфейса" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:142 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:156 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:186 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:143 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:157 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:187 msgid "Other Tools" msgstr "Прочие настройки" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:159 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:160 #, python-format -msgid "In the %s tab has unsaved changes" +msgid "There are unsaved changes on tab %s" msgstr "На вкладке %s имеются несохранённые изменения" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:161 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:162 msgid "
Apply them?
" msgstr "
Применить их?
" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:164 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:165 msgid "Saving changes" msgstr "Сохранение изменений" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:207 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:208 msgid "Height image" msgstr "Высота изображений" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:211 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:212 msgid "Set fixed height image for actions" msgstr "Установка фиксированной высоты изображений для действий" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:212 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:213 msgid "0 - hide images" msgstr "0 - скрыть изображения" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:220 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:221 msgid "Expert view" msgstr "Расширенный просмотр" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:223 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:224 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:225 msgid "Expert mode view results" msgstr "Расширенный режим просмотра результатов" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:230 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:231 msgid "Count Row in result Table" msgstr "Кол-во строк в таблице" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:375 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:376 msgid "Select Language" msgstr "Выбор языка" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:379 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:380 msgid "English" msgstr "Английский" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:379 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:380 msgid "Russian" msgstr "Русский" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:393 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:394 msgid "Path to Certificates" msgstr "Директория с сертификатами" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:397 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:398 msgid "Certificate Directory" msgstr "Директория с сертификатами" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:400 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:401 msgid "Empty to default path" msgstr "Оставьте пустым для выбора стандартного пути" @@ -906,33 +910,28 @@ msgstr "Обновление успешно завершено" msgid "System control" msgstr "Управление системой" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:152 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:252 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:159 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:257 msgid "Show/Hide Window" msgstr "Показать/спрятать окно" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:153 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:160 -msgid "Update system" -msgstr "Обновить систему" - -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:154 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:161 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:288 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:395 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:168 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:293 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:400 msgid "Exit program" msgstr "Выйти из программы" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:159 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:362 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:166 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:367 msgid "Program settings" msgstr "Настройки программы" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:233 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:239 msgid "Update is already running" msgstr "Обновление уже запущено" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/DisplayMethod.py:325 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/DisplayMethod.py:332 msgid "Reconnect" msgstr "Переподключиться" @@ -1015,7 +1014,7 @@ msgstr "Не найдено поле \"CN\" в сертификате!" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:373 #, python-format -msgid "filename = %s" +msgid "Filename = %s" msgstr "Имя файла = %s" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:373 @@ -1067,56 +1066,503 @@ msgstr "Сертификат Центра Авторизации удалён и msgid "CA certificate delete from system trusted certificate" msgstr "Сертификат Центра Авторизации удалён из системного списка доверенных сертификатов" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1074 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1047 msgid "Advanced settings." msgstr "Дополнительные настройки." -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1162 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1135 msgid "Clean expert parameters?" msgstr "Очистить экспертные параметры?" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1391 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1364 msgid "Delete selected rows" msgstr "Удалить выделенные строки" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1635 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1608 msgid "Delete row" msgstr "Удалить строку" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1756 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1729 msgid "View options" msgstr "Просмотреть параметры" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2259 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2257 msgid " Step " msgstr " Шаг " -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2262 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2266 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2260 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2264 msgid "Run" msgstr "Выполнение" +#~ msgid "When the program is closed, all connections will be shut down!" +#~ msgstr "При закрытии программы все соединения будут закрыты!" + +#~ msgid "Do you really want to close the program?" +#~ msgstr "Вы точно хотите закрыть программу?" + +#~ msgid "Certificate added to the database server" +#~ msgstr "Сертификат добавлен в базу сервера" + +#~ msgid "You must restart the program" +#~ msgstr "Необходимо перезапустить программу" + +#~ msgid "Your certificate ID = %s" +#~ msgstr "Номер Вашего сертификата = %s" + +#~ msgid "Adding the certificate to the server database..." +#~ msgstr "Добавление сертификата в БД сервера..." + +#~ msgid "Failed to add the certificate to the server!" +#~ msgstr "Ошибка добавления сертификата на сервер!" + +#~ msgid "Your certificate ID = " +#~ msgstr "Номер Вашего сертификата = " + +#~ msgid "Your certifitate ID = " +#~ msgstr "Номер Вашего сертификата = " + +#~ msgid "Bug report" +#~ msgstr "Сообщить об ошибке" + +#~ msgid "Your request ID = %s\n" +#~ msgstr "Номер Вашего запроса = %s\n" + +#~ msgid "Failed to clear the process cache on the server" +#~ msgstr "Ошибка удаления кэша процесса на сервере" + +#~ msgid "Image height" +#~ msgstr "Высота изображений" + +#~ msgid "Set a fixed image height for actions" +#~ msgstr "Установка фиксированной высоты изображений для действий" + +#~ msgid "View results in expert mode" +#~ msgstr "Расширенный режим просмотра результатов" + +#~ msgid "Rows in the table" +#~ msgstr "Кол-во строк в таблице" + +#~ msgid "Language" +#~ msgstr "Выбор языка" + +#~ msgid "Certificate directory" +#~ msgstr "Директория с сертификатами" + +#~ msgid "Leave empty for the default path" +#~ msgstr "Оставьте пустым для выбора стандартного пути" + #~ msgid "Timeout" #~ msgstr "Таймаут" +#~ msgid "You are not connected to the localhost server" +#~ msgstr "Вы не подсоединены к локальному серверу!" + +#~ msgid "Show/Hide the window" +#~ msgstr "Показать/спрятать окно" + +#~ msgid "Update the system" +#~ msgstr "Обновить систему" + +#~ msgid "Exit the program" +#~ msgstr "Выйти из программы" + +#~ msgid "The system is being updated" +#~ msgstr "Система обновляется" + +#~ msgid "Stop updating and exit?" +#~ msgstr "Остановить обновление и выйти?" + +#~ msgid "Untrusted server certificate!" +#~ msgstr "Недоверенный сертификат сервера!" + +#~ msgid "Add this servers certificate to trusted or " +#~ msgstr "Добавить сертификат этого сервера в доверенные или" + +#~ msgid "Try to add the CA and ROOT certificates to trusted?" +#~ msgstr "Попытаться добавить сертификат ЦА и корневой в доверенные?" + +#~ msgid "Add the server certificate" +#~ msgstr "Добавить сертификат сервера" + +#~ msgid "Add the CA and ROOT certificate" +#~ msgstr "Добавить корневой сертификат и сертификат ЦА" + +#~ msgid "Add the certificate to trusted" +#~ msgstr "Добавить сертификат в доверенные" + +#~ msgid "" +#~ "Server certificate added to trusted \n" +#~ "%s" +#~ msgstr "" +#~ "Сертификат сервера добавлен в доверенные \n" +#~ "%s" + +#~ msgid "Certificate added" +#~ msgstr "Сертификат добавлен" + +#~ msgid "Failed to create directory %s" +#~ msgstr "Ошибка при создании директории %s" + +#~ msgid "Certificate not found on the client’s side" +#~ msgstr "Сертификат не найден на стороне клиента" + +#~ msgid "Failed to open the file" +#~ msgstr "Ошибка при открытии файла" + +#~ msgid "Field \"CN\" not found in the certificate!" +#~ msgstr "Не найдено поле \"CN\" в сертификате!" + +#~ msgid "CERTIFICATE ADDED" +#~ msgstr "Сертификат добавлен" + +#~ msgid "File with the CA certificate now exists" +#~ msgstr "Файл с сертификатом удостоверяющего центра создан" + +#~ msgid "Invalid server certificate!" +#~ msgstr "Сертификат сервера недействителен!" + +#~ msgid "CA not found on the server" +#~ msgstr "Сертификат Центра авторизации не найден на сервере" + +#~ msgid "CRL added" +#~ msgstr "Список отзыва сертификатов добавлен" + +#~ msgid "CA certificate deleted from the user trusted list" +#~ msgstr "" +#~ "Сертификат Центра авторизации удалён из пользовательского списка " +#~ "доверенных сертификатов" + +#~ msgid "CA certificate deleted from the system trusted list" +#~ msgstr "" +#~ "Сертификат Центра авторизации удалён из системного списка доверенных " +#~ "сертификатов" + +#~ msgid "Press for advanced settings" +#~ msgstr "Нажмите для дополнительных настроек" + +#~ msgid "Clear expert parameters?" +#~ msgstr "Очистить экспертные параметры?" + +#~ msgid "Delete all selected rows" +#~ msgstr "Удалить выделенные строки" + +#~ msgid "Delete the row" +#~ msgstr "Удалить строку" + +#~ msgid "Running" +#~ msgstr "Выполнение" + +#~ msgid "Server was restarted." +#~ msgstr "Сервер был перезапущен." + +#~ msgid "Please, connect to server again." +#~ msgstr "Пожалуйста, подключитесь к серверу снова." + +#~ msgid "Close your session" +#~ msgstr "Закрыть данную сессию" + +#~ 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 "View information about current session" +#~ msgstr "Просмотр информации о текущей сессии" + +#~ msgid "Disconnect from current server" +#~ msgstr "Отсоединиться от текущего сервера" + +#~ msgid "Window work with certificates" +#~ msgstr "Окно работы с сертификатами" + +#~ msgid "Tool" +#~ msgstr "Настройки" + +#~ msgid "Error get list pid from server" +#~ msgstr "Ошибка получения списка идентификаторов процессов с сервера" + +#~ msgid "Country (2 words)" +#~ msgstr "Страна (2 символа)" + +#~ msgid "Create Request" +#~ msgstr "Создать Запрос на подпись сертификата" + +#~ msgid "Field \"Country\" must be two-character" +#~ msgstr "Поле \"Страна\" должно состоять из двух символов" + +#~ msgid "Input Error" +#~ msgstr "Ошибка Ввода" + +#~ msgid "Kill process? (Process is active)" +#~ msgstr "Убить процесс? (Процесс активен)" + +#~ msgid "Process is completed" +#~ msgstr "Процесс завершён" + +#~ msgid "View result of process id %s" +#~ msgstr "Просмотреть результат работы процесса id %s" + +#~ msgid "No running processes in current session." +#~ msgstr "Нет запущенных процессов в текущей сессии." + +#~ msgid "Killed successfully!" +#~ msgstr "Успешно убит!" + +#~ msgid "Certificate not found in server database!" +#~ msgstr "Сертификат не найден в БД сервера!" + +#~ msgid "Session doesn't belong to your certificate!" +#~ msgstr "Сессия не соответствует Вашему сертификату!" + +#~ msgid "It was not possible to kill process!" +#~ msgstr "Не удалось завершить процесс!" + +#~ msgid "language for translate" +#~ msgstr "язык для перевода" + +#~ msgid "host destination" +#~ msgstr "хост назначения" + +#~ msgid "At current step has mistake." +#~ msgstr "На текущем шаге есть ошибка." + +#~ msgid "User should be not root" +#~ msgstr "Пользователь должен быть не root" + +#~ msgid "Composed of Calculate Utilities 3.0.0." +#~ msgstr "Входит в состав Calculate Utilities 3.0.0." + +#~ msgid "Distributive website" +#~ msgstr "Сайт Дистрибутива" + +#~ msgid "Please, enter valid email. " +#~ msgstr "Пожалуйста, введите существующий адрес электронной почты! " + +#~ msgid "If email does not exist, letter will not reach." +#~ msgstr "Если электронная почта не существует, то письмо не дойдет." + +#~ msgid "Send Bug" +#~ msgstr "Отправить ошибку" + +#~ msgid "Enter valid email!" +#~ msgstr "Введите существующий адрес электронной почты!" + +#~ msgid "Error close process" +#~ msgstr "Ошибка закрытия процесса" + +#~ msgid " New Session" +#~ msgstr "Новая сессия" + +#~ msgid " Old Session" +#~ msgstr "Старая сессия" + +#~ msgid " Your session id = %s" +#~ msgstr "Номер Вашей сессии = %s" + +#~ msgid "Certificate not send!" +#~ msgstr "Сертификат не отправлен!" + +#~ msgid " Your certifitate id = %d" +#~ msgstr "Номер Вашего сертификата = %d" + +#~ msgid "Your session id = " +#~ msgstr "Номер Вашей сессии = " + +#~ msgid "Your IP adress - " +#~ msgstr "Ваш IP адрес - " + +#~ msgid "Your MAC adress - " +#~ msgstr "Ваш MAC адрес - " + +#~ msgid "Clear session cache" +#~ msgstr "Очистить кэш сессии" + +#~ msgid "Error clearing session cache" +#~ msgstr "Ошибка удаления кэша сессии" + +#~ msgid "Session cache is cleared" +#~ msgstr "Кэш сессии удалён" + +#~ msgid "About Program" +#~ msgstr "О программе" + +#~ msgid "Information" +#~ msgstr "Справка" + +#~ msgid "Clear Table" +#~ msgstr "Очистить таблицу" + +#~ msgid "Add row" +#~ msgstr "Добавить строку" + +#~ msgid "Recover Table" +#~ msgstr "Восстановить таблицу" + +#~ msgid "Reset changes" +#~ msgstr "Сбросить изменения" + +#~ msgid "Break process" +#~ msgstr "Прервать процесс" + +#~ msgid "" +#~ "You do not have a certificate. Please, generate new request and get new " +#~ "certificate from server." +#~ msgstr "" +#~ "У Вас нет сертификата. Пожалуйста, сгенерируйте запрос на сертитфикат и " +#~ "получите сертификат с сервера." + +#~ msgid "No access to file!" +#~ msgstr "Нет доступа к файлу!" + +#~ msgid "Sid Deleted!" +#~ msgstr "Сессия удалена!" + +#~ msgid "Server delete sid error" +#~ msgstr "Ошибка удаления сессии на сервере" + +#~ msgid "Send request" +#~ msgstr "Отправить запрос" + +#~ msgid "Get certificate" +#~ msgstr "Получить сертификат" + +#~ msgid "Certificate signing request" +#~ msgstr "Запрос на подпись сертификата" + +#~ msgid "Enter Hostname or IP adress" +#~ msgstr "Введите имя хоста или IP адрес" + +#~ msgid "Field \"Host\" Error!" +#~ msgstr "Ошибка в поле \"Хост\"!" + +#~ msgid "Enter Port" +#~ msgstr "Введите номер порта" + +#~ msgid "Field \"Port\" Error!" +#~ msgstr "Ошибка в поле \"Порт\"!" + +#~ msgid "You have sent a request to sign the certificate!" +#~ msgstr "У Вас уже есть запрос на подписание сертификата!" + +#~ msgid "Send new request?" +#~ msgstr "Отправить навый запрос на подпись сертификата?" + +#~ msgid "Close. Connecting Error." +#~ msgstr "Ошибка соединения. Закрываюсь." + +#~ msgid "Private Key and Request exists!" +#~ msgstr "Секретный ключ и запрос на подпись сертификата созданы!" + +#~ msgid "Create new Private Key and Request?" +#~ msgstr "Создать новые Секретный Ключ и Запрос на подпись сертификата?" + +#~ msgid "This server can not sign certificate!" +#~ msgstr "Сервер не подписал сертификат!" + +#~ msgid "Your request id - %s" +#~ msgstr "Номер Вашего запроса - %s" + +#~ msgid "request was not sent or deleted file %s" +#~ msgstr "Запрос не был послан или удалён файл %s" + +#~ msgid "Request %s not found on client side" +#~ msgstr "Запрос %s не найден на стороне клиента" + +#~ msgid "Request to sign is rejected!" +#~ msgstr "Запрос на подпись сертификата отвергнут!" + +#~ msgid "Request for the signing has not yet reviewed.\n" +#~ msgstr "Запрос на подписание сертификата ещё не рассмотрен.\n" + +#~ msgid "Request on signature does not match sent earlier." +#~ msgstr "Запрос или подпись не соответствуют отправленным ранее." + +#~ msgid "OK. Certificate save. Your certificate id = %s" +#~ msgstr "Сертификат сохранён! Номер Вашего сертификата = %s" + +#~ msgid "Not found field \"CN\" in root certificate!" +#~ msgstr "Не найдено поле \"CN\" в корневом сертификате!" + +#~ msgid "filename = " +#~ msgstr "Имя файла =" + +#~ msgid "Root Certificate Add" +#~ msgstr "Корневой сертификат добавлен" + +#~ msgid "file with ca certificates exists" +#~ msgstr "Файл с сертификатом удостоверяющего центра создан" + +#~ msgid "You are connected to server!" +#~ msgstr "Вы подсоединены к серверу!" + +#~ msgid "Please break " +#~ msgstr "Пожалуйста разорвите " + +#~ msgid "Enter correctly port!" +#~ msgstr "Введите корректный порт!" + +#~ msgid "Verify Error" +#~ msgstr "Ошибка проверки сертификата сервера" + +#~ msgid "Password is invalid" +#~ msgstr "Пароль неверен" + +#~ msgid "" +#~ "You do not have a certificate or your certificate does not match the " +#~ "server certificate. Please, generate new request andget new certificate " +#~ "from server." +#~ msgstr "" +#~ "У вас нет сертификата или ваш сертификат не соответствует серверному " +#~ "сертификату. Пожалуйста, сгенерируйте запрос на сертитфикат и получите " +#~ "сертификат с сервера." + +#~ msgid "Error get frame from Server..." +#~ msgstr "Ошибка получения фрейма с сервера." + +#~ msgid "Error get frame from Server." +#~ msgstr "Ошибка получения фрейма с сервера." + +#~ msgid "Please, resfesh this Page later." +#~ msgstr "Пожалуйста, обновите эту страницу позже." + +#~ msgid "Error get entire frame from Server..." +#~ msgstr "Ошибка получения полного фрейма с сервера." + +#~ msgid "Error get progress from Server." +#~ msgstr "Ошибка получения значения прогресса с сервера." + +#~ msgid "Error send password to Server" +#~ msgstr "Ошибка отправки сообщения (пароля) на сервер" + +#~ msgid "Clear config" +#~ msgstr "Очистить файл конфигурации" + +#~ msgid "Gui Tools" +#~ msgstr "Настройки интерфейса" + +#~ msgid "In the %s tab has unsaved changes" +#~ msgstr "На вкладке %s имеются несохранённые изменения" + +#~ msgid "Update system" +#~ msgstr "Обновить систему" + +#~ msgid "filename = %s" +#~ msgstr "Имя файла = %s" + #~ msgid "Certificate added to database server. " #~ msgstr "Сертификат добавлен в базу сервера. " #~ msgid "Must restart the program." #~ msgstr "Необходимо перезапустить программу." -#~ msgid "Your certificate ID = %s" -#~ msgstr "Номер Вашего сертификата = %s" - #~ msgid "Add certificate to server Database..." #~ msgstr "Добавление сертификата в БД сервера..." #~ msgid "Error adding certificate to server!" #~ msgstr "Ошибка добавления сертификата на сервер!" -#~ msgid "Your certificate ID = " -#~ msgstr "Номер Вашего сертификата = " - #~ msgid "Error clear process cache on server" #~ msgstr "Ошибка удаления кэша процесса на сервере" @@ -1131,6 +1577,3 @@ msgstr "Выполнение" #~ msgid "The system is updated" #~ msgstr "Система обновляется" - -#~ msgid "Stop updating and exit?" -#~ msgstr "Остановить обновление и выйти?" diff --git a/scripts/cl-console-gui b/scripts/cl-console-gui index 65d0c35..71f9b4d 100755 --- a/scripts/cl-console-gui +++ b/scripts/cl-console-gui @@ -25,7 +25,11 @@ def main(): __builtin__.__dict__['_print'] = _print host, port, args = None, None, None if len(sys.argv) > 1: - args = parse() + parser = parse() + args = parser.parse_args() + if args.help: + parser.print_help() + sys.exit(0) if args.method: app = QtGui.QApplication(sys.argv) app.setQuitOnLastWindowClosed(True)