From 156ff8f73a143725ea2e73fdd48721510dac0500 Mon Sep 17 00:00:00 2001 From: Sergey Kalinin Date: Thu, 26 Jul 2018 09:35:06 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5?= =?UTF-8?q?=D0=B9=D1=81=D0=B0=20=D0=BD=D0=B0=20=D0=B0=D0=BD=D0=B3=D0=BB?= =?UTF-8?q?=D0=B8=D0=B9=D1=81=D0=BA=D0=B8=D0=B9=20=D0=B8=20=D1=80=D1=83?= =?UTF-8?q?=D1=81=D1=81=D0=BA=D0=B8=D0=B9=20=D1=8F=D0=B7=D1=8B=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/function.tcl | 163 ++++++++++++++++++++++++++--------------------- lib/msg/en.msg | 1 - lib/msg/ru.msg | 42 ++++++++++-- 3 files changed, 129 insertions(+), 77 deletions(-) delete mode 100644 lib/msg/en.msg diff --git a/lib/function.tcl b/lib/function.tcl index 5769646..4f06135 100644 --- a/lib/function.tcl +++ b/lib/function.tcl @@ -166,7 +166,7 @@ proc AuthorisationDialog {txt} { proc InsertClusterItems {tree id} { set parent "cluster::$id" $tree insert $parent end -id "infobases::$id" -text [::msgcat::mc "Infobases"] -values "$id" - $tree insert $parent end -id "servers::$id" -text [::msgcat::mc "Working servers"] -values "$id" + $tree insert $parent end -id "servers::$id" -text [::msgcat::mc "Work servers"] -values "$id" $tree insert $parent end -id "admins::$id" -text [::msgcat::mc "Administrators"] -values "$id" $tree insert $parent end -id "managers::$id" -text [::msgcat::mc "Cluster managers"] -values $id $tree insert $parent end -id "processes::$id" -text [::msgcat::mc "Working processes"] -values "workprocess-all" @@ -211,14 +211,14 @@ proc InsertProfileItems {tree id} { {directory "Virtual directory"} {com "Available COM class"} {addin "Available add-in"} - {module "Available external module"} - {app "Available application"} - {inet "Available internet resurce"} + {module "Available external modules"} + {app "Available applications"} + {inet "Available internet resurces"} } foreach i $lst { append item [lindex $i 0] "::$id" if { [$tree exists $item] == 0 } { - $tree insert $parent end -id $item -text [::msgcat::mc [lindex $i 1]] -values "$id" + $tree insert $parent end -id $item -text [::msgcat::mc "[lindex $i 1]"] -values "$id" } unset item } @@ -1171,23 +1171,23 @@ proc Add::rule {tree host values} { set server $values - set frm [AddToplevel "Требование назначения функциональности" functional_grey_64] + set frm [AddToplevel [::msgcat::mc "Assignment rule"] functional_grey_64] #set type [lindex $default(obtype) 0] set infobase_name "" - label $frm.lbl_object_type -text "Объект требования" + label $frm.lbl_object_type -text [::msgcat::mc "Object type"] ttk::combobox $frm.cb_object_type -textvariable object_type \ -values $default(object_type) - label $frm.lbl_rule_type -text "Тип требования" + label $frm.lbl_rule_type -text [::msgcat::mc "Rule type"] ttk::combobox $frm.cb_rule_type -textvariable rule_type \ -values $default(rule_type) - label $frm.lbl_infobase_name -text "Имя ИБ" + label $frm.lbl_infobase_name -text [::msgcat::mc "Infobase"] ttk::combobox $frm.cb_infobase_name -textvariable infobase_name \ -values [GetInfobases $active_cluster $host] - label $frm.lbl_application_ext -text "Значение доп. параметра" + label $frm.lbl_application_ext -text [::msgcat::mc "Application with an ajustment"] entry $frm.ent_application_ext - label $frm.lbl_priority -text "Приоритет" + label $frm.lbl_priority -text [::msgcat::mc "Priority"] entry $frm.ent_priority $frm.ent_priority insert end $default(priority) @@ -1236,28 +1236,41 @@ proc Add::profile {tree host values} { unset var_list puts ">>>$right_extension_definition_roles" - set frm [AddToplevel "Профиль безопасности" security_grey_64] + set frm [AddToplevel [::msgcat::mc "Security profile"] security_grey_64] - label $frm.lbl_name -text "Имя профиля" + label $frm.lbl_name -text [::msgcat::mc "Name"] entry $frm.ent_name - label $frm.lbl_descr -text "Описание" + label $frm.lbl_descr -text [::msgcat::mc Description""] entry $frm.ent_descr - label $frm.lbl_config -justify left -anchor nw -text "Использование профиля из конфигурации" + label $frm.lbl_config -justify left -anchor nw \ + -text [::msgcat::mc "Using the security profile from the configuration"] checkbutton $frm.check_config -variable config -onvalue yes -offvalue no - label $frm.lbl_priv -justify left -anchor nw -text "Привилегированный режим" + label $frm.lbl_priv -justify left -anchor nw \ + -text [::msgcat::mc "Priveleged mode"] checkbutton $frm.check_priv -variable priv -onvalue yes -offvalue no - label $frm.lbl_crypto -justify left -anchor nw -text "Разрешено использование криптографии" + label $frm.lbl_crypto -justify left -anchor nw \ + -text [::msgcat::mc "Using cryptography function"] checkbutton $frm.check_crypto -variable crypto -onvalue yes -offvalue no - label $frm.lbl_right_extension -justify left -anchor nw -text "Любое расширение прав доступа" - checkbutton $frm.check_right_extension -variable right_extension -onvalue yes -offvalue no - label $frm.lbl_right_extension_definition_roles -justify left -anchor nw -text "Роли, ограничивающие расширение прав доступа" - ttk::combobox $frm.cb_right_extension_definition_roles -textvariable right_extension_definition_roles - label $frm.lbl_all_modules_extension -justify left -anchor nw -text "Расширение всех модулей" - checkbutton $frm.check_all_modules_extension -variable all_modules_extension -onvalue yes -offvalue no - label $frm.lbl_modules_available_for_extension -text "Доступные для расширения модули" - ttk::combobox $frm.cb_modules_available_for_extension -textvariable modules_available_for_extension - label $frm.lbl_modules_not_available_for_extension -text "Недоступные для расширения модули" - ttk::combobox $frm.cb_modules_not_available_for_extension -textvariable modules_not_available_for_extension + label $frm.lbl_right_extension -justify left -anchor nw \ + -text [::msgcat::mc "All access right extention"] + checkbutton $frm.check_right_extension \ + -variable right_extension -onvalue yes -offvalue no + label $frm.lbl_right_extension_definition_roles -justify left -anchor nw \ + -text [::msgcat::mc "Roles that restrict access rights"] + ttk::combobox $frm.cb_right_extension_definition_roles \ + -textvariable right_extension_definition_roles + label $frm.lbl_all_modules_extension -justify left -anchor nw \ + -text [::msgcat::mc "Allow extention of all modules"] + checkbutton $frm.check_all_modules_extension \ + -variable all_modules_extension -onvalue yes -offvalue no + label $frm.lbl_modules_available_for_extension \ + -text [::msgcat::mc "Modules available for extention"] + ttk::combobox $frm.cb_modules_available_for_extension \ + -textvariable modules_available_for_extension + label $frm.lbl_modules_not_available_for_extension \ + -text [::msgcat::mc "Modules not available for extention"] + ttk::combobox $frm.cb_modules_not_available_for_extension \ + -textvariable modules_not_available_for_extension grid $frm.lbl_name -row 0 -column 0 -sticky nw -padx 5 -pady 5 grid $frm.ent_name -row 0 -column 1 -sticky nsew -padx 5 -pady 5 @@ -1312,17 +1325,17 @@ proc Add::directory {tree host values} { foreach v $var_list {set $v "no"; puts $v} unset var_list - set frm [AddToplevel "Виртуальный каталог" directory_grey_64] + set frm [AddToplevel [::msgcat::mc "Virtual directory"] directory_grey_64] - label $frm.lbl_alias -text "Логический URL" + label $frm.lbl_alias -text [::msgcat::mc "Logical URL"] entry $frm.ent_alias - label $frm.lbl_descr -text "Описание" + label $frm.lbl_descr -text [::msgcat::mc "Description"] entry $frm.ent_descr - label $frm.lbl_physicalPath -justify left -anchor nw -text "Физический URL" + label $frm.lbl_physicalPath -justify left -anchor nw -text [::msgcat::mc "Phisical path"] entry $frm.ent_physicalPath - label $frm.lbl_allowedRead -justify left -anchor nw -text "Разрешено чтение данных" + label $frm.lbl_allowedRead -justify left -anchor nw -text [::msgcat::mc "Reading is allowed"] checkbutton $frm.check_allowedRead -variable allowedRead -onvalue yes -offvalue no - label $frm.lbl_allowedWrite -justify left -anchor nw -text "Разрешена запись данных" + label $frm.lbl_allowedWrite -justify left -anchor nw -text [::msgcat::mc "Write is allowed"] checkbutton $frm.check_allowedWrite -variable allowedWrite -onvalue yes -offvalue no grid $frm.lbl_alias -row 0 -column 0 -sticky nw -padx 5 -pady 5 @@ -1365,13 +1378,13 @@ proc Add::addin {tree host values} { foreach v $var_list {set $v "no"; puts $v} unset var_list - set frm [AddToplevel "Внешняя компонента" addin_grey_64] + set frm [AddToplevel [::msgcat::mc "Available add-in"] addin_grey_64] - label $frm.lbl_name -text "Имя" + label $frm.lbl_name -text [::msgcat::mc "Name"] entry $frm.ent_name - label $frm.lbl_descr -text "Описание" + label $frm.lbl_descr -text [::msgcat::mc "Description"] entry $frm.ent_descr - label $frm.lbl_hash -justify left -anchor nw -text "Контрольная сумма" + label $frm.lbl_hash -justify left -anchor nw -text [::msgcat::mc "Check summ"] entry $frm.ent_hash grid $frm.lbl_name -row 0 -column 0 -sticky nw -padx 5 -pady 5 @@ -1406,13 +1419,13 @@ proc Add::module {tree host values} { foreach v $var_list {set $v "no"; puts $v} unset var_list - set frm [AddToplevel "Внешний отчёт или обработка" module_grey_64] + set frm [AddToplevel [::msgcat::mc "External module"] module_grey_64] - label $frm.lbl_name -text "Имя" + label $frm.lbl_name -text [::msgcat::mc "Name"] entry $frm.ent_name - label $frm.lbl_descr -text "Описание" + label $frm.lbl_descr -text [::msgcat::mc "Description"] entry $frm.ent_descr - label $frm.lbl_hash -justify left -anchor nw -text "Контрольная сумма" + label $frm.lbl_hash -justify left -anchor nw -text [::msgcat::mc "Check summ"] entry $frm.ent_hash grid $frm.lbl_name -row 0 -column 0 -sticky nw -padx 5 -pady 5 @@ -1447,17 +1460,17 @@ proc Add::com {tree host values} { foreach v $var_list {set $v "no"; puts $v} unset var_list - set frm [AddToplevel "COM-класс" com_grey_64] + set frm [AddToplevel [::msgcat::mc "COM class"] com_grey_64] - label $frm.lbl_name -text "Имя" + label $frm.lbl_name -text [::msgcat::mc "Name"] entry $frm.ent_name - label $frm.lbl_descr -text "Описание" + label $frm.lbl_descr -text [::msgcat::mc "Description"] entry $frm.ent_descr - label $frm.lbl_fileName -justify left -anchor nw -text "Файл (моникер)" + label $frm.lbl_fileName -justify left -anchor nw -text [::msgcat::mc "Moniker file name"] entry $frm.ent_fileName - label $frm.lbl_id -justify left -anchor nw -text "Идентификатор COM-класса" + label $frm.lbl_id -justify left -anchor nw -text [::msgcat::mc "COM class ID"] entry $frm.ent_id - label $frm.lbl_host -justify left -anchor nw -text "Компьютер COM-объекта" + label $frm.lbl_host -justify left -anchor nw -text [::msgcat::mc "COM object computer"] entry $frm.ent_host grid $frm.lbl_name -row 0 -column 0 -sticky nw -padx 5 -pady 5 @@ -1498,13 +1511,13 @@ proc Add::app {tree host values} { foreach v $var_list {set $v "no"; puts $v} unset var_list - set frm [AddToplevel "Разрешённое приложения" app_grey_64] + set frm [AddToplevel [::msgcat::mc "Application"] app_grey_64] - label $frm.lbl_name -text "Имя приложения" + label $frm.lbl_name -text [::msgcat::mc "Name"] entry $frm.ent_name - label $frm.lbl_descr -text "Описание" + label $frm.lbl_descr -text [::msgcat::mc "Description"] entry $frm.ent_descr - label $frm.lbl_wild -justify left -anchor nw -text "Шаблон строки запуска" + label $frm.lbl_wild -justify left -anchor nw -text [::msgcat::mc "Aplication command line sintax"] entry $frm.ent_wild grid $frm.lbl_name -row 0 -column 0 -sticky nw -padx 5 -pady 5 @@ -1538,17 +1551,17 @@ proc Add::inet {tree host values} { foreach v $var_list {set $v "no"; puts $v} unset var_list - set frm [AddToplevel "Ресурс интернет" link_grey_64] + set frm [AddToplevel [::msgcat::mc "Internet resource"] link_grey_64] - label $frm.lbl_name -text "Имя ресурса" + label $frm.lbl_name -text [::msgcat::mc "Name"] entry $frm.ent_name - label $frm.lbl_descr -text "Описание" + label $frm.lbl_descr -text [::msgcat::mc "Description"] entry $frm.ent_descr - label $frm.lbl_protocol -justify left -anchor nw -text "Протокол" + label $frm.lbl_protocol -justify left -anchor nw -text [::msgcat::mc "Protocol"] entry $frm.ent_protocol - label $frm.lbl_url -justify left -anchor nw -text "Адрес (URL)" + label $frm.lbl_url -justify left -anchor nw -text [::msgcat::mc "Address (URL)"] entry $frm.ent_url - label $frm.lbl_port -justify left -anchor nw -text "Порт" + label $frm.lbl_port -justify left -anchor nw -text [::msgcat::mc "Port"] entry $frm.ent_port $frm.ent_port insert end 0 @@ -1606,7 +1619,7 @@ proc Edit::server {tree host value} { global dir prev_address set frm [Add::server] - $frm configure -text "Редактирование основного сервера" + wm title .add [::msgcat::mc "Edit record"] set lst [split $value ":"] set prev_address $value .add.frm.ent_host delete 0 end @@ -1649,7 +1662,8 @@ proc Edit::cluster {tree host values} { } set frm [Add::cluster $tree $host $values] - $frm configure -text "Редактирование кластера" + wm title .add [::msgcat::mc "Edit record"] + $frm configure -text [::msgcat::mc "Cluster"] set active_cluster $values set lst [RunCommand "cluster info --cluster=$active_cluster $host"] @@ -1697,14 +1711,14 @@ proc Edit::infobase {tree host values} { set infobase $values set frm [Add::infobases $tree $host $values] - + wm title .add [::msgcat::mc "Edit record"] $frm.lbl_create_db configure -state disable $frm.cb_create_db configure -state disable $frm.lbl_locale configure -state disable $frm.ent_locale configure -state disable - $frm configure -text "Редактирование информационной базы" + $frm configure -text [::msgcat::mc "Infobase"] #set active_cluster $values label $frm.lbl_denied_from -text "Начало интервала времени действия\nрежима блокировки сеансов" \ -justify left -anchor nw @@ -1806,7 +1820,8 @@ proc Edit::work_server {tree host values} { set server $values set frm [Add::work_server $tree $host $values] - $frm configure -text "Редактирование рабочего сервера" + wm title .add [::msgcat::mc "Edit record"] + $frm configure -text [::msgcat::mc "Work server"] set lst [RunCommand "server info --cluster=$active_cluster $auth --server=$server $host"] FormFieldsDataInsert $frm $lst @@ -1850,8 +1865,8 @@ proc Edit::rule {tree host values} { } set frm [Add::rule $tree $host $server] - - $frm configure -text "Редактирование требования назначения функциональности" + wm title .add [::msgcat::mc "Edit record"] + $frm configure -text [::msgcat::mc "Assignment rule"] set lst [RunCommand "rule info --cluster=$active_cluster $auth --server=$server --rule=$rule $host"] @@ -1888,8 +1903,9 @@ proc Edit::profile {tree host values} { } set frm [Add::profile $tree $host $values] + wm title .add [::msgcat::mc "Edit record"] - $frm configure -text "Редактирование профиля безопасности: $values" + $frm configure -text "[::msgcat::mc "Security profile"]: $values" set work_tree_id [.frm_work.tree_work selection] puts "$work_tree_id" @@ -1935,24 +1951,25 @@ proc Edit::directory {tree host values} { agent_user agent_pwd cluster_user cluster_pwd auth set lst [GetWorkTreeRow] set frm [Add::directory $tree $host $profile_name] - $frm configure -text "Редактирование виртуального каталога" + wm title .add [::msgcat::mc "Edit record"] + $frm configure -text [::msgcat::mc "Virtual directory"] FormFieldsDataInsert $frm [list $lst] $frm.ent_alias configure -state disable } proc Edit::addin {tree host values} { - Edit::acl $tree $host addin "Редактирование внешней компоненты" + Edit::acl $tree $host addin "Available add-in" } proc Edit::module {tree host values} { - Edit::acl $tree $host module "Редактирование" + Edit::acl $tree $host module "External module" } proc Edit::com {tree host values} { - Edit::acl $tree $host com "Редактирование COM-класса" + Edit::acl $tree $host com "COM class" } proc Edit::app {tree host values} { - Edit::acl $tree $host app "Редактирование приложения" + Edit::acl $tree $host app "Application" } proc Edit::inet {tree host values} { - Edit::acl $tree $host inet "Редактирование ссылки" + Edit::acl $tree $host inet "Internet resource" } proc Edit::acl {tree host item descr} { global default active_cluster profile_name \ @@ -1962,7 +1979,8 @@ proc Edit::acl {tree host item descr} { return } set frm [Add::$item $tree $host $profile_name] - $frm configure -text $descr + wm title .add [::msgcat::mc "Edit record"] + $frm configure -text [::msgcat::mc $descr] FormFieldsDataInsert $frm [list $lst] $frm.ent_name configure -state disable } @@ -2292,3 +2310,4 @@ proc Del::inet {tree host profile_name} { } + diff --git a/lib/msg/en.msg b/lib/msg/en.msg deleted file mode 100644 index 8b13789..0000000 --- a/lib/msg/en.msg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/lib/msg/ru.msg b/lib/msg/ru.msg index 25267ba..788976c 100644 --- a/lib/msg/ru.msg +++ b/lib/msg/ru.msg @@ -1,6 +1,8 @@ ::msgcat::mcset ru "Show where is a RAC comand" "Укажите путь до rac" ::msgcat::mcset ru "Infobases" "Информационные базы" +::msgcat::mcset ru "Infobase" "Информационная база" ::msgcat::mcset ru "Authorization" "Авторизация" +::msgcat::mcset ru "Administrators" "Администраторы" ::msgcat::mcset ru "User name" "Имя пользователя" ::msgcat::mcset ru "Password" "Пароль" ::msgcat::mcset ru "Cluster manager" "Менеджеры кластера" @@ -17,9 +19,9 @@ ::msgcat::mcset ru "Virtual directory" "Виртуальные каталоги" ::msgcat::mcset ru "Available COM class" "Разрешённые COM-классы" ::msgcat::mcset ru "Available add-in" "Внешние компоненты" -::msgcat::mcset ru "Available external module" "Внешние отчёты и обработки" -::msgcat::mcset ru "Available application" "Разрешённые приложения" -::msgcat::mcset ru "Available internet resurce" "Ресурсы интернет" +::msgcat::mcset ru "Available external modules" "Внешние отчёты и обработки" +::msgcat::mcset ru "Available applications" "Разрешённые приложения" +::msgcat::mcset ru "Available internet resurces" "Ресурсы интернет" ::msgcat::mcset ru "OS user name" "Пользователь ОС" ::msgcat::mcset ru "Authentication method" "Способ аутентификации" ::msgcat::mcset ru "Add record" "Добавить запись" @@ -28,6 +30,9 @@ ::msgcat::mcset ru "Address" "Адрес сервера" ::msgcat::mcset ru "Port" "Порт" ::msgcat::mcset ru "Port range" "Диапазон портов" +::msgcat::mcset ru "Protocol" "Протокол" +::msgcat::mcset ru "Working processes" "Рабочие процессы" +::msgcat::mcset ru "Cluster managers" "Менеджеры кластера" ::msgcat::mcset ru "Maximum memory in working processes" "Максимальный объём памяти раб. процессов" ::msgcat::mcset ru "Safe memory consuption per call" "Безопасный расход памяти за вызов" ::msgcat::mcset ru "Memory use limit per working process" "Предел использования памяти рабочим процессом" @@ -36,7 +41,8 @@ ::msgcat::mcset ru "Main cluster manager port number" "Порт главного менеджера кластера" ::msgcat::mcset ru "Service manager allocation" "Менеджер под каждый сервис" ::msgcat::mcset ru "Working server use variant" "Вариант использования рабочего сервера" -::msgcat::mcset ru "Working servers" "Рабочие серверы" +::msgcat::mcset ru "Work servers" "Рабочие серверы" +::msgcat::mcset ru "Work server" "Рабочий сервер" ::msgcat::mcset ru "Databases server address" "Адрес сервера баз данных" ::msgcat::mcset ru "DBMS" "Тип СУБД" ::msgcat::mcset ru "Database name" "Имя базы данных" @@ -55,3 +61,31 @@ ::msgcat::mcset ru "Maximum virtual address space" "Допустимый объём памяти, КБ" ::msgcat::mcset ru "Maximum period of memori size exeeding" "Интервал превышения допустимого объёма памяти, сек." ::msgcat::mcset ru "Terminate corrupted processes" "Принудительно завершать проблемные процессы" +::msgcat::mcset ru "Object type" "Объект требования" +::msgcat::mcset ru "Rule type" "Тип требования" +::msgcat::mcset ru "Application with an ajustment" "Значение доп. параметра" +::msgcat::mcset ru "Priority" "Приоритет" +::msgcat::mcset ru "Using the security profile from the configuration" "Использование профиля из конфигурации" +::msgcat::mcset ru "Priveleged mode" "Привилегированный режим" +::msgcat::mcset ru "Using cryptography function" "Разрешено использование криптографии" +::msgcat::mcset ru "All access right extention" "Любое расширение прав доступа" +::msgcat::mcset ru "Roles that restrict access rights" "Роли, ограничивающие расширение прав доступа" +::msgcat::mcset ru "Allow extention of all modules" "Расширение всех модулей" +::msgcat::mcset ru "Modules available for extention" "Доступные для расширения модули" +::msgcat::mcset ru "Modules not available for extention" "Недоступные для расширения модули" +::msgcat::mcset ru "Logical URL" "Логический URL" +::msgcat::mcset ru "Phisical path" "Физический URL" +::msgcat::mcset ru "Reading is allowed" "Разрешено чтение данных" +::msgcat::mcset ru "Write is allowed" "Разрешена запись данных" +::msgcat::mcset ru "Check summ" "Контрольная сумма" +::msgcat::mcset ru "Moniker file name" "Файл (моникер)" +::msgcat::mcset ru "COM class ID" "Идентификатор COM-класса" +::msgcat::mcset ru "COM object computer" "Компьютер COM-объекта" +::msgcat::mcset ru "Aplication command line sintax" "Шаблон строки запуска" +::msgcat::mcset ru "Application" "Приложение" +::msgcat::mcset ru "Name" "Имя" +::msgcat::mcset ru "Description" "Описание" +::msgcat::mcset ru "Address (URL)" "Адрес (URL)" +::msgcat::mcset ru "Internet resource" "Ресурс интернет" +::msgcat::mcset ru "Edit record" "Редактировать запись" +::msgcat::mcset ru "External module" "Внешний отчёт или обработка"