From 3aa906b5360284e970fe1ca106ba8a4041154111 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Thu, 23 Mar 2023 13:51:34 +0600 Subject: [PATCH 1/5] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BE?= =?UTF-8?q?=D0=BA=D0=BD=D0=BE=20=D1=83=D0=B2=D0=B5=D0=B4=D0=BE=D0=BC=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B9,=20=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=BE=D0=BA?= =?UTF-8?q?=D1=83=20=D1=83=D0=B2=D0=B5=D0=B4=D0=BE=D0=BC=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 95 +- source/ubl-settings-datetime.h | 2 +- ubl-settings-datetime.pot | 156 ++- ubl-settings-datetime_ru.po | 164 ++- ubl-settings-datetime_ru.po~ | 1938 +++++++++++++++++++++++++++++++ 5 files changed, 2211 insertions(+), 144 deletions(-) create mode 100644 ubl-settings-datetime_ru.po~ diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 743978b..3ebe980 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -430,6 +430,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"); lblWarning->set_text(gettext("Nothing to save!")); } else { @@ -461,6 +462,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"); lblWarning->set_text(gettext("Nothing to save!")); } else { @@ -491,6 +493,7 @@ void MainWindow::save_global_cfg() { 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))) { + info_status_app("boxInfoMessOK"); lblWarning->set_text(gettext("Nothing to save!")); } else { @@ -778,8 +781,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 +800,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 +824,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 +955,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 +1072,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 +1362,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 +1392,40 @@ 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(); + cout << 1111 << endl; + 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 +1437,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..93865bb 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -173,7 +173,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 версия: " diff --git a/ubl-settings-datetime_ru.po~ b/ubl-settings-datetime_ru.po~ new file mode 100644 index 0000000..9affefb --- /dev/null +++ b/ubl-settings-datetime_ru.po~ @@ -0,0 +1,1938 @@ +# Russian 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: 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: Russian - UBLinux Team \n" +"Language: Russian\n" +"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 +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: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 +msgid ": \"NTP\"" +msgstr "" + +#: 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 +msgid ": \"xdg-open\"" +msgstr "" + +msgid "Abidjan" +msgstr "Абиджан" + +msgid "About" +msgstr "О программе" + +msgid "Accra" +msgstr "Аккра" + +msgid "Acre" +msgstr "Акр" + +msgid "" +"Active service detected\n" +"Automatic time and date synchronization service detected" +msgstr "" +"Обнаружен активный сервис\n" +"автоматической синхронизации времени и даты" + +msgid "Adak" +msgstr "Адак" + +msgid "Addis_Ababa" +msgstr "Аддис-Абеба" + +msgid "Adelaide" +msgstr "Аделаида" + +msgid "Aden" +msgstr "Аден" + +msgid "Africa" +msgstr "Африка" + +msgid "Alaska" +msgstr "Аляска" + +msgid "Aleutian" +msgstr "Алеутский" + +msgid "Algiers" +msgstr "Алжир" + +msgid "Almaty" +msgstr "Алматы" + +msgid "America" +msgstr "Америка" + +msgid "Amman" +msgstr "Амман" + +msgid "Amsterdam" +msgstr "Амстердам" + +#: source/ubl-settings-datetime.cc:817 +msgid "An invalid character is entered" +msgstr "Введён недопустимый символ" + +msgid "Anadyr" +msgstr "Анадырь" + +msgid "Anchorage" +msgstr "Анкоридж" + +msgid "Andorra" +msgstr "Андорра" + +msgid "Anguilla" +msgstr "Ангилья" + +msgid "Antananarivo" +msgstr "Антананариву" + +msgid "Antarctica" +msgstr "Антарктида" + +msgid "Antigua" +msgstr "Антигуа" + +msgid "Apia" +msgstr "Апиа" + +msgid "Aqtau" +msgstr "Актау" + +msgid "Aqtobe" +msgstr "Актобе" + +msgid "Araguaina" +msgstr "Арагуайна" + +msgid "Arctic" +msgstr "Арктика" + +msgid "Argument not recognized\n" +msgstr "Нepacпoзнaнный аргумент\n" + +msgid "Arizona" +msgstr "Аризона" + +msgid "Aruba" +msgstr "Аруба" + +msgid "Ashgabat" +msgstr "Ашхабад" + +msgid "Ashkhabad" +msgstr "Ашхабад" + +msgid "Asia" +msgstr "Азия" + +msgid "Asmara" +msgstr "Асмэра" + +msgid "Asmera" +msgstr "Асмера" + +msgid "Astrakhan" +msgstr "Астрахань" + +msgid "Asuncion" +msgstr "Асунсьон" + +msgid "Athens" +msgstr "Афины" + +msgid "Atikokan" +msgstr "Атикокан" + +msgid "Atka" +msgstr "Атка" + +msgid "Atlantic" +msgstr "Атлантика" + +msgid "Atyrau" +msgstr "Атырау" + +msgid "Auckland" +msgstr "Окленд" + +msgid "Australia" +msgstr "Австралия" + +msgid "Automatic time synchronization" +msgstr "Автоматическая синхронизация времени" + +msgid "Azores" +msgstr "Азорские острова" + +msgid "Baghdad" +msgstr "Багдад" + +msgid "Bahia" +msgstr "Баия" + +msgid "Bahia_Banderas" +msgstr "Баия_Бандерас" + +msgid "Bahrain" +msgstr "Бахрейн" + +msgid "BajaNorte" +msgstr "БахаНорте" + +msgid "BajaSur" +msgstr "Южная Нижняя Калифорния" + +msgid "Baku" +msgstr "Баку" + +msgid "Bamako" +msgstr "Бамако" + +msgid "Bangkok" +msgstr "Бангкок" + +msgid "Bangui" +msgstr "Банги" + +msgid "Banjul" +msgstr "Банжул" + +msgid "Barbados" +msgstr "Барбадос" + +msgid "Barnaul" +msgstr "Барнаул" + +msgid "Beirut" +msgstr "Бейрут" + +msgid "Belem" +msgstr "Белен" + +msgid "Belfast" +msgstr "Белфаст" + +msgid "Belgrade" +msgstr "Белград" + +msgid "Belize" +msgstr "Белиз" + +msgid "Berlin" +msgstr "Берлин" + +msgid "Bermuda" +msgstr "Бермуды" + +msgid "Beulah" +msgstr "Беула" + +msgid "Bishkek" +msgstr "Бишкек" + +msgid "Bissau" +msgstr "Бисау" + +msgid "Blanc-Sablon" +msgstr "Блан-Саблон" + +msgid "Blantyre" +msgstr "Блантайр" + +msgid "Boa_Vista" +msgstr "Боа_Виста" + +msgid "Bogota" +msgstr "Богота" + +msgid "Boise" +msgstr "Бойсе" + +msgid "Bougainville" +msgstr "Бугенвиль" + +msgid "Bratislava" +msgstr "Братислава" + +msgid "Brazil" +msgstr "Бразилия" + +msgid "Brazzaville" +msgstr "Браззавиль" + +msgid "Brisbane" +msgstr "Брисбен" + +msgid "Broken_Hill" +msgstr "Брокен-Хилл" + +msgid "Brunei" +msgstr "Бруней" + +msgid "Brussels" +msgstr "Брюссель" + +msgid "Bucharest" +msgstr "Бухарест" + +msgid "Budapest" +msgstr "Будапешт" + +msgid "Buenos_Aires" +msgstr "Буэнос Айрес" + +msgid "Bujumbura" +msgstr "Бужумбура" + +msgid "Busingen" +msgstr "Бузинген" + +msgid "Cairo" +msgstr "Каир" + +msgid "Calcutta" +msgstr "Калькутта" + +msgid "Cambridge_Bay" +msgstr "Кембридж Бэй" + +msgid "Campo_Grande" +msgstr "Кампо_Гранде" + +msgid "Canada" +msgstr "Канада" + +msgid "Canary" +msgstr "Канари" + +msgid "Canberra" +msgstr "Канберра" + +msgid "Cancun" +msgstr "Канкун" + +msgid "Cape_Vepde" +msgstr "Кабо-Верде" + +msgid "Cape_Verde" +msgstr "Кабо-Верде" + +msgid "Caracas" +msgstr "Каракас" + +msgid "Casablanca" +msgstr "Касабланка" + +msgid "Casey" +msgstr "Кейси" + +msgid "Catamarca" +msgstr "Катамарка" + +msgid "Cayenne" +msgstr "Кайенна" + +msgid "Cayman" +msgstr "Кайман" + +msgid "Center" +msgstr "Центр" + +msgid "Central" +msgstr "Центральный" + +msgid "Ceuta" +msgstr "Сеута" + +msgid "Chagos" +msgstr "Чагос" + +msgid "Change the NTPSERVERS parameter" +msgstr "Изменить параметр NTPSERVERS" + +msgid "Change zone setting" +msgstr "Изменить параметр зоны" + +msgid "Chatham" +msgstr "Чатем" + +msgid "Chicago" +msgstr "Чикаго" + +msgid "Chihuahua" +msgstr "Чихуахуа" + +msgid "Chile" +msgstr "Чили" + +msgid "Chisinau" +msgstr "Кишинев" + +msgid "Chita" +msgstr "Чита" + +msgid "Choibalsan" +msgstr "Чойбалсан" + +msgid "Chongqing" +msgstr "Чунцин" + +msgid "Christmas" +msgstr "Рождество" + +msgid "Chungking" +msgstr "Чунцин" + +msgid "Chuuk" +msgstr "Чуук" + +msgid "Ciudad_Juarez" +msgstr "Сьюдад_Хуарес" + +msgid "Clock" +msgstr "Часы" + +msgid "Close" +msgstr "Закрыть" + +msgid "Cocos" +msgstr "Кокос" + +msgid "Colombo" +msgstr "Коломбо" + +msgid "ComodRivadavia" +msgstr "Комодоро-Ривадавия" + +msgid "Comoro" +msgstr "Коморо" + +msgid "Conakry" +msgstr "Конакри" + +msgid "Continental" +msgstr "Континентальный" + +msgid "Copenhagen" +msgstr "Копенгаген" + +#: source/ubl-settings-datetime.cc:123 +msgid "Copyright © UBSoft LLC, 2022 - " +msgstr "Авторские права © ООО \"Юбисофт\", 2022 - " + +msgid "Coral_Harbour" +msgstr "Корал Харбор" + +msgid "Cordoba" +msgstr "Кордова" + +msgid "Costa_Rica" +msgstr "Коста_Рика" + +msgid "Creston" +msgstr "Крестон" + +msgid "Cuiaba" +msgstr "Куяба" + +msgid "Curacao" +msgstr "Кюрасао" + +#: source/ubl-settings-datetime.cc:138 +msgid "Current date and time" +msgstr "Текущие дата и время" + +msgid "Currie" +msgstr "Карри" + +#: source/ubl-settings-datetime.cc:135 +msgid "DHCP" +msgstr "" + +msgid "Dacca" +msgstr "Дакка" + +msgid "Dakar" +msgstr "Дакар" + +msgid "Damascus" +msgstr "Дамаск" + +msgid "Danmarkshavn" +msgstr "Данмарксхавн" + +msgid "Dar_es_Salaam" +msgstr "Дар-эс-Салам" + +msgid "Darwin" +msgstr "Дарвин" + +#: source/ubl-settings-datetime.cc:125 +msgid "Date and Time" +msgstr "Дата и Время" + +#: source/ubl-settings-datetime.cc:131 +msgid "" +"Date of\n" +"Format: DD.MM.YYYY" +msgstr "" +"Дата\n" +"Формат: ДД.ММ.ГГГГ" + +#: source/ubl-settings-datetime.cc:141 +msgid "Date:" +msgstr "Дата:" + +msgid "Davis" +msgstr "Дэвис" + +msgid "Dawson" +msgstr "Доусон" + +msgid "Dawson_Creek" +msgstr "Доусон Крик" + +msgid "DeNoronha" +msgstr "Фернанду-ди-Норонья" + +#: source/ubl-settings-datetime.cc:134 +msgid "Default" +msgstr "По умолчанию" + +msgid "Denver" +msgstr "Денвер" + +msgid "Detroit" +msgstr "Детройт" + +msgid "Dhaka" +msgstr "Дакка" + +msgid "Dili" +msgstr "Дили" + +#: source/ubl-settings-datetime.cc:137 +msgid "Disabled" +msgstr "Отключено" + +msgid "Djibouti" +msgstr "Джибути" + +msgid "Dominica" +msgstr "Доминика" + +msgid "Douala" +msgstr "Дуала" + +msgid "Dubai" +msgstr "Дубай" + +msgid "Dublin" +msgstr "Дублин" + +msgid "DumontDUrville" +msgstr "Дюмон-д-Юрвиль" + +msgid "Dushanbe" +msgstr "Душанбе" + +msgid "ERROR" +msgstr "ОШИБКА" + +msgid "East" +msgstr "Восток" + +msgid "East-Indiana" +msgstr "Восточная Индиана" + +msgid "Easter" +msgstr "Пасха" + +msgid "EasterIsland" +msgstr "Остров Пасхи" + +msgid "Easterlsland" +msgstr "Остров Пасхи" + +msgid "Eastern" +msgstr "Восточный" + +msgid "Edmonton" +msgstr "Эдмонтон" + +msgid "Efate" +msgstr "Эфате" + +msgid "Eirunepe" +msgstr "Эйрунепе" + +msgid "El_Aaiun" +msgstr "Эль_Аайун" + +msgid "El_Salvador" +msgstr "Сальвадор" + +msgid "Enderbury" +msgstr "Эндербери" + +msgid "Ensenada" +msgstr "Энсенада" + +#: source/ubl-settings-datetime.cc:791 source/ubl-settings-datetime.cc:1054 +msgid "Enter a list of NTP servers" +msgstr "Введите перечень NTP серверов" + +#: 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 "" +"Введите имя ntp-сервера или его ip-адрес.\n" +"При вводе нескольких адресов, разделяйте их запятыми." + +#: source/ubl-settings-datetime.cc:821 +msgid "Error in the NTP server name" +msgstr "Ошибка в имени NTP сервера" + +#: source/ubl-settings-datetime.cc:678 +msgid "Error saved local and global configuration" +msgstr "Ошибка сохранения локальной и глобальной конфигурации" + +msgid "Eucla" +msgstr "Евкла" + +msgid "Europe" +msgstr "Европа" + +msgid "Faeroe" +msgstr "Фарерские острова" + +msgid "Fakaofo" +msgstr "Факаофо" + +msgid "Famagusta" +msgstr "Фамагуста" + +msgid "Faroe" +msgstr "Фарерские острова" + +msgid "Fiji" +msgstr "Фиджи" + +msgid "Fort_Nelson" +msgstr "Форт Нельсон" + +msgid "Fort_Wayne" +msgstr "Форт_Уэйн" + +msgid "Fortaleza" +msgstr "Форталеза" + +msgid "Freetown" +msgstr "Фритаун" + +msgid "Funafuti" +msgstr "Фунафути" + +msgid "GMT-1" +msgstr "ГМТ-1" + +msgid "GMT-3" +msgstr "ГМТ-3" + +msgid "" +"GTK settings datetime for UBLinux\n" +"\n" +"Usage: ubl-settings-datetime [OPTIONS...]\n" +"Options:\n" +" -h, --help\t Show this help\n" +" -V, --version\t Show package version\n" +" --lock-datetime Lock date and time changes\n" +" --lock-timezone Lock time zone changes\n" +" --lock-ntp-mode Lock NTP mode selection\n" +" --lock-ntp-edit Lock editing NTP servers\n" +" --lock-sync-hwclock Lock sync hwclock mode selection\n" +" --lock-save Lock saving local and global configuration\n" +" --lock-save-local Lock save global configuration\n" +" --lock-save-global Lock load global configuration\n" +" --lock-load-global Lock load global configuration\n" +msgstr "" +"GTK-утилита настройки даты и времени для UBLinux\n" +"\n" +"Использование: ubl-settings-datetime [Параметры приложения...]\n" +"Параметры приложения:\n" +" -h, --help\t Показать параметры справки\n" +" -V, --version\t Показать версию пакета\n" +" --lock-datetime Блокировка изменения даты и времени\n" +" --lock-timezone Блокировка изменения часового пояса\n" +" --lock-ntp-mode Блокировка выбора режима NTP\n" +" --lock-ntp-edit Блокировка перечня NTP серверов\n" +" --lock-sync-hwclock Блокировка выбора режима синхронизации аппаратного " +"времени\n" +" --lock-save Блокировка сохранения локальной и глобальной " +"конфигурации\n" +" --lock-save-local Блокировка сохранения локальной конфигурации\n" +" --lock-save-global Блокировка сохранения глобальной конфигурации\n" +" --lock-load-global Блокировка загрузки глобальной конфигурации\n" + +msgid "Gaborone" +msgstr "Габороне" + +msgid "Galapagos" +msgstr "Галапагос" + +msgid "Gambier" +msgstr "Гамбье" + +msgid "Gaza" +msgstr "Газа" + +msgid "General" +msgstr "Генерал-Сантос" + +msgid "Gibraltar" +msgstr "Гибралтар" + +msgid "Glace_Bay" +msgstr "Глейс-Бей" + +#: source/ubl-settings-datetime.cc:690 +msgid "Global configuration downloaded successfully" +msgstr "Успешно загружена глобальная конфигурация" + +#: source/ubl-settings-datetime.cc:666 +msgid "Global configuration read error" +msgstr "Ошибка чтения глобальной конфигурации" + +#: source/ubl-settings-datetime.cc:696 +msgid "Global configuration successfully written" +msgstr "Успешно записана глобальная конфигурация" + +#: source/ubl-settings-datetime.cc:674 +msgid "Global configuration write error" +msgstr "Ошибка записи глобальной конфигурации" + +msgid "Global customization" +msgstr "Глобальная настройка" + +msgid "Godthab" +msgstr "Годтаб" + +msgid "Goose_Bay" +msgstr "Гуз-Бей" + +msgid "Grand_Turk" +msgstr "Гранд_Турк" + +msgid "Greenwich" +msgstr "Гринвич" + +msgid "Grenada" +msgstr "Гренада" + +msgid "Guadalcanal" +msgstr "Гуадалканал" + +msgid "Guadeloupe" +msgstr "Гваделупа" + +msgid "Guam" +msgstr "Гуам" + +msgid "Guatemala" +msgstr "Гватемала" + +msgid "Guayaquil" +msgstr "Гуаякиль" + +msgid "Guernsey" +msgstr "Гернси" + +msgid "Guyana" +msgstr "Гайана" + +msgid "Halifax" +msgstr "Галифакс" + +msgid "Harare" +msgstr "Хараре" + +msgid "Harbin" +msgstr "Харбин" + +msgid "Havana" +msgstr "Гавана" + +msgid "Hawaii" +msgstr "Гавайи" + +msgid "Hebron" +msgstr "Хеврон" + +msgid "Help" +msgstr "Справка" + +msgid "Helsinki" +msgstr "Хельсинки" + +msgid "Hermosillo" +msgstr "Эрмосильо" + +msgid "Ho_Chi_Minh" +msgstr "Хо_Чи_Мин" + +msgid "Hobart" +msgstr "Хобарт" + +msgid "Hong_Kong" +msgstr "Гонконг" + +msgid "Honolulu" +msgstr "Гонолулу" + +msgid "Hovd" +msgstr "Ховд" + +#: source/ubl-settings-datetime.cc:1402 source/ubl-settings-datetime.cc:1407 +msgid "Incorrect date format" +msgstr "Не верный формат даты" + +msgid "Indian" +msgstr "Индиана" + +msgid "Indiana" +msgstr "Индианан" + +msgid "Indiana-Starke" +msgstr "Индиана-Старке" + +msgid "Indianapolis" +msgstr "Индианаполис" + +msgid "Interactive date picker" +msgstr "Интерактивный выбор даты" + +msgid "Inuvik" +msgstr "Инувик" + +msgid "Iqaluit" +msgstr "Икалуит" + +msgid "Irkutsk" +msgstr "Иркутск" + +msgid "Isle_of_Man" +msgstr "Остров Мэн" + +msgid "Istanbul" +msgstr "Стамбул" + +msgid "Jakarta" +msgstr "Джакарта" + +msgid "Jamaica" +msgstr "Ямайка" + +msgid "Jan_Mayen" +msgstr "Ян_Майен" + +msgid "Jayapura" +msgstr "Джаяпура" + +msgid "Jersey" +msgstr "Джерси" + +msgid "Jerusalem" +msgstr "Иерусалим" + +msgid "Johannesburg" +msgstr "Йоханнесбург" + +msgid "Johnston" +msgstr "Джонстон" + +msgid "Juba" +msgstr "Джуба" + +msgid "Jujuy" +msgstr "Жужуй" + +msgid "Juneau" +msgstr "Джуно" + +msgid "Kabul" +msgstr "Кабул" + +msgid "Kaliningrad" +msgstr "Калининград" + +msgid "Kamchatka" +msgstr "Камчатка" + +msgid "Kampala" +msgstr "Кампала" + +msgid "Kanton" +msgstr "Кантон" + +msgid "Karachi" +msgstr "Карачи" + +msgid "Kashgar" +msgstr "Кашгар" + +msgid "Kathmandu" +msgstr "Катманду" + +msgid "Katmandu" +msgstr "Катманду" + +msgid "Kerguelen" +msgstr "Кергелен" + +msgid "Khandyga" +msgstr "Хандыга" + +msgid "Khartoum" +msgstr "Хартум" + +msgid "Kiev" +msgstr "Киев" + +msgid "Kigali" +msgstr "Кигали" + +msgid "Kinshasa" +msgstr "Киншаса" + +msgid "Kiritimati" +msgstr "Киритимати" + +msgid "Kirov" +msgstr "Киров" + +msgid "Knox" +msgstr "Ноксвилл" + +msgid "Knox_IN" +msgstr "Нокс_IN" + +msgid "Kolkata" +msgstr "Калькутта" + +msgid "Kralendijk" +msgstr "Кралендейк" + +msgid "Krasnoyarsk" +msgstr "Красноярск" + +msgid "Kuala_Lumpur" +msgstr "Куала-Лумпур" + +msgid "Kuching" +msgstr "Кучинг" + +msgid "Kuwait" +msgstr "Кувейт" + +msgid "Kwajalein" +msgstr "Кваджалейн" + +msgid "Kyiv" +msgstr "Киев" + +msgid "LHI" +msgstr "Лхи" + +msgid "La_Paz" +msgstr "Ла_Пас" + +msgid "La_Rioja" +msgstr "Риоха" + +msgid "Lagos" +msgstr "Лагос" + +msgid "Libreville" +msgstr "Либревиль" + +msgid "Lima" +msgstr "Лима" + +msgid "Lindeman" +msgstr "Линдеман" + +msgid "Lisbon" +msgstr "Лиссабон" + +msgid "Ljubljana" +msgstr "Любляна" + +#: source/ubl-settings-datetime.cc:130 +msgid "Load" +msgstr "Загрузить" + +msgid "Load global configuration" +msgstr "Загрузить глобальную конфигурацию" + +msgid "Load local configuration" +msgstr "Загрузить локальную конфигурацию" + +#: source/ubl-settings-datetime.cc:687 +msgid "Local configuration downloaded successfully" +msgstr "Успешно загружена локальная конфигурация" + +#: source/ubl-settings-datetime.cc:662 +msgid "Local configuration reading error" +msgstr "Ошибка чтения локальной конфигурации" + +#: source/ubl-settings-datetime.cc:693 +msgid "Local configuration successfully written" +msgstr "Успешно записана локальная конфигурация" + +#: source/ubl-settings-datetime.cc:670 +msgid "Local configuration write error" +msgstr "Ошибка записи локальной конфигурации" + +#: source/ubl-settings-datetime.cc:151 +msgid "Local time" +msgstr "Локальное время" + +msgid "Lome" +msgstr "Ломе" + +msgid "London" +msgstr "Лондон" + +msgid "Longyearbyen" +msgstr "Лонгйир" + +msgid "Lord_Howe" +msgstr "Лорд_Хау" + +msgid "Los_Angeles" +msgstr "Лос-Анджелес" + +msgid "Louisville" +msgstr "Луисвилл" + +msgid "Lower_Princes" +msgstr "Лоуэр-Принс-Куотер" + +msgid "Luanda" +msgstr "Луанда" + +msgid "Lubumbashi" +msgstr "Лубумбаши" + +msgid "Lusaka" +msgstr "Лусака" + +msgid "Luxembourg" +msgstr "Люксембург" + +msgid "Macao" +msgstr "Макао" + +msgid "Macau" +msgstr "Макао" + +msgid "Maceio" +msgstr "Масейо" + +msgid "Macquarie" +msgstr "Маккуори" + +msgid "Madeira" +msgstr "Мадейра" + +msgid "Madrid" +msgstr "Мадрид" + +msgid "Magadan" +msgstr "Магадан" + +msgid "Mahe" +msgstr "Маэ" + +msgid "Majuro" +msgstr "Маджуро" + +msgid "Makassar" +msgstr "Макассар" + +msgid "Malabo" +msgstr "Малабо" + +msgid "Maldives" +msgstr "Мальдивы" + +msgid "Malta" +msgstr "Мальта" + +msgid "Managua" +msgstr "Манагуа" + +msgid "Manaus" +msgstr "Манаус" + +msgid "Manila" +msgstr "Манила" + +#: source/ubl-settings-datetime.cc:136 +msgid "Manual" +msgstr "Вручную" + +msgid "Maputo" +msgstr "Мапуту" + +msgid "Marengo" +msgstr "Маренго" + +msgid "Mariehamn" +msgstr "Мариехамн" + +msgid "Marigot" +msgstr "Мариго" + +msgid "Marquesas" +msgstr "Маркизские острова" + +msgid "Martinique" +msgstr "Мартиника" + +msgid "Maseru" +msgstr "Масеру" + +msgid "Matamoros" +msgstr "Матаморос" + +msgid "Mauritius" +msgstr "Маврикий" + +msgid "Mawson" +msgstr "Моусон" + +msgid "Mayotte" +msgstr "Майотта" + +msgid "Mazatlan" +msgstr "Масатлан" + +msgid "Mbabane" +msgstr "Мбабане" + +msgid "McMurdo" +msgstr "МакМердо" + +msgid "Melbourne" +msgstr "Мельбурн" + +msgid "Mendoza" +msgstr "Мендоса" + +msgid "Menominee" +msgstr "Меномини" + +msgid "Merida" +msgstr "Мерида" + +msgid "Metlakatla" +msgstr "Метлакатла" + +msgid "Mexico" +msgstr "Мексика" + +msgid "Mexico_City" +msgstr "Мехико" + +msgid "Michigan" +msgstr "Мичиган" + +msgid "Midway" +msgstr "Мидуэй" + +msgid "Minsk" +msgstr "Минск" + +msgid "Minutes" +msgstr "Минуты" + +msgid "Miquelon" +msgstr "Микелон" + +msgid "Mogadishu" +msgstr "Могадишо" + +msgid "Monaco" +msgstr "Монако" + +msgid "Moncton" +msgstr "Монктон" + +msgid "Monrovia" +msgstr "Монровия" + +msgid "Monterrey" +msgstr "Монтеррей" + +msgid "Montevideo" +msgstr "Монтевидео" + +msgid "Monticello" +msgstr "Монтиселло" + +msgid "Montreal" +msgstr "Монреаль" + +msgid "Montserrat" +msgstr "Монтсеррат" + +msgid "Moscow" +msgstr "Москва" + +msgid "Mountain" +msgstr "Маунтин-Вью" + +msgid "Muscat" +msgstr "Мускат" + +msgid "NSW" +msgstr "Новый Южный Уэльс" + +msgid "Nairobi" +msgstr "Найроби" + +msgid "Nassau" +msgstr "Нассау" + +msgid "Nauru" +msgstr "Науру" + +msgid "Ndjamena" +msgstr "Нджамена" + +msgid "New_Salem" +msgstr "Нью-Салем" + +msgid "New_York" +msgstr "Нью-Йорк" + +msgid "Newfoundland" +msgstr "Ньюфаундленд" + +msgid "Niamey" +msgstr "Ниамей" + +msgid "Nicosia" +msgstr "Никосия" + +msgid "Nipigon" +msgstr "Нипигон" + +msgid "Niue" +msgstr "Ниуэ" + +msgid "Nome" +msgstr "Ном" + +msgid "Norfolk" +msgstr "Норфолк" + +msgid "Noronha" +msgstr "Норонья" + +msgid "North" +msgstr "Север" + +msgid "North_Dokota" +msgstr "Северная Докота" + +#: source/ubl-settings-datetime.cc:433 source/ubl-settings-datetime.cc:464 +#: source/ubl-settings-datetime.cc:494 +msgid "Nothing to save!" +msgstr "Нечего сохранять!" + +msgid "Nouakchott" +msgstr "Нуакшот" + +msgid "Noumea" +msgstr "Нумеа" + +msgid "Novokuznetsk" +msgstr "Новокузнецк" + +msgid "Novosibirsk" +msgstr "Новосибирск" + +msgid "Nuuk" +msgstr "Нуук" + +msgid "OK" +msgstr "OK" + +msgid "Ojinaga" +msgstr "Охинага" + +msgid "Omsk" +msgstr "Омск" + +msgid "Oral" +msgstr "Уральск" + +msgid "Oslo" +msgstr "Осло" + +msgid "Ouagadougou" +msgstr "Уагадугу" + +msgid "Pacific" +msgstr "Тихий океан" + +msgid "Pago_Pago" +msgstr "Паго_Паго" + +msgid "Palau" +msgstr "Палау" + +msgid "Palmer" +msgstr "Палмер" + +msgid "Panama" +msgstr "Панама" + +msgid "Pangnirtung" +msgstr "Пангниртунг" + +msgid "Paramaribo" +msgstr "Парамарибо" + +msgid "Paris" +msgstr "Париж" + +msgid "Perth" +msgstr "Перт" + +msgid "Petersburg" +msgstr "Петербург" + +msgid "Phnom_Penh" +msgstr "Пномпень" + +msgid "Phoenix" +msgstr "Феникс" + +msgid "Pitcairn" +msgstr "Питкэрн" + +msgid "Podgorica" +msgstr "Подгорица" + +msgid "Pohnpei" +msgstr "Понпеи" + +msgid "Ponape" +msgstr "Понапе" + +msgid "Pontianak" +msgstr "Понтианак" + +msgid "Port-au-Prince" +msgstr "Порт-о-Пренс" + +msgid "Port_Moresby" +msgstr "Порт_Морсби" + +msgid "Port_of_Spain" +msgstr "Порт-оф-Спейн" + +msgid "Porto-Novo" +msgstr "Порто-Ново" + +msgid "Porto_Acre" +msgstr "Порту_Акр" + +msgid "Porto_Velho" +msgstr "Порту-Велью" + +msgid "Prague" +msgstr "Прага" + +#: source/ubl-settings-datetime.cc:128 +msgid "Project Home Page" +msgstr "Домашняя страница проекта" + +msgid "Puerto_Rico" +msgstr "Пуэрто-Рико" + +msgid "Punta_Arenas" +msgstr "Пунта_Аренас" + +msgid "Pyongyang" +msgstr "Пхеньян" + +msgid "Qatar" +msgstr "Катар" + +msgid "Qostanay" +msgstr "Костанай" + +msgid "Queensland" +msgstr "Квинсленд" + +msgid "Qyzylorda" +msgstr "Кызылорда" + +msgid "Rainy_River" +msgstr "Рейни-Ривер" + +msgid "Rangoon" +msgstr "Рангун" + +msgid "Rankin_Inlet" +msgstr "Ранкин-Инлет" + +msgid "Rarotonga" +msgstr "Раротонга" + +msgid "Recife" +msgstr "Ресифи" + +msgid "Regina" +msgstr "Реджайна" + +#: source/ubl-settings-datetime.cc:143 +msgid "Region:" +msgstr "Регион:" + +msgid "Resolute" +msgstr "Резольют" + +msgid "Reunion" +msgstr "Воссоединение" + +msgid "Reykjavik" +msgstr "Рейкьявик" + +msgid "Riga" +msgstr "Рига" + +msgid "Rio_Branco" +msgstr "Рио_Бранко" + +msgid "Rio_Gallegos" +msgstr "Рио-Гальегос" + +msgid "Riyadh" +msgstr "Эр-Рияд" + +msgid "Rome" +msgstr "Рим" + +msgid "Rosario" +msgstr "Росарио" + +msgid "Rothera" +msgstr "Ротера" + +msgid "Saigon" +msgstr "Сайгон" + +msgid "Saipan" +msgstr "Сайпан" + +msgid "Sakhalin" +msgstr "Сахалин" + +msgid "Salta" +msgstr "Сальта" + +msgid "Samara" +msgstr "Самара" + +msgid "Samarkand" +msgstr "Самарканд" + +msgid "Samoa" +msgstr "Самоа" + +msgid "San_Juan" +msgstr "Сан-Хуан" + +msgid "San_Luis" +msgstr "Сан-Луис" + +msgid "San_Marino" +msgstr "Сан Марино" + +msgid "Santa_Isabel" +msgstr "Санта_Изабель" + +msgid "Santarem" +msgstr "Сантарен" + +msgid "Santiago" +msgstr "Сантьяго" + +msgid "Santo_Domingo" +msgstr "Санто-Доминго" + +msgid "Sao_Paulo" +msgstr "Сан-Паулу" + +msgid "Sao_Tome" +msgstr "Сан-Томе" + +msgid "Sarajevo" +msgstr "Сараево" + +msgid "Saratov" +msgstr "Саратов" + +msgid "Saskatchewan" +msgstr "Саскачеван" + +#: source/ubl-settings-datetime.cc:129 +msgid "Save" +msgstr "Сохранить" + +msgid "Save global configuration" +msgstr "Сохранить глобальную конфигурацию" + +msgid "Save local configuration" +msgstr "Сохранить локальную конфигурацию" + +msgid "Save to global and local configuration" +msgstr "Сохранить глобальную и локальную конфигурацию" + +msgid "Scoresbysund" +msgstr "Скорсбисунд" + +msgid "Select the method of hardware time synchronization" +msgstr "Выберите способ синхронизации аппаратного времени" + +msgid "Seoul" +msgstr "Сеул" + +msgid "Setting date and time in global configuration" +msgstr "Настройка даты и времени в глобальной конфигурации" + +#: source/ubl-settings-datetime.cc:139 +msgid "Setting the date and time" +msgstr "Настройка даты и времени" + +msgid "Settings the date and time" +msgstr "Настройки даты и времени" + +msgid "Shanghai" +msgstr "Шанхай" + +msgid "Shiprock" +msgstr "Шипрок" + +msgid "Simferopol" +msgstr "Симферополь" + +msgid "Singapore" +msgstr "Сингапур" + +msgid "Sitka" +msgstr "Ситка" + +msgid "Skopje" +msgstr "Скопье" + +msgid "Sofia" +msgstr "София" + +msgid "South" +msgstr "Саутф" + +msgid "South_Georgia" +msgstr "Южная Грузия" + +msgid "South_Pole" +msgstr "Южный полюс" + +msgid "Srednekolymsk" +msgstr "Среднеколымск" + +msgid "St_Barthelemy" +msgstr "Святой Бартелеми" + +msgid "St_Helena" +msgstr "Сент-Хелина" + +msgid "St_Johns" +msgstr "Сент-Джонс" + +msgid "St_Kitts" +msgstr "Сент-Китс" + +msgid "St_Lucia" +msgstr "Святая Люсия" + +msgid "St_Thomas" +msgstr "Сент-Томас" + +msgid "St_Vincent" +msgstr "Сент-Винсент" + +msgid "Stanley" +msgstr "Стэнли" + +msgid "Stockholm" +msgstr "Стокгольм" + +msgid "Stop the synchronization service" +msgstr "Остановить сервис синхронизации" + +#: source/ubl-settings-datetime.cc:699 +msgid "Successfully saved local and global configuration" +msgstr "Успешно сохранена локальная и глобальная конфигурация" + +msgid "Swift_Current" +msgstr "Суифт-Каррент" + +msgid "Sydney" +msgstr "Сидней" + +#: source/ubl-settings-datetime.cc:145 +msgid "Sync by" +msgstr "Синхронизировать" + +#: source/ubl-settings-datetime.cc:148 +msgid "Synchronize hardware time" +msgstr "Синхронизировать аппаратное время" + +#: source/ubl-settings-datetime.cc:149 +msgid "Synchronize hardware time:" +msgstr "Синхронизировать аппаратное время:" + +#: source/ubl-settings-datetime.cc:133 +msgid "Synchronize via NTP" +msgstr "Синхронизировать через NTP" + +msgid "Syowa" +msgstr "Сёва" + +msgid "Tahiti" +msgstr "Таити" + +msgid "Taipei" +msgstr "Тайбэй" + +msgid "Tallinn" +msgstr "Таллинн" + +msgid "Tarawa" +msgstr "Тарава" + +msgid "Tashkent" +msgstr "Ташкент" + +msgid "Tasmania" +msgstr "Тасмания" + +msgid "Tbilisi" +msgstr "Тбилиси" + +msgid "Tegucigalpa" +msgstr "Тегусигальпа" + +msgid "Tehran" +msgstr "Тегеран" + +msgid "Tel_Aviv" +msgstr "Тель-Авив" + +msgid "Tell_City" +msgstr "Телл-Сити" + +#: source/ubl-settings-datetime.cc:115 +msgid "The program must be run as root" +msgstr "Программа должна быть запущена с правами суперпользователя!" + +msgid "" +"The program must be run with \n" +"superuser privileges!" +msgstr "" +"Программа должна быть запущена с правами \n" +"суперпользователя!" + +msgid "Thimbu" +msgstr "Тимбу" + +msgid "Thimphu" +msgstr "Тхимпху" + +msgid "Thule" +msgstr "Туле" + +msgid "Thunder_Bay" +msgstr "Тандер-Бей" + +msgid "Tijuana" +msgstr "Тихуана" + +msgid "Timbuktu" +msgstr "Тимбукту" + +#: source/ubl-settings-datetime.cc:142 +msgid "Time zone" +msgstr "Часовой пояс" + +#: source/ubl-settings-datetime.cc:140 +msgid "Time:" +msgstr "Время:" + +msgid "Tirane" +msgstr "Тиран" + +msgid "Tiraspol" +msgstr "Тирасполь" + +msgid "Tokyo" +msgstr "Токио" + +msgid "Tomsk" +msgstr "Томск" + +msgid "Tongatapu" +msgstr "Тонгатапу" + +msgid "Toronto" +msgstr "Торонто" + +msgid "Tortola" +msgstr "Тортола" + +msgid "Tripoli" +msgstr "Триполи" + +msgid "Troll" +msgstr "Тролль" + +msgid "Truk" +msgstr "Трук" + +msgid "Tucuman" +msgstr "Тукуман" + +msgid "Tunis" +msgstr "Тунис" + +msgid "US" +msgstr "США" + +#: source/ubl-settings-datetime.cc:150 +msgid "UTC time" +msgstr "Время по UTC" + +msgid "Ujung_Pandang" +msgstr "Уджунг_Панданг" + +msgid "Ulaanbaatar" +msgstr "Улан-Батор" + +msgid "Ulan_Bator" +msgstr "Улан_Батор" + +msgid "Ulyanovsk" +msgstr "Ульяновск" + +msgid "Universal" +msgstr "Юнивёрсал-Сити" + +msgid "Urumqi" +msgstr "Урумчи" + +msgid "Ushuaia" +msgstr "Ушуая" + +msgid "Ust-Nera" +msgstr "Усть-Нера" + +msgid "Uzhgorod" +msgstr "Ужгород" + +msgid "Vaduz" +msgstr "Вадуц" + +msgid "Vancouver" +msgstr "Ванкувер" + +msgid "Vatican" +msgstr "Ватикан" + +msgid "Vevay" +msgstr "Вевей" + +msgid "Victoria" +msgstr "Виктория" + +msgid "Vienna" +msgstr "Вена" + +msgid "Vientiane" +msgstr "Вьентьян" + +msgid "Vilnius" +msgstr "Вильнюс" + +msgid "Vincennes" +msgstr "Венсен" + +msgid "Virgin" +msgstr "Виргин" + +msgid "Vladivostok" +msgstr "Владивосток" + +msgid "Volgograd" +msgstr "Волгоград" + +msgid "Vostok" +msgstr "Восток" + +msgid "Wake" +msgstr "Уэйко" + +msgid "Wallis" +msgstr "Уоллис" + +#: source/ubl-settings-datetime.cc:147 +msgid "Attention" +msgstr "Внимание" + +msgid "Warsaw" +msgstr "Варшава" + +msgid "West" +msgstr "Запад" + +msgid "Whitehorse" +msgstr "Уайтхорс" + +msgid "Winamac" +msgstr "Винамаке" + +msgid "Windhoek" +msgstr "Виндхук" + +msgid "Winnipeg" +msgstr "Виннипег" + +msgid "Yakutat" +msgstr "Якутат" + +msgid "Yakutsk" +msgstr "Якутск" + +msgid "Yancowinna" +msgstr "Янковина" + +msgid "Yangon" +msgstr "Янгон" + +msgid "Yap" +msgstr "Яп" + +msgid "Yekaterinburg" +msgstr "Екатеринбург" + +msgid "Yellowknife" +msgstr "Йеллоунайф" + +msgid "Yerevan" +msgstr "Ереван" + +msgid "Yukon" +msgstr "Юкон" + +msgid "Zagreb" +msgstr "Загреб" + +msgid "Zaporozhye" +msgstr "Запорожье" + +#: source/ubl-settings-datetime.cc:144 +msgid "Zone:" +msgstr "Зона:" + +msgid "Zulu" +msgstr "Зулу" + +msgid "Zurich" +msgstr "Цюрих" + +#: source/ubl-settings-datetime.cc:126 +msgid "https://wiki.ublinux.com" +msgstr "https://wiki.ublinux.ru" + +#: source/ubl-settings-datetime.cc:387 +msgid "" +"https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/" +msgstr "" +"https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/" + +#: source/ubl-settings-datetime.cc:146 +msgid "ubl-settings-datetime" +msgstr "Настройка даты и времени" + +#: source/ubl-settings-datetime.cc:1606 +msgid "ubl-settings-datetime version: " +msgstr "ubl-settings-datetime версия: " + +#: source/ubl-settings-datetime.cc:1377 +msgid "Date and time are successfully synchronized" +msgstr "Дата и время успешно синхронизированы" + +#: source/ubl-settings-datetime.cc:818 +msgid "NTP server name is correct" +msgstr "Имя NTP сервера корректно" + +#: source/ubl-settings-datetime.cc:818 +msgid "Hardware clock successfully synchronized" +msgstr "Аппаратные часы успешно синхронизированы" + +#: source/ubl-settings-datetime.cc:818 +msgid "Hardware clock synchronization error" +msgstr "Ошибка синхронизации аппаратных часов" From 794ed7d7a84292e6a068d11a2522d22abc7ccf7f Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Thu, 23 Mar 2023 16:41:27 +0600 Subject: [PATCH 2/5] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3=20=D1=81=20=D1=81=D0=BE=D1=85?= =?UTF-8?q?=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 93 +++++++++++++++++++++------------ source/ubl-settings-datetime.h | 1 + 2 files changed, 60 insertions(+), 34 deletions(-) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 3ebe980..d261019 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -396,6 +396,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 +408,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,9 +424,9 @@ 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() { @@ -453,9 +455,6 @@ 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; - } } } @@ -485,14 +484,14 @@ 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!")); } @@ -506,17 +505,21 @@ 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", 0) == false || this->check_config("zone", 0) == 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"; @@ -524,6 +527,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"; @@ -532,19 +537,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); @@ -554,25 +560,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; @@ -584,8 +602,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; @@ -612,14 +643,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()) { @@ -1398,7 +1424,6 @@ void MainWindow::update_time_date() { } else { flag_error_time = this->post_entry_data(); - cout << 1111 << endl; year = 0; month = 0; day = 0; diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 93865bb..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 = ""; From 028d5aa60bb0e8aea5bb58767e1177987b9bf625 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Thu, 23 Mar 2023 16:48:32 +0600 Subject: [PATCH 3/5] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3=20=D1=81=20=D0=B7=D0=B0=D0=B3?= =?UTF-8?q?=D1=80=D1=83=D0=B7=D0=BA=D0=BE=D0=B9=20=D0=B3=D0=BB=D0=BE=D0=B1?= =?UTF-8?q?=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B9=20=D0=BA=D0=BE=D0=BD=D1=84?= =?UTF-8?q?=D0=B8=D0=B3=D1=83=D1=80=D0=B0=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index d261019..d77db86 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); @@ -608,9 +609,11 @@ bool MainWindow::check_config(string key, int key_save) { 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]) { + cout << 111 << endl; return false; } if (map_config_data_global[key] != map_config_data_local[key]) { + cout << 222 << endl; return false; } } From e3c2ceda582f4b8107bae7fb4b82608cc8f56034 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Fri, 24 Mar 2023 09:22:17 +0600 Subject: [PATCH 4/5] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B1=D0=B0=D0=B3=20=D1=81=20=D1=81=D0=BE=D1=85=D1=80?= =?UTF-8?q?=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20=D0=B7=D0=BE=D0=BD?= =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index d77db86..398b0b1 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -513,13 +513,14 @@ void MainWindow::save_global_local_cfg() { cmd_zone = "ubconfig --target system set clock ZONE="; this->enter_zone(cmd_zone); } - if ((this->check_config("region", 0) == false || this->check_config("zone", 0) == false)) { + } + 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", 0) == false) { if (flag_local == false) { cmd_default = "ubconfig --target system set network NTPSERVERS=default"; @@ -609,11 +610,9 @@ bool MainWindow::check_config(string key, int key_save) { 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]) { - cout << 111 << endl; return false; } if (map_config_data_global[key] != map_config_data_local[key]) { - cout << 222 << endl; return false; } } From c29f84d485219194d77003a5d78334244afd7d8a Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Fri, 24 Mar 2023 17:52:08 +0600 Subject: [PATCH 5/5] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20?= =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB=20.po~?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + ubl-settings-datetime_ru.po~ | 1938 ---------------------------------- 2 files changed, 1 insertion(+), 1938 deletions(-) delete mode 100644 ubl-settings-datetime_ru.po~ 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/ubl-settings-datetime_ru.po~ b/ubl-settings-datetime_ru.po~ deleted file mode 100644 index 9affefb..0000000 --- a/ubl-settings-datetime_ru.po~ +++ /dev/null @@ -1,1938 +0,0 @@ -# Russian 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: 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: Russian - UBLinux Team \n" -"Language: Russian\n" -"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 -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: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 -msgid ": \"NTP\"" -msgstr "" - -#: 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 -msgid ": \"xdg-open\"" -msgstr "" - -msgid "Abidjan" -msgstr "Абиджан" - -msgid "About" -msgstr "О программе" - -msgid "Accra" -msgstr "Аккра" - -msgid "Acre" -msgstr "Акр" - -msgid "" -"Active service detected\n" -"Automatic time and date synchronization service detected" -msgstr "" -"Обнаружен активный сервис\n" -"автоматической синхронизации времени и даты" - -msgid "Adak" -msgstr "Адак" - -msgid "Addis_Ababa" -msgstr "Аддис-Абеба" - -msgid "Adelaide" -msgstr "Аделаида" - -msgid "Aden" -msgstr "Аден" - -msgid "Africa" -msgstr "Африка" - -msgid "Alaska" -msgstr "Аляска" - -msgid "Aleutian" -msgstr "Алеутский" - -msgid "Algiers" -msgstr "Алжир" - -msgid "Almaty" -msgstr "Алматы" - -msgid "America" -msgstr "Америка" - -msgid "Amman" -msgstr "Амман" - -msgid "Amsterdam" -msgstr "Амстердам" - -#: source/ubl-settings-datetime.cc:817 -msgid "An invalid character is entered" -msgstr "Введён недопустимый символ" - -msgid "Anadyr" -msgstr "Анадырь" - -msgid "Anchorage" -msgstr "Анкоридж" - -msgid "Andorra" -msgstr "Андорра" - -msgid "Anguilla" -msgstr "Ангилья" - -msgid "Antananarivo" -msgstr "Антананариву" - -msgid "Antarctica" -msgstr "Антарктида" - -msgid "Antigua" -msgstr "Антигуа" - -msgid "Apia" -msgstr "Апиа" - -msgid "Aqtau" -msgstr "Актау" - -msgid "Aqtobe" -msgstr "Актобе" - -msgid "Araguaina" -msgstr "Арагуайна" - -msgid "Arctic" -msgstr "Арктика" - -msgid "Argument not recognized\n" -msgstr "Нepacпoзнaнный аргумент\n" - -msgid "Arizona" -msgstr "Аризона" - -msgid "Aruba" -msgstr "Аруба" - -msgid "Ashgabat" -msgstr "Ашхабад" - -msgid "Ashkhabad" -msgstr "Ашхабад" - -msgid "Asia" -msgstr "Азия" - -msgid "Asmara" -msgstr "Асмэра" - -msgid "Asmera" -msgstr "Асмера" - -msgid "Astrakhan" -msgstr "Астрахань" - -msgid "Asuncion" -msgstr "Асунсьон" - -msgid "Athens" -msgstr "Афины" - -msgid "Atikokan" -msgstr "Атикокан" - -msgid "Atka" -msgstr "Атка" - -msgid "Atlantic" -msgstr "Атлантика" - -msgid "Atyrau" -msgstr "Атырау" - -msgid "Auckland" -msgstr "Окленд" - -msgid "Australia" -msgstr "Австралия" - -msgid "Automatic time synchronization" -msgstr "Автоматическая синхронизация времени" - -msgid "Azores" -msgstr "Азорские острова" - -msgid "Baghdad" -msgstr "Багдад" - -msgid "Bahia" -msgstr "Баия" - -msgid "Bahia_Banderas" -msgstr "Баия_Бандерас" - -msgid "Bahrain" -msgstr "Бахрейн" - -msgid "BajaNorte" -msgstr "БахаНорте" - -msgid "BajaSur" -msgstr "Южная Нижняя Калифорния" - -msgid "Baku" -msgstr "Баку" - -msgid "Bamako" -msgstr "Бамако" - -msgid "Bangkok" -msgstr "Бангкок" - -msgid "Bangui" -msgstr "Банги" - -msgid "Banjul" -msgstr "Банжул" - -msgid "Barbados" -msgstr "Барбадос" - -msgid "Barnaul" -msgstr "Барнаул" - -msgid "Beirut" -msgstr "Бейрут" - -msgid "Belem" -msgstr "Белен" - -msgid "Belfast" -msgstr "Белфаст" - -msgid "Belgrade" -msgstr "Белград" - -msgid "Belize" -msgstr "Белиз" - -msgid "Berlin" -msgstr "Берлин" - -msgid "Bermuda" -msgstr "Бермуды" - -msgid "Beulah" -msgstr "Беула" - -msgid "Bishkek" -msgstr "Бишкек" - -msgid "Bissau" -msgstr "Бисау" - -msgid "Blanc-Sablon" -msgstr "Блан-Саблон" - -msgid "Blantyre" -msgstr "Блантайр" - -msgid "Boa_Vista" -msgstr "Боа_Виста" - -msgid "Bogota" -msgstr "Богота" - -msgid "Boise" -msgstr "Бойсе" - -msgid "Bougainville" -msgstr "Бугенвиль" - -msgid "Bratislava" -msgstr "Братислава" - -msgid "Brazil" -msgstr "Бразилия" - -msgid "Brazzaville" -msgstr "Браззавиль" - -msgid "Brisbane" -msgstr "Брисбен" - -msgid "Broken_Hill" -msgstr "Брокен-Хилл" - -msgid "Brunei" -msgstr "Бруней" - -msgid "Brussels" -msgstr "Брюссель" - -msgid "Bucharest" -msgstr "Бухарест" - -msgid "Budapest" -msgstr "Будапешт" - -msgid "Buenos_Aires" -msgstr "Буэнос Айрес" - -msgid "Bujumbura" -msgstr "Бужумбура" - -msgid "Busingen" -msgstr "Бузинген" - -msgid "Cairo" -msgstr "Каир" - -msgid "Calcutta" -msgstr "Калькутта" - -msgid "Cambridge_Bay" -msgstr "Кембридж Бэй" - -msgid "Campo_Grande" -msgstr "Кампо_Гранде" - -msgid "Canada" -msgstr "Канада" - -msgid "Canary" -msgstr "Канари" - -msgid "Canberra" -msgstr "Канберра" - -msgid "Cancun" -msgstr "Канкун" - -msgid "Cape_Vepde" -msgstr "Кабо-Верде" - -msgid "Cape_Verde" -msgstr "Кабо-Верде" - -msgid "Caracas" -msgstr "Каракас" - -msgid "Casablanca" -msgstr "Касабланка" - -msgid "Casey" -msgstr "Кейси" - -msgid "Catamarca" -msgstr "Катамарка" - -msgid "Cayenne" -msgstr "Кайенна" - -msgid "Cayman" -msgstr "Кайман" - -msgid "Center" -msgstr "Центр" - -msgid "Central" -msgstr "Центральный" - -msgid "Ceuta" -msgstr "Сеута" - -msgid "Chagos" -msgstr "Чагос" - -msgid "Change the NTPSERVERS parameter" -msgstr "Изменить параметр NTPSERVERS" - -msgid "Change zone setting" -msgstr "Изменить параметр зоны" - -msgid "Chatham" -msgstr "Чатем" - -msgid "Chicago" -msgstr "Чикаго" - -msgid "Chihuahua" -msgstr "Чихуахуа" - -msgid "Chile" -msgstr "Чили" - -msgid "Chisinau" -msgstr "Кишинев" - -msgid "Chita" -msgstr "Чита" - -msgid "Choibalsan" -msgstr "Чойбалсан" - -msgid "Chongqing" -msgstr "Чунцин" - -msgid "Christmas" -msgstr "Рождество" - -msgid "Chungking" -msgstr "Чунцин" - -msgid "Chuuk" -msgstr "Чуук" - -msgid "Ciudad_Juarez" -msgstr "Сьюдад_Хуарес" - -msgid "Clock" -msgstr "Часы" - -msgid "Close" -msgstr "Закрыть" - -msgid "Cocos" -msgstr "Кокос" - -msgid "Colombo" -msgstr "Коломбо" - -msgid "ComodRivadavia" -msgstr "Комодоро-Ривадавия" - -msgid "Comoro" -msgstr "Коморо" - -msgid "Conakry" -msgstr "Конакри" - -msgid "Continental" -msgstr "Континентальный" - -msgid "Copenhagen" -msgstr "Копенгаген" - -#: source/ubl-settings-datetime.cc:123 -msgid "Copyright © UBSoft LLC, 2022 - " -msgstr "Авторские права © ООО \"Юбисофт\", 2022 - " - -msgid "Coral_Harbour" -msgstr "Корал Харбор" - -msgid "Cordoba" -msgstr "Кордова" - -msgid "Costa_Rica" -msgstr "Коста_Рика" - -msgid "Creston" -msgstr "Крестон" - -msgid "Cuiaba" -msgstr "Куяба" - -msgid "Curacao" -msgstr "Кюрасао" - -#: source/ubl-settings-datetime.cc:138 -msgid "Current date and time" -msgstr "Текущие дата и время" - -msgid "Currie" -msgstr "Карри" - -#: source/ubl-settings-datetime.cc:135 -msgid "DHCP" -msgstr "" - -msgid "Dacca" -msgstr "Дакка" - -msgid "Dakar" -msgstr "Дакар" - -msgid "Damascus" -msgstr "Дамаск" - -msgid "Danmarkshavn" -msgstr "Данмарксхавн" - -msgid "Dar_es_Salaam" -msgstr "Дар-эс-Салам" - -msgid "Darwin" -msgstr "Дарвин" - -#: source/ubl-settings-datetime.cc:125 -msgid "Date and Time" -msgstr "Дата и Время" - -#: source/ubl-settings-datetime.cc:131 -msgid "" -"Date of\n" -"Format: DD.MM.YYYY" -msgstr "" -"Дата\n" -"Формат: ДД.ММ.ГГГГ" - -#: source/ubl-settings-datetime.cc:141 -msgid "Date:" -msgstr "Дата:" - -msgid "Davis" -msgstr "Дэвис" - -msgid "Dawson" -msgstr "Доусон" - -msgid "Dawson_Creek" -msgstr "Доусон Крик" - -msgid "DeNoronha" -msgstr "Фернанду-ди-Норонья" - -#: source/ubl-settings-datetime.cc:134 -msgid "Default" -msgstr "По умолчанию" - -msgid "Denver" -msgstr "Денвер" - -msgid "Detroit" -msgstr "Детройт" - -msgid "Dhaka" -msgstr "Дакка" - -msgid "Dili" -msgstr "Дили" - -#: source/ubl-settings-datetime.cc:137 -msgid "Disabled" -msgstr "Отключено" - -msgid "Djibouti" -msgstr "Джибути" - -msgid "Dominica" -msgstr "Доминика" - -msgid "Douala" -msgstr "Дуала" - -msgid "Dubai" -msgstr "Дубай" - -msgid "Dublin" -msgstr "Дублин" - -msgid "DumontDUrville" -msgstr "Дюмон-д-Юрвиль" - -msgid "Dushanbe" -msgstr "Душанбе" - -msgid "ERROR" -msgstr "ОШИБКА" - -msgid "East" -msgstr "Восток" - -msgid "East-Indiana" -msgstr "Восточная Индиана" - -msgid "Easter" -msgstr "Пасха" - -msgid "EasterIsland" -msgstr "Остров Пасхи" - -msgid "Easterlsland" -msgstr "Остров Пасхи" - -msgid "Eastern" -msgstr "Восточный" - -msgid "Edmonton" -msgstr "Эдмонтон" - -msgid "Efate" -msgstr "Эфате" - -msgid "Eirunepe" -msgstr "Эйрунепе" - -msgid "El_Aaiun" -msgstr "Эль_Аайун" - -msgid "El_Salvador" -msgstr "Сальвадор" - -msgid "Enderbury" -msgstr "Эндербери" - -msgid "Ensenada" -msgstr "Энсенада" - -#: source/ubl-settings-datetime.cc:791 source/ubl-settings-datetime.cc:1054 -msgid "Enter a list of NTP servers" -msgstr "Введите перечень NTP серверов" - -#: 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 "" -"Введите имя ntp-сервера или его ip-адрес.\n" -"При вводе нескольких адресов, разделяйте их запятыми." - -#: source/ubl-settings-datetime.cc:821 -msgid "Error in the NTP server name" -msgstr "Ошибка в имени NTP сервера" - -#: source/ubl-settings-datetime.cc:678 -msgid "Error saved local and global configuration" -msgstr "Ошибка сохранения локальной и глобальной конфигурации" - -msgid "Eucla" -msgstr "Евкла" - -msgid "Europe" -msgstr "Европа" - -msgid "Faeroe" -msgstr "Фарерские острова" - -msgid "Fakaofo" -msgstr "Факаофо" - -msgid "Famagusta" -msgstr "Фамагуста" - -msgid "Faroe" -msgstr "Фарерские острова" - -msgid "Fiji" -msgstr "Фиджи" - -msgid "Fort_Nelson" -msgstr "Форт Нельсон" - -msgid "Fort_Wayne" -msgstr "Форт_Уэйн" - -msgid "Fortaleza" -msgstr "Форталеза" - -msgid "Freetown" -msgstr "Фритаун" - -msgid "Funafuti" -msgstr "Фунафути" - -msgid "GMT-1" -msgstr "ГМТ-1" - -msgid "GMT-3" -msgstr "ГМТ-3" - -msgid "" -"GTK settings datetime for UBLinux\n" -"\n" -"Usage: ubl-settings-datetime [OPTIONS...]\n" -"Options:\n" -" -h, --help\t Show this help\n" -" -V, --version\t Show package version\n" -" --lock-datetime Lock date and time changes\n" -" --lock-timezone Lock time zone changes\n" -" --lock-ntp-mode Lock NTP mode selection\n" -" --lock-ntp-edit Lock editing NTP servers\n" -" --lock-sync-hwclock Lock sync hwclock mode selection\n" -" --lock-save Lock saving local and global configuration\n" -" --lock-save-local Lock save global configuration\n" -" --lock-save-global Lock load global configuration\n" -" --lock-load-global Lock load global configuration\n" -msgstr "" -"GTK-утилита настройки даты и времени для UBLinux\n" -"\n" -"Использование: ubl-settings-datetime [Параметры приложения...]\n" -"Параметры приложения:\n" -" -h, --help\t Показать параметры справки\n" -" -V, --version\t Показать версию пакета\n" -" --lock-datetime Блокировка изменения даты и времени\n" -" --lock-timezone Блокировка изменения часового пояса\n" -" --lock-ntp-mode Блокировка выбора режима NTP\n" -" --lock-ntp-edit Блокировка перечня NTP серверов\n" -" --lock-sync-hwclock Блокировка выбора режима синхронизации аппаратного " -"времени\n" -" --lock-save Блокировка сохранения локальной и глобальной " -"конфигурации\n" -" --lock-save-local Блокировка сохранения локальной конфигурации\n" -" --lock-save-global Блокировка сохранения глобальной конфигурации\n" -" --lock-load-global Блокировка загрузки глобальной конфигурации\n" - -msgid "Gaborone" -msgstr "Габороне" - -msgid "Galapagos" -msgstr "Галапагос" - -msgid "Gambier" -msgstr "Гамбье" - -msgid "Gaza" -msgstr "Газа" - -msgid "General" -msgstr "Генерал-Сантос" - -msgid "Gibraltar" -msgstr "Гибралтар" - -msgid "Glace_Bay" -msgstr "Глейс-Бей" - -#: source/ubl-settings-datetime.cc:690 -msgid "Global configuration downloaded successfully" -msgstr "Успешно загружена глобальная конфигурация" - -#: source/ubl-settings-datetime.cc:666 -msgid "Global configuration read error" -msgstr "Ошибка чтения глобальной конфигурации" - -#: source/ubl-settings-datetime.cc:696 -msgid "Global configuration successfully written" -msgstr "Успешно записана глобальная конфигурация" - -#: source/ubl-settings-datetime.cc:674 -msgid "Global configuration write error" -msgstr "Ошибка записи глобальной конфигурации" - -msgid "Global customization" -msgstr "Глобальная настройка" - -msgid "Godthab" -msgstr "Годтаб" - -msgid "Goose_Bay" -msgstr "Гуз-Бей" - -msgid "Grand_Turk" -msgstr "Гранд_Турк" - -msgid "Greenwich" -msgstr "Гринвич" - -msgid "Grenada" -msgstr "Гренада" - -msgid "Guadalcanal" -msgstr "Гуадалканал" - -msgid "Guadeloupe" -msgstr "Гваделупа" - -msgid "Guam" -msgstr "Гуам" - -msgid "Guatemala" -msgstr "Гватемала" - -msgid "Guayaquil" -msgstr "Гуаякиль" - -msgid "Guernsey" -msgstr "Гернси" - -msgid "Guyana" -msgstr "Гайана" - -msgid "Halifax" -msgstr "Галифакс" - -msgid "Harare" -msgstr "Хараре" - -msgid "Harbin" -msgstr "Харбин" - -msgid "Havana" -msgstr "Гавана" - -msgid "Hawaii" -msgstr "Гавайи" - -msgid "Hebron" -msgstr "Хеврон" - -msgid "Help" -msgstr "Справка" - -msgid "Helsinki" -msgstr "Хельсинки" - -msgid "Hermosillo" -msgstr "Эрмосильо" - -msgid "Ho_Chi_Minh" -msgstr "Хо_Чи_Мин" - -msgid "Hobart" -msgstr "Хобарт" - -msgid "Hong_Kong" -msgstr "Гонконг" - -msgid "Honolulu" -msgstr "Гонолулу" - -msgid "Hovd" -msgstr "Ховд" - -#: source/ubl-settings-datetime.cc:1402 source/ubl-settings-datetime.cc:1407 -msgid "Incorrect date format" -msgstr "Не верный формат даты" - -msgid "Indian" -msgstr "Индиана" - -msgid "Indiana" -msgstr "Индианан" - -msgid "Indiana-Starke" -msgstr "Индиана-Старке" - -msgid "Indianapolis" -msgstr "Индианаполис" - -msgid "Interactive date picker" -msgstr "Интерактивный выбор даты" - -msgid "Inuvik" -msgstr "Инувик" - -msgid "Iqaluit" -msgstr "Икалуит" - -msgid "Irkutsk" -msgstr "Иркутск" - -msgid "Isle_of_Man" -msgstr "Остров Мэн" - -msgid "Istanbul" -msgstr "Стамбул" - -msgid "Jakarta" -msgstr "Джакарта" - -msgid "Jamaica" -msgstr "Ямайка" - -msgid "Jan_Mayen" -msgstr "Ян_Майен" - -msgid "Jayapura" -msgstr "Джаяпура" - -msgid "Jersey" -msgstr "Джерси" - -msgid "Jerusalem" -msgstr "Иерусалим" - -msgid "Johannesburg" -msgstr "Йоханнесбург" - -msgid "Johnston" -msgstr "Джонстон" - -msgid "Juba" -msgstr "Джуба" - -msgid "Jujuy" -msgstr "Жужуй" - -msgid "Juneau" -msgstr "Джуно" - -msgid "Kabul" -msgstr "Кабул" - -msgid "Kaliningrad" -msgstr "Калининград" - -msgid "Kamchatka" -msgstr "Камчатка" - -msgid "Kampala" -msgstr "Кампала" - -msgid "Kanton" -msgstr "Кантон" - -msgid "Karachi" -msgstr "Карачи" - -msgid "Kashgar" -msgstr "Кашгар" - -msgid "Kathmandu" -msgstr "Катманду" - -msgid "Katmandu" -msgstr "Катманду" - -msgid "Kerguelen" -msgstr "Кергелен" - -msgid "Khandyga" -msgstr "Хандыга" - -msgid "Khartoum" -msgstr "Хартум" - -msgid "Kiev" -msgstr "Киев" - -msgid "Kigali" -msgstr "Кигали" - -msgid "Kinshasa" -msgstr "Киншаса" - -msgid "Kiritimati" -msgstr "Киритимати" - -msgid "Kirov" -msgstr "Киров" - -msgid "Knox" -msgstr "Ноксвилл" - -msgid "Knox_IN" -msgstr "Нокс_IN" - -msgid "Kolkata" -msgstr "Калькутта" - -msgid "Kralendijk" -msgstr "Кралендейк" - -msgid "Krasnoyarsk" -msgstr "Красноярск" - -msgid "Kuala_Lumpur" -msgstr "Куала-Лумпур" - -msgid "Kuching" -msgstr "Кучинг" - -msgid "Kuwait" -msgstr "Кувейт" - -msgid "Kwajalein" -msgstr "Кваджалейн" - -msgid "Kyiv" -msgstr "Киев" - -msgid "LHI" -msgstr "Лхи" - -msgid "La_Paz" -msgstr "Ла_Пас" - -msgid "La_Rioja" -msgstr "Риоха" - -msgid "Lagos" -msgstr "Лагос" - -msgid "Libreville" -msgstr "Либревиль" - -msgid "Lima" -msgstr "Лима" - -msgid "Lindeman" -msgstr "Линдеман" - -msgid "Lisbon" -msgstr "Лиссабон" - -msgid "Ljubljana" -msgstr "Любляна" - -#: source/ubl-settings-datetime.cc:130 -msgid "Load" -msgstr "Загрузить" - -msgid "Load global configuration" -msgstr "Загрузить глобальную конфигурацию" - -msgid "Load local configuration" -msgstr "Загрузить локальную конфигурацию" - -#: source/ubl-settings-datetime.cc:687 -msgid "Local configuration downloaded successfully" -msgstr "Успешно загружена локальная конфигурация" - -#: source/ubl-settings-datetime.cc:662 -msgid "Local configuration reading error" -msgstr "Ошибка чтения локальной конфигурации" - -#: source/ubl-settings-datetime.cc:693 -msgid "Local configuration successfully written" -msgstr "Успешно записана локальная конфигурация" - -#: source/ubl-settings-datetime.cc:670 -msgid "Local configuration write error" -msgstr "Ошибка записи локальной конфигурации" - -#: source/ubl-settings-datetime.cc:151 -msgid "Local time" -msgstr "Локальное время" - -msgid "Lome" -msgstr "Ломе" - -msgid "London" -msgstr "Лондон" - -msgid "Longyearbyen" -msgstr "Лонгйир" - -msgid "Lord_Howe" -msgstr "Лорд_Хау" - -msgid "Los_Angeles" -msgstr "Лос-Анджелес" - -msgid "Louisville" -msgstr "Луисвилл" - -msgid "Lower_Princes" -msgstr "Лоуэр-Принс-Куотер" - -msgid "Luanda" -msgstr "Луанда" - -msgid "Lubumbashi" -msgstr "Лубумбаши" - -msgid "Lusaka" -msgstr "Лусака" - -msgid "Luxembourg" -msgstr "Люксембург" - -msgid "Macao" -msgstr "Макао" - -msgid "Macau" -msgstr "Макао" - -msgid "Maceio" -msgstr "Масейо" - -msgid "Macquarie" -msgstr "Маккуори" - -msgid "Madeira" -msgstr "Мадейра" - -msgid "Madrid" -msgstr "Мадрид" - -msgid "Magadan" -msgstr "Магадан" - -msgid "Mahe" -msgstr "Маэ" - -msgid "Majuro" -msgstr "Маджуро" - -msgid "Makassar" -msgstr "Макассар" - -msgid "Malabo" -msgstr "Малабо" - -msgid "Maldives" -msgstr "Мальдивы" - -msgid "Malta" -msgstr "Мальта" - -msgid "Managua" -msgstr "Манагуа" - -msgid "Manaus" -msgstr "Манаус" - -msgid "Manila" -msgstr "Манила" - -#: source/ubl-settings-datetime.cc:136 -msgid "Manual" -msgstr "Вручную" - -msgid "Maputo" -msgstr "Мапуту" - -msgid "Marengo" -msgstr "Маренго" - -msgid "Mariehamn" -msgstr "Мариехамн" - -msgid "Marigot" -msgstr "Мариго" - -msgid "Marquesas" -msgstr "Маркизские острова" - -msgid "Martinique" -msgstr "Мартиника" - -msgid "Maseru" -msgstr "Масеру" - -msgid "Matamoros" -msgstr "Матаморос" - -msgid "Mauritius" -msgstr "Маврикий" - -msgid "Mawson" -msgstr "Моусон" - -msgid "Mayotte" -msgstr "Майотта" - -msgid "Mazatlan" -msgstr "Масатлан" - -msgid "Mbabane" -msgstr "Мбабане" - -msgid "McMurdo" -msgstr "МакМердо" - -msgid "Melbourne" -msgstr "Мельбурн" - -msgid "Mendoza" -msgstr "Мендоса" - -msgid "Menominee" -msgstr "Меномини" - -msgid "Merida" -msgstr "Мерида" - -msgid "Metlakatla" -msgstr "Метлакатла" - -msgid "Mexico" -msgstr "Мексика" - -msgid "Mexico_City" -msgstr "Мехико" - -msgid "Michigan" -msgstr "Мичиган" - -msgid "Midway" -msgstr "Мидуэй" - -msgid "Minsk" -msgstr "Минск" - -msgid "Minutes" -msgstr "Минуты" - -msgid "Miquelon" -msgstr "Микелон" - -msgid "Mogadishu" -msgstr "Могадишо" - -msgid "Monaco" -msgstr "Монако" - -msgid "Moncton" -msgstr "Монктон" - -msgid "Monrovia" -msgstr "Монровия" - -msgid "Monterrey" -msgstr "Монтеррей" - -msgid "Montevideo" -msgstr "Монтевидео" - -msgid "Monticello" -msgstr "Монтиселло" - -msgid "Montreal" -msgstr "Монреаль" - -msgid "Montserrat" -msgstr "Монтсеррат" - -msgid "Moscow" -msgstr "Москва" - -msgid "Mountain" -msgstr "Маунтин-Вью" - -msgid "Muscat" -msgstr "Мускат" - -msgid "NSW" -msgstr "Новый Южный Уэльс" - -msgid "Nairobi" -msgstr "Найроби" - -msgid "Nassau" -msgstr "Нассау" - -msgid "Nauru" -msgstr "Науру" - -msgid "Ndjamena" -msgstr "Нджамена" - -msgid "New_Salem" -msgstr "Нью-Салем" - -msgid "New_York" -msgstr "Нью-Йорк" - -msgid "Newfoundland" -msgstr "Ньюфаундленд" - -msgid "Niamey" -msgstr "Ниамей" - -msgid "Nicosia" -msgstr "Никосия" - -msgid "Nipigon" -msgstr "Нипигон" - -msgid "Niue" -msgstr "Ниуэ" - -msgid "Nome" -msgstr "Ном" - -msgid "Norfolk" -msgstr "Норфолк" - -msgid "Noronha" -msgstr "Норонья" - -msgid "North" -msgstr "Север" - -msgid "North_Dokota" -msgstr "Северная Докота" - -#: source/ubl-settings-datetime.cc:433 source/ubl-settings-datetime.cc:464 -#: source/ubl-settings-datetime.cc:494 -msgid "Nothing to save!" -msgstr "Нечего сохранять!" - -msgid "Nouakchott" -msgstr "Нуакшот" - -msgid "Noumea" -msgstr "Нумеа" - -msgid "Novokuznetsk" -msgstr "Новокузнецк" - -msgid "Novosibirsk" -msgstr "Новосибирск" - -msgid "Nuuk" -msgstr "Нуук" - -msgid "OK" -msgstr "OK" - -msgid "Ojinaga" -msgstr "Охинага" - -msgid "Omsk" -msgstr "Омск" - -msgid "Oral" -msgstr "Уральск" - -msgid "Oslo" -msgstr "Осло" - -msgid "Ouagadougou" -msgstr "Уагадугу" - -msgid "Pacific" -msgstr "Тихий океан" - -msgid "Pago_Pago" -msgstr "Паго_Паго" - -msgid "Palau" -msgstr "Палау" - -msgid "Palmer" -msgstr "Палмер" - -msgid "Panama" -msgstr "Панама" - -msgid "Pangnirtung" -msgstr "Пангниртунг" - -msgid "Paramaribo" -msgstr "Парамарибо" - -msgid "Paris" -msgstr "Париж" - -msgid "Perth" -msgstr "Перт" - -msgid "Petersburg" -msgstr "Петербург" - -msgid "Phnom_Penh" -msgstr "Пномпень" - -msgid "Phoenix" -msgstr "Феникс" - -msgid "Pitcairn" -msgstr "Питкэрн" - -msgid "Podgorica" -msgstr "Подгорица" - -msgid "Pohnpei" -msgstr "Понпеи" - -msgid "Ponape" -msgstr "Понапе" - -msgid "Pontianak" -msgstr "Понтианак" - -msgid "Port-au-Prince" -msgstr "Порт-о-Пренс" - -msgid "Port_Moresby" -msgstr "Порт_Морсби" - -msgid "Port_of_Spain" -msgstr "Порт-оф-Спейн" - -msgid "Porto-Novo" -msgstr "Порто-Ново" - -msgid "Porto_Acre" -msgstr "Порту_Акр" - -msgid "Porto_Velho" -msgstr "Порту-Велью" - -msgid "Prague" -msgstr "Прага" - -#: source/ubl-settings-datetime.cc:128 -msgid "Project Home Page" -msgstr "Домашняя страница проекта" - -msgid "Puerto_Rico" -msgstr "Пуэрто-Рико" - -msgid "Punta_Arenas" -msgstr "Пунта_Аренас" - -msgid "Pyongyang" -msgstr "Пхеньян" - -msgid "Qatar" -msgstr "Катар" - -msgid "Qostanay" -msgstr "Костанай" - -msgid "Queensland" -msgstr "Квинсленд" - -msgid "Qyzylorda" -msgstr "Кызылорда" - -msgid "Rainy_River" -msgstr "Рейни-Ривер" - -msgid "Rangoon" -msgstr "Рангун" - -msgid "Rankin_Inlet" -msgstr "Ранкин-Инлет" - -msgid "Rarotonga" -msgstr "Раротонга" - -msgid "Recife" -msgstr "Ресифи" - -msgid "Regina" -msgstr "Реджайна" - -#: source/ubl-settings-datetime.cc:143 -msgid "Region:" -msgstr "Регион:" - -msgid "Resolute" -msgstr "Резольют" - -msgid "Reunion" -msgstr "Воссоединение" - -msgid "Reykjavik" -msgstr "Рейкьявик" - -msgid "Riga" -msgstr "Рига" - -msgid "Rio_Branco" -msgstr "Рио_Бранко" - -msgid "Rio_Gallegos" -msgstr "Рио-Гальегос" - -msgid "Riyadh" -msgstr "Эр-Рияд" - -msgid "Rome" -msgstr "Рим" - -msgid "Rosario" -msgstr "Росарио" - -msgid "Rothera" -msgstr "Ротера" - -msgid "Saigon" -msgstr "Сайгон" - -msgid "Saipan" -msgstr "Сайпан" - -msgid "Sakhalin" -msgstr "Сахалин" - -msgid "Salta" -msgstr "Сальта" - -msgid "Samara" -msgstr "Самара" - -msgid "Samarkand" -msgstr "Самарканд" - -msgid "Samoa" -msgstr "Самоа" - -msgid "San_Juan" -msgstr "Сан-Хуан" - -msgid "San_Luis" -msgstr "Сан-Луис" - -msgid "San_Marino" -msgstr "Сан Марино" - -msgid "Santa_Isabel" -msgstr "Санта_Изабель" - -msgid "Santarem" -msgstr "Сантарен" - -msgid "Santiago" -msgstr "Сантьяго" - -msgid "Santo_Domingo" -msgstr "Санто-Доминго" - -msgid "Sao_Paulo" -msgstr "Сан-Паулу" - -msgid "Sao_Tome" -msgstr "Сан-Томе" - -msgid "Sarajevo" -msgstr "Сараево" - -msgid "Saratov" -msgstr "Саратов" - -msgid "Saskatchewan" -msgstr "Саскачеван" - -#: source/ubl-settings-datetime.cc:129 -msgid "Save" -msgstr "Сохранить" - -msgid "Save global configuration" -msgstr "Сохранить глобальную конфигурацию" - -msgid "Save local configuration" -msgstr "Сохранить локальную конфигурацию" - -msgid "Save to global and local configuration" -msgstr "Сохранить глобальную и локальную конфигурацию" - -msgid "Scoresbysund" -msgstr "Скорсбисунд" - -msgid "Select the method of hardware time synchronization" -msgstr "Выберите способ синхронизации аппаратного времени" - -msgid "Seoul" -msgstr "Сеул" - -msgid "Setting date and time in global configuration" -msgstr "Настройка даты и времени в глобальной конфигурации" - -#: source/ubl-settings-datetime.cc:139 -msgid "Setting the date and time" -msgstr "Настройка даты и времени" - -msgid "Settings the date and time" -msgstr "Настройки даты и времени" - -msgid "Shanghai" -msgstr "Шанхай" - -msgid "Shiprock" -msgstr "Шипрок" - -msgid "Simferopol" -msgstr "Симферополь" - -msgid "Singapore" -msgstr "Сингапур" - -msgid "Sitka" -msgstr "Ситка" - -msgid "Skopje" -msgstr "Скопье" - -msgid "Sofia" -msgstr "София" - -msgid "South" -msgstr "Саутф" - -msgid "South_Georgia" -msgstr "Южная Грузия" - -msgid "South_Pole" -msgstr "Южный полюс" - -msgid "Srednekolymsk" -msgstr "Среднеколымск" - -msgid "St_Barthelemy" -msgstr "Святой Бартелеми" - -msgid "St_Helena" -msgstr "Сент-Хелина" - -msgid "St_Johns" -msgstr "Сент-Джонс" - -msgid "St_Kitts" -msgstr "Сент-Китс" - -msgid "St_Lucia" -msgstr "Святая Люсия" - -msgid "St_Thomas" -msgstr "Сент-Томас" - -msgid "St_Vincent" -msgstr "Сент-Винсент" - -msgid "Stanley" -msgstr "Стэнли" - -msgid "Stockholm" -msgstr "Стокгольм" - -msgid "Stop the synchronization service" -msgstr "Остановить сервис синхронизации" - -#: source/ubl-settings-datetime.cc:699 -msgid "Successfully saved local and global configuration" -msgstr "Успешно сохранена локальная и глобальная конфигурация" - -msgid "Swift_Current" -msgstr "Суифт-Каррент" - -msgid "Sydney" -msgstr "Сидней" - -#: source/ubl-settings-datetime.cc:145 -msgid "Sync by" -msgstr "Синхронизировать" - -#: source/ubl-settings-datetime.cc:148 -msgid "Synchronize hardware time" -msgstr "Синхронизировать аппаратное время" - -#: source/ubl-settings-datetime.cc:149 -msgid "Synchronize hardware time:" -msgstr "Синхронизировать аппаратное время:" - -#: source/ubl-settings-datetime.cc:133 -msgid "Synchronize via NTP" -msgstr "Синхронизировать через NTP" - -msgid "Syowa" -msgstr "Сёва" - -msgid "Tahiti" -msgstr "Таити" - -msgid "Taipei" -msgstr "Тайбэй" - -msgid "Tallinn" -msgstr "Таллинн" - -msgid "Tarawa" -msgstr "Тарава" - -msgid "Tashkent" -msgstr "Ташкент" - -msgid "Tasmania" -msgstr "Тасмания" - -msgid "Tbilisi" -msgstr "Тбилиси" - -msgid "Tegucigalpa" -msgstr "Тегусигальпа" - -msgid "Tehran" -msgstr "Тегеран" - -msgid "Tel_Aviv" -msgstr "Тель-Авив" - -msgid "Tell_City" -msgstr "Телл-Сити" - -#: source/ubl-settings-datetime.cc:115 -msgid "The program must be run as root" -msgstr "Программа должна быть запущена с правами суперпользователя!" - -msgid "" -"The program must be run with \n" -"superuser privileges!" -msgstr "" -"Программа должна быть запущена с правами \n" -"суперпользователя!" - -msgid "Thimbu" -msgstr "Тимбу" - -msgid "Thimphu" -msgstr "Тхимпху" - -msgid "Thule" -msgstr "Туле" - -msgid "Thunder_Bay" -msgstr "Тандер-Бей" - -msgid "Tijuana" -msgstr "Тихуана" - -msgid "Timbuktu" -msgstr "Тимбукту" - -#: source/ubl-settings-datetime.cc:142 -msgid "Time zone" -msgstr "Часовой пояс" - -#: source/ubl-settings-datetime.cc:140 -msgid "Time:" -msgstr "Время:" - -msgid "Tirane" -msgstr "Тиран" - -msgid "Tiraspol" -msgstr "Тирасполь" - -msgid "Tokyo" -msgstr "Токио" - -msgid "Tomsk" -msgstr "Томск" - -msgid "Tongatapu" -msgstr "Тонгатапу" - -msgid "Toronto" -msgstr "Торонто" - -msgid "Tortola" -msgstr "Тортола" - -msgid "Tripoli" -msgstr "Триполи" - -msgid "Troll" -msgstr "Тролль" - -msgid "Truk" -msgstr "Трук" - -msgid "Tucuman" -msgstr "Тукуман" - -msgid "Tunis" -msgstr "Тунис" - -msgid "US" -msgstr "США" - -#: source/ubl-settings-datetime.cc:150 -msgid "UTC time" -msgstr "Время по UTC" - -msgid "Ujung_Pandang" -msgstr "Уджунг_Панданг" - -msgid "Ulaanbaatar" -msgstr "Улан-Батор" - -msgid "Ulan_Bator" -msgstr "Улан_Батор" - -msgid "Ulyanovsk" -msgstr "Ульяновск" - -msgid "Universal" -msgstr "Юнивёрсал-Сити" - -msgid "Urumqi" -msgstr "Урумчи" - -msgid "Ushuaia" -msgstr "Ушуая" - -msgid "Ust-Nera" -msgstr "Усть-Нера" - -msgid "Uzhgorod" -msgstr "Ужгород" - -msgid "Vaduz" -msgstr "Вадуц" - -msgid "Vancouver" -msgstr "Ванкувер" - -msgid "Vatican" -msgstr "Ватикан" - -msgid "Vevay" -msgstr "Вевей" - -msgid "Victoria" -msgstr "Виктория" - -msgid "Vienna" -msgstr "Вена" - -msgid "Vientiane" -msgstr "Вьентьян" - -msgid "Vilnius" -msgstr "Вильнюс" - -msgid "Vincennes" -msgstr "Венсен" - -msgid "Virgin" -msgstr "Виргин" - -msgid "Vladivostok" -msgstr "Владивосток" - -msgid "Volgograd" -msgstr "Волгоград" - -msgid "Vostok" -msgstr "Восток" - -msgid "Wake" -msgstr "Уэйко" - -msgid "Wallis" -msgstr "Уоллис" - -#: source/ubl-settings-datetime.cc:147 -msgid "Attention" -msgstr "Внимание" - -msgid "Warsaw" -msgstr "Варшава" - -msgid "West" -msgstr "Запад" - -msgid "Whitehorse" -msgstr "Уайтхорс" - -msgid "Winamac" -msgstr "Винамаке" - -msgid "Windhoek" -msgstr "Виндхук" - -msgid "Winnipeg" -msgstr "Виннипег" - -msgid "Yakutat" -msgstr "Якутат" - -msgid "Yakutsk" -msgstr "Якутск" - -msgid "Yancowinna" -msgstr "Янковина" - -msgid "Yangon" -msgstr "Янгон" - -msgid "Yap" -msgstr "Яп" - -msgid "Yekaterinburg" -msgstr "Екатеринбург" - -msgid "Yellowknife" -msgstr "Йеллоунайф" - -msgid "Yerevan" -msgstr "Ереван" - -msgid "Yukon" -msgstr "Юкон" - -msgid "Zagreb" -msgstr "Загреб" - -msgid "Zaporozhye" -msgstr "Запорожье" - -#: source/ubl-settings-datetime.cc:144 -msgid "Zone:" -msgstr "Зона:" - -msgid "Zulu" -msgstr "Зулу" - -msgid "Zurich" -msgstr "Цюрих" - -#: source/ubl-settings-datetime.cc:126 -msgid "https://wiki.ublinux.com" -msgstr "https://wiki.ublinux.ru" - -#: source/ubl-settings-datetime.cc:387 -msgid "" -"https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/" -msgstr "" -"https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/" - -#: source/ubl-settings-datetime.cc:146 -msgid "ubl-settings-datetime" -msgstr "Настройка даты и времени" - -#: source/ubl-settings-datetime.cc:1606 -msgid "ubl-settings-datetime version: " -msgstr "ubl-settings-datetime версия: " - -#: source/ubl-settings-datetime.cc:1377 -msgid "Date and time are successfully synchronized" -msgstr "Дата и время успешно синхронизированы" - -#: source/ubl-settings-datetime.cc:818 -msgid "NTP server name is correct" -msgstr "Имя NTP сервера корректно" - -#: source/ubl-settings-datetime.cc:818 -msgid "Hardware clock successfully synchronized" -msgstr "Аппаратные часы успешно синхронизированы" - -#: source/ubl-settings-datetime.cc:818 -msgid "Hardware clock synchronization error" -msgstr "Ошибка синхронизации аппаратных часов"