diff --git a/consolegui/application/CertificateClass.py b/consolegui/application/CertificateClass.py
index 2175616..1f81112 100755
--- a/consolegui/application/CertificateClass.py
+++ b/consolegui/application/CertificateClass.py
@@ -71,7 +71,7 @@ class CertClass (QtGui.QWidget):
self.sendlayout.setColumnStretch(1,1)
self.sendlayout.setColumnStretch(2,1)
- self.GroupBoxSend = QtGui.QGroupBox(_('Certificate signature request'))
+ self.GroupBoxSend = QtGui.QGroupBox(_('Signature request'))
# self.GroupBoxSend.setContentsMargins(10,0,0,0)
self.GroupBoxSend.setLayout(self.sendlayout)
@@ -109,8 +109,8 @@ class CertClass (QtGui.QWidget):
cert_path = self.default_cert_path
if os.path.exists(cert_path + 'req_id'):
- text=_("You have already sent a request to sign the certificate!")
- informative_text = _("request id - %s") \
+ text=_("You have already sent a signature request!")
+ informative_text = _("Request ID: %s") \
%open(cert_path + 'req_id', 'r').read()+'\n' \
+ _("Send a new request?")
reply = show_question(self, text, informative_text,
@@ -192,7 +192,7 @@ class CertClass (QtGui.QWidget):
fc.write(res)
fc.close()
show_msg (_("Your request ID: %s") %res + '\n' + \
- _("To sign the certificate in the server use command") + \
+ _("To sign the certificate on the server, use command") + \
'\n'+'cl-core --sign-client ID_CLIENT_REQUEST',
title = _('Request'), parent=self)
return 0
@@ -270,7 +270,7 @@ class CertClass (QtGui.QWidget):
elif cert == '2':
show_msg (_("The request has not been reviewed yet.") + '\n' + \
_("Your request ID: %s") %req_id + '\n'+\
- _("To sign the certificate in the server use command")+\
+ _("To sign the certificate on the server, use command")+\
'\n'+'cl-core --sign-client ID_CLIENT_REQUEST',
title = _('Request'), parent = self)
return 1
@@ -349,5 +349,5 @@ class CertClass (QtGui.QWidget):
_print (_("Filename = "), filename)
show_msg (_("Root certificate added") + '\n' + filename)
else:
- _print (_("File with CA certificates now exists"))
+ _print (_("File with the CA certificate now exists"))
return 0
diff --git a/consolegui/application/ControlButton.py b/consolegui/application/ControlButton.py
index d929bc7..c967901 100644
--- a/consolegui/application/ControlButton.py
+++ b/consolegui/application/ControlButton.py
@@ -252,7 +252,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 when closing the process'))
+ _print (_('Error closing the process'))
from calculate.consolegui.application.ConnectionTabs \
import SelectedMethodWgt
diff --git a/consolegui/application/MainFrameResult.py b/consolegui/application/MainFrameResult.py
index 10e0c37..13ec7c1 100755
--- a/consolegui/application/MainFrameResult.py
+++ b/consolegui/application/MainFrameResult.py
@@ -114,15 +114,15 @@ class MainFrameRes(QtGui.QWidget):
################# API FUNCTION ###############################
def show_view(self, view):
pass
-
+
def show_table(self, table, item):
# method to display tables
add_offset_flag = False
-
+
if not table.body:
table.body = [[]]
self.show_normal(item)
-
+
if self.method_name in self.ClientObj.param_objects:
if len(table.body[0]) >= self.ClientObj.count_row_res_table or \
self.ClientObj.param_objects[self.method_name]['offset']:
@@ -362,13 +362,13 @@ class MainFrameRes(QtGui.QWidget):
# sid = int(self.ClientObj.sid)
# res = self.client.service.clear_pid_cache(sid, self.cur_pid)
# if res:
-# _print (_('Error when closing the process'))
+# _print (_('Error closing the process'))
# self._parent.back()
def startGroup(self, item):
pass
- def endGruop(self, item):
+ def endGroup(self, item):
pass
def callView(self, item, sid):
@@ -478,8 +478,8 @@ class MainFrameRes(QtGui.QWidget):
if case('startGroup'):
self.startGroup(item)
return 1
- if case('endGruop'):
- self.endGruop(item)
+ if case('endGroup'):
+ self.endGroup(item)
return 1
if case('briefParams'):
self.callView(item, sid)
@@ -635,8 +635,8 @@ class MainFrameRes(QtGui.QWidget):
def get_Progress_cycle(self, returnProgr, through_object):
if type(returnProgr) == Exception:
- _print (_('Failed to get progress status from the server'))
-# show_msg(_('Failed to get progress status from the server') + \
+ _print (_('Failed to get the progress status from the server'))
+# show_msg(_('Failed to get the progress status from the server') + \
# '\n'+ \
# _('Try resfeshing this page later.'),'get progress error')
return 1
diff --git a/consolegui/application/ShortFrameResult.py b/consolegui/application/ShortFrameResult.py
index 8086968..dfb3fe7 100644
--- a/consolegui/application/ShortFrameResult.py
+++ b/consolegui/application/ShortFrameResult.py
@@ -234,7 +234,7 @@ class ShortFrameRes(QtGui.QWidget):
def startGroup(self, item):
pass
- def endGruop(self, item):
+ def endGroup(self, item):
pass
def callView(self, item, sid):
@@ -340,8 +340,8 @@ class ShortFrameRes(QtGui.QWidget):
if case('startGroup'):
self.startGroup(item)
return 1
- if case('endGruop'):
- self.endGruop(item)
+ if case('endGroup'):
+ self.endGroup(item)
return 1
if case('briefParams'):
self.callView(item, sid)
@@ -485,9 +485,9 @@ class ShortFrameRes(QtGui.QWidget):
def get_Progress_cycle(self, returnProgr, through_object):
if type(returnProgr) == Exception:
- _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')
+ _print (_('Failed to get the progress status from the server'))
+ show_msg(_('Failed to get the progress status from the server')+\
+ '\n'+_('Try resfeshing this page later.'),'get progress error')
return 1
sid, pid, id, temp_progress = through_object
########################################
diff --git a/consolegui/application/TrayIcon.py b/consolegui/application/TrayIcon.py
index 14b05f4..f1974ba 100644
--- a/consolegui/application/TrayIcon.py
+++ b/consolegui/application/TrayIcon.py
@@ -35,11 +35,11 @@ class TrayUpdateSystem(QtCore.QThread):
self.close_flag = False
if not hasattr(self._parent, 'localhost_ClientObj'):
self.mes_sig.emit(_('Connection Error'), \
- _('You are not connected to localhost server'))
+ _('You are not connected to the localhost server'))
return 1
if not self._parent.localhost_ClientObj.client:
self.mes_sig.emit(_('Connection Error'), \
- _('You are not connected to localhost server'))
+ _('You are not connected to the localhost server'))
return 1
sid = get_sid(self._parent.localhost_ClientObj.client)
@@ -160,14 +160,14 @@ class TrayIcon (QtGui.QSystemTrayIcon):
# Translate left click menu
self.left_menu.windowVisible.setText(_('Show/Hide Window'))
# self.left_menu.sys_update.setText(_('Update system'))
- self.left_menu.exit_action.setText(_('Exit program'))
+ self.left_menu.exit_action.setText(_('Exit Program'))
# Translate right click menu
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'))
- self.right_menu.exit_action.setText(_('Exit program'))
+ self.right_menu.exit_action.setText(_('Exit Program'))
def help(self):
self._parent.currentWidget().help()
@@ -238,7 +238,7 @@ class TrayIcon (QtGui.QSystemTrayIcon):
if not self.update_thread.isRunning():
self.update_thread.start()
else:
- show_msg(_('Update is already running'))
+ show_msg(_('An update is already running'))
class LeftButtonMenu(QtGui.QMenu):
def __init__(self, parent, MainWgt):
@@ -292,7 +292,7 @@ class LeftButtonMenu(QtGui.QMenu):
if not exit_icon.isNull():
break
- self.exit_action = QtGui.QAction(exit_icon, _('Exit program'), \
+ self.exit_action = QtGui.QAction(exit_icon, _('Exit Program'), \
self, triggered=parent.exit)
self.addAction(self.exit_action)
@@ -400,6 +400,6 @@ class RightButtonMenu(QtGui.QMenu):
if not exit_icon.isNull():
break
- self.exit_action = QtGui.QAction(exit_icon, _("Exit program"), \
+ self.exit_action = QtGui.QAction(exit_icon, _("Exit Program"), \
self, triggered=parent.exit)
self.addAction(self.exit_action)
diff --git a/consolegui/application/View_Process.py b/consolegui/application/View_Process.py
index a15a1c1..6230cd4 100755
--- a/consolegui/application/View_Process.py
+++ b/consolegui/application/View_Process.py
@@ -33,15 +33,15 @@ class ViewProc(QtGui.QWidget):
list_pid = client_list_pid(self.ClientObj.client)
ClientObj._parent.setWindowTitle ( \
- _('View information about running processes')\
- + ' - ' + self.ClientObj.Name)
+ _('View information about the running processes')\
+ + ' - ' + self.ClientObj.Name)
self.lable_list = []
self.button_list = []
self.status_list = []
self.grid_layout = QtGui.QGridLayout()
self.helpLabel = LabelWordWrap \
- (_('View information about running processes'), self)
+ (_('View information about the running processes'), self)
self.grid_layout.addWidget(self.helpLabel, 0, 0, 1, 0)
if not list_pid:
diff --git a/consolegui/application/client_class.py b/consolegui/application/client_class.py
index f6c682b..71002e3 100755
--- a/consolegui/application/client_class.py
+++ b/consolegui/application/client_class.py
@@ -89,8 +89,8 @@ class AddServerCert (QtGui.QDialog):
self.grid.addWidget(self.tab, 3, 0, 3, 3)
self.lbl_list.append(LabelWordWrap \
- (_('Add this Servers certificate to trusted or ') +\
- _('try add CA and ROOT certificates to trusted?'),self))
+ (_("Add this server's certificate to trusted or ") +\
+ _('try add the CA and ROOT certificates to trusted?'),self))
self.pix_lbl = QtGui.QLabel(self)
pi = QtGui.QPixmap()
@@ -102,12 +102,14 @@ class AddServerCert (QtGui.QDialog):
self.grid.addWidget(self.lbl_list[num_lbl], num_lbl + 8, 0, 1, 3)
x = len (self.lbl_list) + 8
- self.server_but = QtGui.QPushButton(_('Add Servers certificate'),self)
+ self.server_but = QtGui.QPushButton(_('Add the server certificate'),
+ self)
self.server_but.clicked.connect(self.add_server)
self.server_but.clicked.connect(self.close)
self.grid.addWidget(self.server_but, x, 0)
- self.ca_but = QtGui.QPushButton(_('Add CA and ROOT certificate'),self)
+ self.ca_but = QtGui.QPushButton(_('Add the CA and ROOT certificates'),
+ self)
self.ca_but.clicked.connect(self.add_ca)
self.ca_but.clicked.connect(self.add_server)
self.ca_but.clicked.connect(self.close)
@@ -118,7 +120,7 @@ class AddServerCert (QtGui.QDialog):
self.grid.addWidget(self.cancel_but, x, 2)
# self.setLayout(self.grid)
- self.setWindowTitle (_('Add certificate to trusted'))
+ self.setWindowTitle (_('Add the certificate to trusted'))
# move to center
prim_screen = ClientObj.app.desktop().primaryScreen()
@@ -164,8 +166,8 @@ class AddServerCert (QtGui.QDialog):
fcl = open(ca_certs,"a")
fcl.write(host + ' ' + filename + '\n')
fcl.close()
- show_msg (_('Server certificate add to trusted \n%s') \
- %(self.parent.trusted_path + filename),_('Certificate add'))
+ show_msg (_('Server certificate added to trusted') +'\n'+ \
+ (self.parent.trusted_path + filename),_('Certificate added'))
self.flag = 3
from conf_connection import FrameConnection
self.ConnectWidget = FrameConnection(self, self.ClientObj)
@@ -181,7 +183,7 @@ class AddServerCert (QtGui.QDialog):
try:
os.makedirs(root_cert_dir)
except OSError:
- show_msg (_('error creating directory %s') %root_cert_dir)
+ show_msg (_('Error creating directory %s') %root_cert_dir)
return 1
self.parent.list_ca_certs = []
@@ -293,7 +295,7 @@ class CheckingClientHTTPSConnection(CheckingHTTPSConnection):
if not filename:
return None
except:
- msg = _("Certificate not found in client")
+ msg = _("Certificate not found on the client's side")
show_msg (msg)
# self.parent.MainWidget.bottom.addMessage(msg)
return None
@@ -304,7 +306,7 @@ class CheckingClientHTTPSConnection(CheckingHTTPSConnection):
if store_cert == server_cert:
return filename
except:
- msg = _('Error open file')
+ msg = _('Error opening file')
show_msg (msg + ' %s%s' %(self.trusted_path, filename))
# self.parent.MainWidget.bottom.addMessage(msg)
return None
@@ -360,7 +362,7 @@ class CheckingClientHTTPSConnection(CheckingHTTPSConnection):
fc.close()
if not filename:
- show_msg (_('Not found field "CN" in certificate!'))
+ show_msg (_('Field "CN" not found in the certificate!'))
return 1
fd = open(cl_client_cert_dir + '/ca/' + filename, 'w')
@@ -370,9 +372,9 @@ 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 added'))
else:
- show_msg (_('File with ca certificates exists'))
+ show_msg (_('A file with the CA certificate now exists'))
get_CRL(cl_client_cert_dir)
def add_ca_cert(self, cert, list_ca_certs):
@@ -388,12 +390,12 @@ class CheckingClientHTTPSConnection(CheckingHTTPSConnection):
cert = '0'
if cert == '1':
- msg = _('Server certificate is not valid')
+ msg = _('Invalid server certificate')
show_msg (msg)
return
if cert == '2':
- msg = _('CA not found on server')
+ msg = _('CA certificate not found on the server')
show_msg (msg)
return
@@ -423,9 +425,9 @@ class CheckingClientHTTPSConnection(CheckingHTTPSConnection):
for subj in Subject:
inf_text += "\n %s : %s" %(subj[0], subj[1])
- text = _("Add CA certificates to trusted? ")
+ text = _("Add the CA certificate to trusted? ")
reply = show_question(self.ClientObj.MainWidget, text, inf_text,
- title = _('Adding certificate'))
+ title = _('Adding the certificate'))
if reply == QtGui.QMessageBox.No:
show_msg (_('Certificate not added to trusted'))
@@ -627,12 +629,12 @@ def get_CRL(path_to_cert):
try:
os.makedirs(path_to_cert)
except OSError:
- _print (_("error creating directory %s") %path_to_cert)
+ _print (_("Error creating directory %s") %path_to_cert)
sys.exit()
try:
os.makedirs(os.path.join(path_to_cert, 'ca'))
except OSError:
- _print (_("error creating directory %s") \
+ _print (_("Error creating directory %s") \
%(os.path.join(path_to_cert, 'ca')))
sys.exit()
os.makedirs(CRL_path)
@@ -709,7 +711,7 @@ def get_CRL(path_to_cert):
fd = open(CRL_file, 'w')
fd.write(new_crl)
fd.close()
- _print (_("CRL add"))
+ _print (_("CRL added"))
find_ca_in_crl (CRL_path, all_ca_certs_list)
def find_ca_in_crl (CRL_path, all_ca_certs_list):
@@ -798,8 +800,7 @@ def rm_ca_from_trusted(ca_cert):
if ca_cert != cert:
new_user_ca_certs.append(cert)
else:
- _print (_("CA certificate delete from user"
- " trusted certificate"))
+ _print (_("CA certificate removed from user trusted"))
fd = open(user_ca_db, 'w')
for cert in new_user_ca_certs:
@@ -818,8 +819,7 @@ def rm_ca_from_trusted(ca_cert):
if ca_cert != cert:
new_system_ca_certs.append(cert)
else:
- _print (_("CA certificate delete from system"
- " trusted certificate"))
+ _print (_("CA certificate removed from system trusted"))
fd = open(system_ca_db, 'w')
for cert in new_system_ca_certs:
diff --git a/consolegui/application/helpwidget.py b/consolegui/application/helpwidget.py
index b2b49ef..d209cd7 100755
--- a/consolegui/application/helpwidget.py
+++ b/consolegui/application/helpwidget.py
@@ -233,5 +233,5 @@ class BugWgt(QtGui.QWidget):
server.quit()
self.close()
except:
- show_msg (_('Error sending!'))
+ show_msg (_('Sending error!'))
server.quit()
\ No newline at end of file
diff --git a/consolegui/application/mainframe.py b/consolegui/application/mainframe.py
index 30a0f89..b84f73b 100755
--- a/consolegui/application/mainframe.py
+++ b/consolegui/application/mainframe.py
@@ -1044,7 +1044,7 @@ class MainFrame(QtGui.QWidget):
self.view_dict[field.name] = ExpertWidget(field.label, self)
else:
self.view_dict[field.name] = ExpertWidget\
- (_('Advanced settings.'), self)
+ (_('Advanced settings'), self)
self.view_dict[field.name].setFlat(True)
self.grid.addWidget(self.view_dict[field.name], x, y, 1, 2)
@@ -1132,7 +1132,7 @@ class MainFrame(QtGui.QWidget):
def wrapper():
reply = None
if self.changed_expert_list:
- text = _('Clean expert parameters?')
+ text = _('Clean the expert parameters?')
reply = show_question(self, text, cursor_pos = True,
title = _('Calculate Console'))
@@ -1361,7 +1361,7 @@ class MainFrame(QtGui.QWidget):
except:
self.view_dict[field.name].minus_but.setText('-')
self.view_dict[field.name].minus_but.setToolTip \
- (_('Delete selected rows'))
+ (_('Delete the selected rows'))
self.view_dict[field.name].minus_but.setFixedWidth(30)
self.view_dict[field.name].minus_but.setDisabled(True)
@@ -1608,7 +1608,7 @@ class MainFrame(QtGui.QWidget):
# table.item(row, 0).setFlags(QtCore.Qt.ItemIsEditable)
ch = CentralCheckBox(self.table_widget, False, ind_col = True)
- ch.setToolTip(_('Delete row'))
+ ch.setToolTip(_('Delete the row'))
ch.pCheckB.clicked.connect(selected_row \
(self, ch, table.rowCount(), \
table.minus_but))
diff --git a/consolegui/application/mainmenu.py b/consolegui/application/mainmenu.py
index 5328a3e..d7a9f6a 100755
--- a/consolegui/application/mainmenu.py
+++ b/consolegui/application/mainmenu.py
@@ -42,7 +42,7 @@ class MainMenu(QtGui.QWidget):
#
# self.hlayout.addWidget(self.Methods)
-######### View information about running processes
+######### View information about the running processes
self.Processes = TopMenu(_('Processes'),['system-run', \
'applications-system'], self)
self.Processes.setStatusTip(_('View information about running '
@@ -103,7 +103,7 @@ class MainMenu(QtGui.QWidget):
self.Help.setStatusTip(_('Help'))
self.hlayout.addWidget(self.Help)
-######### Exit program
+######### Exit Program
# self.Exit=TopMenu(_('Close'),['application-exit', 'system-log-out'],\
# self)
# self.Exit.setStatusTip(_('Close Tab'))
@@ -125,7 +125,7 @@ class MainMenu(QtGui.QWidget):
self.Back.setStatusTip(_('Back'))
self.Back.setToolTip(_('Back'))
-######### View information about running processes
+######### View information about the running processes
self.Processes.setText(_('Processes'))
self.Processes.setStatusTip(_('View information about running '
'processes'))
@@ -164,7 +164,7 @@ class MainMenu(QtGui.QWidget):
self.Help.setStatusTip(_('Help'))
# self.Help.setToolTip(_('About Application'))
-######### Exit program
+######### Exit Program
# self.Exit.setText(_('Close'))
# self.Exit.setStatusTip(_('Close Tab'))
# self.Exit.setToolTip(_('Close Tab'))
\ No newline at end of file
diff --git a/consolegui/application/more.py b/consolegui/application/more.py
index a263092..1b2ff9e 100755
--- a/consolegui/application/more.py
+++ b/consolegui/application/more.py
@@ -23,7 +23,7 @@ import Image
import pwd, sys
from calculate.lib.utils.files import listDirectory
-_('User should be not root')
+_('The user must not be root')
class TopMenu(QtGui.QPushButton):
def __init__(self, label, images, parent = None):
QtGui.QPushButton.__init__(self, parent)
@@ -1241,7 +1241,7 @@ class SelectTable(QtGui.QWidget):
cb.setCheckState(QtCore.Qt.CheckState.PartiallyChecked)
if hard_auto:
cb.setCheckState(QtCore.Qt.CheckState.PartiallyChecked)
-# cb.setToolTip(_('Delete row'))
+# cb.setToolTip(_('Delete the row'))
cb.clicked.connect(self.selected_row)
self.table.setCellWidget(row, 0, cb)
@@ -2438,7 +2438,7 @@ def client_del_sid(client):
_print (_("Failed to obtain certificate data!"))
return -2
if s[0][0] == "Permission denied":
- _print (_("Permission denied %s") % s[1][1])
+ _print (_("%s: Permission denied") % s[1][1])
return -3
if s[0][0] == '0':
pass
diff --git a/consolegui/application/session_function.py b/consolegui/application/session_function.py
index 284addd..5508cb4 100755
--- a/consolegui/application/session_function.py
+++ b/consolegui/application/session_function.py
@@ -87,7 +87,7 @@ class ViewSessionInfo (QtGui.QWidget):
if results[0][0] == -4:
self.layout.addWidget(LabelWordWrap(_('Certificate not found in'
- ' Server Database!'), self), 0,0,1,2)
+ ' the server!'), self), 0,0,1,2)
self.setLayout(self.layout)
return 1
diff --git a/consolegui/application/tools.py b/consolegui/application/tools.py
index 250f9da..3737bf3 100755
--- a/consolegui/application/tools.py
+++ b/consolegui/application/tools.py
@@ -157,7 +157,7 @@ class ToolTabWidget(QtGui.QTabWidget):
tab_list = [_('GUI Tools'),_('Other Tools')]
if self.changed_flag:
- text = _('There are unsaved changes on tab %s') \
+ text = _('There are unsaved changes in tab %s') \
%tab_list[self.cur_tab_num]
informative_text = _('Apply them?')
@@ -205,12 +205,12 @@ class ToolGui(QtGui.QWidget):
# self.grid.setAlignment(QtCore.Qt.AlignLeft)
# add height image in grid
- self.h_image_lbl = LabelWordWrap(_('Height image'), self)
+ self.h_image_lbl = LabelWordWrap(_('Image height'), self)
self.h_image_lbl.setMaximumWidth(self.h_image_lbl.sizeHint().width())
self.h_image_lineedit = QtGui.QLineEdit(self)
- self.h_image_lineedit.setToolTip(_('Set fixed height image for '
- 'actions')+' '+_('0 - hide images'))
+ self.h_image_lineedit.setToolTip(_('Set a fixed height image for '
+ 'actions')+' '+_('0: hide images'))
self.h_image_lineedit.setText(str(ClientObj.height_image))
@@ -221,14 +221,14 @@ class ToolGui(QtGui.QWidget):
self.expert_lbl = LabelWordWrap(_('Expert view'), self)
self.expert_checkbox = QtGui.QCheckBox(self)
self.expert_checkbox.setChecked(ClientObj.expert)
- self.expert_lbl.setToolTip(_('Expert mode view results'))
- self.expert_checkbox.setToolTip(_('Expert mode view results'))
+ self.expert_lbl.setToolTip(_('View results in expert mode'))
+ self.expert_checkbox.setToolTip(_('View results in expert mode'))
self.grid.addWidget(self.expert_lbl, 1, 0)
self.grid.addWidget(self.expert_checkbox, 1, 1, 1, 2)
# add count item in result table in grid
- self.count_row_lbl = LabelWordWrap(_('Count Row in result Table'),self)
+ self.count_row_lbl = LabelWordWrap(_('Rows in the Table'),self)
self.count_row_lbl.setMaximumWidth \
(self.count_row_lbl.sizeHint().width())
diff --git a/ru/console_gui.po b/ru/console_gui.po
index 4249d14..a9a4c6e 100644
--- a/ru/console_gui.po
+++ b/ru/console_gui.po
@@ -2,9 +2,9 @@ msgid ""
msgstr ""
"Project-Id-Version: console_gui_translate\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-06 09:36+0300\n"
-"PO-Revision-Date: 2012-07-06 09:37+0300\n"
-"Last-Translator: Denis Spiridonov \n"
+"POT-Creation-Date: 2012-07-19 17:05+0300\n"
+"PO-Revision-Date: 2012-07-19 17:09+0300\n"
+"Last-Translator: Calculate Ltd., Elena Gavrilova \n"
"Language-Team: \n"
"Language: \n"
"MIME-Version: 1.0\n"
@@ -51,18 +51,18 @@ 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:419
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:178
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:179
#: /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:2285
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2286
msgid "Yes"
msgstr "Да"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:420
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:179
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:180
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:703
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1960
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2286
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2287
msgid "No"
msgstr "Нет"
@@ -95,8 +95,6 @@ msgstr "Процессы"
#: /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: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 "Просмотр информации о запущенных процессах"
@@ -227,6 +225,11 @@ msgstr "Поле \"Страна\" должно состоять из двух с
msgid "Input error"
msgstr "Ошибка ввода"
+#: /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 the running processes"
+msgstr "Просмотр информации о запущенных процессах"
+
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/View_Process.py:87
msgid "Kill the process? (The process is active)"
msgstr "Убить процесс? (Процесс активен)"
@@ -271,6 +274,7 @@ msgstr "Успешно убит!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/View_Process.py:182
#: /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:89
msgid "Certificate not found in the server!"
msgstr "Не найден сертификат на сервере!"
@@ -282,7 +286,7 @@ msgstr "Сессия не соответствует Вашему сертифи
msgid "Failed to kill the process!"
msgstr "Не удалось завершить процесс!"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:173
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:174
#: /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:140
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:238
@@ -290,28 +294,28 @@ msgstr "Не удалось завершить процесс!"
msgid "Close"
msgstr "Закрыть"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:207
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:208
msgid "show this help message and exit"
msgstr "вывод этой справки и выход"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:210
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:211
msgid "language for translation"
msgstr "язык для перевода"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:213
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:214
msgid "call method"
msgstr "вызов метода"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:216
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:217
msgid "port number"
msgstr "номер порта"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:219
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:220
msgid "destination host"
msgstr "хост назначения"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:365
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:438
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:383
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:456
msgid "New connection"
msgstr "Новое соединение"
@@ -400,7 +404,7 @@ msgid "Email sent!"
msgstr "Письмо отправлено!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:236
-msgid "Error sending!"
+msgid "Sending error!"
msgstr "Ошибка отправки"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:139
@@ -418,7 +422,7 @@ msgid "Next"
msgstr "Далее"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:255
-msgid "Error when closing the process"
+msgid "Error closing the process"
msgstr "Ошибка закрытия процесса"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:54
@@ -468,10 +472,6 @@ msgstr "Время жизни сертификата истекает через
msgid "Not connected!"
msgstr "Соединение отсутствует!"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:89
-msgid "Certificate not found in Server Database!"
-msgstr "Сертификат не найден в БД сервера!"
-
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:95
msgid "Your session ID: "
msgstr "Номер Вашей сессии: "
@@ -514,7 +514,7 @@ msgid "Session cache cleared"
msgstr "Кэш сессии удалён"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:26
-msgid "User should be not root"
+msgid "The user must not be root"
msgstr "Пользователь должен быть не root"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:146
@@ -563,33 +563,33 @@ msgstr "Сбросить изменения"
msgid "Repeat"
msgstr "Повтор"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2155
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2156
msgid "Break the process"
msgstr "Прервать процесс"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2319
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2320
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:360
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:2400
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2404
msgid "No methods available!"
msgstr "Нет доступных методов!"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2429
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2435
msgid "No access to the file!"
msgstr "Нет доступа к файлу!"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2432
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2438
msgid "Failed to obtain certificate data!"
msgstr "Не удалось получить данные сертификата!"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2435
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2441
#, python-format
-msgid "Permission denied %s"
+msgid "%s: Permission denied"
msgstr "Доступ запрещён %s"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2446
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2452
msgid "Error removing the session from the server"
msgstr "Ошибка удаления сессии на сервере"
@@ -616,7 +616,7 @@ msgid "Quit"
msgstr "Выход"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:74
-msgid "Certificate signature request"
+msgid "Signature request"
msgstr "Запрос на подпись сертификата"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:99
@@ -642,12 +642,12 @@ msgid "Incorrect \"Port\" value!"
msgstr "Ошибка в поле \"Порт\"!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:112
-msgid "You have already sent a request to sign the certificate!"
+msgid "You have already sent a signature request!"
msgstr "У Вас уже есть запрос на подписание сертификата!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:113
#, python-format
-msgid "request id - %s"
+msgid "Request ID: %s"
msgstr "Номер Вашего запроса - %s"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:115
@@ -666,7 +666,7 @@ msgstr "Секретный ключ и запрос на подпись серт
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:158
msgid "Create a new private key and signature request?"
-msgstr "Создать новые Секретный Ключ и Запрос на подпись сертификата?"
+msgstr "Создать новые секретный ключ и запрос на подпись сертификата?"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:188
msgid "This server has not signed the certificate!"
@@ -680,7 +680,7 @@ msgstr "Номер Вашего запроса: %s"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:195
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:273
-msgid "To sign the certificate in the server use command"
+msgid "To sign the certificate on the server, use command"
msgstr "Для подписания сертификата на сервере используется команда"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:197
@@ -733,8 +733,8 @@ msgid "Root certificate added"
msgstr "Корневой сертификат добавлен"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:352
-msgid "File with CA certificates now exists"
-msgstr "Файл с сертификатом удостоверяющего центра создан"
+msgid "File with the CA certificate now exists"
+msgstr "Файл с сертификатом Центра авторизации создан"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:160
msgid "Connection"
@@ -746,7 +746,7 @@ msgstr "Вы подсоединены к серверу!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:173
msgid "Please break"
-msgstr "Пожалуйста разорвите"
+msgstr "Пожалуйста, разорвите"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:173
msgid "previous connection!"
@@ -800,7 +800,7 @@ msgstr "Ошибка получения полного фрейма с серв
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:488
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:489
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:638
-msgid "Failed to get progress status from the server"
+msgid "Failed to get the progress status from the server"
msgstr "Ошибка получения значения прогресса с сервера"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:601
@@ -835,7 +835,7 @@ msgstr "Прочие настройки"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:160
#, python-format
-msgid "There are unsaved changes on tab %s"
+msgid "There are unsaved changes in tab %s"
msgstr "На вкладке %s имеются несохранённые изменения"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:162
@@ -847,15 +847,15 @@ msgid "Saving changes"
msgstr "Сохранение изменений"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:208
-msgid "Height image"
+msgid "Image height"
msgstr "Высота изображений"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:212
-msgid "Set fixed height image for actions"
+msgid "Set a fixed height image for actions"
msgstr "Установка фиксированной высоты изображений для действий"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:213
-msgid "0 - hide images"
+msgid "0: hide images"
msgstr "0 - скрыть изображения"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:221
@@ -864,11 +864,11 @@ msgstr "Расширенный просмотр"
#: /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"
+msgid "View results in expert mode"
msgstr "Расширенный режим просмотра результатов"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:231
-msgid "Count Row in result Table"
+msgid "Rows in the Table"
msgstr "Кол-во строк в таблице"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/tools.py:376
@@ -897,7 +897,7 @@ msgstr "Оставьте пустым для выбора стандартног
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:38
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:42
-msgid "You are not connected to localhost server"
+msgid "You are not connected to the localhost server"
msgstr "Вы не подсоединены к локальному серверу!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:84
@@ -929,7 +929,7 @@ msgstr "Показать/спрятать окно"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:170
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:295
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:403
-msgid "Exit program"
+msgid "Exit Program"
msgstr "Выйти из программы"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:168
@@ -938,7 +938,7 @@ msgid "Program settings"
msgstr "Настройки программы"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/TrayIcon.py:241
-msgid "Update is already running"
+msgid "An update is already running"
msgstr "Обновление уже запущено"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/DisplayMethod.py:332
@@ -950,7 +950,7 @@ msgid "Untrusted Server Certificate!"
msgstr "Недоверенный сертификат сервера!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:55
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:414
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:416
#, python-format
msgid "Fingerprint = %s"
msgstr "Отпечаток = %s"
@@ -961,150 +961,148 @@ msgid "Serial Number = %s"
msgstr "Серийный номер = %s"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:71
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:418
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:420
msgid "Issuer"
msgstr "Подписчик"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:83
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:422
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:424
msgid "Subject"
msgstr "Субъект"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:92
-msgid "Add this Servers certificate to trusted or "
+msgid "Add this server's certificate to trusted or "
msgstr "Добавить сертификат этого сервера в доверенные или"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:93
-msgid "try add CA and ROOT certificates to trusted?"
+msgid "try add the CA and ROOT certificates to trusted?"
msgstr "Попытаться добавить сертификат ЦА и корневой в доверенные?"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:105
-msgid "Add Servers certificate"
+msgid "Add the server certificate"
msgstr "Добавить сертификат сервера"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:110
-msgid "Add CA and ROOT certificate"
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:111
+msgid "Add the CA and ROOT certificates"
msgstr "Добавить Корневой и сертификат ЦА"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:121
-msgid "Add certificate to trusted"
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:123
+msgid "Add the certificate to trusted"
msgstr "Добавить сертификат в доверенные"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:167
-#, python-format
-msgid ""
-"Server certificate add to trusted \n"
-"%s"
-msgstr ""
-"Сертификат сервера добавлен в доверенные \n"
-"%s"
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:169
+msgid "Server certificate added to trusted"
+msgstr "Сертификат сервера добавлен в доверенные"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:168
-msgid "Certificate add"
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:170
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:375
+msgid "Certificate added"
msgstr "Сертификат добавлен"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:184
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:630
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:635
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:186
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:632
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:637
#, python-format
-msgid "error creating directory %s"
+msgid "Error creating directory %s"
msgstr "Ошибка при создании директории %s"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:296
-msgid "Certificate not found in client"
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:298
+msgid "Certificate not found on the client's side"
msgstr "Сертификат не найден на стороне клиента"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:307
-msgid "Error open file"
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:309
+msgid "Error opening file"
msgstr "Ошибка при открытии файла"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:363
-msgid "Not found field \"CN\" in certificate!"
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:365
+msgid "Field \"CN\" not found in the certificate!"
msgstr "Не найдено поле \"CN\" в сертификате!"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:373
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:375
#, python-format
msgid "Filename = %s"
msgstr "Имя файла = %s"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:373
-msgid "CERTIFICATE ADD"
-msgstr "Сертификат добавлен"
-
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:375
-msgid "File with ca certificates exists"
-msgstr "Файл с сертификатом удостоверяющего центра создан"
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:377
+msgid "A file with the CA certificate now exists"
+msgstr "Файл с сертификатом Центра авторизации создан"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:391
-msgid "Server certificate is not valid"
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:393
+msgid "Invalid server certificate"
msgstr "Сертификат сервера недействителен!"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:396
-msgid "CA not found on server"
-msgstr "Сертификат Центра Авторизации не найден на сервере"
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:398
+msgid "CA certificate not found on the server"
+msgstr "Сертификат Центра авторизации не найден на сервере"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:408
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:410
msgid "Error. Certificate not added to trusted"
msgstr "Ошибка! Сертификат не добавлен в доверенные"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:415
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:417
#, python-format
msgid "Serial Number = %s"
msgstr "Серийный номер = %s"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:426
-msgid "Add CA certificates to trusted? "
-msgstr "Добавить сертификат Центра Авторизации в доверенные?"
-
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:428
-msgid "Adding certificate"
+msgid "Add the CA certificate to trusted? "
+msgstr "Добавить сертификат Центра авторизации в доверенные?"
+
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:430
+msgid "Adding the certificate"
msgstr "Добавление сертификата"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:431
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:433
msgid "Certificate not added to trusted"
msgstr "Сертификат не добавлен в доверенные"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:712
-msgid "CRL add"
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:714
+msgid "CRL added"
msgstr "Список отзыва сертификатов добавлен"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:801
-msgid "CA certificate delete from user trusted certificate"
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:803
+msgid "CA certificate removed from user trusted"
msgstr "Сертификат Центра Авторизации удалён из пользовательского списка доверенных сертификатов"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:821
-msgid "CA certificate delete from system trusted certificate"
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/client_class.py:822
+msgid "CA certificate removed from system trusted"
msgstr "Сертификат Центра Авторизации удалён из системного списка доверенных сертификатов"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1047
-msgid "Advanced settings."
-msgstr "Дополнительные настройки."
+msgid "Advanced settings"
+msgstr "Дополнительные настройки"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1135
-msgid "Clean expert parameters?"
+msgid "Clean the expert parameters?"
msgstr "Очистить экспертные параметры?"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1364
-msgid "Delete selected rows"
+msgid "Delete the selected rows"
msgstr "Удалить выделенные строки"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1608
-msgid "Delete row"
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1611
+msgid "Delete the row"
msgstr "Удалить строку"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1729
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1732
msgid "View options"
msgstr "Просмотреть параметры"
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2255
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2258
msgid " Step "
msgstr " Шаг "
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2258
-#: /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:2261
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2265
msgid "Run"
msgstr "Выполнение"
+#~ msgid "Certificate not found in the server database!"
+#~ msgstr "Сертификат не найден в БД сервера!"
+
+#~ msgid "CERTIFICATE ADDED"
+#~ msgstr "Сертификат добавлен"
+
#~ msgid "No module named %s"
#~ msgstr "Нет модуля %s"
diff --git a/scripts/cl-console-gui b/scripts/cl-console-gui
index 13d38e0..9cc7777 100755
--- a/scripts/cl-console-gui
+++ b/scripts/cl-console-gui
@@ -56,7 +56,7 @@ def main():
except dbus.exceptions.DBusException, e:
bus = None
if not os.getuid():
- _print (_('User should be not root'))
+ _print (_('The user must not be root'))
else:
print e
sys.exit(1)