diff --git a/.gitignore b/.gitignore index c87e2df..8d239bc 100644 --- a/.gitignore +++ b/.gitignore @@ -7,5 +7,6 @@ compile/ source/**/ubl_settings_datetime source/**/main.o source/**/ubl_settings_datetime.o +ubl-settings-datetime_ru.po~ reg/ .vscode/ \ No newline at end of file diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 743978b..398b0b1 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -104,6 +104,7 @@ void MainWindow::settings() { this->flag_block_gui(); this->event(); 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); @@ -396,6 +397,7 @@ void MainWindow::synopsis_show() { } 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); @@ -407,12 +409,13 @@ void MainWindow::load_local_cfg() { string hw = "ubconfig --default --source system get clock HWCLOCK_SYNC"; this->get_hardware_clock(hw); info_warning_error(0); - map_config_data_global_local_old = map_config_data_global_local; map_config_data_global_old = map_config_data_global; map_config_data_local_old = map_config_data_local; + flag_local_global_load = 2; } 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"; @@ -422,14 +425,15 @@ void MainWindow::load_globl_cfg() { string hw = "ubconfig --source global get clock HWCLOCK_SYNC"; this->get_hardware_clock(hw); info_warning_error(1); - map_config_data_global_local_old = map_config_data_global_local; map_config_data_global_old = map_config_data_global; map_config_data_local_old = map_config_data_local; + flag_local_global_load = 2; } 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!")); } else { @@ -452,15 +456,13 @@ void MainWindow::save_local_cfg() { info_warning_error(2); map_config_data_local_old = map_config_data_local; flag_local = true; - if (flag_global and flag_local){ - map_config_data_global_local_old = map_config_data_global_local; - } } } 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!")); } else { @@ -483,14 +485,15 @@ void MainWindow::save_global_cfg() { info_warning_error(3); map_config_data_global_old = map_config_data_global; flag_global = true; - if (flag_global and flag_local){ - map_config_data_global_local_old = map_config_data_global_local; - } } } + void MainWindow::save_global_local_cfg() { - if ((this->check_config("region", 2) && this->check_config("zone", 2) && - this->check_config("dhcp", 2) && this->check_config("hw", 2))) { + if ((this->check_config("region", 0) && this->check_config("zone", 0) && + this->check_config("dhcp", 0) && this->check_config("hw", 0)) && + (this->check_config("region", 1) && this->check_config("zone", 1) && + this->check_config("dhcp", 1) && this->check_config("hw", 1))) { + info_status_app("boxInfoMessOK"); lblWarning->set_text(gettext("Nothing to save!")); } else { @@ -503,17 +506,22 @@ void MainWindow::save_global_local_cfg() { string hw = ""; string remove_ntp = ""; string cmd_zone = ""; - if ((this->check_config("region", 2) == false || this->check_config("zone", 2) == false)) { + if (flag_local == false) {} + 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="; 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="; this->enter_zone(cmd_zone); } } - if (this->check_config("dhcp", 2) == false) { + + 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"; @@ -521,6 +529,8 @@ void MainWindow::save_global_local_cfg() { remove_ntp = "ubconfig --target system remove network 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"; @@ -529,19 +539,20 @@ void MainWindow::save_global_local_cfg() { this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); } } - if (this->check_config("hw", 2) == false) { + 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"; 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"; this->set_hardware_clock(local, hw); } } - map_config_data_global_local_old = map_config_data_global_local; map_config_data_global_old = map_config_data_global; map_config_data_local_old = map_config_data_local; info_warning_error(4); @@ -551,25 +562,37 @@ void MainWindow::save_global_local_cfg() { } void MainWindow::write_config(string data, string key) { - std::map :: iterator it, it2, it3; - it3 = map_config_data_global_local.find(key); it2 = map_config_data_global.find(key); it = map_config_data_local.find(key); - if (it != map_config_data_local.end() || it2 != map_config_data_global.end() || it3 != map_config_data_global_local.end()) { - if (map_config_data_local[key] != data) { - map_config_data_global[key] = data; - map_config_data_local[key] = data; - map_config_data_global_local[key] = data; + if (it != map_config_data_local.end() || it2 != map_config_data_global.end()) { + if (flag_local_global_load == 2) { + map_config_data_global[key] = data; + map_config_data_local[key] = data; + } + else if (flag_local_global_load == 1) { + map_config_data_global[key] = data; + } + else if (flag_local_global_load == 0) { + map_config_data_local[key] = data; + } + flag_local = false; flag_global = false; flag_global_local = false; - } + } - else if (it == map_config_data_local.end() || it2 == map_config_data_global.end() || it3 == map_config_data_global_local.end()) { - map_config_data_global[key] = data; - map_config_data_local[key] = data; - map_config_data_global_local[key] = data; + else if (it == map_config_data_local.end() || it2 == map_config_data_global.end()) { + if (flag_local_global_load == 2) { + map_config_data_global[key] = data; + map_config_data_local[key] = data; + } + else if (flag_local_global_load == 1) { + map_config_data_global[key] = data; + } + else if (flag_local_global_load == 0) { + map_config_data_local[key] = data; + } flag_local = false; flag_global = false; flag_global_local = false; @@ -581,8 +604,21 @@ bool MainWindow::check_config(string key, int key_save) { std::map :: iterator iter_map_config_data_old; std::map map_config_data; std::map map_config_data_old; + if (map_config_data_global.find(key) != map_config_data_global.end() && + map_config_data_local.find(key) != map_config_data_local.end() && + map_config_data_global_old.find(key) != map_config_data_global_old.end() && + map_config_data_local_old.find(key) != map_config_data_local_old.end()) { + if (map_config_data_global[key] != map_config_data_local_old[key] || + map_config_data_global_old[key] != map_config_data_local[key]) { + return false; + } + if (map_config_data_global[key] != map_config_data_local[key]) { + return false; + } + } + + if ((key_save == 0 || key_save == 1) && flag_global_local == true) { - map_config_data_global_local_old = map_config_data_global_local; map_config_data_global_old = map_config_data_global; map_config_data_local_old = map_config_data_local; return true; @@ -609,14 +645,9 @@ bool MainWindow::check_config(string key, int key_save) { map_config_data = map_config_data_global; map_config_data_old = map_config_data_global_old; } - else if (key_save == 2) { - iter_map_config_data = map_config_data_global_local.find(key); - map_config_data = map_config_data_global_local; - map_config_data_old = map_config_data_global_local_old; - } iter_map_config_data = map_config_data.find(key); iter_map_config_data_old = map_config_data_old.find(key); - if (iter_map_config_data == map_config_data.end()) {; + if (iter_map_config_data == map_config_data.end()) { return false; } else if (iter_map_config_data_old == map_config_data_old.end()) { @@ -778,8 +809,17 @@ void MainWindow::get_hardware_clock(string &cmd) { } void MainWindow::hardware_clock() { + int error_hw = error_info; string cmd = "hwclock --systohc"; wrapper_system(cmd); + if (error_hw != error_info){ + lblWarning->set_text(gettext("Hardware clock synchronization error")); + info_status_app("boxInfoMessError"); + } + else { + lblWarning->set_text(gettext("Hardware clock successfully synchronized")); + info_status_app("boxInfoMessOK"); + } } void MainWindow::gui_mess_close() { @@ -788,8 +828,10 @@ void MainWindow::gui_mess_close() { bool MainWindow::focus_ntp_text() { if (txtNtpServer->get_text() == "" || txtNtpServer->get_text() == " ") { - lblMessage->set_text(gettext("Enter DHCP!")); - windowMessDchp->show(); + lblWarning->set_text(gettext("Enter a list of NTP servers")); + info_status_app("boxInfoMessError"); + btnSave->set_sensitive(false); + return false; } else { string cmd = ""; @@ -810,20 +852,26 @@ bool MainWindow::focus_ntp_text() { } if ((flag_error == false) && (flag_error_check_ntp == false)) { this->write_config(str_ntp, "dhcp"); + lblWarning->set_text(gettext("NTP server name is correct")); + info_status_app("boxInfoMessOK"); + btnSave->set_sensitive(true); return true; } else { if (flag_error == true) { - lblMessage->set_text(gettext("An invalid character is entered")); - windowMessDchp->show(); + lblWarning->set_text(gettext("An invalid character is entered")); + info_status_app("boxInfoMessError"); + btnSave->set_sensitive(false); } else if (flag_error_check_ntp == true) { - lblMessage->set_text(gettext("Error in the ntp name")); - windowMessDchp->show(); + lblWarning->set_text(gettext("Error in the NTP server name")); + info_status_app("boxInfoMessError"); + btnSave->set_sensitive(false); } return false; } } + btnSave->set_sensitive(true); return true; } @@ -935,6 +983,7 @@ struct MainWindow::Result MainWindow::wrapper_call(string cmd) { void MainWindow::event_entry_cbDhcp() { + btnSave->set_sensitive(true); string str_dhcp = cbDhcp->get_active_text(); string cmd = ""; int activ_index = cbDhcp->get_active_row_number(); @@ -1051,8 +1100,9 @@ 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"); - lblMessage->set_text(gettext("Enter DHCP!")); - windowMessDchp->show(); + lblWarning->set_text(gettext("Enter a list of NTP servers")); + info_status_app("boxInfoMessError"); + btnSave->set_sensitive(false); } else if (str_dhcp == "(null)") { cbDhcp->set_active(0); @@ -1340,12 +1390,13 @@ void MainWindow::append_zone() { } void MainWindow::update_time_date() { + bool flag_error_time = false; string cmd = ""; string response = ""; - if ((year != 0) && (month != 0) && (day != 0)) { + if (((year != 0) && (month != 0) && (day != 0))) { string str_month = ""; string str_day = ""; - month+= 2; + month += 2; if (month < 10) { str_month = "0"+to_string(month); } @@ -1369,25 +1420,39 @@ void MainWindow::update_time_date() { year = 0; month = 0; day = 0; + lblWarning->set_text(gettext("Date and time are successfully synchronized")); + info_status_app("boxInfoMessOK"); + flag_error_time = false; } else { - this->post_entry_data(); + flag_error_time = this->post_entry_data(); + year = 0; + month = 0; + day = 0; } } else { - this->post_entry_data(); + flag_error_time = this->post_entry_data(); + year = 0; + month = 0; + day = 0; } - hour = numTimeHrs->get_value_as_int(); - minute = numTimeMin->get_value_as_int(); - time_t now = time(0); - tm *ltm = localtime(&now); - cmd = "date +%T -s \"" + - to_string(hour) + ":" + to_string(minute) - + ":" + to_string(ltm->tm_sec) +"\""; - wrapper_system(cmd); + if (flag_error_time == false) { + lblWarning->set_text(gettext("Date and time are successfully synchronized")); + info_status_app("boxInfoMessOK"); + hour = numTimeHrs->get_value_as_int(); + minute = numTimeMin->get_value_as_int(); + time_t now = time(0); + tm *ltm = localtime(&now); + cmd = "date +%T -s \"" + + to_string(hour) + ":" + to_string(minute) + + ":" + to_string(ltm->tm_sec) +"\""; + wrapper_system(cmd); + } + } -void MainWindow::post_entry_data() { +bool MainWindow::post_entry_data() { string cmd = ""; string data = txtDate->get_text(); if (data.length() == 10) { @@ -1399,13 +1464,20 @@ void MainWindow::post_entry_data() { string str_error_clock = this->call(cmd); size_t index = str_error_clock.find("date:"); if (index != std::string::npos) { - lblMessage->set_text(gettext("Incorrect date format")); - windowMessDchp->show(); + lblWarning->set_text(gettext("Incorrect date format")); + info_status_app("boxInfoMessError"); + return true; + } + else { + lblWarning->set_text(gettext("Date and time are successfully synchronized")); + info_status_app("boxInfoMessOK"); + return false; } } else { - lblMessage->set_text(gettext("Incorrect date format")); - windowMessDchp->show(); + lblWarning->set_text(gettext("Incorrect date format")); + info_status_app("boxInfoMessError"); + return true; } } diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 2fb08f7..bcb6dbe 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -125,6 +125,7 @@ class MainWindow : public Gtk::ApplicationWindow { int error_info = 0; int warning_info = 0; string cmd_error = ""; + int flag_local_global_load = 2; int hour; int minute; string str_region = ""; @@ -173,7 +174,7 @@ class MainWindow : public Gtk::ApplicationWindow { void save_global_cfg(); void save_Dhcp(string &cmd_default, string &cmd_dhcp, string &remove, string &cmd_set_ntp); void load_local_cfg(); - void post_entry_data(); + bool post_entry_data(); void lacalization(); void settings(); void flag_block_gui(); diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot index 6fd54d6..80bae74 100644 --- a/ubl-settings-datetime.pot +++ b/ubl-settings-datetime.pot @@ -20,33 +20,42 @@ msgstr "" msgid ":" msgstr "" -#: source/ubl-settings-datetime.cc:82 source/ubl-settings-datetime.cc:83 +#: 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:62 -#: source/ubl-settings-datetime.cc:65 source/ubl-settings-datetime.cc:66 -#: source/ubl-settings-datetime.cc:72 source/ubl-settings-datetime.cc:73 -#: source/ubl-settings-datetime.cc:79 source/ubl-settings-datetime.cc:80 +#: 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:84 msgid ": \"Hardware time\"" msgstr "" -#: source/ubl-settings-datetime.cc:60 source/ubl-settings-datetime.cc:61 -#: source/ubl-settings-datetime.cc:63 source/ubl-settings-datetime.cc:68 -#: source/ubl-settings-datetime.cc:69 source/ubl-settings-datetime.cc:70 -#: source/ubl-settings-datetime.cc:71 source/ubl-settings-datetime.cc:75 -#: source/ubl-settings-datetime.cc:76 source/ubl-settings-datetime.cc:77 -#: source/ubl-settings-datetime.cc:78 source/ubl-settings-datetime.cc:81 +#: 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: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 msgid ": \"NTP\"" msgstr "" +#: 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 msgid ": \"Time Zone\"" msgstr "" -#: source/ubl-settings-datetime.cc:57 +#: source/ubl-settings-datetime.cc:58 source/ubl-settings-datetime.cc:57 msgid ": \"xdg-open\"" msgstr "" @@ -103,7 +112,7 @@ msgstr "" msgid "Amsterdam" msgstr "" -#: source/ubl-settings-datetime.cc:817 +#: source/ubl-settings-datetime.cc:834 source/ubl-settings-datetime.cc:817 msgid "An invalid character is entered" msgstr "" @@ -185,6 +194,10 @@ msgstr "" msgid "Atlantic" msgstr "" +#: source/ubl-settings-datetime.cc:152 source/ubl-settings-datetime.cc:147 +msgid "Attention" +msgstr "" + msgid "Atyrau" msgstr "" @@ -452,7 +465,7 @@ msgstr "" msgid "Copenhagen" msgstr "" -#: source/ubl-settings-datetime.cc:123 +#: source/ubl-settings-datetime.cc:128 source/ubl-settings-datetime.cc:123 msgid "Copyright © UBSoft LLC, 2022 - " msgstr "" @@ -474,14 +487,14 @@ msgstr "" msgid "Curacao" msgstr "" -#: source/ubl-settings-datetime.cc:138 +#: 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:135 +#: source/ubl-settings-datetime.cc:140 source/ubl-settings-datetime.cc:135 msgid "DHCP" msgstr "" @@ -503,17 +516,22 @@ msgstr "" msgid "Darwin" msgstr "" -#: source/ubl-settings-datetime.cc:125 +#: source/ubl-settings-datetime.cc:130 source/ubl-settings-datetime.cc:125 msgid "Date and Time" msgstr "" -#: source/ubl-settings-datetime.cc:131 +#: 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 msgid "" "Date of\n" "Format: DD.MM.YYYY" msgstr "" -#: source/ubl-settings-datetime.cc:141 +#: source/ubl-settings-datetime.cc:146 source/ubl-settings-datetime.cc:141 msgid "Date:" msgstr "" @@ -529,7 +547,7 @@ msgstr "" msgid "DeNoronha" msgstr "" -#: source/ubl-settings-datetime.cc:134 +#: source/ubl-settings-datetime.cc:139 source/ubl-settings-datetime.cc:134 msgid "Default" msgstr "" @@ -545,7 +563,7 @@ msgstr "" msgid "Dili" msgstr "" -#: source/ubl-settings-datetime.cc:137 +#: source/ubl-settings-datetime.cc:142 source/ubl-settings-datetime.cc:137 msgid "Disabled" msgstr "" @@ -612,21 +630,29 @@ msgstr "" msgid "Ensenada" msgstr "" +#: source/ubl-settings-datetime.cc:803 source/ubl-settings-datetime.cc:1075 +msgid "Enter a list of NTP servers" +msgstr "" + #: source/ubl-settings-datetime.cc:791 source/ubl-settings-datetime.cc:1054 -msgid "Enter DHCP!" +msgid "Enter a list of ntp servers" msgstr "" -#: source/ubl-settings-datetime.cc:132 +#: 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 +msgid "Error in the NTP server name" +msgstr "" + #: source/ubl-settings-datetime.cc:821 msgid "Error in the ntp name" msgstr "" -#: source/ubl-settings-datetime.cc:678 +#: source/ubl-settings-datetime.cc:681 source/ubl-settings-datetime.cc:678 msgid "Error saved local and global configuration" msgstr "" @@ -711,19 +737,19 @@ msgstr "" msgid "Glace_Bay" msgstr "" -#: source/ubl-settings-datetime.cc:690 +#: source/ubl-settings-datetime.cc:693 source/ubl-settings-datetime.cc:690 msgid "Global configuration downloaded successfully" msgstr "" -#: source/ubl-settings-datetime.cc:666 +#: source/ubl-settings-datetime.cc:669 source/ubl-settings-datetime.cc:666 msgid "Global configuration read error" msgstr "" -#: source/ubl-settings-datetime.cc:696 +#: source/ubl-settings-datetime.cc:699 source/ubl-settings-datetime.cc:696 msgid "Global configuration successfully written" msgstr "" -#: source/ubl-settings-datetime.cc:674 +#: source/ubl-settings-datetime.cc:677 source/ubl-settings-datetime.cc:674 msgid "Global configuration write error" msgstr "" @@ -775,6 +801,14 @@ msgstr "" msgid "Harbin" msgstr "" +#: source/ubl-settings-datetime.cc:792 +msgid "Hardware clock successfully synchronized" +msgstr "" + +#: source/ubl-settings-datetime.cc:788 +msgid "Hardware clock synchronization error" +msgstr "" + msgid "Havana" msgstr "" @@ -808,6 +842,7 @@ msgstr "" msgid "Hovd" msgstr "" +#: 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 "" @@ -983,7 +1018,7 @@ msgstr "" msgid "Ljubljana" msgstr "" -#: source/ubl-settings-datetime.cc:130 +#: source/ubl-settings-datetime.cc:135 source/ubl-settings-datetime.cc:130 msgid "Load" msgstr "" @@ -993,23 +1028,23 @@ msgstr "" msgid "Load local configuration" msgstr "" -#: source/ubl-settings-datetime.cc:687 +#: source/ubl-settings-datetime.cc:690 source/ubl-settings-datetime.cc:687 msgid "Local configuration downloaded successfully" msgstr "" -#: source/ubl-settings-datetime.cc:662 +#: source/ubl-settings-datetime.cc:665 source/ubl-settings-datetime.cc:662 msgid "Local configuration reading error" msgstr "" -#: source/ubl-settings-datetime.cc:693 +#: source/ubl-settings-datetime.cc:696 source/ubl-settings-datetime.cc:693 msgid "Local configuration successfully written" msgstr "" -#: source/ubl-settings-datetime.cc:670 +#: source/ubl-settings-datetime.cc:673 source/ubl-settings-datetime.cc:670 msgid "Local configuration write error" msgstr "" -#: source/ubl-settings-datetime.cc:151 +#: source/ubl-settings-datetime.cc:156 source/ubl-settings-datetime.cc:151 msgid "Local time" msgstr "" @@ -1094,7 +1129,7 @@ msgstr "" msgid "Manila" msgstr "" -#: source/ubl-settings-datetime.cc:136 +#: source/ubl-settings-datetime.cc:141 source/ubl-settings-datetime.cc:136 msgid "Manual" msgstr "" @@ -1215,6 +1250,14 @@ msgstr "" msgid "NSW" msgstr "" +#: source/ubl-settings-datetime.cc:818 +msgid "NTP is correct" +msgstr "" + +#: source/ubl-settings-datetime.cc:827 +msgid "NTP server name is correct" +msgstr "" + msgid "Nairobi" msgstr "" @@ -1263,8 +1306,9 @@ msgstr "" msgid "North_Dokota" msgstr "" -#: source/ubl-settings-datetime.cc:433 source/ubl-settings-datetime.cc:464 -#: source/ubl-settings-datetime.cc:494 +#: 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 "" @@ -1373,7 +1417,7 @@ msgstr "" msgid "Prague" msgstr "" -#: source/ubl-settings-datetime.cc:128 +#: source/ubl-settings-datetime.cc:133 source/ubl-settings-datetime.cc:128 msgid "Project Home Page" msgstr "" @@ -1416,7 +1460,7 @@ msgstr "" msgid "Regina" msgstr "" -#: source/ubl-settings-datetime.cc:143 +#: source/ubl-settings-datetime.cc:148 source/ubl-settings-datetime.cc:143 msgid "Region:" msgstr "" @@ -1507,7 +1551,7 @@ msgstr "" msgid "Saskatchewan" msgstr "" -#: source/ubl-settings-datetime.cc:129 +#: source/ubl-settings-datetime.cc:134 source/ubl-settings-datetime.cc:129 msgid "Save" msgstr "" @@ -1532,7 +1576,7 @@ msgstr "" msgid "Setting date and time in global configuration" msgstr "" -#: source/ubl-settings-datetime.cc:139 +#: source/ubl-settings-datetime.cc:144 source/ubl-settings-datetime.cc:139 msgid "Setting the date and time" msgstr "" @@ -1602,7 +1646,7 @@ msgstr "" msgid "Stop the synchronization service" msgstr "" -#: source/ubl-settings-datetime.cc:699 +#: source/ubl-settings-datetime.cc:702 source/ubl-settings-datetime.cc:699 msgid "Successfully saved local and global configuration" msgstr "" @@ -1612,19 +1656,19 @@ msgstr "" msgid "Sydney" msgstr "" -#: source/ubl-settings-datetime.cc:145 +#: source/ubl-settings-datetime.cc:150 source/ubl-settings-datetime.cc:145 msgid "Sync by" msgstr "" -#: source/ubl-settings-datetime.cc:148 +#: source/ubl-settings-datetime.cc:153 source/ubl-settings-datetime.cc:148 msgid "Synchronize hardware time" msgstr "" -#: source/ubl-settings-datetime.cc:149 +#: source/ubl-settings-datetime.cc:154 source/ubl-settings-datetime.cc:149 msgid "Synchronize hardware time:" msgstr "" -#: source/ubl-settings-datetime.cc:133 +#: source/ubl-settings-datetime.cc:138 source/ubl-settings-datetime.cc:133 msgid "Synchronize via NTP" msgstr "" @@ -1664,7 +1708,7 @@ msgstr "" msgid "Tell_City" msgstr "" -#: source/ubl-settings-datetime.cc:115 +#: source/ubl-settings-datetime.cc:120 source/ubl-settings-datetime.cc:115 msgid "The program must be run as root" msgstr "" @@ -1691,11 +1735,11 @@ msgstr "" msgid "Timbuktu" msgstr "" -#: source/ubl-settings-datetime.cc:142 +#: source/ubl-settings-datetime.cc:147 source/ubl-settings-datetime.cc:142 msgid "Time zone" msgstr "" -#: source/ubl-settings-datetime.cc:140 +#: source/ubl-settings-datetime.cc:145 source/ubl-settings-datetime.cc:140 msgid "Time:" msgstr "" @@ -1738,7 +1782,7 @@ msgstr "" msgid "US" msgstr "" -#: source/ubl-settings-datetime.cc:150 +#: source/ubl-settings-datetime.cc:155 source/ubl-settings-datetime.cc:150 msgid "UTC time" msgstr "" @@ -1814,10 +1858,6 @@ msgstr "" msgid "Wallis" msgstr "" -#: source/ubl-settings-datetime.cc:147 -msgid "Attention" -msgstr "" - msgid "Warsaw" msgstr "" @@ -1869,7 +1909,7 @@ msgstr "" msgid "Zaporozhye" msgstr "" -#: source/ubl-settings-datetime.cc:144 +#: source/ubl-settings-datetime.cc:149 source/ubl-settings-datetime.cc:144 msgid "Zone:" msgstr "" @@ -1879,7 +1919,7 @@ msgstr "" msgid "Zurich" msgstr "" -#: source/ubl-settings-datetime.cc:126 +#: source/ubl-settings-datetime.cc:131 source/ubl-settings-datetime.cc:126 msgid "https://wiki.ublinux.com" msgstr "" @@ -1888,10 +1928,10 @@ msgid "" "https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/" msgstr "" -#: source/ubl-settings-datetime.cc:146 +#: source/ubl-settings-datetime.cc:151 source/ubl-settings-datetime.cc:146 msgid "ubl-settings-datetime" msgstr "" -#: source/ubl-settings-datetime.cc:1606 +#: 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 5f91c3d..319ce54 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -16,36 +16,46 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" + msgid ":" msgstr ":" -#: source/ubl-settings-datetime.cc:82 source/ubl-settings-datetime.cc:83 +#: 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:62 -#: source/ubl-settings-datetime.cc:65 source/ubl-settings-datetime.cc:66 -#: source/ubl-settings-datetime.cc:72 source/ubl-settings-datetime.cc:73 -#: source/ubl-settings-datetime.cc:79 source/ubl-settings-datetime.cc:80 +#: 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:84 msgid ": \"Hardware time\"" msgstr ": \"Аппаратное время\"" -#: source/ubl-settings-datetime.cc:60 source/ubl-settings-datetime.cc:61 -#: source/ubl-settings-datetime.cc:63 source/ubl-settings-datetime.cc:68 -#: source/ubl-settings-datetime.cc:69 source/ubl-settings-datetime.cc:70 -#: source/ubl-settings-datetime.cc:71 source/ubl-settings-datetime.cc:75 -#: source/ubl-settings-datetime.cc:76 source/ubl-settings-datetime.cc:77 -#: source/ubl-settings-datetime.cc:78 source/ubl-settings-datetime.cc:81 +#: 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: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 msgid ": \"NTP\"" msgstr "" +#: 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 msgid ": \"Time Zone\"" msgstr ": \"Временная зона\"" -#: source/ubl-settings-datetime.cc:57 +#: source/ubl-settings-datetime.cc:58 source/ubl-settings-datetime.cc:57 msgid ": \"xdg-open\"" msgstr "" @@ -104,7 +114,7 @@ msgstr "Амман" msgid "Amsterdam" msgstr "Амстердам" -#: source/ubl-settings-datetime.cc:817 +#: source/ubl-settings-datetime.cc:834 source/ubl-settings-datetime.cc:817 msgid "An invalid character is entered" msgstr "Введён недопустимый символ" @@ -186,6 +196,10 @@ msgstr "Атка" msgid "Atlantic" msgstr "Атлантика" +#: source/ubl-settings-datetime.cc:152 source/ubl-settings-datetime.cc:147 +msgid "Attention" +msgstr "Внимание" + msgid "Atyrau" msgstr "Атырау" @@ -453,7 +467,7 @@ msgstr "Континентальный" msgid "Copenhagen" msgstr "Копенгаген" -#: source/ubl-settings-datetime.cc:123 +#: source/ubl-settings-datetime.cc:128 source/ubl-settings-datetime.cc:123 msgid "Copyright © UBSoft LLC, 2022 - " msgstr "Авторские права © ООО \"Юбисофт\", 2022 - " @@ -475,14 +489,14 @@ msgstr "Куяба" msgid "Curacao" msgstr "Кюрасао" -#: source/ubl-settings-datetime.cc:138 +#: 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:135 +#: source/ubl-settings-datetime.cc:140 source/ubl-settings-datetime.cc:135 msgid "DHCP" msgstr "" @@ -504,11 +518,16 @@ msgstr "Дар-эс-Салам" msgid "Darwin" msgstr "Дарвин" -#: source/ubl-settings-datetime.cc:125 +#: source/ubl-settings-datetime.cc:130 source/ubl-settings-datetime.cc:125 msgid "Date and Time" msgstr "Дата и Время" -#: source/ubl-settings-datetime.cc:131 +#: 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 msgid "" "Date of\n" "Format: DD.MM.YYYY" @@ -516,7 +535,7 @@ msgstr "" "Дата\n" "Формат: ДД.ММ.ГГГГ" -#: source/ubl-settings-datetime.cc:141 +#: source/ubl-settings-datetime.cc:146 source/ubl-settings-datetime.cc:141 msgid "Date:" msgstr "Дата:" @@ -532,7 +551,7 @@ msgstr "Доусон Крик" msgid "DeNoronha" msgstr "Фернанду-ди-Норонья" -#: source/ubl-settings-datetime.cc:134 +#: source/ubl-settings-datetime.cc:139 source/ubl-settings-datetime.cc:134 msgid "Default" msgstr "По умолчанию" @@ -548,7 +567,7 @@ msgstr "Дакка" msgid "Dili" msgstr "Дили" -#: source/ubl-settings-datetime.cc:137 +#: source/ubl-settings-datetime.cc:142 source/ubl-settings-datetime.cc:137 msgid "Disabled" msgstr "Отключено" @@ -615,11 +634,16 @@ msgstr "Эндербери" msgid "Ensenada" msgstr "Энсенада" +#: source/ubl-settings-datetime.cc:803 source/ubl-settings-datetime.cc:1075 +msgid "Enter a list of NTP servers" +msgstr "Введите перечень NTP серверов" + #: source/ubl-settings-datetime.cc:791 source/ubl-settings-datetime.cc:1054 -msgid "Enter DHCP!" -msgstr "Введите DHCP!" +#, fuzzy +msgid "Enter a list of ntp servers" +msgstr "Введите перечень NTP серверов" -#: source/ubl-settings-datetime.cc:132 +#: 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." @@ -627,11 +651,16 @@ msgstr "" "Введите имя ntp-сервера или его ip-адрес.\n" "При вводе нескольких адресов, разделяйте их запятыми." +#: source/ubl-settings-datetime.cc:839 +msgid "Error in the NTP server name" +msgstr "Ошибка в имени NTP сервера" + #: source/ubl-settings-datetime.cc:821 +#, fuzzy msgid "Error in the ntp name" -msgstr "Ошибка в имени ntp" +msgstr "Ошибка в имени NTP сервера" -#: source/ubl-settings-datetime.cc:678 +#: source/ubl-settings-datetime.cc:681 source/ubl-settings-datetime.cc:678 msgid "Error saved local and global configuration" msgstr "Ошибка сохранения локальной и глобальной конфигурации" @@ -733,19 +762,19 @@ msgstr "Гибралтар" msgid "Glace_Bay" msgstr "Глейс-Бей" -#: source/ubl-settings-datetime.cc:690 +#: source/ubl-settings-datetime.cc:693 source/ubl-settings-datetime.cc:690 msgid "Global configuration downloaded successfully" msgstr "Успешно загружена глобальная конфигурация" -#: source/ubl-settings-datetime.cc:666 +#: source/ubl-settings-datetime.cc:669 source/ubl-settings-datetime.cc:666 msgid "Global configuration read error" msgstr "Ошибка чтения глобальной конфигурации" -#: source/ubl-settings-datetime.cc:696 +#: source/ubl-settings-datetime.cc:699 source/ubl-settings-datetime.cc:696 msgid "Global configuration successfully written" msgstr "Успешно записана глобальная конфигурация" -#: source/ubl-settings-datetime.cc:674 +#: source/ubl-settings-datetime.cc:677 source/ubl-settings-datetime.cc:674 msgid "Global configuration write error" msgstr "Ошибка записи глобальной конфигурации" @@ -797,6 +826,14 @@ msgstr "Хараре" msgid "Harbin" msgstr "Харбин" +#: source/ubl-settings-datetime.cc:792 +msgid "Hardware clock successfully synchronized" +msgstr "Аппаратные часы успешно синхронизированы" + +#: source/ubl-settings-datetime.cc:788 +msgid "Hardware clock synchronization error" +msgstr "Ошибка синхронизации аппаратных часов" + msgid "Havana" msgstr "Гавана" @@ -830,6 +867,7 @@ msgstr "Гонолулу" msgid "Hovd" msgstr "Ховд" +#: 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 "Не верный формат даты" @@ -1005,7 +1043,7 @@ msgstr "Лиссабон" msgid "Ljubljana" msgstr "Любляна" -#: source/ubl-settings-datetime.cc:130 +#: source/ubl-settings-datetime.cc:135 source/ubl-settings-datetime.cc:130 msgid "Load" msgstr "Загрузить" @@ -1015,23 +1053,23 @@ msgstr "Загрузить глобальную конфигурацию" msgid "Load local configuration" msgstr "Загрузить локальную конфигурацию" -#: source/ubl-settings-datetime.cc:687 +#: source/ubl-settings-datetime.cc:690 source/ubl-settings-datetime.cc:687 msgid "Local configuration downloaded successfully" msgstr "Успешно загружена локальная конфигурация" -#: source/ubl-settings-datetime.cc:662 +#: source/ubl-settings-datetime.cc:665 source/ubl-settings-datetime.cc:662 msgid "Local configuration reading error" msgstr "Ошибка чтения локальной конфигурации" -#: source/ubl-settings-datetime.cc:693 +#: source/ubl-settings-datetime.cc:696 source/ubl-settings-datetime.cc:693 msgid "Local configuration successfully written" msgstr "Успешно записана локальная конфигурация" -#: source/ubl-settings-datetime.cc:670 +#: source/ubl-settings-datetime.cc:673 source/ubl-settings-datetime.cc:670 msgid "Local configuration write error" msgstr "Ошибка записи локальной конфигурации" -#: source/ubl-settings-datetime.cc:151 +#: source/ubl-settings-datetime.cc:156 source/ubl-settings-datetime.cc:151 msgid "Local time" msgstr "Локальное время" @@ -1116,7 +1154,7 @@ msgstr "Манаус" msgid "Manila" msgstr "Манила" -#: source/ubl-settings-datetime.cc:136 +#: source/ubl-settings-datetime.cc:141 source/ubl-settings-datetime.cc:136 msgid "Manual" msgstr "Вручную" @@ -1237,6 +1275,15 @@ msgstr "Мускат" msgid "NSW" msgstr "Новый Южный Уэльс" +#: source/ubl-settings-datetime.cc:818 +#, fuzzy +msgid "NTP is correct" +msgstr "Имя NTP сервера корректно" + +#: source/ubl-settings-datetime.cc:827 +msgid "NTP server name is correct" +msgstr "Имя NTP сервера корректно" + msgid "Nairobi" msgstr "Найроби" @@ -1285,8 +1332,9 @@ msgstr "Север" msgid "North_Dokota" msgstr "Северная Докота" -#: source/ubl-settings-datetime.cc:433 source/ubl-settings-datetime.cc:464 -#: source/ubl-settings-datetime.cc:494 +#: 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 "Нечего сохранять!" @@ -1395,7 +1443,7 @@ msgstr "Порту-Велью" msgid "Prague" msgstr "Прага" -#: source/ubl-settings-datetime.cc:128 +#: source/ubl-settings-datetime.cc:133 source/ubl-settings-datetime.cc:128 msgid "Project Home Page" msgstr "Домашняя страница проекта" @@ -1438,7 +1486,7 @@ msgstr "Ресифи" msgid "Regina" msgstr "Реджайна" -#: source/ubl-settings-datetime.cc:143 +#: source/ubl-settings-datetime.cc:148 source/ubl-settings-datetime.cc:143 msgid "Region:" msgstr "Регион:" @@ -1529,7 +1577,7 @@ msgstr "Саратов" msgid "Saskatchewan" msgstr "Саскачеван" -#: source/ubl-settings-datetime.cc:129 +#: source/ubl-settings-datetime.cc:134 source/ubl-settings-datetime.cc:129 msgid "Save" msgstr "Сохранить" @@ -1554,7 +1602,7 @@ msgstr "Сеул" msgid "Setting date and time in global configuration" msgstr "Настройка даты и времени в глобальной конфигурации" -#: source/ubl-settings-datetime.cc:139 +#: source/ubl-settings-datetime.cc:144 source/ubl-settings-datetime.cc:139 msgid "Setting the date and time" msgstr "Настройка даты и времени" @@ -1624,7 +1672,7 @@ msgstr "Стокгольм" msgid "Stop the synchronization service" msgstr "Остановить сервис синхронизации" -#: source/ubl-settings-datetime.cc:699 +#: source/ubl-settings-datetime.cc:702 source/ubl-settings-datetime.cc:699 msgid "Successfully saved local and global configuration" msgstr "Успешно сохранена локальная и глобальная конфигурация" @@ -1634,19 +1682,19 @@ msgstr "Суифт-Каррент" msgid "Sydney" msgstr "Сидней" -#: source/ubl-settings-datetime.cc:145 +#: source/ubl-settings-datetime.cc:150 source/ubl-settings-datetime.cc:145 msgid "Sync by" msgstr "Синхронизировать" -#: source/ubl-settings-datetime.cc:148 +#: source/ubl-settings-datetime.cc:153 source/ubl-settings-datetime.cc:148 msgid "Synchronize hardware time" msgstr "Синхронизировать аппаратное время" -#: source/ubl-settings-datetime.cc:149 +#: source/ubl-settings-datetime.cc:154 source/ubl-settings-datetime.cc:149 msgid "Synchronize hardware time:" msgstr "Синхронизировать аппаратное время:" -#: source/ubl-settings-datetime.cc:133 +#: source/ubl-settings-datetime.cc:138 source/ubl-settings-datetime.cc:133 msgid "Synchronize via NTP" msgstr "Синхронизировать через NTP" @@ -1686,7 +1734,7 @@ msgstr "Тель-Авив" msgid "Tell_City" msgstr "Телл-Сити" -#: source/ubl-settings-datetime.cc:115 +#: source/ubl-settings-datetime.cc:120 source/ubl-settings-datetime.cc:115 msgid "The program must be run as root" msgstr "Программа должна быть запущена с правами суперпользователя!" @@ -1715,11 +1763,11 @@ msgstr "Тихуана" msgid "Timbuktu" msgstr "Тимбукту" -#: source/ubl-settings-datetime.cc:142 +#: source/ubl-settings-datetime.cc:147 source/ubl-settings-datetime.cc:142 msgid "Time zone" msgstr "Часовой пояс" -#: source/ubl-settings-datetime.cc:140 +#: source/ubl-settings-datetime.cc:145 source/ubl-settings-datetime.cc:140 msgid "Time:" msgstr "Время:" @@ -1762,7 +1810,7 @@ msgstr "Тунис" msgid "US" msgstr "США" -#: source/ubl-settings-datetime.cc:150 +#: source/ubl-settings-datetime.cc:155 source/ubl-settings-datetime.cc:150 msgid "UTC time" msgstr "Время по UTC" @@ -1838,10 +1886,6 @@ msgstr "Уэйко" msgid "Wallis" msgstr "Уоллис" -#: source/ubl-settings-datetime.cc:147 -msgid "Attention" -msgstr "Внимание" - msgid "Warsaw" msgstr "Варшава" @@ -1893,7 +1937,7 @@ msgstr "Загреб" msgid "Zaporozhye" msgstr "Запорожье" -#: source/ubl-settings-datetime.cc:144 +#: source/ubl-settings-datetime.cc:149 source/ubl-settings-datetime.cc:144 msgid "Zone:" msgstr "Зона:" @@ -1903,7 +1947,7 @@ msgstr "Зулу" msgid "Zurich" msgstr "Цюрих" -#: source/ubl-settings-datetime.cc:126 +#: source/ubl-settings-datetime.cc:131 source/ubl-settings-datetime.cc:126 msgid "https://wiki.ublinux.com" msgstr "https://wiki.ublinux.ru" @@ -1913,10 +1957,10 @@ msgid "" msgstr "" "https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/" -#: source/ubl-settings-datetime.cc:146 +#: source/ubl-settings-datetime.cc:151 source/ubl-settings-datetime.cc:146 msgid "ubl-settings-datetime" msgstr "Настройка даты и времени" -#: source/ubl-settings-datetime.cc:1606 +#: source/ubl-settings-datetime.cc:1651 source/ubl-settings-datetime.cc:1606 msgid "ubl-settings-datetime version: " msgstr "ubl-settings-datetime версия: "