From 83c11af5934dd205fa0aee4d40f664deefde7a89 Mon Sep 17 00:00:00 2001 From: Denis Spiridonov Date: Fri, 15 Jun 2012 16:14:30 +0400 Subject: [PATCH] del cert_add method --- consolegui/application/conf_connection.py | 4 +- consolegui/application/session_function.py | 28 +-- consolegui/application/tools.py | 5 +- ru/console_gui.po | 231 ++++++++++----------- 4 files changed, 122 insertions(+), 146 deletions(-) diff --git a/consolegui/application/conf_connection.py b/consolegui/application/conf_connection.py index ddc6056..6b6c94c 100755 --- a/consolegui/application/conf_connection.py +++ b/consolegui/application/conf_connection.py @@ -350,6 +350,7 @@ class FrameConnection(QtGui.QWidget): #If the certificate file misses if Connect_Error: + self.ClientObj.client = None if crypto_Error and 'passwd' in locals(): show_msg (_('Password is invalid'), \ _('Connection Error'), self) @@ -369,7 +370,8 @@ class FrameConnection(QtGui.QWidget): 'get new certificate from server.') show_msg (mess, parent = self) else: - show_msg (e, parent = self) + if e.message or e.args: + show_msg (e, parent = self) return CERT_FILE = None CERT_KEY = None diff --git a/consolegui/application/session_function.py b/consolegui/application/session_function.py index cd27245..ed8aabb 100755 --- a/consolegui/application/session_function.py +++ b/consolegui/application/session_function.py @@ -51,13 +51,8 @@ def client_post_cert (client, lang): sid = get_sid(client) results = client.service.post_cert() if results[0][0] == -4: - show_msg (_('Certificate added to database server. ') + \ - _('Must restart the program.'),\ - _("Certificate not found in Server Database!")) - ip, mac = get_ip_mac() - cert_id = client.service.cert_add(mac, 'gui') - _print (_("Your certificate ID = %s") %cert_id) - sys.exit(1) + show_msg (_("Certificate not found in Server Database!"), _('Error')) + raise Exception() sid, new_session = client_sid(sid, client, results[0][0], lang) if new_session: _print (_(" New Session")) @@ -94,26 +89,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) - - self.layout.addWidget(LabelWordWrap(_('Add certificate to server' - ' Database...'), self), 1,0,1,2) - - self.layout.addWidget(LabelWordWrap(_('Your IP adress - ')+ip, - self), 2,0,1,2) - self.layout.addWidget(LabelWordWrap(_('Your MAC adress - ')+mac, - self), 3,0,1,2) - - try: - cert_id = client.service.cert_add(mac, 'gui') - except urllib2.URLError: - self.layout.addWidget(LabelWordWrap(_('Error adding ' - 'certificate to server!')), 4,0,1,2) - self.setLayout(self.layout) - return 1 - self.layout.addWidget(LabelWordWrap(_('Your certificate ID = ') \ - + cert_id, self), 4,0,1,2) self.setLayout(self.layout) - return 1 sid = get_sid(client) diff --git a/consolegui/application/tools.py b/consolegui/application/tools.py index 198788c..0e55516 100755 --- a/consolegui/application/tools.py +++ b/consolegui/application/tools.py @@ -521,7 +521,10 @@ class ToolOther(QtGui.QWidget): ClientObj.lang = self.lang_ComboBox.itemData \ (self.lang_ComboBox.currentIndex()) if ClientObj.client: - client_post_cert(ClientObj.client, ClientObj.lang) + try: + client_post_cert(ClientObj.client, ClientObj.lang) + except: + return ClientObj.methods_list = client_list_methods \ (ClientObj.sid, ClientObj.client) from DisplayMethod import DisplayMethod diff --git a/ru/console_gui.po b/ru/console_gui.po index 6e39114..4cf0e72 100755 --- 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-13 10:26+0300\n" -"PO-Revision-Date: 2012-06-13 10:27+0300\n" +"POT-Creation-Date: 2012-06-15 16:04+0300\n" +"PO-Revision-Date: 2012-06-15 16:04+0300\n" "Last-Translator: Denis \n" "Language-Team: \n" "Language: \n" @@ -51,25 +51,26 @@ 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:124 -#: /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:1929 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2261 +#: /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:700 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1957 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2284 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:125 -#: /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:1931 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2262 +#: /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: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:2285 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:1047 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2025 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:891 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1075 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2050 #: /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" @@ -203,8 +204,8 @@ msgid "Country (2 words)" 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:1802 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2007 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1830 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2034 #: /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" @@ -279,32 +280,32 @@ msgstr "Сессия не соответствует Вашему сертифи msgid "It was not possible to kill process!" msgstr "Не удалось завершить процесс!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:119 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:126 #: /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:225 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:149 +#: /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 msgid "Close" msgstr "Закрыть" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:140 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:147 msgid "language for translate" msgstr "язык для перевода" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:143 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:150 msgid "call method" msgstr "вызов метода" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:146 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:153 msgid "port number" msgstr "номер порта" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:149 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:156 msgid "host destination" msgstr "хост назначения" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:273 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:342 +#: /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 msgid "New connection" msgstr "Новое соединение" @@ -401,7 +402,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:2019 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2045 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:43 msgid "Ok" msgstr "Ok" @@ -410,63 +411,54 @@ msgstr "Ok" msgid "Next" msgstr "Далее" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:238 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:241 msgid "Error close process" msgstr "Ошибка закрытия процесса" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:54 -msgid "Certificate added to database server. " -msgstr "Сертификат добавлен в базу сервера. " - -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:55 -msgid "Must restart the program." -msgstr "Необходимо перезапустить программу." - -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:56 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:95 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:90 msgid "Certificate not found in Server Database!" msgstr "Сертификат не найден в БД сервера!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:59 -#, python-format -msgid "Your certificate ID = %s" -msgstr "Номер Вашего сертификата = %s" +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:54 +msgid "Error" +msgstr "Ошибка" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:63 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:58 msgid " New Session" msgstr "Новая сессия" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:64 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:59 msgid " Old Session" msgstr "Старая сессия" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:65 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:60 #, python-format msgid " Your session id = %s" msgstr "Номер Вашей сессии = %s" -#: /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:124 +#: /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!" 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:64 #, python-format msgid " Your certifitate id = %d" msgstr "Номер Вашего сертификата = %d" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:72 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:131 +#: /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" msgstr "Время жизни сертификата истекло" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:74 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:134 +#: /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" msgstr "Время жизни сертификата истекает через %d дней" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:88 +#: /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 @@ -477,49 +469,35 @@ msgstr "Время жизни сертификата истекает через msgid "Not connected!" msgstr "Соединение отсутствует!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:98 -msgid "Add certificate to server Database..." -msgstr "Добавление сертификата в БД сервера..." +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:96 +msgid "Your session id = " +msgstr "Номер Вашей сессии = " + +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:103 +msgid "Your certifitate id = " +msgstr "Номер Вашего сертификата = " -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:101 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:138 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:114 msgid "Your IP adress - " msgstr "Ваш IP адрес - " -#: /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:140 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:116 msgid "Your MAC adress - " msgstr "Ваш MAC адрес - " -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:109 -msgid "Error adding certificate to server!" -msgstr "Ошибка добавления сертификата на сервер!" - -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:113 -msgid "Your certificate ID = " -msgstr "Номер Вашего сертификата = " - -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:120 -msgid "Your session id = " -msgstr "Номер Вашей сессии = " - -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:127 -msgid "Your certifitate id = " -msgstr "Номер Вашего сертификата = " - -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:145 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:121 msgid "Clear session cache" msgstr "Очистить кэш сессии" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:160 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:136 msgid "Session information" msgstr "Информация о сессии" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:175 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:151 msgid "Error clearing session cache" msgstr "Ошибка удаления кэша сессии" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:177 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:153 msgid "Session cache is cleared" msgstr "Кэш сессии удалён" @@ -532,75 +510,75 @@ msgid "Information" msgstr "Справка" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:488 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:600 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:599 msgid "Open" msgstr "Открыть" -#: /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:1933 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:698 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1961 msgid "Auto" msgstr "Авто" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:998 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1026 msgid "Clear Table" msgstr "Очистить таблицу" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1099 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1238 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1304 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1417 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1127 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1266 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1332 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1445 msgid "Add row" msgstr "Добавить строку" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1110 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1138 msgid "Recover Table" msgstr "Восстановить таблицу" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1154 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1182 msgid "Check all" msgstr "Отметить все" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1317 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1345 msgid "Reset changes" msgstr "Сбросить изменения" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1805 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2013 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1833 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2040 msgid "Repeat" msgstr "Повтор" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2131 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2154 msgid "Break process" msgstr "Прервать процесс" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2295 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2318 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:359 msgid "You do not have a certificate. Please, generate new request and get new certificate from server." msgstr "У Вас нет сертификата. Пожалуйста, сгенерируйте запрос на сертитфикат и получите сертификат с сервера." -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2363 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2386 msgid "No methods available!" msgstr "Нет доступных методов!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2390 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2413 msgid "No access to file!" msgstr "Нет доступа к файлу!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2393 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2416 msgid "Failed to obtain certificate data!" msgstr "Не удалось получить данные сертификата!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2396 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2419 #, python-format msgid "Permission denied %s" msgstr "Доступ запрещён %s" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2399 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2403 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2422 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2426 msgid "Sid Deleted!" msgstr "Сессия удалена!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2406 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2429 msgid "Server delete sid error" msgstr "Ошибка удаления сессии на сервере" @@ -774,46 +752,42 @@ 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 "У вас нет сертификата или ваш сертификат не соответствует серверному сертификату. Пожалуйста, сгенерируйте запрос на сертитфикат и получите сертификат с сервера." -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:225 -msgid "Error clear process cache on 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:495 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:512 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:496 +#: /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: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:497 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:514 msgid "Please, resfesh 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:570 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:587 msgid "Error get entire frame from 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:619 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:637 msgid "Error get progress from 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:766 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:784 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:799 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:817 msgid "Error send password to Server" msgstr "Ошибка отправки сообщения (пароля) на сервер" @@ -959,7 +933,7 @@ msgstr "Настройки программы" msgid "Update is already running" msgstr "Обновление уже запущено" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/DisplayMethod.py:319 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/DisplayMethod.py:344 msgid "Reconnect" msgstr "Переподключиться" @@ -1094,35 +1068,56 @@ msgstr "Сертификат Центра Авторизации удалён и msgid "CA certificate delete from system trusted certificate" msgstr "Сертификат Центра Авторизации удалён из системного списка доверенных сертификатов" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:999 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1061 msgid "Advanced settings." msgstr "Дополнительные настройки." -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1082 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1149 msgid "Clean expert parameters?" msgstr "Очистить экспертные параметры?" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1301 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1375 msgid "Delete selected rows" msgstr "Удалить выделенные строки" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1545 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1619 msgid "Delete row" msgstr "Удалить строку" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1682 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1751 msgid "View options" msgstr "Просмотреть параметры" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2160 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2228 msgid " Step " msgstr " Шаг " -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2163 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2167 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2231 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2235 msgid "Run" msgstr "Выполнение" +#~ 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 "Ошибка удаления кэша процесса на сервере" + #~ msgid "Clear your cache session" #~ msgstr "Очистить кэш сессии"