diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index b0d3007..24b1c08 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -9,6 +9,20 @@ link_directories(${GTK_LIBRARY_DIRS}) add_definitions(${GTK_CFLAGS_OTHER}) find_package(ICU REQUIRED COMPONENTS uc dt in io) +find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0) + +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-datetime.h.in ubl-settings-datetime-cm.h) + #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -std=c++2a") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \ -O2 -pipe -fno-plt -fexceptions \ @@ -16,6 +30,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissin -fstack-clash-protection -fcf-protection") set(SOURCE_FILES + ubl-settings-datetime-cm.h ubl-util-standard.h ubl-util-standard.c main.cc @@ -27,5 +42,9 @@ set(LIBRARIES pthread) add_executable(ubl-settings-datetime ${SOURCE_FILES}) -target_link_libraries(ubl-settings-datetime ${LIBRARIES} ${ICU_LIBRARIES}) +target_link_libraries(ubl-settings-datetime PUBLIC ${ICU_LIBRARIES} ${WEBKIT_LIBRARIES} ${LIBRARIES}) +target_include_directories(ubl-settings-datetime PUBLIC + "${PROJECT_BINARY_DIR}" + ${WEBKIT_INCLUDE_DIRS} + ) install(TARGETS ubl-settings-datetime DESTINATION bin) \ No newline at end of file diff --git a/source/main.cc b/source/main.cc index d7dbecd..4e6c94d 100644 --- a/source/main.cc +++ b/source/main.cc @@ -21,7 +21,7 @@ int main(int argc, char* argv[]) { pars_flag(3, argc, argv); auto app = Gtk::Application::create(argc, argv, "org.gtkmm.example.plug"); - auto builder = Gtk::Builder::create_from_file(path_glade + "ubl-settings-datetime.glade"); + auto builder = Gtk::Builder::create_from_file(path_glade); Glib::init(); setlocale(LC_ALL, ""); Glib::OptionContext context; @@ -48,7 +48,7 @@ int main(int argc, char* argv[]) { int len_argv = 1; pars_flag(1, argc, argv); auto app = Gtk::Application::create(len_argv, argv, "org.gtkmm.example.plug"); - auto builder = Gtk::Builder::create_from_file(path_glade + "ubl-settings-datetime.glade"); + auto builder = Gtk::Builder::create_from_file(path_glade); MainWindow* wnd = nullptr; builder->get_widget_derived("window", wnd); auto r = app->run(*wnd); @@ -56,7 +56,7 @@ int main(int argc, char* argv[]) { return r; } else{ - cout << gettext("Argument not recognized"); + cout << no_recognized; return 0; } } @@ -70,7 +70,7 @@ void pars_flag(int index_start, int argc, char* argv[]){ exit(1); } else if (str_argv == "--version" || str_argv == "-v"){ - string version = string(gettext("ubl-settings-datetime version: ")) + version_application + "\n"; + string version = string(str_version) + version_application + "\n"; cout << version.c_str(); exit(1); } @@ -105,7 +105,7 @@ void pars_flag(int index_start, int argc, char* argv[]){ } else{ if (index_start == 1){ - g_print(gettext("Argument not recognized\n")); + g_print(no_recognized); } } diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 398b0b1..46359d0 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -2,12 +2,6 @@ #include "ubl-settings-datetime.h" using namespace std; -const string path_app = "/usr/bin/"; -const string path_glade = "/usr/share/ubl-settings-datetime/ui/"; -const string app_name = "ubl-settings-datetime"; -const string path_locale = "/usr/share/locale/"; -const string path_css = "/usr/share/ubl-settings-datetime/css/ubl-settings-datetime.css"; -const string path_img_head_background = "/usr/share/ubl-settings-datetime/images/logo-background.png"; bool flag_datetime = false; bool flag_timezone = false; bool flag_ntp_mode = false; @@ -19,7 +13,7 @@ bool flag_load_global = false; bool flag_sync_hwclock = false; int socket_ext_id_I = 0; int socket_trd_id_I = 0; -string version_application = "1.5"; +string version_application = "1.6"; CmdArgParser::CmdArgParser(const std::string& p_name, const std::string& p_description, const std::string& p_help) : Glib::OptionGroup{p_name, p_description, p_help} { @@ -55,34 +49,31 @@ MainWindow::MainWindow(Glib::RefPtr const& builder) { } void MainWindow::settings() { - map_error["xdg-open https://wiki.ublinux.ru/ru/home"] = string(gettext(": \"xdg-open\"")); - map_error["ubconfig --default --source system get clock ZONE"] = string(gettext(": \"Time Zone\"")); - map_error["hwclock --systohc"] = string(gettext(": \"Hardware time\"")); - map_error["ubconfig --default --source system get network NTPSERVERS"] = string(gettext(": \"NTP\"")); - map_error["ubconfig --source=default get NTPSERVERS_DEFAULT"] = string(gettext(": \"NTP\"")); - map_error["ubconfig --default --source system get clock HWCLOCK_SYNC"] = string(gettext(": \"Hardware time\"")); - map_error["ubconfig --default --source global get network NTPSERVERS"] = string(gettext(": \"NTP\"")); - map_error["ubconfig --default --source global get clock ZONE"] = string(gettext(": \"Time Zone\"")); - map_error["ubconfig --default --source global get clock HWCLOCK_SYNC"] = string(gettext(": \"Hardware time\"")); - map_error["ubconfig --source global get clock HWCLOCK_SYNC"] = string(gettext(": \"Hardware time\"")); - map_error["ubconfig --target system set clock ZONE="] = string(gettext(": \"Time Zone\"")); - map_error["ubconfig --target system set network NTPSERVERS=default"] = string(gettext(": \"NTP\"")); - map_error["ubconfig --target system set network NTPSERVERS=dhcp"] = string(gettext(": \"NTP\"")); - map_error["ubconfig --target system set network NTPSERVERS=\""] = string(gettext(": \"NTP\"")); - map_error["ubconfig --target system remove network NTPSERVERS"] = string(gettext(": \"NTP\"")); - map_error["ubconfig --target system set clock HWCLOCK_SYNC=localtime"] = string(gettext(": \"Hardware time\"")); - map_error["ubconfig --target system set clock HWCLOCK_SYNC=utc"] = string(gettext(": \"Hardware time\"")); - map_error["ubconfig --target global set clock ZONE="] = string(gettext(": \"Time Zone\"")); - map_error["ubconfig --target global set network NTPSERVERS=default"] = string(gettext(": \"NTP\"")); - map_error["ubconfig --target global set network NTPSERVERS=dhcp"] = string(gettext(": \"NTP\"")); - map_error["ubconfig --target global set network NTPSERVERS=\""] = string(gettext(": \"NTP\"")); - map_error["ubconfig --target global remove network NTPSERVERS"] = string(gettext(": \"NTP\"")); - map_error["ubconfig --target global set clock HWCLOCK_SYNC=localtime"] = string(gettext(": \"Hardware time\"")); - map_error["ubconfig --target global set clock HWCLOCK_SYNC=utc"] = string(gettext(": \"Hardware time\"")); - map_error["ubconfig --source default get [] NTPSERVERS_DEFAULT"] = string(gettext(": \"NTP\"")); - map_error["date +%Y%m%d -s \""] = string(gettext(": \"Date\"")); - map_error["date +%T -s \""] = string(gettext(": \"Date\"")); - map_error["ubconfig --source default get clock HWCLOCK_SYNC"] = string(gettext(": \"Hardware time\"")); + map_error[get_system_ZONE] = string(str_time_zone_flag); + map_error[set_hwclock] = string(str_hardware_time_flag); + map_error[get_system_NTPSERVERS] = string(str_NTP_flag); + map_error[get_system_HWCLOCK_SYNC] = string(str_hardware_time_flag); + map_error[get_global_NTPSERVERS] = string(str_NTP_flag); + map_error[get_global_ZONE] = string(str_time_zone_flag); + map_error[get_global_defalult_HWCLOCK_SYNC] = string(str_hardware_time_flag); + map_error[get_global_HWCLOCK_SYNC] = string(str_hardware_time_flag); + map_error[set_system_ZONE] = string(str_time_zone_flag); + map_error[set_system_NTPSERVERS_default] = string(str_NTP_flag); + map_error[set_system_NTPSERVERS_dhcp] = string(str_NTP_flag); + map_error[set_system_NTPSERVERS] = string(str_NTP_flag); + map_error[remove_system_NTPSERVERS] = string(str_NTP_flag); + map_error[set_system_HWCLOCK_SYNC_localtime] = string(str_hardware_time_flag); + map_error[set_system_HWCLOCK_SYNC_utc] = string(str_hardware_time_flag); + map_error[set_global_ZONE] = string(str_time_zone_flag); + map_error[set_global_NTPSERVERS_default] = string(str_NTP_flag); + map_error[set_global_NTPSERVERS_dhcp] = string(str_NTP_flag); + map_error[set_global_NTPSERVERS] = string(str_NTP_flag); + map_error[remove_global_NTPSERVERS] = string(str_NTP_flag); + map_error[set_global_HWCLOCK_SYNC_localtime] = string(str_hardware_time_flag); + map_error[set_global_HWCLOCK_SYNC_utc] = string(str_hardware_time_flag); + map_error[get_NTPSERVERS_DEFAULT] = string(str_NTP_flag); + map_error["date +%Y%m%d -s \""] = string(str_date_flag); + map_error["date +%T -s \""] = string(str_date_flag); this->get_builder(); this->add_CSS(); Gtk::Widget *boxWidget; @@ -95,6 +86,11 @@ void MainWindow::settings() { day = 0; this->lacalization(); btnBoxAboutDialog->set_visible(false); + #ifdef WEBKIT_FOUND + one = WEBKIT_WEB_VIEW( webkit_web_view_new() ); + three = Glib::wrap(GTK_WIDGET(one)); + wndWeb->add(*three); + #endif if (geteuid() == 0) { numTimeHrs->set_range(0, 23); numTimeMin->set_range(0, 59); @@ -106,8 +102,7 @@ void MainWindow::settings() { this->parse_text_date(); this->load_globl_cfg(); this->load_local_cfg(); - string cmd = "ubconfig --source default get [] NTPSERVERS_DEFAULT"; - default_get_dhcp = this->get_ubconfig_value(cmd); + default_get_dhcp = this->get_ubconfig_value(get_NTPSERVERS_DEFAULT); this->str_remove(default_get_dhcp, "\""); } else { @@ -116,9 +111,9 @@ void MainWindow::settings() { boxButton->set_sensitive(false); btnSave->set_sensitive(false); this->event(); - imgInfo->set_from_icon_name("com.ublinux.ubl-settings-datetime.warning", Gtk::ICON_SIZE_MENU); - info_status_app("boxInfoMessError"); - lblWarning->set_text(gettext("The program must be run as root")); + imgInfo->set_from_icon_name(icon_warning, Gtk::ICON_SIZE_MENU); + info_status_app(info_box_error_css); + lblWarning->set_text(program_as_root); } } @@ -126,40 +121,50 @@ void MainWindow::lacalization() { time_t now = time(0); tm *ltm = localtime(&now); unsigned int year = 1900+ ltm->tm_year; - string str_authors = string(gettext("Copyright © UBSoft LLC, 2022 - ")) + to_string(year); + string str_authors = string(copyright) + to_string(year); + aboutWindows->set_program_name(name_app); aboutWindows->set_copyright(str_authors); - aboutWindows->set_comments(gettext("Date and Time")); - aboutWindows->set_website(gettext("https://wiki.ublinux.com")); - aboutWindows->set_version(gettext(version_application.c_str())); - aboutWindows->set_website_label(gettext("Project Home Page")); - lblSave->set_label(gettext("Save")); - lblLoad->set_label(gettext("Load")); - txtDate->set_tooltip_text(gettext("Date of\nFormat: DD.MM.YYYY")); - txtNtpServer->set_tooltip_text(gettext("Enter the name of the ntp-server or its ip-address.\nWhen entering multiple addresses, separate them with commas.")); - lblSynchronizebChkGLob->set_text(gettext("Synchronize via NTP")); - cbDhcp->append(gettext("Default")); - cbDhcp->append(gettext("DHCP")); - cbDhcp->append(gettext("Manual")); - cbDhcp->append(gettext("Disabled")); - lblDateTimeSetting->set_text(gettext("Current date and time")); - lblHead->set_text(gettext("Setting the date and time")); - lblTime->set_text(gettext("Time:")); - lblData->set_text(gettext("Date:")); - lblTimeZone->set_text(gettext("Time zone")); - lblReg->set_text(gettext("Region:")); - lblZone->set_text(gettext("Zone:")); - lblSynchronizeBtn->set_text(gettext("Sync by")); - lblHeader->set_text(gettext("ubl-settings-datetime")); - windowMessDchp->set_title(gettext("Attention")); - lblTimeBios->set_text(gettext("Synchronize hardware time")); - lblHW->set_text(gettext("Synchronize hardware time:")); - array_hw_local[0] = gettext("UTC time"); - array_hw_local[1] = gettext("Local time"); + aboutWindows->set_comments(str_date_time); + aboutWindows->set_website(website); + aboutWindows->set_version(_(version_application.c_str())); + aboutWindows->set_website_label(home_page); + lblHeaderAboutTopic->set_label(str_about); + lblSave->set_label(str_save); + lblLoad->set_label(str_load); + txtDate->set_tooltip_text(data_format_d_m_y); + txtNtpServer->set_tooltip_text(enter_name_ntp_tooltip); + lblSynchronizebChkGLob->set_text(synchronize_ntp); + cbDhcp->append(str_default); + cbDhcp->append(str_DHCP); + cbDhcp->append(str_manual); + cbDhcp->append(str_disabled); + lblDateTimeSetting->set_text(current_date_time); + lblHead->set_text(setting_date_time); + lblTime->set_text(str_time); + lblData->set_text(str_date); + lblTimeZone->set_text(str_time_zone); + lblReg->set_text(str_region); + lblZone->set_text(str_zone); + lblSynchronizeBtn->set_text(str_sync_by); + lblHeader->set_text(name_app); + lblHeadeWndWeb->set_text(name_app); + windowMessDchp->set_title(str_attention); + lblTimeBios->set_text(synchronize_hw); + lblHW->set_text(string(synchronize_hw) + ":"); + array_hw_local[0] = utc_time; + array_hw_local[1] = str_local_time; array_hw[0] = "utc"; array_hw[1] = "localtime"; this->bubble_sort(array_hw, array_hw_local, 2); cbHw->append(array_hw_local[0]); cbHw->append(array_hw_local[1]); + + lblhelpHeader->set_text(read_documentation_web); + lblhelpText->set_text(redirected_documentation); + btnReadHelp->set_label(read_online); + btnCancelHelp->set_label(cancel); + chkAlwaysOpenHelp->set_label(always_redirect); + lblwebHeaderName->set_label(name_app); } void MainWindow::bubble_sort(string arr[],string arr_local[], int len_arr) { @@ -246,8 +251,8 @@ void MainWindow::add_CSS() { void MainWindow::info_status_app(string stule) { Glib::RefPtr boxInfo = boxInfoError->get_style_context(); - boxInfo->remove_class("boxInfoMessOK"); - boxInfo->remove_class("boxInfoMessError"); + boxInfo->remove_class(info_box_ok_css); + boxInfo->remove_class(info_box_error_css); boxInfo->add_class(stule); } @@ -313,10 +318,26 @@ void MainWindow::get_builder() { builder->get_widget("boxWidgetFunc", boxWidgetFunc); builder->get_widget("overHead", overHead); builder->get_widget("imgHeadBackground", imgHeadBackground); + #ifdef WEBKIT_FOUND + builder->get_widget("wndWeb", wndWeb); + #endif + builder->get_widget("lblHeadeWndWeb", lblHeadeWndWeb); + builder->get_widget("lblHeaderAboutTopic", lblHeaderAboutTopic); + builder->get_widget("lblwebHeaderName", lblwebHeaderName); + builder->get_widget("lblhelpText", lblhelpText); + builder->get_widget("lblhelpHeader", lblhelpHeader); + builder->get_widget("chkAlwaysOpenHelp", chkAlwaysOpenHelp); + builder->get_widget("btnReadHelp", btnReadHelp); + builder->get_widget("btnCancelHelp", btnCancelHelp); + builder->get_widget("wndShowWeb", wndShowWeb); } void MainWindow::event() { + btnCancelHelp->signal_clicked().connect([&]() {wndShowWeb->hide();}); + chkAlwaysOpenHelp->signal_toggled().connect([&]() {flag_open_browser = true;}); + btnReadHelp->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::open_browser)); + btnSynopsis->signal_activate().connect(sigc::mem_fun(*this, &MainWindow::synopsis_show)); btnHardwareTime->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::hardware_clock)); btnMessClose->signal_clicked().connect(sigc::mem_fun(*this, &MainWindow::gui_mess_close)); //cldrDate->signal_day_selected().connect(sigc::mem_fun(*this, &MainWindow::get_calendar)); @@ -384,30 +405,46 @@ void MainWindow::event_zone() { } void MainWindow::synopsis_show() { - int start_error = error_info; - 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 + " \""; + if (flag_open_browser == true) { + this->open_browser(); } - wrapper_system(cmd, "&"); - if (start_error != error_info) { - error_info = start_error; + else { + wndShowWeb->show_all(); } + +} + +void MainWindow::open_browser() { + #ifdef WEBKIT_FOUND + webkit_web_view_load_uri(one, link_doc); + wndWeb->show_all(); + #else + this->template_open_browser(); + #endif +} + +void MainWindow::template_open_browser() { + string cmd = cmd_xdg + string(_(link_doc)) + " &"; + string buf = ""; + if (geteuid() == 0) { + string response_user = getlogin(); + int size_s = std::snprintf(nullptr, 0, cmd_execute, response_user.c_str(), cmd.c_str()) + 1; + auto size = static_cast(size_s); + std::unique_ptr buf(new char[ size ]); + std::snprintf( buf.get(), size, cmd_execute, response_user.c_str(), cmd.c_str() ); + cmd = std::string( buf.get(), buf.get() + size - 1 ); + } + index_error = system(cmd.c_str()); } void MainWindow::load_local_cfg() { flag_local_global_load = 0; flag_load = false; - string cmd_zone = "ubconfig --default --source system get clock ZONE"; - this->fill_in_reg_zone(cmd_zone); + this->fill_in_reg_zone(get_system_ZONE); this->update_hour_minute(); this->update_calendar(); - string cmd_get_dhcp = "ubconfig --default --source system get network NTPSERVERS"; - string cmd_default_get_dhcp = "ubconfig --source default get [] NTPSERVERS_DEFAULT"; - this->entry_dhcp_mess(cmd_get_dhcp, cmd_default_get_dhcp); - string hw = "ubconfig --default --source system get clock HWCLOCK_SYNC"; - this->get_hardware_clock(hw); + this->entry_dhcp_mess(get_system_NTPSERVERS, get_NTPSERVERS_DEFAULT); + this->get_hardware_clock(get_system_HWCLOCK_SYNC); info_warning_error(0); map_config_data_global_old = map_config_data_global; map_config_data_local_old = map_config_data_local; @@ -417,13 +454,9 @@ void MainWindow::load_local_cfg() { void MainWindow::load_globl_cfg() { flag_local_global_load = 1; flag_load = true; - string cmd_get_dhcp = "ubconfig --default --source global get network NTPSERVERS"; - string cmd_default_get_dhcp = "ubconfig --source default get [] NTPSERVERS_DEFAULT"; - this->entry_dhcp_mess(cmd_get_dhcp, cmd_default_get_dhcp); - string cmd_zone = "ubconfig --default --source global get clock ZONE"; - this->fill_in_reg_zone(cmd_zone); - string hw = "ubconfig --source global get clock HWCLOCK_SYNC"; - this->get_hardware_clock(hw); + this->entry_dhcp_mess(get_global_NTPSERVERS, get_NTPSERVERS_DEFAULT); + this->fill_in_reg_zone(get_global_ZONE); + this->get_hardware_clock(get_global_HWCLOCK_SYNC); info_warning_error(1); map_config_data_global_old = map_config_data_global; map_config_data_local_old = map_config_data_local; @@ -433,17 +466,17 @@ void MainWindow::load_globl_cfg() { void MainWindow::save_local_cfg() { if ((this->check_config("region", 0) && this->check_config("zone", 0) && this->check_config("dhcp", 0) && this->check_config("hw", 0))) { - info_status_app("boxInfoMessOK"); - lblWarning->set_text(gettext("Nothing to save!")); + info_status_app(info_box_ok_css); + lblWarning->set_text(nothing_save); } else { - string cmd_zone = "ubconfig --target system set clock ZONE="; - string cmd_default = "ubconfig --target system set network NTPSERVERS=default"; - string cmd_dhcp = "ubconfig --target system set network NTPSERVERS=dhcp"; - string cmd_set_ntp = "ubconfig --target system set network NTPSERVERS=\""; - string remove_ntp = "ubconfig --target system remove network NTPSERVERS"; - string local = "ubconfig --target system set clock HWCLOCK_SYNC=localtime"; - string hw = "ubconfig --target system set clock HWCLOCK_SYNC=utc"; + string cmd_zone = set_system_ZONE; + string cmd_default = set_system_NTPSERVERS_default; + string cmd_dhcp = set_system_NTPSERVERS_dhcp; + string cmd_set_ntp = set_system_NTPSERVERS; + string remove_ntp = remove_system_NTPSERVERS; + string local = set_system_HWCLOCK_SYNC_localtime; + string hw = set_system_HWCLOCK_SYNC_utc; if ((this->check_config("region", 0) == false || this->check_config("zone", 0) == false)) { this->enter_zone(cmd_zone); } @@ -462,17 +495,17 @@ void MainWindow::save_local_cfg() { void MainWindow::save_global_cfg() { if ((this->check_config("region", 1) && this->check_config("zone", 1) && this->check_config("dhcp", 1) && this->check_config("hw", 1))) { - info_status_app("boxInfoMessOK"); - lblWarning->set_text(gettext("Nothing to save!")); + info_status_app(info_box_ok_css); + lblWarning->set_text(nothing_save); } else { - string cmd = "ubconfig --target global set clock ZONE="; - string cmd_default = "ubconfig --target global set network NTPSERVERS=default"; - string cmd_dhcp = "ubconfig --target global set network NTPSERVERS=dhcp"; - string cmd_set_ntp = "ubconfig --target global set network NTPSERVERS=\""; - string remove_ntp = "ubconfig --target global remove network NTPSERVERS"; - string local = "ubconfig --target global set clock HWCLOCK_SYNC=localtime"; - string hw = "ubconfig --target global set clock HWCLOCK_SYNC=utc"; + string cmd = set_global_ZONE; + string cmd_default = set_global_NTPSERVERS_default; + string cmd_dhcp = set_global_NTPSERVERS_dhcp; + string cmd_set_ntp = set_global_NTPSERVERS; + string remove_ntp = remove_global_NTPSERVERS; + string local = set_global_HWCLOCK_SYNC_localtime; + string hw = set_global_HWCLOCK_SYNC_utc; if ((this->check_config("region", 1) == false || this->check_config("zone", 1) == false)) { this->enter_zone(cmd); } @@ -493,8 +526,8 @@ void MainWindow::save_global_local_cfg() { this->check_config("dhcp", 0) && this->check_config("hw", 0)) && (this->check_config("region", 1) && this->check_config("zone", 1) && this->check_config("dhcp", 1) && this->check_config("hw", 1))) { - info_status_app("boxInfoMessOK"); - lblWarning->set_text(gettext("Nothing to save!")); + info_status_app(info_box_ok_css); + lblWarning->set_text(nothing_save); } else { string cmd = ""; @@ -510,46 +543,46 @@ void MainWindow::save_global_local_cfg() { if (flag_global == false) {} if ((this->check_config("region", 0) == false || this->check_config("zone", 0) == false)) { if (flag_local == false) { - cmd_zone = "ubconfig --target system set clock ZONE="; + cmd_zone = set_system_ZONE; this->enter_zone(cmd_zone); } } if ((this->check_config("region", 1) == false || this->check_config("zone", 1) == false)) { if (flag_global == false) { - cmd_zone = "ubconfig --target global set clock ZONE="; + cmd_zone = set_global_ZONE; this->enter_zone(cmd_zone); } } if (this->check_config("dhcp", 0) == false) { if (flag_local == false) { - cmd_default = "ubconfig --target system set network NTPSERVERS=default"; - cmd_dhcp = "ubconfig --target system set network NTPSERVERS=dhcp"; - cmd_set_ntp = "ubconfig --target system set network NTPSERVERS=\""; - remove_ntp = "ubconfig --target system remove network NTPSERVERS"; + cmd_default = set_system_NTPSERVERS_default; + cmd_dhcp = set_system_NTPSERVERS_dhcp; + cmd_set_ntp = set_system_NTPSERVERS; + remove_ntp = remove_system_NTPSERVERS; this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); } } if (this->check_config("dhcp", 1) == false) { if (flag_global == false) { - cmd_default = "ubconfig --target global set network NTPSERVERS=default"; - cmd_dhcp = "ubconfig --target global set network NTPSERVERS=dhcp"; - cmd_set_ntp = "ubconfig --target global set network NTPSERVERS=\""; - remove_ntp = "ubconfig --target global remove network NTPSERVERS"; + cmd_default = set_global_NTPSERVERS_default; + cmd_dhcp = set_global_NTPSERVERS_dhcp; + cmd_set_ntp = set_global_NTPSERVERS; + remove_ntp = remove_global_NTPSERVERS; this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); } } if (this->check_config("hw", 0) == false) { if (flag_local == false) { - local = "ubconfig --target system set clock HWCLOCK_SYNC=localtime"; - hw = "ubconfig --target system set clock HWCLOCK_SYNC=utc"; + local = set_system_HWCLOCK_SYNC_localtime; + hw = set_system_HWCLOCK_SYNC_utc; this->set_hardware_clock(local, hw); } } if (this->check_config("hw", 1) == false) { if (flag_global == false) { - local = "ubconfig --target global set clock HWCLOCK_SYNC=localtime"; - hw = "ubconfig --target global set clock HWCLOCK_SYNC=utc"; + local = set_global_HWCLOCK_SYNC_localtime; + hw = set_global_HWCLOCK_SYNC_utc; this->set_hardware_clock(local, hw); } } @@ -668,7 +701,7 @@ bool MainWindow::check_config(string key, int key_save) { return false; } -string MainWindow::get_ubconfig_value(string &cmd){ +string MainWindow::get_ubconfig_value(string cmd){ struct Result obj_result = this->wrapper_call(cmd); if (obj_result.error == 0) { return obj_result.response; @@ -684,50 +717,50 @@ string MainWindow::get_ubconfig_value(string &cmd){ void MainWindow::info_warning_error(int mess) { if (error_info > 0 || warning_info > 0) { - info_status_app("boxInfoMessError"); - imgInfo->set_from_icon_name("com.ublinux.ubl-settings-datetime.warning", Gtk::ICON_SIZE_MENU); + info_status_app(info_box_error_css); + imgInfo->set_from_icon_name(icon_warning, Gtk::ICON_SIZE_MENU); error_info = 0; warning_info = 0; string mess_error = ""; if (mess == 0) { - mess_error = string(gettext("Local configuration reading error")) + cmd_error; + mess_error = string(local_read_error) + cmd_error; lblWarning->set_text(mess_error); } else if (mess == 1) { - mess_error = string(gettext("Global configuration read error")) + cmd_error; + mess_error = string(global_read_error) + cmd_error; lblWarning->set_text(mess_error); } else if (mess == 2) { - mess_error = string(gettext("Local configuration write error")) + cmd_error; + mess_error = string(local_write_error) + cmd_error; lblWarning->set_text(mess_error); } else if (mess == 3) { - mess_error = string(gettext("Global configuration write error")) + cmd_error; + mess_error = string(global_write_error) + cmd_error; lblWarning->set_text(mess_error); } else if (mess == 4) { - mess_error = string(gettext("Error saved local and global configuration")) + cmd_error; + mess_error = string(error_save_all) + cmd_error; lblWarning->set_text(mess_error); } cmd_error = ""; } else { - info_status_app("boxInfoMessOK"); - imgInfo->set_from_icon_name("com.ublinux.ubl-settings-datetime.checked", Gtk::ICON_SIZE_MENU);//Gtk::IconSize::INHERIT); + info_status_app(info_box_ok_css); + imgInfo->set_from_icon_name(icon_checked, Gtk::ICON_SIZE_MENU);//Gtk::IconSize::INHERIT); if (mess == 0) { - lblWarning->set_text(gettext("Local configuration downloaded successfully")); + lblWarning->set_text(local_load_ok); } else if (mess == 1) { - lblWarning->set_text(gettext("Global configuration downloaded successfully")); + lblWarning->set_text(global_load_ok); } else if (mess == 2) { - lblWarning->set_text(gettext("Local configuration successfully written")); + lblWarning->set_text(local_ok_written); } else if (mess == 3) { - lblWarning->set_text(gettext("Global configuration successfully written")); + lblWarning->set_text(global_ok_written); } else if (mess == 4) { - lblWarning->set_text(gettext("Successfully saved local and global configuration")); + lblWarning->set_text(successfully_save_all); } } } @@ -772,7 +805,7 @@ void MainWindow::set_hardware_clock(string &local, string &etc) { } } -void MainWindow::get_hardware_clock(string &cmd) { +void MainWindow::get_hardware_clock(string cmd) { int error = warning_info; struct Result obj_result = this->wrapper_call(cmd); if (obj_result.error == 0) { @@ -810,15 +843,15 @@ void MainWindow::get_hardware_clock(string &cmd) { void MainWindow::hardware_clock() { int error_hw = error_info; - string cmd = "hwclock --systohc"; + string cmd = set_hwclock; wrapper_system(cmd); if (error_hw != error_info){ - lblWarning->set_text(gettext("Hardware clock synchronization error")); - info_status_app("boxInfoMessError"); + lblWarning->set_text(hardware_clock_error); + info_status_app(info_box_error_css); } else { - lblWarning->set_text(gettext("Hardware clock successfully synchronized")); - info_status_app("boxInfoMessOK"); + lblWarning->set_text(hardware_clock_ok); + info_status_app(info_box_ok_css); } } @@ -828,8 +861,8 @@ void MainWindow::gui_mess_close() { bool MainWindow::focus_ntp_text() { if (txtNtpServer->get_text() == "" || txtNtpServer->get_text() == " ") { - lblWarning->set_text(gettext("Enter a list of NTP servers")); - info_status_app("boxInfoMessError"); + lblWarning->set_text(entry_list_ntp); + info_status_app(info_box_error_css); btnSave->set_sensitive(false); return false; } @@ -852,20 +885,20 @@ bool MainWindow::focus_ntp_text() { } if ((flag_error == false) && (flag_error_check_ntp == false)) { this->write_config(str_ntp, "dhcp"); - lblWarning->set_text(gettext("NTP server name is correct")); - info_status_app("boxInfoMessOK"); + lblWarning->set_text(ntp_server_ok); + info_status_app(info_box_ok_css); btnSave->set_sensitive(true); return true; } else { if (flag_error == true) { - lblWarning->set_text(gettext("An invalid character is entered")); - info_status_app("boxInfoMessError"); + lblWarning->set_text(invalid_character_entry); + info_status_app(info_box_error_css); btnSave->set_sensitive(false); } else if (flag_error_check_ntp == true) { - lblWarning->set_text(gettext("Error in the NTP server name")); - info_status_app("boxInfoMessError"); + lblWarning->set_text(error_ntp_name); + info_status_app(info_box_error_css); btnSave->set_sensitive(false); } return false; @@ -1009,10 +1042,10 @@ void MainWindow::event_entry_cbDhcp() { txtNtpServer->grab_focus(); string cmd = ""; if (flag_load == false) { - cmd = "ubconfig --default --source system get network NTPSERVERS"; + cmd = get_system_NTPSERVERS; } else{ - cmd = "ubconfig --default --source global get network NTPSERVERS"; + cmd = get_global_NTPSERVERS; } string response = this->get_ubconfig_value(cmd); if (response != "dhcp" && response != "default") { @@ -1100,8 +1133,8 @@ void MainWindow::entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhc // btnUpdateDateTime->set_sensitive(false); if (str_dhcp == "") { this->write_config("", "dhcp"); - lblWarning->set_text(gettext("Enter a list of NTP servers")); - info_status_app("boxInfoMessError"); + lblWarning->set_text(entry_list_ntp); + info_status_app(info_box_error_css); btnSave->set_sensitive(false); } else if (str_dhcp == "(null)") { @@ -1177,7 +1210,7 @@ void MainWindow::calendar_show() { popCalendar->show(); } -void MainWindow::fill_in_reg_zone(string &cmd) { +void MainWindow::fill_in_reg_zone(string cmd) { int error = warning_info; struct Result obj_result_1 = this->wrapper_call(cmd); if (obj_result_1.error== 0) { @@ -1246,19 +1279,19 @@ void MainWindow::enter_zone(string &cmd) { index+= 1; } if (!(zone_text.empty())) { - str_zone = zone_text; - str_region = reg_text; - cmd = cmd + str_region + "/" + str_zone; + str_zone_buff = zone_text; + str_region_buff = reg_text; + cmd = cmd + str_region_buff + "/" + str_zone_buff; wrapper_system(cmd, "&"); } else { - str_zone = ""; - str_region = ""; + str_zone_buff = ""; + str_region_buff = ""; } } else { - str_zone = ""; - str_region = ""; + str_zone_buff = ""; + str_region_buff = ""; } } @@ -1274,13 +1307,13 @@ void MainWindow::parse_text_date() { void MainWindow::append_region_zone(string region, string zone, Gtk::ComboBoxText *tmpCbReg, Gtk::ComboBoxText *tmpCbZone) { this->write_config(region, "region"); this->write_config(zone, "zone"); - str_region = region; + str_region_buff = region; int index = 0; Glib::ustring reg_local = ""; int size_vec = array_region_local.size(); if (size_vec== 0) { for (auto& [key, value]: time_reg_map) { - array_region_local.push_back(string(gettext(key.c_str()))); + array_region_local.push_back(string(_(key.c_str()))); array_region.push_back(key); index += 1; } @@ -1306,7 +1339,7 @@ void MainWindow::append_region_zone(string region, string zone, Gtk::ComboBoxTex if (size_vec == 0) { tmpCbReg->append(Glib::ustring(reg)); } - if (reg == string(gettext(region.c_str()))) { + if (reg == string(_(region.c_str()))) { tmpCbReg->set_active_text(reg); } } @@ -1316,7 +1349,7 @@ void MainWindow::append_region_zone(string region, string zone, Gtk::ComboBoxTex string path_reg_zone = ""; string zone_offest = ""; path_reg_zone = region + "/" + zone; - zone_offest = this->zone_file_read(path_reg_zone) + gettext(zone.c_str()); + zone_offest = this->zone_file_read(path_reg_zone) + _(zone.c_str()); if (region == "") { tmpCbZone->append(" "); tmpCbZone->set_active(0); @@ -1376,12 +1409,12 @@ void MainWindow::append_zone() { cbZone->remove_all(); int index = cbRegion->get_active_row_number(); if (index!=-1) { - string str_region = array_region[index]; + string str_region_buff = array_region[index]; string zone_mixing = ""; - this->write_config(str_region, "region"); + this->write_config(str_region_buff, "region"); string path_dir = ""; - if(str_region.length() != 0) { - for (const auto &_str_zone : time_reg_map_local.at(str_region)) { + if(str_region_buff.length() != 0) { + for (const auto &_str_zone : time_reg_map_local.at(str_region_buff)) { cbZone->append(Glib::ustring(_str_zone)); } } @@ -1420,8 +1453,8 @@ void MainWindow::update_time_date() { year = 0; month = 0; day = 0; - lblWarning->set_text(gettext("Date and time are successfully synchronized")); - info_status_app("boxInfoMessOK"); + lblWarning->set_text(date_time_ok_synchronized); + info_status_app(info_box_ok_css); flag_error_time = false; } else { @@ -1438,8 +1471,8 @@ void MainWindow::update_time_date() { day = 0; } if (flag_error_time == false) { - lblWarning->set_text(gettext("Date and time are successfully synchronized")); - info_status_app("boxInfoMessOK"); + lblWarning->set_text(date_time_ok_synchronized); + info_status_app(info_box_ok_css); hour = numTimeHrs->get_value_as_int(); minute = numTimeMin->get_value_as_int(); time_t now = time(0); @@ -1464,19 +1497,19 @@ bool MainWindow::post_entry_data() { string str_error_clock = this->call(cmd); size_t index = str_error_clock.find("date:"); if (index != std::string::npos) { - lblWarning->set_text(gettext("Incorrect date format")); - info_status_app("boxInfoMessError"); + lblWarning->set_text(incorrect_date_f); + info_status_app(info_box_error_css); return true; } else { - lblWarning->set_text(gettext("Date and time are successfully synchronized")); - info_status_app("boxInfoMessOK"); + lblWarning->set_text(date_time_ok_synchronized); + info_status_app(info_box_ok_css); return false; } } else { - lblWarning->set_text(gettext("Incorrect date format")); - info_status_app("boxInfoMessError"); + lblWarning->set_text(incorrect_date_f); + info_status_app(info_box_error_css); return true; } } @@ -1541,7 +1574,7 @@ void MainWindow::read_file() { string reg_reg_zone = entry_reg_reg_zone.path().filename().string(); zone.push_back(reg_reg_zone); path_reg_zone=key_reg + "/" + reg_reg_zone; - key_zone_local = this->zone_file_read(path_reg_zone) + gettext(reg_reg_zone.c_str()); + key_zone_local = this->zone_file_read(path_reg_zone) + _(reg_reg_zone.c_str()); zone_local.push_back(key_zone_local); } in2.close(); @@ -1550,7 +1583,7 @@ void MainWindow::read_file() { else if (key_zone.length() != 0 || key_zone != " ") { zone.push_back(key_zone); path_reg_zone = key_reg + "/" + key_zone; - key_zone_local = this->zone_file_read(path_reg_zone) + gettext(key_zone.c_str()); + key_zone_local = this->zone_file_read(path_reg_zone) + _(key_zone.c_str()); zone_local.push_back(key_zone_local); } } @@ -1654,6 +1687,9 @@ string MainWindow::zone_file_read(string zone) { return str_utc; } +MainWindow::~MainWindow() { +} + vector MainWindow::split(const std::string &s, char delim) { std::stringstream ss(s); std::string item; @@ -1675,24 +1711,9 @@ SettingsPlug::SettingsPlug(::Window p_socketID, Glib::RefPtr build } void help() { - string version = string(gettext("ubl-settings-datetime version: ")) + version_application + "\n"; - cout << version.c_str(); - string help; - help = "GTK settings datetime for UBLinux\n\n" - "Usage: ubl-settings-datetime [OPTIONS...]\n" - "Options:\n" - " -h, --help Show this help\n" - " -V, --version 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"; - cout << gettext(help.c_str()); + string version = string(str_version) + version_application + "\n"; + cout << version.c_str();; + cout << str_help_h; } diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index bcb6dbe..b5949fc 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -17,17 +17,124 @@ #include #include #include +#include #include "ubl-util-standard.c" +#include "ubl-settings-datetime-cm.h" +#ifdef WEBKIT_FOUND +#include +#endif -using namespace std; -extern const string path_app; -extern const string path_glade; -extern const string app_name; -extern const string path_locale; -extern const string path_css; -extern const string path_img_head_background; +#define link_doc "https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/ubl-settings-datetime" +#define cmd_xdg "xdg-open " +#define cmd_execute "su -l %s -c \" DISPLAY=$DISPLAY %s \"" +#define get_NTPSERVERS_DEFAULT "ubconfig --source default get [] NTPSERVERS_DEFAULT" +#define get_global_NTPSERVERS "ubconfig --default --source global get network NTPSERVERS" +#define get_system_ZONE "ubconfig --default --source system get clock ZONE" +#define get_system_NTPSERVERS "ubconfig --default --source system get network NTPSERVERS" +#define get_system_HWCLOCK_SYNC "ubconfig --default --source system get clock HWCLOCK_SYNC" +#define get_global_ZONE "ubconfig --default --source global get clock ZONE" +#define get_global_HWCLOCK_SYNC "ubconfig --source global get clock HWCLOCK_SYNC" +#define set_system_ZONE "ubconfig --target system set clock ZONE=" +#define set_global_HWCLOCK_SYNC_utc "ubconfig --target global set clock HWCLOCK_SYNC=utc" +#define set_global_HWCLOCK_SYNC_localtime "ubconfig --target global set clock HWCLOCK_SYNC=localtime" +#define set_system_HWCLOCK_SYNC_localtime "ubconfig --target system set clock HWCLOCK_SYNC=localtime" +#define set_system_HWCLOCK_SYNC_utc "ubconfig --target system set clock HWCLOCK_SYNC=utc" +#define remove_global_NTPSERVERS "ubconfig --target global remove network NTPSERVERS" +#define set_system_NTPSERVERS_default "ubconfig --target system set network NTPSERVERS=default" +#define set_system_NTPSERVERS_dhcp "ubconfig --target system set network NTPSERVERS=dhcp" +#define set_system_NTPSERVERS "ubconfig --target system set network NTPSERVERS=\"" +#define remove_system_NTPSERVERS "ubconfig --target system remove network NTPSERVERS" +#define set_global_ZONE "ubconfig --target global set clock ZONE=" +#define set_global_NTPSERVERS_default "ubconfig --target global set network NTPSERVERS=default" +#define set_global_NTPSERVERS_dhcp "ubconfig --target global set network NTPSERVERS=dhcp" +#define set_global_NTPSERVERS "ubconfig --target global set network NTPSERVERS=\"" +#define set_hwclock "hwclock --systohc" +#define icon_checked "com.ublinux.ubl-settings-datetime.checked" +#define icon_warning "com.ublinux.ubl-settings-datetime.warning" +#define get_global_defalult_HWCLOCK_SYNC "ubconfig --default --source global get clock HWCLOCK_SYNC" +#define path_app "/usr/bin/" +#define path_glade "/usr/share/ubl-settings-datetime/ui/ubl-settings-datetime.glade" +#define app_name "ubl-settings-datetime" +#define path_locale "/usr/share/locale/" +#define path_css "/usr/share/ubl-settings-datetime/css/ubl-settings-datetime.css" +#define path_img_head_background "/usr/share/ubl-settings-datetime/images/logo-background.png" + + +#include +#define copyright _("Copyright © UBSoft LLC, 2022 - ") +#define name_app _("ubl-settings-datetime") +#define website _("https://wiki.ublinux.com") +#define home_page _("Project Home Page") +#define str_about_1 _("About") +#define str_about _("About ubl-settings-datetime") +#define str_help _("Help") +#define str_save _("Save") +#define str_load _("Load") +#define save_all _("Save in global and local configuration") +#define save_local _("Save in local configuration") +#define save_global _("Save in global configuration") +#define load_global _("Load global configuration") +#define load_local _("Load local configuration") +#define read_online _("Read online") +#define cancel _("Cancel") +#define always_redirect _("Always redirect") +#define nothing_save _("Nothing to save!") +#define read_documentation_web _("Would you like to read documentation in the Web?") +#define redirected_documentation _("You will be redirected to documentation site, where user help pages are ""translated and supported by community.") +#define str_help_h _("GTK settings datetime for UBLinux\n\n""Usage: ubl-settings-datetime [OPTIONS...]\n""Options:\n"" -h, --help Show this help\n"" -V, --version 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") +#define str_version _("ubl-settings-datetime version: ") +#define local_read_error _("Local configuration reading error") +#define global_read_error _("Global configuration read error") +#define local_write_error _("Local configuration write error") +#define global_write_error _("Global configuration write error") +#define error_save_all _("Error saved local and global configuration") +#define local_load_ok _("Local configuration downloaded successfully") +#define global_load_ok _("Global configuration downloaded successfully") +#define local_ok_written _("Local configuration successfully written") +#define global_ok_written _("Global configuration successfully written") +#define successfully_save_all _("Successfully saved local and global configuration") + +#define incorrect_date_f _("Incorrect date format") +#define date_time_ok_synchronized _("Date and time are successfully synchronized") +#define entry_list_ntp _("Enter a list of NTP servers") +#define error_ntp_name _("Error in the NTP server name") +#define invalid_character_entry _("An invalid character is entered") +#define ntp_server_ok _("NTP server name is correct") +#define hardware_clock_ok _("Hardware clock successfully synchronized") +#define hardware_clock_error _("Hardware clock synchronization error") + +#define no_recognized _("Argument not recognized\n") +#define program_as_root _("The program must be run as root") +#define str_date_flag _(": \"Date\"") +#define str_time_zone_flag _(": \"Time Zone\"") +#define str_hardware_time_flag _(": \"Hardware time\"") +#define str_NTP_flag _(": \"NTP\"") +#define str_default _("Default") +#define str_DHCP _("DHCP") +#define str_manual _("Manual") +#define str_disabled _("Disabled") +#define str_time _("Time:") +#define str_date_time _("Date and Time") +#define utc_time _("UTC time") +#define str_local_time _("Local time") +#define str_attention _("Attention") +#define str_sync_by _("Sync by") +#define str_zone _("Zone:") +#define str_region _("Region:") +#define str_time_zone _("Time zone") +#define str_date _("Date:") +#define synchronize_hw _("Synchronize hardware time") +#define setting_date_time _("Setting the date and time") +#define current_date_time _("Current date and time") +#define data_format_d_m_y _("Date of\nFormat: DD.MM.YYYY") +#define synchronize_ntp _("Synchronize via NTP") +#define enter_name_ntp_tooltip _("Enter the name of the ntp-server or its ip-address.\nWhen entering multiple addresses, separate them with commas.") +#define info_box_ok_css "boxInfoMessOK" +#define info_box_error_css "boxInfoMessError" + +using namespace std; extern bool flag_datetime; extern bool flag_timezone; extern bool flag_ntp_mode; @@ -115,6 +222,22 @@ class MainWindow : public Gtk::ApplicationWindow { Gtk::Image *imgSettings; Gtk::Overlay *overHead; Gtk::Image *imgHeadBackground; + Gtk::Label *lblHeadeWndWeb; + Gtk::Label *lblHeaderAboutTopic; + + Gtk::Label *lblwebHeaderName; + Gtk::Label *lblhelpText; + Gtk::Label *lblhelpHeader; + Gtk::CheckButton *chkAlwaysOpenHelp; + Gtk::Button *btnReadHelp; + Gtk::Button *btnCancelHelp; + Gtk::Window *wndShowWeb; + bool flag_open_browser = false; + #ifdef WEBKIT_FOUND + Gtk::Window *wndWeb; + Gtk::Widget *three; + WebKitWebView *one; + #endif string array_hw[2]; string array_hw_local[2]; bool flag_load = false; @@ -125,11 +248,12 @@ class MainWindow : public Gtk::ApplicationWindow { int error_info = 0; int warning_info = 0; string cmd_error = ""; + int index_error = 0; int flag_local_global_load = 2; int hour; int minute; - string str_region = ""; - string str_zone = ""; + string str_region_buff = ""; + string str_zone_buff = ""; int count_edit = 0; bool flag_global = false; bool flag_local = false; @@ -155,22 +279,24 @@ class MainWindow : public Gtk::ApplicationWindow { public: MainWindow(BaseObjectType* obj, Glib::RefPtr const& builder); MainWindow(Glib::RefPtr const& builder); - virtual ~MainWindow() = default; + ~MainWindow(); + void open_browser(); void log_mess_error(string &cmd); void set_hardware_clock(string &local, string &etc); void info_warning_error(int mess); void synopsis_show(); - void get_hardware_clock(string &cmd); + void get_hardware_clock(string cmd); void save_global_local_cfg(); - void fill_in_reg_zone(string &cmd); + void fill_in_reg_zone(string cmd); void load_globl_cfg(); void save_local_cfg(); + void template_open_browser(); void event_zone(); bool focus_ntp(GdkEventFocus* event); bool check_config(string key, int key_save); void event_log_hw(); void write_config(string data, string key); - string get_ubconfig_value(string &cmd); + string get_ubconfig_value(string cmd); void save_global_cfg(); void save_Dhcp(string &cmd_default, string &cmd_dhcp, string &remove, string &cmd_set_ntp); void load_local_cfg(); diff --git a/source/ubl-settings-datetime.h.in b/source/ubl-settings-datetime.h.in new file mode 100644 index 0000000..17ba454 --- /dev/null +++ b/source/ubl-settings-datetime.h.in @@ -0,0 +1 @@ +#cmakedefine WEBKIT_FOUND \ No newline at end of file diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index fbadc70..3c526f4 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -86,18 +86,16 @@ False - О Программе False True center - ubl-settings-datetime + com.ublinux.ubl-settings-datetime dialog + True True - False - False ubl-settings-datetime - 1.2 - Copyright © 2023 - UBSoft Software LLC + 1.0 + Copyright © 2022 - 2023, UBSoft LLC Setting the date and time https://ublinux.ru/ Project Home Page @@ -110,6 +108,7 @@ gpl-2-0 + True False vertical 2 @@ -117,14 +116,11 @@ False end - - - False False - 0 + 1 @@ -132,6 +128,28 @@ + + + True + False + True + + + True + False + 5 + 5 + 5 + 5 + 2 + ubl-settings-datetime + + + + + + + True @@ -283,7 +301,7 @@ True False - Save to global and local configuration + Save in global and local configuration @@ -293,7 +311,7 @@ True False - Save global configuration + Save in global configuration @@ -303,7 +321,7 @@ True False - Save local configuration + Save in local configuration @@ -1379,4 +1397,239 @@ Format: DD.MM.YYYY + + False + start + start + False + 450 + 250 + dialog-question-symbolic + + + True + False + vertical + + + True + False + + + True + False + start + 20 + 20 + dialog-question-symbolic + 6 + + + False + True + 0 + + + + + True + False + vertical + + + True + False + start + 10 + 5 + Would you like to read documentation in the Web? + True + 0 + + + + + + + False + True + 0 + + + + + True + False + start + start + 10 + 10 + You will be redirected to documentation website where documentation is translated and supported by community. + True + 0 + + + + True + True + 1 + + + + + Always redirect to online documentation + True + True + False + end + 10 + True + + + + False + True + 2 + + + + + + True + True + 1 + + + + + + True + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 30 + True + + + Cancel + True + True + True + + + + True + True + 0 + + + + + Read Online + True + True + True + + + + True + True + 1 + + + + + False + True + 1 + + + + + + + True + False + True + + + True + False + ubl-settings-datetime + + + + + + + + True + False + 32 + dialog-question-symbolic + + + + + + + 800 + 600 + False + True + True + com.ublinux.ubl-settings-datetime + center + + + + + + True + False + True + + + True + False + ubl-settings-datetime + + + + + True + False + 32 + com.ublinux.ubl-settings-datetime + 5 + + + + + diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot index 80bae74..ba7aa22 100644 --- a/ubl-settings-datetime.pot +++ b/ubl-settings-datetime.pot @@ -20,38 +20,47 @@ msgstr "" msgid ":" msgstr "" +#: source/ubl-settings-datetime.h:110 source/ubl-settings-datetime.h:109 +#: source/ubl-settings-datetime.cc:81 source/ubl-settings-datetime.cc:82 #: source/ubl-settings-datetime.cc:83 source/ubl-settings-datetime.cc:84 -#: source/ubl-settings-datetime.cc:82 msgid ": \"Date\"" msgstr "" +#: source/ubl-settings-datetime.h:112 source/ubl-settings-datetime.h:111 +#: source/ubl-settings-datetime.cc:59 source/ubl-settings-datetime.cc:61 +#: source/ubl-settings-datetime.cc:64 source/ubl-settings-datetime.cc:65 +#: source/ubl-settings-datetime.cc:71 source/ubl-settings-datetime.cc:72 +#: source/ubl-settings-datetime.cc:78 source/ubl-settings-datetime.cc:79 #: source/ubl-settings-datetime.cc:60 source/ubl-settings-datetime.cc:63 #: source/ubl-settings-datetime.cc:66 source/ubl-settings-datetime.cc:67 #: source/ubl-settings-datetime.cc:73 source/ubl-settings-datetime.cc:74 #: source/ubl-settings-datetime.cc:80 source/ubl-settings-datetime.cc:81 -#: source/ubl-settings-datetime.cc:85 source/ubl-settings-datetime.cc:59 -#: source/ubl-settings-datetime.cc:62 source/ubl-settings-datetime.cc:65 -#: source/ubl-settings-datetime.cc:72 source/ubl-settings-datetime.cc:79 +#: source/ubl-settings-datetime.cc:85 source/ubl-settings-datetime.cc:62 #: source/ubl-settings-datetime.cc:84 msgid ": \"Hardware time\"" msgstr "" -#: source/ubl-settings-datetime.cc:61 source/ubl-settings-datetime.cc:62 -#: source/ubl-settings-datetime.cc:64 source/ubl-settings-datetime.cc:69 -#: source/ubl-settings-datetime.cc:70 source/ubl-settings-datetime.cc:71 -#: source/ubl-settings-datetime.cc:72 source/ubl-settings-datetime.cc:76 -#: source/ubl-settings-datetime.cc:77 source/ubl-settings-datetime.cc:78 +#: source/ubl-settings-datetime.h:113 source/ubl-settings-datetime.h:112 +#: source/ubl-settings-datetime.cc:60 source/ubl-settings-datetime.cc:62 +#: source/ubl-settings-datetime.cc:67 source/ubl-settings-datetime.cc:68 +#: source/ubl-settings-datetime.cc:69 source/ubl-settings-datetime.cc:70 +#: source/ubl-settings-datetime.cc:74 source/ubl-settings-datetime.cc:75 +#: source/ubl-settings-datetime.cc:76 source/ubl-settings-datetime.cc:77 +#: source/ubl-settings-datetime.cc:80 source/ubl-settings-datetime.cc:61 +#: source/ubl-settings-datetime.cc:64 source/ubl-settings-datetime.cc:71 +#: source/ubl-settings-datetime.cc:72 source/ubl-settings-datetime.cc:78 #: source/ubl-settings-datetime.cc:79 source/ubl-settings-datetime.cc:82 -#: source/ubl-settings-datetime.cc:60 source/ubl-settings-datetime.cc:63 -#: source/ubl-settings-datetime.cc:68 source/ubl-settings-datetime.cc:75 -#: source/ubl-settings-datetime.cc:81 +#: source/ubl-settings-datetime.cc:63 source/ubl-settings-datetime.cc:81 msgid ": \"NTP\"" msgstr "" +#: source/ubl-settings-datetime.h:111 source/ubl-settings-datetime.h:110 +#: source/ubl-settings-datetime.cc:58 source/ubl-settings-datetime.cc:63 +#: source/ubl-settings-datetime.cc:66 source/ubl-settings-datetime.cc:73 #: source/ubl-settings-datetime.cc:59 source/ubl-settings-datetime.cc:65 #: source/ubl-settings-datetime.cc:68 source/ubl-settings-datetime.cc:75 -#: source/ubl-settings-datetime.cc:58 source/ubl-settings-datetime.cc:64 -#: source/ubl-settings-datetime.cc:67 source/ubl-settings-datetime.cc:74 +#: source/ubl-settings-datetime.cc:64 source/ubl-settings-datetime.cc:67 +#: source/ubl-settings-datetime.cc:74 msgid ": \"Time Zone\"" msgstr "" @@ -62,9 +71,15 @@ msgstr "" msgid "Abidjan" msgstr "" +#: source/ubl-settings-datetime.h:70 source/ubl-settings-datetime.h:69 msgid "About" msgstr "" +#: source/ubl-settings-datetime.h:71 source/ubl-settings-datetime.h:70 +#: source/ubl-settings-datetime.cc:137 +msgid "About ubl-settings-datetime" +msgstr "" + msgid "Accra" msgstr "" @@ -103,6 +118,11 @@ msgstr "" msgid "Almaty" msgstr "" +#: source/ubl-settings-datetime.h:82 source/ubl-settings-datetime.h:81 +#: source/ubl-settings-datetime.cc:173 +msgid "Always redirect" +msgstr "" + msgid "America" msgstr "" @@ -112,7 +132,9 @@ msgstr "" msgid "Amsterdam" msgstr "" -#: source/ubl-settings-datetime.cc:834 source/ubl-settings-datetime.cc:817 +#: source/ubl-settings-datetime.h:103 source/ubl-settings-datetime.h:102 +#: source/ubl-settings-datetime.cc:898 source/ubl-settings-datetime.cc:834 +#: source/ubl-settings-datetime.cc:817 msgid "An invalid character is entered" msgstr "" @@ -152,6 +174,7 @@ msgstr "" msgid "Arctic" msgstr "" +#: source/ubl-settings-datetime.h:108 source/ubl-settings-datetime.h:107 msgid "Argument not recognized\n" msgstr "" @@ -194,7 +217,9 @@ msgstr "" msgid "Atlantic" msgstr "" -#: source/ubl-settings-datetime.cc:152 source/ubl-settings-datetime.cc:147 +#: source/ubl-settings-datetime.h:122 source/ubl-settings-datetime.h:121 +#: source/ubl-settings-datetime.cc:157 source/ubl-settings-datetime.cc:152 +#: source/ubl-settings-datetime.cc:147 msgid "Attention" msgstr "" @@ -357,6 +382,11 @@ msgstr "" msgid "Canberra" msgstr "" +#: source/ubl-settings-datetime.h:81 source/ubl-settings-datetime.h:80 +#: source/ubl-settings-datetime.cc:172 +msgid "Cancel" +msgstr "" + msgid "Cancun" msgstr "" @@ -465,7 +495,9 @@ msgstr "" msgid "Copenhagen" msgstr "" -#: source/ubl-settings-datetime.cc:128 source/ubl-settings-datetime.cc:123 +#: source/ubl-settings-datetime.h:66 source/ubl-settings-datetime.h:65 +#: source/ubl-settings-datetime.cc:130 source/ubl-settings-datetime.cc:128 +#: source/ubl-settings-datetime.cc:123 msgid "Copyright © UBSoft LLC, 2022 - " msgstr "" @@ -487,14 +519,18 @@ msgstr "" msgid "Curacao" msgstr "" -#: source/ubl-settings-datetime.cc:143 source/ubl-settings-datetime.cc:138 +#: source/ubl-settings-datetime.h:130 source/ubl-settings-datetime.h:129 +#: source/ubl-settings-datetime.cc:147 source/ubl-settings-datetime.cc:143 +#: source/ubl-settings-datetime.cc:138 msgid "Current date and time" msgstr "" msgid "Currie" msgstr "" -#: source/ubl-settings-datetime.cc:140 source/ubl-settings-datetime.cc:135 +#: source/ubl-settings-datetime.h:115 source/ubl-settings-datetime.h:114 +#: source/ubl-settings-datetime.cc:144 source/ubl-settings-datetime.cc:140 +#: source/ubl-settings-datetime.cc:135 msgid "DHCP" msgstr "" @@ -516,22 +552,30 @@ msgstr "" msgid "Darwin" msgstr "" -#: source/ubl-settings-datetime.cc:130 source/ubl-settings-datetime.cc:125 +#: source/ubl-settings-datetime.h:119 source/ubl-settings-datetime.h:118 +#: source/ubl-settings-datetime.cc:133 source/ubl-settings-datetime.cc:130 +#: source/ubl-settings-datetime.cc:125 msgid "Date and Time" msgstr "" -#: source/ubl-settings-datetime.cc:1395 source/ubl-settings-datetime.cc:1414 -#: source/ubl-settings-datetime.cc:1445 +#: source/ubl-settings-datetime.h:100 source/ubl-settings-datetime.h:99 +#: source/ubl-settings-datetime.cc:1459 source/ubl-settings-datetime.cc:1477 +#: source/ubl-settings-datetime.cc:1508 source/ubl-settings-datetime.cc:1395 +#: source/ubl-settings-datetime.cc:1414 source/ubl-settings-datetime.cc:1445 msgid "Date and time are successfully synchronized" msgstr "" -#: source/ubl-settings-datetime.cc:136 source/ubl-settings-datetime.cc:131 +#: source/ubl-settings-datetime.h:131 source/ubl-settings-datetime.h:130 +#: source/ubl-settings-datetime.cc:140 source/ubl-settings-datetime.cc:136 +#: source/ubl-settings-datetime.cc:131 msgid "" "Date of\n" "Format: DD.MM.YYYY" msgstr "" -#: source/ubl-settings-datetime.cc:146 source/ubl-settings-datetime.cc:141 +#: source/ubl-settings-datetime.h:127 source/ubl-settings-datetime.h:126 +#: source/ubl-settings-datetime.cc:150 source/ubl-settings-datetime.cc:146 +#: source/ubl-settings-datetime.cc:141 msgid "Date:" msgstr "" @@ -547,7 +591,9 @@ msgstr "" msgid "DeNoronha" msgstr "" -#: source/ubl-settings-datetime.cc:139 source/ubl-settings-datetime.cc:134 +#: source/ubl-settings-datetime.h:114 source/ubl-settings-datetime.h:113 +#: source/ubl-settings-datetime.cc:143 source/ubl-settings-datetime.cc:139 +#: source/ubl-settings-datetime.cc:134 msgid "Default" msgstr "" @@ -563,7 +609,9 @@ msgstr "" msgid "Dili" msgstr "" -#: source/ubl-settings-datetime.cc:142 source/ubl-settings-datetime.cc:137 +#: source/ubl-settings-datetime.h:117 source/ubl-settings-datetime.h:116 +#: source/ubl-settings-datetime.cc:146 source/ubl-settings-datetime.cc:142 +#: source/ubl-settings-datetime.cc:137 msgid "Disabled" msgstr "" @@ -630,6 +678,8 @@ msgstr "" msgid "Ensenada" msgstr "" +#: source/ubl-settings-datetime.h:101 source/ubl-settings-datetime.h:100 +#: source/ubl-settings-datetime.cc:867 source/ubl-settings-datetime.cc:1139 #: source/ubl-settings-datetime.cc:803 source/ubl-settings-datetime.cc:1075 msgid "Enter a list of NTP servers" msgstr "" @@ -638,13 +688,16 @@ msgstr "" msgid "Enter a list of ntp servers" msgstr "" -#: source/ubl-settings-datetime.cc:137 source/ubl-settings-datetime.cc:132 +#: source/ubl-settings-datetime.h:133 source/ubl-settings-datetime.h:132 +#: source/ubl-settings-datetime.cc:141 source/ubl-settings-datetime.cc:137 +#: source/ubl-settings-datetime.cc:132 msgid "" "Enter the name of the ntp-server or its ip-address.\n" "When entering multiple addresses, separate them with commas." msgstr "" -#: source/ubl-settings-datetime.cc:839 +#: source/ubl-settings-datetime.h:102 source/ubl-settings-datetime.h:101 +#: source/ubl-settings-datetime.cc:903 source/ubl-settings-datetime.cc:839 msgid "Error in the NTP server name" msgstr "" @@ -652,7 +705,9 @@ msgstr "" msgid "Error in the ntp name" msgstr "" -#: source/ubl-settings-datetime.cc:681 source/ubl-settings-datetime.cc:678 +#: source/ubl-settings-datetime.h:92 source/ubl-settings-datetime.h:91 +#: source/ubl-settings-datetime.cc:745 source/ubl-settings-datetime.cc:681 +#: source/ubl-settings-datetime.cc:678 msgid "Error saved local and global configuration" msgstr "" @@ -698,6 +753,7 @@ msgstr "" msgid "GMT-3" msgstr "" +#: source/ubl-settings-datetime.h:86 source/ubl-settings-datetime.h:85 msgid "" "GTK settings datetime for UBLinux\n" "\n" @@ -737,19 +793,27 @@ msgstr "" msgid "Glace_Bay" msgstr "" -#: source/ubl-settings-datetime.cc:693 source/ubl-settings-datetime.cc:690 +#: source/ubl-settings-datetime.h:94 source/ubl-settings-datetime.h:93 +#: source/ubl-settings-datetime.cc:757 source/ubl-settings-datetime.cc:693 +#: source/ubl-settings-datetime.cc:690 msgid "Global configuration downloaded successfully" msgstr "" -#: source/ubl-settings-datetime.cc:669 source/ubl-settings-datetime.cc:666 +#: source/ubl-settings-datetime.h:89 source/ubl-settings-datetime.h:88 +#: source/ubl-settings-datetime.cc:733 source/ubl-settings-datetime.cc:669 +#: source/ubl-settings-datetime.cc:666 msgid "Global configuration read error" msgstr "" -#: source/ubl-settings-datetime.cc:699 source/ubl-settings-datetime.cc:696 +#: source/ubl-settings-datetime.h:96 source/ubl-settings-datetime.h:95 +#: source/ubl-settings-datetime.cc:763 source/ubl-settings-datetime.cc:699 +#: source/ubl-settings-datetime.cc:696 msgid "Global configuration successfully written" msgstr "" -#: source/ubl-settings-datetime.cc:677 source/ubl-settings-datetime.cc:674 +#: source/ubl-settings-datetime.h:91 source/ubl-settings-datetime.h:90 +#: source/ubl-settings-datetime.cc:741 source/ubl-settings-datetime.cc:677 +#: source/ubl-settings-datetime.cc:674 msgid "Global configuration write error" msgstr "" @@ -801,11 +865,13 @@ msgstr "" msgid "Harbin" msgstr "" -#: source/ubl-settings-datetime.cc:792 +#: source/ubl-settings-datetime.h:105 source/ubl-settings-datetime.h:104 +#: source/ubl-settings-datetime.cc:856 source/ubl-settings-datetime.cc:792 msgid "Hardware clock successfully synchronized" msgstr "" -#: source/ubl-settings-datetime.cc:788 +#: source/ubl-settings-datetime.h:106 source/ubl-settings-datetime.h:105 +#: source/ubl-settings-datetime.cc:852 source/ubl-settings-datetime.cc:788 msgid "Hardware clock synchronization error" msgstr "" @@ -818,6 +884,7 @@ msgstr "" msgid "Hebron" msgstr "" +#: source/ubl-settings-datetime.h:72 source/ubl-settings-datetime.h:71 msgid "Help" msgstr "" @@ -842,6 +909,8 @@ msgstr "" msgid "Hovd" msgstr "" +#: source/ubl-settings-datetime.h:99 source/ubl-settings-datetime.h:98 +#: source/ubl-settings-datetime.cc:1503 source/ubl-settings-datetime.cc:1514 #: source/ubl-settings-datetime.cc:1440 source/ubl-settings-datetime.cc:1451 #: source/ubl-settings-datetime.cc:1402 source/ubl-settings-datetime.cc:1407 msgid "Incorrect date format" @@ -1018,33 +1087,47 @@ msgstr "" msgid "Ljubljana" msgstr "" -#: source/ubl-settings-datetime.cc:135 source/ubl-settings-datetime.cc:130 +#: source/ubl-settings-datetime.h:74 source/ubl-settings-datetime.h:73 +#: source/ubl-settings-datetime.cc:139 source/ubl-settings-datetime.cc:135 +#: source/ubl-settings-datetime.cc:130 msgid "Load" msgstr "" +#: source/ubl-settings-datetime.h:78 source/ubl-settings-datetime.h:77 msgid "Load global configuration" msgstr "" +#: source/ubl-settings-datetime.h:79 source/ubl-settings-datetime.h:78 msgid "Load local configuration" msgstr "" -#: source/ubl-settings-datetime.cc:690 source/ubl-settings-datetime.cc:687 +#: source/ubl-settings-datetime.h:93 source/ubl-settings-datetime.h:92 +#: source/ubl-settings-datetime.cc:754 source/ubl-settings-datetime.cc:690 +#: source/ubl-settings-datetime.cc:687 msgid "Local configuration downloaded successfully" msgstr "" -#: source/ubl-settings-datetime.cc:665 source/ubl-settings-datetime.cc:662 +#: source/ubl-settings-datetime.h:88 source/ubl-settings-datetime.h:87 +#: source/ubl-settings-datetime.cc:729 source/ubl-settings-datetime.cc:665 +#: source/ubl-settings-datetime.cc:662 msgid "Local configuration reading error" msgstr "" -#: source/ubl-settings-datetime.cc:696 source/ubl-settings-datetime.cc:693 +#: source/ubl-settings-datetime.h:95 source/ubl-settings-datetime.h:94 +#: source/ubl-settings-datetime.cc:760 source/ubl-settings-datetime.cc:696 +#: source/ubl-settings-datetime.cc:693 msgid "Local configuration successfully written" msgstr "" -#: source/ubl-settings-datetime.cc:673 source/ubl-settings-datetime.cc:670 +#: source/ubl-settings-datetime.h:90 source/ubl-settings-datetime.h:89 +#: source/ubl-settings-datetime.cc:737 source/ubl-settings-datetime.cc:673 +#: source/ubl-settings-datetime.cc:670 msgid "Local configuration write error" msgstr "" -#: source/ubl-settings-datetime.cc:156 source/ubl-settings-datetime.cc:151 +#: source/ubl-settings-datetime.h:121 source/ubl-settings-datetime.h:120 +#: source/ubl-settings-datetime.cc:161 source/ubl-settings-datetime.cc:156 +#: source/ubl-settings-datetime.cc:151 msgid "Local time" msgstr "" @@ -1129,7 +1212,9 @@ msgstr "" msgid "Manila" msgstr "" -#: source/ubl-settings-datetime.cc:141 source/ubl-settings-datetime.cc:136 +#: source/ubl-settings-datetime.h:116 source/ubl-settings-datetime.h:115 +#: source/ubl-settings-datetime.cc:145 source/ubl-settings-datetime.cc:141 +#: source/ubl-settings-datetime.cc:136 msgid "Manual" msgstr "" @@ -1254,7 +1339,8 @@ msgstr "" msgid "NTP is correct" msgstr "" -#: source/ubl-settings-datetime.cc:827 +#: source/ubl-settings-datetime.h:104 source/ubl-settings-datetime.h:103 +#: source/ubl-settings-datetime.cc:891 source/ubl-settings-datetime.cc:827 msgid "NTP server name is correct" msgstr "" @@ -1306,9 +1392,12 @@ msgstr "" msgid "North_Dokota" msgstr "" -#: source/ubl-settings-datetime.cc:434 source/ubl-settings-datetime.cc:466 -#: source/ubl-settings-datetime.cc:497 source/ubl-settings-datetime.cc:433 -#: source/ubl-settings-datetime.cc:464 source/ubl-settings-datetime.cc:494 +#: source/ubl-settings-datetime.h:83 source/ubl-settings-datetime.h:82 +#: source/ubl-settings-datetime.cc:473 source/ubl-settings-datetime.cc:502 +#: source/ubl-settings-datetime.cc:533 source/ubl-settings-datetime.cc:434 +#: source/ubl-settings-datetime.cc:466 source/ubl-settings-datetime.cc:497 +#: source/ubl-settings-datetime.cc:433 source/ubl-settings-datetime.cc:464 +#: source/ubl-settings-datetime.cc:494 msgid "Nothing to save!" msgstr "" @@ -1417,7 +1506,9 @@ msgstr "" msgid "Prague" msgstr "" -#: source/ubl-settings-datetime.cc:133 source/ubl-settings-datetime.cc:128 +#: source/ubl-settings-datetime.h:69 source/ubl-settings-datetime.h:68 +#: source/ubl-settings-datetime.cc:136 source/ubl-settings-datetime.cc:133 +#: source/ubl-settings-datetime.cc:128 msgid "Project Home Page" msgstr "" @@ -1454,13 +1545,20 @@ msgstr "" msgid "Rarotonga" msgstr "" +#: source/ubl-settings-datetime.h:80 source/ubl-settings-datetime.h:79 +#: source/ubl-settings-datetime.cc:171 +msgid "Read online" +msgstr "" + msgid "Recife" msgstr "" msgid "Regina" msgstr "" -#: source/ubl-settings-datetime.cc:148 source/ubl-settings-datetime.cc:143 +#: source/ubl-settings-datetime.h:125 source/ubl-settings-datetime.h:124 +#: source/ubl-settings-datetime.cc:152 source/ubl-settings-datetime.cc:148 +#: source/ubl-settings-datetime.cc:143 msgid "Region:" msgstr "" @@ -1551,17 +1649,22 @@ msgstr "" msgid "Saskatchewan" msgstr "" -#: source/ubl-settings-datetime.cc:134 source/ubl-settings-datetime.cc:129 +#: source/ubl-settings-datetime.h:73 source/ubl-settings-datetime.h:72 +#: source/ubl-settings-datetime.cc:138 source/ubl-settings-datetime.cc:134 +#: source/ubl-settings-datetime.cc:129 msgid "Save" msgstr "" -msgid "Save global configuration" +#: source/ubl-settings-datetime.h:77 source/ubl-settings-datetime.h:76 +msgid "Save in global configuration" msgstr "" -msgid "Save local configuration" +#: source/ubl-settings-datetime.h:76 source/ubl-settings-datetime.h:75 +msgid "Save in local configuration" msgstr "" -msgid "Save to global and local configuration" +#: source/ubl-settings-datetime.h:75 source/ubl-settings-datetime.h:74 +msgid "Save in global and local configuration" msgstr "" msgid "Scoresbysund" @@ -1576,7 +1679,9 @@ msgstr "" msgid "Setting date and time in global configuration" msgstr "" -#: source/ubl-settings-datetime.cc:144 source/ubl-settings-datetime.cc:139 +#: source/ubl-settings-datetime.h:129 source/ubl-settings-datetime.h:128 +#: source/ubl-settings-datetime.cc:148 source/ubl-settings-datetime.cc:144 +#: source/ubl-settings-datetime.cc:139 msgid "Setting the date and time" msgstr "" @@ -1646,7 +1751,9 @@ msgstr "" msgid "Stop the synchronization service" msgstr "" -#: source/ubl-settings-datetime.cc:702 source/ubl-settings-datetime.cc:699 +#: source/ubl-settings-datetime.h:97 source/ubl-settings-datetime.h:96 +#: source/ubl-settings-datetime.cc:766 source/ubl-settings-datetime.cc:702 +#: source/ubl-settings-datetime.cc:699 msgid "Successfully saved local and global configuration" msgstr "" @@ -1656,19 +1763,26 @@ msgstr "" msgid "Sydney" msgstr "" -#: source/ubl-settings-datetime.cc:150 source/ubl-settings-datetime.cc:145 +#: source/ubl-settings-datetime.h:123 source/ubl-settings-datetime.h:122 +#: source/ubl-settings-datetime.cc:154 source/ubl-settings-datetime.cc:150 +#: source/ubl-settings-datetime.cc:145 msgid "Sync by" msgstr "" -#: source/ubl-settings-datetime.cc:153 source/ubl-settings-datetime.cc:148 +#: source/ubl-settings-datetime.h:128 source/ubl-settings-datetime.h:127 +#: source/ubl-settings-datetime.cc:158 source/ubl-settings-datetime.cc:153 +#: source/ubl-settings-datetime.cc:148 msgid "Synchronize hardware time" msgstr "" -#: source/ubl-settings-datetime.cc:154 source/ubl-settings-datetime.cc:149 +#: source/ubl-settings-datetime.cc:159 source/ubl-settings-datetime.cc:154 +#: source/ubl-settings-datetime.cc:149 msgid "Synchronize hardware time:" msgstr "" -#: source/ubl-settings-datetime.cc:138 source/ubl-settings-datetime.cc:133 +#: source/ubl-settings-datetime.h:132 source/ubl-settings-datetime.h:131 +#: source/ubl-settings-datetime.cc:142 source/ubl-settings-datetime.cc:138 +#: source/ubl-settings-datetime.cc:133 msgid "Synchronize via NTP" msgstr "" @@ -1708,7 +1822,9 @@ msgstr "" msgid "Tell_City" msgstr "" -#: source/ubl-settings-datetime.cc:120 source/ubl-settings-datetime.cc:115 +#: source/ubl-settings-datetime.h:109 source/ubl-settings-datetime.h:108 +#: source/ubl-settings-datetime.cc:122 source/ubl-settings-datetime.cc:120 +#: source/ubl-settings-datetime.cc:115 msgid "The program must be run as root" msgstr "" @@ -1735,11 +1851,15 @@ msgstr "" msgid "Timbuktu" msgstr "" -#: source/ubl-settings-datetime.cc:147 source/ubl-settings-datetime.cc:142 +#: source/ubl-settings-datetime.h:126 source/ubl-settings-datetime.h:125 +#: source/ubl-settings-datetime.cc:151 source/ubl-settings-datetime.cc:147 +#: source/ubl-settings-datetime.cc:142 msgid "Time zone" msgstr "" -#: source/ubl-settings-datetime.cc:145 source/ubl-settings-datetime.cc:140 +#: source/ubl-settings-datetime.h:118 source/ubl-settings-datetime.h:117 +#: source/ubl-settings-datetime.cc:149 source/ubl-settings-datetime.cc:145 +#: source/ubl-settings-datetime.cc:140 msgid "Time:" msgstr "" @@ -1782,7 +1902,9 @@ msgstr "" msgid "US" msgstr "" -#: source/ubl-settings-datetime.cc:155 source/ubl-settings-datetime.cc:150 +#: source/ubl-settings-datetime.h:120 source/ubl-settings-datetime.h:119 +#: source/ubl-settings-datetime.cc:160 source/ubl-settings-datetime.cc:155 +#: source/ubl-settings-datetime.cc:150 msgid "UTC time" msgstr "" @@ -1876,6 +1998,11 @@ msgstr "" msgid "Winnipeg" msgstr "" +#: source/ubl-settings-datetime.h:84 source/ubl-settings-datetime.h:83 +#: source/ubl-settings-datetime.cc:168 +msgid "Would you like to read documentation in the Web?" +msgstr "" + msgid "Yakutat" msgstr "" @@ -1900,6 +2027,13 @@ msgstr "" msgid "Yerevan" msgstr "" +#: source/ubl-settings-datetime.h:85 source/ubl-settings-datetime.h:84 +#: source/ubl-settings-datetime.cc:169 +msgid "" +"You will be redirected to documentation site, where user help pages are " +"translated and supported by community." +msgstr "" + msgid "Yukon" msgstr "" @@ -1909,7 +2043,9 @@ msgstr "" msgid "Zaporozhye" msgstr "" -#: source/ubl-settings-datetime.cc:149 source/ubl-settings-datetime.cc:144 +#: source/ubl-settings-datetime.h:124 source/ubl-settings-datetime.h:123 +#: source/ubl-settings-datetime.cc:153 source/ubl-settings-datetime.cc:149 +#: source/ubl-settings-datetime.cc:144 msgid "Zone:" msgstr "" @@ -1919,7 +2055,9 @@ msgstr "" msgid "Zurich" msgstr "" -#: source/ubl-settings-datetime.cc:131 source/ubl-settings-datetime.cc:126 +#: source/ubl-settings-datetime.h:68 source/ubl-settings-datetime.h:67 +#: source/ubl-settings-datetime.cc:134 source/ubl-settings-datetime.cc:131 +#: source/ubl-settings-datetime.cc:126 msgid "https://wiki.ublinux.com" msgstr "" @@ -1928,10 +2066,19 @@ msgid "" "https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/" msgstr "" -#: source/ubl-settings-datetime.cc:151 source/ubl-settings-datetime.cc:146 +#: source/ubl-settings-datetime.cc:174 +msgid "ubl-settings-bootloader" +msgstr "" + +#: source/ubl-settings-datetime.h:67 source/ubl-settings-datetime.h:66 +#: source/ubl-settings-datetime.cc:131 source/ubl-settings-datetime.cc:155 +#: source/ubl-settings-datetime.cc:156 source/ubl-settings-datetime.cc:151 +#: source/ubl-settings-datetime.cc:146 msgid "ubl-settings-datetime" msgstr "" -#: source/ubl-settings-datetime.cc:1651 source/ubl-settings-datetime.cc:1606 +#: source/ubl-settings-datetime.h:87 source/ubl-settings-datetime.h:86 +#: source/ubl-settings-datetime.cc:1714 source/ubl-settings-datetime.cc:1651 +#: source/ubl-settings-datetime.cc:1606 msgid "ubl-settings-datetime version: " msgstr "" diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index 319ce54..8e3d375 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ubl-settings-datetime 1.0\n" "Report-Msgid-Bugs-To: info@ublinux.com\n" -"POT-Creation-Date: 2023-01-01 00:00+0600\n" +"POT-Creation-Date: 2023-04-25 15:44+0600\n" "PO-Revision-Date: 2023-01-01 00:00+0600\n" "Last-Translator: UBLinux Team \n" "Language-Team: Russian - UBLinux Team \n" @@ -20,38 +20,47 @@ msgstr "" msgid ":" msgstr ":" +#: source/ubl-settings-datetime.h:110 source/ubl-settings-datetime.h:109 +#: source/ubl-settings-datetime.cc:81 source/ubl-settings-datetime.cc:82 #: source/ubl-settings-datetime.cc:83 source/ubl-settings-datetime.cc:84 -#: source/ubl-settings-datetime.cc:82 msgid ": \"Date\"" msgstr ": \"Дата\"" +#: source/ubl-settings-datetime.h:112 source/ubl-settings-datetime.h:111 +#: source/ubl-settings-datetime.cc:59 source/ubl-settings-datetime.cc:61 +#: source/ubl-settings-datetime.cc:64 source/ubl-settings-datetime.cc:65 +#: source/ubl-settings-datetime.cc:71 source/ubl-settings-datetime.cc:72 +#: source/ubl-settings-datetime.cc:78 source/ubl-settings-datetime.cc:79 #: source/ubl-settings-datetime.cc:60 source/ubl-settings-datetime.cc:63 #: source/ubl-settings-datetime.cc:66 source/ubl-settings-datetime.cc:67 #: source/ubl-settings-datetime.cc:73 source/ubl-settings-datetime.cc:74 #: source/ubl-settings-datetime.cc:80 source/ubl-settings-datetime.cc:81 -#: source/ubl-settings-datetime.cc:85 source/ubl-settings-datetime.cc:59 -#: source/ubl-settings-datetime.cc:62 source/ubl-settings-datetime.cc:65 -#: source/ubl-settings-datetime.cc:72 source/ubl-settings-datetime.cc:79 +#: source/ubl-settings-datetime.cc:85 source/ubl-settings-datetime.cc:62 #: source/ubl-settings-datetime.cc:84 msgid ": \"Hardware time\"" msgstr ": \"Аппаратное время\"" -#: source/ubl-settings-datetime.cc:61 source/ubl-settings-datetime.cc:62 -#: source/ubl-settings-datetime.cc:64 source/ubl-settings-datetime.cc:69 -#: source/ubl-settings-datetime.cc:70 source/ubl-settings-datetime.cc:71 -#: source/ubl-settings-datetime.cc:72 source/ubl-settings-datetime.cc:76 -#: source/ubl-settings-datetime.cc:77 source/ubl-settings-datetime.cc:78 +#: source/ubl-settings-datetime.h:113 source/ubl-settings-datetime.h:112 +#: source/ubl-settings-datetime.cc:60 source/ubl-settings-datetime.cc:62 +#: source/ubl-settings-datetime.cc:67 source/ubl-settings-datetime.cc:68 +#: source/ubl-settings-datetime.cc:69 source/ubl-settings-datetime.cc:70 +#: source/ubl-settings-datetime.cc:74 source/ubl-settings-datetime.cc:75 +#: source/ubl-settings-datetime.cc:76 source/ubl-settings-datetime.cc:77 +#: source/ubl-settings-datetime.cc:80 source/ubl-settings-datetime.cc:61 +#: source/ubl-settings-datetime.cc:64 source/ubl-settings-datetime.cc:71 +#: source/ubl-settings-datetime.cc:72 source/ubl-settings-datetime.cc:78 #: source/ubl-settings-datetime.cc:79 source/ubl-settings-datetime.cc:82 -#: source/ubl-settings-datetime.cc:60 source/ubl-settings-datetime.cc:63 -#: source/ubl-settings-datetime.cc:68 source/ubl-settings-datetime.cc:75 -#: source/ubl-settings-datetime.cc:81 +#: source/ubl-settings-datetime.cc:63 source/ubl-settings-datetime.cc:81 msgid ": \"NTP\"" msgstr "" +#: source/ubl-settings-datetime.h:111 source/ubl-settings-datetime.h:110 +#: source/ubl-settings-datetime.cc:58 source/ubl-settings-datetime.cc:63 +#: source/ubl-settings-datetime.cc:66 source/ubl-settings-datetime.cc:73 #: source/ubl-settings-datetime.cc:59 source/ubl-settings-datetime.cc:65 #: source/ubl-settings-datetime.cc:68 source/ubl-settings-datetime.cc:75 -#: source/ubl-settings-datetime.cc:58 source/ubl-settings-datetime.cc:64 -#: source/ubl-settings-datetime.cc:67 source/ubl-settings-datetime.cc:74 +#: source/ubl-settings-datetime.cc:64 source/ubl-settings-datetime.cc:67 +#: source/ubl-settings-datetime.cc:74 msgid ": \"Time Zone\"" msgstr ": \"Временная зона\"" @@ -62,9 +71,15 @@ msgstr "" msgid "Abidjan" msgstr "Абиджан" +#: source/ubl-settings-datetime.h:70 source/ubl-settings-datetime.h:69 msgid "About" msgstr "О программе" +#: source/ubl-settings-datetime.h:71 source/ubl-settings-datetime.h:70 +#: source/ubl-settings-datetime.cc:137 +msgid "About ubl-settings-datetime" +msgstr "О программе Настройка даты и времени" + msgid "Accra" msgstr "Аккра" @@ -105,6 +120,11 @@ msgstr "Алжир" msgid "Almaty" msgstr "Алматы" +#: source/ubl-settings-datetime.h:82 source/ubl-settings-datetime.h:81 +#: source/ubl-settings-datetime.cc:173 +msgid "Always redirect" +msgstr "Всегда перенаправлять" + msgid "America" msgstr "Америка" @@ -114,7 +134,9 @@ msgstr "Амман" msgid "Amsterdam" msgstr "Амстердам" -#: source/ubl-settings-datetime.cc:834 source/ubl-settings-datetime.cc:817 +#: source/ubl-settings-datetime.h:103 source/ubl-settings-datetime.h:102 +#: source/ubl-settings-datetime.cc:898 source/ubl-settings-datetime.cc:834 +#: source/ubl-settings-datetime.cc:817 msgid "An invalid character is entered" msgstr "Введён недопустимый символ" @@ -154,6 +176,7 @@ msgstr "Арагуайна" msgid "Arctic" msgstr "Арктика" +#: source/ubl-settings-datetime.h:108 source/ubl-settings-datetime.h:107 msgid "Argument not recognized\n" msgstr "Нepacпoзнaнный аргумент\n" @@ -196,7 +219,9 @@ msgstr "Атка" msgid "Atlantic" msgstr "Атлантика" -#: source/ubl-settings-datetime.cc:152 source/ubl-settings-datetime.cc:147 +#: source/ubl-settings-datetime.h:122 source/ubl-settings-datetime.h:121 +#: source/ubl-settings-datetime.cc:157 source/ubl-settings-datetime.cc:152 +#: source/ubl-settings-datetime.cc:147 msgid "Attention" msgstr "Внимание" @@ -359,6 +384,11 @@ msgstr "Канари" msgid "Canberra" msgstr "Канберра" +#: source/ubl-settings-datetime.h:81 source/ubl-settings-datetime.h:80 +#: source/ubl-settings-datetime.cc:172 +msgid "Cancel" +msgstr "Отменить" + msgid "Cancun" msgstr "Канкун" @@ -467,7 +497,9 @@ msgstr "Континентальный" msgid "Copenhagen" msgstr "Копенгаген" -#: source/ubl-settings-datetime.cc:128 source/ubl-settings-datetime.cc:123 +#: source/ubl-settings-datetime.h:66 source/ubl-settings-datetime.h:65 +#: source/ubl-settings-datetime.cc:130 source/ubl-settings-datetime.cc:128 +#: source/ubl-settings-datetime.cc:123 msgid "Copyright © UBSoft LLC, 2022 - " msgstr "Авторские права © ООО \"Юбисофт\", 2022 - " @@ -489,14 +521,18 @@ msgstr "Куяба" msgid "Curacao" msgstr "Кюрасао" -#: source/ubl-settings-datetime.cc:143 source/ubl-settings-datetime.cc:138 +#: source/ubl-settings-datetime.h:130 source/ubl-settings-datetime.h:129 +#: source/ubl-settings-datetime.cc:147 source/ubl-settings-datetime.cc:143 +#: source/ubl-settings-datetime.cc:138 msgid "Current date and time" msgstr "Текущие дата и время" msgid "Currie" msgstr "Карри" -#: source/ubl-settings-datetime.cc:140 source/ubl-settings-datetime.cc:135 +#: source/ubl-settings-datetime.h:115 source/ubl-settings-datetime.h:114 +#: source/ubl-settings-datetime.cc:144 source/ubl-settings-datetime.cc:140 +#: source/ubl-settings-datetime.cc:135 msgid "DHCP" msgstr "" @@ -518,16 +554,22 @@ msgstr "Дар-эс-Салам" msgid "Darwin" msgstr "Дарвин" -#: source/ubl-settings-datetime.cc:130 source/ubl-settings-datetime.cc:125 +#: source/ubl-settings-datetime.h:119 source/ubl-settings-datetime.h:118 +#: source/ubl-settings-datetime.cc:133 source/ubl-settings-datetime.cc:130 +#: source/ubl-settings-datetime.cc:125 msgid "Date and Time" msgstr "Дата и Время" -#: source/ubl-settings-datetime.cc:1395 source/ubl-settings-datetime.cc:1414 -#: source/ubl-settings-datetime.cc:1445 +#: source/ubl-settings-datetime.h:100 source/ubl-settings-datetime.h:99 +#: source/ubl-settings-datetime.cc:1459 source/ubl-settings-datetime.cc:1477 +#: source/ubl-settings-datetime.cc:1508 source/ubl-settings-datetime.cc:1395 +#: source/ubl-settings-datetime.cc:1414 source/ubl-settings-datetime.cc:1445 msgid "Date and time are successfully synchronized" msgstr "Дата и время успешно синхронизированы" -#: source/ubl-settings-datetime.cc:136 source/ubl-settings-datetime.cc:131 +#: source/ubl-settings-datetime.h:131 source/ubl-settings-datetime.h:130 +#: source/ubl-settings-datetime.cc:140 source/ubl-settings-datetime.cc:136 +#: source/ubl-settings-datetime.cc:131 msgid "" "Date of\n" "Format: DD.MM.YYYY" @@ -535,7 +577,9 @@ msgstr "" "Дата\n" "Формат: ДД.ММ.ГГГГ" -#: source/ubl-settings-datetime.cc:146 source/ubl-settings-datetime.cc:141 +#: source/ubl-settings-datetime.h:127 source/ubl-settings-datetime.h:126 +#: source/ubl-settings-datetime.cc:150 source/ubl-settings-datetime.cc:146 +#: source/ubl-settings-datetime.cc:141 msgid "Date:" msgstr "Дата:" @@ -551,7 +595,9 @@ msgstr "Доусон Крик" msgid "DeNoronha" msgstr "Фернанду-ди-Норонья" -#: source/ubl-settings-datetime.cc:139 source/ubl-settings-datetime.cc:134 +#: source/ubl-settings-datetime.h:114 source/ubl-settings-datetime.h:113 +#: source/ubl-settings-datetime.cc:143 source/ubl-settings-datetime.cc:139 +#: source/ubl-settings-datetime.cc:134 msgid "Default" msgstr "По умолчанию" @@ -567,7 +613,9 @@ msgstr "Дакка" msgid "Dili" msgstr "Дили" -#: source/ubl-settings-datetime.cc:142 source/ubl-settings-datetime.cc:137 +#: source/ubl-settings-datetime.h:117 source/ubl-settings-datetime.h:116 +#: source/ubl-settings-datetime.cc:146 source/ubl-settings-datetime.cc:142 +#: source/ubl-settings-datetime.cc:137 msgid "Disabled" msgstr "Отключено" @@ -634,6 +682,8 @@ msgstr "Эндербери" msgid "Ensenada" msgstr "Энсенада" +#: source/ubl-settings-datetime.h:101 source/ubl-settings-datetime.h:100 +#: source/ubl-settings-datetime.cc:867 source/ubl-settings-datetime.cc:1139 #: source/ubl-settings-datetime.cc:803 source/ubl-settings-datetime.cc:1075 msgid "Enter a list of NTP servers" msgstr "Введите перечень NTP серверов" @@ -643,7 +693,9 @@ msgstr "Введите перечень NTP серверов" msgid "Enter a list of ntp servers" msgstr "Введите перечень NTP серверов" -#: source/ubl-settings-datetime.cc:137 source/ubl-settings-datetime.cc:132 +#: source/ubl-settings-datetime.h:133 source/ubl-settings-datetime.h:132 +#: source/ubl-settings-datetime.cc:141 source/ubl-settings-datetime.cc:137 +#: source/ubl-settings-datetime.cc:132 msgid "" "Enter the name of the ntp-server or its ip-address.\n" "When entering multiple addresses, separate them with commas." @@ -651,7 +703,8 @@ msgstr "" "Введите имя ntp-сервера или его ip-адрес.\n" "При вводе нескольких адресов, разделяйте их запятыми." -#: source/ubl-settings-datetime.cc:839 +#: source/ubl-settings-datetime.h:102 source/ubl-settings-datetime.h:101 +#: source/ubl-settings-datetime.cc:903 source/ubl-settings-datetime.cc:839 msgid "Error in the NTP server name" msgstr "Ошибка в имени NTP сервера" @@ -660,7 +713,9 @@ msgstr "Ошибка в имени NTP сервера" msgid "Error in the ntp name" msgstr "Ошибка в имени NTP сервера" -#: source/ubl-settings-datetime.cc:681 source/ubl-settings-datetime.cc:678 +#: source/ubl-settings-datetime.h:92 source/ubl-settings-datetime.h:91 +#: source/ubl-settings-datetime.cc:745 source/ubl-settings-datetime.cc:681 +#: source/ubl-settings-datetime.cc:678 msgid "Error saved local and global configuration" msgstr "Ошибка сохранения локальной и глобальной конфигурации" @@ -706,6 +761,7 @@ msgstr "ГМТ-1" msgid "GMT-3" msgstr "ГМТ-3" +#: source/ubl-settings-datetime.h:86 source/ubl-settings-datetime.h:85 msgid "" "GTK settings datetime for UBLinux\n" "\n" @@ -762,19 +818,27 @@ msgstr "Гибралтар" msgid "Glace_Bay" msgstr "Глейс-Бей" -#: source/ubl-settings-datetime.cc:693 source/ubl-settings-datetime.cc:690 +#: source/ubl-settings-datetime.h:94 source/ubl-settings-datetime.h:93 +#: source/ubl-settings-datetime.cc:757 source/ubl-settings-datetime.cc:693 +#: source/ubl-settings-datetime.cc:690 msgid "Global configuration downloaded successfully" msgstr "Успешно загружена глобальная конфигурация" -#: source/ubl-settings-datetime.cc:669 source/ubl-settings-datetime.cc:666 +#: source/ubl-settings-datetime.h:89 source/ubl-settings-datetime.h:88 +#: source/ubl-settings-datetime.cc:733 source/ubl-settings-datetime.cc:669 +#: source/ubl-settings-datetime.cc:666 msgid "Global configuration read error" msgstr "Ошибка чтения глобальной конфигурации" -#: source/ubl-settings-datetime.cc:699 source/ubl-settings-datetime.cc:696 +#: source/ubl-settings-datetime.h:96 source/ubl-settings-datetime.h:95 +#: source/ubl-settings-datetime.cc:763 source/ubl-settings-datetime.cc:699 +#: source/ubl-settings-datetime.cc:696 msgid "Global configuration successfully written" msgstr "Успешно записана глобальная конфигурация" -#: source/ubl-settings-datetime.cc:677 source/ubl-settings-datetime.cc:674 +#: source/ubl-settings-datetime.h:91 source/ubl-settings-datetime.h:90 +#: source/ubl-settings-datetime.cc:741 source/ubl-settings-datetime.cc:677 +#: source/ubl-settings-datetime.cc:674 msgid "Global configuration write error" msgstr "Ошибка записи глобальной конфигурации" @@ -826,11 +890,13 @@ msgstr "Хараре" msgid "Harbin" msgstr "Харбин" -#: source/ubl-settings-datetime.cc:792 +#: source/ubl-settings-datetime.h:105 source/ubl-settings-datetime.h:104 +#: source/ubl-settings-datetime.cc:856 source/ubl-settings-datetime.cc:792 msgid "Hardware clock successfully synchronized" msgstr "Аппаратные часы успешно синхронизированы" -#: source/ubl-settings-datetime.cc:788 +#: source/ubl-settings-datetime.h:106 source/ubl-settings-datetime.h:105 +#: source/ubl-settings-datetime.cc:852 source/ubl-settings-datetime.cc:788 msgid "Hardware clock synchronization error" msgstr "Ошибка синхронизации аппаратных часов" @@ -843,6 +909,7 @@ msgstr "Гавайи" msgid "Hebron" msgstr "Хеврон" +#: source/ubl-settings-datetime.h:72 source/ubl-settings-datetime.h:71 msgid "Help" msgstr "Справка" @@ -867,6 +934,8 @@ msgstr "Гонолулу" msgid "Hovd" msgstr "Ховд" +#: source/ubl-settings-datetime.h:99 source/ubl-settings-datetime.h:98 +#: source/ubl-settings-datetime.cc:1503 source/ubl-settings-datetime.cc:1514 #: source/ubl-settings-datetime.cc:1440 source/ubl-settings-datetime.cc:1451 #: source/ubl-settings-datetime.cc:1402 source/ubl-settings-datetime.cc:1407 msgid "Incorrect date format" @@ -1043,33 +1112,47 @@ msgstr "Лиссабон" msgid "Ljubljana" msgstr "Любляна" -#: source/ubl-settings-datetime.cc:135 source/ubl-settings-datetime.cc:130 +#: source/ubl-settings-datetime.h:74 source/ubl-settings-datetime.h:73 +#: source/ubl-settings-datetime.cc:139 source/ubl-settings-datetime.cc:135 +#: source/ubl-settings-datetime.cc:130 msgid "Load" msgstr "Загрузить" +#: source/ubl-settings-datetime.h:78 source/ubl-settings-datetime.h:77 msgid "Load global configuration" msgstr "Загрузить глобальную конфигурацию" +#: source/ubl-settings-datetime.h:79 source/ubl-settings-datetime.h:78 msgid "Load local configuration" msgstr "Загрузить локальную конфигурацию" -#: source/ubl-settings-datetime.cc:690 source/ubl-settings-datetime.cc:687 +#: source/ubl-settings-datetime.h:93 source/ubl-settings-datetime.h:92 +#: source/ubl-settings-datetime.cc:754 source/ubl-settings-datetime.cc:690 +#: source/ubl-settings-datetime.cc:687 msgid "Local configuration downloaded successfully" msgstr "Успешно загружена локальная конфигурация" -#: source/ubl-settings-datetime.cc:665 source/ubl-settings-datetime.cc:662 +#: source/ubl-settings-datetime.h:88 source/ubl-settings-datetime.h:87 +#: source/ubl-settings-datetime.cc:729 source/ubl-settings-datetime.cc:665 +#: source/ubl-settings-datetime.cc:662 msgid "Local configuration reading error" msgstr "Ошибка чтения локальной конфигурации" -#: source/ubl-settings-datetime.cc:696 source/ubl-settings-datetime.cc:693 +#: source/ubl-settings-datetime.h:95 source/ubl-settings-datetime.h:94 +#: source/ubl-settings-datetime.cc:760 source/ubl-settings-datetime.cc:696 +#: source/ubl-settings-datetime.cc:693 msgid "Local configuration successfully written" msgstr "Успешно записана локальная конфигурация" -#: source/ubl-settings-datetime.cc:673 source/ubl-settings-datetime.cc:670 +#: source/ubl-settings-datetime.h:90 source/ubl-settings-datetime.h:89 +#: source/ubl-settings-datetime.cc:737 source/ubl-settings-datetime.cc:673 +#: source/ubl-settings-datetime.cc:670 msgid "Local configuration write error" msgstr "Ошибка записи локальной конфигурации" -#: source/ubl-settings-datetime.cc:156 source/ubl-settings-datetime.cc:151 +#: source/ubl-settings-datetime.h:121 source/ubl-settings-datetime.h:120 +#: source/ubl-settings-datetime.cc:161 source/ubl-settings-datetime.cc:156 +#: source/ubl-settings-datetime.cc:151 msgid "Local time" msgstr "Локальное время" @@ -1154,7 +1237,9 @@ msgstr "Манаус" msgid "Manila" msgstr "Манила" -#: source/ubl-settings-datetime.cc:141 source/ubl-settings-datetime.cc:136 +#: source/ubl-settings-datetime.h:116 source/ubl-settings-datetime.h:115 +#: source/ubl-settings-datetime.cc:145 source/ubl-settings-datetime.cc:141 +#: source/ubl-settings-datetime.cc:136 msgid "Manual" msgstr "Вручную" @@ -1280,7 +1365,8 @@ msgstr "Новый Южный Уэльс" msgid "NTP is correct" msgstr "Имя NTP сервера корректно" -#: source/ubl-settings-datetime.cc:827 +#: source/ubl-settings-datetime.h:104 source/ubl-settings-datetime.h:103 +#: source/ubl-settings-datetime.cc:891 source/ubl-settings-datetime.cc:827 msgid "NTP server name is correct" msgstr "Имя NTP сервера корректно" @@ -1332,9 +1418,12 @@ msgstr "Север" msgid "North_Dokota" msgstr "Северная Докота" -#: source/ubl-settings-datetime.cc:434 source/ubl-settings-datetime.cc:466 -#: source/ubl-settings-datetime.cc:497 source/ubl-settings-datetime.cc:433 -#: source/ubl-settings-datetime.cc:464 source/ubl-settings-datetime.cc:494 +#: source/ubl-settings-datetime.h:83 source/ubl-settings-datetime.h:82 +#: source/ubl-settings-datetime.cc:473 source/ubl-settings-datetime.cc:502 +#: source/ubl-settings-datetime.cc:533 source/ubl-settings-datetime.cc:434 +#: source/ubl-settings-datetime.cc:466 source/ubl-settings-datetime.cc:497 +#: source/ubl-settings-datetime.cc:433 source/ubl-settings-datetime.cc:464 +#: source/ubl-settings-datetime.cc:494 msgid "Nothing to save!" msgstr "Нечего сохранять!" @@ -1443,7 +1532,9 @@ msgstr "Порту-Велью" msgid "Prague" msgstr "Прага" -#: source/ubl-settings-datetime.cc:133 source/ubl-settings-datetime.cc:128 +#: source/ubl-settings-datetime.h:69 source/ubl-settings-datetime.h:68 +#: source/ubl-settings-datetime.cc:136 source/ubl-settings-datetime.cc:133 +#: source/ubl-settings-datetime.cc:128 msgid "Project Home Page" msgstr "Домашняя страница проекта" @@ -1480,13 +1571,20 @@ msgstr "Ранкин-Инлет" msgid "Rarotonga" msgstr "Раротонга" +#: source/ubl-settings-datetime.h:80 source/ubl-settings-datetime.h:79 +#: source/ubl-settings-datetime.cc:171 +msgid "Read online" +msgstr "Прочитать онлайн" + msgid "Recife" msgstr "Ресифи" msgid "Regina" msgstr "Реджайна" -#: source/ubl-settings-datetime.cc:148 source/ubl-settings-datetime.cc:143 +#: source/ubl-settings-datetime.h:125 source/ubl-settings-datetime.h:124 +#: source/ubl-settings-datetime.cc:152 source/ubl-settings-datetime.cc:148 +#: source/ubl-settings-datetime.cc:143 msgid "Region:" msgstr "Регион:" @@ -1577,18 +1675,23 @@ msgstr "Саратов" msgid "Saskatchewan" msgstr "Саскачеван" -#: source/ubl-settings-datetime.cc:134 source/ubl-settings-datetime.cc:129 +#: source/ubl-settings-datetime.h:73 source/ubl-settings-datetime.h:72 +#: source/ubl-settings-datetime.cc:138 source/ubl-settings-datetime.cc:134 +#: source/ubl-settings-datetime.cc:129 msgid "Save" msgstr "Сохранить" -msgid "Save global configuration" -msgstr "Сохранить глобальную конфигурацию" +#: source/ubl-settings-datetime.h:77 source/ubl-settings-datetime.h:76 +msgid "Save in global configuration" +msgstr "Сохранить в глобальную конфигурацию" -msgid "Save local configuration" -msgstr "Сохранить локальную конфигурацию" +#: source/ubl-settings-datetime.h:76 source/ubl-settings-datetime.h:75 +msgid "Save in local configuration" +msgstr "Сохранить в локальную конфигурацию" -msgid "Save to global and local configuration" -msgstr "Сохранить глобальную и локальную конфигурацию" +#: source/ubl-settings-datetime.h:75 source/ubl-settings-datetime.h:74 +msgid "Save in global and local configuration" +msgstr "Сохранить в глобальную и локальную конфигурацию" msgid "Scoresbysund" msgstr "Скорсбисунд" @@ -1602,7 +1705,9 @@ msgstr "Сеул" msgid "Setting date and time in global configuration" msgstr "Настройка даты и времени в глобальной конфигурации" -#: source/ubl-settings-datetime.cc:144 source/ubl-settings-datetime.cc:139 +#: source/ubl-settings-datetime.h:129 source/ubl-settings-datetime.h:128 +#: source/ubl-settings-datetime.cc:148 source/ubl-settings-datetime.cc:144 +#: source/ubl-settings-datetime.cc:139 msgid "Setting the date and time" msgstr "Настройка даты и времени" @@ -1672,7 +1777,9 @@ msgstr "Стокгольм" msgid "Stop the synchronization service" msgstr "Остановить сервис синхронизации" -#: source/ubl-settings-datetime.cc:702 source/ubl-settings-datetime.cc:699 +#: source/ubl-settings-datetime.h:97 source/ubl-settings-datetime.h:96 +#: source/ubl-settings-datetime.cc:766 source/ubl-settings-datetime.cc:702 +#: source/ubl-settings-datetime.cc:699 msgid "Successfully saved local and global configuration" msgstr "Успешно сохранена локальная и глобальная конфигурация" @@ -1682,19 +1789,26 @@ msgstr "Суифт-Каррент" msgid "Sydney" msgstr "Сидней" -#: source/ubl-settings-datetime.cc:150 source/ubl-settings-datetime.cc:145 +#: source/ubl-settings-datetime.h:123 source/ubl-settings-datetime.h:122 +#: source/ubl-settings-datetime.cc:154 source/ubl-settings-datetime.cc:150 +#: source/ubl-settings-datetime.cc:145 msgid "Sync by" msgstr "Синхронизировать" -#: source/ubl-settings-datetime.cc:153 source/ubl-settings-datetime.cc:148 +#: source/ubl-settings-datetime.h:128 source/ubl-settings-datetime.h:127 +#: source/ubl-settings-datetime.cc:158 source/ubl-settings-datetime.cc:153 +#: source/ubl-settings-datetime.cc:148 msgid "Synchronize hardware time" msgstr "Синхронизировать аппаратное время" -#: source/ubl-settings-datetime.cc:154 source/ubl-settings-datetime.cc:149 +#: source/ubl-settings-datetime.cc:159 source/ubl-settings-datetime.cc:154 +#: source/ubl-settings-datetime.cc:149 msgid "Synchronize hardware time:" msgstr "Синхронизировать аппаратное время:" -#: source/ubl-settings-datetime.cc:138 source/ubl-settings-datetime.cc:133 +#: source/ubl-settings-datetime.h:132 source/ubl-settings-datetime.h:131 +#: source/ubl-settings-datetime.cc:142 source/ubl-settings-datetime.cc:138 +#: source/ubl-settings-datetime.cc:133 msgid "Synchronize via NTP" msgstr "Синхронизировать через NTP" @@ -1734,7 +1848,9 @@ msgstr "Тель-Авив" msgid "Tell_City" msgstr "Телл-Сити" -#: source/ubl-settings-datetime.cc:120 source/ubl-settings-datetime.cc:115 +#: source/ubl-settings-datetime.h:109 source/ubl-settings-datetime.h:108 +#: source/ubl-settings-datetime.cc:122 source/ubl-settings-datetime.cc:120 +#: source/ubl-settings-datetime.cc:115 msgid "The program must be run as root" msgstr "Программа должна быть запущена с правами суперпользователя!" @@ -1763,11 +1879,15 @@ msgstr "Тихуана" msgid "Timbuktu" msgstr "Тимбукту" -#: source/ubl-settings-datetime.cc:147 source/ubl-settings-datetime.cc:142 +#: source/ubl-settings-datetime.h:126 source/ubl-settings-datetime.h:125 +#: source/ubl-settings-datetime.cc:151 source/ubl-settings-datetime.cc:147 +#: source/ubl-settings-datetime.cc:142 msgid "Time zone" msgstr "Часовой пояс" -#: source/ubl-settings-datetime.cc:145 source/ubl-settings-datetime.cc:140 +#: source/ubl-settings-datetime.h:118 source/ubl-settings-datetime.h:117 +#: source/ubl-settings-datetime.cc:149 source/ubl-settings-datetime.cc:145 +#: source/ubl-settings-datetime.cc:140 msgid "Time:" msgstr "Время:" @@ -1810,7 +1930,9 @@ msgstr "Тунис" msgid "US" msgstr "США" -#: source/ubl-settings-datetime.cc:155 source/ubl-settings-datetime.cc:150 +#: source/ubl-settings-datetime.h:120 source/ubl-settings-datetime.h:119 +#: source/ubl-settings-datetime.cc:160 source/ubl-settings-datetime.cc:155 +#: source/ubl-settings-datetime.cc:150 msgid "UTC time" msgstr "Время по UTC" @@ -1904,6 +2026,11 @@ msgstr "Виндхук" msgid "Winnipeg" msgstr "Виннипег" +#: source/ubl-settings-datetime.h:84 source/ubl-settings-datetime.h:83 +#: source/ubl-settings-datetime.cc:168 +msgid "Would you like to read documentation in the Web?" +msgstr "Вы хотите прочитать справку в Сети?" + msgid "Yakutat" msgstr "Якутат" @@ -1928,6 +2055,15 @@ msgstr "Йеллоунайф" msgid "Yerevan" msgstr "Ереван" +#: source/ubl-settings-datetime.h:85 source/ubl-settings-datetime.h:84 +#: source/ubl-settings-datetime.cc:169 +msgid "" +"You will be redirected to documentation site, where user help pages are " +"translated and supported by community." +msgstr "" +"Вы будете перенаправлены на сайт с документацией где страницы помощи " +"переводятся и поддерживаются сообществом." + msgid "Yukon" msgstr "Юкон" @@ -1937,7 +2073,9 @@ msgstr "Загреб" msgid "Zaporozhye" msgstr "Запорожье" -#: source/ubl-settings-datetime.cc:149 source/ubl-settings-datetime.cc:144 +#: source/ubl-settings-datetime.h:124 source/ubl-settings-datetime.h:123 +#: source/ubl-settings-datetime.cc:153 source/ubl-settings-datetime.cc:149 +#: source/ubl-settings-datetime.cc:144 msgid "Zone:" msgstr "Зона:" @@ -1947,7 +2085,9 @@ msgstr "Зулу" msgid "Zurich" msgstr "Цюрих" -#: source/ubl-settings-datetime.cc:131 source/ubl-settings-datetime.cc:126 +#: source/ubl-settings-datetime.h:68 source/ubl-settings-datetime.h:67 +#: source/ubl-settings-datetime.cc:134 source/ubl-settings-datetime.cc:131 +#: source/ubl-settings-datetime.cc:126 msgid "https://wiki.ublinux.com" msgstr "https://wiki.ublinux.ru" @@ -1957,10 +2097,20 @@ msgid "" msgstr "" "https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/" -#: source/ubl-settings-datetime.cc:151 source/ubl-settings-datetime.cc:146 +#: source/ubl-settings-datetime.cc:174 +#, fuzzy +msgid "ubl-settings-bootloader" +msgstr "О программе Загрузка системы" + +#: source/ubl-settings-datetime.h:67 source/ubl-settings-datetime.h:66 +#: source/ubl-settings-datetime.cc:131 source/ubl-settings-datetime.cc:155 +#: source/ubl-settings-datetime.cc:156 source/ubl-settings-datetime.cc:151 +#: source/ubl-settings-datetime.cc:146 msgid "ubl-settings-datetime" msgstr "Настройка даты и времени" -#: source/ubl-settings-datetime.cc:1651 source/ubl-settings-datetime.cc:1606 +#: source/ubl-settings-datetime.h:87 source/ubl-settings-datetime.h:86 +#: source/ubl-settings-datetime.cc:1714 source/ubl-settings-datetime.cc:1651 +#: source/ubl-settings-datetime.cc:1606 msgid "ubl-settings-datetime version: " msgstr "ubl-settings-datetime версия: "