From af627ceebe77e2cac4c2ef6760cb28497e211f02 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Tue, 25 Apr 2023 15:37:17 +0600 Subject: [PATCH] fix --- source/CMakeLists.txt | 12 +- source/ubl-settings-bootloader.cc | 31 +---- source/ubl-settings-bootloader.h | 1 + source/ubl-settings-bootloader.h.in | 1 + ubl-settings-bootloader.glade | 1 - ubl-settings-bootloader.pot | 205 +++++++++++++++------------- ubl-settings-bootloader_ru.po | 203 ++++++++++++++------------- 7 files changed, 232 insertions(+), 222 deletions(-) create mode 100644 source/ubl-settings-bootloader.h.in diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 5800f09..39fe799 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -8,14 +8,19 @@ include_directories(${GTK_INCLUDE_DIRS}) link_directories(${GTK_LIBRARY_DIRS}) add_definitions(${GTK_CFLAGS_OTHER}) -option(WEBKIT_FOUND "" ON) +find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0) -if(WEBKIT_FOUND) +option(WEBKIT_FOUND "No" OFF) + +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(ubl-settings-bootloader.h.in ubl-settings-bootloader-cm.h) @@ -26,6 +31,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissin -fstack-clash-protection -fcf-protection") set(SOURCE_FILES + ubl-settings-bootloader-cm.h ubl-settings-bootloader.h ubl-settings-bootloader.cc save.h @@ -50,4 +56,4 @@ target_include_directories(ubl-settings-bootloader PUBLIC "${PROJECT_BINARY_DIR}" ${WEBKIT_INCLUDE_DIRS} ) -install(TARGETS ubl-settings-bootloader DESTINATION bin) +install(TARGETS ubl-settings-bootloader DESTINATION bin) \ No newline at end of file diff --git a/source/ubl-settings-bootloader.cc b/source/ubl-settings-bootloader.cc index e7207ba..29852c6 100755 --- a/source/ubl-settings-bootloader.cc +++ b/source/ubl-settings-bootloader.cc @@ -83,13 +83,9 @@ void MainWindow::settings(){ btnBoxAboutDialog->set_visible(false); ubl_make_plugs(boxSave,boxButton, socket_ext_id_I, socket_trd_id_I); #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 this->flag_block_gui(); if (this->check_root() == 0) { @@ -442,11 +438,7 @@ void MainWindow::get_builder() { builder->get_widget("entrySecurityLogin", entrySecurityLogin); builder->get_widget("cmbDefaultDonw", cmbDefaultDonw); #ifdef WEBKIT_FOUND - void *handle=NULL; - handle = dlopen("libwebkit2gtk-4.0.so", RTLD_LAZY); - if (handle) { builder->get_widget("wndWeb", wndWeb); - } #endif builder->get_widget("lblHeadeWndWeb", lblHeadeWndWeb); @@ -949,15 +941,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 @@ -1036,11 +1021,7 @@ void MainWindow::info_warning_error(int mess) { } MainWindow::~MainWindow() { #ifdef WEBKIT_FOUND - void *handle=NULL; - handle = dlopen("libwebkit2gtk-4.0.so", RTLD_LAZY); - if (handle) { - free(one); - } + free(one); #endif } diff --git a/source/ubl-settings-bootloader.h b/source/ubl-settings-bootloader.h index 730095f..83756fb 100644 --- a/source/ubl-settings-bootloader.h +++ b/source/ubl-settings-bootloader.h @@ -17,6 +17,7 @@ #include "save.h" #include "load.h" #include +#include "ubl-settings-bootloader-cm.h" #ifdef WEBKIT_FOUND #include #endif diff --git a/source/ubl-settings-bootloader.h.in b/source/ubl-settings-bootloader.h.in new file mode 100644 index 0000000..17ba454 --- /dev/null +++ b/source/ubl-settings-bootloader.h.in @@ -0,0 +1 @@ +#cmakedefine WEBKIT_FOUND \ No newline at end of file diff --git a/ubl-settings-bootloader.glade b/ubl-settings-bootloader.glade index c1e8f69..0b6ec9d 100644 --- a/ubl-settings-bootloader.glade +++ b/ubl-settings-bootloader.glade @@ -221,7 +221,6 @@ specified priority 550 False com.ublinux.ubl-settings-bootloader - center True diff --git a/ubl-settings-bootloader.pot b/ubl-settings-bootloader.pot index 0b829e3..565dbd6 100644 --- a/ubl-settings-bootloader.pot +++ b/ubl-settings-bootloader.pot @@ -1,7 +1,3 @@ -Toni ?????, [24.04.2023 11:42] -msgmerge --update ubl-settings-datetime_ru.po ubl-settings-datetime.pot - -Toni ?????, [25.04.2023 14:57] # Language translations for ubl-settings-bootloader package. # Copyright (C) 2022, UBTech LLC # This file is distributed under the same license as the ubl-settings-bootloader package. @@ -21,65 +17,65 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: source/ubl-settings-bootloader.h:52 source/ubl-settings-bootloader.cc:431 -#: source/ubl-settings-bootloader.cc:301 +#: source/ubl-settings-bootloader.h:53 source/ubl-settings-bootloader.h:52 +#: source/ubl-settings-bootloader.cc:431 source/ubl-settings-bootloader.cc:301 msgid "About" msgstr "" -#: source/ubl-settings-bootloader.h:43 +#: source/ubl-settings-bootloader.h:44 source/ubl-settings-bootloader.h:43 msgid "About ubl-settings-bootloader" msgstr "" -#: source/ubl-settings-bootloader.h:91 source/ubl-settings-bootloader.cc:337 -#: source/ubl-settings-bootloader.cc:199 +#: source/ubl-settings-bootloader.h:92 source/ubl-settings-bootloader.h:91 +#: source/ubl-settings-bootloader.cc:337 source/ubl-settings-bootloader.cc:199 msgid "Active" msgstr "" -#: source/ubl-settings-bootloader.h:62 +#: source/ubl-settings-bootloader.h:63 source/ubl-settings-bootloader.h:62 msgid "Always redirect" msgstr "" -#: source/ubl-settings-bootloader.h:95 +#: source/ubl-settings-bootloader.h:96 source/ubl-settings-bootloader.h:95 msgid "Argument not recognized\n" msgstr "" -#: source/ubl-settings-bootloader.h:65 +#: source/ubl-settings-bootloader.h:66 source/ubl-settings-bootloader.h:65 msgid "Boot menu user name:" msgstr "" -#: source/ubl-settings-bootloader.h:66 +#: source/ubl-settings-bootloader.h:67 source/ubl-settings-bootloader.h:66 msgid "Boot menu user password:" msgstr "" -#: source/ubl-settings-bootloader.h:63 +#: source/ubl-settings-bootloader.h:64 source/ubl-settings-bootloader.h:63 msgid "Boot screen display mode:" msgstr "" -#: source/ubl-settings-bootloader.h:50 +#: source/ubl-settings-bootloader.h:51 source/ubl-settings-bootloader.h:50 msgid "Boot selection menu timer" msgstr "" -#: source/ubl-settings-bootloader.h:61 +#: source/ubl-settings-bootloader.h:62 source/ubl-settings-bootloader.h:61 msgid "Cancel" msgstr "" -#: source/ubl-settings-bootloader.h:44 source/ubl-settings-bootloader.cc:421 -#: source/ubl-settings-bootloader.cc:422 source/ubl-settings-bootloader.cc:423 -#: source/ubl-settings-bootloader.cc:289 source/ubl-settings-bootloader.cc:290 -#: source/ubl-settings-bootloader.cc:291 +#: source/ubl-settings-bootloader.h:45 source/ubl-settings-bootloader.h:44 +#: source/ubl-settings-bootloader.cc:421 source/ubl-settings-bootloader.cc:422 +#: source/ubl-settings-bootloader.cc:423 source/ubl-settings-bootloader.cc:289 +#: source/ubl-settings-bootloader.cc:290 source/ubl-settings-bootloader.cc:291 msgid "Command line parameters:" msgstr "" -#: source/ubl-settings-bootloader.h:41 source/ubl-settings-bootloader.cc:417 -#: source/ubl-settings-bootloader.cc:285 +#: source/ubl-settings-bootloader.h:42 source/ubl-settings-bootloader.h:41 +#: source/ubl-settings-bootloader.cc:417 source/ubl-settings-bootloader.cc:285 msgid "Configuring system boot parameters" msgstr "" msgid "Configuring the boot loader settings" msgstr "" -#: source/ubl-settings-bootloader.h:37 source/ubl-settings-bootloader.cc:411 -#: source/ubl-settings-bootloader.cc:279 +#: source/ubl-settings-bootloader.h:38 source/ubl-settings-bootloader.h:37 +#: source/ubl-settings-bootloader.cc:411 source/ubl-settings-bootloader.cc:279 msgid "Copyright © UBSoft LLC, 2022 - " msgstr "" @@ -87,8 +83,8 @@ msgstr "" msgid "Default download" msgstr "" -#: source/ubl-settings-bootloader.h:93 source/ubl-settings-bootloader.cc:339 -#: source/ubl-settings-bootloader.cc:201 +#: source/ubl-settings-bootloader.h:94 source/ubl-settings-bootloader.h:93 +#: source/ubl-settings-bootloader.cc:339 source/ubl-settings-bootloader.cc:201 msgid "Description" msgstr "" @@ -110,8 +106,8 @@ msgstr "" msgid "Disable local APIC" msgstr "" -#: source/ubl-settings-bootloader.h:47 source/ubl-settings-bootloader.cc:426 -#: source/ubl-settings-bootloader.cc:294 +#: source/ubl-settings-bootloader.h:48 source/ubl-settings-bootloader.h:47 +#: source/ubl-settings-bootloader.cc:426 source/ubl-settings-bootloader.cc:294 msgid "Download menu" msgstr "" @@ -121,16 +117,18 @@ msgstr "" msgid "Eliminates flickering laptop display on Ultra Voltage processors" msgstr "" -#: source/ubl-settings-bootloader.h:77 source/ubl-settings-bootloader.cc:496 +#: source/ubl-settings-bootloader.h:78 source/ubl-settings-bootloader.h:77 +#: source/ubl-settings-bootloader.cc:496 msgid "Enter login" msgstr "" -#: source/ubl-settings-bootloader.h:76 source/ubl-settings-bootloader.cc:476 +#: source/ubl-settings-bootloader.h:77 source/ubl-settings-bootloader.h:76 +#: source/ubl-settings-bootloader.cc:476 msgid "Enter your password" msgstr "" -#: source/ubl-settings-bootloader.h:83 source/ubl-settings-bootloader.cc:897 -#: source/ubl-settings-bootloader.cc:443 +#: source/ubl-settings-bootloader.h:84 source/ubl-settings-bootloader.h:83 +#: source/ubl-settings-bootloader.cc:897 source/ubl-settings-bootloader.cc:443 msgid "Error saved local and global configuration" msgstr "" @@ -146,7 +144,7 @@ msgid "" " -V, --version\t Show package version\n" msgstr "" -#: source/ubl-settings-bootloader.h:94 +#: source/ubl-settings-bootloader.h:95 source/ubl-settings-bootloader.h:94 msgid "" "GTK settings bootloader for UBLinux\n" "\n" @@ -161,28 +159,28 @@ msgid "" " --lock-load-global Lock load global configuration\n" msgstr "" -#: source/ubl-settings-bootloader.h:85 source/ubl-settings-bootloader.cc:911 -#: source/ubl-settings-bootloader.cc:455 +#: source/ubl-settings-bootloader.h:86 source/ubl-settings-bootloader.h:85 +#: source/ubl-settings-bootloader.cc:911 source/ubl-settings-bootloader.cc:455 msgid "Global configuration downloaded successfully" msgstr "" -#: source/ubl-settings-bootloader.h:80 source/ubl-settings-bootloader.cc:885 -#: source/ubl-settings-bootloader.cc:431 +#: source/ubl-settings-bootloader.h:81 source/ubl-settings-bootloader.h:80 +#: source/ubl-settings-bootloader.cc:885 source/ubl-settings-bootloader.cc:431 msgid "Global configuration read error" msgstr "" -#: source/ubl-settings-bootloader.h:87 source/ubl-settings-bootloader.cc:917 -#: source/ubl-settings-bootloader.cc:461 +#: source/ubl-settings-bootloader.h:88 source/ubl-settings-bootloader.h:87 +#: source/ubl-settings-bootloader.cc:917 source/ubl-settings-bootloader.cc:461 msgid "Global configuration successfully written" msgstr "" -#: source/ubl-settings-bootloader.h:82 source/ubl-settings-bootloader.cc:893 -#: source/ubl-settings-bootloader.cc:439 +#: source/ubl-settings-bootloader.h:83 source/ubl-settings-bootloader.h:82 +#: source/ubl-settings-bootloader.cc:893 source/ubl-settings-bootloader.cc:439 msgid "Global configuration write error" msgstr "" -#: source/ubl-settings-bootloader.h:51 source/ubl-settings-bootloader.cc:430 -#: source/ubl-settings-bootloader.cc:300 +#: source/ubl-settings-bootloader.h:52 source/ubl-settings-bootloader.h:51 +#: source/ubl-settings-bootloader.cc:430 source/ubl-settings-bootloader.cc:300 msgid "Help" msgstr "" @@ -190,33 +188,36 @@ msgstr "" msgid "Input terminal" msgstr "" -#: source/ubl-settings-bootloader.h:74 source/ubl-settings-bootloader.cc:451 +#: source/ubl-settings-bootloader.h:75 source/ubl-settings-bootloader.h:74 +#: source/ubl-settings-bootloader.cc:451 msgid "Lack of loading animation with the output of the abbreviated log" msgstr "" msgid "Last Successful Download" msgstr "" -#: source/ubl-settings-bootloader.h:67 source/ubl-settings-bootloader.cc:452 +#: source/ubl-settings-bootloader.h:68 source/ubl-settings-bootloader.h:67 +#: source/ubl-settings-bootloader.cc:452 msgid "Last successful upload" msgstr "" -#: source/ubl-settings-bootloader.h:54 source/ubl-settings-bootloader.cc:438 -#: source/ubl-settings-bootloader.cc:308 +#: source/ubl-settings-bootloader.h:55 source/ubl-settings-bootloader.h:54 +#: source/ubl-settings-bootloader.cc:438 source/ubl-settings-bootloader.cc:308 msgid "Load" msgstr "" -#: source/ubl-settings-bootloader.h:45 source/ubl-settings-bootloader.cc:424 +#: source/ubl-settings-bootloader.h:46 source/ubl-settings-bootloader.h:45 +#: source/ubl-settings-bootloader.cc:424 msgid "Load default:" msgstr "" -#: source/ubl-settings-bootloader.h:58 source/ubl-settings-bootloader.cc:435 -#: source/ubl-settings-bootloader.cc:305 +#: source/ubl-settings-bootloader.h:59 source/ubl-settings-bootloader.h:58 +#: source/ubl-settings-bootloader.cc:435 source/ubl-settings-bootloader.cc:305 msgid "Load global configuration" msgstr "" -#: source/ubl-settings-bootloader.h:59 source/ubl-settings-bootloader.cc:436 -#: source/ubl-settings-bootloader.cc:306 +#: source/ubl-settings-bootloader.h:60 source/ubl-settings-bootloader.h:59 +#: source/ubl-settings-bootloader.cc:436 source/ubl-settings-bootloader.cc:306 msgid "Load local configuration" msgstr "" @@ -236,31 +237,33 @@ msgstr "" msgid "Load screen display mode:" msgstr "" -#: source/ubl-settings-bootloader.h:72 source/ubl-settings-bootloader.cc:448 +#: source/ubl-settings-bootloader.h:73 source/ubl-settings-bootloader.h:72 +#: source/ubl-settings-bootloader.cc:448 msgid "Loading animation with the magazine" msgstr "" -#: source/ubl-settings-bootloader.h:73 source/ubl-settings-bootloader.cc:449 +#: source/ubl-settings-bootloader.h:74 source/ubl-settings-bootloader.h:73 +#: source/ubl-settings-bootloader.cc:449 msgid "Loading animation without a magazine" msgstr "" -#: source/ubl-settings-bootloader.h:84 source/ubl-settings-bootloader.cc:908 -#: source/ubl-settings-bootloader.cc:452 +#: source/ubl-settings-bootloader.h:85 source/ubl-settings-bootloader.h:84 +#: source/ubl-settings-bootloader.cc:908 source/ubl-settings-bootloader.cc:452 msgid "Local configuration downloaded successfully" msgstr "" -#: source/ubl-settings-bootloader.h:79 source/ubl-settings-bootloader.cc:881 -#: source/ubl-settings-bootloader.cc:427 +#: source/ubl-settings-bootloader.h:80 source/ubl-settings-bootloader.h:79 +#: source/ubl-settings-bootloader.cc:881 source/ubl-settings-bootloader.cc:427 msgid "Local configuration reading error" msgstr "" -#: source/ubl-settings-bootloader.h:86 source/ubl-settings-bootloader.cc:914 -#: source/ubl-settings-bootloader.cc:458 +#: source/ubl-settings-bootloader.h:87 source/ubl-settings-bootloader.h:86 +#: source/ubl-settings-bootloader.cc:914 source/ubl-settings-bootloader.cc:458 msgid "Local configuration successfully written" msgstr "" -#: source/ubl-settings-bootloader.h:81 source/ubl-settings-bootloader.cc:889 -#: source/ubl-settings-bootloader.cc:435 +#: source/ubl-settings-bootloader.h:82 source/ubl-settings-bootloader.h:81 +#: source/ubl-settings-bootloader.cc:889 source/ubl-settings-bootloader.cc:435 msgid "Local configuration write error" msgstr "" @@ -271,7 +274,7 @@ msgstr "" msgid "Maximum performance, power management" msgstr "" -#: source/ubl-settings-bootloader.h:64 +#: source/ubl-settings-bootloader.h:65 source/ubl-settings-bootloader.h:64 msgid "No loading animation, full log" msgstr "" @@ -279,17 +282,17 @@ msgstr "" msgid "Not available" msgstr "" -#: source/ubl-settings-bootloader.h:89 source/ubl-settings-bootloader.cc:923 -#: source/ubl-settings-bootloader.cc:341 source/ubl-settings-bootloader.cc:354 -#: source/ubl-settings-bootloader.cc:367 +#: source/ubl-settings-bootloader.h:90 source/ubl-settings-bootloader.h:89 +#: source/ubl-settings-bootloader.cc:923 source/ubl-settings-bootloader.cc:341 +#: source/ubl-settings-bootloader.cc:354 source/ubl-settings-bootloader.cc:367 msgid "Nothing to save!" msgstr "" msgid "Open Firmware Console" msgstr "" -#: source/ubl-settings-bootloader.h:92 source/ubl-settings-bootloader.cc:338 -#: source/ubl-settings-bootloader.cc:200 +#: source/ubl-settings-bootloader.h:93 source/ubl-settings-bootloader.h:92 +#: source/ubl-settings-bootloader.cc:338 source/ubl-settings-bootloader.cc:200 msgid "Option" msgstr "" @@ -312,33 +315,33 @@ msgstr "" msgid "Prevents the processor from going into a deep sleep state" msgstr "" -#: source/ubl-settings-bootloader.h:40 source/ubl-settings-bootloader.cc:416 -#: source/ubl-settings-bootloader.cc:420 source/ubl-settings-bootloader.cc:284 -#: source/ubl-settings-bootloader.cc:288 +#: source/ubl-settings-bootloader.h:41 source/ubl-settings-bootloader.h:40 +#: source/ubl-settings-bootloader.cc:416 source/ubl-settings-bootloader.cc:420 +#: source/ubl-settings-bootloader.cc:284 source/ubl-settings-bootloader.cc:288 msgid "Project Home Page" msgstr "" -#: source/ubl-settings-bootloader.h:60 +#: source/ubl-settings-bootloader.h:61 source/ubl-settings-bootloader.h:60 msgid "Read online" msgstr "" -#: source/ubl-settings-bootloader.h:53 source/ubl-settings-bootloader.cc:437 -#: source/ubl-settings-bootloader.cc:307 +#: source/ubl-settings-bootloader.h:54 source/ubl-settings-bootloader.h:53 +#: source/ubl-settings-bootloader.cc:437 source/ubl-settings-bootloader.cc:307 msgid "Save" msgstr "" -#: source/ubl-settings-bootloader.h:57 source/ubl-settings-bootloader.cc:434 -#: source/ubl-settings-bootloader.cc:304 +#: source/ubl-settings-bootloader.h:58 source/ubl-settings-bootloader.h:57 +#: source/ubl-settings-bootloader.cc:434 source/ubl-settings-bootloader.cc:304 msgid "Save global configuration" msgstr "" -#: source/ubl-settings-bootloader.h:56 source/ubl-settings-bootloader.cc:433 -#: source/ubl-settings-bootloader.cc:303 +#: source/ubl-settings-bootloader.h:57 source/ubl-settings-bootloader.h:56 +#: source/ubl-settings-bootloader.cc:433 source/ubl-settings-bootloader.cc:303 msgid "Save local configuration" msgstr "" -#: source/ubl-settings-bootloader.h:55 source/ubl-settings-bootloader.cc:432 -#: source/ubl-settings-bootloader.cc:302 +#: source/ubl-settings-bootloader.h:56 source/ubl-settings-bootloader.h:55 +#: source/ubl-settings-bootloader.cc:432 source/ubl-settings-bootloader.cc:302 msgid "Save to global and local configuration" msgstr "" @@ -359,20 +362,23 @@ msgstr "" msgid "Single User Mode" msgstr "" -#: source/ubl-settings-bootloader.h:88 source/ubl-settings-bootloader.cc:920 -#: source/ubl-settings-bootloader.cc:464 +#: source/ubl-settings-bootloader.h:89 source/ubl-settings-bootloader.h:88 +#: source/ubl-settings-bootloader.cc:920 source/ubl-settings-bootloader.cc:464 msgid "Successfully saved local and global configuration" msgstr "" -#: source/ubl-settings-bootloader.h:42 source/ubl-settings-bootloader.cc:419 +#: source/ubl-settings-bootloader.h:43 source/ubl-settings-bootloader.h:42 +#: source/ubl-settings-bootloader.cc:419 msgid "System boot" msgstr "" -#: source/ubl-settings-bootloader.h:48 source/ubl-settings-bootloader.cc:427 +#: source/ubl-settings-bootloader.h:49 source/ubl-settings-bootloader.h:48 +#: source/ubl-settings-bootloader.cc:427 msgid "Terminal for input" msgstr "" -#: source/ubl-settings-bootloader.h:49 source/ubl-settings-bootloader.cc:428 +#: source/ubl-settings-bootloader.h:50 source/ubl-settings-bootloader.h:49 +#: source/ubl-settings-bootloader.cc:428 msgid "Terminal for output" msgstr "" @@ -380,8 +386,8 @@ msgstr "" msgid "The last selection will become the default boot choice" msgstr "" -#: source/ubl-settings-bootloader.h:90 source/ubl-settings-bootloader.cc:107 -#: source/ubl-settings-bootloader.cc:94 +#: source/ubl-settings-bootloader.h:91 source/ubl-settings-bootloader.h:90 +#: source/ubl-settings-bootloader.cc:107 source/ubl-settings-bootloader.cc:94 msgid "The program must be run as root" msgstr "" @@ -391,22 +397,23 @@ msgstr "" msgid "USB Keyboard (HID Boot protocol)" msgstr "" -#: source/ubl-settings-bootloader.h:70 source/ubl-settings-bootloader.cc:440 +#: source/ubl-settings-bootloader.h:71 source/ubl-settings-bootloader.h:70 +#: source/ubl-settings-bootloader.cc:440 msgid "User name to enter boot configuration editing mode" msgstr "" -#: source/ubl-settings-bootloader.h:71 +#: source/ubl-settings-bootloader.h:72 source/ubl-settings-bootloader.h:71 msgid "User password to enter boot configuration edit mode" msgstr "" msgid "VGA text output (Coreboot)" msgstr "" -#: source/ubl-settings-bootloader.h:68 +#: source/ubl-settings-bootloader.h:69 source/ubl-settings-bootloader.h:68 msgid "Would you like to read documentation in the Web?" msgstr "" -#: source/ubl-settings-bootloader.h:69 +#: source/ubl-settings-bootloader.h:70 source/ubl-settings-bootloader.h:69 msgid "" "You will be redirected to documentation site, where user help pages are " "translated and supported by community." @@ -430,6 +437,7 @@ msgstr "" msgid "gfxterm (Output in graphical mode)" msgstr "" +#: source/ubl-settings-bootloader.h:40 source/ubl-settings-bootloader.h:76 #: source/ubl-settings-bootloader.h:39 source/ubl-settings-bootloader.h:75 #: source/ubl-settings-bootloader.cc:414 source/ubl-settings-bootloader.cc:282 msgid "https://wiki.ublinux.com" @@ -468,7 +476,8 @@ msgstr "" msgid "quiet (Downloading without text messages)" msgstr "" -#: source/ubl-settings-bootloader.h:46 source/ubl-settings-bootloader.cc:425 +#: source/ubl-settings-bootloader.h:47 source/ubl-settings-bootloader.h:46 +#: source/ubl-settings-bootloader.cc:425 msgid "seconds" msgstr "" @@ -486,15 +495,15 @@ msgstr "" msgid "splash (Show welcome window)" msgstr "" -#: source/ubl-settings-bootloader.h:38 source/ubl-settings-bootloader.cc:413 -#: source/ubl-settings-bootloader.cc:418 source/ubl-settings-bootloader.cc:439 -#: source/ubl-settings-bootloader.cc:281 source/ubl-settings-bootloader.cc:286 -#: source/ubl-settings-bootloader.cc:309 +#: source/ubl-settings-bootloader.h:39 source/ubl-settings-bootloader.h:38 +#: source/ubl-settings-bootloader.cc:413 source/ubl-settings-bootloader.cc:418 +#: source/ubl-settings-bootloader.cc:439 source/ubl-settings-bootloader.cc:281 +#: source/ubl-settings-bootloader.cc:286 source/ubl-settings-bootloader.cc:309 msgid "ubl-settings-bootloader" msgstr "" -#: source/ubl-settings-bootloader.h:78 source/ubl-settings-bootloader.cc:947 -#: source/ubl-settings-bootloader.cc:547 +#: source/ubl-settings-bootloader.h:79 source/ubl-settings-bootloader.h:78 +#: source/ubl-settings-bootloader.cc:947 source/ubl-settings-bootloader.cc:547 msgid "ubl-settings-bootloader version: " msgstr "" diff --git a/ubl-settings-bootloader_ru.po b/ubl-settings-bootloader_ru.po index 34fa9bc..32f9be7 100644 --- a/ubl-settings-bootloader_ru.po +++ b/ubl-settings-bootloader_ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ubl-settings-bootloader 1.0\n" "Report-Msgid-Bugs-To: info@ublinux.com\n" -"POT-Creation-Date: 2023-04-25 14:57+0600\n" +"POT-Creation-Date: 2023-04-25 15:27+0600\n" "PO-Revision-Date: 2020-02-22 23:28+0600\n" "Last-Translator: ublinux \n" "Language-Team: Russian - UBLinux Team \n" @@ -17,65 +17,65 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: source/ubl-settings-bootloader.h:52 source/ubl-settings-bootloader.cc:431 -#: source/ubl-settings-bootloader.cc:301 +#: source/ubl-settings-bootloader.h:53 source/ubl-settings-bootloader.h:52 +#: source/ubl-settings-bootloader.cc:431 source/ubl-settings-bootloader.cc:301 msgid "About" msgstr "О программе" -#: source/ubl-settings-bootloader.h:43 +#: source/ubl-settings-bootloader.h:44 source/ubl-settings-bootloader.h:43 msgid "About ubl-settings-bootloader" msgstr "О программе Загрузка системы" -#: source/ubl-settings-bootloader.h:91 source/ubl-settings-bootloader.cc:337 -#: source/ubl-settings-bootloader.cc:199 +#: source/ubl-settings-bootloader.h:92 source/ubl-settings-bootloader.h:91 +#: source/ubl-settings-bootloader.cc:337 source/ubl-settings-bootloader.cc:199 msgid "Active" msgstr "Активно" -#: source/ubl-settings-bootloader.h:62 +#: source/ubl-settings-bootloader.h:63 source/ubl-settings-bootloader.h:62 msgid "Always redirect" msgstr "Всегда перенаправлять" -#: source/ubl-settings-bootloader.h:95 +#: source/ubl-settings-bootloader.h:96 source/ubl-settings-bootloader.h:95 msgid "Argument not recognized\n" msgstr "" -#: source/ubl-settings-bootloader.h:65 +#: source/ubl-settings-bootloader.h:66 source/ubl-settings-bootloader.h:65 msgid "Boot menu user name:" msgstr "Имя пользователя меню загрузки:" -#: source/ubl-settings-bootloader.h:66 +#: source/ubl-settings-bootloader.h:67 source/ubl-settings-bootloader.h:66 msgid "Boot menu user password:" msgstr "Пароль пользователя меню загрузки:" -#: source/ubl-settings-bootloader.h:63 +#: source/ubl-settings-bootloader.h:64 source/ubl-settings-bootloader.h:63 msgid "Boot screen display mode:" msgstr "Режим отображения экрана загрузки:" -#: source/ubl-settings-bootloader.h:50 +#: source/ubl-settings-bootloader.h:51 source/ubl-settings-bootloader.h:50 msgid "Boot selection menu timer" msgstr "Таймер меню выбора варианта загрузки" -#: source/ubl-settings-bootloader.h:61 +#: source/ubl-settings-bootloader.h:62 source/ubl-settings-bootloader.h:61 msgid "Cancel" msgstr "Отменить" -#: source/ubl-settings-bootloader.h:44 source/ubl-settings-bootloader.cc:421 -#: source/ubl-settings-bootloader.cc:422 source/ubl-settings-bootloader.cc:423 -#: source/ubl-settings-bootloader.cc:289 source/ubl-settings-bootloader.cc:290 -#: source/ubl-settings-bootloader.cc:291 +#: source/ubl-settings-bootloader.h:45 source/ubl-settings-bootloader.h:44 +#: source/ubl-settings-bootloader.cc:421 source/ubl-settings-bootloader.cc:422 +#: source/ubl-settings-bootloader.cc:423 source/ubl-settings-bootloader.cc:289 +#: source/ubl-settings-bootloader.cc:290 source/ubl-settings-bootloader.cc:291 msgid "Command line parameters:" msgstr "Параметры командной строки:" -#: source/ubl-settings-bootloader.h:41 source/ubl-settings-bootloader.cc:417 -#: source/ubl-settings-bootloader.cc:285 +#: source/ubl-settings-bootloader.h:42 source/ubl-settings-bootloader.h:41 +#: source/ubl-settings-bootloader.cc:417 source/ubl-settings-bootloader.cc:285 msgid "Configuring system boot parameters" msgstr "Настройка параметров загрузки системы" msgid "Configuring the boot loader settings" msgstr "Настройка параметров загрузчика системы" -#: source/ubl-settings-bootloader.h:37 source/ubl-settings-bootloader.cc:411 -#: source/ubl-settings-bootloader.cc:279 +#: source/ubl-settings-bootloader.h:38 source/ubl-settings-bootloader.h:37 +#: source/ubl-settings-bootloader.cc:411 source/ubl-settings-bootloader.cc:279 msgid "Copyright © UBSoft LLC, 2022 - " msgstr "" @@ -84,8 +84,8 @@ msgstr "" msgid "Default download" msgstr "По умолчанию" -#: source/ubl-settings-bootloader.h:93 source/ubl-settings-bootloader.cc:339 -#: source/ubl-settings-bootloader.cc:201 +#: source/ubl-settings-bootloader.h:94 source/ubl-settings-bootloader.h:93 +#: source/ubl-settings-bootloader.cc:339 source/ubl-settings-bootloader.cc:201 msgid "Description" msgstr "Описание" @@ -107,8 +107,8 @@ msgstr "Отключить выбор и загрузку ядром драйв msgid "Disable local APIC" msgstr "Отключить локальный APIC" -#: source/ubl-settings-bootloader.h:47 source/ubl-settings-bootloader.cc:426 -#: source/ubl-settings-bootloader.cc:294 +#: source/ubl-settings-bootloader.h:48 source/ubl-settings-bootloader.h:47 +#: source/ubl-settings-bootloader.cc:426 source/ubl-settings-bootloader.cc:294 msgid "Download menu" msgstr "Меню загрузки" @@ -118,16 +118,18 @@ msgstr "Загрузка без текстовых сообщений" msgid "Eliminates flickering laptop display on Ultra Voltage processors" msgstr "Устраняет мерцание дисплея ноутбука на процессорах Ultra Voltage" -#: source/ubl-settings-bootloader.h:77 source/ubl-settings-bootloader.cc:496 +#: source/ubl-settings-bootloader.h:78 source/ubl-settings-bootloader.h:77 +#: source/ubl-settings-bootloader.cc:496 msgid "Enter login" msgstr "Введите логин" -#: source/ubl-settings-bootloader.h:76 source/ubl-settings-bootloader.cc:476 +#: source/ubl-settings-bootloader.h:77 source/ubl-settings-bootloader.h:76 +#: source/ubl-settings-bootloader.cc:476 msgid "Enter your password" msgstr "Введите пароль" -#: source/ubl-settings-bootloader.h:83 source/ubl-settings-bootloader.cc:897 -#: source/ubl-settings-bootloader.cc:443 +#: source/ubl-settings-bootloader.h:84 source/ubl-settings-bootloader.h:83 +#: source/ubl-settings-bootloader.cc:897 source/ubl-settings-bootloader.cc:443 #, fuzzy msgid "Error saved local and global configuration" msgstr "Успешно записаны локальная и глобальная конфигурация" @@ -144,7 +146,7 @@ msgid "" " -V, --version\t Show package version\n" msgstr "" -#: source/ubl-settings-bootloader.h:94 +#: source/ubl-settings-bootloader.h:95 source/ubl-settings-bootloader.h:94 msgid "" "GTK settings bootloader for UBLinux\n" "\n" @@ -171,28 +173,28 @@ msgstr "" " --lock-save-global Блокировка сохранения глобальной конфигурации\n" " --lock-load-global Блокировка загрузки глобальной конфигурации\n" -#: source/ubl-settings-bootloader.h:85 source/ubl-settings-bootloader.cc:911 -#: source/ubl-settings-bootloader.cc:455 +#: source/ubl-settings-bootloader.h:86 source/ubl-settings-bootloader.h:85 +#: source/ubl-settings-bootloader.cc:911 source/ubl-settings-bootloader.cc:455 msgid "Global configuration downloaded successfully" msgstr "Успешно загружена глобальная конфигурация" -#: source/ubl-settings-bootloader.h:80 source/ubl-settings-bootloader.cc:885 -#: source/ubl-settings-bootloader.cc:431 +#: source/ubl-settings-bootloader.h:81 source/ubl-settings-bootloader.h:80 +#: source/ubl-settings-bootloader.cc:885 source/ubl-settings-bootloader.cc:431 msgid "Global configuration read error" msgstr "Ошибка чтения глобальной конфигурации" -#: source/ubl-settings-bootloader.h:87 source/ubl-settings-bootloader.cc:917 -#: source/ubl-settings-bootloader.cc:461 +#: source/ubl-settings-bootloader.h:88 source/ubl-settings-bootloader.h:87 +#: source/ubl-settings-bootloader.cc:917 source/ubl-settings-bootloader.cc:461 msgid "Global configuration successfully written" msgstr "Успешно записана глобальная конфигурация" -#: source/ubl-settings-bootloader.h:82 source/ubl-settings-bootloader.cc:893 -#: source/ubl-settings-bootloader.cc:439 +#: source/ubl-settings-bootloader.h:83 source/ubl-settings-bootloader.h:82 +#: source/ubl-settings-bootloader.cc:893 source/ubl-settings-bootloader.cc:439 msgid "Global configuration write error" msgstr "Ошибка записи глобальной конфигурации" -#: source/ubl-settings-bootloader.h:51 source/ubl-settings-bootloader.cc:430 -#: source/ubl-settings-bootloader.cc:300 +#: source/ubl-settings-bootloader.h:52 source/ubl-settings-bootloader.h:51 +#: source/ubl-settings-bootloader.cc:430 source/ubl-settings-bootloader.cc:300 msgid "Help" msgstr "Справка" @@ -201,7 +203,8 @@ msgstr "Справка" msgid "Input terminal" msgstr "Терминал для вывода" -#: source/ubl-settings-bootloader.h:74 source/ubl-settings-bootloader.cc:451 +#: source/ubl-settings-bootloader.h:75 source/ubl-settings-bootloader.h:74 +#: source/ubl-settings-bootloader.cc:451 msgid "Lack of loading animation with the output of the abbreviated log" msgstr "Отсутствие анимации загрузки с выводом сокращенного журнала" @@ -209,26 +212,28 @@ msgstr "Отсутствие анимации загрузки с выводом msgid "Last Successful Download" msgstr "Последняя удачная загрузка" -#: source/ubl-settings-bootloader.h:67 source/ubl-settings-bootloader.cc:452 +#: source/ubl-settings-bootloader.h:68 source/ubl-settings-bootloader.h:67 +#: source/ubl-settings-bootloader.cc:452 msgid "Last successful upload" msgstr "Последняя удачная загрузка" -#: source/ubl-settings-bootloader.h:54 source/ubl-settings-bootloader.cc:438 -#: source/ubl-settings-bootloader.cc:308 +#: source/ubl-settings-bootloader.h:55 source/ubl-settings-bootloader.h:54 +#: source/ubl-settings-bootloader.cc:438 source/ubl-settings-bootloader.cc:308 msgid "Load" msgstr "Загрузить" -#: source/ubl-settings-bootloader.h:45 source/ubl-settings-bootloader.cc:424 +#: source/ubl-settings-bootloader.h:46 source/ubl-settings-bootloader.h:45 +#: source/ubl-settings-bootloader.cc:424 msgid "Load default:" msgstr "Загрузка по умолчанию:" -#: source/ubl-settings-bootloader.h:58 source/ubl-settings-bootloader.cc:435 -#: source/ubl-settings-bootloader.cc:305 +#: source/ubl-settings-bootloader.h:59 source/ubl-settings-bootloader.h:58 +#: source/ubl-settings-bootloader.cc:435 source/ubl-settings-bootloader.cc:305 msgid "Load global configuration" msgstr "Загрузить глобальную конфигурацию" -#: source/ubl-settings-bootloader.h:59 source/ubl-settings-bootloader.cc:436 -#: source/ubl-settings-bootloader.cc:306 +#: source/ubl-settings-bootloader.h:60 source/ubl-settings-bootloader.h:59 +#: source/ubl-settings-bootloader.cc:436 source/ubl-settings-bootloader.cc:306 msgid "Load local configuration" msgstr "Загрузить локальную конфигурацию" @@ -251,31 +256,33 @@ msgstr "" msgid "Load screen display mode:" msgstr "Режим отображения экрана загрузки:" -#: source/ubl-settings-bootloader.h:72 source/ubl-settings-bootloader.cc:448 +#: source/ubl-settings-bootloader.h:73 source/ubl-settings-bootloader.h:72 +#: source/ubl-settings-bootloader.cc:448 msgid "Loading animation with the magazine" msgstr "Анимация загрузки с журналом" -#: source/ubl-settings-bootloader.h:73 source/ubl-settings-bootloader.cc:449 +#: source/ubl-settings-bootloader.h:74 source/ubl-settings-bootloader.h:73 +#: source/ubl-settings-bootloader.cc:449 msgid "Loading animation without a magazine" msgstr "Анимация загрузки без журнала" -#: source/ubl-settings-bootloader.h:84 source/ubl-settings-bootloader.cc:908 -#: source/ubl-settings-bootloader.cc:452 +#: source/ubl-settings-bootloader.h:85 source/ubl-settings-bootloader.h:84 +#: source/ubl-settings-bootloader.cc:908 source/ubl-settings-bootloader.cc:452 msgid "Local configuration downloaded successfully" msgstr "Успешно загружена локальная конфигурация" -#: source/ubl-settings-bootloader.h:79 source/ubl-settings-bootloader.cc:881 -#: source/ubl-settings-bootloader.cc:427 +#: source/ubl-settings-bootloader.h:80 source/ubl-settings-bootloader.h:79 +#: source/ubl-settings-bootloader.cc:881 source/ubl-settings-bootloader.cc:427 msgid "Local configuration reading error" msgstr "Ошибка чтения локальной конфигурации" -#: source/ubl-settings-bootloader.h:86 source/ubl-settings-bootloader.cc:914 -#: source/ubl-settings-bootloader.cc:458 +#: source/ubl-settings-bootloader.h:87 source/ubl-settings-bootloader.h:86 +#: source/ubl-settings-bootloader.cc:914 source/ubl-settings-bootloader.cc:458 msgid "Local configuration successfully written" msgstr "Успешно записана локальная конфигурация" -#: source/ubl-settings-bootloader.h:81 source/ubl-settings-bootloader.cc:889 -#: source/ubl-settings-bootloader.cc:435 +#: source/ubl-settings-bootloader.h:82 source/ubl-settings-bootloader.h:81 +#: source/ubl-settings-bootloader.cc:889 source/ubl-settings-bootloader.cc:435 msgid "Local configuration write error" msgstr "Ошибка записи локальной конфигурации" @@ -286,7 +293,7 @@ msgstr "Вручную" msgid "Maximum performance, power management" msgstr "Максимальная производительность, управление питанием" -#: source/ubl-settings-bootloader.h:64 +#: source/ubl-settings-bootloader.h:65 source/ubl-settings-bootloader.h:64 msgid "No loading animation, full log" msgstr "Отсутствие анимации загрузки с выводом журнала" @@ -294,17 +301,17 @@ msgstr "Отсутствие анимации загрузки с выводом msgid "Not available" msgstr "Отсутствует" -#: source/ubl-settings-bootloader.h:89 source/ubl-settings-bootloader.cc:923 -#: source/ubl-settings-bootloader.cc:341 source/ubl-settings-bootloader.cc:354 -#: source/ubl-settings-bootloader.cc:367 +#: source/ubl-settings-bootloader.h:90 source/ubl-settings-bootloader.h:89 +#: source/ubl-settings-bootloader.cc:923 source/ubl-settings-bootloader.cc:341 +#: source/ubl-settings-bootloader.cc:354 source/ubl-settings-bootloader.cc:367 msgid "Nothing to save!" msgstr "Нечего сохранять!" msgid "Open Firmware Console" msgstr "Консоль Open Firmware" -#: source/ubl-settings-bootloader.h:92 source/ubl-settings-bootloader.cc:338 -#: source/ubl-settings-bootloader.cc:200 +#: source/ubl-settings-bootloader.h:93 source/ubl-settings-bootloader.h:92 +#: source/ubl-settings-bootloader.cc:338 source/ubl-settings-bootloader.cc:200 msgid "Option" msgstr "Опция" @@ -327,33 +334,33 @@ msgstr "Параметры, передаваемые ядру" msgid "Prevents the processor from going into a deep sleep state" msgstr "Предотвращает переход процессора в состояние глубокого сна" -#: source/ubl-settings-bootloader.h:40 source/ubl-settings-bootloader.cc:416 -#: source/ubl-settings-bootloader.cc:420 source/ubl-settings-bootloader.cc:284 -#: source/ubl-settings-bootloader.cc:288 +#: source/ubl-settings-bootloader.h:41 source/ubl-settings-bootloader.h:40 +#: source/ubl-settings-bootloader.cc:416 source/ubl-settings-bootloader.cc:420 +#: source/ubl-settings-bootloader.cc:284 source/ubl-settings-bootloader.cc:288 msgid "Project Home Page" msgstr "Домашняя страница проекта" -#: source/ubl-settings-bootloader.h:60 +#: source/ubl-settings-bootloader.h:61 source/ubl-settings-bootloader.h:60 msgid "Read online" msgstr "Прочитать онлайн" -#: source/ubl-settings-bootloader.h:53 source/ubl-settings-bootloader.cc:437 -#: source/ubl-settings-bootloader.cc:307 +#: source/ubl-settings-bootloader.h:54 source/ubl-settings-bootloader.h:53 +#: source/ubl-settings-bootloader.cc:437 source/ubl-settings-bootloader.cc:307 msgid "Save" msgstr "Сохранить" -#: source/ubl-settings-bootloader.h:57 source/ubl-settings-bootloader.cc:434 -#: source/ubl-settings-bootloader.cc:304 +#: source/ubl-settings-bootloader.h:58 source/ubl-settings-bootloader.h:57 +#: source/ubl-settings-bootloader.cc:434 source/ubl-settings-bootloader.cc:304 msgid "Save global configuration" msgstr "Сохранить глобальную конфигурацию" -#: source/ubl-settings-bootloader.h:56 source/ubl-settings-bootloader.cc:433 -#: source/ubl-settings-bootloader.cc:303 +#: source/ubl-settings-bootloader.h:57 source/ubl-settings-bootloader.h:56 +#: source/ubl-settings-bootloader.cc:433 source/ubl-settings-bootloader.cc:303 msgid "Save local configuration" msgstr "Сохранить локальную конфигурацию" -#: source/ubl-settings-bootloader.h:55 source/ubl-settings-bootloader.cc:432 -#: source/ubl-settings-bootloader.cc:302 +#: source/ubl-settings-bootloader.h:56 source/ubl-settings-bootloader.h:55 +#: source/ubl-settings-bootloader.cc:432 source/ubl-settings-bootloader.cc:302 msgid "Save to global and local configuration" msgstr "Сохранить глобальную и локальную конфигурацию" @@ -375,21 +382,24 @@ msgstr "Показывать окно приветствия" msgid "Single User Mode" msgstr "Режим одного пользователя" -#: source/ubl-settings-bootloader.h:88 source/ubl-settings-bootloader.cc:920 -#: source/ubl-settings-bootloader.cc:464 +#: source/ubl-settings-bootloader.h:89 source/ubl-settings-bootloader.h:88 +#: source/ubl-settings-bootloader.cc:920 source/ubl-settings-bootloader.cc:464 msgid "Successfully saved local and global configuration" msgstr "Успешно записаны локальная и глобальная конфигурация" -#: source/ubl-settings-bootloader.h:42 source/ubl-settings-bootloader.cc:419 +#: source/ubl-settings-bootloader.h:43 source/ubl-settings-bootloader.h:42 +#: source/ubl-settings-bootloader.cc:419 msgid "System boot" msgstr "Загрузка системы" -#: source/ubl-settings-bootloader.h:48 source/ubl-settings-bootloader.cc:427 +#: source/ubl-settings-bootloader.h:49 source/ubl-settings-bootloader.h:48 +#: source/ubl-settings-bootloader.cc:427 #, fuzzy msgid "Terminal for input" msgstr "Терминал для ввода" -#: source/ubl-settings-bootloader.h:49 source/ubl-settings-bootloader.cc:428 +#: source/ubl-settings-bootloader.h:50 source/ubl-settings-bootloader.h:49 +#: source/ubl-settings-bootloader.cc:428 #, fuzzy msgid "Terminal for output" msgstr "Терминал для вывода" @@ -398,8 +408,8 @@ msgstr "Терминал для вывода" msgid "The last selection will become the default boot choice" msgstr "Последний выбор станет выбором загрузки по умолчанию" -#: source/ubl-settings-bootloader.h:90 source/ubl-settings-bootloader.cc:107 -#: source/ubl-settings-bootloader.cc:94 +#: source/ubl-settings-bootloader.h:91 source/ubl-settings-bootloader.h:90 +#: source/ubl-settings-bootloader.cc:107 source/ubl-settings-bootloader.cc:94 msgid "The program must be run as root" msgstr "Программа должна быть запущена с правами суперпользователя!" @@ -409,12 +419,13 @@ msgstr "UBConfig - Загрузка" msgid "USB Keyboard (HID Boot protocol)" msgstr "Клавиатура USB Keyboard (протокол HID Boot)" -#: source/ubl-settings-bootloader.h:70 source/ubl-settings-bootloader.cc:440 +#: source/ubl-settings-bootloader.h:71 source/ubl-settings-bootloader.h:70 +#: source/ubl-settings-bootloader.cc:440 msgid "User name to enter boot configuration editing mode" msgstr "" "Имя пользователя для входа в режим редактирования конфигурации загрузки" -#: source/ubl-settings-bootloader.h:71 +#: source/ubl-settings-bootloader.h:72 source/ubl-settings-bootloader.h:71 msgid "User password to enter boot configuration edit mode" msgstr "" "Пароль пользователя для входа в режим редактирования конфигурации загрузки" @@ -422,11 +433,11 @@ msgstr "" msgid "VGA text output (Coreboot)" msgstr "Текстовый вывод VGA (Coreboot)" -#: source/ubl-settings-bootloader.h:68 +#: source/ubl-settings-bootloader.h:69 source/ubl-settings-bootloader.h:68 msgid "Would you like to read documentation in the Web?" msgstr "Вы хотите прочитать справку в Сети?" -#: source/ubl-settings-bootloader.h:69 +#: source/ubl-settings-bootloader.h:70 source/ubl-settings-bootloader.h:69 msgid "" "You will be redirected to documentation site, where user help pages are " "translated and supported by community." @@ -454,6 +465,7 @@ msgstr "Консоль (PC BIOS & console EFI)" msgid "gfxterm (Output in graphical mode)" msgstr "gfxterm (Вывод в графическом режиме)" +#: source/ubl-settings-bootloader.h:40 source/ubl-settings-bootloader.h:76 #: source/ubl-settings-bootloader.h:39 source/ubl-settings-bootloader.h:75 #: source/ubl-settings-bootloader.cc:414 source/ubl-settings-bootloader.cc:282 msgid "https://wiki.ublinux.com" @@ -499,7 +511,8 @@ msgstr "ofconsole (Консоль Open Firmware)" msgid "quiet (Downloading without text messages)" msgstr "quiet (Загрузка без текстовых сообщений)" -#: source/ubl-settings-bootloader.h:46 source/ubl-settings-bootloader.cc:425 +#: source/ubl-settings-bootloader.h:47 source/ubl-settings-bootloader.h:46 +#: source/ubl-settings-bootloader.cc:425 msgid "seconds" msgstr "секунд" @@ -519,15 +532,15 @@ msgstr "" msgid "splash (Show welcome window)" msgstr "splash (Показать окно приветствия)" -#: source/ubl-settings-bootloader.h:38 source/ubl-settings-bootloader.cc:413 -#: source/ubl-settings-bootloader.cc:418 source/ubl-settings-bootloader.cc:439 -#: source/ubl-settings-bootloader.cc:281 source/ubl-settings-bootloader.cc:286 -#: source/ubl-settings-bootloader.cc:309 +#: source/ubl-settings-bootloader.h:39 source/ubl-settings-bootloader.h:38 +#: source/ubl-settings-bootloader.cc:413 source/ubl-settings-bootloader.cc:418 +#: source/ubl-settings-bootloader.cc:439 source/ubl-settings-bootloader.cc:281 +#: source/ubl-settings-bootloader.cc:286 source/ubl-settings-bootloader.cc:309 msgid "ubl-settings-bootloader" msgstr "Загрузка системы" -#: source/ubl-settings-bootloader.h:78 source/ubl-settings-bootloader.cc:947 -#: source/ubl-settings-bootloader.cc:547 +#: source/ubl-settings-bootloader.h:79 source/ubl-settings-bootloader.h:78 +#: source/ubl-settings-bootloader.cc:947 source/ubl-settings-bootloader.cc:547 msgid "ubl-settings-bootloader version: " msgstr "ubl-settings-bootloader версия: "