From f20fc7782b234d043d73c9eb48e101a9c8dad872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Tue, 25 Dec 2012 12:07:24 +0400 Subject: [PATCH] Update translate --- consolegui/application/Box.py | 6 +++--- consolegui/application/CertificateClass.py | 10 +++++----- consolegui/application/ConnectionTabs.py | 2 +- consolegui/application/MainFrameResult.py | 6 +++--- consolegui/application/ShortFrameResult.py | 6 +++--- consolegui/application/TrayIcon.py | 6 +++--- consolegui/application/View_Process.py | 2 +- consolegui/application/client_class.py | 8 ++++---- consolegui/application/conf_connection.py | 8 ++++---- consolegui/application/create_cert.py | 2 +- consolegui/application/helpwidget.py | 6 +++--- consolegui/application/mainframe.py | 4 ++-- consolegui/application/more.py | 8 ++++---- consolegui/application/session_function.py | 16 ++++++++-------- 14 files changed, 45 insertions(+), 45 deletions(-) diff --git a/consolegui/application/Box.py b/consolegui/application/Box.py index 632768a..7664552 100755 --- a/consolegui/application/Box.py +++ b/consolegui/application/Box.py @@ -383,7 +383,7 @@ class MainWgt(QtGui.QMainWindow): self.con_lost_lbl.hide() self.con_lost_lbl.close() self.con_lost_lbl = ConnectLostLabel \ - (_('The Server was restarted.') + '\n' + \ + (_("The server was restarted.") + '\n' + \ _('Please try reconnecting to the server.'), self, True) self.topmenu.Processes.setDisabled(True) @@ -407,10 +407,10 @@ class MainWgt(QtGui.QMainWindow): if len(list_pid): if str(len(list_pid)).endswith('1'): msgBox.setInformativeText(_('Once the session is closed, '\ - 'data on %d process will be lost!') %len(list_pid)) + 'data on process %d will be lost!') %len(list_pid)) if len(list_pid) > 1: msgBox.setInformativeText(_('Once the session is closed, '\ - 'data on %d processes will be lost!') %len(list_pid)) + 'data on process %d 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 6478470..789519c 100755 --- a/consolegui/application/CertificateClass.py +++ b/consolegui/application/CertificateClass.py @@ -55,7 +55,7 @@ class CertClass (QtGui.QWidget): Send_button.clicked.connect(self.send) layout_button.addWidget(Send_button) - Get_button = QtGui.QPushButton(_("Get a certificate"), self) + Get_button = QtGui.QPushButton(_("Get the 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(_('Signature request')) + self.GroupBoxSend = QtGui.QGroupBox(_("Certificate signature request")) # self.GroupBoxSend.setContentsMargins(10,0,0,0) self.GroupBoxSend.setLayout(self.sendlayout) @@ -185,14 +185,14 @@ class CertClass (QtGui.QWidget): return 1 del (self.client) if int(res) < 0: - show_msg (_("This server has not signed the certificate!"), + show_msg (_("The 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 + '\n' + \ - _("To sign the certificate on the server, use command") + \ + _("To submit the certificate request 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 on the server, use command")+\ + _("To submit the certificate request on the server use command")+\ '\n'+'cl-core --sign-client ID_CLIENT_REQUEST', title = _('Request'), parent = self) return 1 diff --git a/consolegui/application/ConnectionTabs.py b/consolegui/application/ConnectionTabs.py index 1277f8d..81d6873 100644 --- a/consolegui/application/ConnectionTabs.py +++ b/consolegui/application/ConnectionTabs.py @@ -207,7 +207,7 @@ def parse(): dest='help', help=_("show this help message and exit")) parser.add_argument( '-l', '--lang', type=str, dest='lang', - help=_('language for translation')) + help=_("translation language")) parser.add_argument( '--method', type=str, dest='method', help=_('call method')) diff --git a/consolegui/application/MainFrameResult.py b/consolegui/application/MainFrameResult.py index 80e489d..75aa94c 100755 --- a/consolegui/application/MainFrameResult.py +++ b/consolegui/application/MainFrameResult.py @@ -520,8 +520,8 @@ class MainFrameRes(QtGui.QWidget): def get_Frame_cycle(self, current_frame, through_object): if type(current_frame) == Exception: - _print (_('Failed to get the frame from the server.')) - show_msg(_('Failed to get the frame from the server.') +'\n'+ \ + _print (_("Failed to get a frame from the server.")) + show_msg(_("Failed to get a frame from the server.") +'\n'+ \ _('Try resfeshing this page later.'),'get frame error') return 1 sid, pid = through_object @@ -596,7 +596,7 @@ class MainFrameRes(QtGui.QWidget): def get_entire_frame_after(self, current_frame, through_object): if type(current_frame) == Exception: _print (_('Failed to get the complete frame from the server.')) -# show_msg(_('Failed to get the frame from the server.') +'\n'+ \ +# show_msg(_("Failed to get a frame from the server.") +'\n'+ \ # _('Try resfeshing this page later.'),'get frame error') return 1 sid, pid = through_object diff --git a/consolegui/application/ShortFrameResult.py b/consolegui/application/ShortFrameResult.py index e1bfc62..d3d2905 100644 --- a/consolegui/application/ShortFrameResult.py +++ b/consolegui/application/ShortFrameResult.py @@ -370,8 +370,8 @@ class ShortFrameRes(QtGui.QWidget): def get_Frame_cycle(self, current_frame, through_object): if type(current_frame) == Exception: - _print (_('Failed to get the frame from the server.')) - show_msg(_('Failed to get the frame from the server.') +'\n'+ \ + _print (_("Failed to get a frame from the server.")) + show_msg(_("Failed to get a frame from the server.") +'\n'+ \ _('Try resfeshing this page later.'),'get frame error') return 1 sid, pid = through_object @@ -445,7 +445,7 @@ class ShortFrameRes(QtGui.QWidget): def get_entire_frame_after(self, current_frame, through_object): if type(current_frame) == Exception: _print (_('Failed to get the complete frame from the server.')) - show_msg(_('Failed to get the frame from the server.') +'\n'+ \ + show_msg(_("Failed to get a frame from the server.") +'\n'+ \ _('Try resfeshing this page later.'),'get frame error') return 1 sid, pid = through_object diff --git a/consolegui/application/TrayIcon.py b/consolegui/application/TrayIcon.py index f1974ba..88b0c81 100644 --- a/consolegui/application/TrayIcon.py +++ b/consolegui/application/TrayIcon.py @@ -114,7 +114,7 @@ class TrayUpdateSystem(QtCore.QThread): current_frame = None for item in range(len(current_frame[0])): if current_frame[0][item].type == 'error': - self.mes_sig.emit(_('Error updating!'), \ + self.mes_sig.emit(_("Failed to update!"), \ current_frame[0][item].message) end_frame = False return 1 @@ -164,7 +164,7 @@ class TrayIcon (QtGui.QSystemTrayIcon): # Translate right click menu self.right_menu.about_action.setText(_('About')) - self.right_menu.bug_action.setText(_('Report Bug')) + self.right_menu.bug_action.setText(_("Report a 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')) @@ -348,7 +348,7 @@ class RightButtonMenu(QtGui.QMenu): if not bug_icon.isNull(): break - self.bug_action = QtGui.QAction(bug_icon, _('Report Bug'), self, \ + self.bug_action = QtGui.QAction(bug_icon, _("Report a Bug"), self, \ triggered=parent.bug_report) self.addAction(self.bug_action) diff --git a/consolegui/application/View_Process.py b/consolegui/application/View_Process.py index c9ddccc..849a0cc 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 the process? (The process is active)') + kill_but_text = _('Kill the process? (It\' active)') kill_button = QtGui.QPushButton(kill_but_text, self) kill_button.clicked.connect(self.kill_process \ (int(list_pid[num]), num+2, 2)) diff --git a/consolegui/application/client_class.py b/consolegui/application/client_class.py index 5356955..e629ab5 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 server's certificate to trusted or ") +\ - _('try add the CA and ROOT certificates to trusted?'),self)) + (_("Add this server certificate to trusted or ") +\ + _('try adding the CA and root certificates to trusted?'),self)) self.pix_lbl = QtGui.QLabel(self) pi = QtGui.QPixmap() @@ -108,7 +108,7 @@ class AddServerCert (QtGui.QDialog): self.server_but.clicked.connect(self.close) self.grid.addWidget(self.server_but, x, 0) - self.ca_but = QtGui.QPushButton(_('Add the CA and ROOT certificates'), + 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) @@ -394,7 +394,7 @@ class CheckingClientHTTPSConnection(CheckingHTTPSConnection): cert = '0' if cert == '1': - msg = _('Invalid server certificate') + msg = _("Invalid server certificate!") show_msg (msg) return diff --git a/consolegui/application/conf_connection.py b/consolegui/application/conf_connection.py index 9613015..cdeea08 100755 --- a/consolegui/application/conf_connection.py +++ b/consolegui/application/conf_connection.py @@ -170,7 +170,7 @@ class FrameConnection(QtGui.QWidget): self.setDisabled(True) if self.ClientObj.client: show_msg(_('You are connected to the server!')+'\n' + \ - _('Please break') +' '+ _('previous connection!'), \ + _("Please disconnect") +' '+ _('previous connection!'), \ _('Connection Error')) return 1 @@ -337,7 +337,7 @@ class FrameConnection(QtGui.QWidget): self.ClientObj.lang) Connect_Error = 0 except VerifyError, e: - show_msg (e.value,_("Certificate verification error"),self) + show_msg (e.value,_("Server certificate verification error"),self) e.message = 'VerifyError' Connect_Error = 1 except OpenSSL.crypto.Error, e: @@ -358,7 +358,7 @@ class FrameConnection(QtGui.QWidget): # self.close() if not locals().has_key('e'): mess = _('You do not have a certificate. Please generate ' - 'a new request and get a new certificate from ' + 'a new request and get the new certificate from ' 'the server.') show_msg (mess, parent = self) elif e.message == 'VerifyError': @@ -366,7 +366,7 @@ class FrameConnection(QtGui.QWidget): elif e.message == 1: mess = _('You do not have a certificate or your ' 'certificate does not match the server certificate.' - ' Please generate a new request and get a new ' + ' Please generate a new request and get the new ' 'certificate from the server.') show_msg (mess, parent = self) else: diff --git a/consolegui/application/create_cert.py b/consolegui/application/create_cert.py index 27f7866..68fa573 100755 --- a/consolegui/application/create_cert.py +++ b/consolegui/application/create_cert.py @@ -79,7 +79,7 @@ class RequestCreate (QtGui.QWidget): self.mainlayout.addWidget(self.netw_adr, 3,1) # Add State name field - self.mainlayout.addWidget(LabelWordWrap(_('State Name'), self),4,0, \ + self.mainlayout.addWidget(LabelWordWrap(_("City"), self),4,0, \ QtCore.Qt.AlignRight) self.state_name = QtGui.QLineEdit('My_State', self) self.mainlayout.addWidget(self.state_name, 4,1) diff --git a/consolegui/application/helpwidget.py b/consolegui/application/helpwidget.py index d209cd7..dd52423 100755 --- a/consolegui/application/helpwidget.py +++ b/consolegui/application/helpwidget.py @@ -182,7 +182,7 @@ class BugWgt(QtGui.QWidget): break self.setWindowIcon(bug_icon) - self.setWindowTitle(_('Report Bug')) + self.setWindowTitle(_("Report a Bug")) self.move(parent.window().geometry().x() + parent.window().geometry().width() / 2 @@ -229,9 +229,9 @@ class BugWgt(QtGui.QWidget): server.set_debuglevel(performDebugging) try: server.sendmail(sender, [receivers], msg.as_string()) - show_msg (_('Email sent!')) + show_msg (_("Message sent!")) server.quit() self.close() except: - show_msg (_('Sending error!')) + 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 315cfa3..bc0ede4 100755 --- a/consolegui/application/mainframe.py +++ b/consolegui/application/mainframe.py @@ -2275,11 +2275,11 @@ class MainFrame(QtGui.QWidget): if not _(' Step ') in temp[len(temp)-1]: self.ClientObj._parent.setWindowTitle \ (self.ClientObj._parent.windowTitle() + \ - ' - ' + _('Run')) + ' - ' + _("Running")) else: temp.pop() self.ClientObj._parent.setWindowTitle('-'.join(temp) \ - + ' - ' + _('Run')) + + ' - ' + _("Running")) self.calling_error = False # Call method display process results self.ClientObj.MainWidget.main_frame_res(self.method_name, \ diff --git a/consolegui/application/more.py b/consolegui/application/more.py index ee821d9..c353998 100755 --- a/consolegui/application/more.py +++ b/consolegui/application/more.py @@ -177,7 +177,7 @@ class HelpMenu(TopMenu): if not bug_icon.isNull(): break - bug = QtGui.QAction(bug_icon, _("Report Bug"), \ + bug = QtGui.QAction(bug_icon, _("Report a Bug"), \ self, triggered=self.actions.bug_report) menu.addAction(bug) # menu.addSeparator() @@ -329,7 +329,7 @@ class ErrorLabel (QtGui.QWidget): if not bug_icon.isNull(): break - bug = QtGui.QAction(bug_icon, _("Report Bug"), self, \ + bug = QtGui.QAction(bug_icon, _("Report a Bug"), self, \ triggered=self.bug_report) self.menu.addAction(bug) @@ -392,7 +392,7 @@ class ErrorWgt(QtGui.QWidget): if not bug_icon.isNull(): break - bug = QtGui.QAction(bug_icon, _("Report Bug"), self, \ + bug = QtGui.QAction(bug_icon, _("Report a Bug"), self, \ triggered=self.bug_report) # bug.setDisabled(True) self.menu.addAction(bug) @@ -2385,7 +2385,7 @@ def client_post_auth(client): try: if not os.path.exists(client.CERT_FILE): show_msg (_('You do not have a certificate. Please generate a ' - 'new request and get a new certificate from the server.')) + 'new request and get the new certificate from the server.')) return 1 except VerifyError, e: show_msg (e.value) diff --git a/consolegui/application/session_function.py b/consolegui/application/session_function.py index 5508cb4..4f6df98 100755 --- a/consolegui/application/session_function.py +++ b/consolegui/application/session_function.py @@ -66,7 +66,7 @@ def client_post_cert (client, lang): if results[0][1] == -2: _print (_("Certificate expired")) elif results[0][1] > 0: - _print (_("Expires after %d days")%(results[0][1])) + _print (_("The certificate expires after %d days")%(results[0][1])) except: pass @@ -99,15 +99,15 @@ class ViewSessionInfo (QtGui.QWidget): self.layout.addWidget(LabelWordWrap(_('Certificate not sent!'), self), 5,0,1,2) else: - self.layout.addWidget(LabelWordWrap(_('Your certifitate id: ') \ + self.layout.addWidget(LabelWordWrap(_("Your certificate ID: ") \ + str(results[0][0]), self), 5,0,1,2) try: if results[0][1] == -2: - self.layout.addWidget(LabelWordWrap(_('expiry ' - 'certificate has passed'), self), 6,0,1,2) + self.layout.addWidget(LabelWordWrap(_('Certificate ' + 'expired'), 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) + self.layout.addWidget(LabelWordWrap(_('The certificate ' + 'expires after %d days')%(results[0][1]), self), 6,0,1,2) except: pass self.layout.addWidget(LabelWordWrap(_('Your IP address: ') + ip, @@ -117,7 +117,7 @@ class ViewSessionInfo (QtGui.QWidget): # Add clear cache Button self.clear_cache_button = QtGui.QPushButton \ - (_('Clear your session cache'), self) + (_("Clear the session cache"), self) self.clear_cache_button.clicked.connect(self.clear_cache(client, sid)) self.layout.addWidget(self.clear_cache_button, 9,0) @@ -150,4 +150,4 @@ class ViewSessionInfo (QtGui.QWidget): show_msg(_('Error clearing the session cache'), parent = self) else: show_msg(_('Session cache cleared'), parent = self) - return wrapper \ No newline at end of file + return wrapper