From 8db66c2e439f1a6f01d8723ed0e205369898b8d3 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 20 Mar 2023 17:32:20 +0600 Subject: [PATCH 1/6] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ublexec.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ublexec.css b/ublexec.css index fa795ee..b385397 100644 --- a/ublexec.css +++ b/ublexec.css @@ -65,12 +65,21 @@ } .menuitemtop:hover { background:@theme_bg_color; + border-color:inherit; + border-left-width:inherit; + border-right-width:inherit; } .menuitemmiddle:hover { background:@theme_bg_color; + border-color:inherit; + border-left-width:inherit; + border-right-width:inherit; } .menuitembottom:hover { background:@theme_bg_color; + border-color:inherit; + border-left-width:inherit; + border-right-width:inherit; } .menuitemtop:hover* { From 98a0da151ce7cbe1a7b6bf31d78787e98520cb49 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 22 Mar 2023 11:23:24 +0600 Subject: [PATCH 2/6] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20.po=20=D0=B8=20pot=20=D1=84=D0=B0=D0=B9=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ublexec.cc | 100 +++++++++++----------- ublexec.pot | 151 ++++++++++++++++++++++----------- ublexec_ru.po | 209 +++++++++++++++++++++++++++++----------------- ublexec_ru.po~ | 144 ++++++++++++++++++++++++++++++++ 4 files changed, 428 insertions(+), 176 deletions(-) create mode 100644 ublexec_ru.po~ diff --git a/source/ublexec.cc b/source/ublexec.cc index 402fc4c..6d5c070 100644 --- a/source/ublexec.cc +++ b/source/ublexec.cc @@ -149,42 +149,42 @@ void MainWindow::localization() { time_t now = time(0); tm *ltm = localtime(&now); unsigned int year= 1900+ ltm->tm_year; - string str_authors = string(_("Copyright © UBSoft LLC, 2022 - ")) + to_string(year); + string str_authors = string(gettext("Copyright © UBSoft LLC, 2022 - ")) + to_string(year); aboutWindows->set_copyright(str_authors); - aboutWindows->set_website(_("https://wiki.ublinux.com")); - btnSynopsis->set_label(_("Help")); - btnAbout->set_label(_("About")); - aboutWindows->set_comments(_("ublexec")); - aboutWindows->set_website_label(_("Project Home Page")); - aboutWindows->set_version(_(version_application.c_str())); - lblHeaderName->set_text(_("ublexec")); - this->set_title(_("ublexec")); - btnStart->set_label(_("Run")); - wndChooseFileWallpaper->set_title(_("Please select File")); - dialogStartMenu->set_title(_("Selecting Programs")); - lblInfoHead->set_text(_("Run applications as another user\nwith the specified priority")); - lblinfoCmd->set_text(_("Command Line")); - lblInfoTime->set_text(_("Team:")); - labInfoExecutTerm->set_text(_("Run in the terminal emulator")); - lblInfoUser->set_text(_("User")); - lblInfoUserOther->set_text(_("Run as another user:")); - lblInfoUserName->set_text(_("User Name:")); - lblInfoNooPriority->set_text(_("Priority")); - lblInfoExec->set_text(_("Change startup priority")); - lblInfoPriority->set_text(_("Priority:")); - lblMessageError->set_text(_("Select an executable file or program")); - lblGraphics->set_text(_("Graphics")); - lblTools->set_text(_("Tools")); - lblInternet->set_text(_("Internet")); - lblMultimedia->set_text(_("Multimedia")); - lblSettings->set_text(_("Settings")); - lblEducation->set_text(_("Education")); - lblOffice->set_text(_("Office")); - lblOther->set_text(_("Other")); - lblDevelopment->set_text(_("Development")); - lblSystem->set_text(_("System")); - btnListApp->set_tooltip_text(_("Application Overview")); - btnFilemaneg->set_tooltip_text(_("File Overview")); + aboutWindows->set_website(gettext("https://wiki.ublinux.com")); + btnSynopsis->set_label(gettext("Help")); + btnAbout->set_label(gettext("About")); + aboutWindows->set_comments(gettext("ublexec")); + aboutWindows->set_website_label(gettext("Project Home Page")); + aboutWindows->set_version(gettext(version_application.c_str())); + lblHeaderName->set_text(gettext("ublexec")); + this->set_title(gettext("ublexec")); + btnStart->set_label(gettext("Run")); + wndChooseFileWallpaper->set_title(gettext("Please select File")); + dialogStartMenu->set_title(gettext("Selecting Programs")); + lblInfoHead->set_text(gettext("Run applications as another user\nwith the specified priority")); + lblinfoCmd->set_text(gettext("Command Line")); + lblInfoTime->set_text(gettext("Team:")); + labInfoExecutTerm->set_text(gettext("Run in the terminal emulator")); + lblInfoUser->set_text(gettext("User")); + lblInfoUserOther->set_text(gettext("Run as another user:")); + lblInfoUserName->set_text(gettext("User Name:")); + lblInfoNooPriority->set_text(gettext("Priority")); + lblInfoExec->set_text(gettext("Change startup priority")); + lblInfoPriority->set_text(gettext("Priority:")); + lblMessageError->set_text(gettext("Select an executable file or program")); + lblGraphics->set_text(gettext("Graphics")); + lblTools->set_text(gettext("Tools")); + lblInternet->set_text(gettext("Internet")); + lblMultimedia->set_text(gettext("Multimedia")); + lblSettings->set_text(gettext("Settings")); + lblEducation->set_text(gettext("Education")); + lblOffice->set_text(gettext("Office")); + lblOther->set_text(gettext("Other")); + lblDevelopment->set_text(gettext("Development")); + lblSystem->set_text(gettext("System")); + btnListApp->set_tooltip_text(gettext("Application Overview")); + btnFilemaneg->set_tooltip_text(gettext("File Overview")); } void MainWindow::event() { @@ -232,32 +232,32 @@ void MainWindow::sudo_nice(){ spinPriority->set_increments(1.0, -1.0); scalePriority->set_range(-20, 19); scalePriority->set_value(0); - lblTimeEpriorityLow->set_text(_("19 (Low)")); - lblTime4EpriorityHigh->set_text(_("-20 (High)")); + lblTimeEpriorityLow->set_text(gettext("19 (Low)")); + lblTime4EpriorityHigh->set_text(gettext("-20 (High)")); } else if (rbSudo->get_active() && response.find("wheel") != string::npos){ spinPriority->set_range(-20, 19); spinPriority->set_increments(1.0, -1.0); scalePriority->set_range(-20, 19); scalePriority->set_value(0); - lblTimeEpriorityLow->set_text(_("19 (Low)")); - lblTime4EpriorityHigh->set_text(_("-20 (High)")); + lblTimeEpriorityLow->set_text(gettext("19 (Low)")); + lblTime4EpriorityHigh->set_text(gettext("-20 (High)")); } else if (rbSu->get_active()){ spinPriority->set_range(0, 19); spinPriority->set_increments(1.0, -1.0); scalePriority->set_range(0, 19); scalePriority->set_value(0); - lblTimeEpriorityLow->set_text(_("19 (Low)")); - lblTime4EpriorityHigh->set_text(_("0 (High)")); + lblTimeEpriorityLow->set_text(gettext("19 (Low)")); + lblTime4EpriorityHigh->set_text(gettext("0 (High)")); } else if (rbPkexec->get_active()){ spinPriority->set_range(0, 19); spinPriority->set_increments(1.0, -1.0); scalePriority->set_range(0, 19); scalePriority->set_value(0); - lblTimeEpriorityLow->set_text(_("19 (Low)")); - lblTime4EpriorityHigh->set_text(_("0 (High)")); + lblTimeEpriorityLow->set_text(gettext("19 (Low)")); + lblTime4EpriorityHigh->set_text(gettext("0 (High)")); } this->denamic_cmd(); } @@ -271,16 +271,16 @@ void MainWindow::changed_user() { spinPriority->set_increments(1.0, -1.0); scalePriority->set_range(-20, 19); scalePriority->set_value(0); - lblTimeEpriorityLow->set_text(_("19 (Low)")); - lblTime4EpriorityHigh->set_text(_("-20 (High)")); + lblTimeEpriorityLow->set_text(gettext("19 (Low)")); + lblTime4EpriorityHigh->set_text(gettext("-20 (High)")); } else{ spinPriority->set_range(0, 19); spinPriority->set_increments(1.0, -1.0); scalePriority->set_range(0, 19); scalePriority->set_value(0); - lblTimeEpriorityLow->set_text(_("19 (Low)")); - lblTime4EpriorityHigh->set_text(_("0 (High)")); + lblTimeEpriorityLow->set_text(gettext("19 (Low)")); + lblTime4EpriorityHigh->set_text(gettext("0 (High)")); } } @@ -310,7 +310,7 @@ bool MainWindow::focus_in_txt_cmd(GdkEventFocus* event) { } void MainWindow::synopsis_show() { - string cmd = "xdg-open " + string(_("https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/")) + app_name + " &"; + string cmd = "xdg-open " + string(gettext("https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/")) + app_name + " &"; system(cmd.c_str()); } @@ -409,8 +409,8 @@ void MainWindow::settings() { spinPriority->set_increments(1.0, -1.0); scalePriority->set_range(0, 19); scalePriority->set_value(0); - lblTimeEpriorityLow->set_text(_("19 (Low)")); - lblTime4EpriorityHigh->set_text(_("0 (High)")); + lblTimeEpriorityLow->set_text(gettext("19 (Low)")); + lblTime4EpriorityHigh->set_text(gettext("0 (High)")); scalePriority->set_inverted(true); this->pars_dir_bin(); this->pars_dir_terminal(); diff --git a/ublexec.pot b/ublexec.pot index 78e8b67..a15fd2b 100644 --- a/ublexec.pot +++ b/ublexec.pot @@ -1,144 +1,195 @@ -# Language translations for ublexec package. -# Copyright (C) 2022, UBTech LLC -# This file is distributed under the same license as the ublexec package. -# UBLinux Team , 2022 +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: ublexec 1.0\n" -"Report-Msgid-Bugs-To: info@ublinux.com\n" -"POT-Creation-Date: 2023-01-01 00:00+0600\n" -"PO-Revision-Date: 2023-01-01 00:00+0600\n" -"Last-Translator: UBLinux Team \n" -"Language-Team: UBLinux Team \n" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-03-22 11:23+0600\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -msgid "" -msgstr "" - -msgid "File Overview" +#: source/ublexec.cc:236 source/ublexec.cc:244 source/ublexec.cc:275 +msgid "-20 (High)" msgstr "" -msgid "Application Overview" +#: source/ublexec.cc:252 source/ublexec.cc:260 source/ublexec.cc:283 +#: source/ublexec.cc:413 +msgid "0 (High)" msgstr "" -msgid "https://wiki.ublinux.com" +#: source/ublexec.cc:235 source/ublexec.cc:243 source/ublexec.cc:251 +#: source/ublexec.cc:259 source/ublexec.cc:274 source/ublexec.cc:282 +#: source/ublexec.cc:412 +msgid "19 (Low)" msgstr "" +#: source/ublexec.cc:156 msgid "About" msgstr "" -msgid "Help" +#: source/ublexec.cc:186 +msgid "Application Overview" msgstr "" -msgid "Project Home Page" +msgid "Cancel" msgstr "" -msgid "System" +#: source/ublexec.cc:173 +msgid "Change startup priority" msgstr "" -msgid "Development" +#: source/ublexec.cc:166 +msgid "Command Line" msgstr "" -msgid "Other" +#: source/ublexec.cc:152 +msgid "Copyright © UBSoft LLC, 2022 - " msgstr "" -msgid "Office" +#: source/ublexec.cc:184 +msgid "Development" msgstr "" +#: source/ublexec.cc:181 msgid "Education" msgstr "" -msgid "Settings" +#: source/ublexec.cc:187 +msgid "File Overview" msgstr "" -msgid "Multimedia" +#: source/ublexec.cc:176 +msgid "Graphics" +msgstr "" + +#: source/ublexec.cc:155 +msgid "Help" msgstr "" +#: source/ublexec.cc:178 msgid "Internet" msgstr "" -msgid "Tools" +#: source/ublexec.cc:179 +msgid "Multimedia" msgstr "" -msgid "Graphics" +#: source/ublexec.cc:182 +msgid "Office" msgstr "" -msgid "ОК" +#: source/ublexec.cc:183 +msgid "Other" msgstr "" -msgid "Cancel" +#: source/ublexec.cc:163 +msgid "Please select File" msgstr "" -msgid "Selecting Programs" +#: source/ublexec.cc:172 +msgid "Priority" msgstr "" -msgid "Run applications as another user\nwith the specified priority" +#: source/ublexec.cc:174 +msgid "Priority:" msgstr "" -msgid "Team" +#: source/ublexec.cc:158 +msgid "Project Home Page" msgstr "" -msgid "Run in the terminal emulator" +#: source/ublexec.cc:162 +msgid "Run" msgstr "" -msgid "Command Line" +#: source/ublexec.cc:165 +msgid "" +"Run applications as another user\n" +"with the specified priority" msgstr "" msgid "Run as another user" msgstr "" -msgid "pkexec" +#: source/ublexec.cc:170 +msgid "Run as another user:" msgstr "" -msgid "su" +#: source/ublexec.cc:168 +msgid "Run in the terminal emulator" msgstr "" -msgid "sudo" +#: source/ublexec.cc:175 +msgid "Select an executable file or program" msgstr "" -msgid "User Name" +#: source/ublexec.cc:164 +msgid "Selecting Programs" msgstr "" -msgid "User" +#: source/ublexec.cc:180 +msgid "Settings" msgstr "" -msgid "Change startup priority" +#: source/ublexec.cc:185 +msgid "System" msgstr "" -msgid "Priority" +msgid "Team" msgstr "" -msgid "19 (Low)" +#: source/ublexec.cc:167 +msgid "Team:" msgstr "" -msgid "-20 (High)" +#: source/ublexec.cc:177 +msgid "Tools" msgstr "" -msgid "https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/" +#: source/ublexec.cc:169 +msgid "User" msgstr "" -msgid "0 (High)" +msgid "User Name" msgstr "" -msgid "Run" +#: source/ublexec.cc:171 +msgid "User Name:" msgstr "" -msgid "Select an executable file or program" +msgid "Warning!" msgstr "" -msgid "Please select File" +#: source/ublexec.cc:154 +msgid "https://wiki.ublinux.com" msgstr "" -msgid "Warning!" +#: source/ublexec.cc:313 +msgid "" +"https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/" +msgstr "" + +msgid "pkexec" +msgstr "" + +msgid "su" +msgstr "" + +msgid "sudo" msgstr "" +#: source/ublexec.cc:157 source/ublexec.cc:160 source/ublexec.cc:161 msgid "ublexec" msgstr "" -msgid "Copyright © UBSoft LLC, 2022 - " -msgstr "" \ No newline at end of file +msgid "ОК" +msgstr "" diff --git a/ublexec_ru.po b/ublexec_ru.po index 84f982c..0abfa97 100644 --- a/ublexec_ru.po +++ b/ublexec_ru.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ublexec 1.0\n" -"Report-Msgid-Bugs-To: info@ublinux.com\n" -"POT-Creation-Date: 2023-01-01 00:00+0600\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-03-22 11:23+0600\n" "PO-Revision-Date: 2023-01-01 00:00+0600\n" "Last-Translator: UBLinux Team \n" "Language-Team: Russian - UBLinux Team \n" @@ -17,128 +17,185 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -msgid "File Overview" -msgstr "Обзор файлов" +#: source/ublexec.cc:236 source/ublexec.cc:244 source/ublexec.cc:275 +msgid "-20 (High)" +msgstr "-20 (Высокий)" -msgid "Application Overview" -msgstr "Обзор приложений" +#: source/ublexec.cc:252 source/ublexec.cc:260 source/ublexec.cc:283 +#: source/ublexec.cc:413 +msgid "0 (High)" +msgstr "0 (Высокий)" -msgid "https://wiki.ublinux.com" -msgstr "https://wiki.ublinux.ru" +#: source/ublexec.cc:235 source/ublexec.cc:243 source/ublexec.cc:251 +#: source/ublexec.cc:259 source/ublexec.cc:274 source/ublexec.cc:282 +#: source/ublexec.cc:412 +msgid "19 (Low)" +msgstr "19 (Низкий)" +#: source/ublexec.cc:156 msgid "About" msgstr "О программе" -msgid "Help" -msgstr "Справка" +#: source/ublexec.cc:186 +msgid "Application Overview" +msgstr "Обзор приложений" -msgid "Project Home Page" -msgstr "Домашняя страница проекта" +msgid "Cancel" +msgstr "Отмена" -msgid "System" -msgstr "Система" +#: source/ublexec.cc:173 +msgid "Change startup priority" +msgstr "Изменить приоритет запуска" -msgid "Development" -msgstr "Разработка" +#: source/ublexec.cc:166 +msgid "Command Line" +msgstr "Командная строка" -msgid "Other" -msgstr "Прочие" +#: source/ublexec.cc:152 +msgid "Copyright © UBSoft LLC, 2022 - " +msgstr "Авторские права © ООО \"Юбисофт\", 2022 - " -msgid "Office" -msgstr "Офис" +#: source/ublexec.cc:184 +msgid "Development" +msgstr "Разработка" +#: source/ublexec.cc:181 msgid "Education" msgstr "Образование" -msgid "Settings" -msgstr "Настройки" +#: source/ublexec.cc:187 +msgid "File Overview" +msgstr "Обзор файлов" -msgid "Multimedia" -msgstr "Мультимедиа" +#: source/ublexec.cc:176 +msgid "Graphics" +msgstr "Графика" +#: source/ublexec.cc:155 +msgid "Help" +msgstr "Справка" + +#: source/ublexec.cc:178 msgid "Internet" msgstr "Интернет" -msgid "Tools" -msgstr "Инструменты" +#: source/ublexec.cc:179 +msgid "Multimedia" +msgstr "Мультимедиа" -msgid "Graphics" -msgstr "Графика" +#: source/ublexec.cc:182 +msgid "Office" +msgstr "Офис" -msgid "ОК" -msgstr "ОК" +#: source/ublexec.cc:183 +msgid "Other" +msgstr "Прочие" -msgid "Cancel" -msgstr "Отмена" +#: source/ublexec.cc:163 +msgid "Please select File" +msgstr "Пожалуйста выберите Файл" -msgid "Selecting Programs" -msgstr "Выбор программ" +#: source/ublexec.cc:172 +msgid "Priority" +msgstr "Приоритет" -msgid "Run applications as another user\nwith the specified priority" -msgstr "Запускать приложения от имени другого пользователя\nс указанным приоритетом" +#: source/ublexec.cc:174 +msgid "Priority:" +msgstr "Приоритет:" -msgid "Team:" -msgstr "Команда:" +#: source/ublexec.cc:158 +msgid "Project Home Page" +msgstr "Домашняя страница проекта" -msgid "Run in the terminal emulator" -msgstr "Выполнить в эмуляторе терминала" +#: source/ublexec.cc:162 +msgid "Run" +msgstr "Запустить" -msgid "Command Line" -msgstr "Командная строка" +#: source/ublexec.cc:165 +msgid "" +"Run applications as another user\n" +"with the specified priority" +msgstr "" +"Запускать приложения от имени другого пользователя\n" +"с указанным приоритетом" + +#, fuzzy +msgid "Run as another user" +msgstr "Выполнить от имени другого пользователя:" +#: source/ublexec.cc:170 msgid "Run as another user:" msgstr "Выполнить от имени другого пользователя:" -msgid "pkexec" -msgstr "pkexec" +#: source/ublexec.cc:168 +msgid "Run in the terminal emulator" +msgstr "Выполнить в эмуляторе терминала" -msgid "su" -msgstr "su" +#: source/ublexec.cc:175 +msgid "Select an executable file or program" +msgstr "Выберите исполняемый файл или программу" -msgid "sudo" -msgstr "sudo" +#: source/ublexec.cc:164 +msgid "Selecting Programs" +msgstr "Выбор программ" -msgid "User Name:" -msgstr "Имя пользователя:" +#: source/ublexec.cc:180 +msgid "Settings" +msgstr "Настройки" -msgid "User" -msgstr "Пользователь" +#: source/ublexec.cc:185 +msgid "System" +msgstr "Система" -msgid "Change startup priority" -msgstr "Изменить приоритет запуска" +#, fuzzy +msgid "Team" +msgstr "Команда:" -msgid "Priority:" -msgstr "Приоритет:" +#: source/ublexec.cc:167 +msgid "Team:" +msgstr "Команда:" -msgid "Priority" -msgstr "Приоритет" +#: source/ublexec.cc:177 +msgid "Tools" +msgstr "Инструменты" -msgid "19 (Low)" -msgstr "19 (Низкий)" +#: source/ublexec.cc:169 +msgid "User" +msgstr "Пользователь" -msgid "-20 (High)" -msgstr "-20 (Высокий)" +#, fuzzy +msgid "User Name" +msgstr "Имя пользователя:" -msgid "https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/" -msgstr "https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/" +#: source/ublexec.cc:171 +msgid "User Name:" +msgstr "Имя пользователя:" -msgid "0 (High)" -msgstr "0 (Высокий)" +msgid "Warning!" +msgstr "Внимание!" -msgid "Run" -msgstr "Запустить" +#: source/ublexec.cc:154 +msgid "https://wiki.ublinux.com" +msgstr "https://wiki.ublinux.ru" -msgid "Select an executable file or program" -msgstr "Выберите исполняемый файл или программу" +#: source/ublexec.cc:313 +msgid "" +"https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/" +msgstr "" +"https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/" -msgid "Please select File" -msgstr "Пожалуйста выберите Файл" +msgid "pkexec" +msgstr "pkexec" -msgid "Warning!" -msgstr "Внимание!" +msgid "su" +msgstr "su" +msgid "sudo" +msgstr "sudo" + +#: source/ublexec.cc:157 source/ublexec.cc:160 source/ublexec.cc:161 msgid "ublexec" msgstr "Выполнить как..." -msgid "Copyright © UBSoft LLC, 2022 - " -msgstr "Авторские права © ООО \"Юбисофт\", 2022 - " \ No newline at end of file +msgid "ОК" +msgstr "ОК" diff --git a/ublexec_ru.po~ b/ublexec_ru.po~ new file mode 100644 index 0000000..84f982c --- /dev/null +++ b/ublexec_ru.po~ @@ -0,0 +1,144 @@ +# Russian translations for ublexec package. +# Copyright (C) 2022, UBTech LLC +# This file is distributed under the same license as the ublexec package. +# UBLinux Team , 2022 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: ublexec 1.0\n" +"Report-Msgid-Bugs-To: info@ublinux.com\n" +"POT-Creation-Date: 2023-01-01 00:00+0600\n" +"PO-Revision-Date: 2023-01-01 00:00+0600\n" +"Last-Translator: UBLinux Team \n" +"Language-Team: Russian - UBLinux Team \n" +"Language: Russian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +msgid "File Overview" +msgstr "Обзор файлов" + +msgid "Application Overview" +msgstr "Обзор приложений" + +msgid "https://wiki.ublinux.com" +msgstr "https://wiki.ublinux.ru" + +msgid "About" +msgstr "О программе" + +msgid "Help" +msgstr "Справка" + +msgid "Project Home Page" +msgstr "Домашняя страница проекта" + +msgid "System" +msgstr "Система" + +msgid "Development" +msgstr "Разработка" + +msgid "Other" +msgstr "Прочие" + +msgid "Office" +msgstr "Офис" + +msgid "Education" +msgstr "Образование" + +msgid "Settings" +msgstr "Настройки" + +msgid "Multimedia" +msgstr "Мультимедиа" + +msgid "Internet" +msgstr "Интернет" + +msgid "Tools" +msgstr "Инструменты" + +msgid "Graphics" +msgstr "Графика" + +msgid "ОК" +msgstr "ОК" + +msgid "Cancel" +msgstr "Отмена" + +msgid "Selecting Programs" +msgstr "Выбор программ" + +msgid "Run applications as another user\nwith the specified priority" +msgstr "Запускать приложения от имени другого пользователя\nс указанным приоритетом" + +msgid "Team:" +msgstr "Команда:" + +msgid "Run in the terminal emulator" +msgstr "Выполнить в эмуляторе терминала" + +msgid "Command Line" +msgstr "Командная строка" + +msgid "Run as another user:" +msgstr "Выполнить от имени другого пользователя:" + +msgid "pkexec" +msgstr "pkexec" + +msgid "su" +msgstr "su" + +msgid "sudo" +msgstr "sudo" + +msgid "User Name:" +msgstr "Имя пользователя:" + +msgid "User" +msgstr "Пользователь" + +msgid "Change startup priority" +msgstr "Изменить приоритет запуска" + +msgid "Priority:" +msgstr "Приоритет:" + +msgid "Priority" +msgstr "Приоритет" + +msgid "19 (Low)" +msgstr "19 (Низкий)" + +msgid "-20 (High)" +msgstr "-20 (Высокий)" + +msgid "https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/" +msgstr "https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/" + +msgid "0 (High)" +msgstr "0 (Высокий)" + +msgid "Run" +msgstr "Запустить" + +msgid "Select an executable file or program" +msgstr "Выберите исполняемый файл или программу" + +msgid "Please select File" +msgstr "Пожалуйста выберите Файл" + +msgid "Warning!" +msgstr "Внимание!" + +msgid "ublexec" +msgstr "Выполнить как..." + +msgid "Copyright © UBSoft LLC, 2022 - " +msgstr "Авторские права © ООО \"Юбисофт\", 2022 - " \ No newline at end of file From 216ad6ac8d87dc4ea0035be8c09c3532cec10743 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 22 Mar 2023 11:32:34 +0600 Subject: [PATCH 3/6] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20?= =?UTF-8?q?=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ublexec.cc | 11 +++++++---- source/ublexec.h | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/source/ublexec.cc b/source/ublexec.cc index 6d5c070..1119cf6 100644 --- a/source/ublexec.cc +++ b/source/ublexec.cc @@ -285,6 +285,7 @@ void MainWindow::changed_user() { } void MainWindow::delete_cmd(const int &x, const int &y) { + if (x == 0) {} if (y > 1) { chbTerminal->set_active(false); chbAnotherUser->set_active(false); @@ -294,6 +295,7 @@ void MainWindow::delete_cmd(const int &x, const int &y) { } bool MainWindow::focus_in_txt_cmd(GdkEventFocus* event) { + if (event) {} if (user_cmd.length() != 0) { } else if (name_app.length() != 0) { @@ -311,7 +313,7 @@ bool MainWindow::focus_in_txt_cmd(GdkEventFocus* event) { void MainWindow::synopsis_show() { string cmd = "xdg-open " + string(gettext("https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/")) + app_name + " &"; - system(cmd.c_str()); + index_error = system(cmd.c_str()); } void MainWindow::icon_clear() { @@ -377,7 +379,7 @@ void MainWindow::tempate_icon_select(Gtk::IconView *icon, Glib::RefPtrset_text(app_name_exec); name_app = txtCmd->get_text(); - int len_name_app = name_app.length(); + size_t len_name_app = name_app.length(); string array_del[] = {"%f", "%F", "%d", "%D", "%n", "%N", "%U"}; for (auto &del_sim: array_del) { str_remove(name_app, del_sim); @@ -605,7 +607,7 @@ string MainWindow::start_cmd(string user_cmd) { string user_cmd_X = "xhost +SI:localuser:"; user_cmd_X += cmbUser->get_active_text(); user_cmd_X += " > /dev/null 2>&1"; - system(user_cmd_X.c_str()); + index_error = system(user_cmd_X.c_str()); } if ((cbxExecuteEpriority->get_active()) && (chbAnotherUser->get_active() == false)) { str_nice_cmd = "nice -n " + to_string(spinPriority->get_value_as_int()) + " "; @@ -665,7 +667,7 @@ string MainWindow::start_cmd(string user_cmd) { void MainWindow::call_app(string &cmd) { if (cmd.length() != 0) { - std::thread t([&](string cmd) {system(cmd.c_str());}, cmd); + std::thread t([&](string cmd) {int index = system(cmd.c_str()); if (index){}}, cmd); t.detach(); } } @@ -718,6 +720,7 @@ string MainWindow::call(string cmd) { } bool MainWindow::focus_out_txt_cmd(GdkEventFocus* event) { + if (event) {} if (cmd_old != txtCmd->get_text()) { user_cmd = txtCmd->get_text(); } diff --git a/source/ublexec.h b/source/ublexec.h index f236971..56b8c91 100644 --- a/source/ublexec.h +++ b/source/ublexec.h @@ -211,6 +211,7 @@ public: string execute_cmd = ""; string path_file = ""; string name_app = ""; + int index_error = 0; bool flag_pkexec = false; bool flag_su = false; bool flag_sudo = false; From c48f53507b741a5094e306285e70af0113a8850e Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 22 Mar 2023 11:47:04 +0600 Subject: [PATCH 4/6] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B4=D0=B5=D0=B9=D1=81=D1=82=D0=B2=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BD=D0=B0=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B5=20?= =?UTF-8?q?=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ublexec.cc | 5 +++++ ublexec.glade | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/source/ublexec.cc b/source/ublexec.cc index 1119cf6..8f4138b 100644 --- a/source/ublexec.cc +++ b/source/ublexec.cc @@ -313,6 +313,11 @@ bool MainWindow::focus_in_txt_cmd(GdkEventFocus* event) { void MainWindow::synopsis_show() { string cmd = "xdg-open " + string(gettext("https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/")) + app_name + " &"; + if (geteuid() == 0) { + string response_user = getlogin(); + cmd = "su -l " + response_user + " -c \" DISPLAY=$DISPLAY " + cmd + " \""; + } + cout << cmd << endl; index_error = system(cmd.c_str()); } diff --git a/ublexec.glade b/ublexec.glade index b52d4cd..0690756 100644 --- a/ublexec.glade +++ b/ublexec.glade @@ -1000,7 +1000,7 @@ True False - Synopsis + Help From 34d3f35256cabb2a063d98dac81608bdfaa7ed9c Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 22 Mar 2023 14:30:04 +0600 Subject: [PATCH 5/6] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B4=D0=B8=D0=B7=D0=B0=D0=B9=D0=BD=20=D0=B8=20?= =?UTF-8?q?=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ublexec.cc | 22 +++++-- source/ublexec.h | 3 + ublexec.css | 3 - ublexec.glade | 124 +++++++++++++++++++++++---------------- ublexec.pot | 113 +++++++++++++++++++++--------------- ublexec_ru.po | 97 ++++++++++++++++++------------- ublexec_ru.po~ | 144 ---------------------------------------------- 7 files changed, 220 insertions(+), 286 deletions(-) delete mode 100644 ublexec_ru.po~ diff --git a/source/ublexec.cc b/source/ublexec.cc index 8f4138b..3682eb3 100644 --- a/source/ublexec.cc +++ b/source/ublexec.cc @@ -5,6 +5,7 @@ const string path_app = "/usr/bin/"; const string path_glade = "/usr/share/ublexec/ui/ublexec.glade"; const string path_css = "/usr/share/ublexec/css/ublexec.css"; const string app_name = "ublexec"; +const string path_img_head_background = "/usr/share/ublexec/images/logo-background.png"; int socket_ext_id_I = 0; int socket_trd_id_I = 0; @@ -42,6 +43,9 @@ MainWindow::MainWindow(Glib::RefPtr const& builder) { } void MainWindow::get_builder() { + + builder->get_widget("imgHeadBackground", imgHeadBackground); + builder->get_widget("overHead", overHead); builder->get_widget("btnFilemaneg", btnFilemaneg); builder->get_widget("btnListApp", btnListApp); builder->get_widget("btnStart", btnStart); @@ -135,10 +139,9 @@ void MainWindow::add_CSS() { Glib::RefPtr styleContext = Gtk::StyleContext::create(); Glib::RefPtr screen = Gdk::Screen::get_default();//get default screen styleContext->add_provider_for_screen(screen, cssProvider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);//add provider for screen in all application - Glib::RefPtr context_box = boxColor->get_style_context(); Glib::RefPtr context_lbl_head = lblInfoHead->get_style_context(); Glib::RefPtr boxAbout_css = boxAbout->get_style_context(); - context_box->add_class("cssboxColor1"); + imgHeadBackground->set(path_img_head_background); context_lbl_head->add_class("textHead"); if (socket_ext_id_I == 0){ boxAbout_css->add_class("bkim_no_plug"); @@ -154,11 +157,12 @@ void MainWindow::localization() { aboutWindows->set_website(gettext("https://wiki.ublinux.com")); btnSynopsis->set_label(gettext("Help")); btnAbout->set_label(gettext("About")); - aboutWindows->set_comments(gettext("ublexec")); + aboutWindows->set_comments(gettext("Run as...")); aboutWindows->set_website_label(gettext("Project Home Page")); aboutWindows->set_version(gettext(version_application.c_str())); - lblHeaderName->set_text(gettext("ublexec")); - this->set_title(gettext("ublexec")); + aboutWindows->set_title(gettext(" Run as...")); + lblHeaderName->set_text(gettext("Run as...")); + this->set_title(gettext("Run as...")); btnStart->set_label(gettext("Run")); wndChooseFileWallpaper->set_title(gettext("Please select File")); dialogStartMenu->set_title(gettext("Selecting Programs")); @@ -173,6 +177,7 @@ void MainWindow::localization() { lblInfoExec->set_text(gettext("Change startup priority")); lblInfoPriority->set_text(gettext("Priority:")); lblMessageError->set_text(gettext("Select an executable file or program")); + messageError->set_title(gettext("Warning!")); lblGraphics->set_text(gettext("Graphics")); lblTools->set_text(gettext("Tools")); lblInternet->set_text(gettext("Internet")); @@ -185,6 +190,7 @@ void MainWindow::localization() { lblSystem->set_text(gettext("System")); btnListApp->set_tooltip_text(gettext("Application Overview")); btnFilemaneg->set_tooltip_text(gettext("File Overview")); + btnStartMenuExit->set_label(gettext("Cancel")); } void MainWindow::event() { @@ -419,6 +425,9 @@ void MainWindow::settings() { lblTimeEpriorityLow->set_text(gettext("19 (Low)")); lblTime4EpriorityHigh->set_text(gettext("0 (High)")); scalePriority->set_inverted(true); + Gtk::Widget *boxWidget; + builder->get_widget("boxColor", boxWidget); + overHead->add_overlay(*boxWidget); this->pars_dir_bin(); this->pars_dir_terminal(); this->pars_users(); @@ -434,6 +443,7 @@ void MainWindow::settings() { btnBoxAboutDialog->set_visible(false); cmbTerminal->set_sensitive(false); ubl_make_plugs(boxAbout, boxAbout, socket_ext_id_I, 0); + } void MainWindow::close_entry_app() { @@ -618,6 +628,7 @@ string MainWindow::start_cmd(string user_cmd) { str_nice_cmd = "nice -n " + to_string(spinPriority->get_value_as_int()) + " "; } if (user_cmd.length() == 0 && name_app.length() == 0 && path_file.length() == 0) { + messageError->set_title(gettext("Warning!")); messageError->show(); return ""; } @@ -686,6 +697,7 @@ void MainWindow::denamic_cmd() { name_app = ""; user_cmd = ""; txtCmd->set_text(user_cmd); + messageError->set_title(gettext("Warning!")); messageError->show(); } else{ diff --git a/source/ublexec.h b/source/ublexec.h index 56b8c91..065a420 100644 --- a/source/ublexec.h +++ b/source/ublexec.h @@ -24,6 +24,7 @@ extern const string path_app; extern const string app_name; extern const string path_glade; extern const string path_css; +extern const string path_img_head_background; extern int socket_ext_id_I; extern int socket_trd_id_I; void me_thread(string cmd); @@ -198,6 +199,8 @@ public: Glib::RefPtr list_Other; Glib::RefPtr list_Development; Glib::RefPtr list_System; + Gtk::Image *imgHeadBackground; + Gtk::Overlay *overHead; Gtk::Widget *boxAbout; public: string termunal_cmd[3] = {"konsole -e ", "xfce4-terminal -x ", "xterm -e "}; diff --git a/ublexec.css b/ublexec.css index b385397..733b950 100644 --- a/ublexec.css +++ b/ublexec.css @@ -1,6 +1,3 @@ -.cssboxColor1{ - background: url("/usr/share/ublexec/images/logo-background.png") no-repeat; -} .textHead{ text-shadow: 1px 1px #ffffff; } diff --git a/ublexec.glade b/ublexec.glade index 0690756..54265f5 100644 --- a/ublexec.glade +++ b/ublexec.glade @@ -13,7 +13,7 @@ False True center - ubl-settings-datetime + com.ublinux.ublexec dialog True False @@ -39,6 +39,12 @@ False + 5 + 5 + 5 + 5 + 6 + 6 end @@ -62,6 +68,54 @@ 1 10 + + True + False + + + True + False + 5 + 5 + 5 + 5 + 6 + 6 + 69 + com.ublinux.ublexec + + + False + True + 0 + + + + + True + False + start + 5 + 5 + 5 + 5 + 6 + 6 + Run applications as another user +with the specified priority + + + + + + + + True + True + 1 + + + 410 240 @@ -913,10 +967,8 @@ end start - - ОК - -1 - -1 + + Exit True True True @@ -934,8 +986,10 @@ - - Выход + + ОК + -1 + -1 True True True @@ -1026,56 +1080,22 @@ False vertical - + True False - - True - False - 5 - 5 - 5 - 5 - 6 - 6 - 69 - com.ublinux.ublexec - - - False - True - 0 - - - - + + 81 True False - start - 5 - 5 - 5 - 5 - 6 - 6 - Run applications as another user -with the specified priority - - - - - - True - True - 1 + -1 - False + True True 0 @@ -1903,7 +1923,7 @@ with the specified priority False - Внимание! + Warning! com.ublinux.ublexec dialog @@ -1921,10 +1941,16 @@ with the specified priority - ОК + OK True True True + 5 + 5 + 5 + 5 + 6 + 6 True @@ -1959,7 +1985,7 @@ with the specified priority False - Пожалуйста выберите Файл + Please select File True center 500 diff --git a/ublexec.pot b/ublexec.pot index a15fd2b..68ea1d7 100644 --- a/ublexec.pot +++ b/ublexec.pot @@ -1,109 +1,124 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Language translations for ublexec package. +# Copyright (C) 2022, UBTech LLC +# This file is distributed under the same license as the ublexec package. +# UBLinux Team , 2022 # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-22 11:23+0600\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"Project-Id-Version: ublexec 1.0\n" +"Report-Msgid-Bugs-To: info@ublinux.com\n" +"POT-Creation-Date: 2023-01-01 00:00+0600\n" +"PO-Revision-Date: 2023-01-01 00:00+0600\n" +"Last-Translator: UBLinux Team \n" +"Language-Team: UBLinux Team \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +msgid "" +msgstr "" + +#: source/ublexec.cc:163 +msgid " Run as..." +msgstr "" + +#: source/ublexec.cc:242 source/ublexec.cc:250 source/ublexec.cc:281 #: source/ublexec.cc:236 source/ublexec.cc:244 source/ublexec.cc:275 msgid "-20 (High)" msgstr "" -#: source/ublexec.cc:252 source/ublexec.cc:260 source/ublexec.cc:283 -#: source/ublexec.cc:413 +#: source/ublexec.cc:258 source/ublexec.cc:266 source/ublexec.cc:289 +#: source/ublexec.cc:426 source/ublexec.cc:252 source/ublexec.cc:260 +#: source/ublexec.cc:283 source/ublexec.cc:413 msgid "0 (High)" msgstr "" -#: source/ublexec.cc:235 source/ublexec.cc:243 source/ublexec.cc:251 -#: source/ublexec.cc:259 source/ublexec.cc:274 source/ublexec.cc:282 -#: source/ublexec.cc:412 +#: source/ublexec.cc:241 source/ublexec.cc:249 source/ublexec.cc:257 +#: source/ublexec.cc:265 source/ublexec.cc:280 source/ublexec.cc:288 +#: source/ublexec.cc:425 source/ublexec.cc:235 source/ublexec.cc:243 +#: source/ublexec.cc:251 source/ublexec.cc:259 source/ublexec.cc:274 +#: source/ublexec.cc:282 source/ublexec.cc:412 msgid "19 (Low)" msgstr "" -#: source/ublexec.cc:156 +#: source/ublexec.cc:159 source/ublexec.cc:156 msgid "About" msgstr "" -#: source/ublexec.cc:186 +#: source/ublexec.cc:191 source/ublexec.cc:186 msgid "Application Overview" msgstr "" msgid "Cancel" msgstr "" -#: source/ublexec.cc:173 +#: source/ublexec.cc:177 source/ublexec.cc:173 msgid "Change startup priority" msgstr "" -#: source/ublexec.cc:166 +#: source/ublexec.cc:193 +msgid "Сancel" +msgstr "" + +#: source/ublexec.cc:170 source/ublexec.cc:166 msgid "Command Line" msgstr "" -#: source/ublexec.cc:152 +#: source/ublexec.cc:155 source/ublexec.cc:152 msgid "Copyright © UBSoft LLC, 2022 - " msgstr "" -#: source/ublexec.cc:184 +#: source/ublexec.cc:189 source/ublexec.cc:184 msgid "Development" msgstr "" -#: source/ublexec.cc:181 +#: source/ublexec.cc:186 source/ublexec.cc:181 msgid "Education" msgstr "" -#: source/ublexec.cc:187 +#: source/ublexec.cc:192 source/ublexec.cc:187 msgid "File Overview" msgstr "" -#: source/ublexec.cc:176 +#: source/ublexec.cc:181 source/ublexec.cc:176 msgid "Graphics" msgstr "" -#: source/ublexec.cc:155 +#: source/ublexec.cc:158 source/ublexec.cc:155 msgid "Help" msgstr "" -#: source/ublexec.cc:178 +#: source/ublexec.cc:183 source/ublexec.cc:178 msgid "Internet" msgstr "" -#: source/ublexec.cc:179 +#: source/ublexec.cc:184 source/ublexec.cc:179 msgid "Multimedia" msgstr "" -#: source/ublexec.cc:182 +#: source/ublexec.cc:187 source/ublexec.cc:182 msgid "Office" msgstr "" -#: source/ublexec.cc:183 +#: source/ublexec.cc:188 source/ublexec.cc:183 msgid "Other" msgstr "" -#: source/ublexec.cc:163 +#: source/ublexec.cc:167 source/ublexec.cc:163 msgid "Please select File" msgstr "" -#: source/ublexec.cc:172 +#: source/ublexec.cc:176 source/ublexec.cc:172 msgid "Priority" msgstr "" -#: source/ublexec.cc:174 +#: source/ublexec.cc:178 source/ublexec.cc:174 msgid "Priority:" msgstr "" -#: source/ublexec.cc:158 +#: source/ublexec.cc:161 source/ublexec.cc:158 msgid "Project Home Page" msgstr "" @@ -111,7 +126,7 @@ msgstr "" msgid "Run" msgstr "" -#: source/ublexec.cc:165 +#: source/ublexec.cc:169 source/ublexec.cc:165 msgid "" "Run applications as another user\n" "with the specified priority" @@ -120,60 +135,66 @@ msgstr "" msgid "Run as another user" msgstr "" -#: source/ublexec.cc:170 +#: source/ublexec.cc:174 source/ublexec.cc:170 msgid "Run as another user:" msgstr "" -#: source/ublexec.cc:168 +#: source/ublexec.cc:160 source/ublexec.cc:164 source/ublexec.cc:165 +#: source/ublexec.cc:166 +msgid "Run as..." +msgstr "" + +#: source/ublexec.cc:172 source/ublexec.cc:168 msgid "Run in the terminal emulator" msgstr "" -#: source/ublexec.cc:175 +#: source/ublexec.cc:179 source/ublexec.cc:175 msgid "Select an executable file or program" msgstr "" -#: source/ublexec.cc:164 +#: source/ublexec.cc:168 source/ublexec.cc:164 msgid "Selecting Programs" msgstr "" -#: source/ublexec.cc:180 +#: source/ublexec.cc:185 source/ublexec.cc:180 msgid "Settings" msgstr "" -#: source/ublexec.cc:185 +#: source/ublexec.cc:190 source/ublexec.cc:185 msgid "System" msgstr "" msgid "Team" msgstr "" -#: source/ublexec.cc:167 +#: source/ublexec.cc:171 source/ublexec.cc:167 msgid "Team:" msgstr "" -#: source/ublexec.cc:177 +#: source/ublexec.cc:182 source/ublexec.cc:177 msgid "Tools" msgstr "" -#: source/ublexec.cc:169 +#: source/ublexec.cc:173 source/ublexec.cc:169 msgid "User" msgstr "" msgid "User Name" msgstr "" -#: source/ublexec.cc:171 +#: source/ublexec.cc:175 source/ublexec.cc:171 msgid "User Name:" msgstr "" +#: source/ublexec.cc:180 source/ublexec.cc:631 source/ublexec.cc:700 msgid "Warning!" msgstr "" -#: source/ublexec.cc:154 +#: source/ublexec.cc:157 source/ublexec.cc:154 msgid "https://wiki.ublinux.com" msgstr "" -#: source/ublexec.cc:313 +#: source/ublexec.cc:321 source/ublexec.cc:313 msgid "" "https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/" msgstr "" diff --git a/ublexec_ru.po b/ublexec_ru.po index 0abfa97..9acaf05 100644 --- a/ublexec_ru.po +++ b/ublexec_ru.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ublexec 1.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-22 11:23+0600\n" +"Report-Msgid-Bugs-To: info@ublinux.com\n" +"POT-Creation-Date: 2023-01-01 00:00+0600\n" "PO-Revision-Date: 2023-01-01 00:00+0600\n" "Last-Translator: UBLinux Team \n" "Language-Team: Russian - UBLinux Team \n" @@ -17,93 +17,105 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: source/ublexec.cc:163 +msgid " Run as..." +msgstr "О программе ublexec" + +#: source/ublexec.cc:242 source/ublexec.cc:250 source/ublexec.cc:281 #: source/ublexec.cc:236 source/ublexec.cc:244 source/ublexec.cc:275 msgid "-20 (High)" msgstr "-20 (Высокий)" -#: source/ublexec.cc:252 source/ublexec.cc:260 source/ublexec.cc:283 -#: source/ublexec.cc:413 +#: source/ublexec.cc:258 source/ublexec.cc:266 source/ublexec.cc:289 +#: source/ublexec.cc:426 source/ublexec.cc:252 source/ublexec.cc:260 +#: source/ublexec.cc:283 source/ublexec.cc:413 msgid "0 (High)" msgstr "0 (Высокий)" -#: source/ublexec.cc:235 source/ublexec.cc:243 source/ublexec.cc:251 -#: source/ublexec.cc:259 source/ublexec.cc:274 source/ublexec.cc:282 -#: source/ublexec.cc:412 +#: source/ublexec.cc:241 source/ublexec.cc:249 source/ublexec.cc:257 +#: source/ublexec.cc:265 source/ublexec.cc:280 source/ublexec.cc:288 +#: source/ublexec.cc:425 source/ublexec.cc:235 source/ublexec.cc:243 +#: source/ublexec.cc:251 source/ublexec.cc:259 source/ublexec.cc:274 +#: source/ublexec.cc:282 source/ublexec.cc:412 msgid "19 (Low)" msgstr "19 (Низкий)" -#: source/ublexec.cc:156 +#: source/ublexec.cc:159 source/ublexec.cc:156 msgid "About" msgstr "О программе" -#: source/ublexec.cc:186 +#: source/ublexec.cc:191 source/ublexec.cc:186 msgid "Application Overview" msgstr "Обзор приложений" msgid "Cancel" msgstr "Отмена" -#: source/ublexec.cc:173 +#: source/ublexec.cc:177 source/ublexec.cc:173 msgid "Change startup priority" msgstr "Изменить приоритет запуска" -#: source/ublexec.cc:166 +#: source/ublexec.cc:193 +msgid "Сancel" +msgstr "Отмена" + +#: source/ublexec.cc:170 source/ublexec.cc:166 msgid "Command Line" msgstr "Командная строка" -#: source/ublexec.cc:152 +#: source/ublexec.cc:155 source/ublexec.cc:152 msgid "Copyright © UBSoft LLC, 2022 - " msgstr "Авторские права © ООО \"Юбисофт\", 2022 - " -#: source/ublexec.cc:184 +#: source/ublexec.cc:189 source/ublexec.cc:184 msgid "Development" msgstr "Разработка" -#: source/ublexec.cc:181 +#: source/ublexec.cc:186 source/ublexec.cc:181 msgid "Education" msgstr "Образование" -#: source/ublexec.cc:187 +#: source/ublexec.cc:192 source/ublexec.cc:187 msgid "File Overview" msgstr "Обзор файлов" -#: source/ublexec.cc:176 +#: source/ublexec.cc:181 source/ublexec.cc:176 msgid "Graphics" msgstr "Графика" -#: source/ublexec.cc:155 +#: source/ublexec.cc:158 source/ublexec.cc:155 msgid "Help" msgstr "Справка" -#: source/ublexec.cc:178 +#: source/ublexec.cc:183 source/ublexec.cc:178 msgid "Internet" msgstr "Интернет" -#: source/ublexec.cc:179 +#: source/ublexec.cc:184 source/ublexec.cc:179 msgid "Multimedia" msgstr "Мультимедиа" -#: source/ublexec.cc:182 +#: source/ublexec.cc:187 source/ublexec.cc:182 msgid "Office" msgstr "Офис" -#: source/ublexec.cc:183 +#: source/ublexec.cc:188 source/ublexec.cc:183 msgid "Other" msgstr "Прочие" -#: source/ublexec.cc:163 +#: source/ublexec.cc:167 source/ublexec.cc:163 msgid "Please select File" msgstr "Пожалуйста выберите Файл" -#: source/ublexec.cc:172 +#: source/ublexec.cc:176 source/ublexec.cc:172 msgid "Priority" msgstr "Приоритет" -#: source/ublexec.cc:174 +#: source/ublexec.cc:178 source/ublexec.cc:174 msgid "Priority:" msgstr "Приоритет:" -#: source/ublexec.cc:158 +#: source/ublexec.cc:161 source/ublexec.cc:158 msgid "Project Home Page" msgstr "Домашняя страница проекта" @@ -111,7 +123,7 @@ msgstr "Домашняя страница проекта" msgid "Run" msgstr "Запустить" -#: source/ublexec.cc:165 +#: source/ublexec.cc:169 source/ublexec.cc:165 msgid "" "Run applications as another user\n" "with the specified priority" @@ -123,27 +135,32 @@ msgstr "" msgid "Run as another user" msgstr "Выполнить от имени другого пользователя:" -#: source/ublexec.cc:170 +#: source/ublexec.cc:174 source/ublexec.cc:170 msgid "Run as another user:" msgstr "Выполнить от имени другого пользователя:" -#: source/ublexec.cc:168 +#: source/ublexec.cc:160 source/ublexec.cc:164 source/ublexec.cc:165 +#: source/ublexec.cc:166 +msgid "Run as..." +msgstr "Выполнить как..." + +#: source/ublexec.cc:172 source/ublexec.cc:168 msgid "Run in the terminal emulator" msgstr "Выполнить в эмуляторе терминала" -#: source/ublexec.cc:175 +#: source/ublexec.cc:179 source/ublexec.cc:175 msgid "Select an executable file or program" msgstr "Выберите исполняемый файл или программу" -#: source/ublexec.cc:164 +#: source/ublexec.cc:168 source/ublexec.cc:164 msgid "Selecting Programs" msgstr "Выбор программ" -#: source/ublexec.cc:180 +#: source/ublexec.cc:185 source/ublexec.cc:180 msgid "Settings" msgstr "Настройки" -#: source/ublexec.cc:185 +#: source/ublexec.cc:190 source/ublexec.cc:185 msgid "System" msgstr "Система" @@ -151,15 +168,15 @@ msgstr "Система" msgid "Team" msgstr "Команда:" -#: source/ublexec.cc:167 +#: source/ublexec.cc:171 source/ublexec.cc:167 msgid "Team:" msgstr "Команда:" -#: source/ublexec.cc:177 +#: source/ublexec.cc:182 source/ublexec.cc:177 msgid "Tools" msgstr "Инструменты" -#: source/ublexec.cc:169 +#: source/ublexec.cc:173 source/ublexec.cc:169 msgid "User" msgstr "Пользователь" @@ -167,18 +184,19 @@ msgstr "Пользователь" msgid "User Name" msgstr "Имя пользователя:" -#: source/ublexec.cc:171 +#: source/ublexec.cc:175 source/ublexec.cc:171 msgid "User Name:" msgstr "Имя пользователя:" +#: source/ublexec.cc:180 source/ublexec.cc:631 source/ublexec.cc:700 msgid "Warning!" msgstr "Внимание!" -#: source/ublexec.cc:154 +#: source/ublexec.cc:157 source/ublexec.cc:154 msgid "https://wiki.ublinux.com" msgstr "https://wiki.ublinux.ru" -#: source/ublexec.cc:313 +#: source/ublexec.cc:321 source/ublexec.cc:313 msgid "" "https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/" msgstr "" @@ -194,8 +212,9 @@ msgid "sudo" msgstr "sudo" #: source/ublexec.cc:157 source/ublexec.cc:160 source/ublexec.cc:161 +#, fuzzy msgid "ublexec" -msgstr "Выполнить как..." +msgstr "pkexec" msgid "ОК" msgstr "ОК" diff --git a/ublexec_ru.po~ b/ublexec_ru.po~ deleted file mode 100644 index 84f982c..0000000 --- a/ublexec_ru.po~ +++ /dev/null @@ -1,144 +0,0 @@ -# Russian translations for ublexec package. -# Copyright (C) 2022, UBTech LLC -# This file is distributed under the same license as the ublexec package. -# UBLinux Team , 2022 -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: ublexec 1.0\n" -"Report-Msgid-Bugs-To: info@ublinux.com\n" -"POT-Creation-Date: 2023-01-01 00:00+0600\n" -"PO-Revision-Date: 2023-01-01 00:00+0600\n" -"Last-Translator: UBLinux Team \n" -"Language-Team: Russian - UBLinux Team \n" -"Language: Russian\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -msgid "File Overview" -msgstr "Обзор файлов" - -msgid "Application Overview" -msgstr "Обзор приложений" - -msgid "https://wiki.ublinux.com" -msgstr "https://wiki.ublinux.ru" - -msgid "About" -msgstr "О программе" - -msgid "Help" -msgstr "Справка" - -msgid "Project Home Page" -msgstr "Домашняя страница проекта" - -msgid "System" -msgstr "Система" - -msgid "Development" -msgstr "Разработка" - -msgid "Other" -msgstr "Прочие" - -msgid "Office" -msgstr "Офис" - -msgid "Education" -msgstr "Образование" - -msgid "Settings" -msgstr "Настройки" - -msgid "Multimedia" -msgstr "Мультимедиа" - -msgid "Internet" -msgstr "Интернет" - -msgid "Tools" -msgstr "Инструменты" - -msgid "Graphics" -msgstr "Графика" - -msgid "ОК" -msgstr "ОК" - -msgid "Cancel" -msgstr "Отмена" - -msgid "Selecting Programs" -msgstr "Выбор программ" - -msgid "Run applications as another user\nwith the specified priority" -msgstr "Запускать приложения от имени другого пользователя\nс указанным приоритетом" - -msgid "Team:" -msgstr "Команда:" - -msgid "Run in the terminal emulator" -msgstr "Выполнить в эмуляторе терминала" - -msgid "Command Line" -msgstr "Командная строка" - -msgid "Run as another user:" -msgstr "Выполнить от имени другого пользователя:" - -msgid "pkexec" -msgstr "pkexec" - -msgid "su" -msgstr "su" - -msgid "sudo" -msgstr "sudo" - -msgid "User Name:" -msgstr "Имя пользователя:" - -msgid "User" -msgstr "Пользователь" - -msgid "Change startup priority" -msgstr "Изменить приоритет запуска" - -msgid "Priority:" -msgstr "Приоритет:" - -msgid "Priority" -msgstr "Приоритет" - -msgid "19 (Low)" -msgstr "19 (Низкий)" - -msgid "-20 (High)" -msgstr "-20 (Высокий)" - -msgid "https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/" -msgstr "https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/" - -msgid "0 (High)" -msgstr "0 (Высокий)" - -msgid "Run" -msgstr "Запустить" - -msgid "Select an executable file or program" -msgstr "Выберите исполняемый файл или программу" - -msgid "Please select File" -msgstr "Пожалуйста выберите Файл" - -msgid "Warning!" -msgstr "Внимание!" - -msgid "ublexec" -msgstr "Выполнить как..." - -msgid "Copyright © UBSoft LLC, 2022 - " -msgstr "Авторские права © ООО \"Юбисофт\", 2022 - " \ No newline at end of file From cf68987d93a52d89f73f541a139f36a4785fba71 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 22 Mar 2023 15:09:00 +0600 Subject: [PATCH 6/6] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=BF=D0=BE=D0=BB=D0=B7=D1=83=D0=BD=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ublexec.glade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ublexec.glade b/ublexec.glade index 54265f5..77b652e 100644 --- a/ublexec.glade +++ b/ublexec.glade @@ -1678,7 +1678,6 @@ with the specified priority 5 5 5 - 9 adjustment1 20 0 @@ -1718,6 +1717,7 @@ with the specified priority True False + 9 False