diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 5016aa3..c235f56 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -8,15 +8,19 @@ include_directories(${GTK_INCLUDE_DIRS}) link_directories(${GTK_LIBRARY_DIRS}) add_definitions(${GTK_CFLAGS_OTHER}) +find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0) -option(WEBKIT_FOUND "" ON) +option(WEBKIT_FOUND "No" OFF) -if(WEBKIT_FOUND) +find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0) +if(WEBKIT_LIBRARIES_FOUND) + option(WEBKIT_FOUND "Yes" ON) PKG_CHECK_MODULES(WEBKIT REQUIRED webkit2gtk-4.0 webkit2gtk-web-extension-4.0) include_directories(${WEBKIT_INCLUDE_DIRS}) link_directories(${WEBKIT_LIBRARY_DIRS}) add_definitions(${WEBKIT_CFLAGS_OTHER}) endif() +configure_file(ublexec.h.in ublexec-cm.h) #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -std=c++2a -g") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \ @@ -25,6 +29,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissin -fstack-clash-protection -fcf-protection -g") set(SOURCE_FILES + ublexec-cm.h main.cc ublexec.cc ublexec.h @@ -42,4 +47,4 @@ target_include_directories(ublexec PUBLIC "${PROJECT_BINARY_DIR}" ${WEBKIT_INCLUDE_DIRS} ) -install(TARGETS ublexec DESTINATION bin) +install(TARGETS ublexec DESTINATION bin) \ No newline at end of file diff --git a/source/ublexec.cc b/source/ublexec.cc index 58d4c44..3a663f2 100644 --- a/source/ublexec.cc +++ b/source/ublexec.cc @@ -119,11 +119,7 @@ void MainWindow::get_builder() { builder->get_widget("lblHeadeWndWeb", lblHeadeWndWeb); #ifdef WEBKIT_FOUND - void *handle=NULL; - handle = dlopen("libwebkit2gtk-4.0.so", RTLD_LAZY); - if (handle) { - builder->get_widget("wndWeb", wndWeb); - } + builder->get_widget("wndWeb", wndWeb); #endif } @@ -362,15 +358,8 @@ void MainWindow::synopsis_show() { void MainWindow::open_browser() { #ifdef WEBKIT_FOUND - void *handle = NULL; - handle = dlopen("libwebkit2gtk-4.0.so", RTLD_LAZY); - if (handle) { - webkit_web_view_load_uri(one, link_doc); - wndWeb->show_all(); - } - else { - this->template_open_browser(); - } + webkit_web_view_load_uri(one, link_doc); + wndWeb->show_all(); #else this->template_open_browser(); #endif @@ -516,13 +505,9 @@ void MainWindow::settings() { cmbTerminal->set_sensitive(false); ubl_make_plugs(boxAbout, boxAbout, socket_ext_id_I, 0); #ifdef WEBKIT_FOUND - void *handle=NULL; - handle = dlopen("libwebkit2gtk-4.0.so", RTLD_LAZY); - if (handle) { - one = WEBKIT_WEB_VIEW( webkit_web_view_new() ); - three = Glib::wrap(GTK_WIDGET(one)); - wndWeb->add(*three); - } + one = WEBKIT_WEB_VIEW( webkit_web_view_new() ); + three = Glib::wrap(GTK_WIDGET(one)); + wndWeb->add(*three); #endif } diff --git a/source/ublexec.h b/source/ublexec.h index 6a7ad2c..aa64b7b 100644 --- a/source/ublexec.h +++ b/source/ublexec.h @@ -19,6 +19,7 @@ #include #include "ubl-util-standard.c" #include +#include "ublexec-cm.h" #ifdef WEBKIT_FOUND #include #endif @@ -88,7 +89,7 @@ #define path_img_head_background "/usr/share/ublexec/images/logo-background.png" #define path_all_applications "/usr/share/applications/" #define file_source_login_min_max "/etc/login.defs" - +#define no_print_cmd "nohup %s > /dev/null 2>&1" using namespace std; diff --git a/source/ublexec.h.in b/source/ublexec.h.in new file mode 100644 index 0000000..17ba454 --- /dev/null +++ b/source/ublexec.h.in @@ -0,0 +1 @@ +#cmakedefine WEBKIT_FOUND \ No newline at end of file diff --git a/ublexec.pot b/ublexec.pot index abadd7e..1cdbe2e 100644 --- a/ublexec.pot +++ b/ublexec.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ublexec 1.0\n" -"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: info@ublinux.com\n" "POT-Creation-Date: 2023-04-24 11:43+0600\n" "PO-Revision-Date: 2023-01-01 00:00+0600\n" "Last-Translator: UBLinux Team \n" @@ -17,136 +17,177 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" - -#: source/ublexec.cc:181 source/ublexec.cc:182 source/ublexec.cc:180 -#: source/ublexec.cc:163 +#: source/ublexec.h:32 source/ublexec.cc:181 source/ublexec.cc:182 +#: source/ublexec.cc:180 source/ublexec.cc:163 msgid " Run as..." msgstr "" -#: source/ublexec.cc:274 source/ublexec.cc:282 source/ublexec.cc:313 -#: source/ublexec.cc:272 source/ublexec.cc:280 source/ublexec.cc:311 -#: source/ublexec.cc:242 source/ublexec.cc:250 source/ublexec.cc:281 -#: source/ublexec.cc:236 source/ublexec.cc:244 source/ublexec.cc:275 +#: source/ublexec.h:53 source/ublexec.cc:274 source/ublexec.cc:282 +#: source/ublexec.cc:313 source/ublexec.cc:272 source/ublexec.cc:280 +#: source/ublexec.cc:311 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:290 source/ublexec.cc:298 source/ublexec.cc:321 -#: source/ublexec.cc:487 source/ublexec.cc:288 source/ublexec.cc:296 -#: source/ublexec.cc:319 source/ublexec.cc:485 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 +#: source/ublexec.h:52 source/ublexec.cc:290 source/ublexec.cc:298 +#: source/ublexec.cc:321 source/ublexec.cc:487 source/ublexec.cc:288 +#: source/ublexec.cc:296 source/ublexec.cc:319 source/ublexec.cc:485 +#: 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:273 source/ublexec.cc:281 source/ublexec.cc:289 -#: source/ublexec.cc:297 source/ublexec.cc:312 source/ublexec.cc:320 -#: source/ublexec.cc:486 source/ublexec.cc:271 source/ublexec.cc:279 -#: source/ublexec.cc:287 source/ublexec.cc:295 source/ublexec.cc:310 -#: source/ublexec.cc:318 source/ublexec.cc:484 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 +#: source/ublexec.h:51 source/ublexec.cc:273 source/ublexec.cc:281 +#: source/ublexec.cc:289 source/ublexec.cc:297 source/ublexec.cc:312 +#: source/ublexec.cc:320 source/ublexec.cc:486 source/ublexec.cc:271 +#: source/ublexec.cc:279 source/ublexec.cc:287 source/ublexec.cc:295 +#: source/ublexec.cc:310 source/ublexec.cc:318 source/ublexec.cc:484 +#: 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:177 source/ublexec.cc:176 source/ublexec.cc:159 -#: source/ublexec.cc:156 +#: source/ublexec.h:33 source/ublexec.cc:177 source/ublexec.cc:176 +#: source/ublexec.cc:159 source/ublexec.cc:156 msgid "About" msgstr "" -#: source/ublexec.cc:218 source/ublexec.cc:216 +#: source/ublexec.h:34 +msgid "About ubl-settings-datetime" +msgstr "" + +#: source/ublexec.h:45 source/ublexec.cc:218 source/ublexec.cc:216 msgid "Always redirect" msgstr "" -#: source/ublexec.cc:210 source/ublexec.cc:208 source/ublexec.cc:191 -#: source/ublexec.cc:186 +#: source/ublexec.h:72 source/ublexec.cc:210 source/ublexec.cc:208 +#: source/ublexec.cc:191 source/ublexec.cc:186 msgid "Application Overview" msgstr "" -#: source/ublexec.cc:199 source/ublexec.cc:696 source/ublexec.cc:765 -#: source/ublexec.cc:197 source/ublexec.cc:694 source/ublexec.cc:763 -#: source/ublexec.cc:180 source/ublexec.cc:631 source/ublexec.cc:700 +#: source/ublexec.h:65 source/ublexec.cc:199 source/ublexec.cc:696 +#: source/ublexec.cc:765 source/ublexec.cc:197 source/ublexec.cc:694 +#: source/ublexec.cc:763 source/ublexec.cc:180 source/ublexec.cc:631 +#: source/ublexec.cc:700 msgid "Attention" msgstr "" -#: source/ublexec.cc:217 source/ublexec.cc:215 +#: source/ublexec.h:44 source/ublexec.cc:217 source/ublexec.cc:215 msgid "Cancel" msgstr "" -#: source/ublexec.cc:196 source/ublexec.cc:194 source/ublexec.cc:177 -#: source/ublexec.cc:173 +#: source/ublexec.h:69 source/ublexec.cc:196 source/ublexec.cc:194 +#: source/ublexec.cc:177 source/ublexec.cc:173 msgid "Change startup priority" msgstr "" -#: source/ublexec.cc:212 source/ublexec.cc:210 source/main.cc:197 +#: source/ublexec.h:54 source/ublexec.cc:212 source/ublexec.cc:210 +#: source/main.cc:197 msgid "Close" msgstr "" -#: source/ublexec.cc:189 source/ublexec.cc:187 source/ublexec.cc:170 -#: source/ublexec.cc:166 +#: source/ublexec.h:77 source/ublexec.cc:189 source/ublexec.cc:187 +#: source/ublexec.cc:170 source/ublexec.cc:166 msgid "Command Line" msgstr "" -#: source/ublexec.cc:173 source/ublexec.cc:172 source/ublexec.cc:155 -#: source/ublexec.cc:152 +#: source/ublexec.h:27 source/ublexec.cc:173 source/ublexec.cc:172 +#: source/ublexec.cc:155 source/ublexec.cc:152 msgid "Copyright © UBSoft LLC, 2022 - " msgstr "" -#: source/ublexec.cc:208 source/ublexec.cc:206 source/ublexec.cc:189 -#: source/ublexec.cc:184 +#: source/ublexec.h:56 source/ublexec.cc:208 source/ublexec.cc:206 +#: source/ublexec.cc:189 source/ublexec.cc:184 msgid "Development" msgstr "" -#: source/ublexec.cc:205 source/ublexec.cc:203 source/ublexec.cc:186 -#: source/ublexec.cc:181 +#: source/ublexec.h:59 source/ublexec.cc:205 source/ublexec.cc:203 +#: source/ublexec.cc:186 source/ublexec.cc:181 msgid "Education" msgstr "" -#: source/ublexec.cc:211 source/ublexec.cc:209 source/ublexec.cc:192 -#: source/ublexec.cc:187 +#: source/ublexec.h:71 source/ublexec.cc:211 source/ublexec.cc:209 +#: source/ublexec.cc:192 source/ublexec.cc:187 msgid "File Overview" msgstr "" -#: source/ublexec.cc:200 source/ublexec.cc:198 source/ublexec.cc:181 -#: source/ublexec.cc:176 +#: source/ublexec.h:49 +msgid "" +"GTK settings datetime for UBLinux\n" +"\n" +"Usage: ubl-settings-datetime [OPTIONS...]\n" +"Options:\n" +" -h, --help\t Show this help\n" +" -V, --version\t Show package version\n" +" --lock-datetime Lock date and time changes\n" +" --lock-timezone Lock time zone changes\n" +" --lock-ntp-mode Lock NTP mode selection\n" +" --lock-ntp-edit Lock editing NTP servers\n" +" --lock-sync-hwclock Lock sync hwclock mode selection\n" +" --lock-save Lock saving local and global configuration\n" +" --lock-save-local Lock save global configuration\n" +" --lock-save-global Lock load global configuration\n" +" --lock-load-global Lock load global configuration\n" +msgstr "" + +#: source/ublexec.h:64 source/ublexec.cc:200 source/ublexec.cc:198 +#: source/ublexec.cc:181 source/ublexec.cc:176 msgid "Graphics" msgstr "" -#: source/ublexec.cc:176 source/ublexec.cc:175 source/ublexec.cc:158 -#: source/ublexec.cc:155 +#: source/ublexec.h:35 source/ublexec.cc:176 source/ublexec.cc:175 +#: source/ublexec.cc:158 source/ublexec.cc:155 msgid "Help" msgstr "" -#: source/ublexec.cc:202 source/ublexec.cc:200 source/ublexec.cc:183 -#: source/ublexec.cc:178 +#: source/ublexec.h:62 source/ublexec.cc:202 source/ublexec.cc:200 +#: source/ublexec.cc:183 source/ublexec.cc:178 msgid "Internet" msgstr "" -#: source/ublexec.cc:203 source/ublexec.cc:201 source/ublexec.cc:184 -#: source/ublexec.cc:179 +#: source/ublexec.h:37 +msgid "Load" +msgstr "" + +#: source/ublexec.h:41 +msgid "Load global configuration" +msgstr "" + +#: source/ublexec.h:42 +msgid "Load local configuration" +msgstr "" + +#: source/ublexec.h:61 source/ublexec.cc:203 source/ublexec.cc:201 +#: source/ublexec.cc:184 source/ublexec.cc:179 msgid "Multimedia" msgstr "" -#: source/ublexec.cc:206 source/ublexec.cc:204 source/ublexec.cc:187 -#: source/ublexec.cc:182 +#: source/ublexec.h:46 +msgid "Nothing to save!" +msgstr "" + +#: source/ublexec.h:58 source/ublexec.cc:206 source/ublexec.cc:204 +#: source/ublexec.cc:187 source/ublexec.cc:182 msgid "Office" msgstr "" -#: source/ublexec.cc:207 source/ublexec.cc:205 source/ublexec.cc:188 -#: source/ublexec.cc:183 +#: source/ublexec.h:57 source/ublexec.cc:207 source/ublexec.cc:205 +#: source/ublexec.cc:188 source/ublexec.cc:183 msgid "Other" msgstr "" -#: source/ublexec.cc:186 source/ublexec.cc:184 source/ublexec.cc:167 -#: source/ublexec.cc:163 +#: source/ublexec.h:76 source/ublexec.cc:186 source/ublexec.cc:184 +#: source/ublexec.cc:167 source/ublexec.cc:163 msgid "Please select File" msgstr "" -#: source/ublexec.cc:195 source/ublexec.cc:193 source/ublexec.cc:176 -#: source/ublexec.cc:172 +#: source/ublexec.h:66 source/ublexec.cc:195 source/ublexec.cc:193 +#: source/ublexec.cc:176 source/ublexec.cc:172 msgid "Priority" msgstr "" @@ -155,21 +196,22 @@ msgstr "" msgid "Priority:" msgstr "" -#: source/ublexec.cc:179 source/ublexec.cc:178 source/ublexec.cc:161 -#: source/ublexec.cc:158 +#: source/ublexec.h:31 source/ublexec.cc:179 source/ublexec.cc:178 +#: source/ublexec.cc:161 source/ublexec.cc:158 msgid "Project Home Page" msgstr "" -#: source/ublexec.cc:216 source/ublexec.cc:214 +#: source/ublexec.h:43 source/ublexec.cc:216 source/ublexec.cc:214 msgid "Read online" msgstr "" -#: source/ublexec.cc:185 source/ublexec.cc:183 source/ublexec.cc:162 +#: source/ublexec.h:80 source/ublexec.cc:185 source/ublexec.cc:183 +#: source/ublexec.cc:162 msgid "Run" msgstr "" -#: source/ublexec.cc:188 source/ublexec.cc:186 source/ublexec.cc:169 -#: source/ublexec.cc:165 +#: source/ublexec.h:73 source/ublexec.cc:188 source/ublexec.cc:186 +#: source/ublexec.cc:169 source/ublexec.cc:165 msgid "" "Run applications as another user\n" "with the specified priority" @@ -178,82 +220,98 @@ msgstr "" msgid "Run as another user" msgstr "" -#: source/ublexec.cc:193 source/ublexec.cc:191 source/ublexec.cc:174 -#: source/ublexec.cc:170 +#: source/ublexec.h:67 source/ublexec.cc:193 source/ublexec.cc:191 +#: source/ublexec.cc:174 source/ublexec.cc:170 msgid "Run as another user:" msgstr "" -#: source/ublexec.cc:178 source/ublexec.cc:183 source/ublexec.cc:184 -#: source/ublexec.cc:220 source/ublexec.cc:221 source/ublexec.cc:177 -#: source/ublexec.cc:181 source/ublexec.cc:182 source/ublexec.cc:218 -#: source/ublexec.cc:219 source/ublexec.cc:160 source/ublexec.cc:164 -#: source/ublexec.cc:165 source/ublexec.cc:166 +#: source/ublexec.h:28 source/ublexec.cc:178 source/ublexec.cc:183 +#: source/ublexec.cc:184 source/ublexec.cc:220 source/ublexec.cc:221 +#: source/ublexec.cc:177 source/ublexec.cc:181 source/ublexec.cc:182 +#: source/ublexec.cc:218 source/ublexec.cc:219 source/ublexec.cc:160 +#: source/ublexec.cc:164 source/ublexec.cc:165 source/ublexec.cc:166 msgid "Run as..." msgstr "" -#: source/ublexec.cc:191 source/ublexec.cc:189 source/ublexec.cc:172 -#: source/ublexec.cc:168 +#: source/ublexec.h:70 source/ublexec.cc:191 source/ublexec.cc:189 +#: source/ublexec.cc:172 source/ublexec.cc:168 msgid "Run in the terminal emulator" msgstr "" -#: source/ublexec.cc:198 source/ublexec.cc:196 source/ublexec.cc:179 -#: source/ublexec.cc:175 +#: source/ublexec.h:36 +msgid "Save" +msgstr "" + +#: source/ublexec.h:40 +msgid "Save global configuration" +msgstr "" + +#: source/ublexec.h:39 +msgid "Save local configuration" +msgstr "" + +#: source/ublexec.h:38 +msgid "Save to global and local configuration" +msgstr "" + +#: source/ublexec.h:68 source/ublexec.cc:198 source/ublexec.cc:196 +#: source/ublexec.cc:179 source/ublexec.cc:175 msgid "Select an executable file or program" msgstr "" -#: source/ublexec.cc:187 source/ublexec.cc:185 source/ublexec.cc:168 -#: source/ublexec.cc:164 +#: source/ublexec.h:75 source/ublexec.cc:187 source/ublexec.cc:185 +#: source/ublexec.cc:168 source/ublexec.cc:164 msgid "Selecting Programs" msgstr "" -#: source/ublexec.cc:204 source/ublexec.cc:202 source/ublexec.cc:185 -#: source/ublexec.cc:180 +#: source/ublexec.h:60 source/ublexec.cc:204 source/ublexec.cc:202 +#: source/ublexec.cc:185 source/ublexec.cc:180 msgid "Settings" msgstr "" -#: source/ublexec.cc:209 source/ublexec.cc:207 source/ublexec.cc:190 -#: source/ublexec.cc:185 +#: source/ublexec.h:55 source/ublexec.cc:209 source/ublexec.cc:207 +#: source/ublexec.cc:190 source/ublexec.cc:185 msgid "System" msgstr "" msgid "Team" msgstr "" -#: source/ublexec.cc:190 source/ublexec.cc:188 source/ublexec.cc:171 -#: source/ublexec.cc:167 +#: source/ublexec.h:79 source/ublexec.cc:190 source/ublexec.cc:188 +#: source/ublexec.cc:171 source/ublexec.cc:167 msgid "Team:" msgstr "" -#: source/ublexec.cc:201 source/ublexec.cc:199 source/ublexec.cc:182 -#: source/ublexec.cc:177 +#: source/ublexec.h:63 source/ublexec.cc:201 source/ublexec.cc:199 +#: source/ublexec.cc:182 source/ublexec.cc:177 msgid "Tools" msgstr "" -#: source/ublexec.cc:192 source/ublexec.cc:190 source/ublexec.cc:173 -#: source/ublexec.cc:169 +#: source/ublexec.h:78 source/ublexec.cc:192 source/ublexec.cc:190 +#: source/ublexec.cc:173 source/ublexec.cc:169 msgid "User" msgstr "" msgid "User Name" msgstr "" -#: source/ublexec.cc:194 source/ublexec.cc:192 source/ublexec.cc:175 -#: source/ublexec.cc:171 +#: source/ublexec.h:74 source/ublexec.cc:194 source/ublexec.cc:192 +#: source/ublexec.cc:175 source/ublexec.cc:171 msgid "User Name:" msgstr "" -#: source/ublexec.cc:213 source/ublexec.cc:211 +#: source/ublexec.h:47 source/ublexec.cc:213 source/ublexec.cc:211 msgid "Would you like to read documentation in the Web?" msgstr "" -#: source/ublexec.cc:214 source/ublexec.cc:212 +#: source/ublexec.h:48 source/ublexec.cc:214 source/ublexec.cc:212 msgid "" "You will be redirected to documentation site, where user help pages are " "translated and supported by community." msgstr "" -#: source/ublexec.cc:175 source/ublexec.cc:174 source/ublexec.cc:157 -#: source/ublexec.cc:154 +#: source/ublexec.h:30 source/ublexec.cc:175 source/ublexec.cc:174 +#: source/ublexec.cc:157 source/ublexec.cc:154 msgid "https://wiki.ublinux.com" msgstr "" @@ -275,11 +333,12 @@ msgstr "" msgid "ubl-settings-bootloader" msgstr "" -#: source/ublexec.cc:157 source/ublexec.cc:160 source/ublexec.cc:161 +#: source/ublexec.h:29 source/ublexec.cc:157 source/ublexec.cc:160 +#: source/ublexec.cc:161 msgid "ublexec" msgstr "" -#: source/main.cc:60 source/main.cc:970 +#: source/ublexec.h:50 source/main.cc:60 source/main.cc:970 msgid "ublexec version: " msgstr "" diff --git a/ublexec_ru.po b/ublexec_ru.po index 8dd6ab7..cd0b9b0 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-04-24 11:43+0600\n" +"Report-Msgid-Bugs-To: info@ublinux.com\n" +"POT-Creation-Date: 2023-04-25 15:52+0600\n" "PO-Revision-Date: 2023-01-01 00:00+0600\n" "Last-Translator: UBLinux Team \n" "Language-Team: Russian - UBLinux Team \n" @@ -17,135 +17,177 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: source/ublexec.cc:181 source/ublexec.cc:182 source/ublexec.cc:180 -#: source/ublexec.cc:163 +#: source/ublexec.h:32 source/ublexec.cc:181 source/ublexec.cc:182 +#: source/ublexec.cc:180 source/ublexec.cc:163 msgid " Run as..." msgstr "О программе ublexec" -#: source/ublexec.cc:274 source/ublexec.cc:282 source/ublexec.cc:313 -#: source/ublexec.cc:272 source/ublexec.cc:280 source/ublexec.cc:311 -#: source/ublexec.cc:242 source/ublexec.cc:250 source/ublexec.cc:281 -#: source/ublexec.cc:236 source/ublexec.cc:244 source/ublexec.cc:275 +#: source/ublexec.h:53 source/ublexec.cc:274 source/ublexec.cc:282 +#: source/ublexec.cc:313 source/ublexec.cc:272 source/ublexec.cc:280 +#: source/ublexec.cc:311 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:290 source/ublexec.cc:298 source/ublexec.cc:321 -#: source/ublexec.cc:487 source/ublexec.cc:288 source/ublexec.cc:296 -#: source/ublexec.cc:319 source/ublexec.cc:485 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 +#: source/ublexec.h:52 source/ublexec.cc:290 source/ublexec.cc:298 +#: source/ublexec.cc:321 source/ublexec.cc:487 source/ublexec.cc:288 +#: source/ublexec.cc:296 source/ublexec.cc:319 source/ublexec.cc:485 +#: 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:273 source/ublexec.cc:281 source/ublexec.cc:289 -#: source/ublexec.cc:297 source/ublexec.cc:312 source/ublexec.cc:320 -#: source/ublexec.cc:486 source/ublexec.cc:271 source/ublexec.cc:279 -#: source/ublexec.cc:287 source/ublexec.cc:295 source/ublexec.cc:310 -#: source/ublexec.cc:318 source/ublexec.cc:484 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 +#: source/ublexec.h:51 source/ublexec.cc:273 source/ublexec.cc:281 +#: source/ublexec.cc:289 source/ublexec.cc:297 source/ublexec.cc:312 +#: source/ublexec.cc:320 source/ublexec.cc:486 source/ublexec.cc:271 +#: source/ublexec.cc:279 source/ublexec.cc:287 source/ublexec.cc:295 +#: source/ublexec.cc:310 source/ublexec.cc:318 source/ublexec.cc:484 +#: 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:177 source/ublexec.cc:176 source/ublexec.cc:159 -#: source/ublexec.cc:156 +#: source/ublexec.h:33 source/ublexec.cc:177 source/ublexec.cc:176 +#: source/ublexec.cc:159 source/ublexec.cc:156 msgid "About" msgstr "О программе" -#: source/ublexec.cc:218 source/ublexec.cc:216 +#: source/ublexec.h:34 +msgid "About ubl-settings-datetime" +msgstr "" + +#: source/ublexec.h:45 source/ublexec.cc:218 source/ublexec.cc:216 msgid "Always redirect" msgstr "Всегда перенаправлять" -#: source/ublexec.cc:210 source/ublexec.cc:208 source/ublexec.cc:191 -#: source/ublexec.cc:186 +#: source/ublexec.h:72 source/ublexec.cc:210 source/ublexec.cc:208 +#: source/ublexec.cc:191 source/ublexec.cc:186 msgid "Application Overview" msgstr "Обзор приложений" -#: source/ublexec.cc:199 source/ublexec.cc:696 source/ublexec.cc:765 -#: source/ublexec.cc:197 source/ublexec.cc:694 source/ublexec.cc:763 -#: source/ublexec.cc:180 source/ublexec.cc:631 source/ublexec.cc:700 +#: source/ublexec.h:65 source/ublexec.cc:199 source/ublexec.cc:696 +#: source/ublexec.cc:765 source/ublexec.cc:197 source/ublexec.cc:694 +#: source/ublexec.cc:763 source/ublexec.cc:180 source/ublexec.cc:631 +#: source/ublexec.cc:700 msgid "Attention" msgstr "Внимание" -#: source/ublexec.cc:217 source/ublexec.cc:215 +#: source/ublexec.h:44 source/ublexec.cc:217 source/ublexec.cc:215 msgid "Cancel" msgstr "Отменить" -#: source/ublexec.cc:196 source/ublexec.cc:194 source/ublexec.cc:177 -#: source/ublexec.cc:173 +#: source/ublexec.h:69 source/ublexec.cc:196 source/ublexec.cc:194 +#: source/ublexec.cc:177 source/ublexec.cc:173 msgid "Change startup priority" msgstr "Изменить приоритет запуска" -#: source/ublexec.cc:212 source/ublexec.cc:210 source/main.cc:197 +#: source/ublexec.h:54 source/ublexec.cc:212 source/ublexec.cc:210 +#: source/main.cc:197 msgid "Close" msgstr "Закрыть" -#: source/ublexec.cc:189 source/ublexec.cc:187 source/ublexec.cc:170 -#: source/ublexec.cc:166 +#: source/ublexec.h:77 source/ublexec.cc:189 source/ublexec.cc:187 +#: source/ublexec.cc:170 source/ublexec.cc:166 msgid "Command Line" msgstr "Командная строка" -#: source/ublexec.cc:173 source/ublexec.cc:172 source/ublexec.cc:155 -#: source/ublexec.cc:152 +#: source/ublexec.h:27 source/ublexec.cc:173 source/ublexec.cc:172 +#: source/ublexec.cc:155 source/ublexec.cc:152 msgid "Copyright © UBSoft LLC, 2022 - " msgstr "Авторские права © ООО \"Юбисофт\", 2022 - " -#: source/ublexec.cc:208 source/ublexec.cc:206 source/ublexec.cc:189 -#: source/ublexec.cc:184 +#: source/ublexec.h:56 source/ublexec.cc:208 source/ublexec.cc:206 +#: source/ublexec.cc:189 source/ublexec.cc:184 msgid "Development" msgstr "Разработка" -#: source/ublexec.cc:205 source/ublexec.cc:203 source/ublexec.cc:186 -#: source/ublexec.cc:181 +#: source/ublexec.h:59 source/ublexec.cc:205 source/ublexec.cc:203 +#: source/ublexec.cc:186 source/ublexec.cc:181 msgid "Education" msgstr "Образование" -#: source/ublexec.cc:211 source/ublexec.cc:209 source/ublexec.cc:192 -#: source/ublexec.cc:187 +#: source/ublexec.h:71 source/ublexec.cc:211 source/ublexec.cc:209 +#: source/ublexec.cc:192 source/ublexec.cc:187 msgid "File Overview" msgstr "Обзор файлов" -#: source/ublexec.cc:200 source/ublexec.cc:198 source/ublexec.cc:181 -#: source/ublexec.cc:176 +#: source/ublexec.h:49 +msgid "" +"GTK settings datetime for UBLinux\n" +"\n" +"Usage: ubl-settings-datetime [OPTIONS...]\n" +"Options:\n" +" -h, --help\t Show this help\n" +" -V, --version\t Show package version\n" +" --lock-datetime Lock date and time changes\n" +" --lock-timezone Lock time zone changes\n" +" --lock-ntp-mode Lock NTP mode selection\n" +" --lock-ntp-edit Lock editing NTP servers\n" +" --lock-sync-hwclock Lock sync hwclock mode selection\n" +" --lock-save Lock saving local and global configuration\n" +" --lock-save-local Lock save global configuration\n" +" --lock-save-global Lock load global configuration\n" +" --lock-load-global Lock load global configuration\n" +msgstr "" + +#: source/ublexec.h:64 source/ublexec.cc:200 source/ublexec.cc:198 +#: source/ublexec.cc:181 source/ublexec.cc:176 msgid "Graphics" msgstr "Графика" -#: source/ublexec.cc:176 source/ublexec.cc:175 source/ublexec.cc:158 -#: source/ublexec.cc:155 +#: source/ublexec.h:35 source/ublexec.cc:176 source/ublexec.cc:175 +#: source/ublexec.cc:158 source/ublexec.cc:155 msgid "Help" msgstr "Справка" -#: source/ublexec.cc:202 source/ublexec.cc:200 source/ublexec.cc:183 -#: source/ublexec.cc:178 +#: source/ublexec.h:62 source/ublexec.cc:202 source/ublexec.cc:200 +#: source/ublexec.cc:183 source/ublexec.cc:178 msgid "Internet" msgstr "Интернет" -#: source/ublexec.cc:203 source/ublexec.cc:201 source/ublexec.cc:184 -#: source/ublexec.cc:179 +#: source/ublexec.h:37 +msgid "Load" +msgstr "" + +#: source/ublexec.h:41 +msgid "Load global configuration" +msgstr "" + +#: source/ublexec.h:42 +msgid "Load local configuration" +msgstr "" + +#: source/ublexec.h:61 source/ublexec.cc:203 source/ublexec.cc:201 +#: source/ublexec.cc:184 source/ublexec.cc:179 msgid "Multimedia" msgstr "Мультимедиа" -#: source/ublexec.cc:206 source/ublexec.cc:204 source/ublexec.cc:187 -#: source/ublexec.cc:182 +#: source/ublexec.h:46 +msgid "Nothing to save!" +msgstr "" + +#: source/ublexec.h:58 source/ublexec.cc:206 source/ublexec.cc:204 +#: source/ublexec.cc:187 source/ublexec.cc:182 msgid "Office" msgstr "Офис" -#: source/ublexec.cc:207 source/ublexec.cc:205 source/ublexec.cc:188 -#: source/ublexec.cc:183 +#: source/ublexec.h:57 source/ublexec.cc:207 source/ublexec.cc:205 +#: source/ublexec.cc:188 source/ublexec.cc:183 msgid "Other" msgstr "Прочие" -#: source/ublexec.cc:186 source/ublexec.cc:184 source/ublexec.cc:167 -#: source/ublexec.cc:163 +#: source/ublexec.h:76 source/ublexec.cc:186 source/ublexec.cc:184 +#: source/ublexec.cc:167 source/ublexec.cc:163 msgid "Please select File" msgstr "Пожалуйста выберите Файл" -#: source/ublexec.cc:195 source/ublexec.cc:193 source/ublexec.cc:176 -#: source/ublexec.cc:172 +#: source/ublexec.h:66 source/ublexec.cc:195 source/ublexec.cc:193 +#: source/ublexec.cc:176 source/ublexec.cc:172 msgid "Priority" msgstr "Приоритет" @@ -154,21 +196,22 @@ msgstr "Приоритет" msgid "Priority:" msgstr "Приоритет:" -#: source/ublexec.cc:179 source/ublexec.cc:178 source/ublexec.cc:161 -#: source/ublexec.cc:158 +#: source/ublexec.h:31 source/ublexec.cc:179 source/ublexec.cc:178 +#: source/ublexec.cc:161 source/ublexec.cc:158 msgid "Project Home Page" msgstr "Домашняя страница проекта" -#: source/ublexec.cc:216 source/ublexec.cc:214 +#: source/ublexec.h:43 source/ublexec.cc:216 source/ublexec.cc:214 msgid "Read online" msgstr "Прочитать онлайн" -#: source/ublexec.cc:185 source/ublexec.cc:183 source/ublexec.cc:162 +#: source/ublexec.h:80 source/ublexec.cc:185 source/ublexec.cc:183 +#: source/ublexec.cc:162 msgid "Run" msgstr "Запустить" -#: source/ublexec.cc:188 source/ublexec.cc:186 source/ublexec.cc:169 -#: source/ublexec.cc:165 +#: source/ublexec.h:73 source/ublexec.cc:188 source/ublexec.cc:186 +#: source/ublexec.cc:169 source/ublexec.cc:165 msgid "" "Run applications as another user\n" "with the specified priority" @@ -180,41 +223,57 @@ msgstr "" msgid "Run as another user" msgstr "Выполнить от имени другого пользователя:" -#: source/ublexec.cc:193 source/ublexec.cc:191 source/ublexec.cc:174 -#: source/ublexec.cc:170 +#: source/ublexec.h:67 source/ublexec.cc:193 source/ublexec.cc:191 +#: source/ublexec.cc:174 source/ublexec.cc:170 msgid "Run as another user:" msgstr "Выполнить от имени другого пользователя:" -#: source/ublexec.cc:178 source/ublexec.cc:183 source/ublexec.cc:184 -#: source/ublexec.cc:220 source/ublexec.cc:221 source/ublexec.cc:177 -#: source/ublexec.cc:181 source/ublexec.cc:182 source/ublexec.cc:218 -#: source/ublexec.cc:219 source/ublexec.cc:160 source/ublexec.cc:164 -#: source/ublexec.cc:165 source/ublexec.cc:166 +#: source/ublexec.h:28 source/ublexec.cc:178 source/ublexec.cc:183 +#: source/ublexec.cc:184 source/ublexec.cc:220 source/ublexec.cc:221 +#: source/ublexec.cc:177 source/ublexec.cc:181 source/ublexec.cc:182 +#: source/ublexec.cc:218 source/ublexec.cc:219 source/ublexec.cc:160 +#: source/ublexec.cc:164 source/ublexec.cc:165 source/ublexec.cc:166 msgid "Run as..." msgstr "Выполнить как..." -#: source/ublexec.cc:191 source/ublexec.cc:189 source/ublexec.cc:172 -#: source/ublexec.cc:168 +#: source/ublexec.h:70 source/ublexec.cc:191 source/ublexec.cc:189 +#: source/ublexec.cc:172 source/ublexec.cc:168 msgid "Run in the terminal emulator" msgstr "Выполнить в эмуляторе терминала" -#: source/ublexec.cc:198 source/ublexec.cc:196 source/ublexec.cc:179 -#: source/ublexec.cc:175 +#: source/ublexec.h:36 +msgid "Save" +msgstr "" + +#: source/ublexec.h:40 +msgid "Save global configuration" +msgstr "" + +#: source/ublexec.h:39 +msgid "Save local configuration" +msgstr "" + +#: source/ublexec.h:38 +msgid "Save to global and local configuration" +msgstr "" + +#: source/ublexec.h:68 source/ublexec.cc:198 source/ublexec.cc:196 +#: source/ublexec.cc:179 source/ublexec.cc:175 msgid "Select an executable file or program" msgstr "Выберите исполняемый файл или программу" -#: source/ublexec.cc:187 source/ublexec.cc:185 source/ublexec.cc:168 -#: source/ublexec.cc:164 +#: source/ublexec.h:75 source/ublexec.cc:187 source/ublexec.cc:185 +#: source/ublexec.cc:168 source/ublexec.cc:164 msgid "Selecting Programs" msgstr "Выбор программ" -#: source/ublexec.cc:204 source/ublexec.cc:202 source/ublexec.cc:185 -#: source/ublexec.cc:180 +#: source/ublexec.h:60 source/ublexec.cc:204 source/ublexec.cc:202 +#: source/ublexec.cc:185 source/ublexec.cc:180 msgid "Settings" msgstr "Настройки" -#: source/ublexec.cc:209 source/ublexec.cc:207 source/ublexec.cc:190 -#: source/ublexec.cc:185 +#: source/ublexec.h:55 source/ublexec.cc:209 source/ublexec.cc:207 +#: source/ublexec.cc:190 source/ublexec.cc:185 msgid "System" msgstr "Система" @@ -222,18 +281,18 @@ msgstr "Система" msgid "Team" msgstr "Команда:" -#: source/ublexec.cc:190 source/ublexec.cc:188 source/ublexec.cc:171 -#: source/ublexec.cc:167 +#: source/ublexec.h:79 source/ublexec.cc:190 source/ublexec.cc:188 +#: source/ublexec.cc:171 source/ublexec.cc:167 msgid "Team:" msgstr "Команда:" -#: source/ublexec.cc:201 source/ublexec.cc:199 source/ublexec.cc:182 -#: source/ublexec.cc:177 +#: source/ublexec.h:63 source/ublexec.cc:201 source/ublexec.cc:199 +#: source/ublexec.cc:182 source/ublexec.cc:177 msgid "Tools" msgstr "Инструменты" -#: source/ublexec.cc:192 source/ublexec.cc:190 source/ublexec.cc:173 -#: source/ublexec.cc:169 +#: source/ublexec.h:78 source/ublexec.cc:192 source/ublexec.cc:190 +#: source/ublexec.cc:173 source/ublexec.cc:169 msgid "User" msgstr "Пользователь" @@ -241,16 +300,16 @@ msgstr "Пользователь" msgid "User Name" msgstr "Имя пользователя:" -#: source/ublexec.cc:194 source/ublexec.cc:192 source/ublexec.cc:175 -#: source/ublexec.cc:171 +#: source/ublexec.h:74 source/ublexec.cc:194 source/ublexec.cc:192 +#: source/ublexec.cc:175 source/ublexec.cc:171 msgid "User Name:" msgstr "Имя пользователя:" -#: source/ublexec.cc:213 source/ublexec.cc:211 +#: source/ublexec.h:47 source/ublexec.cc:213 source/ublexec.cc:211 msgid "Would you like to read documentation in the Web?" msgstr "Вы хотите прочитать справку в Сети?" -#: source/ublexec.cc:214 source/ublexec.cc:212 +#: source/ublexec.h:48 source/ublexec.cc:214 source/ublexec.cc:212 msgid "" "You will be redirected to documentation site, where user help pages are " "translated and supported by community." @@ -258,8 +317,8 @@ msgstr "" "Вы будете перенаправлены на сайт с документацией где страницы помощи " "переводятся и поддерживаются сообществом." -#: source/ublexec.cc:175 source/ublexec.cc:174 source/ublexec.cc:157 -#: source/ublexec.cc:154 +#: source/ublexec.h:30 source/ublexec.cc:175 source/ublexec.cc:174 +#: source/ublexec.cc:157 source/ublexec.cc:154 msgid "https://wiki.ublinux.com" msgstr "https://wiki.ublinux.ru" @@ -282,12 +341,13 @@ msgstr "sudo" msgid "ubl-settings-bootloader" msgstr "" -#: source/ublexec.cc:157 source/ublexec.cc:160 source/ublexec.cc:161 +#: source/ublexec.h:29 source/ublexec.cc:157 source/ublexec.cc:160 +#: source/ublexec.cc:161 #, fuzzy msgid "ublexec" msgstr "pkexec" -#: source/main.cc:60 source/main.cc:970 +#: source/ublexec.h:50 source/main.cc:60 source/main.cc:970 msgid "ublexec version: " msgstr "ublexec версия: " @@ -298,23 +358,23 @@ msgstr "ОК" msgid "Сancel" msgstr "Отмена" -msgid "" -"GTK \"Run applications as another user with the specified priority\" for " -"UBLinux\n" -"\n" -"Usage: ublexec [OPTIONS...]\n" -"Options:\n" -" -h, --help\t Show this help\n" -" -V, --version\t Show package version\n" -" -x APP_NAME Running the program\n" -" -e FILE_NAME Running the file\n" -msgstr "" -"GTK-утилита \"Запускать приложения от имени другого пользователя с " -"указанным приоритетом\" для UBLinux\n" -"\n" -"Использование: ublexec [Параметры приложения...]\n" -"Параметры приложения:\n" -" -h, --help\t Показать параметры справки\n" -" -V, --version\t Показать версию пакета\n" -" -x APP_NAME Запуск программы\n" -" -e FILE_NAME Запуск файла\n" \ No newline at end of file +#~ msgid "" +#~ "GTK \"Run applications as another user with the specified priority\" for " +#~ "UBLinux\n" +#~ "\n" +#~ "Usage: ublexec [OPTIONS...]\n" +#~ "Options:\n" +#~ " -h, --help\t Show this help\n" +#~ " -V, --version\t Show package version\n" +#~ " -x APP_NAME Running the program\n" +#~ " -e FILE_NAME Running the file\n" +#~ msgstr "" +#~ "GTK-утилита \"Запускать приложения от имени другого пользователя с " +#~ "указанным приоритетом\" для UBLinux\n" +#~ "\n" +#~ "Использование: ublexec [Параметры приложения...]\n" +#~ "Параметры приложения:\n" +#~ " -h, --help\t Показать параметры справки\n" +#~ " -V, --version\t Показать версию пакета\n" +#~ " -x APP_NAME Запуск программы\n" +#~ " -e FILE_NAME Запуск файла\n"