add translate, translate hiden methods

api/server/decorators.py

@@ -32,7 +32,7 @@ class Dec:
 
     # add wrapped method in list gui methods
     @classmethod
-    def gui(cls,category, label = None, image = None):
+    def gui(cls, category, label = None, image = None):
         def wrapper(function):
             if not category in cls.guiMethods.keys():
                 cls.guiMethods[category] = []

api/server/edit_groups.py

@@ -199,7 +199,7 @@ class ApiWsdl:
     @rpc(Integer, GroupInfo, _returns = Array(ReturnedMessage))
     @Dec.check_permissions(["edit-group"])
     @Dec.console('cl-show-groups')
-    @Dec.gui('Api',_('View Groups'),'user-group-properties,' \
+    @Dec.gui('Api', _('View Groups'), 'user-group-properties,' \
                             'view-certificate-import,application-certificate')
     def show_groups ( self, sid, info):
         if not info:
@@ -234,7 +234,7 @@ class ApiWsdl:
     @rpc(Integer, DetailGroupInfo, _returns = Array(ReturnedMessage))
     @Dec.check_permissions(["edit-group"])
     @Dec.console('cl-show-group')
-    #@Dec.gui(_('Api'),_('Detail Request'),'view-certificate-import')
+    @Dec.gui(_('Detail Group'))
     def detail_group ( self, sid, info):
         if not info:
             mess = 'Field must be in list!'
@@ -357,8 +357,8 @@ class ApiWsdl:
         
     @rpc(Integer, DetailGroupInfo, _returns = Array(ReturnedMessage))
     @Dec.check_permissions(["edit-group"])
-    #@Dec.console('cl-show-request')
-    #@Dec.gui(_('Api'),_('Confirm Request'),'view-certificate-import')
+    @Dec.console('cl-change-group')
+    @Dec.gui(_('Change Group'))
     @catchExcept()
     def change_group ( self, sid, info):
         dv = self.get_cache(sid,'change_group',"vars")
@@ -469,8 +469,8 @@ class ApiWsdl:
 
     @rpc(Integer, DetailGroupInfo, _returns = Array(ReturnedMessage))
     @Dec.check_permissions(["edit-group"])
-    #@Dec.console('cl-show-request')
-    #@Dec.gui(_('Api'),_('Delete Request'),'view-certificate-import')
+    @Dec.console('cl-del-group')
+    @Dec.gui(_('Delete Group'))
     @catchExcept()
     def delete_group ( self, sid, info):
         #dv = self.get_cache(sid,'delete_request',"vars")
@@ -575,8 +575,8 @@ class ApiWsdl:
         
     @rpc(Integer, AddGroupInfo, _returns = Array(ReturnedMessage))
     @Dec.check_permissions(["edit-group"])
-    #@Dec.console('cl-show-request')
-    #@Dec.gui(_('Api'),_('Delete Request'),'view-certificate-import')
+    @Dec.console('cl-add-group')
+    @Dec.gui(_('Add Group'))
     @catchExcept()
     def add_group ( self, sid, info):
         #dv = self.get_cache(sid,'delete_request',"vars")

api/server/func.py

@@ -111,8 +111,6 @@ class ApiWsdl () :
                 temp.append(item)
                 for j in range (3):
                     temp.append(Dec.guiMethods[item][i+j])
-                #temp.append(Dec.guiMethods[item][i+1])
-                #temp.append(Dec.guiMethods[item][i+2])
                 results.append (temp)
         return results
 

api/server/request.py

@@ -236,6 +236,7 @@ class ApiWsdl:
     @rpc(Integer, DetailRequestInfo, _returns = Array(ReturnedMessage))
     @Dec.check_permissions(["request"])
     @Dec.console('cl-show-request')
+    @Dec.gui(_('Detail Request'))
     #@Dec.gui(_('Api'),_('Detail Request'),'view-certificate-import')
     def detail_request ( self, sid, info):
         if not info:
@@ -383,7 +384,7 @@ class ApiWsdl:
     @rpc(Integer, DetailRequestInfo, _returns = Array(ReturnedMessage))
     @Dec.check_permissions(["request"])
     @Dec.console('cl-show-request')
-    #@Dec.gui(_('Api'),_('Confirm Request'),'view-certificate-import')
+    @Dec.gui(_('Confirm Request'))
     @catchExcept()
     def confirm_request ( self, sid, info):
         dv = self.get_cache(sid,'confirm_request',"vars")
@@ -543,7 +544,7 @@ class ApiWsdl:
     @rpc(Integer, DetailRequestInfo, _returns = Array(ReturnedMessage))
     @Dec.check_permissions(["request"])
     @Dec.console('cl-show-request')
-    #@Dec.gui(_('Api'),_('Delete Request'),'view-certificate-import')
+    @Dec.gui(_('Delete Request'))
     @catchExcept()
     def delete_request ( self, sid, info):
         #dv = self.get_cache(sid,'delete_request',"vars")

ru/calculate_api.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: calculate-api\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-24 15:47+0300\n"
-"PO-Revision-Date: 2012-04-24 15:47+0300\n"
+"POT-Creation-Date: 2012-05-11 11:17+0300\n"
+"PO-Revision-Date: 2012-05-11 11:20+0300\n"
 "Last-Translator: Denis <ds@mail.ru>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -305,21 +305,21 @@ msgstr "Город: "
 msgid "Country: [%s]"
 msgstr "Страна: [%s]"
 
-#: /var/calculate/mydir/git/calculate-api/api/client/function.py:51
+#: /var/calculate/mydir/git/calculate-api/api/client/function.py:49
 msgid "Clear Cache error! "
 msgstr "Ошибка очистки кэша! "
 
-#: /var/calculate/mydir/git/calculate-api/api/client/function.py:292
+#: /var/calculate/mydir/git/calculate-api/api/client/function.py:268
 msgid "Error"
 msgstr "Ошибка"
 
-#: /var/calculate/mydir/git/calculate-api/api/client/function.py:404
-#: /var/calculate/mydir/git/calculate-api/api/client/function.py:411
+#: /var/calculate/mydir/git/calculate-api/api/client/function.py:380
+#: /var/calculate/mydir/git/calculate-api/api/client/function.py:387
 #, python-format
 msgid "Percent = %s"
 msgstr "Процент = %s"
 
-#: /var/calculate/mydir/git/calculate-api/api/client/function.py:409
+#: /var/calculate/mydir/git/calculate-api/api/client/function.py:385
 #, python-format
 msgid "Error task by %d"
 msgstr "Ошибка задачи на %d"
@@ -774,27 +774,27 @@ msgstr ""
 "\n"
 "Внимание! %s пытается подменить сертификат!\n"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/baseClass.py:202
+#: /var/calculate/mydir/git/calculate-api/api/server/baseClass.py:200
 msgid "monitoring start"
 msgstr "Общий мониторинг запущен"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/baseClass.py:204
+#: /var/calculate/mydir/git/calculate-api/api/server/baseClass.py:202
 msgid "Error monitoring"
 msgstr "Ошибка мониторинга"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/baseClass.py:210
+#: /var/calculate/mydir/git/calculate-api/api/server/baseClass.py:208
 msgid "session monitoring start\n"
 msgstr "Запущен мониторинг сессий\n"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/baseClass.py:212
+#: /var/calculate/mydir/git/calculate-api/api/server/baseClass.py:210
 msgid "Error sid_mon\n"
 msgstr "Ошибка мониторинга сессий\n"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/baseClass.py:215
+#: /var/calculate/mydir/git/calculate-api/api/server/baseClass.py:213
 msgid "Closed all process"
 msgstr "Завершаю все процессы"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/baseClass.py:228
+#: /var/calculate/mydir/git/calculate-api/api/server/baseClass.py:226
 msgid "All processes are closed."
 msgstr "Все процессы закрыты."
 
@@ -854,7 +854,7 @@ msgid "First group"
 msgstr "Первая группа"
 
 #: /var/calculate/mydir/git/calculate-api/api/server/test2.py:222
-#: /var/calculate/mydir/git/calculate-api/api/server/test.py:427
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:444
 msgid "Next"
 msgstr "Далее"
 
@@ -870,116 +870,120 @@ msgstr "Готово"
 msgid "Interrupted by user"
 msgstr "Прервано пользователем"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/test.py:242
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:250
 msgid "TEST_METHOD"
 msgstr "Тестовый метод"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/test.py:247
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:255
 msgid "YOUR NAME: "
 msgstr "Ваше имя: "
 
-#: /var/calculate/mydir/git/calculate-api/api/server/test.py:251
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:259
 msgid "Please, enter your name"
 msgstr "Пожалуйста, введите Ваше имя"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/test.py:255
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:263
 msgid "TIMES: "
 msgstr "Время: "
 
-#: /var/calculate/mydir/git/calculate-api/api/server/test.py:260
-#: /var/calculate/mydir/git/calculate-api/api/server/test.py:269
-#: /var/calculate/mydir/git/calculate-api/api/server/test.py:279
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:268
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:277
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:287
 msgid "Enter times"
 msgstr "Введите время"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/test.py:265
 #: /var/calculate/mydir/git/calculate-api/api/server/test.py:273
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:281
 msgid "select ISO"
 msgstr "Выберите ISO образ"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/test.py:283
-#: /var/calculate/mydir/git/calculate-api/api/server/test.py:492
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:291
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:499
 msgid "Mount Points: "
 msgstr "Точки монтирования: "
 
-#: /var/calculate/mydir/git/calculate-api/api/server/test.py:332
-#: /var/calculate/mydir/git/calculate-api/api/server/test.py:380
-#: /var/calculate/mydir/git/calculate-api/api/server/test.py:523
-#: /var/calculate/mydir/git/calculate-api/api/server/test.py:532
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:349
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:397
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:530
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:550
 msgid "Press for advanced settings..."
 msgstr "Нажмите для дополнительных настроек..."
 
-#: /var/calculate/mydir/git/calculate-api/api/server/test.py:427
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:444
 msgid "Other Settings"
 msgstr "Другие настройки"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/test.py:461
-#: /var/calculate/mydir/git/calculate-api/api/server/test.py:470
-#: /var/calculate/mydir/git/calculate-api/api/server/test.py:480
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:478
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:487
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:538
 msgid "check population: "
 msgstr "Количество населения: "
 
-#: /var/calculate/mydir/git/calculate-api/api/server/test.py:466
-#: /var/calculate/mydir/git/calculate-api/api/server/test.py:476
-#: /var/calculate/mydir/git/calculate-api/api/server/test.py:488
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:483
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:495
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:545
 msgid "you not human? This is a anti-bot test"
 msgstr "Анти-бот тест"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/test.py:544
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:562
 msgid "Gratulations!"
 msgstr "Поздравляю!"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:90
+#: /var/calculate/mydir/git/calculate-api/api/server/test.py:593
+msgid "Empty group"
+msgstr "Пустая группа"
+
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:95
 #, python-format
 msgid "Country (only TWO letters!) [%s]: "
 msgstr "Страна (только 2 символа!) [%s]: "
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:112
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:117
 #, python-format
 msgid "error write (read) file from directory %s"
 msgstr "ошибка записи (чтения) файла в директории %s"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:114
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:138
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:119
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:143
 msgid "OK"
 msgstr "OK"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:119
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:124
 msgid "root certificate not found (use cl-api-server with key --gen-root-cert)"
 msgstr "корневой сертификат не найден (используйте cl-api-server с ключом --gen-root-cert)"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:163
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:168
 msgid "Create new secret key and request?"
 msgstr "Создать новый секретный ключ и запрос?"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:254
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:263
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:294
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:259
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:268
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:299
 #, python-format
 msgid "cannot create directory %s"
 msgstr "не удаётся создать директорию %s"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:364
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:369
 msgid "delete file certificate error!"
 msgstr "ошибка удаления сертификата!"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:449
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:454
 msgid "to change rights certificate number must be integer"
 msgstr "для изменения прав сертификата используйте целочисленное значение"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:467
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:475
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:472
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:480
 #, python-format
 msgid "file %s not found!"
 msgstr "файл %s не найден!"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:485
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:760
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:490
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:765
 #: /var/calculate/mydir/git/calculate-api/api/server/certificate.py:166
 msgid "Fingerprint = "
 msgstr "Отпечаток = "
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:496
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:501
 msgid ""
 "\n"
 "Rights: "
@@ -987,73 +991,73 @@ msgstr ""
 "\n"
 "Права: "
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:601
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:606
 #, python-format
 msgid "Certificate id = %s"
 msgstr "Номер сертификата = %s"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:609
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:614
 #, python-format
 msgid "Total %d certificates."
 msgstr "Всего %d сертификатов."
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:613
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:618
 msgid "Are you sure? Delete all client certificates?"
 msgstr "Вы уверенны? Удалить все клиентские сертификаты?"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:622
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:627
 msgid "certificate number not int and not 'all'"
 msgstr "номер сертификата не целочисленный и не 'all'"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:628
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:633
 msgid "Certificate not found"
 msgstr "Сертификат не найден"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:640
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:645
 msgid "Deleted"
 msgstr "Удалено"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:652
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:707
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:657
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:712
 msgid "Certificate number (id) must be int"
 msgstr "Номер сертификата должен быть целочисленным"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:657
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:712
-#: /var/calculate/mydir/git/calculate-api/api/server/request.py:344
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:662
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:717
+#: /var/calculate/mydir/git/calculate-api/api/server/request.py:345
 #, python-format
 msgid "Signing Request %s not found"
 msgstr "Запрос на подпись %s не найден"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:661
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:716
-#: /var/calculate/mydir/git/calculate-api/api/server/request.py:348
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:666
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:721
+#: /var/calculate/mydir/git/calculate-api/api/server/request.py:349
 #, python-format
 msgid "certificate %s already exists"
 msgstr "Сертификат %s успешно создан"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:667
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:672
 msgid "Enter Group new certificate: "
 msgstr "Введите группу нового сертификата: "
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:690
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:744
-#: /var/calculate/mydir/git/calculate-api/api/server/request.py:374
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:695
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:749
+#: /var/calculate/mydir/git/calculate-api/api/server/request.py:376
 #, python-format
 msgid "certificate %s is signed"
 msgstr "Сертификат %s подписан"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:699
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:704
 msgid "Root certificate or private key not found"
 msgstr "Корневой сертификат или секретный ключ не найден"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:700
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:705
 #, python-format
 msgid "look at %s"
 msgstr "смотрите %s"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:783
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:823
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:788
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:828
 msgid ""
 "\n"
 "request sent from:"
@@ -1061,174 +1065,174 @@ msgstr ""
 "\n"
 "запрос на подпись отправлен от:"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:786
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:826
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:791
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:831
 msgid "date"
 msgstr "дата"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:790
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:795
 msgid "Certificate not found!"
 msgstr "Сертификат не найден!"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:829
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:834
 msgid "Request not found!"
 msgstr "Запрос на подпись не найден!"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:856
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:896
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:861
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:901
 #, python-format
 msgid "Request \t%s - not signed"
 msgstr "Запрос \t%s - не подписан"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:858
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:898
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:863
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:903
 #, python-format
 msgid "Request \t%s"
 msgstr "Запрос \t%s"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:861
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:901
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:866
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:906
 msgid "Certificates or requests not found!"
 msgstr "Сертификат или запрос не найден!"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:867
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:907
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:872
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:912
 msgid "certificate (request) number not int and not 'all'"
 msgstr "номер сертификата (запроса) не целочисленный и не 'all'"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:892
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:897
 msgid "Certificate \t"
 msgstr "Сертификат \t"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:917
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:922
 msgid "id must be int"
 msgstr "идентификатор должен быть целочисленным"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:926
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:931
 #, python-format
 msgid "Request or certificate with id = %s not found!"
 msgstr "Запрос или сертификат с идентификатором = %s не найден!"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:930
-#: /var/calculate/mydir/git/calculate-api/api/server/request.py:493
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:935
+#: /var/calculate/mydir/git/calculate-api/api/server/request.py:497
 #, python-format
 msgid "request %s not found!"
 msgstr "запрос %s не найден!"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:933
-#: /var/calculate/mydir/git/calculate-api/api/server/request.py:496
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:938
+#: /var/calculate/mydir/git/calculate-api/api/server/request.py:500
 msgid "This request has already been signed"
 msgstr "Запрос успешно подписан"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:934
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:939
 msgid "Delete certificate and request? y/[n]: "
 msgstr "Удалить сертификат и запрос на подпись? y/[n]: "
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:936
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:941
 msgid "Not deleted"
 msgstr "Не удалён"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:963
-#: /var/calculate/mydir/git/calculate-api/api/server/request.py:522
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:968
+#: /var/calculate/mydir/git/calculate-api/api/server/request.py:526
 msgid "request deleted"
 msgstr "запрос на подпись сертификата удалён"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:966
-#: /var/calculate/mydir/git/calculate-api/api/server/request.py:525
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:971
+#: /var/calculate/mydir/git/calculate-api/api/server/request.py:529
 msgid "certificate deleted"
 msgstr "сертификат удалён"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:967
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:972
 msgid "successfully removed"
 msgstr "успешно удалено"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:969
-#: /var/calculate/mydir/git/calculate-api/api/server/request.py:527
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:974
+#: /var/calculate/mydir/git/calculate-api/api/server/request.py:531
 msgid "delete file error!"
 msgstr "ошибка удаления файла!"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:983
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:988
 msgid "CRL deleted"
 msgstr "Список отзыва сертификатов удалён"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:985
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:990
 msgid "CRL not exists"
 msgstr "Список отзыва сертификатов не создан"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:991
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:996
 msgid "Id revocation certificate must be integer!"
 msgstr "Номер отзываемого сертификата должен быть целочисленным!"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:996
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1001
 #, python-format
 msgid "Certificate %s not found"
 msgstr "Сертификат %s не найден"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1054
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1059
 msgid "operations with certificates (number or \"all\"). Server not run"
 msgstr "операции с сертификатами (номер или \"all\"). Сервер не запускается"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1057
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1062
 msgid "view clients requests (number or \"all\")"
 msgstr "просмотр клиентских запросов (номер или \"all\")"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1060
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1065
 msgid "view servers certificates (number or \"all\"). Server not run"
 msgstr "просмотр серверных сертификатов (номер или \"all\"). Сервер не запускается"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1063
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1068
 msgid "bootstrap action"
 msgstr "начальные загрузки"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1066
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1071
 msgid "dump (using with -c [ID])"
 msgstr "дамп (используйте с ключом -c [ID])"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1069
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1074
 msgid "debug"
 msgstr "режим отладки (debug)"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1072
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1077
 msgid "remove selected certificate (using with -c [ID])"
 msgstr "удалить выбранный сертификат (используйте с ключом -c [ID])"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1075
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1080
 msgid "Add right for certificate (or list via ',') (using with -c [ID])"
 msgstr "добавить права для сертификата (или списка через ',') (используйте с ключом -c [ID])"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1078
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1083
 msgid "Delete right(s) for certificate (using with -c [ID])"
 msgstr "удаление прав сертификата (используйте с -c [ID])"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1081
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1086
 msgid "generate a root (CA) certificate"
 msgstr "генерировать корневой сертификат (сертификат удостоверяющего центра)"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1084
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1089
 msgid "send request to sign root certificate"
 msgstr "отправить запрос на подписание корневого сертификата"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1090
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1095
 msgid "use root certificate as server cert"
 msgstr "использовать корневой сертификат как сертификат сервера"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1093
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1098
 msgid "sign client's request by server certificate"
 msgstr "подписать запрос на подписание сертификата клиента сертификатом сервера"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1096
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1101
 msgid "sign server's request by root certificate"
 msgstr "подписать запрос на подписание сертификата сервера корневым сертификатом"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1099
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1104
 msgid "refuse to sign request"
 msgstr "отвергнуть запрос на подпись сертификата"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1102
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1107
 msgid "revoke early signed server (or ca) certificate. rm to remove CRL"
 msgstr "отозвать ранее подписанный сертификат сервера (удостоверяющего центра). rm для удаления списка отзыва."
 
-#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1105
+#: /var/calculate/mydir/git/calculate-api/api/server/cert_cmd.py:1110
 msgid "prints the version number, then exits"
 msgstr "вывод версии программы и выход"
 
@@ -1242,7 +1246,7 @@ msgstr "Ошибка чтения файла с идентификаторами
 msgid "Unable import %s"
 msgstr "Невозможно импортировать %s"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/api_types.py:207
+#: /var/calculate/mydir/git/calculate-api/api/server/api_types.py:238
 msgid "Previous"
 msgstr "Назад"
 
@@ -1254,45 +1258,54 @@ msgstr "Просмотр запросов"
 msgid "Requests"
 msgstr "Запросы"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/request.py:265
-#: /var/calculate/mydir/git/calculate-api/api/server/request.py:418
-#: /var/calculate/mydir/git/calculate-api/api/server/request.py:425
-#: /var/calculate/mydir/git/calculate-api/api/server/request.py:572
+#: /var/calculate/mydir/git/calculate-api/api/server/request.py:239
+msgid "Detail Request"
+msgstr "Подробности запроса"
+
+#: /var/calculate/mydir/git/calculate-api/api/server/request.py:266
+#: /var/calculate/mydir/git/calculate-api/api/server/request.py:420
+#: /var/calculate/mydir/git/calculate-api/api/server/request.py:427
+#: /var/calculate/mydir/git/calculate-api/api/server/request.py:576
 msgid "Requests detail"
 msgstr "Подробности запроса на подпись сертификата"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/request.py:276
-#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:273
+#: /var/calculate/mydir/git/calculate-api/api/server/request.py:277
+#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:274
 msgid "Back"
 msgstr "Назад"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/request.py:281
+#: /var/calculate/mydir/git/calculate-api/api/server/request.py:282
 msgid "Confirm"
 msgstr "Подтвердить"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/request.py:286
-#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:283
-#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:495
+#: /var/calculate/mydir/git/calculate-api/api/server/request.py:287
+#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:284
+#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:497
 msgid "Delete"
 msgstr "Удалить"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/request.py:334
+#: /var/calculate/mydir/git/calculate-api/api/server/request.py:335
+#: /var/calculate/mydir/git/calculate-api/api/server/request.py:387
 msgid "Confirm Request"
 msgstr "Подтверждение запроса"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/request.py:488
+#: /var/calculate/mydir/git/calculate-api/api/server/request.py:492
 #, python-format
 msgid "Request and certificate with id = %s not found!"
 msgstr "Запрос или сертификат с идентификатором = %s не найден!"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/request.py:536
-#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:464
-#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:570
+#: /var/calculate/mydir/git/calculate-api/api/server/request.py:540
+#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:466
+#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:572
 #, python-format
 msgid "Exception!%s"
 msgstr "Исключение: %s"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/request.py:565
+#: /var/calculate/mydir/git/calculate-api/api/server/request.py:547
+msgid "Delete Request"
+msgstr "Удаление запроса"
+
+#: /var/calculate/mydir/git/calculate-api/api/server/request.py:569
 msgid "Requests delete"
 msgstr "Запрос на подпись сертификата удалён"
 
@@ -1310,11 +1323,11 @@ msgstr "Сертификат %d может запускать: "
 msgid "Certificate groups"
 msgstr "Группы сертификата"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/certificate.py:279
+#: /var/calculate/mydir/git/calculate-api/api/server/certificate.py:280
 msgid "Certificate View"
 msgstr "Просмотр сертификата"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/certificate.py:281
+#: /var/calculate/mydir/git/calculate-api/api/server/certificate.py:282
 msgid "View"
 msgstr "Просмотр"
 
@@ -1326,46 +1339,67 @@ msgstr "Просмотр групп"
 msgid "Groups"
 msgstr "Группы"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:263
+#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:237
+msgid "Detail Group"
+msgstr "Подробности групп"
+
+#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:264
 msgid "Group detail"
 msgstr "Подробности группы"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:278
+#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:279
 msgid "Change"
 msgstr "Изменить"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:346
+#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:347
 msgid "Group Changed"
 msgstr "Группа изменена"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:348
+#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:349
 msgid "Not Changed Group"
 msgstr "Группа не изменена"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:382
-#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:388
+#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:361
+msgid "Change Group"
+msgstr "Изменить группу"
+
+#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:384
+#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:390
 msgid "Change group"
 msgstr "Изменить группу"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:450
+#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:452
 #, python-format
 msgid "Group %s deleted"
 msgstr "Группа %s удалена"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:453
+#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:455
 #, python-format
 msgid "Group %s is not deleted"
 msgstr "Группа %s не удалена"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:493
+#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:473
+#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:579
+msgid "Api"
+msgstr "Api"
+
+#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:473
+msgid "Delete Group"
+msgstr "Удаление группы"
+
+#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:495
 msgid "Group delete"
 msgstr "Удаление группы"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:600
+#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:579
+msgid "Add Group"
+msgstr "Добавление группы"
+
+#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:602
 msgid "Group add"
 msgstr "Дабавление группы"
 
-#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:602
+#: /var/calculate/mydir/git/calculate-api/api/server/edit_groups.py:604
 msgid "Add"
 msgstr "Добавить"
 
@@ -1448,9 +1482,6 @@ msgstr "используйте cl-api-server с ключом --gen-cert-by HOST
 #~ msgid "Press for advanced settings"
 #~ msgstr "Нажмите для дополнительных настроек"
 
-#~ msgid "Change Group"
-#~ msgstr "Изменить группу"
-
 #, fuzzy
 #~ msgid "Group name must be int"
 #~ msgstr "Количество должно быть целочисленным"