calculate
/
calculate-utils-3-console-gui
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix translate

Browse Source
master3.3
Denis Spiridonov 12 years ago
parent 6f02b19ce9
commit fce1f700b3
3 changed files with 51 additions and 44 deletions
Show Stats Download Patch File Download Diff File

10
consolegui/application/CertificateClass.py
Unescape View File

@ -191,9 +191,10 @@ class CertClass (QtGui.QWidget):
fc = open(self.default_cert_path + 'req_id', 'w')
fc.write(res)
fc.close()
show_msg (_("Your request ID = %s") %res + '\n' + \
show_msg (_("Your request ID: %s") %res + '\n' + \
_("To sign the certificate in the server use command") + \
'\n'+'cl-core --sign-client ID_CLIENT_REQUEST', parent=self)
'\n'+'cl-core --sign-client ID_CLIENT_REQUEST',
title = _('Request'), parent=self)
return 0
def get(self):
@ -268,9 +269,10 @@ class CertClass (QtGui.QWidget):
return 1
elif cert == '2':
show_msg (_("The request has not been reviewed yet.") + '\n' + \
_("Your request ID = %s") %req_id + '\n'+\
_("Your request ID: %s") %req_id + '\n'+\
_("To sign the certificate in the server use command")+\
'\n'+'cl-core --sign-client ID_CLIENT_REQUEST')
'\n'+'cl-core --sign-client ID_CLIENT_REQUEST',
title = _('Request'), parent = self)
return 1
elif cert == '3':
show_msg (_('Either the request or the signature does not match '

8
consolegui/application/session_function.py
Unescape View File

@ -57,11 +57,11 @@ def client_post_cert (client, lang):
if new_session:
_print (_(" New session"))
else: _print (_(" Old session"))
_print (_(" Your session ID = %s") %sid)
_print (_(" Your session ID: %s") %sid)
if results[0][0] == -3:
_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 (_("Certificate expired"))
@ -92,14 +92,14 @@ 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 sent!'),
self), 5,0,1,2)
else:
self.layout.addWidget(LabelWordWrap(_('Your certifitate id = ') \
self.layout.addWidget(LabelWordWrap(_('Your certifitate id: ') \
+ str(results[0][0]), self), 5,0,1,2)
try:
if results[0][1] == -2:

77
ru/console_gui.po
Unescape View File

@ -2,8 +2,8 @@ msgid ""
msgstr ""
"Project-Id-Version: console_gui_translate\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-07-05 14:22+0300\n"
"PO-Revision-Date: 2012-07-05 14:22+0300\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 <ds.calculate.ru>\n"
"Language-Team: \n"
"Language: \n"
@ -223,7 +223,7 @@ msgstr "Поле \"Страна\" должно состоять из двух с
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:142
#: /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:233
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:234
msgid "Input error"
msgstr "Ошибка ввода"
@ -435,8 +435,8 @@ msgstr "Предыдущая сессия"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:60
#, python-format
msgid " Your session ID = %s"
msgstr "Номер Вашей сессии = %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:99
@ -445,8 +445,8 @@ msgstr "Сертификат не отправлен!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:64
#, python-format
msgid " Your certifitate ID = %d"
msgstr "Номер Вашего сертификата = %d"
msgid " Your certifitate ID: %d"
msgstr "Номер Вашего сертификата: %d"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:67
msgid "Certificate expired"
@ -460,8 +460,8 @@ msgstr "Время жизни сертификата истекает через
#: /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:240
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:257
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:241
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:258
#: /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
@ -473,12 +473,12 @@ 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 "Номер Вашей сессии = "
msgid "Your session ID: "
msgstr "Номер Вашей сессии: "
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:102
msgid "Your certifitate id = "
msgstr "Номер Вашего сертификата = "
msgid "Your certifitate id: "
msgstr "Номер Вашего сертификата: "
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:106
msgid "expiry certificate has passed"
@ -491,11 +491,11 @@ msgstr "Время жизни сертификата истекает через
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:113
msgid "Your IP address: "
msgstr "Ваш IP адрес - "
msgstr "Ваш IP адрес: "
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:115
msgid "Your MAC address: "
msgstr "Ваш MAC адрес - "
msgstr "Ваш MAC адрес: "
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:120
msgid "Clear your session cache"
@ -621,23 +621,23 @@ 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:211
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:232
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:212
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:233
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:212
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:213
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:217
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:218
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:217
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:218
msgid "Incorrect \"Port\" value!"
msgstr "Ошибка в поле \"Порт\"!"
@ -656,7 +656,7 @@ 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:228
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:229
msgid "Closing. Connection error."
msgstr "Ошибка соединения. Закрываюсь."
@ -673,61 +673,66 @@ msgid "This server has not signed the certificate!"
msgstr "Сервер не подписал сертификат!"
#: /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:271
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:272
#, 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:195
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:272
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:273
msgid "To sign the certificate in the server use command"
msgstr "Для подписания сертификата на сервере используется команда"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:202
#: /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:275
msgid "Request"
msgstr "Запрос"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:203
#, python-format
msgid "Request not sent, or file %s deleted"
msgstr "Запрос не был послан, или удалён файл %s"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:228
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:229
#, python-format
msgid "Error code: %s"
msgstr "Код ошибки: %s"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:244
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:245
#, python-format
msgid "Request %s not found on the client’s side"
msgstr "Запрос %s не найден на стороне клиента"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:267
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:268
msgid "Signature request rejected!"
msgstr "Запрос на подпись сертификата отвергнут!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:270
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:271
msgid "The request has not been reviewed yet."
msgstr "Запрос на подписание сертификата ещё не рассмотрен."
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:276
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:278
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:283
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:285
#, python-format
msgid "Certificate saved. Your certificate ID = %s"
msgstr "Сертификат сохранён! Номер Вашего сертификата = %s"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:334
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:336
msgid "Field \"CN\" not found in the root certificate!"
msgstr "Не найдено поле \"CN\" в корневом сертификате!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:347
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:349
msgid "Filename = "
msgstr "Имя файла ="
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:348
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:350
msgid "Root certificate added"
msgstr "Корневой сертификат добавлен"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:350
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:352
msgid "File with CA certificates now exists"
msgstr "Файл с сертификатом удостоверяющего центра создан"

Write Preview
Loading…
Cancel
Save