From d9a7ec1206a45fa65d839fd9115f8f5473df8c29 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Fri, 21 Apr 2023 11:24:54 +0600 Subject: [PATCH 01/20] =?UTF-8?q?=D0=9A=D0=9E=D0=BC=D0=B0=D0=BD=D0=B4?= =?UTF-8?q?=D1=8B=20ubconfig=20=D0=B2=D1=8B=D0=BD=D0=B5=D1=81=D0=B5=D0=BD?= =?UTF-8?q?=D1=8B=20=D0=B2=20=D0=BE=D1=82=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D1=8B=D0=B9=20=D1=84=D0=B0=D0=B9=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/CMakeLists.txt | 8 +- source/my_cmd.h | 30 ++++++ source/ubl-settings-datetime.cc | 163 +++++++++++++++----------------- source/ubl-settings-datetime.h | 12 ++- ubl-settings-datetime.glade | 35 ++++++- 5 files changed, 155 insertions(+), 93 deletions(-) create mode 100644 source/my_cmd.h diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index b0d3007..00b511b 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -4,6 +4,11 @@ project(ubl-settings-datetime) find_package(PkgConfig REQUIRED) pkg_check_modules(GTK REQUIRED gtkmm-3.0) +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}) + include_directories(${GTK_INCLUDE_DIRS}) link_directories(${GTK_LIBRARY_DIRS}) add_definitions(${GTK_CFLAGS_OTHER}) @@ -18,6 +23,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissin set(SOURCE_FILES ubl-util-standard.h ubl-util-standard.c + my_cmd.h main.cc ubl-settings-datetime.cc ubl-settings-datetime.h) @@ -27,5 +33,5 @@ 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 ${LIBRARIES} ${ICU_LIBRARIES} ${WEBKIT_LIBRARIES}) install(TARGETS ubl-settings-datetime DESTINATION bin) \ No newline at end of file diff --git a/source/my_cmd.h b/source/my_cmd.h new file mode 100644 index 0000000..be562ae --- /dev/null +++ b/source/my_cmd.h @@ -0,0 +1,30 @@ +#ifndef MY_CMD_H +#define MY_CMD_H + +#define link_doc "https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/ubl-settings-datetime" + +#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 get_global_defalult_HWCLOCK_SYNC "ubconfig --default --source global get clock HWCLOCK_SYNC" +#endif \ No newline at end of file diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 398b0b1..31b5acb 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -19,7 +19,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 +55,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[get_system_ZONE] = string(gettext(": \"Time Zone\"")); + map_error[set_hwclock] = string(gettext(": \"Hardware time\"")); + map_error[get_system_NTPSERVERS] = string(gettext(": \"NTP\"")); + map_error[get_system_HWCLOCK_SYNC] = string(gettext(": \"Hardware time\"")); + map_error[get_global_NTPSERVERS] = string(gettext(": \"NTP\"")); + map_error[get_global_ZONE] = string(gettext(": \"Time Zone\"")); + map_error[get_global_defalult_HWCLOCK_SYNC] = string(gettext(": \"Hardware time\"")); + map_error[get_global_HWCLOCK_SYNC] = string(gettext(": \"Hardware time\"")); + map_error[set_system_ZONE] = string(gettext(": \"Time Zone\"")); + map_error[set_system_NTPSERVERS_default] = string(gettext(": \"NTP\"")); + map_error[set_system_NTPSERVERS_dhcp] = string(gettext(": \"NTP\"")); + map_error[set_system_NTPSERVERS] = string(gettext(": \"NTP\"")); + map_error[remove_system_NTPSERVERS] = string(gettext(": \"NTP\"")); + map_error[set_system_HWCLOCK_SYNC_localtime] = string(gettext(": \"Hardware time\"")); + map_error[set_system_HWCLOCK_SYNC_utc] = string(gettext(": \"Hardware time\"")); + map_error[set_global_ZONE] = string(gettext(": \"Time Zone\"")); + map_error[set_global_NTPSERVERS_default] = string(gettext(": \"NTP\"")); + map_error[set_global_NTPSERVERS_dhcp] = string(gettext(": \"NTP\"")); + map_error[set_global_NTPSERVERS] = string(gettext(": \"NTP\"")); + map_error[remove_global_NTPSERVERS] = string(gettext(": \"NTP\"")); + map_error[set_global_HWCLOCK_SYNC_localtime] = string(gettext(": \"Hardware time\"")); + map_error[set_global_HWCLOCK_SYNC_utc] = string(gettext(": \"Hardware time\"")); + map_error[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\"")); this->get_builder(); this->add_CSS(); Gtk::Widget *boxWidget; @@ -95,6 +92,9 @@ void MainWindow::settings() { day = 0; this->lacalization(); btnBoxAboutDialog->set_visible(false); + one = WEBKIT_WEB_VIEW( webkit_web_view_new() ); + three = Glib::wrap( GTK_WIDGET( one ) ); + wndWeb->add( *three ); if (geteuid() == 0) { numTimeHrs->set_range(0, 23); numTimeMin->set_range(0, 59); @@ -106,8 +106,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 { @@ -150,6 +149,7 @@ void MainWindow::lacalization() { lblZone->set_text(gettext("Zone:")); lblSynchronizeBtn->set_text(gettext("Sync by")); lblHeader->set_text(gettext("ubl-settings-datetime")); + lblHeadeWndWeb->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:")); @@ -313,7 +313,8 @@ void MainWindow::get_builder() { builder->get_widget("boxWidgetFunc", boxWidgetFunc); builder->get_widget("overHead", overHead); builder->get_widget("imgHeadBackground", imgHeadBackground); - + builder->get_widget("wndWeb", wndWeb); + builder->get_widget("lblHeadeWndWeb", lblHeadeWndWeb); } void MainWindow::event() { @@ -384,30 +385,19 @@ 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 + " \""; - } - wrapper_system(cmd, "&"); - if (start_error != error_info) { - error_info = start_error; - } + webkit_web_view_load_uri(one, link_doc); + wndWeb->show_all(); + } 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 +407,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; @@ -437,13 +423,13 @@ void MainWindow::save_local_cfg() { lblWarning->set_text(gettext("Nothing to 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); } @@ -466,13 +452,13 @@ void MainWindow::save_global_cfg() { lblWarning->set_text(gettext("Nothing to 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); } @@ -510,46 +496,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 +654,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; @@ -735,6 +721,7 @@ void MainWindow::info_warning_error(int mess) { void MainWindow::wrapper_system(string cmd, string thread_str = "") { string cmd_new = cmd + " " + thread_str; + cout << cmd_new << endl; int response_cmd = system(cmd_new.c_str()); if (response_cmd != 0) { error_info += 1; @@ -772,7 +759,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,7 +797,7 @@ 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")); @@ -1009,10 +996,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") { @@ -1177,7 +1164,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) { diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index bcb6dbe..b4ffbbc 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -17,7 +17,9 @@ #include #include #include +#include #include "ubl-util-standard.c" +#include "my_cmd.h" using namespace std; @@ -115,6 +117,10 @@ class MainWindow : public Gtk::ApplicationWindow { Gtk::Image *imgSettings; Gtk::Overlay *overHead; Gtk::Image *imgHeadBackground; + Gtk::Window *wndWeb; + Gtk::Label *lblHeadeWndWeb; + Gtk::Widget *three; + WebKitWebView * one; string array_hw[2]; string array_hw_local[2]; bool flag_load = false; @@ -160,9 +166,9 @@ class MainWindow : public Gtk::ApplicationWindow { 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 event_zone(); @@ -170,7 +176,7 @@ class MainWindow : public Gtk::ApplicationWindow { 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/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index fbadc70..f5e264a 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -1,5 +1,5 @@ - + @@ -1379,4 +1379,37 @@ Format: DD.MM.YYYY + + 800 + 600 + False + start + com.ublinux.ubl-settings-datetime + + + + + + True + False + True + + + True + False + ubl-settings-datetime + + + + + True + False + 32 + com.ublinux.ubl-settings-datetime + 5 + + + + + -- 2.35.1 From f4a9b177167e1db641195414a2c1af773e766f37 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Fri, 21 Apr 2023 12:07:02 +0600 Subject: [PATCH 02/20] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BE=D0=BA=D0=BD=D0=BE=20about?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 5 ++- source/ubl-settings-datetime.h | 1 + ubl-settings-datetime.glade | 74 +++++++++++++++++++++++++++++++-- ubl-settings-datetime_ru.po | 3 ++ 4 files changed, 78 insertions(+), 5 deletions(-) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 31b5acb..ba39577 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -126,11 +126,13 @@ void MainWindow::lacalization() { tm *ltm = localtime(&now); unsigned int year = 1900+ ltm->tm_year; string str_authors = string(gettext("Copyright © UBSoft LLC, 2022 - ")) + to_string(year); + aboutWindows->set_program_name(gettext("ubl-settings-datetime")); 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")); + lblHeaderAboutTopic->set_label(gettext("About ubl-settings-datetime")); lblSave->set_label(gettext("Save")); lblLoad->set_label(gettext("Load")); txtDate->set_tooltip_text(gettext("Date of\nFormat: DD.MM.YYYY")); @@ -315,6 +317,8 @@ void MainWindow::get_builder() { builder->get_widget("imgHeadBackground", imgHeadBackground); builder->get_widget("wndWeb", wndWeb); builder->get_widget("lblHeadeWndWeb", lblHeadeWndWeb); + builder->get_widget("lblHeaderAboutTopic", lblHeaderAboutTopic); + } void MainWindow::event() { @@ -721,7 +725,6 @@ void MainWindow::info_warning_error(int mess) { void MainWindow::wrapper_system(string cmd, string thread_str = "") { string cmd_new = cmd + " " + thread_str; - cout << cmd_new << endl; int response_cmd = system(cmd_new.c_str()); if (response_cmd != 0) { error_info += 1; diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index b4ffbbc..c702cd9 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -121,6 +121,7 @@ class MainWindow : public Gtk::ApplicationWindow { Gtk::Label *lblHeadeWndWeb; Gtk::Widget *three; WebKitWebView * one; + Gtk::Label *lblHeaderAboutTopic; string array_hw[2]; string array_hw_local[2]; bool flag_load = false; diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index f5e264a..7a09cc8 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -84,13 +84,13 @@ - + False О Программе False True center - ubl-settings-datetime + com.ublinux.ubl-settings-datetime dialog True False @@ -98,7 +98,6 @@ ubl-settings-datetime 1.2 Copyright © 2023 - UBSoft Software LLC - Setting the date and time https://ublinux.ru/ Project Home Page Это приложение распространяется без каких-либо гарантий. @@ -114,7 +113,7 @@ vertical 2 - + False end @@ -133,6 +132,73 @@ + + False + False + True + center + com.ublinux.ubl-settings-diskquota + dialog + True + True + ubl-settings-datetime + 1.0 + Copyright © 2022 - 2023, UBSoft LLC + Setting the date and time + https://ublinux.ru/ + Project Home Page + Это приложение распространяется без каких-либо гарантий. +Подробнее в <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General Public License, версии 2 или позднее</a>. + UBGroup + UBGroup + com.ublinux.ubl-settings-datetime + True + gpl-2-0 + + + True + False + vertical + 2 + + + False + end + + + False + False + 1 + + + + + + + + + + True + False + True + + + True + False + 5 + 5 + 5 + 5 + 2 + System quotas + + + + + + + + True False diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index 319ce54..b68c210 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -20,6 +20,9 @@ msgstr "" msgid ":" msgstr ":" +msgid "About ubl-settings-datetime" +msgstr "О программе Настройка даты и времени" + #: source/ubl-settings-datetime.cc:83 source/ubl-settings-datetime.cc:84 #: source/ubl-settings-datetime.cc:82 msgid ": \"Date\"" -- 2.35.1 From 485991a0296a7a598f11767e8e865ea35c6bc7fe Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Fri, 21 Apr 2023 12:38:48 +0600 Subject: [PATCH 03/20] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=B1=D0=B0=D0=B3=20=D0=BE=D1=82=D0=BE=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20webView?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-datetime.glade | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index 7a09cc8..2622658 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -1449,7 +1449,8 @@ Format: DD.MM.YYYY 800 600 False - start + True + True com.ublinux.ubl-settings-datetime -- 2.35.1 From 294cdcf19f18c6b5e142d053cf56f547f61b6cfd Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 24 Apr 2023 10:27:40 +0600 Subject: [PATCH 04/20] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BE=D0=BA=D0=BD=D0=BE=20=D1=81?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/CMakeLists.txt | 26 +++- source/my_cmd.h | 3 +- source/ubl-settings-datetime.cc | 58 ++++++- source/ubl-settings-datetime.h | 24 ++- source/ubl-settings-datetime.h.in | 1 + ubl-settings-datetime.glade | 251 ++++++++++++++++++++++++------ ubl-settings-datetime.pot | 19 +++ ubl-settings-datetime_ru.po | 22 +++ 8 files changed, 336 insertions(+), 68 deletions(-) create mode 100644 source/ubl-settings-datetime.h.in diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 00b511b..06976d8 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -4,16 +4,25 @@ project(ubl-settings-datetime) find_package(PkgConfig REQUIRED) pkg_check_modules(GTK REQUIRED gtkmm-3.0) -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}) - include_directories(${GTK_INCLUDE_DIRS}) 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 \ @@ -21,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 my_cmd.h @@ -33,5 +43,9 @@ set(LIBRARIES pthread) add_executable(ubl-settings-datetime ${SOURCE_FILES}) -target_link_libraries(ubl-settings-datetime ${LIBRARIES} ${ICU_LIBRARIES} ${WEBKIT_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/my_cmd.h b/source/my_cmd.h index be562ae..7dbdc80 100644 --- a/source/my_cmd.h +++ b/source/my_cmd.h @@ -2,7 +2,8 @@ #define MY_CMD_H #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" diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index ba39577..7a84818 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -92,9 +92,11 @@ void MainWindow::settings() { day = 0; this->lacalization(); btnBoxAboutDialog->set_visible(false); - one = WEBKIT_WEB_VIEW( webkit_web_view_new() ); - three = Glib::wrap( GTK_WIDGET( one ) ); - wndWeb->add( *three ); + #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); @@ -162,6 +164,14 @@ void MainWindow::lacalization() { this->bubble_sort(array_hw, array_hw_local, 2); cbHw->append(array_hw_local[0]); cbHw->append(array_hw_local[1]); + + lblhelpHeader->set_text(_("Would you like to read documentation in the Web?")); + lblhelpText->set_text(_("You will be redirected to documentation site, where user help pages are " + "translated and supported by community.")); + btnReadHelp->set_label(_("Read online")); + btnCancelHelp->set_label(_("Cancel")); + chkAlwaysOpenHelp->set_label(_("Always redirect")); + lblwebHeaderName->set_label(_("ubl-settings-bootloader")); } void MainWindow::bubble_sort(string arr[],string arr_local[], int len_arr) { @@ -315,13 +325,26 @@ void MainWindow::get_builder() { builder->get_widget("boxWidgetFunc", boxWidgetFunc); builder->get_widget("overHead", overHead); builder->get_widget("imgHeadBackground", imgHeadBackground); - builder->get_widget("wndWeb", wndWeb); + #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)); @@ -389,9 +412,32 @@ void MainWindow::event_zone() { } void MainWindow::synopsis_show() { - webkit_web_view_load_uri(one, link_doc); - wndWeb->show_all(); + if (flag_open_browser == true) { + this->open_browser(); + } + else { + wndShowWeb->show_all(); + } + +} +void MainWindow::open_browser() { + #ifdef WEBKIT_FOUND + webkit_web_view_load_uri(one, link_doc); + wndWeb->show_all(); + #else + string cmd = cmd_xdg + string(gettext(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 ); + } + obj_process_system.call(cmd, "&"); + #endif } void MainWindow::load_local_cfg() { diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index c702cd9..9b0dfa5 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -17,10 +17,12 @@ #include #include #include -#include #include "ubl-util-standard.c" #include "my_cmd.h" - +#include "ubl-settings-datetime-cm.h" +#ifdef WEBKIT_FOUND +#include +#endif using namespace std; @@ -117,11 +119,22 @@ class MainWindow : public Gtk::ApplicationWindow { Gtk::Image *imgSettings; Gtk::Overlay *overHead; Gtk::Image *imgHeadBackground; - Gtk::Window *wndWeb; Gtk::Label *lblHeadeWndWeb; - Gtk::Widget *three; - WebKitWebView * one; 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; @@ -162,6 +175,7 @@ class MainWindow : public Gtk::ApplicationWindow { public: MainWindow(BaseObjectType* obj, Glib::RefPtr const& builder); MainWindow(Glib::RefPtr const& builder); + void open_browser(); virtual ~MainWindow() = default; void log_mess_error(string &cmd); void set_hardware_clock(string &local, string &etc); 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 2622658..cba6c55 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -1,5 +1,5 @@ - + @@ -84,54 +84,6 @@ - - False - О Программе - False - True - center - com.ublinux.ubl-settings-datetime - dialog - True - False - False - ubl-settings-datetime - 1.2 - Copyright © 2023 - UBSoft Software LLC - https://ublinux.ru/ - Project Home Page - Это приложение распространяется без каких-либо гарантий. -Подробнее в <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General Public License, версии 2 или позднее</a>. - UBGroup - UBGroup - com.ublinux.ubl-settings-datetime - True - gpl-2-0 - - - False - vertical - 2 - - - False - end - - - - - - False - False - 0 - - - - - - - - False False @@ -190,7 +142,7 @@ 5 5 2 - System quotas + ubl-settings-datetime @@ -1445,6 +1397,205 @@ 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 + False + ubl-settings-bootloader + + + + + + + + True + False + 32 + dialog-question-symbolic + + + + + 800 600 diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot index 80bae74..d60a7e6 100644 --- a/ubl-settings-datetime.pot +++ b/ubl-settings-datetime.pot @@ -17,6 +17,25 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" + + +msgid "Would you like to read documentation in the Web?" +msgstr "" + +msgid "" +"You will be redirected to documentation site, where user help pages are " +"translated and supported by community." +msgstr "" + +msgid "Cancel" +msgstr "" + +msgid "Read online" +msgstr "" + +msgid "Always redirect" +msgstr "" + msgid ":" msgstr "" diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index b68c210..30f16a6 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -17,6 +17,28 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +msgid "Would you like to read documentation in the Web?" +msgstr "Вы хотите прочитать справку в Сети?" + +msgid "" +"You will be redirected to documentation site, where user help pages are " +"translated and supported by community." +msgstr "" +"Вы будете перенаправлены на сайт с документацией где страницы помощи " +"переводятся и поддерживаются сообществом." + +msgid "Cancel" +msgstr "Отменить" + +msgid "Always redirect" +msgstr "Всегда перенаправлять" + +msgid "Read online" +msgstr "Прочитать онлайн" + +msgid "About ubl-settings-bootloader" +msgstr "О программе Загрузка системы" + msgid ":" msgstr ":" -- 2.35.1 From 6a66ba4b60d6b88975ce3148de0a38b3364ac618 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 24 Apr 2023 10:29:57 +0600 Subject: [PATCH 05/20] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20pot=20=D0=B8=20po=20=D1=84=D0=B0?= =?UTF-8?q?=D0=B9=D0=BB=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/my_cmd.h | 4 +- ubl-settings-datetime.pot | 246 ++++++++++++++++++++++-------------- ubl-settings-datetime_ru.po | 239 ++++++++++++++++++++++------------- 3 files changed, 306 insertions(+), 183 deletions(-) diff --git a/source/my_cmd.h b/source/my_cmd.h index 7dbdc80..406e915 100644 --- a/source/my_cmd.h +++ b/source/my_cmd.h @@ -28,4 +28,6 @@ #define set_hwclock "hwclock --systohc" #define get_global_defalult_HWCLOCK_SYNC "ubconfig --default --source global get clock HWCLOCK_SYNC" -#endif \ No newline at end of file +#endif + + diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot index d60a7e6..10d5158 100644 --- a/ubl-settings-datetime.pot +++ b/ubl-settings-datetime.pot @@ -1,76 +1,62 @@ -# Language translations for ubl-settings-datetime package. -# Copyright (C) 2022, UBTech LLC -# This file is distributed under the same license as the ubl-settings-datetime package. -# UBLinux Team , 2022 +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: ubl-settings-datetime 1.0\n" -"Report-Msgid-Bugs-To: info@ublinux.com\n" -"POT-Creation-Date: 2023-01-01 00:00+0600\n" -"PO-Revision-Date: 2023-01-01 00:00+0600\n" -"Last-Translator: UBLinux Team \n" -"Language-Team: UBLinux Team \n" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-04-24 10:28+0600\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" - - -msgid "Would you like to read documentation in the Web?" -msgstr "" - -msgid "" -"You will be redirected to documentation site, where user help pages are " -"translated and supported by community." -msgstr "" - -msgid "Cancel" -msgstr "" - -msgid "Read online" -msgstr "" - -msgid "Always redirect" -msgstr "" - msgid ":" msgstr "" +#: 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.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.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.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 "" @@ -84,6 +70,10 @@ msgstr "" msgid "About" msgstr "" +#: source/ubl-settings-datetime.cc:137 +msgid "About ubl-settings-datetime" +msgstr "" + msgid "Accra" msgstr "" @@ -122,6 +112,10 @@ msgstr "" msgid "Almaty" msgstr "" +#: source/ubl-settings-datetime.cc:173 +msgid "Always redirect" +msgstr "" + msgid "America" msgstr "" @@ -131,7 +125,8 @@ msgstr "" msgid "Amsterdam" msgstr "" -#: source/ubl-settings-datetime.cc:834 source/ubl-settings-datetime.cc:817 +#: 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 "" @@ -213,7 +208,8 @@ msgstr "" msgid "Atlantic" msgstr "" -#: source/ubl-settings-datetime.cc:152 source/ubl-settings-datetime.cc:147 +#: source/ubl-settings-datetime.cc:157 source/ubl-settings-datetime.cc:152 +#: source/ubl-settings-datetime.cc:147 msgid "Attention" msgstr "" @@ -376,6 +372,10 @@ msgstr "" msgid "Canberra" msgstr "" +#: source/ubl-settings-datetime.cc:172 +msgid "Cancel" +msgstr "" + msgid "Cancun" msgstr "" @@ -484,7 +484,8 @@ msgstr "" msgid "Copenhagen" msgstr "" -#: source/ubl-settings-datetime.cc:128 source/ubl-settings-datetime.cc:123 +#: source/ubl-settings-datetime.cc:130 source/ubl-settings-datetime.cc:128 +#: source/ubl-settings-datetime.cc:123 msgid "Copyright © UBSoft LLC, 2022 - " msgstr "" @@ -506,14 +507,16 @@ msgstr "" msgid "Curacao" msgstr "" -#: source/ubl-settings-datetime.cc:143 source/ubl-settings-datetime.cc:138 +#: 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.cc:144 source/ubl-settings-datetime.cc:140 +#: source/ubl-settings-datetime.cc:135 msgid "DHCP" msgstr "" @@ -535,22 +538,26 @@ msgstr "" msgid "Darwin" msgstr "" -#: source/ubl-settings-datetime.cc:130 source/ubl-settings-datetime.cc:125 +#: 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.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.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.cc:150 source/ubl-settings-datetime.cc:146 +#: source/ubl-settings-datetime.cc:141 msgid "Date:" msgstr "" @@ -566,7 +573,8 @@ msgstr "" msgid "DeNoronha" msgstr "" -#: source/ubl-settings-datetime.cc:139 source/ubl-settings-datetime.cc:134 +#: source/ubl-settings-datetime.cc:143 source/ubl-settings-datetime.cc:139 +#: source/ubl-settings-datetime.cc:134 msgid "Default" msgstr "" @@ -582,7 +590,8 @@ msgstr "" msgid "Dili" msgstr "" -#: source/ubl-settings-datetime.cc:142 source/ubl-settings-datetime.cc:137 +#: source/ubl-settings-datetime.cc:146 source/ubl-settings-datetime.cc:142 +#: source/ubl-settings-datetime.cc:137 msgid "Disabled" msgstr "" @@ -649,6 +658,7 @@ msgstr "" msgid "Ensenada" msgstr "" +#: 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 "" @@ -657,13 +667,14 @@ 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.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.cc:903 source/ubl-settings-datetime.cc:839 msgid "Error in the NTP server name" msgstr "" @@ -671,7 +682,8 @@ msgstr "" msgid "Error in the ntp name" msgstr "" -#: source/ubl-settings-datetime.cc:681 source/ubl-settings-datetime.cc:678 +#: 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 "" @@ -756,19 +768,23 @@ msgstr "" msgid "Glace_Bay" msgstr "" -#: source/ubl-settings-datetime.cc:693 source/ubl-settings-datetime.cc:690 +#: 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.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.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.cc:741 source/ubl-settings-datetime.cc:677 +#: source/ubl-settings-datetime.cc:674 msgid "Global configuration write error" msgstr "" @@ -820,11 +836,11 @@ msgstr "" msgid "Harbin" msgstr "" -#: source/ubl-settings-datetime.cc:792 +#: 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.cc:852 source/ubl-settings-datetime.cc:788 msgid "Hardware clock synchronization error" msgstr "" @@ -861,6 +877,7 @@ msgstr "" msgid "Hovd" msgstr "" +#: 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" @@ -1037,7 +1054,8 @@ msgstr "" msgid "Ljubljana" msgstr "" -#: source/ubl-settings-datetime.cc:135 source/ubl-settings-datetime.cc:130 +#: source/ubl-settings-datetime.cc:139 source/ubl-settings-datetime.cc:135 +#: source/ubl-settings-datetime.cc:130 msgid "Load" msgstr "" @@ -1047,23 +1065,28 @@ msgstr "" msgid "Load local configuration" msgstr "" -#: source/ubl-settings-datetime.cc:690 source/ubl-settings-datetime.cc:687 +#: 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.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.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.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.cc:161 source/ubl-settings-datetime.cc:156 +#: source/ubl-settings-datetime.cc:151 msgid "Local time" msgstr "" @@ -1148,7 +1171,8 @@ msgstr "" msgid "Manila" msgstr "" -#: source/ubl-settings-datetime.cc:141 source/ubl-settings-datetime.cc:136 +#: source/ubl-settings-datetime.cc:145 source/ubl-settings-datetime.cc:141 +#: source/ubl-settings-datetime.cc:136 msgid "Manual" msgstr "" @@ -1273,7 +1297,7 @@ msgstr "" msgid "NTP is correct" msgstr "" -#: source/ubl-settings-datetime.cc:827 +#: source/ubl-settings-datetime.cc:891 source/ubl-settings-datetime.cc:827 msgid "NTP server name is correct" msgstr "" @@ -1325,9 +1349,11 @@ 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.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 "" @@ -1436,7 +1462,8 @@ msgstr "" msgid "Prague" msgstr "" -#: source/ubl-settings-datetime.cc:133 source/ubl-settings-datetime.cc:128 +#: source/ubl-settings-datetime.cc:136 source/ubl-settings-datetime.cc:133 +#: source/ubl-settings-datetime.cc:128 msgid "Project Home Page" msgstr "" @@ -1473,13 +1500,18 @@ msgstr "" msgid "Rarotonga" msgstr "" +#: 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.cc:152 source/ubl-settings-datetime.cc:148 +#: source/ubl-settings-datetime.cc:143 msgid "Region:" msgstr "" @@ -1570,7 +1602,8 @@ msgstr "" msgid "Saskatchewan" msgstr "" -#: source/ubl-settings-datetime.cc:134 source/ubl-settings-datetime.cc:129 +#: source/ubl-settings-datetime.cc:138 source/ubl-settings-datetime.cc:134 +#: source/ubl-settings-datetime.cc:129 msgid "Save" msgstr "" @@ -1595,7 +1628,8 @@ 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.cc:148 source/ubl-settings-datetime.cc:144 +#: source/ubl-settings-datetime.cc:139 msgid "Setting the date and time" msgstr "" @@ -1665,7 +1699,8 @@ msgstr "" msgid "Stop the synchronization service" msgstr "" -#: source/ubl-settings-datetime.cc:702 source/ubl-settings-datetime.cc:699 +#: 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 "" @@ -1675,19 +1710,23 @@ msgstr "" msgid "Sydney" msgstr "" -#: source/ubl-settings-datetime.cc:150 source/ubl-settings-datetime.cc:145 +#: 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.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.cc:142 source/ubl-settings-datetime.cc:138 +#: source/ubl-settings-datetime.cc:133 msgid "Synchronize via NTP" msgstr "" @@ -1727,7 +1766,8 @@ msgstr "" msgid "Tell_City" msgstr "" -#: source/ubl-settings-datetime.cc:120 source/ubl-settings-datetime.cc:115 +#: 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 "" @@ -1754,11 +1794,13 @@ msgstr "" msgid "Timbuktu" msgstr "" -#: source/ubl-settings-datetime.cc:147 source/ubl-settings-datetime.cc:142 +#: 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.cc:149 source/ubl-settings-datetime.cc:145 +#: source/ubl-settings-datetime.cc:140 msgid "Time:" msgstr "" @@ -1801,7 +1843,8 @@ msgstr "" msgid "US" msgstr "" -#: source/ubl-settings-datetime.cc:155 source/ubl-settings-datetime.cc:150 +#: source/ubl-settings-datetime.cc:160 source/ubl-settings-datetime.cc:155 +#: source/ubl-settings-datetime.cc:150 msgid "UTC time" msgstr "" @@ -1895,6 +1938,10 @@ msgstr "" msgid "Winnipeg" msgstr "" +#: source/ubl-settings-datetime.cc:168 +msgid "Would you like to read documentation in the Web?" +msgstr "" + msgid "Yakutat" msgstr "" @@ -1919,6 +1966,12 @@ msgstr "" msgid "Yerevan" msgstr "" +#: 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 "" @@ -1928,7 +1981,8 @@ msgstr "" msgid "Zaporozhye" msgstr "" -#: source/ubl-settings-datetime.cc:149 source/ubl-settings-datetime.cc:144 +#: source/ubl-settings-datetime.cc:153 source/ubl-settings-datetime.cc:149 +#: source/ubl-settings-datetime.cc:144 msgid "Zone:" msgstr "" @@ -1938,7 +1992,8 @@ msgstr "" msgid "Zurich" msgstr "" -#: source/ubl-settings-datetime.cc:131 source/ubl-settings-datetime.cc:126 +#: source/ubl-settings-datetime.cc:134 source/ubl-settings-datetime.cc:131 +#: source/ubl-settings-datetime.cc:126 msgid "https://wiki.ublinux.com" msgstr "" @@ -1947,10 +2002,17 @@ 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.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.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 30f16a6..ba48d6d 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -7,8 +7,8 @@ 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" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-04-24 10:28+0600\n" "PO-Revision-Date: 2023-01-01 00:00+0600\n" "Last-Translator: UBLinux Team \n" "Language-Team: Russian - UBLinux Team \n" @@ -17,66 +17,46 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -msgid "Would you like to read documentation in the Web?" -msgstr "Вы хотите прочитать справку в Сети?" - -msgid "" -"You will be redirected to documentation site, where user help pages are " -"translated and supported by community." -msgstr "" -"Вы будете перенаправлены на сайт с документацией где страницы помощи " -"переводятся и поддерживаются сообществом." - -msgid "Cancel" -msgstr "Отменить" - -msgid "Always redirect" -msgstr "Всегда перенаправлять" - -msgid "Read online" -msgstr "Прочитать онлайн" - -msgid "About ubl-settings-bootloader" -msgstr "О программе Загрузка системы" - msgid ":" msgstr ":" -msgid "About ubl-settings-datetime" -msgstr "О программе Настройка даты и времени" - +#: 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.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.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.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 ": \"Временная зона\"" @@ -90,6 +70,10 @@ msgstr "Абиджан" msgid "About" msgstr "О программе" +#: source/ubl-settings-datetime.cc:137 +msgid "About ubl-settings-datetime" +msgstr "О программе Настройка даты и времени" + msgid "Accra" msgstr "Аккра" @@ -130,6 +114,10 @@ msgstr "Алжир" msgid "Almaty" msgstr "Алматы" +#: source/ubl-settings-datetime.cc:173 +msgid "Always redirect" +msgstr "Всегда перенаправлять" + msgid "America" msgstr "Америка" @@ -139,7 +127,8 @@ msgstr "Амман" msgid "Amsterdam" msgstr "Амстердам" -#: source/ubl-settings-datetime.cc:834 source/ubl-settings-datetime.cc:817 +#: 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 "Введён недопустимый символ" @@ -221,7 +210,8 @@ msgstr "Атка" msgid "Atlantic" msgstr "Атлантика" -#: source/ubl-settings-datetime.cc:152 source/ubl-settings-datetime.cc:147 +#: source/ubl-settings-datetime.cc:157 source/ubl-settings-datetime.cc:152 +#: source/ubl-settings-datetime.cc:147 msgid "Attention" msgstr "Внимание" @@ -384,6 +374,10 @@ msgstr "Канари" msgid "Canberra" msgstr "Канберра" +#: source/ubl-settings-datetime.cc:172 +msgid "Cancel" +msgstr "Отменить" + msgid "Cancun" msgstr "Канкун" @@ -492,7 +486,8 @@ msgstr "Континентальный" msgid "Copenhagen" msgstr "Копенгаген" -#: source/ubl-settings-datetime.cc:128 source/ubl-settings-datetime.cc:123 +#: 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 - " @@ -514,14 +509,16 @@ msgstr "Куяба" msgid "Curacao" msgstr "Кюрасао" -#: source/ubl-settings-datetime.cc:143 source/ubl-settings-datetime.cc:138 +#: 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.cc:144 source/ubl-settings-datetime.cc:140 +#: source/ubl-settings-datetime.cc:135 msgid "DHCP" msgstr "" @@ -543,16 +540,19 @@ msgstr "Дар-эс-Салам" msgid "Darwin" msgstr "Дарвин" -#: source/ubl-settings-datetime.cc:130 source/ubl-settings-datetime.cc:125 +#: 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.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.cc:140 source/ubl-settings-datetime.cc:136 +#: source/ubl-settings-datetime.cc:131 msgid "" "Date of\n" "Format: DD.MM.YYYY" @@ -560,7 +560,8 @@ msgstr "" "Дата\n" "Формат: ДД.ММ.ГГГГ" -#: source/ubl-settings-datetime.cc:146 source/ubl-settings-datetime.cc:141 +#: source/ubl-settings-datetime.cc:150 source/ubl-settings-datetime.cc:146 +#: source/ubl-settings-datetime.cc:141 msgid "Date:" msgstr "Дата:" @@ -576,7 +577,8 @@ msgstr "Доусон Крик" msgid "DeNoronha" msgstr "Фернанду-ди-Норонья" -#: source/ubl-settings-datetime.cc:139 source/ubl-settings-datetime.cc:134 +#: source/ubl-settings-datetime.cc:143 source/ubl-settings-datetime.cc:139 +#: source/ubl-settings-datetime.cc:134 msgid "Default" msgstr "По умолчанию" @@ -592,7 +594,8 @@ msgstr "Дакка" msgid "Dili" msgstr "Дили" -#: source/ubl-settings-datetime.cc:142 source/ubl-settings-datetime.cc:137 +#: source/ubl-settings-datetime.cc:146 source/ubl-settings-datetime.cc:142 +#: source/ubl-settings-datetime.cc:137 msgid "Disabled" msgstr "Отключено" @@ -659,6 +662,7 @@ msgstr "Эндербери" msgid "Ensenada" msgstr "Энсенада" +#: 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 серверов" @@ -668,7 +672,8 @@ 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.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." @@ -676,7 +681,7 @@ msgstr "" "Введите имя ntp-сервера или его ip-адрес.\n" "При вводе нескольких адресов, разделяйте их запятыми." -#: source/ubl-settings-datetime.cc:839 +#: source/ubl-settings-datetime.cc:903 source/ubl-settings-datetime.cc:839 msgid "Error in the NTP server name" msgstr "Ошибка в имени NTP сервера" @@ -685,7 +690,8 @@ 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.cc:745 source/ubl-settings-datetime.cc:681 +#: source/ubl-settings-datetime.cc:678 msgid "Error saved local and global configuration" msgstr "Ошибка сохранения локальной и глобальной конфигурации" @@ -787,19 +793,23 @@ msgstr "Гибралтар" msgid "Glace_Bay" msgstr "Глейс-Бей" -#: source/ubl-settings-datetime.cc:693 source/ubl-settings-datetime.cc:690 +#: 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.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.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.cc:741 source/ubl-settings-datetime.cc:677 +#: source/ubl-settings-datetime.cc:674 msgid "Global configuration write error" msgstr "Ошибка записи глобальной конфигурации" @@ -851,11 +861,11 @@ msgstr "Хараре" msgid "Harbin" msgstr "Харбин" -#: source/ubl-settings-datetime.cc:792 +#: 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.cc:852 source/ubl-settings-datetime.cc:788 msgid "Hardware clock synchronization error" msgstr "Ошибка синхронизации аппаратных часов" @@ -892,6 +902,7 @@ msgstr "Гонолулу" msgid "Hovd" msgstr "Ховд" +#: 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" @@ -1068,7 +1079,8 @@ msgstr "Лиссабон" msgid "Ljubljana" msgstr "Любляна" -#: source/ubl-settings-datetime.cc:135 source/ubl-settings-datetime.cc:130 +#: source/ubl-settings-datetime.cc:139 source/ubl-settings-datetime.cc:135 +#: source/ubl-settings-datetime.cc:130 msgid "Load" msgstr "Загрузить" @@ -1078,23 +1090,28 @@ msgstr "Загрузить глобальную конфигурацию" msgid "Load local configuration" msgstr "Загрузить локальную конфигурацию" -#: source/ubl-settings-datetime.cc:690 source/ubl-settings-datetime.cc:687 +#: 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.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.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.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.cc:161 source/ubl-settings-datetime.cc:156 +#: source/ubl-settings-datetime.cc:151 msgid "Local time" msgstr "Локальное время" @@ -1179,7 +1196,8 @@ msgstr "Манаус" msgid "Manila" msgstr "Манила" -#: source/ubl-settings-datetime.cc:141 source/ubl-settings-datetime.cc:136 +#: source/ubl-settings-datetime.cc:145 source/ubl-settings-datetime.cc:141 +#: source/ubl-settings-datetime.cc:136 msgid "Manual" msgstr "Вручную" @@ -1305,7 +1323,7 @@ msgstr "Новый Южный Уэльс" msgid "NTP is correct" msgstr "Имя NTP сервера корректно" -#: source/ubl-settings-datetime.cc:827 +#: source/ubl-settings-datetime.cc:891 source/ubl-settings-datetime.cc:827 msgid "NTP server name is correct" msgstr "Имя NTP сервера корректно" @@ -1357,9 +1375,11 @@ 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.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 "Нечего сохранять!" @@ -1468,7 +1488,8 @@ msgstr "Порту-Велью" msgid "Prague" msgstr "Прага" -#: source/ubl-settings-datetime.cc:133 source/ubl-settings-datetime.cc:128 +#: source/ubl-settings-datetime.cc:136 source/ubl-settings-datetime.cc:133 +#: source/ubl-settings-datetime.cc:128 msgid "Project Home Page" msgstr "Домашняя страница проекта" @@ -1505,13 +1526,18 @@ msgstr "Ранкин-Инлет" msgid "Rarotonga" msgstr "Раротонга" +#: 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.cc:152 source/ubl-settings-datetime.cc:148 +#: source/ubl-settings-datetime.cc:143 msgid "Region:" msgstr "Регион:" @@ -1602,7 +1628,8 @@ msgstr "Саратов" msgid "Saskatchewan" msgstr "Саскачеван" -#: source/ubl-settings-datetime.cc:134 source/ubl-settings-datetime.cc:129 +#: source/ubl-settings-datetime.cc:138 source/ubl-settings-datetime.cc:134 +#: source/ubl-settings-datetime.cc:129 msgid "Save" msgstr "Сохранить" @@ -1627,7 +1654,8 @@ 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.cc:148 source/ubl-settings-datetime.cc:144 +#: source/ubl-settings-datetime.cc:139 msgid "Setting the date and time" msgstr "Настройка даты и времени" @@ -1697,7 +1725,8 @@ msgstr "Стокгольм" msgid "Stop the synchronization service" msgstr "Остановить сервис синхронизации" -#: source/ubl-settings-datetime.cc:702 source/ubl-settings-datetime.cc:699 +#: 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 "Успешно сохранена локальная и глобальная конфигурация" @@ -1707,19 +1736,23 @@ msgstr "Суифт-Каррент" msgid "Sydney" msgstr "Сидней" -#: source/ubl-settings-datetime.cc:150 source/ubl-settings-datetime.cc:145 +#: 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.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.cc:142 source/ubl-settings-datetime.cc:138 +#: source/ubl-settings-datetime.cc:133 msgid "Synchronize via NTP" msgstr "Синхронизировать через NTP" @@ -1759,7 +1792,8 @@ msgstr "Тель-Авив" msgid "Tell_City" msgstr "Телл-Сити" -#: source/ubl-settings-datetime.cc:120 source/ubl-settings-datetime.cc:115 +#: 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 "Программа должна быть запущена с правами суперпользователя!" @@ -1788,11 +1822,13 @@ msgstr "Тихуана" msgid "Timbuktu" msgstr "Тимбукту" -#: source/ubl-settings-datetime.cc:147 source/ubl-settings-datetime.cc:142 +#: 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.cc:149 source/ubl-settings-datetime.cc:145 +#: source/ubl-settings-datetime.cc:140 msgid "Time:" msgstr "Время:" @@ -1835,7 +1871,8 @@ msgstr "Тунис" msgid "US" msgstr "США" -#: source/ubl-settings-datetime.cc:155 source/ubl-settings-datetime.cc:150 +#: source/ubl-settings-datetime.cc:160 source/ubl-settings-datetime.cc:155 +#: source/ubl-settings-datetime.cc:150 msgid "UTC time" msgstr "Время по UTC" @@ -1929,6 +1966,10 @@ msgstr "Виндхук" msgid "Winnipeg" msgstr "Виннипег" +#: source/ubl-settings-datetime.cc:168 +msgid "Would you like to read documentation in the Web?" +msgstr "Вы хотите прочитать справку в Сети?" + msgid "Yakutat" msgstr "Якутат" @@ -1953,6 +1994,14 @@ msgstr "Йеллоунайф" msgid "Yerevan" msgstr "Ереван" +#: 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 "Юкон" @@ -1962,7 +2011,8 @@ msgstr "Загреб" msgid "Zaporozhye" msgstr "Запорожье" -#: source/ubl-settings-datetime.cc:149 source/ubl-settings-datetime.cc:144 +#: source/ubl-settings-datetime.cc:153 source/ubl-settings-datetime.cc:149 +#: source/ubl-settings-datetime.cc:144 msgid "Zone:" msgstr "Зона:" @@ -1972,7 +2022,8 @@ msgstr "Зулу" msgid "Zurich" msgstr "Цюрих" -#: source/ubl-settings-datetime.cc:131 source/ubl-settings-datetime.cc:126 +#: 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" @@ -1982,10 +2033,18 @@ 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.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.cc:1714 source/ubl-settings-datetime.cc:1651 +#: source/ubl-settings-datetime.cc:1606 msgid "ubl-settings-datetime version: " msgstr "ubl-settings-datetime версия: " -- 2.35.1 From 4a06af02b0d9174c7d51582f7a0ed8d4e270672b Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 24 Apr 2023 10:32:33 +0600 Subject: [PATCH 06/20] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=BE=D0=BA=D0=BD=D0=BE=20=D0=BE=20?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B3=D1=80=D0=B0=D0=BC=D0=BC=D0=B5=20=D0=B2?= =?UTF-8?q?=20glade?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-datetime.glade | 1 + 1 file changed, 1 insertion(+) diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index cba6c55..3f20b50 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -1575,6 +1575,7 @@ Format: DD.MM.YYYY True False + True True -- 2.35.1 From 9595ea2e8bb62833f568242cbbe5de60acc4b70a Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 24 Apr 2023 11:11:58 +0600 Subject: [PATCH 07/20] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=BD=D0=B5=D0=B4=D0=BE=D1=87=D0=B5?= =?UTF-8?q?=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 5 ++++- source/ubl-settings-datetime.h | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 7a84818..b35d1bf 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -171,7 +171,7 @@ void MainWindow::lacalization() { btnReadHelp->set_label(_("Read online")); btnCancelHelp->set_label(_("Cancel")); chkAlwaysOpenHelp->set_label(_("Always redirect")); - lblwebHeaderName->set_label(_("ubl-settings-bootloader")); + lblwebHeaderName->set_label(_("ubl-settings-datetime")); } void MainWindow::bubble_sort(string arr[],string arr_local[], int len_arr) { @@ -1690,6 +1690,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; diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 9b0dfa5..f823eaf 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -175,8 +175,8 @@ class MainWindow : public Gtk::ApplicationWindow { public: MainWindow(BaseObjectType* obj, Glib::RefPtr const& builder); MainWindow(Glib::RefPtr const& builder); + ~MainWindow(); void open_browser(); - virtual ~MainWindow() = default; void log_mess_error(string &cmd); void set_hardware_clock(string &local, string &etc); void info_warning_error(int mess); -- 2.35.1 From aa52ff312ebbc996062381859a046c32ed4d95b8 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 24 Apr 2023 11:52:09 +0600 Subject: [PATCH 08/20] Fix --- ubl-settings-datetime.glade | 2 +- ubl-settings-datetime.pot | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index 3f20b50..acf8a7e 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -89,7 +89,7 @@ False True center - com.ublinux.ubl-settings-diskquota + com.ublinux.ubl-settings-datetime dialog True True diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot index 10d5158..5a10147 100644 --- a/ubl-settings-datetime.pot +++ b/ubl-settings-datetime.pot @@ -1,17 +1,17 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Language translations for ubl-settings-datetime package. +# Copyright (C) 2022, UBTech LLC +# This file is distributed under the same license as the ubl-settings-datetime package. +# UBLinux Team , 2022 # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-24 10:28+0600\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"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" +"PO-Revision-Date: 2023-01-01 00:00+0600\n" +"Last-Translator: UBLinux Team \n" +"Language-Team: UBLinux Team \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -- 2.35.1 From 16b276e8629116524f22b588bb0bf05dc5f8f767 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 24 Apr 2023 11:58:47 +0600 Subject: [PATCH 09/20] Fix --- ubl-settings-datetime.glade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index acf8a7e..584ca60 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -1580,7 +1580,7 @@ Format: DD.MM.YYYY True False - ubl-settings-bootloader + ubl-settings-datetime -- 2.35.1 From 624ca395d7400c3c496f1472a8a1da8ba4e100b5 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 24 Apr 2023 15:35:23 +0600 Subject: [PATCH 10/20] =?UTF-8?q?=D0=9B=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D0=B2=D1=8B=D0=BD=D0=B5=D1=81?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=B2=20=D0=BE=D1=82=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D1=8B=D0=B9=20=D1=84=D0=B0=D0=B9=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/CMakeLists.txt | 1 + source/main.cc | 6 +- source/my_cmd.h | 7 +- source/my_localization.h | 75 ++++++++++ source/ubl-settings-datetime.cc | 240 +++++++++++++++----------------- source/ubl-settings-datetime.h | 5 +- 6 files changed, 200 insertions(+), 134 deletions(-) create mode 100644 source/my_localization.h diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 06976d8..435f6a0 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -30,6 +30,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissin -fstack-clash-protection -fcf-protection") set(SOURCE_FILES + my_localization.h ubl-settings-datetime-cm.h ubl-util-standard.h ubl-util-standard.c diff --git a/source/main.cc b/source/main.cc index d7dbecd..909431b 100644 --- a/source/main.cc +++ b/source/main.cc @@ -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/my_cmd.h b/source/my_cmd.h index 406e915..9db24c4 100644 --- a/source/my_cmd.h +++ b/source/my_cmd.h @@ -26,8 +26,13 @@ #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" + + + + #endif diff --git a/source/my_localization.h b/source/my_localization.h new file mode 100644 index 0000000..8448c4d --- /dev/null +++ b/source/my_localization.h @@ -0,0 +1,75 @@ + +#ifndef MY_LOCALIZATION +#define MY_LOCALIZATION +#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_about_1 _("About") +#define str_save _("Save") +#define str_load _("Load") +#define save_all _("Save to global and local configuration") +#define save_local _("Save local configuration") +#define save_global _("Save 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.") + +#endif \ No newline at end of file diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index b35d1bf..06d9e32 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -55,31 +55,31 @@ MainWindow::MainWindow(Glib::RefPtr const& builder) { } void MainWindow::settings() { - map_error[get_system_ZONE] = string(gettext(": \"Time Zone\"")); - map_error[set_hwclock] = string(gettext(": \"Hardware time\"")); - map_error[get_system_NTPSERVERS] = string(gettext(": \"NTP\"")); - map_error[get_system_HWCLOCK_SYNC] = string(gettext(": \"Hardware time\"")); - map_error[get_global_NTPSERVERS] = string(gettext(": \"NTP\"")); - map_error[get_global_ZONE] = string(gettext(": \"Time Zone\"")); - map_error[get_global_defalult_HWCLOCK_SYNC] = string(gettext(": \"Hardware time\"")); - map_error[get_global_HWCLOCK_SYNC] = string(gettext(": \"Hardware time\"")); - map_error[set_system_ZONE] = string(gettext(": \"Time Zone\"")); - map_error[set_system_NTPSERVERS_default] = string(gettext(": \"NTP\"")); - map_error[set_system_NTPSERVERS_dhcp] = string(gettext(": \"NTP\"")); - map_error[set_system_NTPSERVERS] = string(gettext(": \"NTP\"")); - map_error[remove_system_NTPSERVERS] = string(gettext(": \"NTP\"")); - map_error[set_system_HWCLOCK_SYNC_localtime] = string(gettext(": \"Hardware time\"")); - map_error[set_system_HWCLOCK_SYNC_utc] = string(gettext(": \"Hardware time\"")); - map_error[set_global_ZONE] = string(gettext(": \"Time Zone\"")); - map_error[set_global_NTPSERVERS_default] = string(gettext(": \"NTP\"")); - map_error[set_global_NTPSERVERS_dhcp] = string(gettext(": \"NTP\"")); - map_error[set_global_NTPSERVERS] = string(gettext(": \"NTP\"")); - map_error[remove_global_NTPSERVERS] = string(gettext(": \"NTP\"")); - map_error[set_global_HWCLOCK_SYNC_localtime] = string(gettext(": \"Hardware time\"")); - map_error[set_global_HWCLOCK_SYNC_utc] = string(gettext(": \"Hardware time\"")); - map_error[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[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; @@ -117,9 +117,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); + imgInfo->set_from_icon_name(icon_warning, Gtk::ICON_SIZE_MENU); info_status_app("boxInfoMessError"); - lblWarning->set_text(gettext("The program must be run as root")); + lblWarning->set_text(program_as_root); } } @@ -127,51 +127,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); - aboutWindows->set_program_name(gettext("ubl-settings-datetime")); + 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")); - lblHeaderAboutTopic->set_label(gettext("About ubl-settings-datetime")); - 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")); - lblHeadeWndWeb->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(_("Would you like to read documentation in the Web?")); - lblhelpText->set_text(_("You will be redirected to documentation site, where user help pages are " - "translated and supported by community.")); - btnReadHelp->set_label(_("Read online")); - btnCancelHelp->set_label(_("Cancel")); - chkAlwaysOpenHelp->set_label(_("Always redirect")); - lblwebHeaderName->set_label(_("ubl-settings-datetime")); + 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) { @@ -426,7 +425,7 @@ void MainWindow::open_browser() { webkit_web_view_load_uri(one, link_doc); wndWeb->show_all(); #else - string cmd = cmd_xdg + string(gettext(link_doc)) + " &"; + string cmd = cmd_xdg + string(_(link_doc)) + " &"; string buf = ""; if (geteuid() == 0) { string response_user = getlogin(); @@ -470,7 +469,7 @@ 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!")); + lblWarning->set_text(nothing_save); } else { string cmd_zone = set_system_ZONE; @@ -499,7 +498,7 @@ 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!")); + lblWarning->set_text(nothing_save); } else { string cmd = set_global_ZONE; @@ -530,7 +529,7 @@ void MainWindow::save_global_local_cfg() { (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!")); + lblWarning->set_text(nothing_save); } else { string cmd = ""; @@ -721,49 +720,49 @@ 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); + 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); + 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); } } } @@ -849,11 +848,11 @@ void MainWindow::hardware_clock() { string cmd = set_hwclock; wrapper_system(cmd); if (error_hw != error_info){ - lblWarning->set_text(gettext("Hardware clock synchronization error")); + lblWarning->set_text(hardware_clock_error); info_status_app("boxInfoMessError"); } else { - lblWarning->set_text(gettext("Hardware clock successfully synchronized")); + lblWarning->set_text(hardware_clock_ok); info_status_app("boxInfoMessOK"); } } @@ -864,7 +863,7 @@ 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")); + lblWarning->set_text(entry_list_ntp); info_status_app("boxInfoMessError"); btnSave->set_sensitive(false); return false; @@ -888,19 +887,19 @@ 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")); + lblWarning->set_text(ntp_server_ok); info_status_app("boxInfoMessOK"); btnSave->set_sensitive(true); return true; } else { if (flag_error == true) { - lblWarning->set_text(gettext("An invalid character is entered")); + lblWarning->set_text(invalid_character_entry); info_status_app("boxInfoMessError"); btnSave->set_sensitive(false); } else if (flag_error_check_ntp == true) { - lblWarning->set_text(gettext("Error in the NTP server name")); + lblWarning->set_text(error_ntp_name); info_status_app("boxInfoMessError"); btnSave->set_sensitive(false); } @@ -1136,7 +1135,7 @@ 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")); + lblWarning->set_text(entry_list_ntp); info_status_app("boxInfoMessError"); btnSave->set_sensitive(false); } @@ -1282,19 +1281,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 = ""; } } @@ -1310,13 +1309,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; } @@ -1342,7 +1341,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); } } @@ -1352,7 +1351,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); @@ -1412,12 +1411,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)); } } @@ -1456,7 +1455,7 @@ void MainWindow::update_time_date() { year = 0; month = 0; day = 0; - lblWarning->set_text(gettext("Date and time are successfully synchronized")); + lblWarning->set_text(date_time_ok_synchronized); info_status_app("boxInfoMessOK"); flag_error_time = false; } @@ -1474,7 +1473,7 @@ void MainWindow::update_time_date() { day = 0; } if (flag_error_time == false) { - lblWarning->set_text(gettext("Date and time are successfully synchronized")); + lblWarning->set_text(date_time_ok_synchronized); info_status_app("boxInfoMessOK"); hour = numTimeHrs->get_value_as_int(); minute = numTimeMin->get_value_as_int(); @@ -1500,18 +1499,18 @@ 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")); + lblWarning->set_text(incorrect_date_f); info_status_app("boxInfoMessError"); return true; } else { - lblWarning->set_text(gettext("Date and time are successfully synchronized")); + lblWarning->set_text(date_time_ok_synchronized); info_status_app("boxInfoMessOK"); return false; } } else { - lblWarning->set_text(gettext("Incorrect date format")); + lblWarning->set_text(incorrect_date_f); info_status_app("boxInfoMessError"); return true; } @@ -1577,7 +1576,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(); @@ -1586,7 +1585,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); } } @@ -1714,24 +1713,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 f823eaf..3f61e1f 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -20,6 +20,7 @@ #include "ubl-util-standard.c" #include "my_cmd.h" #include "ubl-settings-datetime-cm.h" +#include "my_localization.h" #ifdef WEBKIT_FOUND #include #endif @@ -148,8 +149,8 @@ class MainWindow : public Gtk::ApplicationWindow { 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; -- 2.35.1 From a231791f3d04628becda2461a520a4f205374e43 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 24 Apr 2023 16:50:00 +0600 Subject: [PATCH 11/20] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?= =?UTF-8?q?=D0=B0=20.so=20=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5?= =?UTF-8?q?=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/my_localization.h | 1 - source/ubl-settings-datetime.cc | 24 ++++++++++++++++++------ source/ubl-settings-datetime.h | 1 + 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/source/my_localization.h b/source/my_localization.h index 8448c4d..4d2c4bd 100644 --- a/source/my_localization.h +++ b/source/my_localization.h @@ -9,7 +9,6 @@ #define str_about_1 _("About") #define str_about _("About ubl-settings-datetime") #define str_help _("Help") -#define str_about_1 _("About") #define str_save _("Save") #define str_load _("Load") #define save_all _("Save to global and local configuration") diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 06d9e32..04f89c1 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -93,9 +93,13 @@ void MainWindow::settings() { 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); + void *handle=NULL; + handle = dlopen("libwebkit2gtk-4.0.so", RTLD_LAZY); + if (handle) { + one = WEBKIT_WEB_VIEW( webkit_web_view_new() ); + three = Glib::wrap(GTK_WIDGET(one)); + wndWeb->add(*three); + } #endif if (geteuid() == 0) { numTimeHrs->set_range(0, 23); @@ -325,7 +329,11 @@ void MainWindow::get_builder() { builder->get_widget("overHead", overHead); builder->get_widget("imgHeadBackground", imgHeadBackground); #ifdef WEBKIT_FOUND - builder->get_widget("wndWeb", wndWeb); + void *handle=NULL; + handle = dlopen("libwebkit2gtk-4.0.so", RTLD_LAZY); + if (handle) { + builder->get_widget("wndWeb", wndWeb); + } #endif builder->get_widget("lblHeadeWndWeb", lblHeadeWndWeb); builder->get_widget("lblHeaderAboutTopic", lblHeaderAboutTopic); @@ -422,8 +430,12 @@ void MainWindow::synopsis_show() { void MainWindow::open_browser() { #ifdef WEBKIT_FOUND - webkit_web_view_load_uri(one, link_doc); - wndWeb->show_all(); + void *handle=NULL; + handle = dlopen("libwebkit2gtk-4.0.so", RTLD_LAZY); + if (handle) { + webkit_web_view_load_uri(one, link_doc); + wndWeb->show_all(); + } #else string cmd = cmd_xdg + string(_(link_doc)) + " &"; string buf = ""; diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 3f61e1f..703b510 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -22,6 +22,7 @@ #include "ubl-settings-datetime-cm.h" #include "my_localization.h" #ifdef WEBKIT_FOUND +#include #include #endif -- 2.35.1 From be48cf2c97c3281da9fdb2a3765b98e4489c584d Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 24 Apr 2023 17:00:58 +0600 Subject: [PATCH 12/20] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3=20=D1=81=20=D0=B2=D1=8B?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=BE=D0=BC=20=D0=B1=D1=80=D0=B0=D1=83=D0=B7?= =?UTF-8?q?=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 29 ++++++++++++++++++----------- source/ubl-settings-datetime.h | 2 ++ 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 04f89c1..227f8a6 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -436,21 +436,28 @@ void MainWindow::open_browser() { webkit_web_view_load_uri(one, link_doc); wndWeb->show_all(); } + else { + this->template_open_browser(); + } #else - 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 ); - } - obj_process_system.call(cmd, "&"); + 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; diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 703b510..98d2835 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -147,6 +147,7 @@ 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; @@ -188,6 +189,7 @@ class MainWindow : public Gtk::ApplicationWindow { 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); -- 2.35.1 From 1ed3b1550b6e8f03be91fd4db74281014d8f40e3 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 24 Apr 2023 17:38:21 +0600 Subject: [PATCH 13/20] =?UTF-8?q?=D0=A7=D0=B0=D1=81=D1=82=D1=8C=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B2?= =?UTF-8?q?=D1=8B=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=D0=BE=20=D0=B2=20=D0=BE?= =?UTF-8?q?=D1=82=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20=D1=84=D0=B0?= =?UTF-8?q?=D0=B9=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/CMakeLists.txt | 2 +- source/main.cc | 4 ++-- source/{my_cmd.h => my_cmd_and_path.h} | 10 ++++++---- source/ubl-settings-datetime.cc | 6 ------ source/ubl-settings-datetime.h | 9 +-------- 5 files changed, 10 insertions(+), 21 deletions(-) rename source/{my_cmd.h => my_cmd_and_path.h} (86%) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 435f6a0..c9f07e6 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -34,7 +34,7 @@ set(SOURCE_FILES ubl-settings-datetime-cm.h ubl-util-standard.h ubl-util-standard.c - my_cmd.h + my_cmd_and_path.h main.cc ubl-settings-datetime.cc ubl-settings-datetime.h) diff --git a/source/main.cc b/source/main.cc index 909431b..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); diff --git a/source/my_cmd.h b/source/my_cmd_and_path.h similarity index 86% rename from source/my_cmd.h rename to source/my_cmd_and_path.h index 9db24c4..2dd328f 100644 --- a/source/my_cmd.h +++ b/source/my_cmd_and_path.h @@ -29,10 +29,12 @@ #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" #endif diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 227f8a6..19e62f3 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; diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 98d2835..fe03a64 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -18,7 +18,7 @@ #include #include #include "ubl-util-standard.c" -#include "my_cmd.h" +#include "my_cmd_and_path.h" #include "ubl-settings-datetime-cm.h" #include "my_localization.h" #ifdef WEBKIT_FOUND @@ -27,13 +27,6 @@ #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; extern bool flag_datetime; extern bool flag_timezone; extern bool flag_ntp_mode; -- 2.35.1 From 4625ae846b30c2f135c4b8f687d41752906f690e Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Tue, 25 Apr 2023 11:23:03 +0600 Subject: [PATCH 14/20] =?UTF-8?q?=D0=92=D1=8B=D0=BD=D0=B5=D1=81=20=D0=B2?= =?UTF-8?q?=D1=81=D0=B5=20define=20=D0=B2=20=D0=BE=D0=B4=D0=B8=D0=BD=20?= =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB,=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=20CMakeLists?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/CMakeLists.txt | 14 +--- source/my_cmd_and_path.h | 40 ----------- source/my_localization.h | 74 ------------------- source/ubl-settings-datetime.cc | 40 +++++------ source/ubl-settings-datetime.h | 115 ++++++++++++++++++++++++++++-- source/ubl-settings-datetime.h.in | 1 - 6 files changed, 134 insertions(+), 150 deletions(-) delete mode 100644 source/my_cmd_and_path.h delete mode 100644 source/my_localization.h delete mode 100644 source/ubl-settings-datetime.h.in diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index c9f07e6..8d44392 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -9,19 +9,14 @@ 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) +option(WEBKIT_FOUND "" ON) +if(WEBKIT_FOUND) 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 \ @@ -30,11 +25,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissin -fstack-clash-protection -fcf-protection") set(SOURCE_FILES - my_localization.h - ubl-settings-datetime-cm.h ubl-util-standard.h ubl-util-standard.c - my_cmd_and_path.h main.cc ubl-settings-datetime.cc ubl-settings-datetime.h) diff --git a/source/my_cmd_and_path.h b/source/my_cmd_and_path.h deleted file mode 100644 index 2dd328f..0000000 --- a/source/my_cmd_and_path.h +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef MY_CMD_H -#define MY_CMD_H - -#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" -#endif - - diff --git a/source/my_localization.h b/source/my_localization.h deleted file mode 100644 index 4d2c4bd..0000000 --- a/source/my_localization.h +++ /dev/null @@ -1,74 +0,0 @@ - -#ifndef MY_LOCALIZATION -#define MY_LOCALIZATION -#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 to global and local configuration") -#define save_local _("Save local configuration") -#define save_global _("Save 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.") - -#endif \ No newline at end of file diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 19e62f3..be97591 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -116,7 +116,7 @@ void MainWindow::settings() { btnSave->set_sensitive(false); this->event(); imgInfo->set_from_icon_name(icon_warning, Gtk::ICON_SIZE_MENU); - info_status_app("boxInfoMessError"); + info_status_app(info_box_error_css); lblWarning->set_text(program_as_root); } } @@ -255,8 +255,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); } @@ -481,7 +481,7 @@ 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"); + info_status_app(info_box_ok_css); lblWarning->set_text(nothing_save); } else { @@ -510,7 +510,7 @@ 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"); + info_status_app(info_box_ok_css); lblWarning->set_text(nothing_save); } else { @@ -541,7 +541,7 @@ 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"); + info_status_app(info_box_ok_css); lblWarning->set_text(nothing_save); } else { @@ -732,7 +732,7 @@ 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"); + info_status_app(info_box_error_css); imgInfo->set_from_icon_name(icon_warning, Gtk::ICON_SIZE_MENU); error_info = 0; warning_info = 0; @@ -760,7 +760,7 @@ void MainWindow::info_warning_error(int mess) { cmd_error = ""; } else { - info_status_app("boxInfoMessOK"); + 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(local_load_ok); @@ -862,11 +862,11 @@ void MainWindow::hardware_clock() { wrapper_system(cmd); if (error_hw != error_info){ lblWarning->set_text(hardware_clock_error); - info_status_app("boxInfoMessError"); + info_status_app(info_box_error_css); } else { lblWarning->set_text(hardware_clock_ok); - info_status_app("boxInfoMessOK"); + info_status_app(info_box_ok_css); } } @@ -877,7 +877,7 @@ void MainWindow::gui_mess_close() { bool MainWindow::focus_ntp_text() { if (txtNtpServer->get_text() == "" || txtNtpServer->get_text() == " ") { lblWarning->set_text(entry_list_ntp); - info_status_app("boxInfoMessError"); + info_status_app(info_box_error_css); btnSave->set_sensitive(false); return false; } @@ -901,19 +901,19 @@ bool MainWindow::focus_ntp_text() { if ((flag_error == false) && (flag_error_check_ntp == false)) { this->write_config(str_ntp, "dhcp"); lblWarning->set_text(ntp_server_ok); - info_status_app("boxInfoMessOK"); + info_status_app(info_box_ok_css); btnSave->set_sensitive(true); return true; } else { if (flag_error == true) { lblWarning->set_text(invalid_character_entry); - info_status_app("boxInfoMessError"); + info_status_app(info_box_error_css); btnSave->set_sensitive(false); } else if (flag_error_check_ntp == true) { lblWarning->set_text(error_ntp_name); - info_status_app("boxInfoMessError"); + info_status_app(info_box_error_css); btnSave->set_sensitive(false); } return false; @@ -1149,7 +1149,7 @@ void MainWindow::entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhc if (str_dhcp == "") { this->write_config("", "dhcp"); lblWarning->set_text(entry_list_ntp); - info_status_app("boxInfoMessError"); + info_status_app(info_box_error_css); btnSave->set_sensitive(false); } else if (str_dhcp == "(null)") { @@ -1469,7 +1469,7 @@ void MainWindow::update_time_date() { month = 0; day = 0; lblWarning->set_text(date_time_ok_synchronized); - info_status_app("boxInfoMessOK"); + info_status_app(info_box_ok_css); flag_error_time = false; } else { @@ -1487,7 +1487,7 @@ void MainWindow::update_time_date() { } if (flag_error_time == false) { lblWarning->set_text(date_time_ok_synchronized); - info_status_app("boxInfoMessOK"); + info_status_app(info_box_ok_css); hour = numTimeHrs->get_value_as_int(); minute = numTimeMin->get_value_as_int(); time_t now = time(0); @@ -1513,18 +1513,18 @@ bool MainWindow::post_entry_data() { size_t index = str_error_clock.find("date:"); if (index != std::string::npos) { lblWarning->set_text(incorrect_date_f); - info_status_app("boxInfoMessError"); + info_status_app(info_box_error_css); return true; } else { lblWarning->set_text(date_time_ok_synchronized); - info_status_app("boxInfoMessOK"); + info_status_app(info_box_ok_css); return false; } } else { lblWarning->set_text(incorrect_date_f); - info_status_app("boxInfoMessError"); + info_status_app(info_box_error_css); return true; } } diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index fe03a64..4dccb5c 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -17,15 +17,122 @@ #include #include #include +#include #include "ubl-util-standard.c" -#include "my_cmd_and_path.h" -#include "ubl-settings-datetime-cm.h" -#include "my_localization.h" #ifdef WEBKIT_FOUND -#include + #include #endif + +#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 to global and local configuration") +#define save_local _("Save local configuration") +#define save_global _("Save 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; diff --git a/source/ubl-settings-datetime.h.in b/source/ubl-settings-datetime.h.in deleted file mode 100644 index 17ba454..0000000 --- a/source/ubl-settings-datetime.h.in +++ /dev/null @@ -1 +0,0 @@ -#cmakedefine WEBKIT_FOUND \ No newline at end of file -- 2.35.1 From 5908d75e9c81052c948d1fb72971fc91e910579c Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Tue, 25 Apr 2023 11:28:40 +0600 Subject: [PATCH 15/20] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-datetime_ru.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index ba48d6d..40f7be9 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ubl-settings-datetime 1.0\n" -"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: info@ublinux.com\n" "POT-Creation-Date: 2023-04-24 10:28+0600\n" "PO-Revision-Date: 2023-01-01 00:00+0600\n" "Last-Translator: UBLinux Team \n" -- 2.35.1 From 717f7b4c6d98fa3f9b26bc58d9819be711a2b6b5 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Tue, 25 Apr 2023 15:09:45 +0600 Subject: [PATCH 16/20] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-datetime.pot | 278 ++++++++++++++++++----------------- ubl-settings-datetime_ru.po | 282 +++++++++++++++++++----------------- 2 files changed, 298 insertions(+), 262 deletions(-) diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot index 5a10147..81c9fba 100644 --- a/ubl-settings-datetime.pot +++ b/ubl-settings-datetime.pot @@ -20,43 +20,45 @@ msgstr "" msgid ":" msgstr "" -#: 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.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 msgid ": \"Date\"" msgstr "" -#: 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:62 -#: source/ubl-settings-datetime.cc:84 +#: 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:62 source/ubl-settings-datetime.cc:84 msgid ": \"Hardware time\"" msgstr "" -#: 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:63 source/ubl-settings-datetime.cc:81 +#: 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:63 +#: source/ubl-settings-datetime.cc:81 msgid ": \"NTP\"" msgstr "" -#: 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:64 source/ubl-settings-datetime.cc:67 -#: source/ubl-settings-datetime.cc:74 +#: 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:64 +#: source/ubl-settings-datetime.cc:67 source/ubl-settings-datetime.cc:74 msgid ": \"Time Zone\"" msgstr "" @@ -67,10 +69,11 @@ msgstr "" msgid "Abidjan" msgstr "" +#: source/ubl-settings-datetime.h:69 msgid "About" msgstr "" -#: source/ubl-settings-datetime.cc:137 +#: source/ubl-settings-datetime.h:70 source/ubl-settings-datetime.cc:137 msgid "About ubl-settings-datetime" msgstr "" @@ -112,7 +115,7 @@ msgstr "" msgid "Almaty" msgstr "" -#: source/ubl-settings-datetime.cc:173 +#: source/ubl-settings-datetime.h:81 source/ubl-settings-datetime.cc:173 msgid "Always redirect" msgstr "" @@ -125,8 +128,8 @@ msgstr "" msgid "Amsterdam" msgstr "" -#: source/ubl-settings-datetime.cc:898 source/ubl-settings-datetime.cc:834 -#: source/ubl-settings-datetime.cc:817 +#: 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 "" @@ -166,6 +169,7 @@ msgstr "" msgid "Arctic" msgstr "" +#: source/ubl-settings-datetime.h:107 msgid "Argument not recognized\n" msgstr "" @@ -208,8 +212,8 @@ msgstr "" msgid "Atlantic" msgstr "" -#: source/ubl-settings-datetime.cc:157 source/ubl-settings-datetime.cc:152 -#: source/ubl-settings-datetime.cc:147 +#: 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 "" @@ -372,7 +376,7 @@ msgstr "" msgid "Canberra" msgstr "" -#: source/ubl-settings-datetime.cc:172 +#: source/ubl-settings-datetime.h:80 source/ubl-settings-datetime.cc:172 msgid "Cancel" msgstr "" @@ -484,8 +488,8 @@ msgstr "" msgid "Copenhagen" msgstr "" -#: source/ubl-settings-datetime.cc:130 source/ubl-settings-datetime.cc:128 -#: source/ubl-settings-datetime.cc:123 +#: 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 "" @@ -507,16 +511,16 @@ msgstr "" msgid "Curacao" msgstr "" -#: source/ubl-settings-datetime.cc:147 source/ubl-settings-datetime.cc:143 -#: source/ubl-settings-datetime.cc:138 +#: 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:144 source/ubl-settings-datetime.cc:140 -#: source/ubl-settings-datetime.cc:135 +#: 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 "" @@ -538,26 +542,27 @@ msgstr "" msgid "Darwin" msgstr "" -#: source/ubl-settings-datetime.cc:133 source/ubl-settings-datetime.cc:130 -#: source/ubl-settings-datetime.cc:125 +#: 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: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 +#: 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:140 source/ubl-settings-datetime.cc:136 -#: source/ubl-settings-datetime.cc: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:150 source/ubl-settings-datetime.cc:146 -#: source/ubl-settings-datetime.cc:141 +#: 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 "" @@ -573,8 +578,8 @@ msgstr "" msgid "DeNoronha" msgstr "" -#: source/ubl-settings-datetime.cc:143 source/ubl-settings-datetime.cc:139 -#: source/ubl-settings-datetime.cc:134 +#: 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 "" @@ -590,8 +595,8 @@ msgstr "" msgid "Dili" msgstr "" -#: source/ubl-settings-datetime.cc:146 source/ubl-settings-datetime.cc:142 -#: source/ubl-settings-datetime.cc:137 +#: 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 "" @@ -658,8 +663,9 @@ msgstr "" msgid "Ensenada" msgstr "" -#: source/ubl-settings-datetime.cc:867 source/ubl-settings-datetime.cc:1139 -#: source/ubl-settings-datetime.cc:803 source/ubl-settings-datetime.cc:1075 +#: 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 "" @@ -667,14 +673,15 @@ msgstr "" msgid "Enter a list of ntp servers" msgstr "" -#: source/ubl-settings-datetime.cc:141 source/ubl-settings-datetime.cc:137 -#: source/ubl-settings-datetime.cc:132 +#: 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:903 source/ubl-settings-datetime.cc:839 +#: 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 "" @@ -682,8 +689,8 @@ msgstr "" msgid "Error in the ntp name" msgstr "" -#: source/ubl-settings-datetime.cc:745 source/ubl-settings-datetime.cc:681 -#: source/ubl-settings-datetime.cc:678 +#: 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 "" @@ -729,6 +736,7 @@ msgstr "" msgid "GMT-3" msgstr "" +#: source/ubl-settings-datetime.h:85 msgid "" "GTK settings datetime for UBLinux\n" "\n" @@ -768,23 +776,23 @@ msgstr "" msgid "Glace_Bay" msgstr "" -#: source/ubl-settings-datetime.cc:757 source/ubl-settings-datetime.cc:693 -#: source/ubl-settings-datetime.cc:690 +#: 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:733 source/ubl-settings-datetime.cc:669 -#: source/ubl-settings-datetime.cc:666 +#: 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:763 source/ubl-settings-datetime.cc:699 -#: source/ubl-settings-datetime.cc:696 +#: 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:741 source/ubl-settings-datetime.cc:677 -#: source/ubl-settings-datetime.cc:674 +#: 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 "" @@ -836,11 +844,13 @@ msgstr "" msgid "Harbin" msgstr "" -#: source/ubl-settings-datetime.cc:856 source/ubl-settings-datetime.cc:792 +#: 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:852 source/ubl-settings-datetime.cc:788 +#: source/ubl-settings-datetime.h:105 source/ubl-settings-datetime.cc:852 +#: source/ubl-settings-datetime.cc:788 msgid "Hardware clock synchronization error" msgstr "" @@ -853,6 +863,7 @@ msgstr "" msgid "Hebron" msgstr "" +#: source/ubl-settings-datetime.h:71 msgid "Help" msgstr "" @@ -877,9 +888,10 @@ msgstr "" msgid "Hovd" msgstr "" -#: 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 +#: 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" msgstr "" @@ -1054,39 +1066,41 @@ msgstr "" msgid "Ljubljana" msgstr "" -#: source/ubl-settings-datetime.cc:139 source/ubl-settings-datetime.cc:135 -#: source/ubl-settings-datetime.cc:130 +#: 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:77 msgid "Load global configuration" msgstr "" +#: source/ubl-settings-datetime.h:78 msgid "Load local configuration" msgstr "" -#: source/ubl-settings-datetime.cc:754 source/ubl-settings-datetime.cc:690 -#: source/ubl-settings-datetime.cc:687 +#: 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:729 source/ubl-settings-datetime.cc:665 -#: source/ubl-settings-datetime.cc:662 +#: 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:760 source/ubl-settings-datetime.cc:696 -#: source/ubl-settings-datetime.cc:693 +#: 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:737 source/ubl-settings-datetime.cc:673 -#: source/ubl-settings-datetime.cc:670 +#: 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:161 source/ubl-settings-datetime.cc:156 -#: source/ubl-settings-datetime.cc:151 +#: 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 "" @@ -1171,8 +1185,8 @@ msgstr "" msgid "Manila" msgstr "" -#: source/ubl-settings-datetime.cc:145 source/ubl-settings-datetime.cc:141 -#: source/ubl-settings-datetime.cc:136 +#: 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 "" @@ -1297,7 +1311,8 @@ msgstr "" msgid "NTP is correct" msgstr "" -#: source/ubl-settings-datetime.cc:891 source/ubl-settings-datetime.cc:827 +#: 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 "" @@ -1349,11 +1364,11 @@ msgstr "" msgid "North_Dokota" msgstr "" -#: 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 +#: 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 "" @@ -1462,8 +1477,8 @@ msgstr "" msgid "Prague" msgstr "" -#: source/ubl-settings-datetime.cc:136 source/ubl-settings-datetime.cc:133 -#: source/ubl-settings-datetime.cc:128 +#: 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 "" @@ -1500,7 +1515,7 @@ msgstr "" msgid "Rarotonga" msgstr "" -#: source/ubl-settings-datetime.cc:171 +#: source/ubl-settings-datetime.h:79 source/ubl-settings-datetime.cc:171 msgid "Read online" msgstr "" @@ -1510,8 +1525,8 @@ msgstr "" msgid "Regina" msgstr "" -#: source/ubl-settings-datetime.cc:152 source/ubl-settings-datetime.cc:148 -#: source/ubl-settings-datetime.cc:143 +#: 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 "" @@ -1602,17 +1617,20 @@ msgstr "" msgid "Saskatchewan" msgstr "" -#: source/ubl-settings-datetime.cc:138 source/ubl-settings-datetime.cc:134 -#: source/ubl-settings-datetime.cc:129 +#: 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 "" +#: source/ubl-settings-datetime.h:76 msgid "Save global configuration" msgstr "" +#: source/ubl-settings-datetime.h:75 msgid "Save local configuration" msgstr "" +#: source/ubl-settings-datetime.h:74 msgid "Save to global and local configuration" msgstr "" @@ -1628,8 +1646,8 @@ msgstr "" msgid "Setting date and time in global configuration" msgstr "" -#: source/ubl-settings-datetime.cc:148 source/ubl-settings-datetime.cc:144 -#: source/ubl-settings-datetime.cc:139 +#: 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 "" @@ -1699,8 +1717,8 @@ msgstr "" msgid "Stop the synchronization service" msgstr "" -#: source/ubl-settings-datetime.cc:766 source/ubl-settings-datetime.cc:702 -#: source/ubl-settings-datetime.cc:699 +#: 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 "" @@ -1710,13 +1728,13 @@ msgstr "" msgid "Sydney" msgstr "" -#: source/ubl-settings-datetime.cc:154 source/ubl-settings-datetime.cc:150 -#: source/ubl-settings-datetime.cc:145 +#: 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:158 source/ubl-settings-datetime.cc:153 -#: source/ubl-settings-datetime.cc:148 +#: 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 "" @@ -1725,8 +1743,8 @@ msgstr "" msgid "Synchronize hardware time:" msgstr "" -#: source/ubl-settings-datetime.cc:142 source/ubl-settings-datetime.cc:138 -#: source/ubl-settings-datetime.cc:133 +#: 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 "" @@ -1766,8 +1784,8 @@ msgstr "" msgid "Tell_City" msgstr "" -#: source/ubl-settings-datetime.cc:122 source/ubl-settings-datetime.cc:120 -#: source/ubl-settings-datetime.cc:115 +#: 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 "" @@ -1794,13 +1812,13 @@ msgstr "" msgid "Timbuktu" msgstr "" -#: source/ubl-settings-datetime.cc:151 source/ubl-settings-datetime.cc:147 -#: source/ubl-settings-datetime.cc:142 +#: 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:149 source/ubl-settings-datetime.cc:145 -#: source/ubl-settings-datetime.cc:140 +#: 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 "" @@ -1843,8 +1861,8 @@ msgstr "" msgid "US" msgstr "" -#: source/ubl-settings-datetime.cc:160 source/ubl-settings-datetime.cc:155 -#: source/ubl-settings-datetime.cc:150 +#: 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 "" @@ -1938,7 +1956,7 @@ msgstr "" msgid "Winnipeg" msgstr "" -#: source/ubl-settings-datetime.cc:168 +#: source/ubl-settings-datetime.h:83 source/ubl-settings-datetime.cc:168 msgid "Would you like to read documentation in the Web?" msgstr "" @@ -1966,7 +1984,7 @@ msgstr "" msgid "Yerevan" msgstr "" -#: source/ubl-settings-datetime.cc:169 +#: 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." @@ -1981,8 +1999,8 @@ msgstr "" msgid "Zaporozhye" msgstr "" -#: source/ubl-settings-datetime.cc:153 source/ubl-settings-datetime.cc:149 -#: source/ubl-settings-datetime.cc:144 +#: 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 "" @@ -1992,8 +2010,8 @@ msgstr "" msgid "Zurich" msgstr "" -#: source/ubl-settings-datetime.cc:134 source/ubl-settings-datetime.cc:131 -#: source/ubl-settings-datetime.cc:126 +#: 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 "" @@ -2006,13 +2024,13 @@ msgstr "" msgid "ubl-settings-bootloader" msgstr "" -#: 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 +#: 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:1714 source/ubl-settings-datetime.cc:1651 -#: source/ubl-settings-datetime.cc:1606 +#: 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 40f7be9..64e0559 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ubl-settings-datetime 1.0\n" -"Report-Msgid-Bugs-To: info@ublinux.com\n" -"POT-Creation-Date: 2023-04-24 10:28+0600\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-04-25 15:09+0600\n" "PO-Revision-Date: 2023-01-01 00:00+0600\n" "Last-Translator: UBLinux Team \n" "Language-Team: Russian - UBLinux Team \n" @@ -20,43 +20,45 @@ msgstr "" msgid ":" msgstr ":" -#: 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.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 msgid ": \"Date\"" msgstr ": \"Дата\"" -#: 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:62 -#: source/ubl-settings-datetime.cc:84 +#: 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:62 source/ubl-settings-datetime.cc:84 msgid ": \"Hardware time\"" msgstr ": \"Аппаратное время\"" -#: 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:63 source/ubl-settings-datetime.cc:81 +#: 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:63 +#: source/ubl-settings-datetime.cc:81 msgid ": \"NTP\"" msgstr "" -#: 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:64 source/ubl-settings-datetime.cc:67 -#: source/ubl-settings-datetime.cc:74 +#: 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:64 +#: source/ubl-settings-datetime.cc:67 source/ubl-settings-datetime.cc:74 msgid ": \"Time Zone\"" msgstr ": \"Временная зона\"" @@ -67,10 +69,11 @@ msgstr "" msgid "Abidjan" msgstr "Абиджан" +#: source/ubl-settings-datetime.h:69 msgid "About" msgstr "О программе" -#: source/ubl-settings-datetime.cc:137 +#: source/ubl-settings-datetime.h:70 source/ubl-settings-datetime.cc:137 msgid "About ubl-settings-datetime" msgstr "О программе Настройка даты и времени" @@ -114,7 +117,7 @@ msgstr "Алжир" msgid "Almaty" msgstr "Алматы" -#: source/ubl-settings-datetime.cc:173 +#: source/ubl-settings-datetime.h:81 source/ubl-settings-datetime.cc:173 msgid "Always redirect" msgstr "Всегда перенаправлять" @@ -127,8 +130,8 @@ msgstr "Амман" msgid "Amsterdam" msgstr "Амстердам" -#: source/ubl-settings-datetime.cc:898 source/ubl-settings-datetime.cc:834 -#: source/ubl-settings-datetime.cc:817 +#: 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 "Введён недопустимый символ" @@ -168,6 +171,7 @@ msgstr "Арагуайна" msgid "Arctic" msgstr "Арктика" +#: source/ubl-settings-datetime.h:107 msgid "Argument not recognized\n" msgstr "Нepacпoзнaнный аргумент\n" @@ -210,8 +214,8 @@ msgstr "Атка" msgid "Atlantic" msgstr "Атлантика" -#: source/ubl-settings-datetime.cc:157 source/ubl-settings-datetime.cc:152 -#: source/ubl-settings-datetime.cc:147 +#: 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 "Внимание" @@ -374,7 +378,7 @@ msgstr "Канари" msgid "Canberra" msgstr "Канберра" -#: source/ubl-settings-datetime.cc:172 +#: source/ubl-settings-datetime.h:80 source/ubl-settings-datetime.cc:172 msgid "Cancel" msgstr "Отменить" @@ -486,8 +490,8 @@ msgstr "Континентальный" msgid "Copenhagen" msgstr "Копенгаген" -#: source/ubl-settings-datetime.cc:130 source/ubl-settings-datetime.cc:128 -#: source/ubl-settings-datetime.cc:123 +#: 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 - " @@ -509,16 +513,16 @@ msgstr "Куяба" msgid "Curacao" msgstr "Кюрасао" -#: source/ubl-settings-datetime.cc:147 source/ubl-settings-datetime.cc:143 -#: source/ubl-settings-datetime.cc:138 +#: 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:144 source/ubl-settings-datetime.cc:140 -#: source/ubl-settings-datetime.cc:135 +#: 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 "" @@ -540,19 +544,20 @@ msgstr "Дар-эс-Салам" msgid "Darwin" msgstr "Дарвин" -#: source/ubl-settings-datetime.cc:133 source/ubl-settings-datetime.cc:130 -#: source/ubl-settings-datetime.cc:125 +#: 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: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 +#: 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:140 source/ubl-settings-datetime.cc:136 -#: source/ubl-settings-datetime.cc: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" @@ -560,8 +565,8 @@ msgstr "" "Дата\n" "Формат: ДД.ММ.ГГГГ" -#: source/ubl-settings-datetime.cc:150 source/ubl-settings-datetime.cc:146 -#: source/ubl-settings-datetime.cc:141 +#: 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 "Дата:" @@ -577,8 +582,8 @@ msgstr "Доусон Крик" msgid "DeNoronha" msgstr "Фернанду-ди-Норонья" -#: source/ubl-settings-datetime.cc:143 source/ubl-settings-datetime.cc:139 -#: source/ubl-settings-datetime.cc:134 +#: 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 "По умолчанию" @@ -594,8 +599,8 @@ msgstr "Дакка" msgid "Dili" msgstr "Дили" -#: source/ubl-settings-datetime.cc:146 source/ubl-settings-datetime.cc:142 -#: source/ubl-settings-datetime.cc:137 +#: 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 "Отключено" @@ -662,8 +667,9 @@ msgstr "Эндербери" msgid "Ensenada" msgstr "Энсенада" -#: source/ubl-settings-datetime.cc:867 source/ubl-settings-datetime.cc:1139 -#: source/ubl-settings-datetime.cc:803 source/ubl-settings-datetime.cc:1075 +#: 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 серверов" @@ -672,8 +678,8 @@ msgstr "Введите перечень NTP серверов" msgid "Enter a list of ntp servers" msgstr "Введите перечень NTP серверов" -#: source/ubl-settings-datetime.cc:141 source/ubl-settings-datetime.cc:137 -#: source/ubl-settings-datetime.cc:132 +#: 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." @@ -681,7 +687,8 @@ msgstr "" "Введите имя ntp-сервера или его ip-адрес.\n" "При вводе нескольких адресов, разделяйте их запятыми." -#: source/ubl-settings-datetime.cc:903 source/ubl-settings-datetime.cc:839 +#: 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 сервера" @@ -690,8 +697,8 @@ msgstr "Ошибка в имени NTP сервера" msgid "Error in the ntp name" msgstr "Ошибка в имени NTP сервера" -#: source/ubl-settings-datetime.cc:745 source/ubl-settings-datetime.cc:681 -#: source/ubl-settings-datetime.cc:678 +#: 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 "Ошибка сохранения локальной и глобальной конфигурации" @@ -737,6 +744,7 @@ msgstr "ГМТ-1" msgid "GMT-3" msgstr "ГМТ-3" +#: source/ubl-settings-datetime.h:85 msgid "" "GTK settings datetime for UBLinux\n" "\n" @@ -793,23 +801,23 @@ msgstr "Гибралтар" msgid "Glace_Bay" msgstr "Глейс-Бей" -#: source/ubl-settings-datetime.cc:757 source/ubl-settings-datetime.cc:693 -#: source/ubl-settings-datetime.cc:690 +#: 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:733 source/ubl-settings-datetime.cc:669 -#: source/ubl-settings-datetime.cc:666 +#: 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:763 source/ubl-settings-datetime.cc:699 -#: source/ubl-settings-datetime.cc:696 +#: 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:741 source/ubl-settings-datetime.cc:677 -#: source/ubl-settings-datetime.cc:674 +#: 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 "Ошибка записи глобальной конфигурации" @@ -861,11 +869,13 @@ msgstr "Хараре" msgid "Harbin" msgstr "Харбин" -#: source/ubl-settings-datetime.cc:856 source/ubl-settings-datetime.cc:792 +#: 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:852 source/ubl-settings-datetime.cc:788 +#: source/ubl-settings-datetime.h:105 source/ubl-settings-datetime.cc:852 +#: source/ubl-settings-datetime.cc:788 msgid "Hardware clock synchronization error" msgstr "Ошибка синхронизации аппаратных часов" @@ -878,6 +888,7 @@ msgstr "Гавайи" msgid "Hebron" msgstr "Хеврон" +#: source/ubl-settings-datetime.h:71 msgid "Help" msgstr "Справка" @@ -902,9 +913,10 @@ msgstr "Гонолулу" msgid "Hovd" msgstr "Ховд" -#: 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 +#: 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" msgstr "Не верный формат даты" @@ -1079,39 +1091,41 @@ msgstr "Лиссабон" msgid "Ljubljana" msgstr "Любляна" -#: source/ubl-settings-datetime.cc:139 source/ubl-settings-datetime.cc:135 -#: source/ubl-settings-datetime.cc:130 +#: 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:77 msgid "Load global configuration" msgstr "Загрузить глобальную конфигурацию" +#: source/ubl-settings-datetime.h:78 msgid "Load local configuration" msgstr "Загрузить локальную конфигурацию" -#: source/ubl-settings-datetime.cc:754 source/ubl-settings-datetime.cc:690 -#: source/ubl-settings-datetime.cc:687 +#: 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:729 source/ubl-settings-datetime.cc:665 -#: source/ubl-settings-datetime.cc:662 +#: 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:760 source/ubl-settings-datetime.cc:696 -#: source/ubl-settings-datetime.cc:693 +#: 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:737 source/ubl-settings-datetime.cc:673 -#: source/ubl-settings-datetime.cc:670 +#: 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:161 source/ubl-settings-datetime.cc:156 -#: source/ubl-settings-datetime.cc:151 +#: 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 "Локальное время" @@ -1196,8 +1210,8 @@ msgstr "Манаус" msgid "Manila" msgstr "Манила" -#: source/ubl-settings-datetime.cc:145 source/ubl-settings-datetime.cc:141 -#: source/ubl-settings-datetime.cc:136 +#: 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 "Вручную" @@ -1323,7 +1337,8 @@ msgstr "Новый Южный Уэльс" msgid "NTP is correct" msgstr "Имя NTP сервера корректно" -#: source/ubl-settings-datetime.cc:891 source/ubl-settings-datetime.cc:827 +#: 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 сервера корректно" @@ -1375,11 +1390,11 @@ msgstr "Север" msgid "North_Dokota" msgstr "Северная Докота" -#: 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 +#: 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 "Нечего сохранять!" @@ -1488,8 +1503,8 @@ msgstr "Порту-Велью" msgid "Prague" msgstr "Прага" -#: source/ubl-settings-datetime.cc:136 source/ubl-settings-datetime.cc:133 -#: source/ubl-settings-datetime.cc:128 +#: 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 "Домашняя страница проекта" @@ -1526,7 +1541,7 @@ msgstr "Ранкин-Инлет" msgid "Rarotonga" msgstr "Раротонга" -#: source/ubl-settings-datetime.cc:171 +#: source/ubl-settings-datetime.h:79 source/ubl-settings-datetime.cc:171 msgid "Read online" msgstr "Прочитать онлайн" @@ -1536,8 +1551,8 @@ msgstr "Ресифи" msgid "Regina" msgstr "Реджайна" -#: source/ubl-settings-datetime.cc:152 source/ubl-settings-datetime.cc:148 -#: source/ubl-settings-datetime.cc:143 +#: 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 "Регион:" @@ -1628,17 +1643,20 @@ msgstr "Саратов" msgid "Saskatchewan" msgstr "Саскачеван" -#: source/ubl-settings-datetime.cc:138 source/ubl-settings-datetime.cc:134 -#: source/ubl-settings-datetime.cc:129 +#: 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 "Сохранить" +#: source/ubl-settings-datetime.h:76 msgid "Save global configuration" msgstr "Сохранить глобальную конфигурацию" +#: source/ubl-settings-datetime.h:75 msgid "Save local configuration" msgstr "Сохранить локальную конфигурацию" +#: source/ubl-settings-datetime.h:74 msgid "Save to global and local configuration" msgstr "Сохранить глобальную и локальную конфигурацию" @@ -1654,8 +1672,8 @@ msgstr "Сеул" msgid "Setting date and time in global configuration" msgstr "Настройка даты и времени в глобальной конфигурации" -#: source/ubl-settings-datetime.cc:148 source/ubl-settings-datetime.cc:144 -#: source/ubl-settings-datetime.cc:139 +#: 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 "Настройка даты и времени" @@ -1725,8 +1743,8 @@ msgstr "Стокгольм" msgid "Stop the synchronization service" msgstr "Остановить сервис синхронизации" -#: source/ubl-settings-datetime.cc:766 source/ubl-settings-datetime.cc:702 -#: source/ubl-settings-datetime.cc:699 +#: 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 "Успешно сохранена локальная и глобальная конфигурация" @@ -1736,13 +1754,13 @@ msgstr "Суифт-Каррент" msgid "Sydney" msgstr "Сидней" -#: source/ubl-settings-datetime.cc:154 source/ubl-settings-datetime.cc:150 -#: source/ubl-settings-datetime.cc:145 +#: 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:158 source/ubl-settings-datetime.cc:153 -#: source/ubl-settings-datetime.cc:148 +#: 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 "Синхронизировать аппаратное время" @@ -1751,8 +1769,8 @@ msgstr "Синхронизировать аппаратное время" msgid "Synchronize hardware time:" msgstr "Синхронизировать аппаратное время:" -#: source/ubl-settings-datetime.cc:142 source/ubl-settings-datetime.cc:138 -#: source/ubl-settings-datetime.cc:133 +#: 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" @@ -1792,8 +1810,8 @@ msgstr "Тель-Авив" msgid "Tell_City" msgstr "Телл-Сити" -#: source/ubl-settings-datetime.cc:122 source/ubl-settings-datetime.cc:120 -#: source/ubl-settings-datetime.cc:115 +#: 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 "Программа должна быть запущена с правами суперпользователя!" @@ -1822,13 +1840,13 @@ msgstr "Тихуана" msgid "Timbuktu" msgstr "Тимбукту" -#: source/ubl-settings-datetime.cc:151 source/ubl-settings-datetime.cc:147 -#: source/ubl-settings-datetime.cc:142 +#: 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:149 source/ubl-settings-datetime.cc:145 -#: source/ubl-settings-datetime.cc:140 +#: 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 "Время:" @@ -1871,8 +1889,8 @@ msgstr "Тунис" msgid "US" msgstr "США" -#: source/ubl-settings-datetime.cc:160 source/ubl-settings-datetime.cc:155 -#: source/ubl-settings-datetime.cc:150 +#: 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" @@ -1966,7 +1984,7 @@ msgstr "Виндхук" msgid "Winnipeg" msgstr "Виннипег" -#: source/ubl-settings-datetime.cc:168 +#: source/ubl-settings-datetime.h:83 source/ubl-settings-datetime.cc:168 msgid "Would you like to read documentation in the Web?" msgstr "Вы хотите прочитать справку в Сети?" @@ -1994,7 +2012,7 @@ msgstr "Йеллоунайф" msgid "Yerevan" msgstr "Ереван" -#: source/ubl-settings-datetime.cc:169 +#: 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." @@ -2011,8 +2029,8 @@ msgstr "Загреб" msgid "Zaporozhye" msgstr "Запорожье" -#: source/ubl-settings-datetime.cc:153 source/ubl-settings-datetime.cc:149 -#: source/ubl-settings-datetime.cc:144 +#: 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 "Зона:" @@ -2022,8 +2040,8 @@ msgstr "Зулу" msgid "Zurich" msgstr "Цюрих" -#: source/ubl-settings-datetime.cc:134 source/ubl-settings-datetime.cc:131 -#: source/ubl-settings-datetime.cc:126 +#: 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" @@ -2038,13 +2056,13 @@ msgstr "" msgid "ubl-settings-bootloader" msgstr "О программе Загрузка системы" -#: 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 +#: 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:1714 source/ubl-settings-datetime.cc:1651 -#: source/ubl-settings-datetime.cc:1606 +#: 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 версия: " -- 2.35.1 From cbbff6e6ffd022240a5f5d7b974e296a104d9362 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Tue, 25 Apr 2023 15:12:21 +0600 Subject: [PATCH 17/20] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20po=20=D1=84=D0=B0=D0=B9=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-datetime_ru.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index 64e0559..57a0951 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ubl-settings-datetime 1.0\n" -"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: info@ublinux.com\n" "POT-Creation-Date: 2023-04-25 15:09+0600\n" "PO-Revision-Date: 2023-01-01 00:00+0600\n" "Last-Translator: UBLinux Team \n" -- 2.35.1 From 279eb01dbebea62d1e02ec778920f4e25eefc372 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Tue, 25 Apr 2023 15:45:43 +0600 Subject: [PATCH 18/20] fix --- source/CMakeLists.txt | 12 +- source/ubl-settings-datetime.cc | 27 +-- source/ubl-settings-datetime.h | 1 + source/ubl-settings-datetime.h.in | 1 + ubl-settings-datetime.glade | 1 + ubl-settings-datetime.pot | 362 +++++++++++++++++------------- ubl-settings-datetime_ru.po | 346 ++++++++++++++++------------ 7 files changed, 420 insertions(+), 330 deletions(-) create mode 100644 source/ubl-settings-datetime.h.in diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 8d44392..24b1c08 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -9,14 +9,19 @@ link_directories(${GTK_LIBRARY_DIRS}) add_definitions(${GTK_CFLAGS_OTHER}) find_package(ICU REQUIRED COMPONENTS uc dt in io) -option(WEBKIT_FOUND "" ON) -if(WEBKIT_FOUND) +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 \ @@ -25,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 diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index be97591..46359d0 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -87,13 +87,9 @@ void MainWindow::settings() { this->lacalization(); btnBoxAboutDialog->set_visible(false); #ifdef WEBKIT_FOUND - void *handle=NULL; - handle = dlopen("libwebkit2gtk-4.0.so", RTLD_LAZY); - if (handle) { - one = WEBKIT_WEB_VIEW( webkit_web_view_new() ); - three = Glib::wrap(GTK_WIDGET(one)); - wndWeb->add(*three); - } + one = WEBKIT_WEB_VIEW( webkit_web_view_new() ); + three = Glib::wrap(GTK_WIDGET(one)); + wndWeb->add(*three); #endif if (geteuid() == 0) { numTimeHrs->set_range(0, 23); @@ -323,11 +319,7 @@ void MainWindow::get_builder() { builder->get_widget("overHead", overHead); builder->get_widget("imgHeadBackground", imgHeadBackground); #ifdef WEBKIT_FOUND - void *handle=NULL; - handle = dlopen("libwebkit2gtk-4.0.so", RTLD_LAZY); - if (handle) { - builder->get_widget("wndWeb", wndWeb); - } + builder->get_widget("wndWeb", wndWeb); #endif builder->get_widget("lblHeadeWndWeb", lblHeadeWndWeb); builder->get_widget("lblHeaderAboutTopic", lblHeaderAboutTopic); @@ -424,15 +416,8 @@ void MainWindow::synopsis_show() { void MainWindow::open_browser() { #ifdef WEBKIT_FOUND - void *handle=NULL; - handle = dlopen("libwebkit2gtk-4.0.so", RTLD_LAZY); - if (handle) { - webkit_web_view_load_uri(one, link_doc); - wndWeb->show_all(); - } - else { - this->template_open_browser(); - } + webkit_web_view_load_uri(one, link_doc); + wndWeb->show_all(); #else this->template_open_browser(); #endif diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 4dccb5c..772ab85 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -19,6 +19,7 @@ #include #include #include "ubl-util-standard.c" +#include "ubl-settings-datetime-cm.h" #ifdef WEBKIT_FOUND #include 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 584ca60..8802c32 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -1604,6 +1604,7 @@ Format: DD.MM.YYYY True True com.ublinux.ubl-settings-datetime + center diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot index 81c9fba..eece244 100644 --- a/ubl-settings-datetime.pot +++ b/ubl-settings-datetime.pot @@ -1,17 +1,17 @@ -# Language translations for ubl-settings-datetime package. -# Copyright (C) 2022, UBTech LLC -# This file is distributed under the same license as the ubl-settings-datetime package. -# UBLinux Team , 2022 +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: ubl-settings-datetime 1.0\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: info@ublinux.com\n" -"POT-Creation-Date: 2023-01-01 00:00+0600\n" -"PO-Revision-Date: 2023-01-01 00:00+0600\n" -"Last-Translator: UBLinux Team \n" -"Language-Team: UBLinux Team \n" +"POT-Creation-Date: 2023-04-25 15:44+0600\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,45 +20,47 @@ msgstr "" msgid ":" msgstr "" -#: 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.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 msgid ": \"Date\"" msgstr "" -#: 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:62 source/ubl-settings-datetime.cc:84 +#: 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:62 +#: source/ubl-settings-datetime.cc:84 msgid ": \"Hardware time\"" msgstr "" -#: 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:63 -#: source/ubl-settings-datetime.cc:81 +#: 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:63 source/ubl-settings-datetime.cc:81 msgid ": \"NTP\"" msgstr "" -#: 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:64 -#: source/ubl-settings-datetime.cc:67 source/ubl-settings-datetime.cc:74 +#: 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:64 source/ubl-settings-datetime.cc:67 +#: source/ubl-settings-datetime.cc:74 msgid ": \"Time Zone\"" msgstr "" @@ -69,11 +71,12 @@ msgstr "" msgid "Abidjan" msgstr "" -#: source/ubl-settings-datetime.h:69 +#: source/ubl-settings-datetime.h:70 source/ubl-settings-datetime.h:69 msgid "About" msgstr "" -#: source/ubl-settings-datetime.h:70 source/ubl-settings-datetime.cc:137 +#: source/ubl-settings-datetime.h:71 source/ubl-settings-datetime.h:70 +#: source/ubl-settings-datetime.cc:137 msgid "About ubl-settings-datetime" msgstr "" @@ -115,7 +118,8 @@ msgstr "" msgid "Almaty" msgstr "" -#: source/ubl-settings-datetime.h:81 source/ubl-settings-datetime.cc:173 +#: source/ubl-settings-datetime.h:82 source/ubl-settings-datetime.h:81 +#: source/ubl-settings-datetime.cc:173 msgid "Always redirect" msgstr "" @@ -128,8 +132,9 @@ msgstr "" msgid "Amsterdam" msgstr "" -#: source/ubl-settings-datetime.h:102 source/ubl-settings-datetime.cc:898 -#: 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 "" @@ -169,7 +174,7 @@ msgstr "" msgid "Arctic" msgstr "" -#: source/ubl-settings-datetime.h:107 +#: source/ubl-settings-datetime.h:108 source/ubl-settings-datetime.h:107 msgid "Argument not recognized\n" msgstr "" @@ -212,8 +217,9 @@ msgstr "" msgid "Atlantic" msgstr "" -#: source/ubl-settings-datetime.h:121 source/ubl-settings-datetime.cc:157 -#: 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 "" @@ -376,7 +382,8 @@ msgstr "" msgid "Canberra" msgstr "" -#: source/ubl-settings-datetime.h:80 source/ubl-settings-datetime.cc:172 +#: source/ubl-settings-datetime.h:81 source/ubl-settings-datetime.h:80 +#: source/ubl-settings-datetime.cc:172 msgid "Cancel" msgstr "" @@ -488,8 +495,9 @@ msgstr "" msgid "Copenhagen" msgstr "" -#: source/ubl-settings-datetime.h:65 source/ubl-settings-datetime.cc:130 -#: 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 "" @@ -511,16 +519,18 @@ msgstr "" msgid "Curacao" msgstr "" -#: source/ubl-settings-datetime.h:129 source/ubl-settings-datetime.cc:147 -#: 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.h:114 source/ubl-settings-datetime.cc:144 -#: 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 "" @@ -542,27 +552,30 @@ msgstr "" msgid "Darwin" msgstr "" -#: source/ubl-settings-datetime.h:118 source/ubl-settings-datetime.cc:133 -#: 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.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 +#: 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.h:130 source/ubl-settings-datetime.cc:140 -#: 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.h:126 source/ubl-settings-datetime.cc:150 -#: 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 "" @@ -578,8 +591,9 @@ msgstr "" msgid "DeNoronha" msgstr "" -#: source/ubl-settings-datetime.h:113 source/ubl-settings-datetime.cc:143 -#: 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 "" @@ -595,8 +609,9 @@ msgstr "" msgid "Dili" msgstr "" -#: source/ubl-settings-datetime.h:116 source/ubl-settings-datetime.cc:146 -#: 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 "" @@ -663,9 +678,9 @@ msgstr "" msgid "Ensenada" msgstr "" -#: 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 +#: 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 "" @@ -673,15 +688,16 @@ msgstr "" msgid "Enter a list of ntp servers" msgstr "" -#: source/ubl-settings-datetime.h:132 source/ubl-settings-datetime.cc:141 -#: 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.h:101 source/ubl-settings-datetime.cc:903 -#: 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 "" @@ -689,8 +705,9 @@ msgstr "" msgid "Error in the ntp name" msgstr "" -#: source/ubl-settings-datetime.h:91 source/ubl-settings-datetime.cc:745 -#: 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 "" @@ -736,7 +753,7 @@ msgstr "" msgid "GMT-3" msgstr "" -#: source/ubl-settings-datetime.h:85 +#: source/ubl-settings-datetime.h:86 source/ubl-settings-datetime.h:85 msgid "" "GTK settings datetime for UBLinux\n" "\n" @@ -776,23 +793,27 @@ msgstr "" msgid "Glace_Bay" msgstr "" -#: source/ubl-settings-datetime.h:93 source/ubl-settings-datetime.cc:757 -#: 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.h:88 source/ubl-settings-datetime.cc:733 -#: 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.h:95 source/ubl-settings-datetime.cc:763 -#: 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.h:90 source/ubl-settings-datetime.cc:741 -#: 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 "" @@ -844,13 +865,13 @@ msgstr "" msgid "Harbin" msgstr "" -#: source/ubl-settings-datetime.h:104 source/ubl-settings-datetime.cc:856 -#: 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.h:105 source/ubl-settings-datetime.cc:852 -#: 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 "" @@ -863,7 +884,7 @@ msgstr "" msgid "Hebron" msgstr "" -#: source/ubl-settings-datetime.h:71 +#: source/ubl-settings-datetime.h:72 source/ubl-settings-datetime.h:71 msgid "Help" msgstr "" @@ -888,10 +909,10 @@ msgstr "" msgid "Hovd" msgstr "" -#: 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 +#: 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" msgstr "" @@ -1066,41 +1087,47 @@ msgstr "" msgid "Ljubljana" msgstr "" -#: source/ubl-settings-datetime.h:73 source/ubl-settings-datetime.cc:139 -#: 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:77 +#: source/ubl-settings-datetime.h:78 source/ubl-settings-datetime.h:77 msgid "Load global configuration" msgstr "" -#: source/ubl-settings-datetime.h:78 +#: source/ubl-settings-datetime.h:79 source/ubl-settings-datetime.h:78 msgid "Load local configuration" msgstr "" -#: source/ubl-settings-datetime.h:92 source/ubl-settings-datetime.cc:754 -#: 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.h:87 source/ubl-settings-datetime.cc:729 -#: 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.h:94 source/ubl-settings-datetime.cc:760 -#: 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.h:89 source/ubl-settings-datetime.cc:737 -#: 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.h:120 source/ubl-settings-datetime.cc:161 -#: 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 "" @@ -1185,8 +1212,9 @@ msgstr "" msgid "Manila" msgstr "" -#: source/ubl-settings-datetime.h:115 source/ubl-settings-datetime.cc:145 -#: 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 "" @@ -1311,8 +1339,8 @@ msgstr "" msgid "NTP is correct" msgstr "" -#: source/ubl-settings-datetime.h:103 source/ubl-settings-datetime.cc:891 -#: 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 "" @@ -1364,11 +1392,12 @@ msgstr "" msgid "North_Dokota" msgstr "" -#: 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 +#: 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 "" @@ -1477,8 +1506,9 @@ msgstr "" msgid "Prague" msgstr "" -#: source/ubl-settings-datetime.h:68 source/ubl-settings-datetime.cc:136 -#: 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 "" @@ -1515,7 +1545,8 @@ msgstr "" msgid "Rarotonga" msgstr "" -#: source/ubl-settings-datetime.h:79 source/ubl-settings-datetime.cc:171 +#: source/ubl-settings-datetime.h:80 source/ubl-settings-datetime.h:79 +#: source/ubl-settings-datetime.cc:171 msgid "Read online" msgstr "" @@ -1525,8 +1556,9 @@ msgstr "" msgid "Regina" msgstr "" -#: source/ubl-settings-datetime.h:124 source/ubl-settings-datetime.cc:152 -#: 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 "" @@ -1617,20 +1649,21 @@ msgstr "" msgid "Saskatchewan" msgstr "" -#: source/ubl-settings-datetime.h:72 source/ubl-settings-datetime.cc:138 -#: 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 "" -#: source/ubl-settings-datetime.h:76 +#: source/ubl-settings-datetime.h:77 source/ubl-settings-datetime.h:76 msgid "Save global configuration" msgstr "" -#: source/ubl-settings-datetime.h:75 +#: source/ubl-settings-datetime.h:76 source/ubl-settings-datetime.h:75 msgid "Save local configuration" msgstr "" -#: source/ubl-settings-datetime.h:74 +#: source/ubl-settings-datetime.h:75 source/ubl-settings-datetime.h:74 msgid "Save to global and local configuration" msgstr "" @@ -1646,8 +1679,9 @@ msgstr "" msgid "Setting date and time in global configuration" msgstr "" -#: source/ubl-settings-datetime.h:128 source/ubl-settings-datetime.cc:148 -#: 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 "" @@ -1717,8 +1751,9 @@ msgstr "" msgid "Stop the synchronization service" msgstr "" -#: source/ubl-settings-datetime.h:96 source/ubl-settings-datetime.cc:766 -#: 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 "" @@ -1728,13 +1763,15 @@ msgstr "" msgid "Sydney" msgstr "" -#: source/ubl-settings-datetime.h:122 source/ubl-settings-datetime.cc:154 -#: 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.h:127 source/ubl-settings-datetime.cc:158 -#: 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 "" @@ -1743,8 +1780,9 @@ msgstr "" msgid "Synchronize hardware time:" msgstr "" -#: source/ubl-settings-datetime.h:131 source/ubl-settings-datetime.cc:142 -#: 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 "" @@ -1784,8 +1822,9 @@ msgstr "" msgid "Tell_City" msgstr "" -#: source/ubl-settings-datetime.h:108 source/ubl-settings-datetime.cc:122 -#: 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 "" @@ -1812,13 +1851,15 @@ msgstr "" msgid "Timbuktu" msgstr "" -#: source/ubl-settings-datetime.h:125 source/ubl-settings-datetime.cc:151 -#: 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.h:117 source/ubl-settings-datetime.cc:149 -#: 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 "" @@ -1861,8 +1902,9 @@ msgstr "" msgid "US" msgstr "" -#: source/ubl-settings-datetime.h:119 source/ubl-settings-datetime.cc:160 -#: 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 "" @@ -1956,7 +1998,8 @@ msgstr "" msgid "Winnipeg" msgstr "" -#: source/ubl-settings-datetime.h:83 source/ubl-settings-datetime.cc:168 +#: 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 "" @@ -1984,7 +2027,8 @@ msgstr "" msgid "Yerevan" msgstr "" -#: source/ubl-settings-datetime.h:84 source/ubl-settings-datetime.cc:169 +#: 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." @@ -1999,8 +2043,9 @@ msgstr "" msgid "Zaporozhye" msgstr "" -#: source/ubl-settings-datetime.h:123 source/ubl-settings-datetime.cc:153 -#: 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 "" @@ -2010,8 +2055,9 @@ msgstr "" msgid "Zurich" msgstr "" -#: source/ubl-settings-datetime.h:67 source/ubl-settings-datetime.cc:134 -#: 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 "" @@ -2024,13 +2070,15 @@ msgstr "" msgid "ubl-settings-bootloader" msgstr "" -#: 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 +#: 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.h:86 source/ubl-settings-datetime.cc:1714 -#: 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 57a0951..2a6896c 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-04-25 15:09+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,45 +20,47 @@ msgstr "" msgid ":" msgstr ":" -#: 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.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 msgid ": \"Date\"" msgstr ": \"Дата\"" -#: 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:62 source/ubl-settings-datetime.cc:84 +#: 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:62 +#: source/ubl-settings-datetime.cc:84 msgid ": \"Hardware time\"" msgstr ": \"Аппаратное время\"" -#: 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:63 -#: source/ubl-settings-datetime.cc:81 +#: 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:63 source/ubl-settings-datetime.cc:81 msgid ": \"NTP\"" msgstr "" -#: 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:64 -#: source/ubl-settings-datetime.cc:67 source/ubl-settings-datetime.cc:74 +#: 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:64 source/ubl-settings-datetime.cc:67 +#: source/ubl-settings-datetime.cc:74 msgid ": \"Time Zone\"" msgstr ": \"Временная зона\"" @@ -69,11 +71,12 @@ msgstr "" msgid "Abidjan" msgstr "Абиджан" -#: source/ubl-settings-datetime.h:69 +#: source/ubl-settings-datetime.h:70 source/ubl-settings-datetime.h:69 msgid "About" msgstr "О программе" -#: source/ubl-settings-datetime.h:70 source/ubl-settings-datetime.cc:137 +#: source/ubl-settings-datetime.h:71 source/ubl-settings-datetime.h:70 +#: source/ubl-settings-datetime.cc:137 msgid "About ubl-settings-datetime" msgstr "О программе Настройка даты и времени" @@ -117,7 +120,8 @@ msgstr "Алжир" msgid "Almaty" msgstr "Алматы" -#: source/ubl-settings-datetime.h:81 source/ubl-settings-datetime.cc:173 +#: source/ubl-settings-datetime.h:82 source/ubl-settings-datetime.h:81 +#: source/ubl-settings-datetime.cc:173 msgid "Always redirect" msgstr "Всегда перенаправлять" @@ -130,8 +134,9 @@ msgstr "Амман" msgid "Amsterdam" msgstr "Амстердам" -#: source/ubl-settings-datetime.h:102 source/ubl-settings-datetime.cc:898 -#: 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 "Введён недопустимый символ" @@ -171,7 +176,7 @@ msgstr "Арагуайна" msgid "Arctic" msgstr "Арктика" -#: source/ubl-settings-datetime.h:107 +#: source/ubl-settings-datetime.h:108 source/ubl-settings-datetime.h:107 msgid "Argument not recognized\n" msgstr "Нepacпoзнaнный аргумент\n" @@ -214,8 +219,9 @@ msgstr "Атка" msgid "Atlantic" msgstr "Атлантика" -#: source/ubl-settings-datetime.h:121 source/ubl-settings-datetime.cc:157 -#: 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 "Внимание" @@ -378,7 +384,8 @@ msgstr "Канари" msgid "Canberra" msgstr "Канберра" -#: source/ubl-settings-datetime.h:80 source/ubl-settings-datetime.cc:172 +#: source/ubl-settings-datetime.h:81 source/ubl-settings-datetime.h:80 +#: source/ubl-settings-datetime.cc:172 msgid "Cancel" msgstr "Отменить" @@ -490,8 +497,9 @@ msgstr "Континентальный" msgid "Copenhagen" msgstr "Копенгаген" -#: source/ubl-settings-datetime.h:65 source/ubl-settings-datetime.cc:130 -#: 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 - " @@ -513,16 +521,18 @@ msgstr "Куяба" msgid "Curacao" msgstr "Кюрасао" -#: source/ubl-settings-datetime.h:129 source/ubl-settings-datetime.cc:147 -#: 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.h:114 source/ubl-settings-datetime.cc:144 -#: 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 "" @@ -544,20 +554,22 @@ msgstr "Дар-эс-Салам" msgid "Darwin" msgstr "Дарвин" -#: source/ubl-settings-datetime.h:118 source/ubl-settings-datetime.cc:133 -#: 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.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 +#: 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.h:130 source/ubl-settings-datetime.cc:140 -#: 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" @@ -565,8 +577,9 @@ msgstr "" "Дата\n" "Формат: ДД.ММ.ГГГГ" -#: source/ubl-settings-datetime.h:126 source/ubl-settings-datetime.cc:150 -#: 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 "Дата:" @@ -582,8 +595,9 @@ msgstr "Доусон Крик" msgid "DeNoronha" msgstr "Фернанду-ди-Норонья" -#: source/ubl-settings-datetime.h:113 source/ubl-settings-datetime.cc:143 -#: 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 "По умолчанию" @@ -599,8 +613,9 @@ msgstr "Дакка" msgid "Dili" msgstr "Дили" -#: source/ubl-settings-datetime.h:116 source/ubl-settings-datetime.cc:146 -#: 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 "Отключено" @@ -667,9 +682,9 @@ msgstr "Эндербери" msgid "Ensenada" msgstr "Энсенада" -#: 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 +#: 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 серверов" @@ -678,8 +693,9 @@ msgstr "Введите перечень NTP серверов" msgid "Enter a list of ntp servers" msgstr "Введите перечень NTP серверов" -#: source/ubl-settings-datetime.h:132 source/ubl-settings-datetime.cc:141 -#: 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." @@ -687,8 +703,8 @@ msgstr "" "Введите имя ntp-сервера или его ip-адрес.\n" "При вводе нескольких адресов, разделяйте их запятыми." -#: source/ubl-settings-datetime.h:101 source/ubl-settings-datetime.cc:903 -#: 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 сервера" @@ -697,8 +713,9 @@ msgstr "Ошибка в имени NTP сервера" msgid "Error in the ntp name" msgstr "Ошибка в имени NTP сервера" -#: source/ubl-settings-datetime.h:91 source/ubl-settings-datetime.cc:745 -#: 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 "Ошибка сохранения локальной и глобальной конфигурации" @@ -744,7 +761,7 @@ msgstr "ГМТ-1" msgid "GMT-3" msgstr "ГМТ-3" -#: source/ubl-settings-datetime.h:85 +#: source/ubl-settings-datetime.h:86 source/ubl-settings-datetime.h:85 msgid "" "GTK settings datetime for UBLinux\n" "\n" @@ -801,23 +818,27 @@ msgstr "Гибралтар" msgid "Glace_Bay" msgstr "Глейс-Бей" -#: source/ubl-settings-datetime.h:93 source/ubl-settings-datetime.cc:757 -#: 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.h:88 source/ubl-settings-datetime.cc:733 -#: 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.h:95 source/ubl-settings-datetime.cc:763 -#: 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.h:90 source/ubl-settings-datetime.cc:741 -#: 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 "Ошибка записи глобальной конфигурации" @@ -869,13 +890,13 @@ msgstr "Хараре" msgid "Harbin" msgstr "Харбин" -#: source/ubl-settings-datetime.h:104 source/ubl-settings-datetime.cc:856 -#: 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.h:105 source/ubl-settings-datetime.cc:852 -#: 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 "Ошибка синхронизации аппаратных часов" @@ -888,7 +909,7 @@ msgstr "Гавайи" msgid "Hebron" msgstr "Хеврон" -#: source/ubl-settings-datetime.h:71 +#: source/ubl-settings-datetime.h:72 source/ubl-settings-datetime.h:71 msgid "Help" msgstr "Справка" @@ -913,10 +934,10 @@ msgstr "Гонолулу" msgid "Hovd" msgstr "Ховд" -#: 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 +#: 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" msgstr "Не верный формат даты" @@ -1091,41 +1112,47 @@ msgstr "Лиссабон" msgid "Ljubljana" msgstr "Любляна" -#: source/ubl-settings-datetime.h:73 source/ubl-settings-datetime.cc:139 -#: 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:77 +#: source/ubl-settings-datetime.h:78 source/ubl-settings-datetime.h:77 msgid "Load global configuration" msgstr "Загрузить глобальную конфигурацию" -#: source/ubl-settings-datetime.h:78 +#: source/ubl-settings-datetime.h:79 source/ubl-settings-datetime.h:78 msgid "Load local configuration" msgstr "Загрузить локальную конфигурацию" -#: source/ubl-settings-datetime.h:92 source/ubl-settings-datetime.cc:754 -#: 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.h:87 source/ubl-settings-datetime.cc:729 -#: 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.h:94 source/ubl-settings-datetime.cc:760 -#: 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.h:89 source/ubl-settings-datetime.cc:737 -#: 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.h:120 source/ubl-settings-datetime.cc:161 -#: 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 "Локальное время" @@ -1210,8 +1237,9 @@ msgstr "Манаус" msgid "Manila" msgstr "Манила" -#: source/ubl-settings-datetime.h:115 source/ubl-settings-datetime.cc:145 -#: 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 "Вручную" @@ -1337,8 +1365,8 @@ msgstr "Новый Южный Уэльс" msgid "NTP is correct" msgstr "Имя NTP сервера корректно" -#: source/ubl-settings-datetime.h:103 source/ubl-settings-datetime.cc:891 -#: 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 сервера корректно" @@ -1390,11 +1418,12 @@ msgstr "Север" msgid "North_Dokota" msgstr "Северная Докота" -#: 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 +#: 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 "Нечего сохранять!" @@ -1503,8 +1532,9 @@ msgstr "Порту-Велью" msgid "Prague" msgstr "Прага" -#: source/ubl-settings-datetime.h:68 source/ubl-settings-datetime.cc:136 -#: 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 "Домашняя страница проекта" @@ -1541,7 +1571,8 @@ msgstr "Ранкин-Инлет" msgid "Rarotonga" msgstr "Раротонга" -#: source/ubl-settings-datetime.h:79 source/ubl-settings-datetime.cc:171 +#: source/ubl-settings-datetime.h:80 source/ubl-settings-datetime.h:79 +#: source/ubl-settings-datetime.cc:171 msgid "Read online" msgstr "Прочитать онлайн" @@ -1551,8 +1582,9 @@ msgstr "Ресифи" msgid "Regina" msgstr "Реджайна" -#: source/ubl-settings-datetime.h:124 source/ubl-settings-datetime.cc:152 -#: 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 "Регион:" @@ -1643,20 +1675,21 @@ msgstr "Саратов" msgid "Saskatchewan" msgstr "Саскачеван" -#: source/ubl-settings-datetime.h:72 source/ubl-settings-datetime.cc:138 -#: 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 "Сохранить" -#: source/ubl-settings-datetime.h:76 +#: source/ubl-settings-datetime.h:77 source/ubl-settings-datetime.h:76 msgid "Save global configuration" msgstr "Сохранить глобальную конфигурацию" -#: source/ubl-settings-datetime.h:75 +#: source/ubl-settings-datetime.h:76 source/ubl-settings-datetime.h:75 msgid "Save local configuration" msgstr "Сохранить локальную конфигурацию" -#: source/ubl-settings-datetime.h:74 +#: source/ubl-settings-datetime.h:75 source/ubl-settings-datetime.h:74 msgid "Save to global and local configuration" msgstr "Сохранить глобальную и локальную конфигурацию" @@ -1672,8 +1705,9 @@ msgstr "Сеул" msgid "Setting date and time in global configuration" msgstr "Настройка даты и времени в глобальной конфигурации" -#: source/ubl-settings-datetime.h:128 source/ubl-settings-datetime.cc:148 -#: 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 "Настройка даты и времени" @@ -1743,8 +1777,9 @@ msgstr "Стокгольм" msgid "Stop the synchronization service" msgstr "Остановить сервис синхронизации" -#: source/ubl-settings-datetime.h:96 source/ubl-settings-datetime.cc:766 -#: 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 "Успешно сохранена локальная и глобальная конфигурация" @@ -1754,13 +1789,15 @@ msgstr "Суифт-Каррент" msgid "Sydney" msgstr "Сидней" -#: source/ubl-settings-datetime.h:122 source/ubl-settings-datetime.cc:154 -#: 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.h:127 source/ubl-settings-datetime.cc:158 -#: 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 "Синхронизировать аппаратное время" @@ -1769,8 +1806,9 @@ msgstr "Синхронизировать аппаратное время" msgid "Synchronize hardware time:" msgstr "Синхронизировать аппаратное время:" -#: source/ubl-settings-datetime.h:131 source/ubl-settings-datetime.cc:142 -#: 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" @@ -1810,8 +1848,9 @@ msgstr "Тель-Авив" msgid "Tell_City" msgstr "Телл-Сити" -#: source/ubl-settings-datetime.h:108 source/ubl-settings-datetime.cc:122 -#: 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 "Программа должна быть запущена с правами суперпользователя!" @@ -1840,13 +1879,15 @@ msgstr "Тихуана" msgid "Timbuktu" msgstr "Тимбукту" -#: source/ubl-settings-datetime.h:125 source/ubl-settings-datetime.cc:151 -#: 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.h:117 source/ubl-settings-datetime.cc:149 -#: 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 "Время:" @@ -1889,8 +1930,9 @@ msgstr "Тунис" msgid "US" msgstr "США" -#: source/ubl-settings-datetime.h:119 source/ubl-settings-datetime.cc:160 -#: 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" @@ -1984,7 +2026,8 @@ msgstr "Виндхук" msgid "Winnipeg" msgstr "Виннипег" -#: source/ubl-settings-datetime.h:83 source/ubl-settings-datetime.cc:168 +#: 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 "Вы хотите прочитать справку в Сети?" @@ -2012,7 +2055,8 @@ msgstr "Йеллоунайф" msgid "Yerevan" msgstr "Ереван" -#: source/ubl-settings-datetime.h:84 source/ubl-settings-datetime.cc:169 +#: 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." @@ -2029,8 +2073,9 @@ msgstr "Загреб" msgid "Zaporozhye" msgstr "Запорожье" -#: source/ubl-settings-datetime.h:123 source/ubl-settings-datetime.cc:153 -#: 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 "Зона:" @@ -2040,8 +2085,9 @@ msgstr "Зулу" msgid "Zurich" msgstr "Цюрих" -#: source/ubl-settings-datetime.h:67 source/ubl-settings-datetime.cc:134 -#: 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" @@ -2056,13 +2102,15 @@ msgstr "" msgid "ubl-settings-bootloader" msgstr "О программе Загрузка системы" -#: 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 +#: 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.h:86 source/ubl-settings-datetime.cc:1714 -#: 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 версия: " -- 2.35.1 From 1d1c36379851f27f18c2514bf1cba1944d5f10de Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Tue, 25 Apr 2023 15:46:27 +0600 Subject: [PATCH 19/20] fix --- ubl-settings-datetime.pot | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot index eece244..6e78e87 100644 --- a/ubl-settings-datetime.pot +++ b/ubl-settings-datetime.pot @@ -1,17 +1,17 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Language translations for ubl-settings-datetime package. +# Copyright (C) 2022, UBTech LLC +# This file is distributed under the same license as the ubl-settings-datetime package. +# UBLinux Team , 2022 # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: ubl-settings-datetime 1.0\n" "Report-Msgid-Bugs-To: info@ublinux.com\n" -"POT-Creation-Date: 2023-04-25 15:44+0600\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"POT-Creation-Date: 2023-01-01 00:00+0600\n" +"PO-Revision-Date: 2023-01-01 00:00+0600\n" +"Last-Translator: UBLinux Team \n" +"Language-Team: UBLinux Team \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -- 2.35.1 From e9757a37ce35faf2787c55d7afeed51f2990c18d Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 26 Apr 2023 09:45:37 +0600 Subject: [PATCH 20/20] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BB=D0=BE=D0=BA=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BE?= =?UTF-8?q?=D0=BA=20"=D0=A1=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B8=D1=82?= =?UTF-8?q?=D1=8C"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.h | 6 +++--- ubl-settings-datetime.glade | 6 +++--- ubl-settings-datetime.pot | 6 +++--- ubl-settings-datetime_ru.po | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 772ab85..b5949fc 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -72,9 +72,9 @@ #define str_help _("Help") #define str_save _("Save") #define str_load _("Load") -#define save_all _("Save to global and local configuration") -#define save_local _("Save local configuration") -#define save_global _("Save global configuration") +#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") diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index 8802c32..3c526f4 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -301,7 +301,7 @@ True False - Save to global and local configuration + Save in global and local configuration @@ -311,7 +311,7 @@ True False - Save global configuration + Save in global configuration @@ -321,7 +321,7 @@ True False - Save local configuration + Save in local configuration diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot index 6e78e87..ba7aa22 100644 --- a/ubl-settings-datetime.pot +++ b/ubl-settings-datetime.pot @@ -1656,15 +1656,15 @@ msgid "Save" msgstr "" #: source/ubl-settings-datetime.h:77 source/ubl-settings-datetime.h:76 -msgid "Save global configuration" +msgid "Save in global configuration" msgstr "" #: source/ubl-settings-datetime.h:76 source/ubl-settings-datetime.h:75 -msgid "Save local configuration" +msgid "Save in local configuration" msgstr "" #: source/ubl-settings-datetime.h:75 source/ubl-settings-datetime.h:74 -msgid "Save to global and local configuration" +msgid "Save in global and local configuration" msgstr "" msgid "Scoresbysund" diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index 2a6896c..8e3d375 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -1682,16 +1682,16 @@ msgid "Save" msgstr "Сохранить" #: source/ubl-settings-datetime.h:77 source/ubl-settings-datetime.h:76 -msgid "Save global configuration" -msgstr "Сохранить глобальную конфигурацию" +msgid "Save in global configuration" +msgstr "Сохранить в глобальную конфигурацию" #: source/ubl-settings-datetime.h:76 source/ubl-settings-datetime.h:75 -msgid "Save local configuration" -msgstr "Сохранить локальную конфигурацию" +msgid "Save in local configuration" +msgstr "Сохранить в локальную конфигурацию" #: source/ubl-settings-datetime.h:75 source/ubl-settings-datetime.h:74 -msgid "Save to global and local configuration" -msgstr "Сохранить глобальную и локальную конфигурацию" +msgid "Save in global and local configuration" +msgstr "Сохранить в глобальную и локальную конфигурацию" msgid "Scoresbysund" msgstr "Скорсбисунд" -- 2.35.1