From 828773a7654f52ca398c679af166358f65fa5096 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Fri, 17 Mar 2023 17:55:59 +0600 Subject: [PATCH 01/24] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20README?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 000c257..0864937 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Options: --lock-datetime Locking date and time changes --lock-timezone Locking time zone change --lock-ntp-mode Locking the NTP mode selection - --lock-ntp-edit Blocking the list of NTP servers + --lock-ntp-edit Lock editing NTP servers --lock-save Locking of local and global configuration saving --lock-save-local Locking the local configuration save --lock-save-global Locking the global configuration save -- 2.35.1 From b716574663c4ae813c5021b416f61d8dfa634ac0 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 20 Mar 2023 09:36:15 +0600 Subject: [PATCH 02/24] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20--help?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 23 +++++++++--------- ubl-settings-datetime_ru.po | 42 +++++++++++++++++---------------- 2 files changed, 34 insertions(+), 31 deletions(-) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index f212379..59611b0 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -17,7 +17,7 @@ bool flag_save_global = false; bool flag_load_global = false; int socket_ext_id_I = 0; int socket_trd_id_I = 0; -string version_application = "1.4"; +string version_application = "1.5"; CmdArgParser::CmdArgParser(const std::string& p_name, const std::string& p_description, const std::string& p_help) : Glib::OptionGroup{p_name, p_description, p_help} { @@ -1340,16 +1340,17 @@ void help() { help = "GTK settings datetime for UBLinux\n\n" "Usage: ubl-settings-datetime [OPTIONS...]\n" "Options:\n" - " -h, --help Show this help\n" - " -V, --version Show package version\n" - " --lock-datetime Lock date and time changes\n" - " --lock-timezone Lock time zone changes\n" - " --lock-ntp-mode Lock NTP mode selection\n" - " --lock-ntp-edit Lock editing NTP servers\n" - " --lock-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"; + " -h, --help Show this help\n" + " -V, --version Show package version\n" + " --lock-datetime Lock date and time changes\n" + " --lock-timezone Lock time zone changes\n" + " --lock-ntp-mode Lock NTP mode selection\n" + " --lock-ntp-edit Lock editing NTP servers\n" + " --lock-sync-hwclock Lock sync hwclock mode selection\n" + " --lock-save Lock saving local and global configuration\n" + " --lock-save-local Lock save global configuration\n" + " --lock-save-global Lock load global configuration\n" + " --lock-load-global Lock load global configuration\n"; cout << gettext(help.c_str()); } diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index 6488c96..3b7347b 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -1796,30 +1796,32 @@ msgid "" "GTK settings datetime for UBLinux\n\n" "Usage: ubl-settings-datetime [OPTIONS...]\n" "Options:\n" -" -h, --help Show this help\n" -" -V, --version Show package version\n" -" --lock-datetime Lock date and time changes\n" -" --lock-timezone Lock time zone changes\n" -" --lock-ntp-mode Lock NTP mode selection\n" -" --lock-ntp-edit Lock editing NTP servers\n" -" --lock-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" +" -h, --help Show this help\n" +" -V, --version Show package version\n" +" --lock-datetime Lock date and time changes\n" +" --lock-timezone Lock time zone changes\n" +" --lock-ntp-mode Lock NTP mode selection\n" +" --lock-ntp-edit Lock editing NTP servers\n" +" --lock-sync-hwclock Lock sync hwclock mode selection\n" +" --lock-save Lock saving local and global configuration\n" +" --lock-save-local Lock save global configuration\n" +" --lock-save-global Lock load global configuration\n" +" --lock-load-global Lock load global configuration\n" msgstr "" "GTK-утилита настройки даты и времени для UBLinux\n\n" "Использование: ubl-settings-datetime [Параметры приложения...]\n" "Параметры приложения:\n" -" -h, --help Показать параметры справки\n" -" -V, --version Показать версию пакета\n" -" --lock-datetime Блокировка изменения даты и времени\n" -" --lock-timezone Блокировка изменения часового пояса\n" -" --lock-ntp-mode Блокировка выбора режима NTP\n" -" --lock-ntp-edit Блокировка перечня NTP серверов\n" -" --lock-save Блокировка сохранения локальной и глобальной конфигурации\n" -" --lock-save-local Блокировка сохранения локальной конфигурации\n" -" --lock-save-global Блокировка сохранения глобальной конфигурации\n" -" --lock-load-global Блокировка загрузки глобальной конфигурации\n" +" -h, --help Показать параметры справки\n" +" -V, --version Показать версию пакета\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 "ubl-settings-datetime version: " msgstr "ubl-settings-datetime версия: " -- 2.35.1 From 56487ad0f0cc03f10f40cf5c4c80af5239590a4d Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 20 Mar 2023 09:41:25 +0600 Subject: [PATCH 03/24] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=B1=D0=BB=D0=BE=D0=BA=D0=B8=D1=80=D0=BE=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=B0=20=D1=80=D0=B5?= =?UTF-8?q?=D0=B6=D0=B8=D0=BC=D0=B0=20=D1=81=D0=B8=D0=BD=D1=85=D1=80=D0=BE?= =?UTF-8?q?=D0=BD=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B0=D0=BF=D0=BF?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=82=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=B2=D1=80?= =?UTF-8?q?=D0=B5=D0=BC=D0=B5=D0=BD=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/main.cc | 3 +++ source/ubl-settings-datetime.cc | 5 +++++ source/ubl-settings-datetime.h | 1 + 3 files changed, 9 insertions(+) diff --git a/source/main.cc b/source/main.cc index 05180f4..d7dbecd 100644 --- a/source/main.cc +++ b/source/main.cc @@ -100,6 +100,9 @@ void pars_flag(int index_start, int argc, char* argv[]){ else if (str_argv == "--lock-load-global"){ flag_load_global = true; } + else if (str_argv == "--lock-sync-hwclock"){ + flag_sync_hwclock = true; + } else{ if (index_start == 1){ g_print(gettext("Argument not recognized\n")); diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 59611b0..afc890c 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -15,6 +15,7 @@ bool flag_save = false; bool flag_save_local = false; bool flag_save_global = false; bool flag_load_global = false; +bool flag_sync_hwclock = false; int socket_ext_id_I = 0; int socket_trd_id_I = 0; string version_application = "1.5"; @@ -182,6 +183,10 @@ void MainWindow::flag_block_gui() { lblTime->set_sensitive(false); lblData->set_sensitive(false); } + if (flag_sync_hwclock == true) { + lblHW->set_sensitive(false); + cbHw->set_sensitive(false); + } if (flag_timezone == true) { cbRegion->set_sensitive(false); cbZone->set_sensitive(false); diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 7fa3d20..44b5838 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -34,6 +34,7 @@ extern bool flag_save; extern bool flag_save_local; extern bool flag_save_global; extern bool flag_load_global; +extern bool flag_sync_hwclock; extern int socket_ext_id_I; extern int socket_trd_id_I; extern string version_application; -- 2.35.1 From bf8a8bef6c86cd28abddb92bc7329d20705252c7 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 20 Mar 2023 13:56:59 +0600 Subject: [PATCH 04/24] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3=20=D1=81=20css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- style.css | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/style.css b/style.css index dcfb5c4..d8c59cf 100644 --- a/style.css +++ b/style.css @@ -38,12 +38,21 @@ padding: 3px 10px 5px 5px; } .menuitemtop:hover { background:@theme_bg_color; +border-color:inherit; +border-left-width:inherit; +border-right-width:inherit; } .menuitemmiddle:hover { background:@theme_bg_color; +border-color:inherit; +border-left-width:inherit; +border-right-width:inherit; } .menuitembottom:hover { background:@theme_bg_color; +border-color:inherit; +border-left-width:inherit; +border-right-width:inherit; } .menuitemtop:hover* { -- 2.35.1 From 213aa1ccc1650fc9c684531f019133e9de196d5d Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 20 Mar 2023 16:19:15 +0600 Subject: [PATCH 05/24] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D1=83=20=D0=B8=D0=B7?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D0=B4=20=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 71 ++++++++++ source/ubl-settings-datetime.cc | 221 +++++++++++++++++++++++++++----- source/ubl-settings-datetime.h | 7 + ubl-settings-datetime_ru.po | 3 + 4 files changed, 269 insertions(+), 33 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..ba3a677 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,71 @@ +{ + "files.associations": { + "array": "cpp", + "atomic": "cpp", + "hash_map": "cpp", + "bit": "cpp", + "*.tcc": "cpp", + "bitset": "cpp", + "cctype": "cpp", + "chrono": "cpp", + "clocale": "cpp", + "cmath": "cpp", + "codecvt": "cpp", + "compare": "cpp", + "concepts": "cpp", + "condition_variable": "cpp", + "cstdarg": "cpp", + "cstddef": "cpp", + "cstdint": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "cwchar": "cpp", + "cwctype": "cpp", + "deque": "cpp", + "list": "cpp", + "map": "cpp", + "set": "cpp", + "string": "cpp", + "unordered_map": "cpp", + "unordered_set": "cpp", + "vector": "cpp", + "exception": "cpp", + "algorithm": "cpp", + "functional": "cpp", + "iterator": "cpp", + "memory": "cpp", + "memory_resource": "cpp", + "numeric": "cpp", + "optional": "cpp", + "random": "cpp", + "ratio": "cpp", + "string_view": "cpp", + "system_error": "cpp", + "tuple": "cpp", + "type_traits": "cpp", + "utility": "cpp", + "fstream": "cpp", + "initializer_list": "cpp", + "iomanip": "cpp", + "iosfwd": "cpp", + "iostream": "cpp", + "istream": "cpp", + "limits": "cpp", + "mutex": "cpp", + "new": "cpp", + "numbers": "cpp", + "ostream": "cpp", + "semaphore": "cpp", + "sstream": "cpp", + "stdexcept": "cpp", + "stop_token": "cpp", + "streambuf": "cpp", + "thread": "cpp", + "cinttypes": "cpp", + "typeinfo": "cpp", + "valarray": "cpp", + "variant": "cpp" + } +} \ No newline at end of file diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index afc890c..75df98e 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -331,6 +331,45 @@ void MainWindow::event() { btnSaveLocalGlob->signal_activate().connect([&]() {save_global_local_cfg();}); btnSaveLocal->signal_activate().connect([&]() {save_local_cfg();}); btnSaveGlob->signal_activate().connect([&]() {save_global_cfg();}); + cbZone->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::event_zone)); + cbHw->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::event_log_hw)); +} + +void MainWindow::event_log_hw() { + string str_hw = cbHw->get_active_text(); + if (str_hw.length() > 0) { + int size_hw = sizeof(array_hw)/sizeof(array_hw[0]); + for (int i = 0; i < size_hw; i++) { + if (str_hw == array_hw_local[i]) { + this->write_config(map_config_data, array_hw[i], "hw"); + } + } + } +} + +void MainWindow::event_zone() { + int activ_index_reg = cbRegion->get_active_row_number(); + if (activ_index_reg == -1) { + this->write_config(map_config_data, "error", "zone"); + return; + } + string reg_text = array_region[activ_index_reg]; + int activ_index = cbZone->get_active_row_number(); + if (activ_index == -1) { + this->write_config(map_config_data, "error", "zone"); + return; + } + string zone_text = ""; + if(!(reg_text.empty())) { + int index= 0; + for (const auto &zone: time_reg_map.at(reg_text)) { + if (index == activ_index) { + zone_text = zone; + } + index+= 1; + } + } + this->write_config(map_config_data, zone_text, "zone"); } void MainWindow::synopsis_show() { @@ -343,8 +382,9 @@ void MainWindow::synopsis_show() { } void MainWindow::load_local_cfg() { - string cmd = "ubconfig --default --source system get clock ZONE"; - this->fill_in_reg_zone(cmd); + flag_load = false; + string cmd_zone = "ubconfig --default --source system get clock ZONE"; + this->fill_in_reg_zone(cmd_zone); this->update_hour_minute(); this->update_calendar(); string cmd_get_dhcp = "ubconfig --default --source system get network NTPSERVERS"; @@ -352,11 +392,13 @@ void MainWindow::load_local_cfg() { this->entry_dhcp_mess(cmd_get_dhcp, cmd_default_get_dhcp); string hw = "ubconfig --default --source system get clock HWCLOCK_SYNC"; this->get_hardware_clock(hw); - flag_load = false; info_warning_error(0); + map_config_data_old = map_config_data; } void MainWindow::load_globl_cfg() { + flag_load = true; + string cmd_get_dhcp = "ubconfig --default --source global get network NTPSERVERS"; string cmd_default_get_dhcp = "ubconfig --source default get [] NTPSERVERS_DEFAULT"; this->entry_dhcp_mess(cmd_get_dhcp, cmd_default_get_dhcp); @@ -364,36 +406,134 @@ void MainWindow::load_globl_cfg() { this->fill_in_reg_zone(cmd_zone); string hw = "ubconfig --source global get clock HWCLOCK_SYNC"; this->get_hardware_clock(hw); - flag_load = true; info_warning_error(1); + map_config_data_old = map_config_data; } void MainWindow::save_local_cfg() { string cmd_zone = "ubconfig --target system set clock ZONE="; - this->enter_zone(cmd_zone); string cmd_default = "ubconfig --target system set network NTPSERVERS=default"; string cmd_dhcp = "ubconfig --target system set network NTPSERVERS=dhcp"; string cmd_set_ntp = "ubconfig --target system set network NTPSERVERS=\""; string remove_ntp = "ubconfig --target system remove network NTPSERVERS"; - this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); string local = "ubconfig --target system set clock HWCLOCK_SYNC=localtime"; string hw = "ubconfig --target system set clock HWCLOCK_SYNC=utc"; - this->set_hardware_clock(local, hw); + if (this->check_config("region") == false || this->check_config("zone") == false) { + this->enter_zone(cmd_zone); + } + if (this->check_config("dhcp") == false) { + this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); + } + if (this->check_config("hw") == false) { + this->set_hardware_clock(local, hw); + } info_warning_error(2); + map_config_data_old = map_config_data; + if (this->check_config("region") || this->check_config("zone") || + this->check_config("dhcp") || this->check_config("hw")){ + lblWarning->set_text(_("Nothing to save!")); + } } void MainWindow::save_global_cfg() { string cmd = "ubconfig --target global set clock ZONE="; - this->enter_zone(cmd); string cmd_default = "ubconfig --target global set network NTPSERVERS=default"; string cmd_dhcp = "ubconfig --target global set network NTPSERVERS=dhcp"; string cmd_set_ntp = "ubconfig --target global set network NTPSERVERS=\""; string remove_ntp = "ubconfig --target global remove network NTPSERVERS"; - this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); string local = "ubconfig --target global set clock HWCLOCK_SYNC=localtime"; string hw = "ubconfig --target global set clock HWCLOCK_SYNC=utc"; - this->set_hardware_clock(local, hw); + if (this->check_config("region") == false || this->check_config("zone") == false) { + this->enter_zone(cmd); + } + if (this->check_config("dhcp") == false) { + this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); + } + if (this->check_config("hw") == false) { + this->set_hardware_clock(local, hw); + } info_warning_error(3); + map_config_data_old = map_config_data; + if (this->check_config("region") || this->check_config("zone") || + this->check_config("dhcp") || this->check_config("hw")){ + lblWarning->set_text(_("Nothing to save!")); + } +} +void MainWindow::save_global_local_cfg() { + string cmd = ""; + string cmd_default = ""; + string cmd_dhcp = ""; + string cmd_set_ntp = ""; + string remove = ""; + string local = ""; + string hw = ""; + string remove_ntp = ""; + string cmd_zone = ""; + if (this->check_config("region") == false || this->check_config("zone") == false) { + cmd_zone = "ubconfig --target system set clock ZONE="; + this->enter_zone(cmd_zone); + cmd_zone = "ubconfig --target global set clock ZONE="; + this->enter_zone(cmd_zone); + } + if (this->check_config("dhcp") == false) { + cmd_default = "ubconfig --target system set network NTPSERVERS=default"; + cmd_dhcp = "ubconfig --target system set network NTPSERVERS=dhcp"; + cmd_set_ntp = "ubconfig --target system set network NTPSERVERS=\""; + remove_ntp = "ubconfig --target system remove network NTPSERVERS"; + this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); + cmd_default = "ubconfig --target global set network NTPSERVERS=default"; + cmd_dhcp = "ubconfig --target global set network NTPSERVERS=dhcp"; + cmd_set_ntp = "ubconfig --target global set network NTPSERVERS=\""; + remove_ntp = "ubconfig --target global remove network NTPSERVERS"; + this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); + } + if (this->check_config("hw") == 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); + 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_old = map_config_data; + info_warning_error(4); + if (this->check_config("region") || this->check_config("zone") || + this->check_config("dhcp") || this->check_config("hw")){ + lblWarning->set_text(_("Nothing to save!")); + } +} + +void MainWindow::write_config(std::map &map_config, string data, string key) { + cout << data << " " << key << endl; + map_config[key] = data; +} + +bool MainWindow::check_config(string key) { + std::map :: iterator iter_map_config_data; + std::map :: iterator iter_map_config_data_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()) { + cout << 1 << endl; + return false; + } + else if (iter_map_config_data_old == map_config_data_old.end()) { + cout << 2 << endl; + return false; + } + else if (iter_map_config_data->second != iter_map_config_data_old->second) { + return false; + } + else if (iter_map_config_data->second.length() == 0 || iter_map_config_data_old->second.length() == 0) { + return false; + } + else if (iter_map_config_data->second == iter_map_config_data_old->second) { + return true; + } + else { + return false; + } + return false; } string MainWindow::get_ubconfig_value(string &cmd){ @@ -410,21 +550,6 @@ string MainWindow::get_ubconfig_value(string &cmd){ } -void MainWindow::save_global_local_cfg() { - string cmd = ""; - string cmd_default = ""; - string cmd_dhcp = ""; - string cmd_set_ntp = ""; - string remove = ""; - if (flag_save_global == false) { - this->save_local_cfg(); - } - if (flag_save_local == false) { - this->save_global_cfg(); - } - info_warning_error(4); -} - void MainWindow::info_warning_error(int mess) { if (error_info > 0 || warning_info > 0) { info_status_app("boxInfoMessError"); @@ -505,7 +630,7 @@ void MainWindow::set_hardware_clock(string &local, string &etc) { string str_hw = cbHw->get_active_text(); for (int index = 0; index < 2; index++) { if (array_hw_local[index] == str_hw){ - if (array_hw[index] == "utc"){ + if (array_hw[index] == "utc") { wrapper_system(etc, "&"); } else{ @@ -519,6 +644,7 @@ void MainWindow::get_hardware_clock(string &cmd) { int error = warning_info; struct Result obj_result = this->wrapper_call(cmd); if (obj_result.error == 0) { + this->write_config(map_config_data, obj_result.response, "hw"); if (obj_result.response.find("localtime") != string::npos) { if (array_hw[0] == "localtime"){ cbHw->set_active(0); @@ -541,6 +667,7 @@ void MainWindow::get_hardware_clock(string &cmd) { } } else { + this->write_config(map_config_data, "", "hw"); cbHw->set_active(-1); } if (error != warning_info){ @@ -582,6 +709,7 @@ bool MainWindow::focus_ntp(string &cmd_set_ntp) { } if ((flag_error == false) && (flag_error_check_ntp == false)) { cmd = cmd_set_ntp + str_ntp + "\""; + this->write_config(map_config_data, str_ntp, "dhcp"); wrapper_system(cmd, "&"); } else { @@ -711,15 +839,18 @@ void MainWindow::event_entry_cbDhcp() { int activ_index = cbDhcp->get_active_row_number(); if (str_dhcp.length() == 0) { cbDhcp->set_active(0); + this->write_config(map_config_data, "default", "dhcp"); } else if (activ_index == 0) { txtNtpServer->set_text(default_get_dhcp); txtNtpServer->set_sensitive(false); + this->write_config(map_config_data, "default", "dhcp"); } else if (activ_index == 1) { // btnUpdateDateTime->set_sensitive(false); txtNtpServer->set_sensitive(false); txtNtpServer->set_text(""); + this->write_config(map_config_data, "dhcp", "dhcp"); } else if (activ_index == 2) { txtNtpServer->set_text(""); @@ -735,11 +866,15 @@ void MainWindow::event_entry_cbDhcp() { if (response != "dhcp" && response != "default"){ txtNtpServer->set_text(response); } - + this->write_config(map_config_data, response, "dhcp"); txtNtpServer->set_sensitive(true); } + else { + this->write_config(map_config_data, "", "dhcp"); + } } else if (activ_index == 3) { + this->write_config(map_config_data, "", "dhcp"); txtNtpServer->set_text(""); txtNtpServer->set_sensitive(false); // btnUpdateDateTime->set_sensitive(true); @@ -752,12 +887,15 @@ void MainWindow::save_Dhcp(string &cmd_default, string &cmd_dhcp, string &remove if (str_dhcp.length() == 0) { } else if (activ_index == 0) { + this->write_config(map_config_data, "default", "dhcp"); wrapper_system(cmd_default, "&"); } else if (activ_index == 1) { + this->write_config(map_config_data, "dhcp", "dhcp"); wrapper_system(cmd_dhcp, "&"); } else if (activ_index == 2) { + this->focus_ntp(cmd_set_ntp); } else if (activ_index== 3) { @@ -766,18 +904,20 @@ void MainWindow::save_Dhcp(string &cmd_default, string &cmd_dhcp, string &remove if (start_error != error_info) { error_info=start_error; } + this->write_config(map_config_data, "", "dhcp"); } } void MainWindow::entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhcp) { string cmd = cmd_get_dhcp; struct Result obj_result = this->wrapper_call(cmd); - if (obj_result.error== 0) { + if (obj_result.error == 0) { string str_dhcp = obj_result.response; // btnUpdateDateTime->set_sensitive(false); - str_dhcp = str_dhcp.substr(str_dhcp.find("=")+1,str_dhcp.length()); - str_dhcp = str_dhcp.substr(0,str_dhcp.find("\n")); + str_dhcp = str_dhcp.substr(str_dhcp.find("=")+1, str_dhcp.length()); + str_dhcp = str_dhcp.substr(0, str_dhcp.find("\n")); if (str_dhcp == "dhcp") { + this->write_config(map_config_data, "dhcp", "dhcp"); cbDhcp->set_active(1); txtNtpServer->set_text(""); txtNtpServer->set_sensitive(false); @@ -787,6 +927,7 @@ void MainWindow::entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhc cbDhcp->set_active(0); cmd = cmd_default_get_dhcp; struct Result obj_result = this->wrapper_call(cmd); + this->write_config(map_config_data, "default", "dhcp"); txtNtpServer->set_sensitive(false); if (obj_result.error== 0) { txtNtpServer->set_text(obj_result.response); @@ -800,15 +941,18 @@ void MainWindow::entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhc else { // btnUpdateDateTime->set_sensitive(false); if (str_dhcp == "") { + this->write_config(map_config_data, "", "dhcp"); lblMessage->set_text(_("Enter DHCP!")); windowMessDchp->show(); } else if (str_dhcp == "(null)") { cbDhcp->set_active(0); txtNtpServer->set_text(""); + this->write_config(map_config_data, "", "dhcp"); } else { cbDhcp->set_active(2); + this->write_config(map_config_data, str_dhcp, "dhcp"); txtNtpServer->set_text(str_dhcp); if (flag_ntp_edit ==false) { txtNtpServer->set_sensitive(true); @@ -817,6 +961,7 @@ void MainWindow::entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhc } } else { + this->write_config(map_config_data, "", "dhcp"); cbDhcp->set_active(3); txtNtpServer->set_text(""); txtNtpServer->set_sensitive(false); @@ -924,20 +1069,26 @@ array MainWindow::split_region_zone(string &read_reg_zon_cfg) { void MainWindow::enter_zone(string &cmd) { int activ_index_reg = cbRegion->get_active_row_number(); + if (activ_index_reg == -1) { + return; + } string reg_text = array_region[activ_index_reg]; int activ_index = cbZone->get_active_row_number(); + if (activ_index == -1) { + return; + } string zone_text = ""; if(!(reg_text.empty())) { int index= 0; for (const auto &zone: time_reg_map.at(reg_text)) { if (index == activ_index) { - zone_text=zone; + zone_text = zone; } index+= 1; } if (!(zone_text.empty())) { - str_zone=zone_text; - str_region=reg_text; + str_zone = zone_text; + str_region = reg_text; cmd = cmd + str_region + "/" + str_zone; wrapper_system(cmd, "&"); } @@ -962,6 +1113,8 @@ void MainWindow::parse_text_date() { } void MainWindow::append_region_zone(string region, string zone, Gtk::ComboBoxText *tmpCbReg, Gtk::ComboBoxText *tmpCbZone) { + this->write_config(map_config_data, region, "region"); + this->write_config(map_config_data, zone, "zone"); str_region = region; int index = 0; Glib::ustring reg_local = ""; @@ -1060,11 +1213,13 @@ string MainWindow::call(string cmd) { } void MainWindow::append_zone() { + cbZone->remove_all(); int index = cbRegion->get_active_row_number(); if (index!=-1) { string str_region = array_region[index]; string zone_mixing = ""; + this->write_config(map_config_data, str_region, "region"); string path_dir = ""; if(str_region.length() != 0) { for (const auto &_str_zone : time_reg_map_local.at(str_region)) { diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 44b5838..3fa8d31 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -135,6 +135,9 @@ class MainWindow : public Gtk::ApplicationWindow { vector array_region_local; vector array_region; std::map map_error; + std::map map_config_data; + std::map map_config_data_old; + public: MainWindow(BaseObjectType* obj, Glib::RefPtr const& builder); @@ -149,6 +152,10 @@ class MainWindow : public Gtk::ApplicationWindow { void fill_in_reg_zone(string &cmd); void load_globl_cfg(); void save_local_cfg(); + void event_zone(); + bool check_config(string key); + void event_log_hw(); + void write_config(std::map &map_config, string data, string key); string get_ubconfig_value(string &cmd); void save_global_cfg(); void save_Dhcp(string &cmd_default, string &cmd_dhcp, string &remove, string &cmd_set_ntp); diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index 3b7347b..3898417 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -22,6 +22,9 @@ msgstr "https://wiki.ublinux.ru/ru/Программное_обеспечение msgid "Copyright © UBSoft LLC, 2022 - " msgstr "Авторские права © ООО \"Юбисофт\", 2022 - " +msgid "Nothing to save!" +msgstr "Нечего сохранять!" + msgid "Select the method of hardware time synchronization" msgstr "Выберите способ синхронизации аппаратного времени" -- 2.35.1 From dd6cf57b855c9d0a48b6615f6402ac0dc9f7babf Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 20 Mar 2023 16:22:04 +0600 Subject: [PATCH 06/24] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=B1=D0=B0=D0=B3=20=D1=81=20=D0=B1=D0=BB=D0=BE?= =?UTF-8?q?=D0=BA=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=BE=D0=B9=20=D0=BA=D0=BD?= =?UTF-8?q?=D0=BE=D0=BF=D0=BA=D0=B8=20about?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 75df98e..9312b51 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -89,6 +89,7 @@ void MainWindow::settings() { month = 0; day = 0; this->lacalization(); + btnBoxAboutDialog->set_visible(false); if (geteuid() == 0) { numTimeHrs->set_range(0, 23); numTimeMin->set_range(0, 59); @@ -96,7 +97,6 @@ void MainWindow::settings() { numTimeMin->set_increments(1.0, 1.0); this->get_config(); this->flag_block_gui(); - btnBoxAboutDialog->set_visible(false); this->event(); this->parse_text_date(); this->load_local_cfg(); -- 2.35.1 From ad05770f5fc281a8db54dbbbe4ae9382fe931100 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Mon, 20 Mar 2023 16:41:47 +0600 Subject: [PATCH 07/24] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20pot=20=D1=84=D0=B0=D0=B9=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-datetime.pot | 1807 +++++++++++++++++++++++++++++++++++++ 1 file changed, 1807 insertions(+) create mode 100644 ubl-settings-datetime.pot diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot new file mode 100644 index 0000000..f3fd696 --- /dev/null +++ b/ubl-settings-datetime.pot @@ -0,0 +1,1807 @@ +# Russian translations for PACKAGE package. +# Copyright (C) 2023 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Automatically generated, 2023. +# + +msgid "" +msgstr "" + +msgid "https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/" +msgstr "" + +msgid "Copyright © UBSoft LLC, 2022 - " +msgstr "" + +msgid "Nothing to save!" +msgstr "" + +msgid "Select the method of hardware time synchronization" +msgstr "" + +msgid "https://wiki.ublinux.com" +msgstr "" + +msgid "Local time" +msgstr "" + +msgid "UTC time" +msgstr "" + +msgid "Synchronize hardware time:" +msgstr "" + +msgid "An invalid character is entered" +msgstr "" + +msgid "Longyearbyen" +msgstr "" + +msgid "Error in the ntp name" +msgstr "" + +msgid "Stop the synchronization service" +msgstr "" + +msgid "Close" +msgstr "" + +msgid "Active service detected\nAutomatic time and date synchronization service detected" +msgstr "" + +msgid "Default" +msgstr "" + +msgid "The program must be run with \nsuperuser privileges!" +msgstr "" + +msgid "The program must be run as root" +msgstr "" + +msgid "Manual" +msgstr "" + +msgid "Enter DHCP!" +msgstr "" + +msgid "OK" +msgstr "" + +msgid "Setting the date and time" +msgstr "" + +msgid "Successfully saved local and global configuration" +msgstr "" + +msgid "Error saved local and global configuration" +msgstr "" + +msgid "Settings the date and time" +msgstr "" + +msgid "Current date and time" +msgstr "" + +msgid "Global customization" +msgstr "" + +msgid "Change the NTPSERVERS parameter" +msgstr "" + +msgid "ubl-settings-datetime" +msgstr "" + +msgid "Time:" +msgstr "" + +msgid "Clock" +msgstr "" + +msgid ":" +msgstr "" + +msgid "Minutes" +msgstr "" + +msgid "Date:" +msgstr "" + +msgid "Date of\nFormat: DD.MM.YYYY" +msgstr "" + +msgid "Interactive date picker" +msgstr "" + +msgid "Change zone setting" +msgstr "" + +msgid "Region:" +msgstr "" + +msgid "Zone:" +msgstr "" + +msgid "Sync by" +msgstr "" + +msgid "Automatic time synchronization" +msgstr "" + +msgid "Synchronize via NTP" +msgstr "" + +msgid "Time zone" +msgstr "" + +msgid "Setting date and time in global configuration" +msgstr "" + +msgid "Incorrect date format" +msgstr "" + +msgid "Synchronize hardware time" +msgstr "" + +msgid "Warning!" +msgstr "" + +msgid "ERROR" +msgstr "" + +msgid "America" +msgstr "" + +msgid "Brazil" +msgstr "" + +msgid "Aruba" +msgstr "" + +msgid "Asia" +msgstr "" + +msgid "Mexico_City" +msgstr "" + +msgid "Antarctica" +msgstr "" + +msgid "Dubai" +msgstr "" + +msgid "Antigua" +msgstr "" + +msgid "Lima" +msgstr "" + +msgid "Manaus" +msgstr "" + +msgid "Africa" +msgstr "" + +msgid "Chicago" +msgstr "" + +msgid "Punta_Arenas" +msgstr "" + +msgid "Europe" +msgstr "" + +msgid "Djibouti" +msgstr "" + +msgid "Pyongyang" +msgstr "" + +msgid "Australia" +msgstr "" + +msgid "Mazatlan" +msgstr "" + +msgid "Macau" +msgstr "" + +msgid "Denver" +msgstr "" + +msgid "Yakutat" +msgstr "" + +msgid "Currie" +msgstr "" + +msgid "Dar_es_Salaam" +msgstr "" + +msgid "Thunder_Bay" +msgstr "" + +msgid "Los_Angeles" +msgstr "" + +msgid "Nome" +msgstr "" + +msgid "Colombo" +msgstr "" + +msgid "Nairobi" +msgstr "" + +msgid "Prague" +msgstr "" + +msgid "Metlakatla" +msgstr "" + +msgid "Vostok" +msgstr "" + +msgid "Blanc-Sablon" +msgstr "" + +msgid "Port_Moresby" +msgstr "" + +msgid "US" +msgstr "" + +msgid "Ouagadougou" +msgstr "" + +msgid "Tashkent" +msgstr "" + +msgid "Maputo" +msgstr "" + +msgid "Qatar" +msgstr "" + +msgid "Chita" +msgstr "" + +msgid "Caracas" +msgstr "" + +msgid "Central" +msgstr "" + +msgid "Chatham" +msgstr "" + +msgid "Brussels" +msgstr "" + +msgid "Zaporozhye" +msgstr "" + +msgid "Cambridge_Bay" +msgstr "" + +msgid "Guayaquil" +msgstr "" + +msgid "Coral_Harbour" +msgstr "" + +msgid "Kigali" +msgstr "" + +msgid "Zagreb" +msgstr "" + +msgid "Maseru" +msgstr "" + +msgid "Belgrade" +msgstr "" + +msgid "Goose_Bay" +msgstr "" + +msgid "Monterrey" +msgstr "" + +msgid "Luxembourg" +msgstr "" + +msgid "Cayman" +msgstr "" + +msgid "Alaska" +msgstr "" + +msgid "Skopje" +msgstr "" + +msgid "St_Kitts" +msgstr "" + +msgid "Kampala" +msgstr "" + +msgid "Rankin_Inlet" +msgstr "" + +msgid "Kolkata" +msgstr "" + +msgid "Canada" +msgstr "" + +msgid "Dominica" +msgstr "" + +msgid "Bucharest" +msgstr "" + +msgid "Zurich" +msgstr "" + +msgid "Queensland" +msgstr "" + +msgid "Atikokan" +msgstr "" + +msgid "Mbabane" +msgstr "" + +msgid "Kathmandu" +msgstr "" + +msgid "Indian" +msgstr "" + +msgid "Khandyga" +msgstr "" + +msgid "Guernsey" +msgstr "" + +msgid "Yerevan" +msgstr "" + +msgid "Buenos_Aires" +msgstr "" + +msgid "Tunis" +msgstr "" + +msgid "Easter" +msgstr "" + +msgid "Matamoros" +msgstr "" + +msgid "East-Indiana" +msgstr "" + +msgid "Singapore" +msgstr "" + +msgid "Atlantic" +msgstr "" + +msgid "Canary" +msgstr "" + +msgid "Fort_Nelson" +msgstr "" + +msgid "Recife" +msgstr "" + +msgid "Malta" +msgstr "" + +msgid "Eucla" +msgstr "" + +msgid "Azores" +msgstr "" + +msgid "Santiago" +msgstr "" + +msgid "Aden" +msgstr "" + +msgid "Merida" +msgstr "" + +msgid "Baku" +msgstr "" + +msgid "Belem" +msgstr "" + +msgid "Ceuta" +msgstr "" + +msgid "San_Marino" +msgstr "" + +msgid "Barnaul" +msgstr "" + +msgid "Damascus" +msgstr "" + +msgid "Fakaofo" +msgstr "" + +msgid "Dawson" +msgstr "" + +msgid "Irkutsk" +msgstr "" + +msgid "Anguilla" +msgstr "" + +msgid "Tijuana" +msgstr "" + +msgid "Warsaw" +msgstr "" + +msgid "Adak" +msgstr "" + +msgid "London" +msgstr "" + +msgid "Jayapura" +msgstr "" + +msgid "St_Vincent" +msgstr "" + +msgid "Darwin" +msgstr "" + +msgid "Cayenne" +msgstr "" + +msgid "St_Johns" +msgstr "" + +msgid "Khartoum" +msgstr "" + +msgid "Rainy_River" +msgstr "" + +msgid "Samara" +msgstr "" + +msgid "Vienna" +msgstr "" + +msgid "Ndjamena" +msgstr "" + +msgid "Vladivostok" +msgstr "" + +msgid "Saratov" +msgstr "" + +msgid "Nuuk" +msgstr "" + +msgid "Chongqing" +msgstr "" + +msgid "North" +msgstr "" + +msgid "Atka" +msgstr "" + +msgid "Swift_Current" +msgstr "" + +msgid "Bangkok" +msgstr "" + +msgid "Blantyre" +msgstr "" + +msgid "Algiers" +msgstr "" + +msgid "Freetown" +msgstr "" + +msgid "GMT-1" +msgstr "" + +msgid "Detroit" +msgstr "" + +msgid "Johannesburg" +msgstr "" + +msgid "Shanghai" +msgstr "" + +msgid "Novokuznetsk" +msgstr "" + +msgid "Dawson_Creek" +msgstr "" + +msgid "Srednekolymsk" +msgstr "" + +msgid "Grenada" +msgstr "" + +msgid "Samoa" +msgstr "" + +msgid "Rarotonga" +msgstr "" + +msgid "Broken_Hill" +msgstr "" + +msgid "Winnipeg" +msgstr "" + +msgid "Tripoli" +msgstr "" + +msgid "Perth" +msgstr "" + +msgid "Comoro" +msgstr "" + +msgid "Tarawa" +msgstr "" + +msgid "DeNoronha" +msgstr "" + +msgid "Rio_Branco" +msgstr "" + +msgid "St_Helena" +msgstr "" + +msgid "Famagusta" +msgstr "" + +msgid "Noronha" +msgstr "" + +msgid "Rangoon" +msgstr "" + +msgid "Hermosillo" +msgstr "" + +msgid "Bahia" +msgstr "" + +msgid "Tortola" +msgstr "" + +msgid "Sao_Paulo" +msgstr "" + +msgid "Dakar" +msgstr "" + +msgid "Jan_Mayen" +msgstr "" + +msgid "Acre" +msgstr "" + +msgid "Choibalsan" +msgstr "" + +msgid "Sitka" +msgstr "" + +msgid "Arizona" +msgstr "" + +msgid "Jersey" +msgstr "" + +msgid "Juneau" +msgstr "" + +msgid "Brisbane" +msgstr "" + +msgid "Rome" +msgstr "" + +msgid "Troll" +msgstr "" + +msgid "Ashkhabad" +msgstr "" + +msgid "Guatemala" +msgstr "" + +msgid "Dublin" +msgstr "" + +msgid "Barbados" +msgstr "" + +msgid "Conakry" +msgstr "" + +msgid "Montserrat" +msgstr "" + +msgid "Sarajevo" +msgstr "" + +msgid "Abidjan" +msgstr "" + +msgid "Scoresbysund" +msgstr "" + +msgid "Cancun" +msgstr "" + +msgid "Pohnpei" +msgstr "" + +msgid "Pacific" +msgstr "" + +msgid "Chungking" +msgstr "" + +msgid "Greenwich" +msgstr "" + +msgid "Anchorage" +msgstr "" + +msgid "Chihuahua" +msgstr "" + +msgid "Porto-Novo" +msgstr "" + +msgid "Boise" +msgstr "" + +msgid "Chile" +msgstr "" + +msgid "Bratislava" +msgstr "" + +msgid "Bahrain" +msgstr "" + +msgid "Athens" +msgstr "" + +msgid "Ulaanbaatar" +msgstr "" + +msgid "Maceio" +msgstr "" + +msgid "Mawson" +msgstr "" + +msgid "Newfoundland" +msgstr "" + +msgid "Tiraspol" +msgstr "" + +msgid "Aqtau" +msgstr "" + +msgid "Bujumbura" +msgstr "" + +msgid "Saskatchewan" +msgstr "" + +msgid "Norfolk" +msgstr "" + +msgid "Pontianak" +msgstr "" + +msgid "Panama" +msgstr "" + +msgid "Kuala_Lumpur" +msgstr "" + +msgid "Ashgabat" +msgstr "" + +msgid "Whitehorse" +msgstr "" + +msgid "Busingen" +msgstr "" + +msgid "Lower_Princes" +msgstr "" + +msgid "Niamey" +msgstr "" + +msgid "El_Aaiun" +msgstr "" + +msgid "Ulyanovsk" +msgstr "" + +msgid "Minsk" +msgstr "" + +msgid "Asmara" +msgstr "" + +msgid "Taipei" +msgstr "" + +msgid "Danmarkshavn" +msgstr "" + +msgid "Casey" +msgstr "" + +msgid "Tbilisi" +msgstr "" + +msgid "Beirut" +msgstr "" + +msgid "Stockholm" +msgstr "" + +msgid "Santa_Isabel" +msgstr "" + +msgid "Ho_Chi_Minh" +msgstr "" + +msgid "Funafuti" +msgstr "" + +msgid "Lubumbashi" +msgstr "" + +msgid "Tahiti" +msgstr "" + +msgid "Toronto" +msgstr "" + +msgid "Hebron" +msgstr "" + +msgid "Lisbon" +msgstr "" + +msgid "Mogadishu" +msgstr "" + +msgid "Edmonton" +msgstr "" + +msgid "Chisinau" +msgstr "" + +msgid "Grand_Turk" +msgstr "" + +msgid "Antananarivo" +msgstr "" + +msgid "Dushanbe" +msgstr "" + +msgid "McMurdo" +msgstr "" + +msgid "Truk" +msgstr "" + +msgid "Cordoba" +msgstr "" + +msgid "Indianapolis" +msgstr "" + +msgid "Wake" +msgstr "" + +msgid "Qostanay" +msgstr "" + +msgid "Syowa" +msgstr "" + +msgid "Managua" +msgstr "" + +msgid "Fortaleza" +msgstr "" + +msgid "Ponape" +msgstr "" + +msgid "Havana" +msgstr "" + +msgid "Yukon" +msgstr "" + +msgid "Copenhagen" +msgstr "" + +msgid "Kamchatka" +msgstr "" + +msgid "Amman" +msgstr "" + +msgid "Pitcairn" +msgstr "" + +msgid "Yancowinna" +msgstr "" + +msgid "Mexico" +msgstr "" + +msgid "Harare" +msgstr "" + +msgid "Riyadh" +msgstr "" + +msgid "Lord_Howe" +msgstr "" + +msgid "Apia" +msgstr "" + +msgid "Monaco" +msgstr "" + +msgid "Aleutian" +msgstr "" + +msgid "Montreal" +msgstr "" + +msgid "Davis" +msgstr "" + +msgid "Efate" +msgstr "" + +msgid "Honolulu" +msgstr "" + +msgid "Lagos" +msgstr "" + +msgid "Shiprock" +msgstr "" + +msgid "Volgograd" +msgstr "" + +msgid "Vilnius" +msgstr "" + +msgid "Oslo" +msgstr "" + +msgid "Vientiane" +msgstr "" + +msgid "Dili" +msgstr "" + +msgid "Seoul" +msgstr "" + +msgid "Kerguelen" +msgstr "" + +msgid "Curacao" +msgstr "" + +msgid "Jujuy" +msgstr "" + +msgid "Manila" +msgstr "" + +msgid "Yap" +msgstr "" + +msgid "Kuwait" +msgstr "" + +msgid "Lindeman" +msgstr "" + +msgid "Vaduz" +msgstr "" + +msgid "Isle_of_Man" +msgstr "" + +msgid "Nassau" +msgstr "" + +msgid "Zulu" +msgstr "" + +msgid "Campo_Grande" +msgstr "" + +msgid "Libreville" +msgstr "" + +msgid "Fiji" +msgstr "" + +msgid "Yakutsk" +msgstr "" + +msgid "Ensenada" +msgstr "" + +msgid "Kiritimati" +msgstr "" + +msgid "Kaliningrad" +msgstr "" + +msgid "Creston" +msgstr "" + +msgid "Michigan" +msgstr "" + +msgid "Oral" +msgstr "" + +msgid "Cocos" +msgstr "" + +msgid "Eastern" +msgstr "" + +msgid "BajaNorte" +msgstr "" + +msgid "Tel_Aviv" +msgstr "" + +msgid "Sofia" +msgstr "" + +msgid "Adelaide" +msgstr "" + +msgid "Vatican" +msgstr "" + +msgid "Calcutta" +msgstr "" + +msgid "Lusaka" +msgstr "" + +msgid "St_Barthelemy" +msgstr "" + +msgid "Bougainville" +msgstr "" + +msgid "Tegucigalpa" +msgstr "" + +msgid "Sao_Tome" +msgstr "" + +msgid "Moncton" +msgstr "" + +msgid "Reykjavik" +msgstr "" + +msgid "St_Thomas" +msgstr "" + +msgid "Baghdad" +msgstr "" + +msgid "Gibraltar" +msgstr "" + +msgid "Puerto_Rico" +msgstr "" + +msgid "Asmera" +msgstr "" + +msgid "Madrid" +msgstr "" + +msgid "Sakhalin" +msgstr "" + +msgid "Porto_Acre" +msgstr "" + +msgid "General" +msgstr "" + +msgid "Macao" +msgstr "" + +msgid "Martinique" +msgstr "" + +msgid "Mountain" +msgstr "" + +msgid "Nipigon" +msgstr "" + +msgid "Vancouver" +msgstr "" + +msgid "Bangui" +msgstr "" + +msgid "Indiana-Starke" +msgstr "" + +msgid "Harbin" +msgstr "" + +msgid "Istanbul" +msgstr "" + +msgid "Guadeloupe" +msgstr "" + +msgid "Simferopol" +msgstr "" + +msgid "Paris" +msgstr "" + +msgid "Christmas" +msgstr "" + +msgid "Accra" +msgstr "" + +msgid "Victoria" +msgstr "" + +msgid "Faeroe" +msgstr "" + +msgid "Dacca" +msgstr "" + +msgid "Marigot" +msgstr "" + +msgid "Dhaka" +msgstr "" + +msgid "Kralendijk" +msgstr "" + +msgid "Aqtobe" +msgstr "" + +msgid "Pago_Pago" +msgstr "" + +msgid "Bahia_Banderas" +msgstr "" + +msgid "Continental" +msgstr "" + +msgid "Midway" +msgstr "" + +msgid "Johnston" +msgstr "" + +msgid "Tasmania" +msgstr "" + +msgid "Reunion" +msgstr "" + +msgid "South_Pole" +msgstr "" + +msgid "Riga" +msgstr "" + +msgid "La_Paz" +msgstr "" + +msgid "Niue" +msgstr "" + +msgid "Nouakchott" +msgstr "" + +msgid "Berlin" +msgstr "" + +msgid "Kwajalein" +msgstr "" + +msgid "St_Lucia" +msgstr "" + +msgid "Jakarta" +msgstr "" + +msgid "Chuuk" +msgstr "" + +msgid "Tallinn" +msgstr "" + +msgid "Nicosia" +msgstr "" + +msgid "New_York" +msgstr "" + +msgid "Kuching" +msgstr "" + +msgid "Porto_Velho" +msgstr "" + +msgid "Canberra" +msgstr "" + +msgid "Douala" +msgstr "" + +msgid "Atyrau" +msgstr "" + +msgid "Madeira" +msgstr "" + +msgid "Phoenix" +msgstr "" + +msgid "Santo_Domingo" +msgstr "" + +msgid "El_Salvador" +msgstr "" + +msgid "Anadyr" +msgstr "" + +msgid "Boa_Vista" +msgstr "" + +msgid "Godthab" +msgstr "" + +msgid "Inuvik" +msgstr "" + +msgid "Cairo" +msgstr "" + +msgid "Ojinaga" +msgstr "" + +msgid "Samarkand" +msgstr "" + +msgid "Jerusalem" +msgstr "" + +msgid "Bishkek" +msgstr "" + +msgid "Karachi" +msgstr "" + +msgid "Phnom_Penh" +msgstr "" + +msgid "Qyzylorda" +msgstr "" + +msgid "Auckland" +msgstr "" + +msgid "Makassar" +msgstr "" + +msgid "Stanley" +msgstr "" + +msgid "Virgin" +msgstr "" + +msgid "Noumea" +msgstr "" + +msgid "Budapest" +msgstr "" + +msgid "Tirane" +msgstr "" + +msgid "Miquelon" +msgstr "" + +msgid "Krasnoyarsk" +msgstr "" + +msgid "Rosario" +msgstr "" + +msgid "LHI" +msgstr "" + +msgid "Bamako" +msgstr "" + +msgid "Lome" +msgstr "" + +msgid "Astrakhan" +msgstr "" + +msgid "Addis_Ababa" +msgstr "" + +msgid "GMT-3" +msgstr "" + +msgid "Tokyo" +msgstr "" + +msgid "Saipan" +msgstr "" + +msgid "Katmandu" +msgstr "" + +msgid "Monrovia" +msgstr "" + +msgid "Casablanca" +msgstr "" + +msgid "Nauru" +msgstr "" + +msgid "Guam" +msgstr "" + +msgid "Ust-Nera" +msgstr "" + +msgid "Arctic" +msgstr "" + +msgid "Menominee" +msgstr "" + +msgid "Asuncion" +msgstr "" + +msgid "Rothera" +msgstr "" + +msgid "Luanda" +msgstr "" + +msgid "Tomsk" +msgstr "" + +msgid "Guadalcanal" +msgstr "" + +msgid "Chagos" +msgstr "" + +msgid "Thimphu" +msgstr "" + +msgid "Timbuktu" +msgstr "" + +msgid "Glace_Bay" +msgstr "" + +msgid "Marquesas" +msgstr "" + +msgid "Brunei" +msgstr "" + +msgid "Pangnirtung" +msgstr "" + +msgid "South" +msgstr "" + +msgid "Magadan" +msgstr "" + +msgid "Palau" +msgstr "" + +msgid "Yangon" +msgstr "" + +msgid "Tongatapu" +msgstr "" + +msgid "Hobart" +msgstr "" + +msgid "Bogota" +msgstr "" + +msgid "Urumqi" +msgstr "" + +msgid "Kinshasa" +msgstr "" + +msgid "Thule" +msgstr "" + +msgid "Saigon" +msgstr "" + +msgid "NSW" +msgstr "" + +msgid "Halifax" +msgstr "" + +msgid "Araguaina" +msgstr "" + +msgid "Muscat" +msgstr "" + +msgid "Kashgar" +msgstr "" + +msgid "Port-au-Prince" +msgstr "" + +msgid "Resolute" +msgstr "" + +msgid "Kabul" +msgstr "" + +msgid "Kyiv" +msgstr "" + +msgid "Omsk" +msgstr "" + +msgid "Gaza" +msgstr "" + +msgid "Malabo" +msgstr "" + +msgid "Hovd" +msgstr "" + +msgid "Jamaica" +msgstr "" + +msgid "Faroe" +msgstr "" + +msgid "Mahe" +msgstr "" + +msgid "Montevideo" +msgstr "" + +msgid "Eirunepe" +msgstr "" + +msgid "Catamarca" +msgstr "" + +msgid "Melbourne" +msgstr "" + +msgid "Hawaii" +msgstr "" + +msgid "Macquarie" +msgstr "" + +msgid "Belfast" +msgstr "" + +msgid "Wallis" +msgstr "" + +msgid "Moscow" +msgstr "" + +msgid "Gaborone" +msgstr "" + +msgid "Port_of_Spain" +msgstr "" + +msgid "Bissau" +msgstr "" + +msgid "Universal" +msgstr "" + +msgid "Regina" +msgstr "" + +msgid "Ulan_Bator" +msgstr "" + +msgid "Ujung_Pandang" +msgstr "" + +msgid "Costa_Rica" +msgstr "" + +msgid "Galapagos" +msgstr "" + +msgid "Tehran" +msgstr "" + +msgid "DumontDUrville" +msgstr "" + +msgid "Enderbury" +msgstr "" + +msgid "Ciudad_Juarez" +msgstr "" + +msgid "Mauritius" +msgstr "" + +msgid "Podgorica" +msgstr "" + +msgid "Kiev" +msgstr "" + +msgid "Hong_Kong" +msgstr "" + +msgid "Thimbu" +msgstr "" + +msgid "Belize" +msgstr "" + +msgid "Gambier" +msgstr "" + +msgid "Sydney" +msgstr "" + +msgid "Amsterdam" +msgstr "" + +msgid "Juba" +msgstr "" + +msgid "Helsinki" +msgstr "" + +msgid "Santarem" +msgstr "" + +msgid "Guyana" +msgstr "" + +msgid "Maldives" +msgstr "" + +msgid "Paramaribo" +msgstr "" + +msgid "Fort_Wayne" +msgstr "" + +msgid "Yellowknife" +msgstr "" + +msgid "West" +msgstr "" + +msgid "Almaty" +msgstr "" + +msgid "Novosibirsk" +msgstr "" + +msgid "Mariehamn" +msgstr "" + +msgid "Brazzaville" +msgstr "" + +msgid "Majuro" +msgstr "" + +msgid "Uzhgorod" +msgstr "" + +msgid "Ljubljana" +msgstr "" + +msgid "Knox_IN" +msgstr "" + +msgid "Bermuda" +msgstr "" + +msgid "Kirov" +msgstr "" + +msgid "Cuiaba" +msgstr "" + +msgid "Mendoza" +msgstr "" + +msgid "Kanton" +msgstr "" + +msgid "South_Georgia" +msgstr "" + +msgid "Banjul" +msgstr "" + +msgid "Louisville" +msgstr "" + +msgid "Indiana" +msgstr "" + +msgid "North_Dokota" +msgstr "" + +msgid "Palmer" +msgstr "" + +msgid "Yekaterinburg" +msgstr "" + +msgid "Cape_Vepde" +msgstr "" + +msgid "East" +msgstr "" + +msgid "Easterlsland" +msgstr "" + +msgid "Mayotte" +msgstr "" + +msgid "BajaSur" +msgstr "" + +msgid "Enter the name of the ntp-server or its ip-address.\nWhen entering multiple addresses, separate them with commas." +msgstr "" + +msgid "Cape_Verde" +msgstr "" + +msgid "Save" +msgstr "" + +msgid "Save to global and local configuration" +msgstr "" + +msgid "Save global configuration" +msgstr "" + +msgid "Save local configuration" +msgstr "" + +msgid "Load global configuration" +msgstr "" + +msgid "Load local configuration" +msgstr "" + +msgid "Disabled" +msgstr "" + +msgid "Load" +msgstr "" + +msgid "Argument not recognized\n" +msgstr "" + +msgid "La_Rioja" +msgstr "" + +msgid "Rio_Gallegos" +msgstr "" + +msgid "Salta" +msgstr "" + +msgid "San_Juan" +msgstr "" + +msgid "San_Luis" +msgstr "" + +msgid "Tucuman" +msgstr "" + +msgid "Ushuaia" +msgstr "" + +msgid "Knox" +msgstr "" + +msgid "Marengo" +msgstr "" + +msgid "Petersburg" +msgstr "" + +msgid "Tell_City" +msgstr "" + +msgid "Vevay" +msgstr "" + +msgid "Vincennes" +msgstr "" + +msgid "Winamac" +msgstr "" + +msgid "Project Home Page" +msgstr "" + +msgid "ComodRivadavia" +msgstr "" + +msgid "Monticello" +msgstr "" + +msgid "Beulah" +msgstr "" + +msgid "Center" +msgstr "" + +msgid "New_Salem" +msgstr "" + +msgid "Windhoek" +msgstr "" + +msgid "Iqaluit" +msgstr "" + +msgid "EasterIsland" +msgstr "" + +msgid "Andorra" +msgstr "" + +msgid "About" +msgstr "" + +msgid "Help" +msgstr "" + +msgid "Date and Time" +msgstr "" + +msgid ": \"Hardware time\"" +msgstr "" + +msgid ": \"Time Zone\"" +msgstr "" + +msgid ": \"Date\"" +msgstr "" + +msgid "Local configuration reading error" +msgstr "" + +msgid "Local configuration write error" +msgstr "" + +msgid "Global configuration read error" +msgstr "" + +msgid "Global configuration write error" +msgstr "" + +msgid "Local configuration downloaded successfully" +msgstr "" + +msgid "Global configuration downloaded successfully" +msgstr "" + +msgid "Global configuration successfully written" +msgstr "" + +msgid "Local configuration successfully written" +msgstr "" + +msgid "" +"GTK settings datetime for UBLinux\n\n" +"Usage: ubl-settings-datetime [OPTIONS...]\n" +"Options:\n" +" -h, --help Show this help\n" +" -V, --version Show package version\n" +" --lock-datetime Lock date and time changes\n" +" --lock-timezone Lock time zone changes\n" +" --lock-ntp-mode Lock NTP mode selection\n" +" --lock-ntp-edit Lock editing NTP servers\n" +" --lock-sync-hwclock Lock sync hwclock mode selection\n" +" --lock-save Lock saving local and global configuration\n" +" --lock-save-local Lock save global configuration\n" +" --lock-save-global Lock load global configuration\n" +" --lock-load-global Lock load global configuration\n" +msgstr "" + +msgid "ubl-settings-datetime version: " +msgstr "" -- 2.35.1 From 69155e6b4165ee9f952dda92941c0edcf3e709d2 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Tue, 21 Mar 2023 10:55:29 +0600 Subject: [PATCH 08/24] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=B1=D0=B0=D0=B3=20=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 --- .vscode/settings.json | 3 +- source/ubl-settings-datetime.cc | 290 +++++++++++++++++++------------- source/ubl-settings-datetime.h | 18 +- 3 files changed, 189 insertions(+), 122 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index ba3a677..64b1c51 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -67,5 +67,6 @@ "typeinfo": "cpp", "valarray": "cpp", "variant": "cpp" - } + }, + "cmake.sourceDirectory": "${workspaceFolder}/source" } \ No newline at end of file diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 9312b51..f138c94 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -307,7 +307,6 @@ void MainWindow::get_builder() { builder->get_widget("imgSettings", imgSettings); builder->get_widget("imgSave", imgSave); builder->get_widget("boxWidgetFunc", boxWidgetFunc); - } void MainWindow::gui_exit() { @@ -341,7 +340,7 @@ void MainWindow::event_log_hw() { int size_hw = sizeof(array_hw)/sizeof(array_hw[0]); for (int i = 0; i < size_hw; i++) { if (str_hw == array_hw_local[i]) { - this->write_config(map_config_data, array_hw[i], "hw"); + this->write_config(array_hw[i], "hw"); } } } @@ -350,17 +349,17 @@ void MainWindow::event_log_hw() { void MainWindow::event_zone() { int activ_index_reg = cbRegion->get_active_row_number(); if (activ_index_reg == -1) { - this->write_config(map_config_data, "error", "zone"); + this->write_config("error", "zone"); return; } string reg_text = array_region[activ_index_reg]; int activ_index = cbZone->get_active_row_number(); if (activ_index == -1) { - this->write_config(map_config_data, "error", "zone"); + this->write_config("error", "zone"); return; } string zone_text = ""; - if(!(reg_text.empty())) { + if (!(reg_text.empty())) { int index= 0; for (const auto &zone: time_reg_map.at(reg_text)) { if (index == activ_index) { @@ -369,7 +368,7 @@ void MainWindow::event_zone() { index+= 1; } } - this->write_config(map_config_data, zone_text, "zone"); + this->write_config(zone_text, "zone"); } void MainWindow::synopsis_show() { @@ -393,12 +392,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_old = map_config_data; + 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; } void MainWindow::load_globl_cfg() { flag_load = true; - string cmd_get_dhcp = "ubconfig --default --source global get network NTPSERVERS"; string cmd_default_get_dhcp = "ubconfig --source default get [] NTPSERVERS_DEFAULT"; this->entry_dhcp_mess(cmd_get_dhcp, cmd_default_get_dhcp); @@ -407,118 +407,174 @@ 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_old = map_config_data; + 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; } void MainWindow::save_local_cfg() { - string cmd_zone = "ubconfig --target system set clock ZONE="; - string cmd_default = "ubconfig --target system set network NTPSERVERS=default"; - string cmd_dhcp = "ubconfig --target system set network NTPSERVERS=dhcp"; - string cmd_set_ntp = "ubconfig --target system set network NTPSERVERS=\""; - string remove_ntp = "ubconfig --target system remove network NTPSERVERS"; - string local = "ubconfig --target system set clock HWCLOCK_SYNC=localtime"; - string hw = "ubconfig --target system set clock HWCLOCK_SYNC=utc"; - if (this->check_config("region") == false || this->check_config("zone") == false) { - this->enter_zone(cmd_zone); - } - if (this->check_config("dhcp") == false) { - this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); - } - if (this->check_config("hw") == false) { - this->set_hardware_clock(local, hw); - } - info_warning_error(2); - map_config_data_old = map_config_data; - if (this->check_config("region") || this->check_config("zone") || - this->check_config("dhcp") || this->check_config("hw")){ + if ((this->check_config("region", 0) && this->check_config("zone", 0) && + this->check_config("dhcp", 0) && this->check_config("hw", 0))) { lblWarning->set_text(_("Nothing to save!")); - } + } + else { + string cmd_zone = "ubconfig --target system set clock ZONE="; + string cmd_default = "ubconfig --target system set network NTPSERVERS=default"; + string cmd_dhcp = "ubconfig --target system set network NTPSERVERS=dhcp"; + string cmd_set_ntp = "ubconfig --target system set network NTPSERVERS=\""; + string remove_ntp = "ubconfig --target system remove network NTPSERVERS"; + string local = "ubconfig --target system set clock HWCLOCK_SYNC=localtime"; + string hw = "ubconfig --target system set clock HWCLOCK_SYNC=utc"; + if ((this->check_config("region", 0) == false || this->check_config("zone", 0) == false)) { + this->enter_zone(cmd_zone); + } + if (this->check_config("dhcp", 0) == false) { + this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); + } + if (this->check_config("hw", 0) == false) { + this->set_hardware_clock(local, hw); + } + info_warning_error(2); + map_config_data_local_old = map_config_data_local; + flag_local = true; + } } void MainWindow::save_global_cfg() { - string cmd = "ubconfig --target global set clock ZONE="; - string cmd_default = "ubconfig --target global set network NTPSERVERS=default"; - string cmd_dhcp = "ubconfig --target global set network NTPSERVERS=dhcp"; - string cmd_set_ntp = "ubconfig --target global set network NTPSERVERS=\""; - string remove_ntp = "ubconfig --target global remove network NTPSERVERS"; - string local = "ubconfig --target global set clock HWCLOCK_SYNC=localtime"; - string hw = "ubconfig --target global set clock HWCLOCK_SYNC=utc"; - if (this->check_config("region") == false || this->check_config("zone") == false) { - this->enter_zone(cmd); - } - if (this->check_config("dhcp") == false) { - this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); - } - if (this->check_config("hw") == false) { - this->set_hardware_clock(local, hw); - } - info_warning_error(3); - map_config_data_old = map_config_data; - if (this->check_config("region") || this->check_config("zone") || - this->check_config("dhcp") || this->check_config("hw")){ + if ((this->check_config("region", 1) && this->check_config("zone", 1) && + this->check_config("dhcp", 1) && this->check_config("hw", 1))) { lblWarning->set_text(_("Nothing to save!")); } + else { + string cmd = "ubconfig --target global set clock ZONE="; + string cmd_default = "ubconfig --target global set network NTPSERVERS=default"; + string cmd_dhcp = "ubconfig --target global set network NTPSERVERS=dhcp"; + string cmd_set_ntp = "ubconfig --target global set network NTPSERVERS=\""; + string remove_ntp = "ubconfig --target global remove network NTPSERVERS"; + string local = "ubconfig --target global set clock HWCLOCK_SYNC=localtime"; + string hw = "ubconfig --target global set clock HWCLOCK_SYNC=utc"; + if ((this->check_config("region", 1) == false || this->check_config("zone", 1) == false)) { + this->enter_zone(cmd); + } + if (this->check_config("dhcp", 1) == false) { + this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); + } + if (this->check_config("hw", 1) == false) { + this->set_hardware_clock(local, hw); + } + info_warning_error(3); + map_config_data_global_old = map_config_data_global; + flag_global = true; + } } void MainWindow::save_global_local_cfg() { - string cmd = ""; - string cmd_default = ""; - string cmd_dhcp = ""; - string cmd_set_ntp = ""; - string remove = ""; - string local = ""; - string hw = ""; - string remove_ntp = ""; - string cmd_zone = ""; - if (this->check_config("region") == false || this->check_config("zone") == false) { - cmd_zone = "ubconfig --target system set clock ZONE="; - this->enter_zone(cmd_zone); - cmd_zone = "ubconfig --target global set clock ZONE="; - this->enter_zone(cmd_zone); - } - if (this->check_config("dhcp") == false) { - cmd_default = "ubconfig --target system set network NTPSERVERS=default"; - cmd_dhcp = "ubconfig --target system set network NTPSERVERS=dhcp"; - cmd_set_ntp = "ubconfig --target system set network NTPSERVERS=\""; - remove_ntp = "ubconfig --target system remove network NTPSERVERS"; - this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); - cmd_default = "ubconfig --target global set network NTPSERVERS=default"; - cmd_dhcp = "ubconfig --target global set network NTPSERVERS=dhcp"; - cmd_set_ntp = "ubconfig --target global set network NTPSERVERS=\""; - remove_ntp = "ubconfig --target global remove network NTPSERVERS"; - this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); - } - if (this->check_config("hw") == 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); - 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_old = map_config_data; - info_warning_error(4); - if (this->check_config("region") || this->check_config("zone") || - this->check_config("dhcp") || this->check_config("hw")){ + if ((this->check_config("region", 2) && this->check_config("zone", 2) && + this->check_config("dhcp", 2) && this->check_config("hw", 2))) { lblWarning->set_text(_("Nothing to save!")); } + else { + string cmd = ""; + string cmd_default = ""; + string cmd_dhcp = ""; + string cmd_set_ntp = ""; + string remove = ""; + string local = ""; + string hw = ""; + string remove_ntp = ""; + string cmd_zone = ""; + if ((this->check_config("region", 2) == false || this->check_config("zone", 2) == false)) { + cmd_zone = "ubconfig --target system set clock ZONE="; + this->enter_zone(cmd_zone); + cmd_zone = "ubconfig --target global set clock ZONE="; + this->enter_zone(cmd_zone); + } + if (this->check_config("dhcp", 2) == false) { + cmd_default = "ubconfig --target system set network NTPSERVERS=default"; + cmd_dhcp = "ubconfig --target system set network NTPSERVERS=dhcp"; + cmd_set_ntp = "ubconfig --target system set network NTPSERVERS=\""; + remove_ntp = "ubconfig --target system remove network NTPSERVERS"; + this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); + cmd_default = "ubconfig --target global set network NTPSERVERS=default"; + cmd_dhcp = "ubconfig --target global set network NTPSERVERS=dhcp"; + cmd_set_ntp = "ubconfig --target global set network NTPSERVERS=\""; + remove_ntp = "ubconfig --target global remove network NTPSERVERS"; + this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); + } + if (this->check_config("hw", 2) == 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); + 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; + info_warning_error(4); + flag_global_local = true; + } } -void MainWindow::write_config(std::map &map_config, string data, string key) { - cout << data << " " << key << endl; - map_config[key] = data; +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; + 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; + flag_local = false; + flag_global = false; + flag_global_local = false; + } } -bool MainWindow::check_config(string key) { +bool MainWindow::check_config(string key, int key_save) { std::map :: iterator iter_map_config_data; std::map :: iterator iter_map_config_data_old; + std::map map_config_data; + std::map map_config_data_old; + if (key_save == 0 && flag_local == true) { + return true; + } + else if (key_save == 1 && flag_global == true) { + return true; + } + else if (key_save == 2 && flag_global_local == true) { + return true; + } + if (key_save == 0) { + iter_map_config_data = map_config_data_local.find(key); + map_config_data = map_config_data_local; + map_config_data_old = map_config_data_local_old; + } + else if (key_save == 1) { + iter_map_config_data = map_config_data_global.find(key); + 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()) { - cout << 1 << endl; + if (iter_map_config_data == map_config_data.end()) {; return false; } else if (iter_map_config_data_old == map_config_data_old.end()) { - cout << 2 << endl; return false; } else if (iter_map_config_data->second != iter_map_config_data_old->second) { @@ -644,7 +700,7 @@ void MainWindow::get_hardware_clock(string &cmd) { int error = warning_info; struct Result obj_result = this->wrapper_call(cmd); if (obj_result.error == 0) { - this->write_config(map_config_data, obj_result.response, "hw"); + this->write_config(obj_result.response, "hw"); if (obj_result.response.find("localtime") != string::npos) { if (array_hw[0] == "localtime"){ cbHw->set_active(0); @@ -667,7 +723,7 @@ void MainWindow::get_hardware_clock(string &cmd) { } } else { - this->write_config(map_config_data, "", "hw"); + this->write_config("", "hw"); cbHw->set_active(-1); } if (error != warning_info){ @@ -709,7 +765,7 @@ bool MainWindow::focus_ntp(string &cmd_set_ntp) { } if ((flag_error == false) && (flag_error_check_ntp == false)) { cmd = cmd_set_ntp + str_ntp + "\""; - this->write_config(map_config_data, str_ntp, "dhcp"); + this->write_config(str_ntp, "dhcp"); wrapper_system(cmd, "&"); } else { @@ -839,18 +895,18 @@ void MainWindow::event_entry_cbDhcp() { int activ_index = cbDhcp->get_active_row_number(); if (str_dhcp.length() == 0) { cbDhcp->set_active(0); - this->write_config(map_config_data, "default", "dhcp"); + this->write_config("default", "dhcp"); } else if (activ_index == 0) { txtNtpServer->set_text(default_get_dhcp); txtNtpServer->set_sensitive(false); - this->write_config(map_config_data, "default", "dhcp"); + this->write_config("default", "dhcp"); } else if (activ_index == 1) { // btnUpdateDateTime->set_sensitive(false); txtNtpServer->set_sensitive(false); txtNtpServer->set_text(""); - this->write_config(map_config_data, "dhcp", "dhcp"); + this->write_config("dhcp", "dhcp"); } else if (activ_index == 2) { txtNtpServer->set_text(""); @@ -866,15 +922,15 @@ void MainWindow::event_entry_cbDhcp() { if (response != "dhcp" && response != "default"){ txtNtpServer->set_text(response); } - this->write_config(map_config_data, response, "dhcp"); + this->write_config(response, "dhcp"); txtNtpServer->set_sensitive(true); } else { - this->write_config(map_config_data, "", "dhcp"); + this->write_config("", "dhcp"); } } else if (activ_index == 3) { - this->write_config(map_config_data, "", "dhcp"); + this->write_config("", "dhcp"); txtNtpServer->set_text(""); txtNtpServer->set_sensitive(false); // btnUpdateDateTime->set_sensitive(true); @@ -887,11 +943,11 @@ void MainWindow::save_Dhcp(string &cmd_default, string &cmd_dhcp, string &remove if (str_dhcp.length() == 0) { } else if (activ_index == 0) { - this->write_config(map_config_data, "default", "dhcp"); + this->write_config("default", "dhcp"); wrapper_system(cmd_default, "&"); } else if (activ_index == 1) { - this->write_config(map_config_data, "dhcp", "dhcp"); + this->write_config("dhcp", "dhcp"); wrapper_system(cmd_dhcp, "&"); } else if (activ_index == 2) { @@ -904,7 +960,7 @@ void MainWindow::save_Dhcp(string &cmd_default, string &cmd_dhcp, string &remove if (start_error != error_info) { error_info=start_error; } - this->write_config(map_config_data, "", "dhcp"); + this->write_config("", "dhcp"); } } @@ -917,7 +973,7 @@ void MainWindow::entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhc str_dhcp = str_dhcp.substr(str_dhcp.find("=")+1, str_dhcp.length()); str_dhcp = str_dhcp.substr(0, str_dhcp.find("\n")); if (str_dhcp == "dhcp") { - this->write_config(map_config_data, "dhcp", "dhcp"); + this->write_config("dhcp", "dhcp"); cbDhcp->set_active(1); txtNtpServer->set_text(""); txtNtpServer->set_sensitive(false); @@ -927,7 +983,7 @@ void MainWindow::entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhc cbDhcp->set_active(0); cmd = cmd_default_get_dhcp; struct Result obj_result = this->wrapper_call(cmd); - this->write_config(map_config_data, "default", "dhcp"); + this->write_config("default", "dhcp"); txtNtpServer->set_sensitive(false); if (obj_result.error== 0) { txtNtpServer->set_text(obj_result.response); @@ -941,18 +997,18 @@ void MainWindow::entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhc else { // btnUpdateDateTime->set_sensitive(false); if (str_dhcp == "") { - this->write_config(map_config_data, "", "dhcp"); + this->write_config("", "dhcp"); lblMessage->set_text(_("Enter DHCP!")); windowMessDchp->show(); } else if (str_dhcp == "(null)") { cbDhcp->set_active(0); txtNtpServer->set_text(""); - this->write_config(map_config_data, "", "dhcp"); + this->write_config("", "dhcp"); } else { cbDhcp->set_active(2); - this->write_config(map_config_data, str_dhcp, "dhcp"); + this->write_config(str_dhcp, "dhcp"); txtNtpServer->set_text(str_dhcp); if (flag_ntp_edit ==false) { txtNtpServer->set_sensitive(true); @@ -961,7 +1017,7 @@ void MainWindow::entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhc } } else { - this->write_config(map_config_data, "", "dhcp"); + this->write_config("", "dhcp"); cbDhcp->set_active(3); txtNtpServer->set_text(""); txtNtpServer->set_sensitive(false); @@ -1113,8 +1169,8 @@ void MainWindow::parse_text_date() { } void MainWindow::append_region_zone(string region, string zone, Gtk::ComboBoxText *tmpCbReg, Gtk::ComboBoxText *tmpCbZone) { - this->write_config(map_config_data, region, "region"); - this->write_config(map_config_data, zone, "zone"); + this->write_config(region, "region"); + this->write_config(zone, "zone"); str_region = region; int index = 0; Glib::ustring reg_local = ""; @@ -1219,7 +1275,7 @@ void MainWindow::append_zone() { if (index!=-1) { string str_region = array_region[index]; string zone_mixing = ""; - this->write_config(map_config_data, str_region, "region"); + this->write_config(str_region, "region"); string path_dir = ""; if(str_region.length() != 0) { for (const auto &_str_zone : time_reg_map_local.at(str_region)) { diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 3fa8d31..27ea2dd 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -127,6 +127,10 @@ class MainWindow : public Gtk::ApplicationWindow { int minute; string str_region = ""; string str_zone = ""; + int count_edit = 0; + bool flag_global = false; + bool flag_local = false; + bool flag_global_local = false; template struct Result{ Type response; @@ -135,8 +139,14 @@ class MainWindow : public Gtk::ApplicationWindow { vector array_region_local; vector array_region; std::map map_error; - std::map map_config_data; - std::map map_config_data_old; + + std::map map_config_data_global; + std::map map_config_data_local; + std::map map_config_data_global_local; + std::map map_config_data_global_old; + std::map map_config_data_local_old; + std::map map_config_data_global_local_old; + public: @@ -153,9 +163,9 @@ class MainWindow : public Gtk::ApplicationWindow { void load_globl_cfg(); void save_local_cfg(); void event_zone(); - bool check_config(string key); + bool check_config(string key, int key_save); void event_log_hw(); - void write_config(std::map &map_config, string data, string key); + void write_config(string data, string key); string get_ubconfig_value(string &cmd); void save_global_cfg(); void save_Dhcp(string &cmd_default, string &cmd_dhcp, string &remove, string &cmd_set_ntp); -- 2.35.1 From 9ce3d12cce31b439cdff6ba530200e98bfe7742a Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Tue, 21 Mar 2023 11:54:28 +0600 Subject: [PATCH 09/24] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20focus=20ntp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 29 +++++++++++++++++++++++------ source/ubl-settings-datetime.h | 3 ++- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index f138c94..04b3708 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -332,6 +332,14 @@ void MainWindow::event() { btnSaveGlob->signal_activate().connect([&]() {save_global_cfg();}); cbZone->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::event_zone)); cbHw->signal_changed().connect(sigc::mem_fun(*this, &MainWindow::event_log_hw)); + txtNtpServer->signal_focus_out_event().connect(sigc::mem_fun(*this, &MainWindow::focus_ntp)); +} + +bool MainWindow::focus_ntp(GdkEventFocus* event) { + if (event!=NULL){ + } + this->focus_ntp_text(); + return true; } void MainWindow::event_log_hw() { @@ -741,7 +749,7 @@ void MainWindow::gui_mess_close() { windowMessDchp->hide(); } -bool MainWindow::focus_ntp(string &cmd_set_ntp) { +bool MainWindow::focus_ntp_text() { if (txtNtpServer->get_text() == "" || txtNtpServer->get_text() == " ") { lblMessage->set_text(_("Enter DHCP!")); windowMessDchp->show(); @@ -764,9 +772,8 @@ bool MainWindow::focus_ntp(string &cmd_set_ntp) { } } if ((flag_error == false) && (flag_error_check_ntp == false)) { - cmd = cmd_set_ntp + str_ntp + "\""; - this->write_config(str_ntp, "dhcp"); - wrapper_system(cmd, "&"); + + return true; } else { if (flag_error == true) { @@ -777,6 +784,7 @@ bool MainWindow::focus_ntp(string &cmd_set_ntp) { lblMessage->set_text(_("Error in the ntp name")); windowMessDchp->show(); } + return false; } } return true; @@ -919,8 +927,11 @@ void MainWindow::event_entry_cbDhcp() { cmd = "ubconfig --default --source global get network NTPSERVERS"; } string response = this->get_ubconfig_value(cmd); - if (response != "dhcp" && response != "default"){ + if (response != "dhcp" && response != "default") { txtNtpServer->set_text(response); + txtNtpServer->grab_focus(); + txtNtpServer->unset_cursor(); + cout << 222 << endl; } this->write_config(response, "dhcp"); txtNtpServer->set_sensitive(true); @@ -952,7 +963,13 @@ void MainWindow::save_Dhcp(string &cmd_default, string &cmd_dhcp, string &remove } else if (activ_index == 2) { - this->focus_ntp(cmd_set_ntp); + if (this->focus_ntp_text()){ + string str_ntp = txtNtpServer->get_text(); + string cmd = cmd_set_ntp + str_ntp + "\""; + this->write_config(str_ntp, "dhcp"); + wrapper_system(cmd, "&"); + } + } else if (activ_index== 3) { int start_error = error_info; diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 27ea2dd..0742f9e 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -163,6 +163,7 @@ class MainWindow : public Gtk::ApplicationWindow { void load_globl_cfg(); void save_local_cfg(); void event_zone(); + bool focus_ntp(GdkEventFocus* event); bool check_config(string key, int key_save); void event_log_hw(); void write_config(string data, string key); @@ -178,7 +179,7 @@ class MainWindow : public Gtk::ApplicationWindow { void get_builder(); void event(); void gui_mess_close(); - bool focus_ntp(string &cmd_set_ntp); + bool focus_ntp_text() ; void event_entry_cbDhcp(); void get_calendar(); void calendar_show(); -- 2.35.1 From bd8d24acb57e59920ecdd53ae37b8d8a95b427c5 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Tue, 21 Mar 2023 12:02:49 +0600 Subject: [PATCH 10/24] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BF=D0=B0=D0=BF=D0=BA=D1=83=20.vscode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 +- .vscode/settings.json | 72 ------------------------------------------- 2 files changed, 2 insertions(+), 73 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore index 45460e9..c87e2df 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ compile/ source/**/ubl_settings_datetime source/**/main.o source/**/ubl_settings_datetime.o -reg/ \ No newline at end of file +reg/ +.vscode/ \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 64b1c51..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "files.associations": { - "array": "cpp", - "atomic": "cpp", - "hash_map": "cpp", - "bit": "cpp", - "*.tcc": "cpp", - "bitset": "cpp", - "cctype": "cpp", - "chrono": "cpp", - "clocale": "cpp", - "cmath": "cpp", - "codecvt": "cpp", - "compare": "cpp", - "concepts": "cpp", - "condition_variable": "cpp", - "cstdarg": "cpp", - "cstddef": "cpp", - "cstdint": "cpp", - "cstdio": "cpp", - "cstdlib": "cpp", - "cstring": "cpp", - "ctime": "cpp", - "cwchar": "cpp", - "cwctype": "cpp", - "deque": "cpp", - "list": "cpp", - "map": "cpp", - "set": "cpp", - "string": "cpp", - "unordered_map": "cpp", - "unordered_set": "cpp", - "vector": "cpp", - "exception": "cpp", - "algorithm": "cpp", - "functional": "cpp", - "iterator": "cpp", - "memory": "cpp", - "memory_resource": "cpp", - "numeric": "cpp", - "optional": "cpp", - "random": "cpp", - "ratio": "cpp", - "string_view": "cpp", - "system_error": "cpp", - "tuple": "cpp", - "type_traits": "cpp", - "utility": "cpp", - "fstream": "cpp", - "initializer_list": "cpp", - "iomanip": "cpp", - "iosfwd": "cpp", - "iostream": "cpp", - "istream": "cpp", - "limits": "cpp", - "mutex": "cpp", - "new": "cpp", - "numbers": "cpp", - "ostream": "cpp", - "semaphore": "cpp", - "sstream": "cpp", - "stdexcept": "cpp", - "stop_token": "cpp", - "streambuf": "cpp", - "thread": "cpp", - "cinttypes": "cpp", - "typeinfo": "cpp", - "valarray": "cpp", - "variant": "cpp" - }, - "cmake.sourceDirectory": "${workspaceFolder}/source" -} \ No newline at end of file -- 2.35.1 From 7dcb564aca95e0b8dee0e6f9b10b5f4dd0db8016 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Tue, 21 Mar 2023 14:07:37 +0600 Subject: [PATCH 11/24] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BE=D1=82=D0=BA=D1=80=D1=8B=D1=82=D0=B8=D0=B5?= =?UTF-8?q?=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B8=20=D0=BD=D0=B0=20=D0=BA?= =?UTF-8?q?=D0=BD=D0=BE=D0=BF=D0=BA=D0=B5=20"=D0=A1=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BA=D0=B0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 04b3708..38f2a9c 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -382,6 +382,14 @@ void MainWindow::event_zone() { void MainWindow::synopsis_show() { int start_error = error_info; string cmd = "xdg-open " + string(_("https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/")) + app_name; + if (geteuid() == 0) { + string response_user = this->call("who"); + size_t index = response_user.find(" "); + if (index != std::string::npos){ + response_user = response_user.substr(0, index); + cmd = "sudo -u " + response_user + " " + cmd + " "; + } + } wrapper_system(cmd, "&"); if (start_error != error_info) { error_info = start_error; -- 2.35.1 From de1bc6b91d2d49b87dcc9526c58ac3343acd6c71 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Tue, 21 Mar 2023 14:32:01 +0600 Subject: [PATCH 12/24] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BE=D1=82=D0=BA=D1=80=D1=8B=D1=82=D0=B8=D0=B5?= =?UTF-8?q?=20=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20sudo=20=D0=BD?= =?UTF-8?q?=D0=B0=20su?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 38f2a9c..b76716f 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -381,13 +381,15 @@ void MainWindow::event_zone() { void MainWindow::synopsis_show() { int start_error = error_info; + //su -l superadmin -c " DISPLAY=$DISPLAY string cmd = "xdg-open " + string(_("https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/")) + app_name; if (geteuid() == 0) { string response_user = this->call("who"); size_t index = response_user.find(" "); if (index != std::string::npos){ response_user = response_user.substr(0, index); - cmd = "sudo -u " + response_user + " " + cmd + " "; + cmd = "su -l " + response_user + " -c \" DISPLAY=$DISPLAY " + cmd + " \""; + cout << "" << cmd << endl; } } wrapper_system(cmd, "&"); -- 2.35.1 From 4ca73b623b80d62d626b139ecfb12316f7b1d7d6 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Tue, 21 Mar 2023 14:56:44 +0600 Subject: [PATCH 13/24] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?= =?UTF-8?q?=D1=84=D0=BE=D0=BA=D1=83=D1=81=D0=B0=20=D0=BF=D0=BE=D0=BB=D1=8F?= =?UTF-8?q?=20ntp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 9 +++------ style.css | 7 +++++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index b76716f..150d7d1 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -246,6 +246,7 @@ void MainWindow::info_status_app(string stule) { boxInfo->add_class(stule); } + void MainWindow::get_builder() { builder->set_translation_domain(path_app); builder->get_widget("boxColor", boxColor); @@ -381,7 +382,6 @@ void MainWindow::event_zone() { void MainWindow::synopsis_show() { int start_error = error_info; - //su -l superadmin -c " DISPLAY=$DISPLAY string cmd = "xdg-open " + string(_("https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/")) + app_name; if (geteuid() == 0) { string response_user = this->call("who"); @@ -389,7 +389,6 @@ void MainWindow::synopsis_show() { if (index != std::string::npos){ response_user = response_user.substr(0, index); cmd = "su -l " + response_user + " -c \" DISPLAY=$DISPLAY " + cmd + " \""; - cout << "" << cmd << endl; } } wrapper_system(cmd, "&"); @@ -929,6 +928,8 @@ void MainWindow::event_entry_cbDhcp() { else if (activ_index == 2) { txtNtpServer->set_text(""); if (flag_ntp_edit == false) { + txtNtpServer->set_sensitive(true); + txtNtpServer->grab_focus(); string cmd = ""; if (flag_load == false) { cmd = "ubconfig --default --source system get network NTPSERVERS"; @@ -939,12 +940,8 @@ void MainWindow::event_entry_cbDhcp() { string response = this->get_ubconfig_value(cmd); if (response != "dhcp" && response != "default") { txtNtpServer->set_text(response); - txtNtpServer->grab_focus(); - txtNtpServer->unset_cursor(); - cout << 222 << endl; } this->write_config(response, "dhcp"); - txtNtpServer->set_sensitive(true); } else { this->write_config("", "dhcp"); diff --git a/style.css b/style.css index d8c59cf..e323d55 100644 --- a/style.css +++ b/style.css @@ -86,4 +86,11 @@ border-radius:2px; .bkim_no_plug{ background-color: transparent; opacity:0.99; +} + +.entry { + +} +.entry:focus { + } \ No newline at end of file -- 2.35.1 From c25c83ce75a25936be2dc41dc2d7dc57cc7ae8f0 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Tue, 21 Mar 2023 15:34:50 +0600 Subject: [PATCH 14/24] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=B1=D0=B0=D0=B3=20=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=20ntp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 2 +- ubl-settings-datetime.glade | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) mode change 100644 => 100755 source/ubl-settings-datetime.cc diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc old mode 100644 new mode 100755 index 150d7d1..a0fa546 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -781,7 +781,7 @@ bool MainWindow::focus_ntp_text() { } } if ((flag_error == false) && (flag_error_check_ntp == false)) { - + this->write_config(str_ntp, "dhcp"); return true; } else { diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index 45593ac..ff5c144 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -498,6 +498,7 @@ Format: DD.MM.YYYY False + 252 True True True @@ -1138,12 +1139,6 @@ Format: DD.MM.YYYY - - - - - - 240 185 -- 2.35.1 From 0ce939ec53dcbfc7b82e9f0db3789823532ee355 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Tue, 21 Mar 2023 16:42:47 +0600 Subject: [PATCH 15/24] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=B1=D0=B0=D0=B3=D0=B8=20=D1=81=20?= =?UTF-8?q?=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 74 +++++++++++++++++++++++---------- 1 file changed, 52 insertions(+), 22 deletions(-) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index a0fa546..db95cfe 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -454,6 +454,9 @@ 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; + } } } @@ -482,6 +485,9 @@ 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() { @@ -500,34 +506,49 @@ void MainWindow::save_global_local_cfg() { string remove_ntp = ""; string cmd_zone = ""; if ((this->check_config("region", 2) == false || this->check_config("zone", 2) == false)) { - cmd_zone = "ubconfig --target system set clock ZONE="; - this->enter_zone(cmd_zone); - cmd_zone = "ubconfig --target global set clock ZONE="; - this->enter_zone(cmd_zone); + if (flag_local == false) { + cmd_zone = "ubconfig --target system set clock ZONE="; + this->enter_zone(cmd_zone); + } + if (flag_global == false) { + cmd_zone = "ubconfig --target global set clock ZONE="; + this->enter_zone(cmd_zone); + } } if (this->check_config("dhcp", 2) == false) { - cmd_default = "ubconfig --target system set network NTPSERVERS=default"; - cmd_dhcp = "ubconfig --target system set network NTPSERVERS=dhcp"; - cmd_set_ntp = "ubconfig --target system set network NTPSERVERS=\""; - remove_ntp = "ubconfig --target system remove network NTPSERVERS"; - this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); - cmd_default = "ubconfig --target global set network NTPSERVERS=default"; - cmd_dhcp = "ubconfig --target global set network NTPSERVERS=dhcp"; - cmd_set_ntp = "ubconfig --target global set network NTPSERVERS=\""; - remove_ntp = "ubconfig --target global remove network NTPSERVERS"; - this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); + if (flag_local == false) { + cmd_default = "ubconfig --target system set network NTPSERVERS=default"; + cmd_dhcp = "ubconfig --target system set network NTPSERVERS=dhcp"; + cmd_set_ntp = "ubconfig --target system set network NTPSERVERS=\""; + remove_ntp = "ubconfig --target system remove network NTPSERVERS"; + this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); + } + if (flag_global == false) { + cmd_default = "ubconfig --target global set network NTPSERVERS=default"; + cmd_dhcp = "ubconfig --target global set network NTPSERVERS=dhcp"; + cmd_set_ntp = "ubconfig --target global set network NTPSERVERS=\""; + remove_ntp = "ubconfig --target global remove network NTPSERVERS"; + this->save_Dhcp(cmd_default, cmd_dhcp, remove_ntp, cmd_set_ntp); + } } if (this->check_config("hw", 2) == 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); - local = "ubconfig --target global set clock HWCLOCK_SYNC=localtime"; - hw = "ubconfig --target global set clock HWCLOCK_SYNC=utc"; - this->set_hardware_clock(local, hw); + 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 (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); flag_global_local = true; + } } @@ -562,12 +583,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 (key_save == 0 && flag_local == true) { + 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; + } + else if (key_save == 0 && flag_local == true) { return true; } else if (key_save == 1 && flag_global == true) { return true; } + else if (key_save == 2 && flag_global == true && flag_local == true) { + return true; + } else if (key_save == 2 && flag_global_local == true) { return true; } @@ -598,7 +628,7 @@ bool MainWindow::check_config(string key, int key_save) { return false; } else if (iter_map_config_data->second.length() == 0 || iter_map_config_data_old->second.length() == 0) { - return false; + return true; } else if (iter_map_config_data->second == iter_map_config_data_old->second) { return true; -- 2.35.1 From 77651ff402cc9072fc7865cc766c278cbc272dd9 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Tue, 21 Mar 2023 16:56:37 +0600 Subject: [PATCH 16/24] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4?= =?UTF-8?q?=D0=B0=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5?= =?UTF-8?q?=D0=BB=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 8 ++------ source/ubl-settings-datetime.h | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index db95cfe..147c6c1 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -384,12 +384,8 @@ void MainWindow::synopsis_show() { int start_error = error_info; string cmd = "xdg-open " + string(_("https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/")) + app_name; if (geteuid() == 0) { - string response_user = this->call("who"); - size_t index = response_user.find(" "); - if (index != std::string::npos){ - response_user = response_user.substr(0, index); - cmd = "su -l " + response_user + " -c \" DISPLAY=$DISPLAY " + cmd + " \""; - } + string response_user = getlogin(); + cmd = "su -l " + response_user + " -c \" DISPLAY=$DISPLAY " + cmd + " \""; } wrapper_system(cmd, "&"); if (start_error != error_info) { diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 0742f9e..83ee0a5 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -16,6 +16,7 @@ #include #include #include +#include #include "ubl-util-standard.c" -- 2.35.1 From 882ba03bd3cc9b42624ad7309a8cd36f2d0fe535 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Tue, 21 Mar 2023 17:24:40 +0600 Subject: [PATCH 17/24] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3=20=D1=81=20=D0=B1=D0=BB?= =?UTF-8?q?=D0=BE=D0=BA=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=BE=D0=B9=20ntp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 147c6c1..206e2aa 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -339,7 +339,9 @@ void MainWindow::event() { bool MainWindow::focus_ntp(GdkEventFocus* event) { if (event!=NULL){ } - this->focus_ntp_text(); + if (flag_ntp_edit == false) { + this->focus_ntp_text(); + } return true; } @@ -995,12 +997,13 @@ void MainWindow::save_Dhcp(string &cmd_default, string &cmd_dhcp, string &remove wrapper_system(cmd_dhcp, "&"); } else if (activ_index == 2) { - - if (this->focus_ntp_text()){ - string str_ntp = txtNtpServer->get_text(); - string cmd = cmd_set_ntp + str_ntp + "\""; - this->write_config(str_ntp, "dhcp"); - wrapper_system(cmd, "&"); + if (flag_ntp_edit == false) { + if (this->focus_ntp_text()){ + string str_ntp = txtNtpServer->get_text(); + string cmd = cmd_set_ntp + str_ntp + "\""; + this->write_config(str_ntp, "dhcp"); + wrapper_system(cmd, "&"); + } } } -- 2.35.1 From 064bd52daba28078b1f3427d394dfa57bec4d295 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 22 Mar 2023 11:08:18 +0600 Subject: [PATCH 18/24] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20.po=20=D0=B8=20pot=20=D1=84=D0=B0=D0=B9?= =?UTF-8?q?=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- #ubl-settings-datetime.glade# | 1344 ++++++++++++++++ source/ubl-settings-datetime.cc | 164 +- ubl-settings-datetime.pot | 1304 ++++++++-------- ubl-settings-datetime_ru.po | 2527 ++++++++++++++++--------------- ubl-settings-datetime_ru.po~ | 1830 ++++++++++++++++++++++ 5 files changed, 5262 insertions(+), 1907 deletions(-) create mode 100644 #ubl-settings-datetime.glade# create mode 100644 ubl-settings-datetime_ru.po~ diff --git a/#ubl-settings-datetime.glade# b/#ubl-settings-datetime.glade# new file mode 100644 index 0000000..26f879f --- /dev/null +++ b/#ubl-settings-datetime.glade# @@ -0,0 +1,1344 @@ + + + + + + False + О Программе + False + True + center + ubl-settings-datetime + dialog + True + False + False + ubl-settings-datetime + 1.2 + Copyright © 2023 - UBSoft Software LLC + Setting the date and time + https://ublinux.ru/ + Project Home Page + Это приложение распространяется без каких-либо гарантий. +Подробнее в <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General Public License, версии 2 или позднее</a>. + UBGroup + UBGroup + com.ublinux.ubl-settings-datetime + True + gpl-2-0 + + + False + vertical + 2 + + + False + end + + + + + + False + False + 0 + + + + + + + + + + True + False + False + False + 4 + + + True + False + Load global configuration + + + + + + True + False + Load local configuration + + + + + + True + False + False + False + 4 + + + True + False + Help + + + + + + True + False + About + + + + + + True + False + False + False + 4 + + + True + False + Save to global and local configuration + + + + + + True + False + Save global configuration + + + + + + True + False + Save local configuration + + + + + + 659 + False + + + True + False + vertical + + + True + False + vertical + + + True + False + + + True + False + 5 + 5 + 5 + 5 + 6 + 6 + 25 + 1 + + + False + True + 0 + + + + + True + False + start + 5 + 5 + 5 + 5 + 6 + 6 + + + + + + + True + True + 1 + + + + + False + True + 0 + + + + + True + False + vertical + + + True + False + + + True + False + + + 90 + True + False + 5 + 5 + 5 + 5 + 6 + 6 + 69 + com.ublinux.ubl-settings-datetime + + + False + True + 0 + + + + + True + False + + + True + False + + + True + False + vertical + + + 255 + True + False + Date and time settings + + + + + + + + + True + True + 0 + + + + + False + True + 0 + + + + + True + True + 0 + + + + + True + False + + + False + True + 1 + + + + + True + True + 1 + + + + + -1 + + + + + False + True + 0 + + + + + False + True + 1 + + + + + True + False + vertical + + + True + False + vertical + + + True + False + 5 + 5 + 5 + 5 + 0.019999999552965164 + in + + + True + False + 5 + 5 + 5 + vertical + + + True + False + + + 0 + True + False + 5 + 5 + 5 + 5 + 6 + 6 + Time: + True + 0 + + + False + True + 0 + + + + + True + True + 5 + 5 + 5 + 5 + 6 + 6 + 2 + 0.099999999776482579 + True + + + False + True + 1 + + + + + True + False + : + + + False + True + 2 + + + + + True + True + 5 + 5 + 5 + 5 + 6 + 6 + 2 + True + + + False + True + 3 + + + + + 20 + True + False + 5 + 5 + 5 + 5 + 6 + 6 + Date: + True + 0 + + + False + True + 4 + + + + + -1 + True + True + Date +Format: DD.MM.YYYY + 5 + 5 + 5 + 5 + 6 + 6 + + + True + True + 5 + + + + + True + True + True + Интерактивный выбор даты + 5 + 10 + 5 + 10 + 6 + 6 + + + True + False + x-office-calendar + + + + + False + True + 6 + + + + + False + True + 1 + + + + + True + False + + + 252 + True + True + True + 7 + 5 + 7 + 5 + 6 + 6 + + + True + False + center + center + + + True + False + 5 + 5 + 5 + 5 + media-playlist-repeat + + + False + True + 0 + + + + + True + False + center + center + Sync by + + + False + True + 1 + + + + + + + True + True + 0 + + + + + True + False + + + False + True + 1 + + + + + True + False + + + False + True + 2 + + + + + True + True + True + 5 + 10 + 5 + 10 + 6 + 6 + + + True + False + center + center + Synchronize hardware time + + + + + True + True + 3 + + + + + False + True + 3 + + + + + + + True + False + Current date and time + + + + + False + True + 0 + + + + + False + True + 1 + + + + + True + False + vertical + + + True + False + 5 + 5 + 5 + 5 + 0.019999999552965164 + in + + + True + False + 5 + 5 + 5 + vertical + + + True + False + + + True + False + 5 + 5 + 5 + 5 + 6 + 6 + + + False + True + 1 + + + + + True + True + Enter the name of the ntp server or its ip address. When entering multiple addresses, separate them with spaces. + center + 5 + 10 + 5 + 10 + 6 + 6 + + + True + True + 3 + + + + + False + True + 1 + + + + + + + True + False + Synchronize via NTP + + + + + False + True + 0 + + + + + False + True + 2 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 0.019999999552965164 + in + + + True + False + vertical + + + True + False + + + True + False + start + 8 + 5 + 8 + 5 + 6 + 13 + Synchronize hardware time: + + + False + True + 0 + + + + + True + False + 10 + 5 + 5 + 10 + 6 + 10 + False + False + + + True + True + 2 + + + + + False + True + 0 + + + + + True + False + + + True + False + + + False + True + 1 + + + + + True + False + 8 + 5 + 8 + 5 + 6 + 13 + Region: + 0 + + + False + True + 2 + + + + + True + False + 5 + 5 + 5 + 5 + 6 + 10 + False + False + + + True + True + 3 + + + + + True + False + 5 + 5 + 5 + 5 + 6 + 13 + Area: + 0 + + + False + True + 4 + + + + + True + False + 5 + 5 + 5 + 5 + 6 + 10 + False + False + + + True + True + 5 + + + + + 5 + True + False + + + False + True + 6 + + + + + True + False + + + False + True + 7 + + + + + False + True + 1 + + + + + + + True + False + Time Zone + + + + + False + True + 3 + + + + + False + True + 2 + + + + + False + True + 0 + + + + + + + True + False + True + + + True + False + start + 5 + 5 + 5 + 5 + 1 + False + ubl-settings-datetime + + + + + + + + True + False + 5 + 5 + 5 + 5 + 32 + com.ublinux.ubl-settings-datetime + + + + + True + False + + + True + True + False + True + True + menu + none + + + True + False + + + True + False + 5 + 5 + 5 + 5 + Load + + + False + True + 0 + + + + + True + False + pan-down-symbolic + + + False + True + 1 + + + + + + + False + True + 0 + + + + + + 1 + + + + + True + False + + + True + True + False + True + True + menu2 + none + + + True + False + + + True + False + 5 + 5 + 5 + 5 + Save + + + + False + True + 0 + + + + + True + False + pan-down-symbolic + + + False + True + 1 + + + + + + + False + True + 0 + + + + + True + True + False + True + True + menu1 + none + + + True + False + open-menu-symbolic + + + + + False + True + 1 + + + + + + end + 3 + + + + + + + both + True + + + + + + + 240 + 185 + False + btnChooseDate + bottom + none + + + True + True + 10 + 10 + 10 + 10 + 10 + 10 + 2023 + 1 + 10 + + + + + False + Внимание! + com.ublinux.ubl-settings-datetime + dialog + + + True + False + vertical + + + True + False + 5 + 5 + 5 + 5 + + + True + False + 5 + 5 + 5 + 6 + 6 + 50 + gtk-dialog-warning + + + True + True + 0 + + + + + 160 + True + False + start + center + 6 + 6 + Enter DHCP ! + + + True + True + 1 + + + + + False + True + 1 + + + + + OK + True + True + True + 5 + 5 + 5 + 5 + 3 + 3 + + + False + True + 1 + + + + + + + False + popup + Внимание! + center + com.ublinux.ubl-settings-datetime + dialog + + + True + False + vertical + + + True + False + 5 + 5 + 5 + 5 + + + True + False + 5 + 5 + 5 + 6 + 6 + 50 + gtk-dialog-warning + + + True + True + 0 + + + + + 160 + True + False + start + center + 5 + 5 + 5 + 5 + 6 + 6 + Enter DHCP ! + + + True + True + 1 + + + + + False + True + 1 + + + + + OK + True + True + True + 5 + 5 + 5 + 5 + 3 + 3 + + + False + True + 1 + + + + + + diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 46e4f7e..f363fe7 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -54,34 +54,34 @@ MainWindow::MainWindow(Glib::RefPtr const& builder) { } void MainWindow::settings() { - map_error["xdg-open https://wiki.ublinux.ru/ru/home"] = string(_(": \"xdg-open\"")); - map_error["ubconfig --default --source system get clock ZONE"] = string(_(": \"Time Zone\"")); - map_error["hwclock --systohc"] = string(_(": \"Hardware time\"")); - map_error["ubconfig --default --source system get network NTPSERVERS"] = string(_(": \"NTP\"")); - map_error["ubconfig --source=default get NTPSERVERS_DEFAULT"] = string(_(": \"NTP\"")); - map_error["ubconfig --default --source system get clock HWCLOCK_SYNC"] = string(_(": \"Hardware time\"")); - map_error["ubconfig --default --source global get network NTPSERVERS"] = string(_(": \"NTP\"")); - map_error["ubconfig --default --source global get clock ZONE"] = string(_(": \"Time Zone\"")); - map_error["ubconfig --default --source global get clock HWCLOCK_SYNC"] = string(_(": \"Hardware time\"")); - map_error["ubconfig --source global get clock HWCLOCK_SYNC"] = string(_(": \"Hardware time\"")); - map_error["ubconfig --target system set clock ZONE="] = string(_(": \"Time Zone\"")); - map_error["ubconfig --target system set network NTPSERVERS=default"] = string(_(": \"NTP\"")); - map_error["ubconfig --target system set network NTPSERVERS=dhcp"] = string(_(": \"NTP\"")); - map_error["ubconfig --target system set network NTPSERVERS=\""] = string(_(": \"NTP\"")); - map_error["ubconfig --target system remove network NTPSERVERS"] = string(_(": \"NTP\"")); - map_error["ubconfig --target system set clock HWCLOCK_SYNC=localtime"] = string(_(": \"Hardware time\"")); - map_error["ubconfig --target system set clock HWCLOCK_SYNC=utc"] = string(_(": \"Hardware time\"")); - map_error["ubconfig --target global set clock ZONE="] = string(_(": \"Time Zone\"")); - map_error["ubconfig --target global set network NTPSERVERS=default"] = string(_(": \"NTP\"")); - map_error["ubconfig --target global set network NTPSERVERS=dhcp"] = string(_(": \"NTP\"")); - map_error["ubconfig --target global set network NTPSERVERS=\""] = string(_(": \"NTP\"")); - map_error["ubconfig --target global remove network NTPSERVERS"] = string(_(": \"NTP\"")); - map_error["ubconfig --target global set clock HWCLOCK_SYNC=localtime"] = string(_(": \"Hardware time\"")); - map_error["ubconfig --target global set clock HWCLOCK_SYNC=utc"] = string(_(": \"Hardware time\"")); - map_error["ubconfig --source default get [] NTPSERVERS_DEFAULT"] = string(_(": \"NTP\"")); - map_error["date +%Y%m%d -s \""] = string(_(": \"Date\"")); - map_error["date +%T -s \""] = string(_(": \"Date\"")); - map_error["ubconfig --source default get clock HWCLOCK_SYNC"] = string(_(": \"Hardware time\"")); + map_error["xdg-open https://wiki.ublinux.ru/ru/home"] = string(gettext(": \"xdg-open\"")); + map_error["ubconfig --default --source system get clock ZONE"] = string(gettext(": \"Time Zone\"")); + map_error["hwclock --systohc"] = string(gettext(": \"Hardware time\"")); + map_error["ubconfig --default --source system get network NTPSERVERS"] = string(gettext(": \"NTP\"")); + map_error["ubconfig --source=default get NTPSERVERS_DEFAULT"] = string(gettext(": \"NTP\"")); + map_error["ubconfig --default --source system get clock HWCLOCK_SYNC"] = string(gettext(": \"Hardware time\"")); + map_error["ubconfig --default --source global get network NTPSERVERS"] = string(gettext(": \"NTP\"")); + map_error["ubconfig --default --source global get clock ZONE"] = string(gettext(": \"Time Zone\"")); + map_error["ubconfig --default --source global get clock HWCLOCK_SYNC"] = string(gettext(": \"Hardware time\"")); + map_error["ubconfig --source global get clock HWCLOCK_SYNC"] = string(gettext(": \"Hardware time\"")); + map_error["ubconfig --target system set clock ZONE="] = string(gettext(": \"Time Zone\"")); + map_error["ubconfig --target system set network NTPSERVERS=default"] = string(gettext(": \"NTP\"")); + map_error["ubconfig --target system set network NTPSERVERS=dhcp"] = string(gettext(": \"NTP\"")); + map_error["ubconfig --target system set network NTPSERVERS=\""] = string(gettext(": \"NTP\"")); + map_error["ubconfig --target system remove network NTPSERVERS"] = string(gettext(": \"NTP\"")); + map_error["ubconfig --target system set clock HWCLOCK_SYNC=localtime"] = string(gettext(": \"Hardware time\"")); + map_error["ubconfig --target system set clock HWCLOCK_SYNC=utc"] = string(gettext(": \"Hardware time\"")); + map_error["ubconfig --target global set clock ZONE="] = string(gettext(": \"Time Zone\"")); + map_error["ubconfig --target global set network NTPSERVERS=default"] = string(gettext(": \"NTP\"")); + map_error["ubconfig --target global set network NTPSERVERS=dhcp"] = string(gettext(": \"NTP\"")); + map_error["ubconfig --target global set network NTPSERVERS=\""] = string(gettext(": \"NTP\"")); + map_error["ubconfig --target global remove network NTPSERVERS"] = string(gettext(": \"NTP\"")); + map_error["ubconfig --target global set clock HWCLOCK_SYNC=localtime"] = string(gettext(": \"Hardware time\"")); + map_error["ubconfig --target global set clock HWCLOCK_SYNC=utc"] = string(gettext(": \"Hardware time\"")); + map_error["ubconfig --source default get [] NTPSERVERS_DEFAULT"] = string(gettext(": \"NTP\"")); + map_error["date +%Y%m%d -s \""] = string(gettext(": \"Date\"")); + map_error["date +%T -s \""] = string(gettext(": \"Date\"")); + map_error["ubconfig --source default get clock HWCLOCK_SYNC"] = string(gettext(": \"Hardware time\"")); this->get_builder(); this->add_CSS(); ubl_make_plugs(boxSave,boxButton, socket_ext_id_I, socket_trd_id_I); @@ -112,7 +112,7 @@ void MainWindow::settings() { this->event(); imgInfo->set_from_icon_name("com.ublinux.ubl-settings-datetime.warning", Gtk::ICON_SIZE_MENU); info_status_app("boxInfoMessError"); - lblWarning->set_text(_("The program must be run as root")); + lblWarning->set_text(gettext("The program must be run as root")); } } @@ -120,35 +120,35 @@ void MainWindow::lacalization() { time_t now = time(0); tm *ltm = localtime(&now); unsigned int year = 1900+ ltm->tm_year; - string str_authors = string(_("Copyright © UBSoft LLC, 2022 - ")) + to_string(year); + string str_authors = string(gettext("Copyright © UBSoft LLC, 2022 - ")) + to_string(year); aboutWindows->set_copyright(str_authors); - aboutWindows->set_comments(_("Date and Time")); - aboutWindows->set_website(_("https://wiki.ublinux.com")); - aboutWindows->set_version(_(version_application.c_str())); - aboutWindows->set_website_label(_("Project Home Page")); - lblSave->set_label(_("Save")); - lblLoad->set_label(_("Load")); - txtDate->set_tooltip_text(_("Date of\nFormat: DD.MM.YYYY")); - txtNtpServer->set_tooltip_text(_("Enter the name of the ntp-server or its ip-address.\nWhen entering multiple addresses, separate them with commas.")); - lblSynchronizebChkGLob->set_text(_("Synchronize via NTP")); - cbDhcp->append(_("Default")); - cbDhcp->append(_("DHCP")); - cbDhcp->append(_("Manual")); - cbDhcp->append(_("Disabled")); - lblDateTimeSetting->set_text(_("Current date and time")); - lblHead->set_text(_("Setting the date and time")); - lblTime->set_text(_("Time:")); - lblData->set_text(_("Date:")); - lblTimeZone->set_text(_("Time zone")); - lblReg->set_text(_("Region:")); - lblZone->set_text(_("Zone:")); - lblSynchronizeBtn->set_text(_("Sync by")); - lblHeader->set_text(_("ubl-settings-datetime")); - windowMessDchp->set_title(_("Warning!")); - lblTimeBios->set_text(_("Synchronize hardware time")); - lblHW->set_text(_("Synchronize hardware time:")); - array_hw_local[0] = _("UTC time"); - array_hw_local[1] = _("Local time"); + aboutWindows->set_comments(gettext("Date and Time")); + aboutWindows->set_website(gettext("https://wiki.ublinux.com")); + aboutWindows->set_version(gettext(version_application.c_str())); + aboutWindows->set_website_label(gettext("Project Home Page")); + lblSave->set_label(gettext("Save")); + lblLoad->set_label(gettext("Load")); + txtDate->set_tooltip_text(gettext("Date of\nFormat: DD.MM.YYYY")); + txtNtpServer->set_tooltip_text(gettext("Enter the name of the ntp-server or its ip-address.\nWhen entering multiple addresses, separate them with commas.")); + lblSynchronizebChkGLob->set_text(gettext("Synchronize via NTP")); + cbDhcp->append(gettext("Default")); + cbDhcp->append(gettext("DHCP")); + cbDhcp->append(gettext("Manual")); + cbDhcp->append(gettext("Disabled")); + lblDateTimeSetting->set_text(gettext("Current date and time")); + lblHead->set_text(gettext("Setting the date and time")); + lblTime->set_text(gettext("Time:")); + lblData->set_text(gettext("Date:")); + lblTimeZone->set_text(gettext("Time zone")); + lblReg->set_text(gettext("Region:")); + lblZone->set_text(gettext("Zone:")); + lblSynchronizeBtn->set_text(gettext("Sync by")); + lblHeader->set_text(gettext("ubl-settings-datetime")); + windowMessDchp->set_title(gettext("Warning!")); + lblTimeBios->set_text(gettext("Synchronize hardware time")); + lblHW->set_text(gettext("Synchronize hardware time:")); + array_hw_local[0] = gettext("UTC time"); + array_hw_local[1] = gettext("Local time"); array_hw[0] = "utc"; array_hw[1] = "localtime"; this->bubble_sort(array_hw, array_hw_local, 2); @@ -384,7 +384,7 @@ void MainWindow::event_zone() { void MainWindow::synopsis_show() { int start_error = error_info; - string cmd = "xdg-open " + string(_("https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/")) + app_name; + string cmd = "xdg-open " + string(gettext("https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/")) + app_name; if (geteuid() == 0) { string response_user = getlogin(); cmd = "su -l " + response_user + " -c \" DISPLAY=$DISPLAY " + cmd + " \""; @@ -430,7 +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))) { - lblWarning->set_text(_("Nothing to save!")); + lblWarning->set_text(gettext("Nothing to save!")); } else { string cmd_zone = "ubconfig --target system set clock ZONE="; @@ -461,7 +461,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))) { - lblWarning->set_text(_("Nothing to save!")); + lblWarning->set_text(gettext("Nothing to save!")); } else { string cmd = "ubconfig --target global set clock ZONE="; @@ -491,7 +491,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))) { - lblWarning->set_text(_("Nothing to save!")); + lblWarning->set_text(gettext("Nothing to save!")); } else { string cmd = ""; @@ -659,23 +659,23 @@ void MainWindow::info_warning_error(int mess) { warning_info = 0; string mess_error = ""; if (mess == 0) { - mess_error = string(_("Local configuration reading error")) + cmd_error; + mess_error = string(gettext("Local configuration reading error")) + cmd_error; lblWarning->set_text(mess_error); } else if (mess == 1) { - mess_error = string(_("Global configuration read error")) + cmd_error; + mess_error = string(gettext("Global configuration read error")) + cmd_error; lblWarning->set_text(mess_error); } else if (mess == 2) { - mess_error = string(_("Local configuration write error")) + cmd_error; + mess_error = string(gettext("Local configuration write error")) + cmd_error; lblWarning->set_text(mess_error); } else if (mess == 3) { - mess_error = string(_("Global configuration write error")) + cmd_error; + mess_error = string(gettext("Global configuration write error")) + cmd_error; lblWarning->set_text(mess_error); } else if (mess == 4) { - mess_error = string(_("Error saved local and global configuration")) + cmd_error; + mess_error = string(gettext("Error saved local and global configuration")) + cmd_error; lblWarning->set_text(mess_error); } cmd_error = ""; @@ -684,19 +684,19 @@ void MainWindow::info_warning_error(int mess) { info_status_app("boxInfoMessOK"); imgInfo->set_from_icon_name("com.ublinux.ubl-settings-datetime.checked", Gtk::ICON_SIZE_MENU);//Gtk::IconSize::INHERIT); if (mess == 0) { - lblWarning->set_text(_("Local configuration downloaded successfully")); + lblWarning->set_text(gettext("Local configuration downloaded successfully")); } else if (mess == 1) { - lblWarning->set_text(_("Global configuration downloaded successfully")); + lblWarning->set_text(gettext("Global configuration downloaded successfully")); } else if (mess == 2) { - lblWarning->set_text(_("Local configuration successfully written")); + lblWarning->set_text(gettext("Local configuration successfully written")); } else if (mess == 3) { - lblWarning->set_text(_("Global configuration successfully written")); + lblWarning->set_text(gettext("Global configuration successfully written")); } else if (mess == 4) { - lblWarning->set_text(_("Successfully saved local and global configuration")); + lblWarning->set_text(gettext("Successfully saved local and global configuration")); } } } @@ -788,7 +788,7 @@ void MainWindow::gui_mess_close() { bool MainWindow::focus_ntp_text() { if (txtNtpServer->get_text() == "" || txtNtpServer->get_text() == " ") { - lblMessage->set_text(_("Enter DHCP!")); + lblMessage->set_text(gettext("Enter DHCP!")); windowMessDchp->show(); } else { @@ -814,11 +814,11 @@ bool MainWindow::focus_ntp_text() { } else { if (flag_error == true) { - lblMessage->set_text(_("An invalid character is entered")); + lblMessage->set_text(gettext("An invalid character is entered")); windowMessDchp->show(); } else if (flag_error_check_ntp == true) { - lblMessage->set_text(_("Error in the ntp name")); + lblMessage->set_text(gettext("Error in the ntp name")); windowMessDchp->show(); } return false; @@ -1051,7 +1051,7 @@ void MainWindow::entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhc // btnUpdateDateTime->set_sensitive(false); if (str_dhcp == "") { this->write_config("", "dhcp"); - lblMessage->set_text(_("Enter DHCP!")); + lblMessage->set_text(gettext("Enter DHCP!")); windowMessDchp->show(); } else if (str_dhcp == "(null)") { @@ -1230,7 +1230,7 @@ void MainWindow::append_region_zone(string region, string zone, Gtk::ComboBoxTex int size_vec = array_region_local.size(); if (size_vec== 0) { for (auto& [key, value]: time_reg_map) { - array_region_local.push_back(string(_(key.c_str()))); + array_region_local.push_back(string(gettext(key.c_str()))); array_region.push_back(key); index += 1; } @@ -1256,7 +1256,7 @@ void MainWindow::append_region_zone(string region, string zone, Gtk::ComboBoxTex if (size_vec == 0) { tmpCbReg->append(Glib::ustring(reg)); } - if (reg == string(_(region.c_str()))) { + if (reg == string(gettext(region.c_str()))) { tmpCbReg->set_active_text(reg); } } @@ -1266,7 +1266,7 @@ void MainWindow::append_region_zone(string region, string zone, Gtk::ComboBoxTex string path_reg_zone = ""; string zone_offest = ""; path_reg_zone = region + "/" + zone; - zone_offest = this->zone_file_read(path_reg_zone) + _(zone.c_str()); + zone_offest = this->zone_file_read(path_reg_zone) + gettext(zone.c_str()); if (region == "") { tmpCbZone->append(" "); tmpCbZone->set_active(0); @@ -1399,12 +1399,12 @@ 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(_("Incorrect date format")); + lblMessage->set_text(gettext("Incorrect date format")); windowMessDchp->show(); } } else { - lblMessage->set_text(_("Incorrect date format")); + lblMessage->set_text(gettext("Incorrect date format")); windowMessDchp->show(); } } @@ -1469,7 +1469,7 @@ void MainWindow::read_file() { string reg_reg_zone = entry_reg_reg_zone.path().filename().string(); zone.push_back(reg_reg_zone); path_reg_zone=key_reg + "/" + reg_reg_zone; - key_zone_local = this->zone_file_read(path_reg_zone) + _(reg_reg_zone.c_str()); + key_zone_local = this->zone_file_read(path_reg_zone) + gettext(reg_reg_zone.c_str()); zone_local.push_back(key_zone_local); } in2.close(); @@ -1478,7 +1478,7 @@ void MainWindow::read_file() { else if (key_zone.length() != 0 || key_zone != " ") { zone.push_back(key_zone); path_reg_zone = key_reg + "/" + key_zone; - key_zone_local = this->zone_file_read(path_reg_zone) + _(key_zone.c_str()); + key_zone_local = this->zone_file_read(path_reg_zone) + gettext(key_zone.c_str()); zone_local.push_back(key_zone_local); } } diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot index f3fd696..e1feb1f 100644 --- a/ubl-settings-datetime.pot +++ b/ubl-settings-datetime.pot @@ -1,1807 +1,1897 @@ -# Russian translations for PACKAGE package. -# Copyright (C) 2023 THE PACKAGE'S COPYRIGHT HOLDER +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Automatically generated, 2023. +# FIRST AUTHOR , YEAR. # - +#, fuzzy msgid "" msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-03-22 11:06+0600\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" -msgid "https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/" +msgid ":" msgstr "" -msgid "Copyright © UBSoft LLC, 2022 - " +#: source/ubl-settings-datetime.cc:82 source/ubl-settings-datetime.cc:83 +msgid ": \"Date\"" msgstr "" -msgid "Nothing to save!" +#: 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 "" -msgid "Select the method of hardware time synchronization" +#: 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 "" -msgid "https://wiki.ublinux.com" +#: 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 "" -msgid "Local time" +#: source/ubl-settings-datetime.cc:57 +msgid ": \"xdg-open\"" msgstr "" -msgid "UTC time" +msgid "Abidjan" msgstr "" -msgid "Synchronize hardware time:" +msgid "About" msgstr "" -msgid "An invalid character is entered" +msgid "Accra" msgstr "" -msgid "Longyearbyen" +msgid "Acre" msgstr "" -msgid "Error in the ntp name" +msgid "" +"Active service detected\n" +"Automatic time and date synchronization service detected" msgstr "" -msgid "Stop the synchronization service" +msgid "Adak" msgstr "" -msgid "Close" +msgid "Addis_Ababa" msgstr "" -msgid "Active service detected\nAutomatic time and date synchronization service detected" +msgid "Adelaide" msgstr "" -msgid "Default" +msgid "Aden" msgstr "" -msgid "The program must be run with \nsuperuser privileges!" +msgid "Africa" msgstr "" -msgid "The program must be run as root" +msgid "Alaska" msgstr "" -msgid "Manual" +msgid "Aleutian" msgstr "" -msgid "Enter DHCP!" +msgid "Algiers" msgstr "" -msgid "OK" +msgid "Almaty" msgstr "" -msgid "Setting the date and time" +msgid "America" msgstr "" -msgid "Successfully saved local and global configuration" +msgid "Amman" msgstr "" -msgid "Error saved local and global configuration" +msgid "Amsterdam" msgstr "" -msgid "Settings the date and time" +#: source/ubl-settings-datetime.cc:817 +msgid "An invalid character is entered" msgstr "" -msgid "Current date and time" +msgid "Anadyr" msgstr "" -msgid "Global customization" +msgid "Anchorage" msgstr "" -msgid "Change the NTPSERVERS parameter" +msgid "Andorra" msgstr "" -msgid "ubl-settings-datetime" +msgid "Anguilla" msgstr "" -msgid "Time:" +msgid "Antananarivo" msgstr "" -msgid "Clock" +msgid "Antarctica" msgstr "" -msgid ":" +msgid "Antigua" msgstr "" -msgid "Minutes" +msgid "Apia" msgstr "" -msgid "Date:" +msgid "Aqtau" msgstr "" -msgid "Date of\nFormat: DD.MM.YYYY" +msgid "Aqtobe" msgstr "" -msgid "Interactive date picker" +msgid "Araguaina" msgstr "" -msgid "Change zone setting" +msgid "Arctic" msgstr "" -msgid "Region:" +msgid "Argument not recognized\n" msgstr "" -msgid "Zone:" +msgid "Arizona" msgstr "" -msgid "Sync by" +msgid "Aruba" msgstr "" -msgid "Automatic time synchronization" +msgid "Ashgabat" msgstr "" -msgid "Synchronize via NTP" +msgid "Ashkhabad" msgstr "" -msgid "Time zone" +msgid "Asia" msgstr "" -msgid "Setting date and time in global configuration" +msgid "Asmara" msgstr "" -msgid "Incorrect date format" +msgid "Asmera" msgstr "" -msgid "Synchronize hardware time" +msgid "Astrakhan" msgstr "" -msgid "Warning!" +msgid "Asuncion" msgstr "" -msgid "ERROR" +msgid "Athens" msgstr "" -msgid "America" +msgid "Atikokan" msgstr "" -msgid "Brazil" +msgid "Atka" msgstr "" -msgid "Aruba" +msgid "Atlantic" msgstr "" -msgid "Asia" +msgid "Atyrau" msgstr "" -msgid "Mexico_City" +msgid "Auckland" msgstr "" -msgid "Antarctica" +msgid "Australia" msgstr "" -msgid "Dubai" +msgid "Automatic time synchronization" msgstr "" -msgid "Antigua" +msgid "Azores" msgstr "" -msgid "Lima" +msgid "Baghdad" msgstr "" -msgid "Manaus" +msgid "Bahia" msgstr "" -msgid "Africa" +msgid "Bahia_Banderas" msgstr "" -msgid "Chicago" +msgid "Bahrain" msgstr "" -msgid "Punta_Arenas" +msgid "BajaNorte" msgstr "" -msgid "Europe" +msgid "BajaSur" msgstr "" -msgid "Djibouti" +msgid "Baku" msgstr "" -msgid "Pyongyang" +msgid "Bamako" msgstr "" -msgid "Australia" +msgid "Bangkok" msgstr "" -msgid "Mazatlan" +msgid "Bangui" msgstr "" -msgid "Macau" +msgid "Banjul" msgstr "" -msgid "Denver" +msgid "Barbados" msgstr "" -msgid "Yakutat" +msgid "Barnaul" msgstr "" -msgid "Currie" +msgid "Beirut" msgstr "" -msgid "Dar_es_Salaam" +msgid "Belem" msgstr "" -msgid "Thunder_Bay" +msgid "Belfast" msgstr "" -msgid "Los_Angeles" +msgid "Belgrade" msgstr "" -msgid "Nome" +msgid "Belize" msgstr "" -msgid "Colombo" +msgid "Berlin" msgstr "" -msgid "Nairobi" +msgid "Bermuda" msgstr "" -msgid "Prague" +msgid "Beulah" msgstr "" -msgid "Metlakatla" +msgid "Bishkek" msgstr "" -msgid "Vostok" +msgid "Bissau" msgstr "" msgid "Blanc-Sablon" msgstr "" -msgid "Port_Moresby" +msgid "Blantyre" msgstr "" -msgid "US" +msgid "Boa_Vista" msgstr "" -msgid "Ouagadougou" +msgid "Bogota" msgstr "" -msgid "Tashkent" +msgid "Boise" msgstr "" -msgid "Maputo" +msgid "Bougainville" msgstr "" -msgid "Qatar" +msgid "Bratislava" msgstr "" -msgid "Chita" +msgid "Brazil" msgstr "" -msgid "Caracas" +msgid "Brazzaville" msgstr "" -msgid "Central" +msgid "Brisbane" msgstr "" -msgid "Chatham" +msgid "Broken_Hill" +msgstr "" + +msgid "Brunei" msgstr "" msgid "Brussels" msgstr "" -msgid "Zaporozhye" +msgid "Bucharest" msgstr "" -msgid "Cambridge_Bay" +msgid "Budapest" msgstr "" -msgid "Guayaquil" +msgid "Buenos_Aires" msgstr "" -msgid "Coral_Harbour" +msgid "Bujumbura" msgstr "" -msgid "Kigali" +msgid "Busingen" msgstr "" -msgid "Zagreb" +msgid "Cairo" msgstr "" -msgid "Maseru" +msgid "Calcutta" msgstr "" -msgid "Belgrade" +msgid "Cambridge_Bay" msgstr "" -msgid "Goose_Bay" +msgid "Campo_Grande" msgstr "" -msgid "Monterrey" +msgid "Canada" msgstr "" -msgid "Luxembourg" +msgid "Canary" msgstr "" -msgid "Cayman" +msgid "Canberra" msgstr "" -msgid "Alaska" +msgid "Cancun" msgstr "" -msgid "Skopje" +msgid "Cape_Vepde" msgstr "" -msgid "St_Kitts" +msgid "Cape_Verde" msgstr "" -msgid "Kampala" +msgid "Caracas" msgstr "" -msgid "Rankin_Inlet" +msgid "Casablanca" msgstr "" -msgid "Kolkata" +msgid "Casey" msgstr "" -msgid "Canada" +msgid "Catamarca" msgstr "" -msgid "Dominica" +msgid "Cayenne" msgstr "" -msgid "Bucharest" +msgid "Cayman" msgstr "" -msgid "Zurich" +msgid "Center" msgstr "" -msgid "Queensland" +msgid "Central" msgstr "" -msgid "Atikokan" +msgid "Ceuta" msgstr "" -msgid "Mbabane" +msgid "Chagos" msgstr "" -msgid "Kathmandu" +msgid "Change the NTPSERVERS parameter" msgstr "" -msgid "Indian" +msgid "Change zone setting" msgstr "" -msgid "Khandyga" +msgid "Chatham" msgstr "" -msgid "Guernsey" +msgid "Chicago" msgstr "" -msgid "Yerevan" +msgid "Chihuahua" msgstr "" -msgid "Buenos_Aires" +msgid "Chile" msgstr "" -msgid "Tunis" +msgid "Chisinau" msgstr "" -msgid "Easter" +msgid "Chita" msgstr "" -msgid "Matamoros" +msgid "Choibalsan" msgstr "" -msgid "East-Indiana" +msgid "Chongqing" msgstr "" -msgid "Singapore" +msgid "Christmas" msgstr "" -msgid "Atlantic" +msgid "Chungking" msgstr "" -msgid "Canary" +msgid "Chuuk" msgstr "" -msgid "Fort_Nelson" +msgid "Ciudad_Juarez" msgstr "" -msgid "Recife" +msgid "Clock" msgstr "" -msgid "Malta" +msgid "Close" msgstr "" -msgid "Eucla" +msgid "Cocos" msgstr "" -msgid "Azores" +msgid "Colombo" msgstr "" -msgid "Santiago" +msgid "ComodRivadavia" msgstr "" -msgid "Aden" +msgid "Comoro" msgstr "" -msgid "Merida" +msgid "Conakry" msgstr "" -msgid "Baku" +msgid "Continental" msgstr "" -msgid "Belem" +msgid "Copenhagen" msgstr "" -msgid "Ceuta" +#: source/ubl-settings-datetime.cc:123 +msgid "Copyright © UBSoft LLC, 2022 - " msgstr "" -msgid "San_Marino" +msgid "Coral_Harbour" msgstr "" -msgid "Barnaul" +msgid "Cordoba" msgstr "" -msgid "Damascus" +msgid "Costa_Rica" msgstr "" -msgid "Fakaofo" +msgid "Creston" msgstr "" -msgid "Dawson" +msgid "Cuiaba" msgstr "" -msgid "Irkutsk" +msgid "Curacao" msgstr "" -msgid "Anguilla" +#: source/ubl-settings-datetime.cc:138 +msgid "Current date and time" msgstr "" -msgid "Tijuana" +msgid "Currie" msgstr "" -msgid "Warsaw" +#: source/ubl-settings-datetime.cc:135 +msgid "DHCP" msgstr "" -msgid "Adak" +msgid "Dacca" msgstr "" -msgid "London" +msgid "Dakar" msgstr "" -msgid "Jayapura" +msgid "Damascus" msgstr "" -msgid "St_Vincent" +msgid "Danmarkshavn" +msgstr "" + +msgid "Dar_es_Salaam" msgstr "" msgid "Darwin" msgstr "" -msgid "Cayenne" +#: source/ubl-settings-datetime.cc:125 +msgid "Date and Time" msgstr "" -msgid "St_Johns" +#: source/ubl-settings-datetime.cc:131 +msgid "" +"Date of\n" +"Format: DD.MM.YYYY" msgstr "" -msgid "Khartoum" +#: source/ubl-settings-datetime.cc:141 +msgid "Date:" msgstr "" -msgid "Rainy_River" +msgid "Davis" msgstr "" -msgid "Samara" +msgid "Dawson" msgstr "" -msgid "Vienna" +msgid "Dawson_Creek" msgstr "" -msgid "Ndjamena" +msgid "DeNoronha" msgstr "" -msgid "Vladivostok" +#: source/ubl-settings-datetime.cc:134 +msgid "Default" msgstr "" -msgid "Saratov" +msgid "Denver" msgstr "" -msgid "Nuuk" +msgid "Detroit" msgstr "" -msgid "Chongqing" +msgid "Dhaka" msgstr "" -msgid "North" +msgid "Dili" msgstr "" -msgid "Atka" +#: source/ubl-settings-datetime.cc:137 +msgid "Disabled" msgstr "" -msgid "Swift_Current" +msgid "Djibouti" msgstr "" -msgid "Bangkok" +msgid "Dominica" msgstr "" -msgid "Blantyre" +msgid "Douala" msgstr "" -msgid "Algiers" +msgid "Dubai" msgstr "" -msgid "Freetown" +msgid "Dublin" msgstr "" -msgid "GMT-1" +msgid "DumontDUrville" msgstr "" -msgid "Detroit" +msgid "Dushanbe" msgstr "" -msgid "Johannesburg" +msgid "ERROR" msgstr "" -msgid "Shanghai" +msgid "East" msgstr "" -msgid "Novokuznetsk" +msgid "East-Indiana" msgstr "" -msgid "Dawson_Creek" +msgid "Easter" msgstr "" -msgid "Srednekolymsk" +msgid "EasterIsland" msgstr "" -msgid "Grenada" +msgid "Easterlsland" msgstr "" -msgid "Samoa" +msgid "Eastern" msgstr "" -msgid "Rarotonga" +msgid "Edmonton" msgstr "" -msgid "Broken_Hill" +msgid "Efate" msgstr "" -msgid "Winnipeg" +msgid "Eirunepe" msgstr "" -msgid "Tripoli" +msgid "El_Aaiun" msgstr "" -msgid "Perth" +msgid "El_Salvador" msgstr "" -msgid "Comoro" +msgid "Enderbury" msgstr "" -msgid "Tarawa" +msgid "Ensenada" msgstr "" -msgid "DeNoronha" +#: source/ubl-settings-datetime.cc:791 source/ubl-settings-datetime.cc:1054 +msgid "Enter DHCP!" msgstr "" -msgid "Rio_Branco" +#: 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 "" -msgid "St_Helena" +#: source/ubl-settings-datetime.cc:821 +msgid "Error in the ntp name" msgstr "" -msgid "Famagusta" +#: source/ubl-settings-datetime.cc:678 +msgid "Error saved local and global configuration" msgstr "" -msgid "Noronha" +msgid "Eucla" msgstr "" -msgid "Rangoon" +msgid "Europe" msgstr "" -msgid "Hermosillo" +msgid "Faeroe" msgstr "" -msgid "Bahia" +msgid "Fakaofo" msgstr "" -msgid "Tortola" +msgid "Famagusta" msgstr "" -msgid "Sao_Paulo" +msgid "Faroe" msgstr "" -msgid "Dakar" +msgid "Fiji" msgstr "" -msgid "Jan_Mayen" +msgid "Fort_Nelson" msgstr "" -msgid "Acre" +msgid "Fort_Wayne" msgstr "" -msgid "Choibalsan" +msgid "Fortaleza" msgstr "" -msgid "Sitka" +msgid "Freetown" msgstr "" -msgid "Arizona" +msgid "Funafuti" msgstr "" -msgid "Jersey" +msgid "GMT-1" msgstr "" -msgid "Juneau" +msgid "GMT-3" msgstr "" -msgid "Brisbane" +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 "" -msgid "Rome" +msgid "Gaborone" msgstr "" -msgid "Troll" +msgid "Galapagos" msgstr "" -msgid "Ashkhabad" +msgid "Gambier" msgstr "" -msgid "Guatemala" +msgid "Gaza" msgstr "" -msgid "Dublin" +msgid "General" msgstr "" -msgid "Barbados" +msgid "Gibraltar" msgstr "" -msgid "Conakry" +msgid "Glace_Bay" msgstr "" -msgid "Montserrat" +#: source/ubl-settings-datetime.cc:690 +msgid "Global configuration downloaded successfully" msgstr "" -msgid "Sarajevo" +#: source/ubl-settings-datetime.cc:666 +msgid "Global configuration read error" msgstr "" -msgid "Abidjan" +#: source/ubl-settings-datetime.cc:696 +msgid "Global configuration successfully written" msgstr "" -msgid "Scoresbysund" +#: source/ubl-settings-datetime.cc:674 +msgid "Global configuration write error" msgstr "" -msgid "Cancun" +msgid "Global customization" msgstr "" -msgid "Pohnpei" +msgid "Godthab" msgstr "" -msgid "Pacific" +msgid "Goose_Bay" msgstr "" -msgid "Chungking" +msgid "Grand_Turk" msgstr "" msgid "Greenwich" msgstr "" -msgid "Anchorage" +msgid "Grenada" msgstr "" -msgid "Chihuahua" +msgid "Guadalcanal" msgstr "" -msgid "Porto-Novo" +msgid "Guadeloupe" msgstr "" -msgid "Boise" +msgid "Guam" msgstr "" -msgid "Chile" +msgid "Guatemala" msgstr "" -msgid "Bratislava" +msgid "Guayaquil" msgstr "" -msgid "Bahrain" +msgid "Guernsey" msgstr "" -msgid "Athens" +msgid "Guyana" msgstr "" -msgid "Ulaanbaatar" +msgid "Halifax" msgstr "" -msgid "Maceio" +msgid "Harare" msgstr "" -msgid "Mawson" +msgid "Harbin" msgstr "" -msgid "Newfoundland" +msgid "Havana" msgstr "" -msgid "Tiraspol" +msgid "Hawaii" msgstr "" -msgid "Aqtau" +msgid "Hebron" msgstr "" -msgid "Bujumbura" +msgid "Help" msgstr "" -msgid "Saskatchewan" +msgid "Helsinki" msgstr "" -msgid "Norfolk" +msgid "Hermosillo" msgstr "" -msgid "Pontianak" +msgid "Ho_Chi_Minh" msgstr "" -msgid "Panama" +msgid "Hobart" msgstr "" -msgid "Kuala_Lumpur" +msgid "Hong_Kong" msgstr "" -msgid "Ashgabat" +msgid "Honolulu" msgstr "" -msgid "Whitehorse" +msgid "Hovd" msgstr "" -msgid "Busingen" +#: source/ubl-settings-datetime.cc:1402 source/ubl-settings-datetime.cc:1407 +msgid "Incorrect date format" msgstr "" -msgid "Lower_Princes" +msgid "Indian" msgstr "" -msgid "Niamey" +msgid "Indiana" msgstr "" -msgid "El_Aaiun" +msgid "Indiana-Starke" msgstr "" -msgid "Ulyanovsk" +msgid "Indianapolis" msgstr "" -msgid "Minsk" +msgid "Interactive date picker" msgstr "" -msgid "Asmara" +msgid "Inuvik" msgstr "" -msgid "Taipei" +msgid "Iqaluit" msgstr "" -msgid "Danmarkshavn" +msgid "Irkutsk" msgstr "" -msgid "Casey" +msgid "Isle_of_Man" msgstr "" -msgid "Tbilisi" +msgid "Istanbul" msgstr "" -msgid "Beirut" +msgid "Jakarta" msgstr "" -msgid "Stockholm" +msgid "Jamaica" msgstr "" -msgid "Santa_Isabel" +msgid "Jan_Mayen" msgstr "" -msgid "Ho_Chi_Minh" +msgid "Jayapura" msgstr "" -msgid "Funafuti" +msgid "Jersey" msgstr "" -msgid "Lubumbashi" +msgid "Jerusalem" msgstr "" -msgid "Tahiti" +msgid "Johannesburg" msgstr "" -msgid "Toronto" +msgid "Johnston" msgstr "" -msgid "Hebron" +msgid "Juba" msgstr "" -msgid "Lisbon" +msgid "Jujuy" msgstr "" -msgid "Mogadishu" +msgid "Juneau" msgstr "" -msgid "Edmonton" +msgid "Kabul" msgstr "" -msgid "Chisinau" +msgid "Kaliningrad" msgstr "" -msgid "Grand_Turk" +msgid "Kamchatka" msgstr "" -msgid "Antananarivo" +msgid "Kampala" msgstr "" -msgid "Dushanbe" +msgid "Kanton" msgstr "" -msgid "McMurdo" +msgid "Karachi" msgstr "" -msgid "Truk" +msgid "Kashgar" msgstr "" -msgid "Cordoba" +msgid "Kathmandu" msgstr "" -msgid "Indianapolis" +msgid "Katmandu" msgstr "" -msgid "Wake" +msgid "Kerguelen" msgstr "" -msgid "Qostanay" +msgid "Khandyga" msgstr "" -msgid "Syowa" +msgid "Khartoum" msgstr "" -msgid "Managua" +msgid "Kiev" msgstr "" -msgid "Fortaleza" +msgid "Kigali" msgstr "" -msgid "Ponape" +msgid "Kinshasa" msgstr "" -msgid "Havana" +msgid "Kiritimati" msgstr "" -msgid "Yukon" +msgid "Kirov" msgstr "" -msgid "Copenhagen" +msgid "Knox" msgstr "" -msgid "Kamchatka" +msgid "Knox_IN" msgstr "" -msgid "Amman" +msgid "Kolkata" msgstr "" -msgid "Pitcairn" +msgid "Kralendijk" msgstr "" -msgid "Yancowinna" +msgid "Krasnoyarsk" msgstr "" -msgid "Mexico" +msgid "Kuala_Lumpur" msgstr "" -msgid "Harare" +msgid "Kuching" msgstr "" -msgid "Riyadh" +msgid "Kuwait" msgstr "" -msgid "Lord_Howe" +msgid "Kwajalein" msgstr "" -msgid "Apia" +msgid "Kyiv" msgstr "" -msgid "Monaco" +msgid "LHI" msgstr "" -msgid "Aleutian" +msgid "La_Paz" msgstr "" -msgid "Montreal" +msgid "La_Rioja" msgstr "" -msgid "Davis" +msgid "Lagos" msgstr "" -msgid "Efate" +msgid "Libreville" msgstr "" -msgid "Honolulu" +msgid "Lima" msgstr "" -msgid "Lagos" +msgid "Lindeman" msgstr "" -msgid "Shiprock" +msgid "Lisbon" msgstr "" -msgid "Volgograd" +msgid "Ljubljana" msgstr "" -msgid "Vilnius" +#: source/ubl-settings-datetime.cc:130 +msgid "Load" msgstr "" -msgid "Oslo" +msgid "Load global configuration" msgstr "" -msgid "Vientiane" +msgid "Load local configuration" msgstr "" -msgid "Dili" +#: source/ubl-settings-datetime.cc:687 +msgid "Local configuration downloaded successfully" msgstr "" -msgid "Seoul" +#: source/ubl-settings-datetime.cc:662 +msgid "Local configuration reading error" msgstr "" -msgid "Kerguelen" +#: source/ubl-settings-datetime.cc:693 +msgid "Local configuration successfully written" msgstr "" -msgid "Curacao" +#: source/ubl-settings-datetime.cc:670 +msgid "Local configuration write error" msgstr "" -msgid "Jujuy" +#: source/ubl-settings-datetime.cc:151 +msgid "Local time" msgstr "" -msgid "Manila" +msgid "Lome" msgstr "" -msgid "Yap" +msgid "London" msgstr "" -msgid "Kuwait" +msgid "Longyearbyen" msgstr "" -msgid "Lindeman" +msgid "Lord_Howe" msgstr "" -msgid "Vaduz" +msgid "Los_Angeles" msgstr "" -msgid "Isle_of_Man" +msgid "Louisville" msgstr "" -msgid "Nassau" +msgid "Lower_Princes" msgstr "" -msgid "Zulu" +msgid "Luanda" msgstr "" -msgid "Campo_Grande" +msgid "Lubumbashi" msgstr "" -msgid "Libreville" +msgid "Lusaka" msgstr "" -msgid "Fiji" +msgid "Luxembourg" msgstr "" -msgid "Yakutsk" +msgid "Macao" msgstr "" -msgid "Ensenada" +msgid "Macau" msgstr "" -msgid "Kiritimati" +msgid "Maceio" msgstr "" -msgid "Kaliningrad" +msgid "Macquarie" msgstr "" -msgid "Creston" +msgid "Madeira" msgstr "" -msgid "Michigan" +msgid "Madrid" msgstr "" -msgid "Oral" +msgid "Magadan" msgstr "" -msgid "Cocos" +msgid "Mahe" msgstr "" -msgid "Eastern" +msgid "Majuro" msgstr "" -msgid "BajaNorte" +msgid "Makassar" msgstr "" -msgid "Tel_Aviv" +msgid "Malabo" msgstr "" -msgid "Sofia" +msgid "Maldives" msgstr "" -msgid "Adelaide" +msgid "Malta" msgstr "" -msgid "Vatican" +msgid "Managua" msgstr "" -msgid "Calcutta" +msgid "Manaus" msgstr "" -msgid "Lusaka" +msgid "Manila" msgstr "" -msgid "St_Barthelemy" +#: source/ubl-settings-datetime.cc:136 +msgid "Manual" msgstr "" -msgid "Bougainville" +msgid "Maputo" msgstr "" -msgid "Tegucigalpa" +msgid "Marengo" msgstr "" -msgid "Sao_Tome" +msgid "Mariehamn" msgstr "" -msgid "Moncton" +msgid "Marigot" +msgstr "" + +msgid "Marquesas" msgstr "" -msgid "Reykjavik" +msgid "Martinique" msgstr "" -msgid "St_Thomas" +msgid "Maseru" msgstr "" -msgid "Baghdad" +msgid "Matamoros" msgstr "" -msgid "Gibraltar" +msgid "Mauritius" msgstr "" -msgid "Puerto_Rico" +msgid "Mawson" msgstr "" -msgid "Asmera" +msgid "Mayotte" msgstr "" -msgid "Madrid" +msgid "Mazatlan" msgstr "" -msgid "Sakhalin" +msgid "Mbabane" msgstr "" -msgid "Porto_Acre" +msgid "McMurdo" msgstr "" -msgid "General" +msgid "Melbourne" msgstr "" -msgid "Macao" +msgid "Mendoza" msgstr "" -msgid "Martinique" +msgid "Menominee" msgstr "" -msgid "Mountain" +msgid "Merida" msgstr "" -msgid "Nipigon" +msgid "Metlakatla" msgstr "" -msgid "Vancouver" +msgid "Mexico" msgstr "" -msgid "Bangui" +msgid "Mexico_City" msgstr "" -msgid "Indiana-Starke" +msgid "Michigan" msgstr "" -msgid "Harbin" +msgid "Midway" msgstr "" -msgid "Istanbul" +msgid "Minsk" msgstr "" -msgid "Guadeloupe" +msgid "Minutes" msgstr "" -msgid "Simferopol" +msgid "Miquelon" msgstr "" -msgid "Paris" +msgid "Mogadishu" msgstr "" -msgid "Christmas" +msgid "Monaco" msgstr "" -msgid "Accra" +msgid "Moncton" msgstr "" -msgid "Victoria" +msgid "Monrovia" msgstr "" -msgid "Faeroe" +msgid "Monterrey" msgstr "" -msgid "Dacca" +msgid "Montevideo" msgstr "" -msgid "Marigot" +msgid "Monticello" msgstr "" -msgid "Dhaka" +msgid "Montreal" msgstr "" -msgid "Kralendijk" +msgid "Montserrat" msgstr "" -msgid "Aqtobe" +msgid "Moscow" msgstr "" -msgid "Pago_Pago" +msgid "Mountain" msgstr "" -msgid "Bahia_Banderas" +msgid "Muscat" msgstr "" -msgid "Continental" +msgid "NSW" msgstr "" -msgid "Midway" +msgid "Nairobi" msgstr "" -msgid "Johnston" +msgid "Nassau" msgstr "" -msgid "Tasmania" +msgid "Nauru" msgstr "" -msgid "Reunion" +msgid "Ndjamena" msgstr "" -msgid "South_Pole" +msgid "New_Salem" msgstr "" -msgid "Riga" +msgid "New_York" msgstr "" -msgid "La_Paz" +msgid "Newfoundland" msgstr "" -msgid "Niue" +msgid "Niamey" msgstr "" -msgid "Nouakchott" +msgid "Nicosia" msgstr "" -msgid "Berlin" +msgid "Nipigon" msgstr "" -msgid "Kwajalein" +msgid "Niue" msgstr "" -msgid "St_Lucia" +msgid "Nome" msgstr "" -msgid "Jakarta" +msgid "Norfolk" msgstr "" -msgid "Chuuk" +msgid "Noronha" msgstr "" -msgid "Tallinn" +msgid "North" msgstr "" -msgid "Nicosia" +msgid "North_Dokota" msgstr "" -msgid "New_York" +#: source/ubl-settings-datetime.cc:433 source/ubl-settings-datetime.cc:464 +#: source/ubl-settings-datetime.cc:494 +msgid "Nothing to save!" msgstr "" -msgid "Kuching" +msgid "Nouakchott" msgstr "" -msgid "Porto_Velho" +msgid "Noumea" msgstr "" -msgid "Canberra" +msgid "Novokuznetsk" msgstr "" -msgid "Douala" +msgid "Novosibirsk" msgstr "" -msgid "Atyrau" +msgid "Nuuk" msgstr "" -msgid "Madeira" +msgid "OK" msgstr "" -msgid "Phoenix" +msgid "Ojinaga" msgstr "" -msgid "Santo_Domingo" +msgid "Omsk" msgstr "" -msgid "El_Salvador" +msgid "Oral" msgstr "" -msgid "Anadyr" +msgid "Oslo" msgstr "" -msgid "Boa_Vista" +msgid "Ouagadougou" msgstr "" -msgid "Godthab" +msgid "Pacific" msgstr "" -msgid "Inuvik" +msgid "Pago_Pago" msgstr "" -msgid "Cairo" +msgid "Palau" msgstr "" -msgid "Ojinaga" +msgid "Palmer" msgstr "" -msgid "Samarkand" +msgid "Panama" msgstr "" -msgid "Jerusalem" +msgid "Pangnirtung" msgstr "" -msgid "Bishkek" +msgid "Paramaribo" msgstr "" -msgid "Karachi" +msgid "Paris" msgstr "" -msgid "Phnom_Penh" +msgid "Perth" msgstr "" -msgid "Qyzylorda" +msgid "Petersburg" msgstr "" -msgid "Auckland" +msgid "Phnom_Penh" msgstr "" -msgid "Makassar" +msgid "Phoenix" msgstr "" -msgid "Stanley" +msgid "Pitcairn" msgstr "" -msgid "Virgin" +msgid "Podgorica" msgstr "" -msgid "Noumea" +msgid "Pohnpei" msgstr "" -msgid "Budapest" +msgid "Ponape" msgstr "" -msgid "Tirane" +msgid "Pontianak" msgstr "" -msgid "Miquelon" +msgid "Port-au-Prince" msgstr "" -msgid "Krasnoyarsk" +msgid "Port_Moresby" msgstr "" -msgid "Rosario" +msgid "Port_of_Spain" msgstr "" -msgid "LHI" +msgid "Porto-Novo" msgstr "" -msgid "Bamako" +msgid "Porto_Acre" msgstr "" -msgid "Lome" +msgid "Porto_Velho" msgstr "" -msgid "Astrakhan" +msgid "Prague" msgstr "" -msgid "Addis_Ababa" +#: source/ubl-settings-datetime.cc:128 +msgid "Project Home Page" msgstr "" -msgid "GMT-3" +msgid "Puerto_Rico" msgstr "" -msgid "Tokyo" +msgid "Punta_Arenas" msgstr "" -msgid "Saipan" +msgid "Pyongyang" msgstr "" -msgid "Katmandu" +msgid "Qatar" msgstr "" -msgid "Monrovia" +msgid "Qostanay" msgstr "" -msgid "Casablanca" +msgid "Queensland" msgstr "" -msgid "Nauru" +msgid "Qyzylorda" msgstr "" -msgid "Guam" +msgid "Rainy_River" msgstr "" -msgid "Ust-Nera" +msgid "Rangoon" msgstr "" -msgid "Arctic" +msgid "Rankin_Inlet" msgstr "" -msgid "Menominee" +msgid "Rarotonga" msgstr "" -msgid "Asuncion" +msgid "Recife" msgstr "" -msgid "Rothera" +msgid "Regina" msgstr "" -msgid "Luanda" +#: source/ubl-settings-datetime.cc:143 +msgid "Region:" msgstr "" -msgid "Tomsk" +msgid "Resolute" msgstr "" -msgid "Guadalcanal" +msgid "Reunion" msgstr "" -msgid "Chagos" +msgid "Reykjavik" msgstr "" -msgid "Thimphu" +msgid "Riga" msgstr "" -msgid "Timbuktu" +msgid "Rio_Branco" msgstr "" -msgid "Glace_Bay" +msgid "Rio_Gallegos" msgstr "" -msgid "Marquesas" +msgid "Riyadh" msgstr "" -msgid "Brunei" +msgid "Rome" msgstr "" -msgid "Pangnirtung" +msgid "Rosario" msgstr "" -msgid "South" +msgid "Rothera" msgstr "" -msgid "Magadan" +msgid "Saigon" msgstr "" -msgid "Palau" +msgid "Saipan" msgstr "" -msgid "Yangon" +msgid "Sakhalin" msgstr "" -msgid "Tongatapu" +msgid "Salta" msgstr "" -msgid "Hobart" +msgid "Samara" msgstr "" -msgid "Bogota" +msgid "Samarkand" msgstr "" -msgid "Urumqi" +msgid "Samoa" msgstr "" -msgid "Kinshasa" +msgid "San_Juan" msgstr "" -msgid "Thule" +msgid "San_Luis" msgstr "" -msgid "Saigon" +msgid "San_Marino" msgstr "" -msgid "NSW" +msgid "Santa_Isabel" msgstr "" -msgid "Halifax" +msgid "Santarem" msgstr "" -msgid "Araguaina" +msgid "Santiago" msgstr "" -msgid "Muscat" +msgid "Santo_Domingo" msgstr "" -msgid "Kashgar" +msgid "Sao_Paulo" msgstr "" -msgid "Port-au-Prince" +msgid "Sao_Tome" msgstr "" -msgid "Resolute" +msgid "Sarajevo" msgstr "" -msgid "Kabul" +msgid "Saratov" msgstr "" -msgid "Kyiv" +msgid "Saskatchewan" msgstr "" -msgid "Omsk" +#: source/ubl-settings-datetime.cc:129 +msgid "Save" msgstr "" -msgid "Gaza" +msgid "Save global configuration" msgstr "" -msgid "Malabo" +msgid "Save local configuration" msgstr "" -msgid "Hovd" +msgid "Save to global and local configuration" msgstr "" -msgid "Jamaica" +msgid "Scoresbysund" msgstr "" -msgid "Faroe" +msgid "Select the method of hardware time synchronization" msgstr "" -msgid "Mahe" +msgid "Seoul" msgstr "" -msgid "Montevideo" +msgid "Setting date and time in global configuration" msgstr "" -msgid "Eirunepe" +#: source/ubl-settings-datetime.cc:139 +msgid "Setting the date and time" msgstr "" -msgid "Catamarca" +msgid "Settings the date and time" msgstr "" -msgid "Melbourne" +msgid "Shanghai" msgstr "" -msgid "Hawaii" +msgid "Shiprock" msgstr "" -msgid "Macquarie" +msgid "Simferopol" msgstr "" -msgid "Belfast" +msgid "Singapore" msgstr "" -msgid "Wallis" +msgid "Sitka" msgstr "" -msgid "Moscow" +msgid "Skopje" msgstr "" -msgid "Gaborone" +msgid "Sofia" msgstr "" -msgid "Port_of_Spain" +msgid "South" msgstr "" -msgid "Bissau" +msgid "South_Georgia" msgstr "" -msgid "Universal" +msgid "South_Pole" msgstr "" -msgid "Regina" +msgid "Srednekolymsk" msgstr "" -msgid "Ulan_Bator" +msgid "St_Barthelemy" msgstr "" -msgid "Ujung_Pandang" +msgid "St_Helena" msgstr "" -msgid "Costa_Rica" +msgid "St_Johns" msgstr "" -msgid "Galapagos" +msgid "St_Kitts" msgstr "" -msgid "Tehran" +msgid "St_Lucia" msgstr "" -msgid "DumontDUrville" +msgid "St_Thomas" msgstr "" -msgid "Enderbury" +msgid "St_Vincent" msgstr "" -msgid "Ciudad_Juarez" +msgid "Stanley" msgstr "" -msgid "Mauritius" +msgid "Stockholm" msgstr "" -msgid "Podgorica" +msgid "Stop the synchronization service" msgstr "" -msgid "Kiev" +#: source/ubl-settings-datetime.cc:699 +msgid "Successfully saved local and global configuration" msgstr "" -msgid "Hong_Kong" +msgid "Swift_Current" msgstr "" -msgid "Thimbu" +msgid "Sydney" msgstr "" -msgid "Belize" +#: source/ubl-settings-datetime.cc:145 +msgid "Sync by" msgstr "" -msgid "Gambier" +#: source/ubl-settings-datetime.cc:148 +msgid "Synchronize hardware time" msgstr "" -msgid "Sydney" +#: source/ubl-settings-datetime.cc:149 +msgid "Synchronize hardware time:" msgstr "" -msgid "Amsterdam" +#: source/ubl-settings-datetime.cc:133 +msgid "Synchronize via NTP" msgstr "" -msgid "Juba" +msgid "Syowa" msgstr "" -msgid "Helsinki" +msgid "Tahiti" msgstr "" -msgid "Santarem" +msgid "Taipei" msgstr "" -msgid "Guyana" +msgid "Tallinn" msgstr "" -msgid "Maldives" +msgid "Tarawa" msgstr "" -msgid "Paramaribo" +msgid "Tashkent" msgstr "" -msgid "Fort_Wayne" +msgid "Tasmania" msgstr "" -msgid "Yellowknife" +msgid "Tbilisi" msgstr "" -msgid "West" +msgid "Tegucigalpa" msgstr "" -msgid "Almaty" +msgid "Tehran" msgstr "" -msgid "Novosibirsk" +msgid "Tel_Aviv" msgstr "" -msgid "Mariehamn" +msgid "Tell_City" msgstr "" -msgid "Brazzaville" +#: source/ubl-settings-datetime.cc:115 +msgid "The program must be run as root" msgstr "" -msgid "Majuro" +msgid "" +"The program must be run with \n" +"superuser privileges!" msgstr "" -msgid "Uzhgorod" +msgid "Thimbu" msgstr "" -msgid "Ljubljana" +msgid "Thimphu" msgstr "" -msgid "Knox_IN" +msgid "Thule" msgstr "" -msgid "Bermuda" +msgid "Thunder_Bay" msgstr "" -msgid "Kirov" +msgid "Tijuana" msgstr "" -msgid "Cuiaba" +msgid "Timbuktu" msgstr "" -msgid "Mendoza" +#: source/ubl-settings-datetime.cc:142 +msgid "Time zone" msgstr "" -msgid "Kanton" +#: source/ubl-settings-datetime.cc:140 +msgid "Time:" msgstr "" -msgid "South_Georgia" +msgid "Tirane" msgstr "" -msgid "Banjul" +msgid "Tiraspol" msgstr "" -msgid "Louisville" +msgid "Tokyo" msgstr "" -msgid "Indiana" +msgid "Tomsk" msgstr "" -msgid "North_Dokota" +msgid "Tongatapu" msgstr "" -msgid "Palmer" +msgid "Toronto" msgstr "" -msgid "Yekaterinburg" +msgid "Tortola" msgstr "" -msgid "Cape_Vepde" +msgid "Tripoli" msgstr "" -msgid "East" +msgid "Troll" msgstr "" -msgid "Easterlsland" +msgid "Truk" msgstr "" -msgid "Mayotte" +msgid "Tucuman" msgstr "" -msgid "BajaSur" +msgid "Tunis" msgstr "" -msgid "Enter the name of the ntp-server or its ip-address.\nWhen entering multiple addresses, separate them with commas." +msgid "US" msgstr "" -msgid "Cape_Verde" +#: source/ubl-settings-datetime.cc:150 +msgid "UTC time" msgstr "" -msgid "Save" +msgid "Ujung_Pandang" msgstr "" -msgid "Save to global and local configuration" +msgid "Ulaanbaatar" msgstr "" -msgid "Save global configuration" +msgid "Ulan_Bator" msgstr "" -msgid "Save local configuration" +msgid "Ulyanovsk" msgstr "" -msgid "Load global configuration" +msgid "Universal" msgstr "" -msgid "Load local configuration" +msgid "Urumqi" msgstr "" -msgid "Disabled" +msgid "Ushuaia" msgstr "" -msgid "Load" +msgid "Ust-Nera" msgstr "" -msgid "Argument not recognized\n" +msgid "Uzhgorod" msgstr "" -msgid "La_Rioja" +msgid "Vaduz" msgstr "" -msgid "Rio_Gallegos" +msgid "Vancouver" msgstr "" -msgid "Salta" +msgid "Vatican" msgstr "" -msgid "San_Juan" +msgid "Vevay" msgstr "" -msgid "San_Luis" +msgid "Victoria" msgstr "" -msgid "Tucuman" +msgid "Vienna" msgstr "" -msgid "Ushuaia" +msgid "Vientiane" msgstr "" -msgid "Knox" +msgid "Vilnius" msgstr "" -msgid "Marengo" +msgid "Vincennes" msgstr "" -msgid "Petersburg" +msgid "Virgin" msgstr "" -msgid "Tell_City" +msgid "Vladivostok" msgstr "" -msgid "Vevay" +msgid "Volgograd" msgstr "" -msgid "Vincennes" +msgid "Vostok" msgstr "" -msgid "Winamac" +msgid "Wake" msgstr "" -msgid "Project Home Page" +msgid "Wallis" msgstr "" -msgid "ComodRivadavia" +#: source/ubl-settings-datetime.cc:147 +msgid "Warning!" msgstr "" -msgid "Monticello" +msgid "Warsaw" msgstr "" -msgid "Beulah" +msgid "West" msgstr "" -msgid "Center" +msgid "Whitehorse" msgstr "" -msgid "New_Salem" +msgid "Winamac" msgstr "" msgid "Windhoek" msgstr "" -msgid "Iqaluit" +msgid "Winnipeg" msgstr "" -msgid "EasterIsland" +msgid "Yakutat" msgstr "" -msgid "Andorra" +msgid "Yakutsk" msgstr "" -msgid "About" +msgid "Yancowinna" msgstr "" -msgid "Help" +msgid "Yangon" msgstr "" -msgid "Date and Time" +msgid "Yap" msgstr "" -msgid ": \"Hardware time\"" +msgid "Yekaterinburg" msgstr "" -msgid ": \"Time Zone\"" +msgid "Yellowknife" msgstr "" -msgid ": \"Date\"" +msgid "Yerevan" msgstr "" -msgid "Local configuration reading error" +msgid "Yukon" msgstr "" -msgid "Local configuration write error" +msgid "Zagreb" msgstr "" -msgid "Global configuration read error" +msgid "Zaporozhye" msgstr "" -msgid "Global configuration write error" +#: source/ubl-settings-datetime.cc:144 +msgid "Zone:" msgstr "" -msgid "Local configuration downloaded successfully" +msgid "Zulu" msgstr "" -msgid "Global configuration downloaded successfully" +msgid "Zurich" msgstr "" -msgid "Global configuration successfully written" +#: source/ubl-settings-datetime.cc:126 +msgid "https://wiki.ublinux.com" msgstr "" -msgid "Local configuration successfully written" +#: source/ubl-settings-datetime.cc:387 +msgid "" +"https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/" msgstr "" -msgid "" -"GTK settings datetime for UBLinux\n\n" -"Usage: ubl-settings-datetime [OPTIONS...]\n" -"Options:\n" -" -h, --help Show this help\n" -" -V, --version Show package version\n" -" --lock-datetime Lock date and time changes\n" -" --lock-timezone Lock time zone changes\n" -" --lock-ntp-mode Lock NTP mode selection\n" -" --lock-ntp-edit Lock editing NTP servers\n" -" --lock-sync-hwclock Lock sync hwclock mode selection\n" -" --lock-save Lock saving local and global configuration\n" -" --lock-save-local Lock save global configuration\n" -" --lock-save-global Lock load global configuration\n" -" --lock-load-global Lock load global configuration\n" +#: source/ubl-settings-datetime.cc:146 +msgid "ubl-settings-datetime" msgstr "" +#: 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 3d5769f..fa77ef2 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -1,1831 +1,1922 @@ -# 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 +# Russian translations for PACKAGE package. +# Copyright (C) 2023 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Automatically generated, 2023. # -#, 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" +"Project-Id-Version: ubconfig 1.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-03-22 11:06+0600\n" +"PO-Revision-Date: 2020-02-22 23:28+0600\n" +"Last-Translator: ublinux \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 "https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/" -msgstr "https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/" +msgid ":" +msgstr ":" -msgid "Copyright © UBSoft LLC, 2022 - " -msgstr "Авторские права © ООО \"Юбисофт\", 2022 - " +#: source/ubl-settings-datetime.cc:82 source/ubl-settings-datetime.cc:83 +msgid ": \"Date\"" +msgstr ": \"Дата\"" -msgid "Nothing to save!" -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 ": \"Аппаратное время\"" -msgid "Select the method of hardware time synchronization" -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 "" -msgid "https://wiki.ublinux.com" -msgstr "https://wiki.ublinux.ru" +#: 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 ": \"Временная зона\"" -msgid "Local time" -msgstr "Локальное время" +#: source/ubl-settings-datetime.cc:57 +msgid ": \"xdg-open\"" +msgstr "" -msgid "UTC time" -msgstr "Время по UTC" +msgid "Abidjan" +msgstr "Абиджан" -msgid "Synchronize hardware time:" -msgstr "Синхронизировать аппаратное время:" +msgid "About" +msgstr "О программе" -msgid "An invalid character is entered" -msgstr "Введён недопустимый символ" +msgid "Accra" +msgstr "Аккра" -msgid "Longyearbyen" -msgstr "Лонгйир" +msgid "Acre" +msgstr "Акр" -msgid "Error in the ntp name" -msgstr "Ошибка в имени ntp" +msgid "" +"Active service detected\n" +"Automatic time and date synchronization service detected" +msgstr "" +"Обнаружен активный сервис\n" +"автоматической синхронизации времени и даты" -msgid "Stop the synchronization service" -msgstr "Остановить сервис синхронизации" +msgid "Adak" +msgstr "Адак" -msgid "Close" -msgstr "Закрыть" +msgid "Addis_Ababa" +msgstr "Аддис-Абеба" -msgid "Active service detected\nAutomatic time and date synchronization service detected" -msgstr "Обнаружен активный сервис\nавтоматической синхронизации времени и даты" +msgid "Adelaide" +msgstr "Аделаида" -msgid "Default" -msgstr "По умолчанию" +msgid "Aden" +msgstr "Аден" -msgid "The program must be run with \nsuperuser privileges!" -msgstr "Программа должна быть запущена с правами \nсуперпользователя!" +msgid "Africa" +msgstr "Африка" -msgid "The program must be run as root" -msgstr "Программа должна быть запущена с правами суперпользователя!" +msgid "Alaska" +msgstr "Аляска" -msgid "Manual" -msgstr "Вручную" +msgid "Aleutian" +msgstr "Алеутский" -msgid "Enter DHCP!" -msgstr "Введите DHCP!" +msgid "Algiers" +msgstr "Алжир" -msgid "OK" -msgstr "OK" +msgid "Almaty" +msgstr "Алматы" -msgid "Setting the date and time" -msgstr "Настройка даты и времени" +msgid "America" +msgstr "Америка" -msgid "Successfully saved local and global configuration" -msgstr "Успешно сохранена локальная и глобальная конфигурация" +msgid "Amman" +msgstr "Амман" -msgid "Error saved local and global configuration" -msgstr "Ошибка сохранения локальной и глобальной конфигурации" +msgid "Amsterdam" +msgstr "Амстердам" -msgid "Settings the date and time" -msgstr "Настройки даты и времени" +#: source/ubl-settings-datetime.cc:817 +msgid "An invalid character is entered" +msgstr "Введён недопустимый символ" -msgid "Current date and time" -msgstr "Текущие дата и время" +msgid "Anadyr" +msgstr "Анадырь" -msgid "Global customization" -msgstr "Глобальная настройка" +msgid "Anchorage" +msgstr "Анкоридж" -msgid "Change the NTPSERVERS parameter" -msgstr "Изменить параметр NTPSERVERS" +msgid "Andorra" +msgstr "Андорра" -msgid "ubl-settings-datetime" -msgstr "Настройка даты и времени" +msgid "Anguilla" +msgstr "Ангилья" -msgid "Time:" -msgstr "Время:" +msgid "Antananarivo" +msgstr "Антананариву" -msgid "Clock" -msgstr "Часы" +msgid "Antarctica" +msgstr "Антарктида" -msgid ":" -msgstr ":" +msgid "Antigua" +msgstr "Антигуа" -msgid "Minutes" -msgstr "Минуты" +msgid "Apia" +msgstr "Апиа" -msgid "Date:" -msgstr "Дата:" +msgid "Aqtau" +msgstr "Актау" -msgid "Date of\nFormat: DD.MM.YYYY" -msgstr "Дата\nФормат: ДД.ММ.ГГГГ" +msgid "Aqtobe" +msgstr "Актобе" -msgid "Interactive date picker" -msgstr "Интерактивный выбор даты" +msgid "Araguaina" +msgstr "Арагуайна" -msgid "Change zone setting" -msgstr "Изменить параметр зоны" +msgid "Arctic" +msgstr "Арктика" -msgid "Region:" -msgstr "Регион:" +msgid "Argument not recognized\n" +msgstr "Нepacпoзнaнный аргумент\n" -msgid "Zone:" -msgstr "Зона:" +msgid "Arizona" +msgstr "Аризона" -msgid "Sync by" -msgstr "Синхронизировать" +msgid "Aruba" +msgstr "Аруба" -msgid "Automatic time synchronization" -msgstr "Автоматическая синхронизация времени" +msgid "Ashgabat" +msgstr "Ашхабад" -msgid "Synchronize via NTP" -msgstr "Синхронизировать через NTP" +msgid "Ashkhabad" +msgstr "Ашхабад" -msgid "Time zone" -msgstr "Часовой пояс" +msgid "Asia" +msgstr "Азия" -msgid "Setting date and time in global configuration" -msgstr "Настройка даты и времени в глобальной конфигурации" +msgid "Asmara" +msgstr "Асмэра" -msgid "Incorrect date format" -msgstr "Не верный формат даты" +msgid "Asmera" +msgstr "Асмера" -msgid "Synchronize hardware time" -msgstr "Синхронизировать аппаратное время" +msgid "Astrakhan" +msgstr "Астрахань" -msgid "Warning!" -msgstr "Внимание!" +msgid "Asuncion" +msgstr "Асунсьон" -msgid "ERROR" -msgstr "ОШИБКА" +msgid "Athens" +msgstr "Афины" -msgid "America" -msgstr "Америка" +msgid "Atikokan" +msgstr "Атикокан" -msgid "Brazil" -msgstr "Бразилия" +msgid "Atka" +msgstr "Атка" -msgid "Aruba" -msgstr "Аруба" +msgid "Atlantic" +msgstr "Атлантика" -msgid "Asia" -msgstr "Азия" +msgid "Atyrau" +msgstr "Атырау" -msgid "Mexico_City" -msgstr "Мехико" +msgid "Auckland" +msgstr "Окленд" -msgid "Antarctica" -msgstr "Антарктида" +msgid "Australia" +msgstr "Австралия" -msgid "Dubai" -msgstr "Дубай" +msgid "Automatic time synchronization" +msgstr "Автоматическая синхронизация времени" -msgid "Antigua" -msgstr "Антигуа" +msgid "Azores" +msgstr "Азорские острова" -msgid "Lima" -msgstr "Лима" +msgid "Baghdad" +msgstr "Багдад" -msgid "Manaus" -msgstr "Манаус" +msgid "Bahia" +msgstr "Баия" -msgid "Africa" -msgstr "Африка" +msgid "Bahia_Banderas" +msgstr "Баия_Бандерас" -msgid "Chicago" -msgstr "Чикаго" +msgid "Bahrain" +msgstr "Бахрейн" -msgid "Punta_Arenas" -msgstr "Пунта_Аренас" +msgid "BajaNorte" +msgstr "БахаНорте" -msgid "Europe" -msgstr "Европа" +msgid "BajaSur" +msgstr "Южная Нижняя Калифорния" -msgid "Djibouti" -msgstr "Джибути" +msgid "Baku" +msgstr "Баку" -msgid "Pyongyang" -msgstr "Пхеньян" +msgid "Bamako" +msgstr "Бамако" -msgid "Australia" -msgstr "Австралия" +msgid "Bangkok" +msgstr "Бангкок" -msgid "Mazatlan" -msgstr "Масатлан" +msgid "Bangui" +msgstr "Банги" -msgid "Macau" -msgstr "Макао" +msgid "Banjul" +msgstr "Банжул" -msgid "Denver" -msgstr "Денвер" +msgid "Barbados" +msgstr "Барбадос" -msgid "Yakutat" -msgstr "Якутат" +msgid "Barnaul" +msgstr "Барнаул" -msgid "Currie" -msgstr "Карри" +msgid "Beirut" +msgstr "Бейрут" -msgid "Dar_es_Salaam" -msgstr "Дар-эс-Салам" +msgid "Belem" +msgstr "Белен" -msgid "Thunder_Bay" -msgstr "Тандер-Бей" +msgid "Belfast" +msgstr "Белфаст" -msgid "Los_Angeles" -msgstr "Лос-Анджелес" +msgid "Belgrade" +msgstr "Белград" -msgid "Nome" -msgstr "Ном" +msgid "Belize" +msgstr "Белиз" -msgid "Colombo" -msgstr "Коломбо" +msgid "Berlin" +msgstr "Берлин" -msgid "Nairobi" -msgstr "Найроби" +msgid "Bermuda" +msgstr "Бермуды" -msgid "Prague" -msgstr "Прага" +msgid "Beulah" +msgstr "Беула" -msgid "Metlakatla" -msgstr "Метлакатла" +msgid "Bishkek" +msgstr "Бишкек" -msgid "Vostok" -msgstr "Восток" +msgid "Bissau" +msgstr "Бисау" msgid "Blanc-Sablon" msgstr "Блан-Саблон" -msgid "Port_Moresby" -msgstr "Порт_Морсби" +msgid "Blantyre" +msgstr "Блантайр" -msgid "US" -msgstr "США" +msgid "Boa_Vista" +msgstr "Боа_Виста" -msgid "Ouagadougou" -msgstr "Уагадугу" +msgid "Bogota" +msgstr "Богота" -msgid "Tashkent" -msgstr "Ташкент" +msgid "Boise" +msgstr "Бойсе" -msgid "Maputo" -msgstr "Мапуту" +msgid "Bougainville" +msgstr "Бугенвиль" -msgid "Qatar" -msgstr "Катар" +msgid "Bratislava" +msgstr "Братислава" -msgid "Chita" -msgstr "Чита" +msgid "Brazil" +msgstr "Бразилия" -msgid "Caracas" -msgstr "Каракас" +msgid "Brazzaville" +msgstr "Браззавиль" -msgid "Central" -msgstr "Центральный" +msgid "Brisbane" +msgstr "Брисбен" -msgid "Chatham" -msgstr "Чатем" +msgid "Broken_Hill" +msgstr "Брокен-Хилл" + +msgid "Brunei" +msgstr "Бруней" msgid "Brussels" msgstr "Брюссель" -msgid "Zaporozhye" -msgstr "Запорожье" - -msgid "Cambridge_Bay" -msgstr "Кембридж Бэй" +msgid "Bucharest" +msgstr "Бухарест" -msgid "Guayaquil" -msgstr "Гуаякиль" +msgid "Budapest" +msgstr "Будапешт" -msgid "Coral_Harbour" -msgstr "Корал Харбор" +msgid "Buenos_Aires" +msgstr "Буэнос Айрес" -msgid "Kigali" -msgstr "Кигали" +msgid "Bujumbura" +msgstr "Бужумбура" -msgid "Zagreb" -msgstr "Загреб" +msgid "Busingen" +msgstr "Бузинген" -msgid "Maseru" -msgstr "Масеру" +msgid "Cairo" +msgstr "Каир" -msgid "Belgrade" -msgstr "Белград" +msgid "Calcutta" +msgstr "Калькутта" -msgid "Goose_Bay" -msgstr "Гуз-Бей" +msgid "Cambridge_Bay" +msgstr "Кембридж Бэй" -msgid "Monterrey" -msgstr "Монтеррей" +msgid "Campo_Grande" +msgstr "Кампо_Гранде" -msgid "Luxembourg" -msgstr "Люксембург" +msgid "Canada" +msgstr "Канада" -msgid "Cayman" -msgstr "Кайман" +msgid "Canary" +msgstr "Канари" -msgid "Alaska" -msgstr "Аляска" +msgid "Canberra" +msgstr "Канберра" -msgid "Skopje" -msgstr "Скопье" +msgid "Cancun" +msgstr "Канкун" -msgid "St_Kitts" -msgstr "Сент-Китс" +msgid "Cape_Vepde" +msgstr "Кабо-Верде" -msgid "Kampala" -msgstr "Кампала" +msgid "Cape_Verde" +msgstr "Кабо-Верде" -msgid "Rankin_Inlet" -msgstr "Ранкин-Инлет" +msgid "Caracas" +msgstr "Каракас" -msgid "Kolkata" -msgstr "Калькутта" +msgid "Casablanca" +msgstr "Касабланка" -msgid "Canada" -msgstr "Канада" +msgid "Casey" +msgstr "Кейси" -msgid "Dominica" -msgstr "Доминика" +msgid "Catamarca" +msgstr "Катамарка" -msgid "Bucharest" -msgstr "Бухарест" +msgid "Cayenne" +msgstr "Кайенна" -msgid "Zurich" -msgstr "Цюрих" +msgid "Cayman" +msgstr "Кайман" -msgid "Queensland" -msgstr "Квинсленд" +msgid "Center" +msgstr "Центр" -msgid "Atikokan" -msgstr "Атикокан" +msgid "Central" +msgstr "Центральный" -msgid "Mbabane" -msgstr "Мбабане" +msgid "Ceuta" +msgstr "Сеута" -msgid "Kathmandu" -msgstr "Катманду" +msgid "Chagos" +msgstr "Чагос" -msgid "Indian" -msgstr "Индиана" +msgid "Change the NTPSERVERS parameter" +msgstr "Изменить параметр NTPSERVERS" -msgid "Khandyga" -msgstr "Хандыга" +msgid "Change zone setting" +msgstr "Изменить параметр зоны" -msgid "Guernsey" -msgstr "Гернси" +msgid "Chatham" +msgstr "Чатем" -msgid "Yerevan" -msgstr "Ереван" +msgid "Chicago" +msgstr "Чикаго" -msgid "Buenos_Aires" -msgstr "Буэнос Айрес" +msgid "Chihuahua" +msgstr "Чихуахуа" -msgid "Tunis" -msgstr "Тунис" +msgid "Chile" +msgstr "Чили" -msgid "Easter" -msgstr "Пасха" +msgid "Chisinau" +msgstr "Кишинев" -msgid "Matamoros" -msgstr "Матаморос" +msgid "Chita" +msgstr "Чита" -msgid "East-Indiana" -msgstr "Восточная Индиана" +msgid "Choibalsan" +msgstr "Чойбалсан" -msgid "Singapore" -msgstr "Сингапур" +msgid "Chongqing" +msgstr "Чунцин" -msgid "Atlantic" -msgstr "Атлантика" +msgid "Christmas" +msgstr "Рождество" -msgid "Canary" -msgstr "Канари" +msgid "Chungking" +msgstr "Чунцин" -msgid "Fort_Nelson" -msgstr "Форт Нельсон" +msgid "Chuuk" +msgstr "Чуук" -msgid "Recife" -msgstr "Ресифи" +msgid "Ciudad_Juarez" +msgstr "Сьюдад_Хуарес" -msgid "Malta" -msgstr "Мальта" +msgid "Clock" +msgstr "Часы" -msgid "Eucla" -msgstr "Евкла" +msgid "Close" +msgstr "Закрыть" -msgid "Azores" -msgstr "Азорские острова" +msgid "Cocos" +msgstr "Кокос" -msgid "Santiago" -msgstr "Сантьяго" +msgid "Colombo" +msgstr "Коломбо" -msgid "Aden" -msgstr "Аден" +msgid "ComodRivadavia" +msgstr "Комодоро-Ривадавия" -msgid "Merida" -msgstr "Мерида" +msgid "Comoro" +msgstr "Коморо" -msgid "Baku" -msgstr "Баку" +msgid "Conakry" +msgstr "Конакри" -msgid "Belem" -msgstr "Белен" +msgid "Continental" +msgstr "Континентальный" -msgid "Ceuta" -msgstr "Сеута" +msgid "Copenhagen" +msgstr "Копенгаген" -msgid "San_Marino" -msgstr "Сан Марино" +#: source/ubl-settings-datetime.cc:123 +msgid "Copyright © UBSoft LLC, 2022 - " +msgstr "Авторские права © ООО \"Юбисофт\", 2022 - " -msgid "Barnaul" -msgstr "Барнаул" +msgid "Coral_Harbour" +msgstr "Корал Харбор" -msgid "Damascus" -msgstr "Дамаск" +msgid "Cordoba" +msgstr "Кордова" -msgid "Fakaofo" -msgstr "Факаофо" +msgid "Costa_Rica" +msgstr "Коста_Рика" -msgid "Dawson" -msgstr "Доусон" +msgid "Creston" +msgstr "Крестон" -msgid "Irkutsk" -msgstr "Иркутск" +msgid "Cuiaba" +msgstr "Куяба" -msgid "Anguilla" -msgstr "Ангилья" +msgid "Curacao" +msgstr "Кюрасао" -msgid "Tijuana" -msgstr "Тихуана" +#: source/ubl-settings-datetime.cc:138 +msgid "Current date and time" +msgstr "Текущие дата и время" -msgid "Warsaw" -msgstr "Варшава" +msgid "Currie" +msgstr "Карри" -msgid "Adak" -msgstr "Адак" +#: source/ubl-settings-datetime.cc:135 +msgid "DHCP" +msgstr "" -msgid "London" -msgstr "Лондон" +msgid "Dacca" +msgstr "Дакка" -msgid "Jayapura" -msgstr "Джаяпура" +msgid "Dakar" +msgstr "Дакар" -msgid "St_Vincent" -msgstr "Сент-Винсент" +msgid "Damascus" +msgstr "Дамаск" + +msgid "Danmarkshavn" +msgstr "Данмарксхавн" + +msgid "Dar_es_Salaam" +msgstr "Дар-эс-Салам" msgid "Darwin" msgstr "Дарвин" -msgid "Cayenne" -msgstr "Кайенна" - -msgid "St_Johns" -msgstr "Сент-Джонс" +#: source/ubl-settings-datetime.cc:125 +msgid "Date and Time" +msgstr "Дата и Время" -msgid "Khartoum" -msgstr "Хартум" +#: source/ubl-settings-datetime.cc:131 +msgid "" +"Date of\n" +"Format: DD.MM.YYYY" +msgstr "" +"Дата\n" +"Формат: ДД.ММ.ГГГГ" -msgid "Rainy_River" -msgstr "Рейни-Ривер" +#: source/ubl-settings-datetime.cc:141 +msgid "Date:" +msgstr "Дата:" -msgid "Samara" -msgstr "Самара" +msgid "Davis" +msgstr "Дэвис" -msgid "Vienna" -msgstr "Вена" +msgid "Dawson" +msgstr "Доусон" -msgid "Ndjamena" -msgstr "Нджамена" +msgid "Dawson_Creek" +msgstr "Доусон Крик" -msgid "Vladivostok" -msgstr "Владивосток" +msgid "DeNoronha" +msgstr "Фернанду-ди-Норонья" -msgid "Saratov" -msgstr "Саратов" +#: source/ubl-settings-datetime.cc:134 +msgid "Default" +msgstr "По умолчанию" -msgid "Nuuk" -msgstr "Нуук" +msgid "Denver" +msgstr "Денвер" -msgid "Chongqing" -msgstr "Чунцин" +msgid "Detroit" +msgstr "Детройт" -msgid "North" -msgstr "Север" +msgid "Dhaka" +msgstr "Дакка" -msgid "Atka" -msgstr "Атка" +msgid "Dili" +msgstr "Дили" -msgid "Swift_Current" -msgstr "Суифт-Каррент" +#: source/ubl-settings-datetime.cc:137 +msgid "Disabled" +msgstr "Отключено" -msgid "Bangkok" -msgstr "Бангкок" +msgid "Djibouti" +msgstr "Джибути" -msgid "Blantyre" -msgstr "Блантайр" +msgid "Dominica" +msgstr "Доминика" -msgid "Algiers" -msgstr "Алжир" +msgid "Douala" +msgstr "Дуала" -msgid "Freetown" -msgstr "Фритаун" +msgid "Dubai" +msgstr "Дубай" -msgid "GMT-1" -msgstr "ГМТ-1" +msgid "Dublin" +msgstr "Дублин" -msgid "Detroit" -msgstr "Детройт" +msgid "DumontDUrville" +msgstr "Дюмон-д-Юрвиль" -msgid "Johannesburg" -msgstr "Йоханнесбург" +msgid "Dushanbe" +msgstr "Душанбе" -msgid "Shanghai" -msgstr "Шанхай" +msgid "ERROR" +msgstr "ОШИБКА" -msgid "Novokuznetsk" -msgstr "Новокузнецк" +msgid "East" +msgstr "Восток" -msgid "Dawson_Creek" -msgstr "Доусон Крик" +msgid "East-Indiana" +msgstr "Восточная Индиана" -msgid "Srednekolymsk" -msgstr "Среднеколымск" +msgid "Easter" +msgstr "Пасха" -msgid "Grenada" -msgstr "Гренада" +msgid "EasterIsland" +msgstr "Остров Пасхи" -msgid "Samoa" -msgstr "Самоа" +msgid "Easterlsland" +msgstr "Остров Пасхи" -msgid "Rarotonga" -msgstr "Раротонга" +msgid "Eastern" +msgstr "Восточный" -msgid "Broken_Hill" -msgstr "Брокен-Хилл" +msgid "Edmonton" +msgstr "Эдмонтон" -msgid "Winnipeg" -msgstr "Виннипег" +msgid "Efate" +msgstr "Эфате" -msgid "Tripoli" -msgstr "Триполи" +msgid "Eirunepe" +msgstr "Эйрунепе" -msgid "Perth" -msgstr "Перт" +msgid "El_Aaiun" +msgstr "Эль_Аайун" -msgid "Comoro" -msgstr "Коморо" +msgid "El_Salvador" +msgstr "Сальвадор" -msgid "Tarawa" -msgstr "Тарава" +msgid "Enderbury" +msgstr "Эндербери" -msgid "DeNoronha" -msgstr "Фернанду-ди-Норонья" +msgid "Ensenada" +msgstr "Энсенада" -msgid "Rio_Branco" -msgstr "Рио_Бранко" +#: source/ubl-settings-datetime.cc:791 source/ubl-settings-datetime.cc:1054 +msgid "Enter DHCP!" +msgstr "Введите DHCP!" -msgid "St_Helena" -msgstr "Сент-Хелина" +#: 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" +"При вводе нескольких адресов, разделяйте их запятыми." -msgid "Famagusta" -msgstr "Фамагуста" +#: source/ubl-settings-datetime.cc:821 +msgid "Error in the ntp name" +msgstr "Ошибка в имени ntp" -msgid "Noronha" -msgstr "Норонья" +#: source/ubl-settings-datetime.cc:678 +msgid "Error saved local and global configuration" +msgstr "Ошибка сохранения локальной и глобальной конфигурации" -msgid "Rangoon" -msgstr "Рангун" +msgid "Eucla" +msgstr "Евкла" -msgid "Hermosillo" -msgstr "Эрмосильо" +msgid "Europe" +msgstr "Европа" -msgid "Bahia" -msgstr "Баия" +msgid "Faeroe" +msgstr "Фарерские острова" -msgid "Tortola" -msgstr "Тортола" +msgid "Fakaofo" +msgstr "Факаофо" -msgid "Sao_Paulo" -msgstr "Сан-Паулу" +msgid "Famagusta" +msgstr "Фамагуста" -msgid "Dakar" -msgstr "Дакар" +msgid "Faroe" +msgstr "Фарерские острова" -msgid "Jan_Mayen" -msgstr "Ян_Майен" +msgid "Fiji" +msgstr "Фиджи" -msgid "Acre" -msgstr "Акр" +msgid "Fort_Nelson" +msgstr "Форт Нельсон" -msgid "Choibalsan" -msgstr "Чойбалсан" +msgid "Fort_Wayne" +msgstr "Форт_Уэйн" -msgid "Sitka" -msgstr "Ситка" +msgid "Fortaleza" +msgstr "Форталеза" -msgid "Arizona" -msgstr "Аризона" +msgid "Freetown" +msgstr "Фритаун" -msgid "Jersey" -msgstr "Джерси" +msgid "Funafuti" +msgstr "Фунафути" -msgid "Juneau" -msgstr "Джуно" +msgid "GMT-1" +msgstr "ГМТ-1" -msgid "Brisbane" -msgstr "Брисбен" +msgid "GMT-3" +msgstr "ГМТ-3" -msgid "Rome" -msgstr "Рим" +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 "Troll" -msgstr "Тролль" +msgid "Gaborone" +msgstr "Габороне" -msgid "Ashkhabad" -msgstr "Ашхабад" +msgid "Galapagos" +msgstr "Галапагос" -msgid "Guatemala" -msgstr "Гватемала" +msgid "Gambier" +msgstr "Гамбье" -msgid "Dublin" -msgstr "Дублин" +msgid "Gaza" +msgstr "Газа" -msgid "Barbados" -msgstr "Барбадос" +msgid "General" +msgstr "Генерал-Сантос" -msgid "Conakry" -msgstr "Конакри" +msgid "Gibraltar" +msgstr "Гибралтар" -msgid "Montserrat" -msgstr "Монтсеррат" +msgid "Glace_Bay" +msgstr "Глейс-Бей" -msgid "Sarajevo" -msgstr "Сараево" +#: source/ubl-settings-datetime.cc:690 +msgid "Global configuration downloaded successfully" +msgstr "Успешно загружена глобальная конфигурация" -msgid "Abidjan" -msgstr "Абиджан" +#: source/ubl-settings-datetime.cc:666 +msgid "Global configuration read error" +msgstr "Ошибка чтения глобальной конфигурации" -msgid "Scoresbysund" -msgstr "Скорсбисунд" +#: source/ubl-settings-datetime.cc:696 +msgid "Global configuration successfully written" +msgstr "Успешно записана глобальная конфигурация" -msgid "Cancun" -msgstr "Канкун" +#: source/ubl-settings-datetime.cc:674 +msgid "Global configuration write error" +msgstr "Ошибка записи глобальной конфигурации" -msgid "Pohnpei" -msgstr "Понпеи" +msgid "Global customization" +msgstr "Глобальная настройка" -msgid "Pacific" -msgstr "Тихий океан" +msgid "Godthab" +msgstr "Годтаб" -msgid "Chungking" -msgstr "Чунцин" +msgid "Goose_Bay" +msgstr "Гуз-Бей" + +msgid "Grand_Turk" +msgstr "Гранд_Турк" msgid "Greenwich" msgstr "Гринвич" -msgid "Anchorage" -msgstr "Анкоридж" - -msgid "Chihuahua" -msgstr "Чихуахуа" - -msgid "Porto-Novo" -msgstr "Порто-Ново" - -msgid "Boise" -msgstr "Бойсе" - -msgid "Chile" -msgstr "Чили" - -msgid "Bratislava" -msgstr "Братислава" - -msgid "Bahrain" -msgstr "Бахрейн" - -msgid "Athens" -msgstr "Афины" - -msgid "Ulaanbaatar" -msgstr "Улан-Батор" - -msgid "Maceio" -msgstr "Масейо" - -msgid "Mawson" -msgstr "Моусон" - -msgid "Newfoundland" -msgstr "Ньюфаундленд" - -msgid "Tiraspol" -msgstr "Тирасполь" - -msgid "Aqtau" -msgstr "Актау" - -msgid "Bujumbura" -msgstr "Бужумбура" - -msgid "Saskatchewan" -msgstr "Саскачеван" - -msgid "Norfolk" -msgstr "Норфолк" - -msgid "Pontianak" -msgstr "Понтианак" - -msgid "Panama" -msgstr "Панама" - -msgid "Kuala_Lumpur" -msgstr "Куала-Лумпур" +msgid "Grenada" +msgstr "Гренада" -msgid "Ashgabat" -msgstr "Ашхабад" +msgid "Guadalcanal" +msgstr "Гуадалканал" -msgid "Whitehorse" -msgstr "Уайтхорс" +msgid "Guadeloupe" +msgstr "Гваделупа" -msgid "Busingen" -msgstr "Бузинген" +msgid "Guam" +msgstr "Гуам" -msgid "Lower_Princes" -msgstr "Лоуэр-Принс-Куотер" +msgid "Guatemala" +msgstr "Гватемала" -msgid "Niamey" -msgstr "Ниамей" +msgid "Guayaquil" +msgstr "Гуаякиль" -msgid "El_Aaiun" -msgstr "Эль_Аайун" +msgid "Guernsey" +msgstr "Гернси" -msgid "Ulyanovsk" -msgstr "Ульяновск" +msgid "Guyana" +msgstr "Гайана" -msgid "Minsk" -msgstr "Минск" +msgid "Halifax" +msgstr "Галифакс" -msgid "Asmara" -msgstr "Асмэра" +msgid "Harare" +msgstr "Хараре" -msgid "Taipei" -msgstr "Тайбэй" +msgid "Harbin" +msgstr "Харбин" -msgid "Danmarkshavn" -msgstr "Данмарксхавн" +msgid "Havana" +msgstr "Гавана" -msgid "Casey" -msgstr "Кейси" +msgid "Hawaii" +msgstr "Гавайи" -msgid "Tbilisi" -msgstr "Тбилиси" +msgid "Hebron" +msgstr "Хеврон" -msgid "Beirut" -msgstr "Бейрут" +msgid "Help" +msgstr "Справка" -msgid "Stockholm" -msgstr "Стокгольм" +msgid "Helsinki" +msgstr "Хельсинки" -msgid "Santa_Isabel" -msgstr "Санта_Изабель" +msgid "Hermosillo" +msgstr "Эрмосильо" msgid "Ho_Chi_Minh" msgstr "Хо_Чи_Мин" -msgid "Funafuti" -msgstr "Фунафути" +msgid "Hobart" +msgstr "Хобарт" -msgid "Lubumbashi" -msgstr "Лубумбаши" +msgid "Hong_Kong" +msgstr "Гонконг" -msgid "Tahiti" -msgstr "Таити" +msgid "Honolulu" +msgstr "Гонолулу" -msgid "Toronto" -msgstr "Торонто" +msgid "Hovd" +msgstr "Ховд" -msgid "Hebron" -msgstr "Хеврон" +#: source/ubl-settings-datetime.cc:1402 source/ubl-settings-datetime.cc:1407 +msgid "Incorrect date format" +msgstr "Не верный формат даты" -msgid "Lisbon" -msgstr "Лиссабон" +msgid "Indian" +msgstr "Индиана" -msgid "Mogadishu" -msgstr "Могадишо" +msgid "Indiana" +msgstr "Индианан" -msgid "Edmonton" -msgstr "Эдмонтон" +msgid "Indiana-Starke" +msgstr "Индиана-Старке" -msgid "Chisinau" -msgstr "Кишинев" +msgid "Indianapolis" +msgstr "Индианаполис" -msgid "Grand_Turk" -msgstr "Гранд_Турк" +msgid "Interactive date picker" +msgstr "Интерактивный выбор даты" -msgid "Antananarivo" -msgstr "Антананариву" +msgid "Inuvik" +msgstr "Инувик" -msgid "Dushanbe" -msgstr "Душанбе" +msgid "Iqaluit" +msgstr "Икалуит" -msgid "McMurdo" -msgstr "МакМердо" +msgid "Irkutsk" +msgstr "Иркутск" -msgid "Truk" -msgstr "Трук" +msgid "Isle_of_Man" +msgstr "Остров Мэн" -msgid "Cordoba" -msgstr "Кордова" +msgid "Istanbul" +msgstr "Стамбул" -msgid "Indianapolis" -msgstr "Индианаполис" +msgid "Jakarta" +msgstr "Джакарта" -msgid "Wake" -msgstr "Уэйко" +msgid "Jamaica" +msgstr "Ямайка" -msgid "Qostanay" -msgstr "Костанай" +msgid "Jan_Mayen" +msgstr "Ян_Майен" -msgid "Syowa" -msgstr "Сёва" +msgid "Jayapura" +msgstr "Джаяпура" -msgid "Managua" -msgstr "Манагуа" +msgid "Jersey" +msgstr "Джерси" -msgid "Fortaleza" -msgstr "Форталеза" +msgid "Jerusalem" +msgstr "Иерусалим" -msgid "Ponape" -msgstr "Понапе" +msgid "Johannesburg" +msgstr "Йоханнесбург" -msgid "Havana" -msgstr "Гавана" +msgid "Johnston" +msgstr "Джонстон" + +msgid "Juba" +msgstr "Джуба" + +msgid "Jujuy" +msgstr "Жужуй" -msgid "Yukon" -msgstr "Юкон" +msgid "Juneau" +msgstr "Джуно" -msgid "Copenhagen" -msgstr "Копенгаген" +msgid "Kabul" +msgstr "Кабул" + +msgid "Kaliningrad" +msgstr "Калининград" msgid "Kamchatka" msgstr "Камчатка" -msgid "Amman" -msgstr "Амман" +msgid "Kampala" +msgstr "Кампала" -msgid "Pitcairn" -msgstr "Питкэрн" +msgid "Kanton" +msgstr "Кантон" -msgid "Yancowinna" -msgstr "Янковина" +msgid "Karachi" +msgstr "Карачи" -msgid "Mexico" -msgstr "Мексика" +msgid "Kashgar" +msgstr "Кашгар" -msgid "Harare" -msgstr "Хараре" +msgid "Kathmandu" +msgstr "Катманду" -msgid "Riyadh" -msgstr "Эр-Рияд" +msgid "Katmandu" +msgstr "Катманду" -msgid "Lord_Howe" -msgstr "Лорд_Хау" +msgid "Kerguelen" +msgstr "Кергелен" -msgid "Apia" -msgstr "Апиа" +msgid "Khandyga" +msgstr "Хандыга" -msgid "Monaco" -msgstr "Монако" +msgid "Khartoum" +msgstr "Хартум" -msgid "Aleutian" -msgstr "Алеутский" +msgid "Kiev" +msgstr "Киев" -msgid "Montreal" -msgstr "Монреаль" +msgid "Kigali" +msgstr "Кигали" -msgid "Davis" -msgstr "Дэвис" +msgid "Kinshasa" +msgstr "Киншаса" -msgid "Efate" -msgstr "Эфате" +msgid "Kiritimati" +msgstr "Киритимати" -msgid "Honolulu" -msgstr "Гонолулу" +msgid "Kirov" +msgstr "Киров" -msgid "Lagos" -msgstr "Лагос" +msgid "Knox" +msgstr "Ноксвилл" -msgid "Shiprock" -msgstr "Шипрок" +msgid "Knox_IN" +msgstr "Нокс_IN" -msgid "Volgograd" -msgstr "Волгоград" +msgid "Kolkata" +msgstr "Калькутта" -msgid "Vilnius" -msgstr "Вильнюс" +msgid "Kralendijk" +msgstr "Кралендейк" -msgid "Oslo" -msgstr "Осло" +msgid "Krasnoyarsk" +msgstr "Красноярск" -msgid "Vientiane" -msgstr "Вьентьян" +msgid "Kuala_Lumpur" +msgstr "Куала-Лумпур" -msgid "Dili" -msgstr "Дили" +msgid "Kuching" +msgstr "Кучинг" -msgid "Seoul" -msgstr "Сеул" +msgid "Kuwait" +msgstr "Кувейт" -msgid "Kerguelen" -msgstr "Кергелен" +msgid "Kwajalein" +msgstr "Кваджалейн" -msgid "Curacao" -msgstr "Кюрасао" +msgid "Kyiv" +msgstr "Киев" -msgid "Jujuy" -msgstr "Жужуй" +msgid "LHI" +msgstr "Лхи" -msgid "Manila" -msgstr "Манила" +msgid "La_Paz" +msgstr "Ла_Пас" -msgid "Yap" -msgstr "Яп" +msgid "La_Rioja" +msgstr "Риоха" -msgid "Kuwait" -msgstr "Кувейт" +msgid "Lagos" +msgstr "Лагос" + +msgid "Libreville" +msgstr "Либревиль" + +msgid "Lima" +msgstr "Лима" msgid "Lindeman" msgstr "Линдеман" -msgid "Vaduz" -msgstr "Вадуц" +msgid "Lisbon" +msgstr "Лиссабон" -msgid "Isle_of_Man" -msgstr "Остров Мэн" +msgid "Ljubljana" +msgstr "Любляна" -msgid "Nassau" -msgstr "Нассау" +#: source/ubl-settings-datetime.cc:130 +msgid "Load" +msgstr "Загрузить" -msgid "Zulu" -msgstr "Зулу" +msgid "Load global configuration" +msgstr "Загрузить глобальную конфигурацию" -msgid "Campo_Grande" -msgstr "Кампо_Гранде" +msgid "Load local configuration" +msgstr "Загрузить локальную конфигурацию" -msgid "Libreville" -msgstr "Либревиль" +#: source/ubl-settings-datetime.cc:687 +msgid "Local configuration downloaded successfully" +msgstr "Успешно загружена локальная конфигурация" -msgid "Fiji" -msgstr "Фиджи" +#: source/ubl-settings-datetime.cc:662 +msgid "Local configuration reading error" +msgstr "Ошибка чтения локальной конфигурации" -msgid "Yakutsk" -msgstr "Якутск" +#: source/ubl-settings-datetime.cc:693 +msgid "Local configuration successfully written" +msgstr "Успешно записана локальная конфигурация" -msgid "Ensenada" -msgstr "Энсенада" +#: source/ubl-settings-datetime.cc:670 +msgid "Local configuration write error" +msgstr "Ошибка записи локальной конфигурации" -msgid "Kiritimati" -msgstr "Киритимати" +#: source/ubl-settings-datetime.cc:151 +msgid "Local time" +msgstr "Локальное время" -msgid "Kaliningrad" -msgstr "Калининград" +msgid "Lome" +msgstr "Ломе" -msgid "Creston" -msgstr "Крестон" +msgid "London" +msgstr "Лондон" -msgid "Michigan" -msgstr "Мичиган" +msgid "Longyearbyen" +msgstr "Лонгйир" -msgid "Oral" -msgstr "Уральск" +msgid "Lord_Howe" +msgstr "Лорд_Хау" -msgid "Cocos" -msgstr "Кокос" +msgid "Los_Angeles" +msgstr "Лос-Анджелес" -msgid "Eastern" -msgstr "Восточный" +msgid "Louisville" +msgstr "Луисвилл" -msgid "BajaNorte" -msgstr "БахаНорте" +msgid "Lower_Princes" +msgstr "Лоуэр-Принс-Куотер" -msgid "Tel_Aviv" -msgstr "Тель-Авив" +msgid "Luanda" +msgstr "Луанда" -msgid "Sofia" -msgstr "София" +msgid "Lubumbashi" +msgstr "Лубумбаши" -msgid "Adelaide" -msgstr "Аделаида" +msgid "Lusaka" +msgstr "Лусака" -msgid "Vatican" -msgstr "Ватикан" +msgid "Luxembourg" +msgstr "Люксембург" -msgid "Calcutta" -msgstr "Калькутта" +msgid "Macao" +msgstr "Макао" -msgid "Lusaka" -msgstr "Лусака" +msgid "Macau" +msgstr "Макао" -msgid "St_Barthelemy" -msgstr "Святой Бартелеми" +msgid "Maceio" +msgstr "Масейо" -msgid "Bougainville" -msgstr "Бугенвиль" +msgid "Macquarie" +msgstr "Маккуори" -msgid "Tegucigalpa" -msgstr "Тегусигальпа" +msgid "Madeira" +msgstr "Мадейра" -msgid "Sao_Tome" -msgstr "Сан-Томе" +msgid "Madrid" +msgstr "Мадрид" -msgid "Moncton" -msgstr "Монктон" +msgid "Magadan" +msgstr "Магадан" -msgid "Reykjavik" -msgstr "Рейкьявик" +msgid "Mahe" +msgstr "Маэ" + +msgid "Majuro" +msgstr "Маджуро" + +msgid "Makassar" +msgstr "Макассар" + +msgid "Malabo" +msgstr "Малабо" + +msgid "Maldives" +msgstr "Мальдивы" -msgid "St_Thomas" -msgstr "Сент-Томас" +msgid "Malta" +msgstr "Мальта" -msgid "Baghdad" -msgstr "Багдад" +msgid "Managua" +msgstr "Манагуа" -msgid "Gibraltar" -msgstr "Гибралтар" +msgid "Manaus" +msgstr "Манаус" -msgid "Puerto_Rico" -msgstr "Пуэрто-Рико" +msgid "Manila" +msgstr "Манила" -msgid "Asmera" -msgstr "Асмера" +#: source/ubl-settings-datetime.cc:136 +msgid "Manual" +msgstr "Вручную" -msgid "Madrid" -msgstr "Мадрид" +msgid "Maputo" +msgstr "Мапуту" -msgid "Sakhalin" -msgstr "Сахалин" +msgid "Marengo" +msgstr "Маренго" -msgid "Porto_Acre" -msgstr "Порту_Акр" +msgid "Mariehamn" +msgstr "Мариехамн" -msgid "General" -msgstr "Генерал-Сантос" +msgid "Marigot" +msgstr "Мариго" -msgid "Macao" -msgstr "Макао" +msgid "Marquesas" +msgstr "Маркизские острова" msgid "Martinique" msgstr "Мартиника" -msgid "Mountain" -msgstr "Маунтин-Вью" +msgid "Maseru" +msgstr "Масеру" -msgid "Nipigon" -msgstr "Нипигон" +msgid "Matamoros" +msgstr "Матаморос" -msgid "Vancouver" -msgstr "Ванкувер" +msgid "Mauritius" +msgstr "Маврикий" -msgid "Bangui" -msgstr "Банги" +msgid "Mawson" +msgstr "Моусон" -msgid "Indiana-Starke" -msgstr "Индиана-Старке" +msgid "Mayotte" +msgstr "Майотта" -msgid "Harbin" -msgstr "Харбин" +msgid "Mazatlan" +msgstr "Масатлан" -msgid "Istanbul" -msgstr "Стамбул" +msgid "Mbabane" +msgstr "Мбабане" -msgid "Guadeloupe" -msgstr "Гваделупа" +msgid "McMurdo" +msgstr "МакМердо" -msgid "Simferopol" -msgstr "Симферополь" +msgid "Melbourne" +msgstr "Мельбурн" -msgid "Paris" -msgstr "Париж" +msgid "Mendoza" +msgstr "Мендоса" -msgid "Christmas" -msgstr "Рождество" +msgid "Menominee" +msgstr "Меномини" -msgid "Accra" -msgstr "Аккра" +msgid "Merida" +msgstr "Мерида" -msgid "Victoria" -msgstr "Виктория" +msgid "Metlakatla" +msgstr "Метлакатла" -msgid "Faeroe" -msgstr "Фарерские острова" +msgid "Mexico" +msgstr "Мексика" -msgid "Dacca" -msgstr "Дакка" +msgid "Mexico_City" +msgstr "Мехико" -msgid "Marigot" -msgstr "Мариго" +msgid "Michigan" +msgstr "Мичиган" -msgid "Dhaka" -msgstr "Дакка" +msgid "Midway" +msgstr "Мидуэй" -msgid "Kralendijk" -msgstr "Кралендейк" +msgid "Minsk" +msgstr "Минск" -msgid "Aqtobe" -msgstr "Актобе" +msgid "Minutes" +msgstr "Минуты" -msgid "Pago_Pago" -msgstr "Паго_Паго" +msgid "Miquelon" +msgstr "Микелон" -msgid "Bahia_Banderas" -msgstr "Баия_Бандерас" +msgid "Mogadishu" +msgstr "Могадишо" -msgid "Continental" -msgstr "Континентальный" +msgid "Monaco" +msgstr "Монако" -msgid "Midway" -msgstr "Мидуэй" +msgid "Moncton" +msgstr "Монктон" -msgid "Johnston" -msgstr "Джонстон" +msgid "Monrovia" +msgstr "Монровия" -msgid "Tasmania" -msgstr "Тасмания" +msgid "Monterrey" +msgstr "Монтеррей" -msgid "Reunion" -msgstr "Воссоединение" +msgid "Montevideo" +msgstr "Монтевидео" -msgid "South_Pole" -msgstr "Южный полюс" +msgid "Monticello" +msgstr "Монтиселло" -msgid "Riga" -msgstr "Рига" +msgid "Montreal" +msgstr "Монреаль" -msgid "La_Paz" -msgstr "Ла_Пас" +msgid "Montserrat" +msgstr "Монтсеррат" -msgid "Niue" -msgstr "Ниуэ" +msgid "Moscow" +msgstr "Москва" -msgid "Nouakchott" -msgstr "Нуакшот" +msgid "Mountain" +msgstr "Маунтин-Вью" -msgid "Berlin" -msgstr "Берлин" +msgid "Muscat" +msgstr "Мускат" -msgid "Kwajalein" -msgstr "Кваджалейн" +msgid "NSW" +msgstr "Новый Южный Уэльс" -msgid "St_Lucia" -msgstr "Святая Люсия" +msgid "Nairobi" +msgstr "Найроби" -msgid "Jakarta" -msgstr "Джакарта" +msgid "Nassau" +msgstr "Нассау" -msgid "Chuuk" -msgstr "Чуук" +msgid "Nauru" +msgstr "Науру" -msgid "Tallinn" -msgstr "Таллинн" +msgid "Ndjamena" +msgstr "Нджамена" -msgid "Nicosia" -msgstr "Никосия" +msgid "New_Salem" +msgstr "Нью-Салем" msgid "New_York" msgstr "Нью-Йорк" -msgid "Kuching" -msgstr "Кучинг" +msgid "Newfoundland" +msgstr "Ньюфаундленд" -msgid "Porto_Velho" -msgstr "Порту-Велью" +msgid "Niamey" +msgstr "Ниамей" -msgid "Canberra" -msgstr "Канберра" +msgid "Nicosia" +msgstr "Никосия" -msgid "Douala" -msgstr "Дуала" +msgid "Nipigon" +msgstr "Нипигон" -msgid "Atyrau" -msgstr "Атырау" +msgid "Niue" +msgstr "Ниуэ" -msgid "Madeira" -msgstr "Мадейра" +msgid "Nome" +msgstr "Ном" -msgid "Phoenix" -msgstr "Феникс" +msgid "Norfolk" +msgstr "Норфолк" -msgid "Santo_Domingo" -msgstr "Санто-Доминго" +msgid "Noronha" +msgstr "Норонья" -msgid "El_Salvador" -msgstr "Сальвадор" +msgid "North" +msgstr "Север" -msgid "Anadyr" -msgstr "Анадырь" +msgid "North_Dokota" +msgstr "Северная Докота" -msgid "Boa_Vista" -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 "Godthab" -msgstr "Годтаб" +msgid "Nouakchott" +msgstr "Нуакшот" -msgid "Inuvik" -msgstr "Инувик" +msgid "Noumea" +msgstr "Нумеа" -msgid "Cairo" -msgstr "Каир" +msgid "Novokuznetsk" +msgstr "Новокузнецк" + +msgid "Novosibirsk" +msgstr "Новосибирск" + +msgid "Nuuk" +msgstr "Нуук" + +msgid "OK" +msgstr "OK" msgid "Ojinaga" msgstr "Охинага" -msgid "Samarkand" -msgstr "Самарканд" - -msgid "Jerusalem" -msgstr "Иерусалим" +msgid "Omsk" +msgstr "Омск" -msgid "Bishkek" -msgstr "Бишкек" +msgid "Oral" +msgstr "Уральск" -msgid "Karachi" -msgstr "Карачи" +msgid "Oslo" +msgstr "Осло" -msgid "Phnom_Penh" -msgstr "Пномпень" +msgid "Ouagadougou" +msgstr "Уагадугу" -msgid "Qyzylorda" -msgstr "Кызылорда" +msgid "Pacific" +msgstr "Тихий океан" -msgid "Auckland" -msgstr "Окленд" +msgid "Pago_Pago" +msgstr "Паго_Паго" -msgid "Makassar" -msgstr "Макассар" +msgid "Palau" +msgstr "Палау" -msgid "Stanley" -msgstr "Стэнли" +msgid "Palmer" +msgstr "Палмер" -msgid "Virgin" -msgstr "Виргин" +msgid "Panama" +msgstr "Панама" -msgid "Noumea" -msgstr "Нумеа" +msgid "Pangnirtung" +msgstr "Пангниртунг" -msgid "Budapest" -msgstr "Будапешт" +msgid "Paramaribo" +msgstr "Парамарибо" -msgid "Tirane" -msgstr "Тиран" +msgid "Paris" +msgstr "Париж" -msgid "Miquelon" -msgstr "Микелон" +msgid "Perth" +msgstr "Перт" -msgid "Krasnoyarsk" -msgstr "Красноярск" +msgid "Petersburg" +msgstr "Петербург" -msgid "Rosario" -msgstr "Росарио" +msgid "Phnom_Penh" +msgstr "Пномпень" -msgid "LHI" -msgstr "Лхи" +msgid "Phoenix" +msgstr "Феникс" -msgid "Bamako" -msgstr "Бамако" +msgid "Pitcairn" +msgstr "Питкэрн" -msgid "Lome" -msgstr "Ломе" +msgid "Podgorica" +msgstr "Подгорица" -msgid "Astrakhan" -msgstr "Астрахань" +msgid "Pohnpei" +msgstr "Понпеи" -msgid "Addis_Ababa" -msgstr "Аддис-Абеба" +msgid "Ponape" +msgstr "Понапе" -msgid "GMT-3" -msgstr "ГМТ-3" +msgid "Pontianak" +msgstr "Понтианак" -msgid "Tokyo" -msgstr "Токио" +msgid "Port-au-Prince" +msgstr "Порт-о-Пренс" -msgid "Saipan" -msgstr "Сайпан" +msgid "Port_Moresby" +msgstr "Порт_Морсби" -msgid "Katmandu" -msgstr "Катманду" +msgid "Port_of_Spain" +msgstr "Порт-оф-Спейн" -msgid "Monrovia" -msgstr "Монровия" +msgid "Porto-Novo" +msgstr "Порто-Ново" -msgid "Casablanca" -msgstr "Касабланка" +msgid "Porto_Acre" +msgstr "Порту_Акр" -msgid "Nauru" -msgstr "Науру" +msgid "Porto_Velho" +msgstr "Порту-Велью" -msgid "Guam" -msgstr "Гуам" +msgid "Prague" +msgstr "Прага" -msgid "Ust-Nera" -msgstr "Усть-Нера" +#: source/ubl-settings-datetime.cc:128 +msgid "Project Home Page" +msgstr "Домашняя страница проекта" -msgid "Arctic" -msgstr "Арктика" +msgid "Puerto_Rico" +msgstr "Пуэрто-Рико" -msgid "Menominee" -msgstr "Меномини" +msgid "Punta_Arenas" +msgstr "Пунта_Аренас" -msgid "Asuncion" -msgstr "Асунсьон" +msgid "Pyongyang" +msgstr "Пхеньян" -msgid "Rothera" -msgstr "Ротера" +msgid "Qatar" +msgstr "Катар" -msgid "Luanda" -msgstr "Луанда" +msgid "Qostanay" +msgstr "Костанай" -msgid "Tomsk" -msgstr "Томск" +msgid "Queensland" +msgstr "Квинсленд" -msgid "Guadalcanal" -msgstr "Гуадалканал" +msgid "Qyzylorda" +msgstr "Кызылорда" -msgid "Chagos" -msgstr "Чагос" +msgid "Rainy_River" +msgstr "Рейни-Ривер" -msgid "Thimphu" -msgstr "Тхимпху" +msgid "Rangoon" +msgstr "Рангун" -msgid "Timbuktu" -msgstr "Тимбукту" +msgid "Rankin_Inlet" +msgstr "Ранкин-Инлет" -msgid "Glace_Bay" -msgstr "Глейс-Бей" +msgid "Rarotonga" +msgstr "Раротонга" -msgid "Marquesas" -msgstr "Маркизские острова" +msgid "Recife" +msgstr "Ресифи" -msgid "Brunei" -msgstr "Бруней" +msgid "Regina" +msgstr "Реджайна" -msgid "Pangnirtung" -msgstr "Пангниртунг" +#: source/ubl-settings-datetime.cc:143 +msgid "Region:" +msgstr "Регион:" -msgid "South" -msgstr "Саутф" +msgid "Resolute" +msgstr "Резольют" -msgid "Magadan" -msgstr "Магадан" +msgid "Reunion" +msgstr "Воссоединение" -msgid "Palau" -msgstr "Палау" +msgid "Reykjavik" +msgstr "Рейкьявик" -msgid "Yangon" -msgstr "Янгон" +msgid "Riga" +msgstr "Рига" -msgid "Tongatapu" -msgstr "Тонгатапу" +msgid "Rio_Branco" +msgstr "Рио_Бранко" -msgid "Hobart" -msgstr "Хобарт" +msgid "Rio_Gallegos" +msgstr "Рио-Гальегос" -msgid "Bogota" -msgstr "Богота" +msgid "Riyadh" +msgstr "Эр-Рияд" -msgid "Urumqi" -msgstr "Урумчи" +msgid "Rome" +msgstr "Рим" -msgid "Kinshasa" -msgstr "Киншаса" +msgid "Rosario" +msgstr "Росарио" -msgid "Thule" -msgstr "Туле" +msgid "Rothera" +msgstr "Ротера" msgid "Saigon" msgstr "Сайгон" -msgid "NSW" -msgstr "Новый Южный Уэльс" +msgid "Saipan" +msgstr "Сайпан" -msgid "Halifax" -msgstr "Галифакс" +msgid "Sakhalin" +msgstr "Сахалин" -msgid "Araguaina" -msgstr "Арагуайна" +msgid "Salta" +msgstr "Сальта" -msgid "Muscat" -msgstr "Мускат" +msgid "Samara" +msgstr "Самара" -msgid "Kashgar" -msgstr "Кашгар" +msgid "Samarkand" +msgstr "Самарканд" -msgid "Port-au-Prince" -msgstr "Порт-о-Пренс" +msgid "Samoa" +msgstr "Самоа" -msgid "Resolute" -msgstr "Резольют" +msgid "San_Juan" +msgstr "Сан-Хуан" -msgid "Kabul" -msgstr "Кабул" +msgid "San_Luis" +msgstr "Сан-Луис" -msgid "Kyiv" -msgstr "Киев" +msgid "San_Marino" +msgstr "Сан Марино" -msgid "Omsk" -msgstr "Омск" +msgid "Santa_Isabel" +msgstr "Санта_Изабель" -msgid "Gaza" -msgstr "Газа" +msgid "Santarem" +msgstr "Сантарен" -msgid "Malabo" -msgstr "Малабо" +msgid "Santiago" +msgstr "Сантьяго" -msgid "Hovd" -msgstr "Ховд" +msgid "Santo_Domingo" +msgstr "Санто-Доминго" -msgid "Jamaica" -msgstr "Ямайка" +msgid "Sao_Paulo" +msgstr "Сан-Паулу" -msgid "Faroe" -msgstr "Фарерские острова" +msgid "Sao_Tome" +msgstr "Сан-Томе" -msgid "Mahe" -msgstr "Маэ" +msgid "Sarajevo" +msgstr "Сараево" -msgid "Montevideo" -msgstr "Монтевидео" +msgid "Saratov" +msgstr "Саратов" -msgid "Eirunepe" -msgstr "Эйрунепе" +msgid "Saskatchewan" +msgstr "Саскачеван" -msgid "Catamarca" -msgstr "Катамарка" +#: source/ubl-settings-datetime.cc:129 +msgid "Save" +msgstr "Сохранить" -msgid "Melbourne" -msgstr "Мельбурн" +msgid "Save global configuration" +msgstr "Сохранить глобальную конфигурацию" -msgid "Hawaii" -msgstr "Гавайи" +msgid "Save local configuration" +msgstr "Сохранить локальную конфигурацию" -msgid "Macquarie" -msgstr "Маккуори" +msgid "Save to global and local configuration" +msgstr "Сохранить глобальную и локальную конфигурацию" -msgid "Belfast" -msgstr "Белфаст" +msgid "Scoresbysund" +msgstr "Скорсбисунд" -msgid "Wallis" -msgstr "Уоллис" +msgid "Select the method of hardware time synchronization" +msgstr "Выберите способ синхронизации аппаратного времени" -msgid "Moscow" -msgstr "Москва" +msgid "Seoul" +msgstr "Сеул" -msgid "Gaborone" -msgstr "Габороне" +msgid "Setting date and time in global configuration" +msgstr "Настройка даты и времени в глобальной конфигурации" -msgid "Port_of_Spain" -msgstr "Порт-оф-Спейн" +#: source/ubl-settings-datetime.cc:139 +msgid "Setting the date and time" +msgstr "Настройка даты и времени" -msgid "Bissau" -msgstr "Бисау" +msgid "Settings the date and time" +msgstr "Настройки даты и времени" -msgid "Universal" -msgstr "Юнивёрсал-Сити" +msgid "Shanghai" +msgstr "Шанхай" -msgid "Regina" -msgstr "Реджайна" +msgid "Shiprock" +msgstr "Шипрок" -msgid "Ulan_Bator" -msgstr "Улан_Батор" +msgid "Simferopol" +msgstr "Симферополь" -msgid "Ujung_Pandang" -msgstr "Уджунг_Панданг" +msgid "Singapore" +msgstr "Сингапур" -msgid "Costa_Rica" -msgstr "Коста_Рика" +msgid "Sitka" +msgstr "Ситка" -msgid "Galapagos" -msgstr "Галапагос" +msgid "Skopje" +msgstr "Скопье" -msgid "Tehran" -msgstr "Тегеран" +msgid "Sofia" +msgstr "София" -msgid "DumontDUrville" -msgstr "Дюмон-д-Юрвиль" +msgid "South" +msgstr "Саутф" -msgid "Enderbury" -msgstr "Эндербери" +msgid "South_Georgia" +msgstr "Южная Грузия" -msgid "Ciudad_Juarez" -msgstr "Сьюдад_Хуарес" +msgid "South_Pole" +msgstr "Южный полюс" -msgid "Mauritius" -msgstr "Маврикий" +msgid "Srednekolymsk" +msgstr "Среднеколымск" -msgid "Podgorica" -msgstr "Подгорица" +msgid "St_Barthelemy" +msgstr "Святой Бартелеми" -msgid "Kiev" -msgstr "Киев" +msgid "St_Helena" +msgstr "Сент-Хелина" -msgid "Hong_Kong" -msgstr "Гонконг" +msgid "St_Johns" +msgstr "Сент-Джонс" -msgid "Thimbu" -msgstr "Тимбу" +msgid "St_Kitts" +msgstr "Сент-Китс" -msgid "Belize" -msgstr "Белиз" +msgid "St_Lucia" +msgstr "Святая Люсия" -msgid "Gambier" -msgstr "Гамбье" +msgid "St_Thomas" +msgstr "Сент-Томас" -msgid "Sydney" -msgstr "Сидней" +msgid "St_Vincent" +msgstr "Сент-Винсент" -msgid "Amsterdam" -msgstr "Амстердам" +msgid "Stanley" +msgstr "Стэнли" -msgid "Juba" -msgstr "Джуба" +msgid "Stockholm" +msgstr "Стокгольм" -msgid "Helsinki" -msgstr "Хельсинки" +msgid "Stop the synchronization service" +msgstr "Остановить сервис синхронизации" -msgid "Santarem" -msgstr "Сантарен" +#: source/ubl-settings-datetime.cc:699 +msgid "Successfully saved local and global configuration" +msgstr "Успешно сохранена локальная и глобальная конфигурация" -msgid "Guyana" -msgstr "Гайана" +msgid "Swift_Current" +msgstr "Суифт-Каррент" -msgid "Maldives" -msgstr "Мальдивы" +msgid "Sydney" +msgstr "Сидней" -msgid "Paramaribo" -msgstr "Парамарибо" +#: source/ubl-settings-datetime.cc:145 +msgid "Sync by" +msgstr "Синхронизировать" -msgid "Fort_Wayne" -msgstr "Форт_Уэйн" +#: source/ubl-settings-datetime.cc:148 +msgid "Synchronize hardware time" +msgstr "Синхронизировать аппаратное время" -msgid "Yellowknife" -msgstr "Йеллоунайф" +#: source/ubl-settings-datetime.cc:149 +msgid "Synchronize hardware time:" +msgstr "Синхронизировать аппаратное время:" -msgid "West" -msgstr "Запад" +#: source/ubl-settings-datetime.cc:133 +msgid "Synchronize via NTP" +msgstr "Синхронизировать через NTP" -msgid "Almaty" -msgstr "Алматы" +msgid "Syowa" +msgstr "Сёва" -msgid "Novosibirsk" -msgstr "Новосибирск" +msgid "Tahiti" +msgstr "Таити" -msgid "Mariehamn" -msgstr "Мариехамн" +msgid "Taipei" +msgstr "Тайбэй" -msgid "Brazzaville" -msgstr "Браззавиль" +msgid "Tallinn" +msgstr "Таллинн" -msgid "Majuro" -msgstr "Маджуро" +msgid "Tarawa" +msgstr "Тарава" -msgid "Uzhgorod" -msgstr "Ужгород" +msgid "Tashkent" +msgstr "Ташкент" -msgid "Ljubljana" -msgstr "Любляна" +msgid "Tasmania" +msgstr "Тасмания" -msgid "Knox_IN" -msgstr "Нокс_IN" +msgid "Tbilisi" +msgstr "Тбилиси" -msgid "Bermuda" -msgstr "Бермуды" +msgid "Tegucigalpa" +msgstr "Тегусигальпа" -msgid "Kirov" -msgstr "Киров" +msgid "Tehran" +msgstr "Тегеран" -msgid "Cuiaba" -msgstr "Куяба" +msgid "Tel_Aviv" +msgstr "Тель-Авив" -msgid "Mendoza" -msgstr "Мендоса" +msgid "Tell_City" +msgstr "Телл-Сити" -msgid "Kanton" -msgstr "Кантон" +#: source/ubl-settings-datetime.cc:115 +msgid "The program must be run as root" +msgstr "Программа должна быть запущена с правами суперпользователя!" -msgid "South_Georgia" -msgstr "Южная Грузия" +msgid "" +"The program must be run with \n" +"superuser privileges!" +msgstr "" +"Программа должна быть запущена с правами \n" +"суперпользователя!" -msgid "Banjul" -msgstr "Банжул" +msgid "Thimbu" +msgstr "Тимбу" -msgid "Louisville" -msgstr "Луисвилл" +msgid "Thimphu" +msgstr "Тхимпху" -msgid "Indiana" -msgstr "Индианан" +msgid "Thule" +msgstr "Туле" -msgid "North_Dokota" -msgstr "Северная Докота" +msgid "Thunder_Bay" +msgstr "Тандер-Бей" -msgid "Palmer" -msgstr "Палмер" +msgid "Tijuana" +msgstr "Тихуана" -msgid "Yekaterinburg" -msgstr "Екатеринбург" +msgid "Timbuktu" +msgstr "Тимбукту" -msgid "Cape_Vepde" -msgstr "Кабо-Верде" +#: source/ubl-settings-datetime.cc:142 +msgid "Time zone" +msgstr "Часовой пояс" -msgid "East" -msgstr "Восток" +#: source/ubl-settings-datetime.cc:140 +msgid "Time:" +msgstr "Время:" -msgid "Easterlsland" -msgstr "Остров Пасхи" +msgid "Tirane" +msgstr "Тиран" -msgid "Mayotte" -msgstr "Майотта" +msgid "Tiraspol" +msgstr "Тирасполь" -msgid "BajaSur" -msgstr "Южная Нижняя Калифорния" +msgid "Tokyo" +msgstr "Токио" -msgid "Enter the name of the ntp-server or its ip-address.\nWhen entering multiple addresses, separate them with commas." -msgstr "Введите имя ntp-сервера или его ip-адрес.\nПри вводе нескольких адресов, разделяйте их запятыми." +msgid "Tomsk" +msgstr "Томск" -msgid "Cape_Verde" -msgstr "Кабо-Верде" +msgid "Tongatapu" +msgstr "Тонгатапу" -msgid "Save" -msgstr "Сохранить" +msgid "Toronto" +msgstr "Торонто" -msgid "Save to global and local configuration" -msgstr "Сохранить глобальную и локальную конфигурацию" +msgid "Tortola" +msgstr "Тортола" -msgid "Save global configuration" -msgstr "Сохранить глобальную конфигурацию" +msgid "Tripoli" +msgstr "Триполи" -msgid "Save local configuration" -msgstr "Сохранить локальную конфигурацию" +msgid "Troll" +msgstr "Тролль" -msgid "Load global configuration" -msgstr "Загрузить глобальную конфигурацию" +msgid "Truk" +msgstr "Трук" -msgid "Load local configuration" -msgstr "Загрузить локальную конфигурацию" +msgid "Tucuman" +msgstr "Тукуман" -msgid "Disabled" -msgstr "Отключено" +msgid "Tunis" +msgstr "Тунис" -msgid "Load" -msgstr "Загрузить" +msgid "US" +msgstr "США" -msgid "Argument not recognized\n" -msgstr "Нepacпoзнaнный аргумент\n" +#: source/ubl-settings-datetime.cc:150 +msgid "UTC time" +msgstr "Время по UTC" -msgid "La_Rioja" -msgstr "Риоха" +msgid "Ujung_Pandang" +msgstr "Уджунг_Панданг" -msgid "Rio_Gallegos" -msgstr "Рио-Гальегос" +msgid "Ulaanbaatar" +msgstr "Улан-Батор" -msgid "Salta" -msgstr "Сальта" +msgid "Ulan_Bator" +msgstr "Улан_Батор" -msgid "San_Juan" -msgstr "Сан-Хуан" +msgid "Ulyanovsk" +msgstr "Ульяновск" -msgid "San_Luis" -msgstr "Сан-Луис" +msgid "Universal" +msgstr "Юнивёрсал-Сити" -msgid "Tucuman" -msgstr "Тукуман" +msgid "Urumqi" +msgstr "Урумчи" msgid "Ushuaia" msgstr "Ушуая" -msgid "Knox" -msgstr "Ноксвилл" +msgid "Ust-Nera" +msgstr "Усть-Нера" -msgid "Marengo" -msgstr "Маренго" +msgid "Uzhgorod" +msgstr "Ужгород" -msgid "Petersburg" -msgstr "Петербург" +msgid "Vaduz" +msgstr "Вадуц" -msgid "Tell_City" -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 "Winamac" -msgstr "Винамаке" +msgid "Virgin" +msgstr "Виргин" -msgid "Project Home Page" -msgstr "Домашняя страница проекта" +msgid "Vladivostok" +msgstr "Владивосток" -msgid "ComodRivadavia" -msgstr "Комодоро-Ривадавия" +msgid "Volgograd" +msgstr "Волгоград" -msgid "Monticello" -msgstr "Монтиселло" +msgid "Vostok" +msgstr "Восток" -msgid "Beulah" -msgstr "Беула" +msgid "Wake" +msgstr "Уэйко" -msgid "Center" -msgstr "Центр" +msgid "Wallis" +msgstr "Уоллис" -msgid "New_Salem" -msgstr "Нью-Салем" +#: source/ubl-settings-datetime.cc:147 +msgid "Warning!" +msgstr "Внимание!" + +msgid "Warsaw" +msgstr "Варшава" + +msgid "West" +msgstr "Запад" + +msgid "Whitehorse" +msgstr "Уайтхорс" + +msgid "Winamac" +msgstr "Винамаке" msgid "Windhoek" msgstr "Виндхук" -msgid "Iqaluit" -msgstr "Икалуит" - -msgid "EasterIsland" -msgstr "Остров Пасхи" +msgid "Winnipeg" +msgstr "Виннипег" -msgid "Andorra" -msgstr "Андорра" +msgid "Yakutat" +msgstr "Якутат" -msgid "About" -msgstr "О программе" +msgid "Yakutsk" +msgstr "Якутск" -msgid "Help" -msgstr "Справка" +msgid "Yancowinna" +msgstr "Янковина" -msgid "Date and Time" -msgstr "Дата и Время" +msgid "Yangon" +msgstr "Янгон" -msgid ": \"Hardware time\"" -msgstr ": \"Аппаратное время\"" +msgid "Yap" +msgstr "Яп" -msgid ": \"Time Zone\"" -msgstr ": \"Временная зона\"" +msgid "Yekaterinburg" +msgstr "Екатеринбург" -msgid ": \"Date\"" -msgstr ": \"Дата\"" +msgid "Yellowknife" +msgstr "Йеллоунайф" -msgid "Local configuration reading error" -msgstr "Ошибка чтения локальной конфигурации" +msgid "Yerevan" +msgstr "Ереван" -msgid "Local configuration write error" -msgstr "Ошибка записи локальной конфигурации" +msgid "Yukon" +msgstr "Юкон" -msgid "Global configuration read error" -msgstr "Ошибка чтения глобальной конфигурации" +msgid "Zagreb" +msgstr "Загреб" -msgid "Global configuration write error" -msgstr "Ошибка записи глобальной конфигурации" +msgid "Zaporozhye" +msgstr "Запорожье" -msgid "Local configuration downloaded successfully" -msgstr "Успешно загружена локальная конфигурация" +#: source/ubl-settings-datetime.cc:144 +msgid "Zone:" +msgstr "Зона:" -msgid "Global configuration downloaded successfully" -msgstr "Успешно загружена глобальная конфигурация" +msgid "Zulu" +msgstr "Зулу" -msgid "Global configuration successfully written" -msgstr "Успешно записана глобальная конфигурация" +msgid "Zurich" +msgstr "Цюрих" -msgid "Local configuration successfully written" -msgstr "Успешно записана локальная конфигурация" +#: source/ubl-settings-datetime.cc:126 +msgid "https://wiki.ublinux.com" +msgstr "https://wiki.ublinux.ru" +#: source/ubl-settings-datetime.cc:387 msgid "" -"GTK settings datetime for UBLinux\n\n" -"Usage: ubl-settings-datetime [OPTIONS...]\n" -"Options:\n" -" -h, --help Show this help\n" -" -V, --version Show package version\n" -" --lock-datetime Lock date and time changes\n" -" --lock-timezone Lock time zone changes\n" -" --lock-ntp-mode Lock NTP mode selection\n" -" --lock-ntp-edit Lock editing NTP servers\n" -" --lock-sync-hwclock Lock sync hwclock mode selection\n" -" --lock-save Lock saving local and global configuration\n" -" --lock-save-local Lock save global configuration\n" -" --lock-save-global Lock load global configuration\n" -" --lock-load-global Lock load global configuration\n" +"https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/" msgstr "" -"GTK-утилита настройки даты и времени для UBLinux\n\n" -"Использование: ubl-settings-datetime [Параметры приложения...]\n" -"Параметры приложения:\n" -" -h, --help Показать параметры справки\n" -" -V, --version Показать версию пакета\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" +"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 версия: " diff --git a/ubl-settings-datetime_ru.po~ b/ubl-settings-datetime_ru.po~ new file mode 100644 index 0000000..3898417 --- /dev/null +++ b/ubl-settings-datetime_ru.po~ @@ -0,0 +1,1830 @@ +# Russian translations for PACKAGE package. +# Copyright (C) 2023 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Automatically generated, 2023. +# +msgid "" +msgstr "" +"Project-Id-Version: ubconfig 1.0\n" +"Report-Msgid-Bugs-To: info@ublinux.ru\n" +"POT-Creation-Date: 2020-02-22 23:22+0600\n" +"PO-Revision-Date: 2020-02-22 23:28+0600\n" +"Last-Translator: ublinux \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 "https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/" +msgstr "https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/" + +msgid "Copyright © UBSoft LLC, 2022 - " +msgstr "Авторские права © ООО \"Юбисофт\", 2022 - " + +msgid "Nothing to save!" +msgstr "Нечего сохранять!" + +msgid "Select the method of hardware time synchronization" +msgstr "Выберите способ синхронизации аппаратного времени" + +msgid "https://wiki.ublinux.com" +msgstr "https://wiki.ublinux.ru" + +msgid "Local time" +msgstr "Локальное время" + +msgid "UTC time" +msgstr "Время по UTC" + +msgid "Synchronize hardware time:" +msgstr "Синхронизировать аппаратное время:" + +msgid "An invalid character is entered" +msgstr "Введён недопустимый символ" + +msgid "Longyearbyen" +msgstr "Лонгйир" + +msgid "Error in the ntp name" +msgstr "Ошибка в имени ntp" + +msgid "Stop the synchronization service" +msgstr "Остановить сервис синхронизации" + +msgid "Close" +msgstr "Закрыть" + +msgid "Active service detected\nAutomatic time and date synchronization service detected" +msgstr "Обнаружен активный сервис\nавтоматической синхронизации времени и даты" + +msgid "Default" +msgstr "По умолчанию" + +msgid "The program must be run with \nsuperuser privileges!" +msgstr "Программа должна быть запущена с правами \nсуперпользователя!" + +msgid "The program must be run as root" +msgstr "Программа должна быть запущена с правами суперпользователя!" + +msgid "Manual" +msgstr "Вручную" + +msgid "Enter DHCP!" +msgstr "Введите DHCP!" + +msgid "OK" +msgstr "OK" + +msgid "Setting the date and time" +msgstr "Настройка даты и времени" + +msgid "Successfully saved local and global configuration" +msgstr "Успешно сохранена локальная и глобальная конфигурация" + +msgid "Error saved local and global configuration" +msgstr "Ошибка сохранения локальной и глобальной конфигурации" + +msgid "Settings the date and time" +msgstr "Настройки даты и времени" + +msgid "Current date and time" +msgstr "Текущие дата и время" + +msgid "Global customization" +msgstr "Глобальная настройка" + +msgid "Change the NTPSERVERS parameter" +msgstr "Изменить параметр NTPSERVERS" + +msgid "ubl-settings-datetime" +msgstr "Настройка даты и времени" + +msgid "Time:" +msgstr "Время:" + +msgid "Clock" +msgstr "Часы" + +msgid ":" +msgstr ":" + +msgid "Minutes" +msgstr "Минуты" + +msgid "Date:" +msgstr "Дата:" + +msgid "Date of\nFormat: DD.MM.YYYY" +msgstr "Дата\nФормат: ДД.ММ.ГГГГ" + +msgid "Interactive date picker" +msgstr "Интерактивный выбор даты" + +msgid "Change zone setting" +msgstr "Изменить параметр зоны" + +msgid "Region:" +msgstr "Регион:" + +msgid "Zone:" +msgstr "Зона:" + +msgid "Sync by" +msgstr "Синхронизировать" + +msgid "Automatic time synchronization" +msgstr "Автоматическая синхронизация времени" + +msgid "Synchronize via NTP" +msgstr "Синхронизировать через NTP" + +msgid "Time zone" +msgstr "Часовой пояс" + +msgid "Setting date and time in global configuration" +msgstr "Настройка даты и времени в глобальной конфигурации" + +msgid "Incorrect date format" +msgstr "Не верный формат даты" + +msgid "Synchronize hardware time" +msgstr "Синхронизировать аппаратное время" + +msgid "Warning!" +msgstr "Внимание!" + +msgid "ERROR" +msgstr "ОШИБКА" + +msgid "America" +msgstr "Америка" + +msgid "Brazil" +msgstr "Бразилия" + +msgid "Aruba" +msgstr "Аруба" + +msgid "Asia" +msgstr "Азия" + +msgid "Mexico_City" +msgstr "Мехико" + +msgid "Antarctica" +msgstr "Антарктида" + +msgid "Dubai" +msgstr "Дубай" + +msgid "Antigua" +msgstr "Антигуа" + +msgid "Lima" +msgstr "Лима" + +msgid "Manaus" +msgstr "Манаус" + +msgid "Africa" +msgstr "Африка" + +msgid "Chicago" +msgstr "Чикаго" + +msgid "Punta_Arenas" +msgstr "Пунта_Аренас" + +msgid "Europe" +msgstr "Европа" + +msgid "Djibouti" +msgstr "Джибути" + +msgid "Pyongyang" +msgstr "Пхеньян" + +msgid "Australia" +msgstr "Австралия" + +msgid "Mazatlan" +msgstr "Масатлан" + +msgid "Macau" +msgstr "Макао" + +msgid "Denver" +msgstr "Денвер" + +msgid "Yakutat" +msgstr "Якутат" + +msgid "Currie" +msgstr "Карри" + +msgid "Dar_es_Salaam" +msgstr "Дар-эс-Салам" + +msgid "Thunder_Bay" +msgstr "Тандер-Бей" + +msgid "Los_Angeles" +msgstr "Лос-Анджелес" + +msgid "Nome" +msgstr "Ном" + +msgid "Colombo" +msgstr "Коломбо" + +msgid "Nairobi" +msgstr "Найроби" + +msgid "Prague" +msgstr "Прага" + +msgid "Metlakatla" +msgstr "Метлакатла" + +msgid "Vostok" +msgstr "Восток" + +msgid "Blanc-Sablon" +msgstr "Блан-Саблон" + +msgid "Port_Moresby" +msgstr "Порт_Морсби" + +msgid "US" +msgstr "США" + +msgid "Ouagadougou" +msgstr "Уагадугу" + +msgid "Tashkent" +msgstr "Ташкент" + +msgid "Maputo" +msgstr "Мапуту" + +msgid "Qatar" +msgstr "Катар" + +msgid "Chita" +msgstr "Чита" + +msgid "Caracas" +msgstr "Каракас" + +msgid "Central" +msgstr "Центральный" + +msgid "Chatham" +msgstr "Чатем" + +msgid "Brussels" +msgstr "Брюссель" + +msgid "Zaporozhye" +msgstr "Запорожье" + +msgid "Cambridge_Bay" +msgstr "Кембридж Бэй" + +msgid "Guayaquil" +msgstr "Гуаякиль" + +msgid "Coral_Harbour" +msgstr "Корал Харбор" + +msgid "Kigali" +msgstr "Кигали" + +msgid "Zagreb" +msgstr "Загреб" + +msgid "Maseru" +msgstr "Масеру" + +msgid "Belgrade" +msgstr "Белград" + +msgid "Goose_Bay" +msgstr "Гуз-Бей" + +msgid "Monterrey" +msgstr "Монтеррей" + +msgid "Luxembourg" +msgstr "Люксембург" + +msgid "Cayman" +msgstr "Кайман" + +msgid "Alaska" +msgstr "Аляска" + +msgid "Skopje" +msgstr "Скопье" + +msgid "St_Kitts" +msgstr "Сент-Китс" + +msgid "Kampala" +msgstr "Кампала" + +msgid "Rankin_Inlet" +msgstr "Ранкин-Инлет" + +msgid "Kolkata" +msgstr "Калькутта" + +msgid "Canada" +msgstr "Канада" + +msgid "Dominica" +msgstr "Доминика" + +msgid "Bucharest" +msgstr "Бухарест" + +msgid "Zurich" +msgstr "Цюрих" + +msgid "Queensland" +msgstr "Квинсленд" + +msgid "Atikokan" +msgstr "Атикокан" + +msgid "Mbabane" +msgstr "Мбабане" + +msgid "Kathmandu" +msgstr "Катманду" + +msgid "Indian" +msgstr "Индиана" + +msgid "Khandyga" +msgstr "Хандыга" + +msgid "Guernsey" +msgstr "Гернси" + +msgid "Yerevan" +msgstr "Ереван" + +msgid "Buenos_Aires" +msgstr "Буэнос Айрес" + +msgid "Tunis" +msgstr "Тунис" + +msgid "Easter" +msgstr "Пасха" + +msgid "Matamoros" +msgstr "Матаморос" + +msgid "East-Indiana" +msgstr "Восточная Индиана" + +msgid "Singapore" +msgstr "Сингапур" + +msgid "Atlantic" +msgstr "Атлантика" + +msgid "Canary" +msgstr "Канари" + +msgid "Fort_Nelson" +msgstr "Форт Нельсон" + +msgid "Recife" +msgstr "Ресифи" + +msgid "Malta" +msgstr "Мальта" + +msgid "Eucla" +msgstr "Евкла" + +msgid "Azores" +msgstr "Азорские острова" + +msgid "Santiago" +msgstr "Сантьяго" + +msgid "Aden" +msgstr "Аден" + +msgid "Merida" +msgstr "Мерида" + +msgid "Baku" +msgstr "Баку" + +msgid "Belem" +msgstr "Белен" + +msgid "Ceuta" +msgstr "Сеута" + +msgid "San_Marino" +msgstr "Сан Марино" + +msgid "Barnaul" +msgstr "Барнаул" + +msgid "Damascus" +msgstr "Дамаск" + +msgid "Fakaofo" +msgstr "Факаофо" + +msgid "Dawson" +msgstr "Доусон" + +msgid "Irkutsk" +msgstr "Иркутск" + +msgid "Anguilla" +msgstr "Ангилья" + +msgid "Tijuana" +msgstr "Тихуана" + +msgid "Warsaw" +msgstr "Варшава" + +msgid "Adak" +msgstr "Адак" + +msgid "London" +msgstr "Лондон" + +msgid "Jayapura" +msgstr "Джаяпура" + +msgid "St_Vincent" +msgstr "Сент-Винсент" + +msgid "Darwin" +msgstr "Дарвин" + +msgid "Cayenne" +msgstr "Кайенна" + +msgid "St_Johns" +msgstr "Сент-Джонс" + +msgid "Khartoum" +msgstr "Хартум" + +msgid "Rainy_River" +msgstr "Рейни-Ривер" + +msgid "Samara" +msgstr "Самара" + +msgid "Vienna" +msgstr "Вена" + +msgid "Ndjamena" +msgstr "Нджамена" + +msgid "Vladivostok" +msgstr "Владивосток" + +msgid "Saratov" +msgstr "Саратов" + +msgid "Nuuk" +msgstr "Нуук" + +msgid "Chongqing" +msgstr "Чунцин" + +msgid "North" +msgstr "Север" + +msgid "Atka" +msgstr "Атка" + +msgid "Swift_Current" +msgstr "Суифт-Каррент" + +msgid "Bangkok" +msgstr "Бангкок" + +msgid "Blantyre" +msgstr "Блантайр" + +msgid "Algiers" +msgstr "Алжир" + +msgid "Freetown" +msgstr "Фритаун" + +msgid "GMT-1" +msgstr "ГМТ-1" + +msgid "Detroit" +msgstr "Детройт" + +msgid "Johannesburg" +msgstr "Йоханнесбург" + +msgid "Shanghai" +msgstr "Шанхай" + +msgid "Novokuznetsk" +msgstr "Новокузнецк" + +msgid "Dawson_Creek" +msgstr "Доусон Крик" + +msgid "Srednekolymsk" +msgstr "Среднеколымск" + +msgid "Grenada" +msgstr "Гренада" + +msgid "Samoa" +msgstr "Самоа" + +msgid "Rarotonga" +msgstr "Раротонга" + +msgid "Broken_Hill" +msgstr "Брокен-Хилл" + +msgid "Winnipeg" +msgstr "Виннипег" + +msgid "Tripoli" +msgstr "Триполи" + +msgid "Perth" +msgstr "Перт" + +msgid "Comoro" +msgstr "Коморо" + +msgid "Tarawa" +msgstr "Тарава" + +msgid "DeNoronha" +msgstr "Фернанду-ди-Норонья" + +msgid "Rio_Branco" +msgstr "Рио_Бранко" + +msgid "St_Helena" +msgstr "Сент-Хелина" + +msgid "Famagusta" +msgstr "Фамагуста" + +msgid "Noronha" +msgstr "Норонья" + +msgid "Rangoon" +msgstr "Рангун" + +msgid "Hermosillo" +msgstr "Эрмосильо" + +msgid "Bahia" +msgstr "Баия" + +msgid "Tortola" +msgstr "Тортола" + +msgid "Sao_Paulo" +msgstr "Сан-Паулу" + +msgid "Dakar" +msgstr "Дакар" + +msgid "Jan_Mayen" +msgstr "Ян_Майен" + +msgid "Acre" +msgstr "Акр" + +msgid "Choibalsan" +msgstr "Чойбалсан" + +msgid "Sitka" +msgstr "Ситка" + +msgid "Arizona" +msgstr "Аризона" + +msgid "Jersey" +msgstr "Джерси" + +msgid "Juneau" +msgstr "Джуно" + +msgid "Brisbane" +msgstr "Брисбен" + +msgid "Rome" +msgstr "Рим" + +msgid "Troll" +msgstr "Тролль" + +msgid "Ashkhabad" +msgstr "Ашхабад" + +msgid "Guatemala" +msgstr "Гватемала" + +msgid "Dublin" +msgstr "Дублин" + +msgid "Barbados" +msgstr "Барбадос" + +msgid "Conakry" +msgstr "Конакри" + +msgid "Montserrat" +msgstr "Монтсеррат" + +msgid "Sarajevo" +msgstr "Сараево" + +msgid "Abidjan" +msgstr "Абиджан" + +msgid "Scoresbysund" +msgstr "Скорсбисунд" + +msgid "Cancun" +msgstr "Канкун" + +msgid "Pohnpei" +msgstr "Понпеи" + +msgid "Pacific" +msgstr "Тихий океан" + +msgid "Chungking" +msgstr "Чунцин" + +msgid "Greenwich" +msgstr "Гринвич" + +msgid "Anchorage" +msgstr "Анкоридж" + +msgid "Chihuahua" +msgstr "Чихуахуа" + +msgid "Porto-Novo" +msgstr "Порто-Ново" + +msgid "Boise" +msgstr "Бойсе" + +msgid "Chile" +msgstr "Чили" + +msgid "Bratislava" +msgstr "Братислава" + +msgid "Bahrain" +msgstr "Бахрейн" + +msgid "Athens" +msgstr "Афины" + +msgid "Ulaanbaatar" +msgstr "Улан-Батор" + +msgid "Maceio" +msgstr "Масейо" + +msgid "Mawson" +msgstr "Моусон" + +msgid "Newfoundland" +msgstr "Ньюфаундленд" + +msgid "Tiraspol" +msgstr "Тирасполь" + +msgid "Aqtau" +msgstr "Актау" + +msgid "Bujumbura" +msgstr "Бужумбура" + +msgid "Saskatchewan" +msgstr "Саскачеван" + +msgid "Norfolk" +msgstr "Норфолк" + +msgid "Pontianak" +msgstr "Понтианак" + +msgid "Panama" +msgstr "Панама" + +msgid "Kuala_Lumpur" +msgstr "Куала-Лумпур" + +msgid "Ashgabat" +msgstr "Ашхабад" + +msgid "Whitehorse" +msgstr "Уайтхорс" + +msgid "Busingen" +msgstr "Бузинген" + +msgid "Lower_Princes" +msgstr "Лоуэр-Принс-Куотер" + +msgid "Niamey" +msgstr "Ниамей" + +msgid "El_Aaiun" +msgstr "Эль_Аайун" + +msgid "Ulyanovsk" +msgstr "Ульяновск" + +msgid "Minsk" +msgstr "Минск" + +msgid "Asmara" +msgstr "Асмэра" + +msgid "Taipei" +msgstr "Тайбэй" + +msgid "Danmarkshavn" +msgstr "Данмарксхавн" + +msgid "Casey" +msgstr "Кейси" + +msgid "Tbilisi" +msgstr "Тбилиси" + +msgid "Beirut" +msgstr "Бейрут" + +msgid "Stockholm" +msgstr "Стокгольм" + +msgid "Santa_Isabel" +msgstr "Санта_Изабель" + +msgid "Ho_Chi_Minh" +msgstr "Хо_Чи_Мин" + +msgid "Funafuti" +msgstr "Фунафути" + +msgid "Lubumbashi" +msgstr "Лубумбаши" + +msgid "Tahiti" +msgstr "Таити" + +msgid "Toronto" +msgstr "Торонто" + +msgid "Hebron" +msgstr "Хеврон" + +msgid "Lisbon" +msgstr "Лиссабон" + +msgid "Mogadishu" +msgstr "Могадишо" + +msgid "Edmonton" +msgstr "Эдмонтон" + +msgid "Chisinau" +msgstr "Кишинев" + +msgid "Grand_Turk" +msgstr "Гранд_Турк" + +msgid "Antananarivo" +msgstr "Антананариву" + +msgid "Dushanbe" +msgstr "Душанбе" + +msgid "McMurdo" +msgstr "МакМердо" + +msgid "Truk" +msgstr "Трук" + +msgid "Cordoba" +msgstr "Кордова" + +msgid "Indianapolis" +msgstr "Индианаполис" + +msgid "Wake" +msgstr "Уэйко" + +msgid "Qostanay" +msgstr "Костанай" + +msgid "Syowa" +msgstr "Сёва" + +msgid "Managua" +msgstr "Манагуа" + +msgid "Fortaleza" +msgstr "Форталеза" + +msgid "Ponape" +msgstr "Понапе" + +msgid "Havana" +msgstr "Гавана" + +msgid "Yukon" +msgstr "Юкон" + +msgid "Copenhagen" +msgstr "Копенгаген" + +msgid "Kamchatka" +msgstr "Камчатка" + +msgid "Amman" +msgstr "Амман" + +msgid "Pitcairn" +msgstr "Питкэрн" + +msgid "Yancowinna" +msgstr "Янковина" + +msgid "Mexico" +msgstr "Мексика" + +msgid "Harare" +msgstr "Хараре" + +msgid "Riyadh" +msgstr "Эр-Рияд" + +msgid "Lord_Howe" +msgstr "Лорд_Хау" + +msgid "Apia" +msgstr "Апиа" + +msgid "Monaco" +msgstr "Монако" + +msgid "Aleutian" +msgstr "Алеутский" + +msgid "Montreal" +msgstr "Монреаль" + +msgid "Davis" +msgstr "Дэвис" + +msgid "Efate" +msgstr "Эфате" + +msgid "Honolulu" +msgstr "Гонолулу" + +msgid "Lagos" +msgstr "Лагос" + +msgid "Shiprock" +msgstr "Шипрок" + +msgid "Volgograd" +msgstr "Волгоград" + +msgid "Vilnius" +msgstr "Вильнюс" + +msgid "Oslo" +msgstr "Осло" + +msgid "Vientiane" +msgstr "Вьентьян" + +msgid "Dili" +msgstr "Дили" + +msgid "Seoul" +msgstr "Сеул" + +msgid "Kerguelen" +msgstr "Кергелен" + +msgid "Curacao" +msgstr "Кюрасао" + +msgid "Jujuy" +msgstr "Жужуй" + +msgid "Manila" +msgstr "Манила" + +msgid "Yap" +msgstr "Яп" + +msgid "Kuwait" +msgstr "Кувейт" + +msgid "Lindeman" +msgstr "Линдеман" + +msgid "Vaduz" +msgstr "Вадуц" + +msgid "Isle_of_Man" +msgstr "Остров Мэн" + +msgid "Nassau" +msgstr "Нассау" + +msgid "Zulu" +msgstr "Зулу" + +msgid "Campo_Grande" +msgstr "Кампо_Гранде" + +msgid "Libreville" +msgstr "Либревиль" + +msgid "Fiji" +msgstr "Фиджи" + +msgid "Yakutsk" +msgstr "Якутск" + +msgid "Ensenada" +msgstr "Энсенада" + +msgid "Kiritimati" +msgstr "Киритимати" + +msgid "Kaliningrad" +msgstr "Калининград" + +msgid "Creston" +msgstr "Крестон" + +msgid "Michigan" +msgstr "Мичиган" + +msgid "Oral" +msgstr "Уральск" + +msgid "Cocos" +msgstr "Кокос" + +msgid "Eastern" +msgstr "Восточный" + +msgid "BajaNorte" +msgstr "БахаНорте" + +msgid "Tel_Aviv" +msgstr "Тель-Авив" + +msgid "Sofia" +msgstr "София" + +msgid "Adelaide" +msgstr "Аделаида" + +msgid "Vatican" +msgstr "Ватикан" + +msgid "Calcutta" +msgstr "Калькутта" + +msgid "Lusaka" +msgstr "Лусака" + +msgid "St_Barthelemy" +msgstr "Святой Бартелеми" + +msgid "Bougainville" +msgstr "Бугенвиль" + +msgid "Tegucigalpa" +msgstr "Тегусигальпа" + +msgid "Sao_Tome" +msgstr "Сан-Томе" + +msgid "Moncton" +msgstr "Монктон" + +msgid "Reykjavik" +msgstr "Рейкьявик" + +msgid "St_Thomas" +msgstr "Сент-Томас" + +msgid "Baghdad" +msgstr "Багдад" + +msgid "Gibraltar" +msgstr "Гибралтар" + +msgid "Puerto_Rico" +msgstr "Пуэрто-Рико" + +msgid "Asmera" +msgstr "Асмера" + +msgid "Madrid" +msgstr "Мадрид" + +msgid "Sakhalin" +msgstr "Сахалин" + +msgid "Porto_Acre" +msgstr "Порту_Акр" + +msgid "General" +msgstr "Генерал-Сантос" + +msgid "Macao" +msgstr "Макао" + +msgid "Martinique" +msgstr "Мартиника" + +msgid "Mountain" +msgstr "Маунтин-Вью" + +msgid "Nipigon" +msgstr "Нипигон" + +msgid "Vancouver" +msgstr "Ванкувер" + +msgid "Bangui" +msgstr "Банги" + +msgid "Indiana-Starke" +msgstr "Индиана-Старке" + +msgid "Harbin" +msgstr "Харбин" + +msgid "Istanbul" +msgstr "Стамбул" + +msgid "Guadeloupe" +msgstr "Гваделупа" + +msgid "Simferopol" +msgstr "Симферополь" + +msgid "Paris" +msgstr "Париж" + +msgid "Christmas" +msgstr "Рождество" + +msgid "Accra" +msgstr "Аккра" + +msgid "Victoria" +msgstr "Виктория" + +msgid "Faeroe" +msgstr "Фарерские острова" + +msgid "Dacca" +msgstr "Дакка" + +msgid "Marigot" +msgstr "Мариго" + +msgid "Dhaka" +msgstr "Дакка" + +msgid "Kralendijk" +msgstr "Кралендейк" + +msgid "Aqtobe" +msgstr "Актобе" + +msgid "Pago_Pago" +msgstr "Паго_Паго" + +msgid "Bahia_Banderas" +msgstr "Баия_Бандерас" + +msgid "Continental" +msgstr "Континентальный" + +msgid "Midway" +msgstr "Мидуэй" + +msgid "Johnston" +msgstr "Джонстон" + +msgid "Tasmania" +msgstr "Тасмания" + +msgid "Reunion" +msgstr "Воссоединение" + +msgid "South_Pole" +msgstr "Южный полюс" + +msgid "Riga" +msgstr "Рига" + +msgid "La_Paz" +msgstr "Ла_Пас" + +msgid "Niue" +msgstr "Ниуэ" + +msgid "Nouakchott" +msgstr "Нуакшот" + +msgid "Berlin" +msgstr "Берлин" + +msgid "Kwajalein" +msgstr "Кваджалейн" + +msgid "St_Lucia" +msgstr "Святая Люсия" + +msgid "Jakarta" +msgstr "Джакарта" + +msgid "Chuuk" +msgstr "Чуук" + +msgid "Tallinn" +msgstr "Таллинн" + +msgid "Nicosia" +msgstr "Никосия" + +msgid "New_York" +msgstr "Нью-Йорк" + +msgid "Kuching" +msgstr "Кучинг" + +msgid "Porto_Velho" +msgstr "Порту-Велью" + +msgid "Canberra" +msgstr "Канберра" + +msgid "Douala" +msgstr "Дуала" + +msgid "Atyrau" +msgstr "Атырау" + +msgid "Madeira" +msgstr "Мадейра" + +msgid "Phoenix" +msgstr "Феникс" + +msgid "Santo_Domingo" +msgstr "Санто-Доминго" + +msgid "El_Salvador" +msgstr "Сальвадор" + +msgid "Anadyr" +msgstr "Анадырь" + +msgid "Boa_Vista" +msgstr "Боа_Виста" + +msgid "Godthab" +msgstr "Годтаб" + +msgid "Inuvik" +msgstr "Инувик" + +msgid "Cairo" +msgstr "Каир" + +msgid "Ojinaga" +msgstr "Охинага" + +msgid "Samarkand" +msgstr "Самарканд" + +msgid "Jerusalem" +msgstr "Иерусалим" + +msgid "Bishkek" +msgstr "Бишкек" + +msgid "Karachi" +msgstr "Карачи" + +msgid "Phnom_Penh" +msgstr "Пномпень" + +msgid "Qyzylorda" +msgstr "Кызылорда" + +msgid "Auckland" +msgstr "Окленд" + +msgid "Makassar" +msgstr "Макассар" + +msgid "Stanley" +msgstr "Стэнли" + +msgid "Virgin" +msgstr "Виргин" + +msgid "Noumea" +msgstr "Нумеа" + +msgid "Budapest" +msgstr "Будапешт" + +msgid "Tirane" +msgstr "Тиран" + +msgid "Miquelon" +msgstr "Микелон" + +msgid "Krasnoyarsk" +msgstr "Красноярск" + +msgid "Rosario" +msgstr "Росарио" + +msgid "LHI" +msgstr "Лхи" + +msgid "Bamako" +msgstr "Бамако" + +msgid "Lome" +msgstr "Ломе" + +msgid "Astrakhan" +msgstr "Астрахань" + +msgid "Addis_Ababa" +msgstr "Аддис-Абеба" + +msgid "GMT-3" +msgstr "ГМТ-3" + +msgid "Tokyo" +msgstr "Токио" + +msgid "Saipan" +msgstr "Сайпан" + +msgid "Katmandu" +msgstr "Катманду" + +msgid "Monrovia" +msgstr "Монровия" + +msgid "Casablanca" +msgstr "Касабланка" + +msgid "Nauru" +msgstr "Науру" + +msgid "Guam" +msgstr "Гуам" + +msgid "Ust-Nera" +msgstr "Усть-Нера" + +msgid "Arctic" +msgstr "Арктика" + +msgid "Menominee" +msgstr "Меномини" + +msgid "Asuncion" +msgstr "Асунсьон" + +msgid "Rothera" +msgstr "Ротера" + +msgid "Luanda" +msgstr "Луанда" + +msgid "Tomsk" +msgstr "Томск" + +msgid "Guadalcanal" +msgstr "Гуадалканал" + +msgid "Chagos" +msgstr "Чагос" + +msgid "Thimphu" +msgstr "Тхимпху" + +msgid "Timbuktu" +msgstr "Тимбукту" + +msgid "Glace_Bay" +msgstr "Глейс-Бей" + +msgid "Marquesas" +msgstr "Маркизские острова" + +msgid "Brunei" +msgstr "Бруней" + +msgid "Pangnirtung" +msgstr "Пангниртунг" + +msgid "South" +msgstr "Саутф" + +msgid "Magadan" +msgstr "Магадан" + +msgid "Palau" +msgstr "Палау" + +msgid "Yangon" +msgstr "Янгон" + +msgid "Tongatapu" +msgstr "Тонгатапу" + +msgid "Hobart" +msgstr "Хобарт" + +msgid "Bogota" +msgstr "Богота" + +msgid "Urumqi" +msgstr "Урумчи" + +msgid "Kinshasa" +msgstr "Киншаса" + +msgid "Thule" +msgstr "Туле" + +msgid "Saigon" +msgstr "Сайгон" + +msgid "NSW" +msgstr "Новый Южный Уэльс" + +msgid "Halifax" +msgstr "Галифакс" + +msgid "Araguaina" +msgstr "Арагуайна" + +msgid "Muscat" +msgstr "Мускат" + +msgid "Kashgar" +msgstr "Кашгар" + +msgid "Port-au-Prince" +msgstr "Порт-о-Пренс" + +msgid "Resolute" +msgstr "Резольют" + +msgid "Kabul" +msgstr "Кабул" + +msgid "Kyiv" +msgstr "Киев" + +msgid "Omsk" +msgstr "Омск" + +msgid "Gaza" +msgstr "Газа" + +msgid "Malabo" +msgstr "Малабо" + +msgid "Hovd" +msgstr "Ховд" + +msgid "Jamaica" +msgstr "Ямайка" + +msgid "Faroe" +msgstr "Фарерские острова" + +msgid "Mahe" +msgstr "Маэ" + +msgid "Montevideo" +msgstr "Монтевидео" + +msgid "Eirunepe" +msgstr "Эйрунепе" + +msgid "Catamarca" +msgstr "Катамарка" + +msgid "Melbourne" +msgstr "Мельбурн" + +msgid "Hawaii" +msgstr "Гавайи" + +msgid "Macquarie" +msgstr "Маккуори" + +msgid "Belfast" +msgstr "Белфаст" + +msgid "Wallis" +msgstr "Уоллис" + +msgid "Moscow" +msgstr "Москва" + +msgid "Gaborone" +msgstr "Габороне" + +msgid "Port_of_Spain" +msgstr "Порт-оф-Спейн" + +msgid "Bissau" +msgstr "Бисау" + +msgid "Universal" +msgstr "Юнивёрсал-Сити" + +msgid "Regina" +msgstr "Реджайна" + +msgid "Ulan_Bator" +msgstr "Улан_Батор" + +msgid "Ujung_Pandang" +msgstr "Уджунг_Панданг" + +msgid "Costa_Rica" +msgstr "Коста_Рика" + +msgid "Galapagos" +msgstr "Галапагос" + +msgid "Tehran" +msgstr "Тегеран" + +msgid "DumontDUrville" +msgstr "Дюмон-д-Юрвиль" + +msgid "Enderbury" +msgstr "Эндербери" + +msgid "Ciudad_Juarez" +msgstr "Сьюдад_Хуарес" + +msgid "Mauritius" +msgstr "Маврикий" + +msgid "Podgorica" +msgstr "Подгорица" + +msgid "Kiev" +msgstr "Киев" + +msgid "Hong_Kong" +msgstr "Гонконг" + +msgid "Thimbu" +msgstr "Тимбу" + +msgid "Belize" +msgstr "Белиз" + +msgid "Gambier" +msgstr "Гамбье" + +msgid "Sydney" +msgstr "Сидней" + +msgid "Amsterdam" +msgstr "Амстердам" + +msgid "Juba" +msgstr "Джуба" + +msgid "Helsinki" +msgstr "Хельсинки" + +msgid "Santarem" +msgstr "Сантарен" + +msgid "Guyana" +msgstr "Гайана" + +msgid "Maldives" +msgstr "Мальдивы" + +msgid "Paramaribo" +msgstr "Парамарибо" + +msgid "Fort_Wayne" +msgstr "Форт_Уэйн" + +msgid "Yellowknife" +msgstr "Йеллоунайф" + +msgid "West" +msgstr "Запад" + +msgid "Almaty" +msgstr "Алматы" + +msgid "Novosibirsk" +msgstr "Новосибирск" + +msgid "Mariehamn" +msgstr "Мариехамн" + +msgid "Brazzaville" +msgstr "Браззавиль" + +msgid "Majuro" +msgstr "Маджуро" + +msgid "Uzhgorod" +msgstr "Ужгород" + +msgid "Ljubljana" +msgstr "Любляна" + +msgid "Knox_IN" +msgstr "Нокс_IN" + +msgid "Bermuda" +msgstr "Бермуды" + +msgid "Kirov" +msgstr "Киров" + +msgid "Cuiaba" +msgstr "Куяба" + +msgid "Mendoza" +msgstr "Мендоса" + +msgid "Kanton" +msgstr "Кантон" + +msgid "South_Georgia" +msgstr "Южная Грузия" + +msgid "Banjul" +msgstr "Банжул" + +msgid "Louisville" +msgstr "Луисвилл" + +msgid "Indiana" +msgstr "Индианан" + +msgid "North_Dokota" +msgstr "Северная Докота" + +msgid "Palmer" +msgstr "Палмер" + +msgid "Yekaterinburg" +msgstr "Екатеринбург" + +msgid "Cape_Vepde" +msgstr "Кабо-Верде" + +msgid "East" +msgstr "Восток" + +msgid "Easterlsland" +msgstr "Остров Пасхи" + +msgid "Mayotte" +msgstr "Майотта" + +msgid "BajaSur" +msgstr "Южная Нижняя Калифорния" + +msgid "Enter the name of the ntp-server or its ip-address.\nWhen entering multiple addresses, separate them with commas." +msgstr "Введите имя ntp-сервера или его ip-адрес.\nПри вводе нескольких адресов, разделяйте их запятыми." + +msgid "Cape_Verde" +msgstr "Кабо-Верде" + +msgid "Save" +msgstr "Сохранить" + +msgid "Save to global and local configuration" +msgstr "Сохранить глобальную и локальную конфигурацию" + +msgid "Save global configuration" +msgstr "Сохранить глобальную конфигурацию" + +msgid "Save local configuration" +msgstr "Сохранить локальную конфигурацию" + +msgid "Load global configuration" +msgstr "Загрузить глобальную конфигурацию" + +msgid "Load local configuration" +msgstr "Загрузить локальную конфигурацию" + +msgid "Disabled" +msgstr "Отключено" + +msgid "Load" +msgstr "Загрузить" + +msgid "Argument not recognized\n" +msgstr "Нepacпoзнaнный аргумент\n" + +msgid "La_Rioja" +msgstr "Риоха" + +msgid "Rio_Gallegos" +msgstr "Рио-Гальегос" + +msgid "Salta" +msgstr "Сальта" + +msgid "San_Juan" +msgstr "Сан-Хуан" + +msgid "San_Luis" +msgstr "Сан-Луис" + +msgid "Tucuman" +msgstr "Тукуман" + +msgid "Ushuaia" +msgstr "Ушуая" + +msgid "Knox" +msgstr "Ноксвилл" + +msgid "Marengo" +msgstr "Маренго" + +msgid "Petersburg" +msgstr "Петербург" + +msgid "Tell_City" +msgstr "Телл-Сити" + +msgid "Vevay" +msgstr "Вевей" + +msgid "Vincennes" +msgstr "Венсен" + +msgid "Winamac" +msgstr "Винамаке" + +msgid "Project Home Page" +msgstr "Домашняя страница проекта" + +msgid "ComodRivadavia" +msgstr "Комодоро-Ривадавия" + +msgid "Monticello" +msgstr "Монтиселло" + +msgid "Beulah" +msgstr "Беула" + +msgid "Center" +msgstr "Центр" + +msgid "New_Salem" +msgstr "Нью-Салем" + +msgid "Windhoek" +msgstr "Виндхук" + +msgid "Iqaluit" +msgstr "Икалуит" + +msgid "EasterIsland" +msgstr "Остров Пасхи" + +msgid "Andorra" +msgstr "Андорра" + +msgid "About" +msgstr "О программе" + +msgid "Help" +msgstr "Справка" + +msgid "Date and Time" +msgstr "Дата и Время" + +msgid ": \"Hardware time\"" +msgstr ": \"Аппаратное время\"" + +msgid ": \"Time Zone\"" +msgstr ": \"Временная зона\"" + +msgid ": \"Date\"" +msgstr ": \"Дата\"" + +msgid "Local configuration reading error" +msgstr "Ошибка чтения локальной конфигурации" + +msgid "Local configuration write error" +msgstr "Ошибка записи локальной конфигурации" + +msgid "Global configuration read error" +msgstr "Ошибка чтения глобальной конфигурации" + +msgid "Global configuration write error" +msgstr "Ошибка записи глобальной конфигурации" + +msgid "Local configuration downloaded successfully" +msgstr "Успешно загружена локальная конфигурация" + +msgid "Global configuration downloaded successfully" +msgstr "Успешно загружена глобальная конфигурация" + +msgid "Global configuration successfully written" +msgstr "Успешно записана глобальная конфигурация" + +msgid "Local configuration successfully written" +msgstr "Успешно записана локальная конфигурация" + +msgid "" +"GTK settings datetime for UBLinux\n\n" +"Usage: ubl-settings-datetime [OPTIONS...]\n" +"Options:\n" +" -h, --help Show this help\n" +" -V, --version Show package version\n" +" --lock-datetime Lock date and time changes\n" +" --lock-timezone Lock time zone changes\n" +" --lock-ntp-mode Lock NTP mode selection\n" +" --lock-ntp-edit Lock editing NTP servers\n" +" --lock-sync-hwclock Lock sync hwclock mode selection\n" +" --lock-save Lock saving local and global configuration\n" +" --lock-save-local Lock save global configuration\n" +" --lock-save-global Lock load global configuration\n" +" --lock-load-global Lock load global configuration\n" +msgstr "" +"GTK-утилита настройки даты и времени для UBLinux\n\n" +"Использование: ubl-settings-datetime [Параметры приложения...]\n" +"Параметры приложения:\n" +" -h, --help Показать параметры справки\n" +" -V, --version Показать версию пакета\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 "ubl-settings-datetime version: " +msgstr "ubl-settings-datetime версия: " -- 2.35.1 From 6d2b3be8bac8599f4b9e9bf09925ba3eec223e95 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 22 Mar 2023 11:09:41 +0600 Subject: [PATCH 19/24] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20.po=20=D0=B8=20pot=20=D1=84=D0=B0=D0=B9?= =?UTF-8?q?=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-datetime_ru.po~ | 1830 ---------------------------------- 1 file changed, 1830 deletions(-) delete mode 100644 ubl-settings-datetime_ru.po~ diff --git a/ubl-settings-datetime_ru.po~ b/ubl-settings-datetime_ru.po~ deleted file mode 100644 index 3898417..0000000 --- a/ubl-settings-datetime_ru.po~ +++ /dev/null @@ -1,1830 +0,0 @@ -# Russian translations for PACKAGE package. -# Copyright (C) 2023 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Automatically generated, 2023. -# -msgid "" -msgstr "" -"Project-Id-Version: ubconfig 1.0\n" -"Report-Msgid-Bugs-To: info@ublinux.ru\n" -"POT-Creation-Date: 2020-02-22 23:22+0600\n" -"PO-Revision-Date: 2020-02-22 23:28+0600\n" -"Last-Translator: ublinux \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 "https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/" -msgstr "https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/" - -msgid "Copyright © UBSoft LLC, 2022 - " -msgstr "Авторские права © ООО \"Юбисофт\", 2022 - " - -msgid "Nothing to save!" -msgstr "Нечего сохранять!" - -msgid "Select the method of hardware time synchronization" -msgstr "Выберите способ синхронизации аппаратного времени" - -msgid "https://wiki.ublinux.com" -msgstr "https://wiki.ublinux.ru" - -msgid "Local time" -msgstr "Локальное время" - -msgid "UTC time" -msgstr "Время по UTC" - -msgid "Synchronize hardware time:" -msgstr "Синхронизировать аппаратное время:" - -msgid "An invalid character is entered" -msgstr "Введён недопустимый символ" - -msgid "Longyearbyen" -msgstr "Лонгйир" - -msgid "Error in the ntp name" -msgstr "Ошибка в имени ntp" - -msgid "Stop the synchronization service" -msgstr "Остановить сервис синхронизации" - -msgid "Close" -msgstr "Закрыть" - -msgid "Active service detected\nAutomatic time and date synchronization service detected" -msgstr "Обнаружен активный сервис\nавтоматической синхронизации времени и даты" - -msgid "Default" -msgstr "По умолчанию" - -msgid "The program must be run with \nsuperuser privileges!" -msgstr "Программа должна быть запущена с правами \nсуперпользователя!" - -msgid "The program must be run as root" -msgstr "Программа должна быть запущена с правами суперпользователя!" - -msgid "Manual" -msgstr "Вручную" - -msgid "Enter DHCP!" -msgstr "Введите DHCP!" - -msgid "OK" -msgstr "OK" - -msgid "Setting the date and time" -msgstr "Настройка даты и времени" - -msgid "Successfully saved local and global configuration" -msgstr "Успешно сохранена локальная и глобальная конфигурация" - -msgid "Error saved local and global configuration" -msgstr "Ошибка сохранения локальной и глобальной конфигурации" - -msgid "Settings the date and time" -msgstr "Настройки даты и времени" - -msgid "Current date and time" -msgstr "Текущие дата и время" - -msgid "Global customization" -msgstr "Глобальная настройка" - -msgid "Change the NTPSERVERS parameter" -msgstr "Изменить параметр NTPSERVERS" - -msgid "ubl-settings-datetime" -msgstr "Настройка даты и времени" - -msgid "Time:" -msgstr "Время:" - -msgid "Clock" -msgstr "Часы" - -msgid ":" -msgstr ":" - -msgid "Minutes" -msgstr "Минуты" - -msgid "Date:" -msgstr "Дата:" - -msgid "Date of\nFormat: DD.MM.YYYY" -msgstr "Дата\nФормат: ДД.ММ.ГГГГ" - -msgid "Interactive date picker" -msgstr "Интерактивный выбор даты" - -msgid "Change zone setting" -msgstr "Изменить параметр зоны" - -msgid "Region:" -msgstr "Регион:" - -msgid "Zone:" -msgstr "Зона:" - -msgid "Sync by" -msgstr "Синхронизировать" - -msgid "Automatic time synchronization" -msgstr "Автоматическая синхронизация времени" - -msgid "Synchronize via NTP" -msgstr "Синхронизировать через NTP" - -msgid "Time zone" -msgstr "Часовой пояс" - -msgid "Setting date and time in global configuration" -msgstr "Настройка даты и времени в глобальной конфигурации" - -msgid "Incorrect date format" -msgstr "Не верный формат даты" - -msgid "Synchronize hardware time" -msgstr "Синхронизировать аппаратное время" - -msgid "Warning!" -msgstr "Внимание!" - -msgid "ERROR" -msgstr "ОШИБКА" - -msgid "America" -msgstr "Америка" - -msgid "Brazil" -msgstr "Бразилия" - -msgid "Aruba" -msgstr "Аруба" - -msgid "Asia" -msgstr "Азия" - -msgid "Mexico_City" -msgstr "Мехико" - -msgid "Antarctica" -msgstr "Антарктида" - -msgid "Dubai" -msgstr "Дубай" - -msgid "Antigua" -msgstr "Антигуа" - -msgid "Lima" -msgstr "Лима" - -msgid "Manaus" -msgstr "Манаус" - -msgid "Africa" -msgstr "Африка" - -msgid "Chicago" -msgstr "Чикаго" - -msgid "Punta_Arenas" -msgstr "Пунта_Аренас" - -msgid "Europe" -msgstr "Европа" - -msgid "Djibouti" -msgstr "Джибути" - -msgid "Pyongyang" -msgstr "Пхеньян" - -msgid "Australia" -msgstr "Австралия" - -msgid "Mazatlan" -msgstr "Масатлан" - -msgid "Macau" -msgstr "Макао" - -msgid "Denver" -msgstr "Денвер" - -msgid "Yakutat" -msgstr "Якутат" - -msgid "Currie" -msgstr "Карри" - -msgid "Dar_es_Salaam" -msgstr "Дар-эс-Салам" - -msgid "Thunder_Bay" -msgstr "Тандер-Бей" - -msgid "Los_Angeles" -msgstr "Лос-Анджелес" - -msgid "Nome" -msgstr "Ном" - -msgid "Colombo" -msgstr "Коломбо" - -msgid "Nairobi" -msgstr "Найроби" - -msgid "Prague" -msgstr "Прага" - -msgid "Metlakatla" -msgstr "Метлакатла" - -msgid "Vostok" -msgstr "Восток" - -msgid "Blanc-Sablon" -msgstr "Блан-Саблон" - -msgid "Port_Moresby" -msgstr "Порт_Морсби" - -msgid "US" -msgstr "США" - -msgid "Ouagadougou" -msgstr "Уагадугу" - -msgid "Tashkent" -msgstr "Ташкент" - -msgid "Maputo" -msgstr "Мапуту" - -msgid "Qatar" -msgstr "Катар" - -msgid "Chita" -msgstr "Чита" - -msgid "Caracas" -msgstr "Каракас" - -msgid "Central" -msgstr "Центральный" - -msgid "Chatham" -msgstr "Чатем" - -msgid "Brussels" -msgstr "Брюссель" - -msgid "Zaporozhye" -msgstr "Запорожье" - -msgid "Cambridge_Bay" -msgstr "Кембридж Бэй" - -msgid "Guayaquil" -msgstr "Гуаякиль" - -msgid "Coral_Harbour" -msgstr "Корал Харбор" - -msgid "Kigali" -msgstr "Кигали" - -msgid "Zagreb" -msgstr "Загреб" - -msgid "Maseru" -msgstr "Масеру" - -msgid "Belgrade" -msgstr "Белград" - -msgid "Goose_Bay" -msgstr "Гуз-Бей" - -msgid "Monterrey" -msgstr "Монтеррей" - -msgid "Luxembourg" -msgstr "Люксембург" - -msgid "Cayman" -msgstr "Кайман" - -msgid "Alaska" -msgstr "Аляска" - -msgid "Skopje" -msgstr "Скопье" - -msgid "St_Kitts" -msgstr "Сент-Китс" - -msgid "Kampala" -msgstr "Кампала" - -msgid "Rankin_Inlet" -msgstr "Ранкин-Инлет" - -msgid "Kolkata" -msgstr "Калькутта" - -msgid "Canada" -msgstr "Канада" - -msgid "Dominica" -msgstr "Доминика" - -msgid "Bucharest" -msgstr "Бухарест" - -msgid "Zurich" -msgstr "Цюрих" - -msgid "Queensland" -msgstr "Квинсленд" - -msgid "Atikokan" -msgstr "Атикокан" - -msgid "Mbabane" -msgstr "Мбабане" - -msgid "Kathmandu" -msgstr "Катманду" - -msgid "Indian" -msgstr "Индиана" - -msgid "Khandyga" -msgstr "Хандыга" - -msgid "Guernsey" -msgstr "Гернси" - -msgid "Yerevan" -msgstr "Ереван" - -msgid "Buenos_Aires" -msgstr "Буэнос Айрес" - -msgid "Tunis" -msgstr "Тунис" - -msgid "Easter" -msgstr "Пасха" - -msgid "Matamoros" -msgstr "Матаморос" - -msgid "East-Indiana" -msgstr "Восточная Индиана" - -msgid "Singapore" -msgstr "Сингапур" - -msgid "Atlantic" -msgstr "Атлантика" - -msgid "Canary" -msgstr "Канари" - -msgid "Fort_Nelson" -msgstr "Форт Нельсон" - -msgid "Recife" -msgstr "Ресифи" - -msgid "Malta" -msgstr "Мальта" - -msgid "Eucla" -msgstr "Евкла" - -msgid "Azores" -msgstr "Азорские острова" - -msgid "Santiago" -msgstr "Сантьяго" - -msgid "Aden" -msgstr "Аден" - -msgid "Merida" -msgstr "Мерида" - -msgid "Baku" -msgstr "Баку" - -msgid "Belem" -msgstr "Белен" - -msgid "Ceuta" -msgstr "Сеута" - -msgid "San_Marino" -msgstr "Сан Марино" - -msgid "Barnaul" -msgstr "Барнаул" - -msgid "Damascus" -msgstr "Дамаск" - -msgid "Fakaofo" -msgstr "Факаофо" - -msgid "Dawson" -msgstr "Доусон" - -msgid "Irkutsk" -msgstr "Иркутск" - -msgid "Anguilla" -msgstr "Ангилья" - -msgid "Tijuana" -msgstr "Тихуана" - -msgid "Warsaw" -msgstr "Варшава" - -msgid "Adak" -msgstr "Адак" - -msgid "London" -msgstr "Лондон" - -msgid "Jayapura" -msgstr "Джаяпура" - -msgid "St_Vincent" -msgstr "Сент-Винсент" - -msgid "Darwin" -msgstr "Дарвин" - -msgid "Cayenne" -msgstr "Кайенна" - -msgid "St_Johns" -msgstr "Сент-Джонс" - -msgid "Khartoum" -msgstr "Хартум" - -msgid "Rainy_River" -msgstr "Рейни-Ривер" - -msgid "Samara" -msgstr "Самара" - -msgid "Vienna" -msgstr "Вена" - -msgid "Ndjamena" -msgstr "Нджамена" - -msgid "Vladivostok" -msgstr "Владивосток" - -msgid "Saratov" -msgstr "Саратов" - -msgid "Nuuk" -msgstr "Нуук" - -msgid "Chongqing" -msgstr "Чунцин" - -msgid "North" -msgstr "Север" - -msgid "Atka" -msgstr "Атка" - -msgid "Swift_Current" -msgstr "Суифт-Каррент" - -msgid "Bangkok" -msgstr "Бангкок" - -msgid "Blantyre" -msgstr "Блантайр" - -msgid "Algiers" -msgstr "Алжир" - -msgid "Freetown" -msgstr "Фритаун" - -msgid "GMT-1" -msgstr "ГМТ-1" - -msgid "Detroit" -msgstr "Детройт" - -msgid "Johannesburg" -msgstr "Йоханнесбург" - -msgid "Shanghai" -msgstr "Шанхай" - -msgid "Novokuznetsk" -msgstr "Новокузнецк" - -msgid "Dawson_Creek" -msgstr "Доусон Крик" - -msgid "Srednekolymsk" -msgstr "Среднеколымск" - -msgid "Grenada" -msgstr "Гренада" - -msgid "Samoa" -msgstr "Самоа" - -msgid "Rarotonga" -msgstr "Раротонга" - -msgid "Broken_Hill" -msgstr "Брокен-Хилл" - -msgid "Winnipeg" -msgstr "Виннипег" - -msgid "Tripoli" -msgstr "Триполи" - -msgid "Perth" -msgstr "Перт" - -msgid "Comoro" -msgstr "Коморо" - -msgid "Tarawa" -msgstr "Тарава" - -msgid "DeNoronha" -msgstr "Фернанду-ди-Норонья" - -msgid "Rio_Branco" -msgstr "Рио_Бранко" - -msgid "St_Helena" -msgstr "Сент-Хелина" - -msgid "Famagusta" -msgstr "Фамагуста" - -msgid "Noronha" -msgstr "Норонья" - -msgid "Rangoon" -msgstr "Рангун" - -msgid "Hermosillo" -msgstr "Эрмосильо" - -msgid "Bahia" -msgstr "Баия" - -msgid "Tortola" -msgstr "Тортола" - -msgid "Sao_Paulo" -msgstr "Сан-Паулу" - -msgid "Dakar" -msgstr "Дакар" - -msgid "Jan_Mayen" -msgstr "Ян_Майен" - -msgid "Acre" -msgstr "Акр" - -msgid "Choibalsan" -msgstr "Чойбалсан" - -msgid "Sitka" -msgstr "Ситка" - -msgid "Arizona" -msgstr "Аризона" - -msgid "Jersey" -msgstr "Джерси" - -msgid "Juneau" -msgstr "Джуно" - -msgid "Brisbane" -msgstr "Брисбен" - -msgid "Rome" -msgstr "Рим" - -msgid "Troll" -msgstr "Тролль" - -msgid "Ashkhabad" -msgstr "Ашхабад" - -msgid "Guatemala" -msgstr "Гватемала" - -msgid "Dublin" -msgstr "Дублин" - -msgid "Barbados" -msgstr "Барбадос" - -msgid "Conakry" -msgstr "Конакри" - -msgid "Montserrat" -msgstr "Монтсеррат" - -msgid "Sarajevo" -msgstr "Сараево" - -msgid "Abidjan" -msgstr "Абиджан" - -msgid "Scoresbysund" -msgstr "Скорсбисунд" - -msgid "Cancun" -msgstr "Канкун" - -msgid "Pohnpei" -msgstr "Понпеи" - -msgid "Pacific" -msgstr "Тихий океан" - -msgid "Chungking" -msgstr "Чунцин" - -msgid "Greenwich" -msgstr "Гринвич" - -msgid "Anchorage" -msgstr "Анкоридж" - -msgid "Chihuahua" -msgstr "Чихуахуа" - -msgid "Porto-Novo" -msgstr "Порто-Ново" - -msgid "Boise" -msgstr "Бойсе" - -msgid "Chile" -msgstr "Чили" - -msgid "Bratislava" -msgstr "Братислава" - -msgid "Bahrain" -msgstr "Бахрейн" - -msgid "Athens" -msgstr "Афины" - -msgid "Ulaanbaatar" -msgstr "Улан-Батор" - -msgid "Maceio" -msgstr "Масейо" - -msgid "Mawson" -msgstr "Моусон" - -msgid "Newfoundland" -msgstr "Ньюфаундленд" - -msgid "Tiraspol" -msgstr "Тирасполь" - -msgid "Aqtau" -msgstr "Актау" - -msgid "Bujumbura" -msgstr "Бужумбура" - -msgid "Saskatchewan" -msgstr "Саскачеван" - -msgid "Norfolk" -msgstr "Норфолк" - -msgid "Pontianak" -msgstr "Понтианак" - -msgid "Panama" -msgstr "Панама" - -msgid "Kuala_Lumpur" -msgstr "Куала-Лумпур" - -msgid "Ashgabat" -msgstr "Ашхабад" - -msgid "Whitehorse" -msgstr "Уайтхорс" - -msgid "Busingen" -msgstr "Бузинген" - -msgid "Lower_Princes" -msgstr "Лоуэр-Принс-Куотер" - -msgid "Niamey" -msgstr "Ниамей" - -msgid "El_Aaiun" -msgstr "Эль_Аайун" - -msgid "Ulyanovsk" -msgstr "Ульяновск" - -msgid "Minsk" -msgstr "Минск" - -msgid "Asmara" -msgstr "Асмэра" - -msgid "Taipei" -msgstr "Тайбэй" - -msgid "Danmarkshavn" -msgstr "Данмарксхавн" - -msgid "Casey" -msgstr "Кейси" - -msgid "Tbilisi" -msgstr "Тбилиси" - -msgid "Beirut" -msgstr "Бейрут" - -msgid "Stockholm" -msgstr "Стокгольм" - -msgid "Santa_Isabel" -msgstr "Санта_Изабель" - -msgid "Ho_Chi_Minh" -msgstr "Хо_Чи_Мин" - -msgid "Funafuti" -msgstr "Фунафути" - -msgid "Lubumbashi" -msgstr "Лубумбаши" - -msgid "Tahiti" -msgstr "Таити" - -msgid "Toronto" -msgstr "Торонто" - -msgid "Hebron" -msgstr "Хеврон" - -msgid "Lisbon" -msgstr "Лиссабон" - -msgid "Mogadishu" -msgstr "Могадишо" - -msgid "Edmonton" -msgstr "Эдмонтон" - -msgid "Chisinau" -msgstr "Кишинев" - -msgid "Grand_Turk" -msgstr "Гранд_Турк" - -msgid "Antananarivo" -msgstr "Антананариву" - -msgid "Dushanbe" -msgstr "Душанбе" - -msgid "McMurdo" -msgstr "МакМердо" - -msgid "Truk" -msgstr "Трук" - -msgid "Cordoba" -msgstr "Кордова" - -msgid "Indianapolis" -msgstr "Индианаполис" - -msgid "Wake" -msgstr "Уэйко" - -msgid "Qostanay" -msgstr "Костанай" - -msgid "Syowa" -msgstr "Сёва" - -msgid "Managua" -msgstr "Манагуа" - -msgid "Fortaleza" -msgstr "Форталеза" - -msgid "Ponape" -msgstr "Понапе" - -msgid "Havana" -msgstr "Гавана" - -msgid "Yukon" -msgstr "Юкон" - -msgid "Copenhagen" -msgstr "Копенгаген" - -msgid "Kamchatka" -msgstr "Камчатка" - -msgid "Amman" -msgstr "Амман" - -msgid "Pitcairn" -msgstr "Питкэрн" - -msgid "Yancowinna" -msgstr "Янковина" - -msgid "Mexico" -msgstr "Мексика" - -msgid "Harare" -msgstr "Хараре" - -msgid "Riyadh" -msgstr "Эр-Рияд" - -msgid "Lord_Howe" -msgstr "Лорд_Хау" - -msgid "Apia" -msgstr "Апиа" - -msgid "Monaco" -msgstr "Монако" - -msgid "Aleutian" -msgstr "Алеутский" - -msgid "Montreal" -msgstr "Монреаль" - -msgid "Davis" -msgstr "Дэвис" - -msgid "Efate" -msgstr "Эфате" - -msgid "Honolulu" -msgstr "Гонолулу" - -msgid "Lagos" -msgstr "Лагос" - -msgid "Shiprock" -msgstr "Шипрок" - -msgid "Volgograd" -msgstr "Волгоград" - -msgid "Vilnius" -msgstr "Вильнюс" - -msgid "Oslo" -msgstr "Осло" - -msgid "Vientiane" -msgstr "Вьентьян" - -msgid "Dili" -msgstr "Дили" - -msgid "Seoul" -msgstr "Сеул" - -msgid "Kerguelen" -msgstr "Кергелен" - -msgid "Curacao" -msgstr "Кюрасао" - -msgid "Jujuy" -msgstr "Жужуй" - -msgid "Manila" -msgstr "Манила" - -msgid "Yap" -msgstr "Яп" - -msgid "Kuwait" -msgstr "Кувейт" - -msgid "Lindeman" -msgstr "Линдеман" - -msgid "Vaduz" -msgstr "Вадуц" - -msgid "Isle_of_Man" -msgstr "Остров Мэн" - -msgid "Nassau" -msgstr "Нассау" - -msgid "Zulu" -msgstr "Зулу" - -msgid "Campo_Grande" -msgstr "Кампо_Гранде" - -msgid "Libreville" -msgstr "Либревиль" - -msgid "Fiji" -msgstr "Фиджи" - -msgid "Yakutsk" -msgstr "Якутск" - -msgid "Ensenada" -msgstr "Энсенада" - -msgid "Kiritimati" -msgstr "Киритимати" - -msgid "Kaliningrad" -msgstr "Калининград" - -msgid "Creston" -msgstr "Крестон" - -msgid "Michigan" -msgstr "Мичиган" - -msgid "Oral" -msgstr "Уральск" - -msgid "Cocos" -msgstr "Кокос" - -msgid "Eastern" -msgstr "Восточный" - -msgid "BajaNorte" -msgstr "БахаНорте" - -msgid "Tel_Aviv" -msgstr "Тель-Авив" - -msgid "Sofia" -msgstr "София" - -msgid "Adelaide" -msgstr "Аделаида" - -msgid "Vatican" -msgstr "Ватикан" - -msgid "Calcutta" -msgstr "Калькутта" - -msgid "Lusaka" -msgstr "Лусака" - -msgid "St_Barthelemy" -msgstr "Святой Бартелеми" - -msgid "Bougainville" -msgstr "Бугенвиль" - -msgid "Tegucigalpa" -msgstr "Тегусигальпа" - -msgid "Sao_Tome" -msgstr "Сан-Томе" - -msgid "Moncton" -msgstr "Монктон" - -msgid "Reykjavik" -msgstr "Рейкьявик" - -msgid "St_Thomas" -msgstr "Сент-Томас" - -msgid "Baghdad" -msgstr "Багдад" - -msgid "Gibraltar" -msgstr "Гибралтар" - -msgid "Puerto_Rico" -msgstr "Пуэрто-Рико" - -msgid "Asmera" -msgstr "Асмера" - -msgid "Madrid" -msgstr "Мадрид" - -msgid "Sakhalin" -msgstr "Сахалин" - -msgid "Porto_Acre" -msgstr "Порту_Акр" - -msgid "General" -msgstr "Генерал-Сантос" - -msgid "Macao" -msgstr "Макао" - -msgid "Martinique" -msgstr "Мартиника" - -msgid "Mountain" -msgstr "Маунтин-Вью" - -msgid "Nipigon" -msgstr "Нипигон" - -msgid "Vancouver" -msgstr "Ванкувер" - -msgid "Bangui" -msgstr "Банги" - -msgid "Indiana-Starke" -msgstr "Индиана-Старке" - -msgid "Harbin" -msgstr "Харбин" - -msgid "Istanbul" -msgstr "Стамбул" - -msgid "Guadeloupe" -msgstr "Гваделупа" - -msgid "Simferopol" -msgstr "Симферополь" - -msgid "Paris" -msgstr "Париж" - -msgid "Christmas" -msgstr "Рождество" - -msgid "Accra" -msgstr "Аккра" - -msgid "Victoria" -msgstr "Виктория" - -msgid "Faeroe" -msgstr "Фарерские острова" - -msgid "Dacca" -msgstr "Дакка" - -msgid "Marigot" -msgstr "Мариго" - -msgid "Dhaka" -msgstr "Дакка" - -msgid "Kralendijk" -msgstr "Кралендейк" - -msgid "Aqtobe" -msgstr "Актобе" - -msgid "Pago_Pago" -msgstr "Паго_Паго" - -msgid "Bahia_Banderas" -msgstr "Баия_Бандерас" - -msgid "Continental" -msgstr "Континентальный" - -msgid "Midway" -msgstr "Мидуэй" - -msgid "Johnston" -msgstr "Джонстон" - -msgid "Tasmania" -msgstr "Тасмания" - -msgid "Reunion" -msgstr "Воссоединение" - -msgid "South_Pole" -msgstr "Южный полюс" - -msgid "Riga" -msgstr "Рига" - -msgid "La_Paz" -msgstr "Ла_Пас" - -msgid "Niue" -msgstr "Ниуэ" - -msgid "Nouakchott" -msgstr "Нуакшот" - -msgid "Berlin" -msgstr "Берлин" - -msgid "Kwajalein" -msgstr "Кваджалейн" - -msgid "St_Lucia" -msgstr "Святая Люсия" - -msgid "Jakarta" -msgstr "Джакарта" - -msgid "Chuuk" -msgstr "Чуук" - -msgid "Tallinn" -msgstr "Таллинн" - -msgid "Nicosia" -msgstr "Никосия" - -msgid "New_York" -msgstr "Нью-Йорк" - -msgid "Kuching" -msgstr "Кучинг" - -msgid "Porto_Velho" -msgstr "Порту-Велью" - -msgid "Canberra" -msgstr "Канберра" - -msgid "Douala" -msgstr "Дуала" - -msgid "Atyrau" -msgstr "Атырау" - -msgid "Madeira" -msgstr "Мадейра" - -msgid "Phoenix" -msgstr "Феникс" - -msgid "Santo_Domingo" -msgstr "Санто-Доминго" - -msgid "El_Salvador" -msgstr "Сальвадор" - -msgid "Anadyr" -msgstr "Анадырь" - -msgid "Boa_Vista" -msgstr "Боа_Виста" - -msgid "Godthab" -msgstr "Годтаб" - -msgid "Inuvik" -msgstr "Инувик" - -msgid "Cairo" -msgstr "Каир" - -msgid "Ojinaga" -msgstr "Охинага" - -msgid "Samarkand" -msgstr "Самарканд" - -msgid "Jerusalem" -msgstr "Иерусалим" - -msgid "Bishkek" -msgstr "Бишкек" - -msgid "Karachi" -msgstr "Карачи" - -msgid "Phnom_Penh" -msgstr "Пномпень" - -msgid "Qyzylorda" -msgstr "Кызылорда" - -msgid "Auckland" -msgstr "Окленд" - -msgid "Makassar" -msgstr "Макассар" - -msgid "Stanley" -msgstr "Стэнли" - -msgid "Virgin" -msgstr "Виргин" - -msgid "Noumea" -msgstr "Нумеа" - -msgid "Budapest" -msgstr "Будапешт" - -msgid "Tirane" -msgstr "Тиран" - -msgid "Miquelon" -msgstr "Микелон" - -msgid "Krasnoyarsk" -msgstr "Красноярск" - -msgid "Rosario" -msgstr "Росарио" - -msgid "LHI" -msgstr "Лхи" - -msgid "Bamako" -msgstr "Бамако" - -msgid "Lome" -msgstr "Ломе" - -msgid "Astrakhan" -msgstr "Астрахань" - -msgid "Addis_Ababa" -msgstr "Аддис-Абеба" - -msgid "GMT-3" -msgstr "ГМТ-3" - -msgid "Tokyo" -msgstr "Токио" - -msgid "Saipan" -msgstr "Сайпан" - -msgid "Katmandu" -msgstr "Катманду" - -msgid "Monrovia" -msgstr "Монровия" - -msgid "Casablanca" -msgstr "Касабланка" - -msgid "Nauru" -msgstr "Науру" - -msgid "Guam" -msgstr "Гуам" - -msgid "Ust-Nera" -msgstr "Усть-Нера" - -msgid "Arctic" -msgstr "Арктика" - -msgid "Menominee" -msgstr "Меномини" - -msgid "Asuncion" -msgstr "Асунсьон" - -msgid "Rothera" -msgstr "Ротера" - -msgid "Luanda" -msgstr "Луанда" - -msgid "Tomsk" -msgstr "Томск" - -msgid "Guadalcanal" -msgstr "Гуадалканал" - -msgid "Chagos" -msgstr "Чагос" - -msgid "Thimphu" -msgstr "Тхимпху" - -msgid "Timbuktu" -msgstr "Тимбукту" - -msgid "Glace_Bay" -msgstr "Глейс-Бей" - -msgid "Marquesas" -msgstr "Маркизские острова" - -msgid "Brunei" -msgstr "Бруней" - -msgid "Pangnirtung" -msgstr "Пангниртунг" - -msgid "South" -msgstr "Саутф" - -msgid "Magadan" -msgstr "Магадан" - -msgid "Palau" -msgstr "Палау" - -msgid "Yangon" -msgstr "Янгон" - -msgid "Tongatapu" -msgstr "Тонгатапу" - -msgid "Hobart" -msgstr "Хобарт" - -msgid "Bogota" -msgstr "Богота" - -msgid "Urumqi" -msgstr "Урумчи" - -msgid "Kinshasa" -msgstr "Киншаса" - -msgid "Thule" -msgstr "Туле" - -msgid "Saigon" -msgstr "Сайгон" - -msgid "NSW" -msgstr "Новый Южный Уэльс" - -msgid "Halifax" -msgstr "Галифакс" - -msgid "Araguaina" -msgstr "Арагуайна" - -msgid "Muscat" -msgstr "Мускат" - -msgid "Kashgar" -msgstr "Кашгар" - -msgid "Port-au-Prince" -msgstr "Порт-о-Пренс" - -msgid "Resolute" -msgstr "Резольют" - -msgid "Kabul" -msgstr "Кабул" - -msgid "Kyiv" -msgstr "Киев" - -msgid "Omsk" -msgstr "Омск" - -msgid "Gaza" -msgstr "Газа" - -msgid "Malabo" -msgstr "Малабо" - -msgid "Hovd" -msgstr "Ховд" - -msgid "Jamaica" -msgstr "Ямайка" - -msgid "Faroe" -msgstr "Фарерские острова" - -msgid "Mahe" -msgstr "Маэ" - -msgid "Montevideo" -msgstr "Монтевидео" - -msgid "Eirunepe" -msgstr "Эйрунепе" - -msgid "Catamarca" -msgstr "Катамарка" - -msgid "Melbourne" -msgstr "Мельбурн" - -msgid "Hawaii" -msgstr "Гавайи" - -msgid "Macquarie" -msgstr "Маккуори" - -msgid "Belfast" -msgstr "Белфаст" - -msgid "Wallis" -msgstr "Уоллис" - -msgid "Moscow" -msgstr "Москва" - -msgid "Gaborone" -msgstr "Габороне" - -msgid "Port_of_Spain" -msgstr "Порт-оф-Спейн" - -msgid "Bissau" -msgstr "Бисау" - -msgid "Universal" -msgstr "Юнивёрсал-Сити" - -msgid "Regina" -msgstr "Реджайна" - -msgid "Ulan_Bator" -msgstr "Улан_Батор" - -msgid "Ujung_Pandang" -msgstr "Уджунг_Панданг" - -msgid "Costa_Rica" -msgstr "Коста_Рика" - -msgid "Galapagos" -msgstr "Галапагос" - -msgid "Tehran" -msgstr "Тегеран" - -msgid "DumontDUrville" -msgstr "Дюмон-д-Юрвиль" - -msgid "Enderbury" -msgstr "Эндербери" - -msgid "Ciudad_Juarez" -msgstr "Сьюдад_Хуарес" - -msgid "Mauritius" -msgstr "Маврикий" - -msgid "Podgorica" -msgstr "Подгорица" - -msgid "Kiev" -msgstr "Киев" - -msgid "Hong_Kong" -msgstr "Гонконг" - -msgid "Thimbu" -msgstr "Тимбу" - -msgid "Belize" -msgstr "Белиз" - -msgid "Gambier" -msgstr "Гамбье" - -msgid "Sydney" -msgstr "Сидней" - -msgid "Amsterdam" -msgstr "Амстердам" - -msgid "Juba" -msgstr "Джуба" - -msgid "Helsinki" -msgstr "Хельсинки" - -msgid "Santarem" -msgstr "Сантарен" - -msgid "Guyana" -msgstr "Гайана" - -msgid "Maldives" -msgstr "Мальдивы" - -msgid "Paramaribo" -msgstr "Парамарибо" - -msgid "Fort_Wayne" -msgstr "Форт_Уэйн" - -msgid "Yellowknife" -msgstr "Йеллоунайф" - -msgid "West" -msgstr "Запад" - -msgid "Almaty" -msgstr "Алматы" - -msgid "Novosibirsk" -msgstr "Новосибирск" - -msgid "Mariehamn" -msgstr "Мариехамн" - -msgid "Brazzaville" -msgstr "Браззавиль" - -msgid "Majuro" -msgstr "Маджуро" - -msgid "Uzhgorod" -msgstr "Ужгород" - -msgid "Ljubljana" -msgstr "Любляна" - -msgid "Knox_IN" -msgstr "Нокс_IN" - -msgid "Bermuda" -msgstr "Бермуды" - -msgid "Kirov" -msgstr "Киров" - -msgid "Cuiaba" -msgstr "Куяба" - -msgid "Mendoza" -msgstr "Мендоса" - -msgid "Kanton" -msgstr "Кантон" - -msgid "South_Georgia" -msgstr "Южная Грузия" - -msgid "Banjul" -msgstr "Банжул" - -msgid "Louisville" -msgstr "Луисвилл" - -msgid "Indiana" -msgstr "Индианан" - -msgid "North_Dokota" -msgstr "Северная Докота" - -msgid "Palmer" -msgstr "Палмер" - -msgid "Yekaterinburg" -msgstr "Екатеринбург" - -msgid "Cape_Vepde" -msgstr "Кабо-Верде" - -msgid "East" -msgstr "Восток" - -msgid "Easterlsland" -msgstr "Остров Пасхи" - -msgid "Mayotte" -msgstr "Майотта" - -msgid "BajaSur" -msgstr "Южная Нижняя Калифорния" - -msgid "Enter the name of the ntp-server or its ip-address.\nWhen entering multiple addresses, separate them with commas." -msgstr "Введите имя ntp-сервера или его ip-адрес.\nПри вводе нескольких адресов, разделяйте их запятыми." - -msgid "Cape_Verde" -msgstr "Кабо-Верде" - -msgid "Save" -msgstr "Сохранить" - -msgid "Save to global and local configuration" -msgstr "Сохранить глобальную и локальную конфигурацию" - -msgid "Save global configuration" -msgstr "Сохранить глобальную конфигурацию" - -msgid "Save local configuration" -msgstr "Сохранить локальную конфигурацию" - -msgid "Load global configuration" -msgstr "Загрузить глобальную конфигурацию" - -msgid "Load local configuration" -msgstr "Загрузить локальную конфигурацию" - -msgid "Disabled" -msgstr "Отключено" - -msgid "Load" -msgstr "Загрузить" - -msgid "Argument not recognized\n" -msgstr "Нepacпoзнaнный аргумент\n" - -msgid "La_Rioja" -msgstr "Риоха" - -msgid "Rio_Gallegos" -msgstr "Рио-Гальегос" - -msgid "Salta" -msgstr "Сальта" - -msgid "San_Juan" -msgstr "Сан-Хуан" - -msgid "San_Luis" -msgstr "Сан-Луис" - -msgid "Tucuman" -msgstr "Тукуман" - -msgid "Ushuaia" -msgstr "Ушуая" - -msgid "Knox" -msgstr "Ноксвилл" - -msgid "Marengo" -msgstr "Маренго" - -msgid "Petersburg" -msgstr "Петербург" - -msgid "Tell_City" -msgstr "Телл-Сити" - -msgid "Vevay" -msgstr "Вевей" - -msgid "Vincennes" -msgstr "Венсен" - -msgid "Winamac" -msgstr "Винамаке" - -msgid "Project Home Page" -msgstr "Домашняя страница проекта" - -msgid "ComodRivadavia" -msgstr "Комодоро-Ривадавия" - -msgid "Monticello" -msgstr "Монтиселло" - -msgid "Beulah" -msgstr "Беула" - -msgid "Center" -msgstr "Центр" - -msgid "New_Salem" -msgstr "Нью-Салем" - -msgid "Windhoek" -msgstr "Виндхук" - -msgid "Iqaluit" -msgstr "Икалуит" - -msgid "EasterIsland" -msgstr "Остров Пасхи" - -msgid "Andorra" -msgstr "Андорра" - -msgid "About" -msgstr "О программе" - -msgid "Help" -msgstr "Справка" - -msgid "Date and Time" -msgstr "Дата и Время" - -msgid ": \"Hardware time\"" -msgstr ": \"Аппаратное время\"" - -msgid ": \"Time Zone\"" -msgstr ": \"Временная зона\"" - -msgid ": \"Date\"" -msgstr ": \"Дата\"" - -msgid "Local configuration reading error" -msgstr "Ошибка чтения локальной конфигурации" - -msgid "Local configuration write error" -msgstr "Ошибка записи локальной конфигурации" - -msgid "Global configuration read error" -msgstr "Ошибка чтения глобальной конфигурации" - -msgid "Global configuration write error" -msgstr "Ошибка записи глобальной конфигурации" - -msgid "Local configuration downloaded successfully" -msgstr "Успешно загружена локальная конфигурация" - -msgid "Global configuration downloaded successfully" -msgstr "Успешно загружена глобальная конфигурация" - -msgid "Global configuration successfully written" -msgstr "Успешно записана глобальная конфигурация" - -msgid "Local configuration successfully written" -msgstr "Успешно записана локальная конфигурация" - -msgid "" -"GTK settings datetime for UBLinux\n\n" -"Usage: ubl-settings-datetime [OPTIONS...]\n" -"Options:\n" -" -h, --help Show this help\n" -" -V, --version Show package version\n" -" --lock-datetime Lock date and time changes\n" -" --lock-timezone Lock time zone changes\n" -" --lock-ntp-mode Lock NTP mode selection\n" -" --lock-ntp-edit Lock editing NTP servers\n" -" --lock-sync-hwclock Lock sync hwclock mode selection\n" -" --lock-save Lock saving local and global configuration\n" -" --lock-save-local Lock save global configuration\n" -" --lock-save-global Lock load global configuration\n" -" --lock-load-global Lock load global configuration\n" -msgstr "" -"GTK-утилита настройки даты и времени для UBLinux\n\n" -"Использование: ubl-settings-datetime [Параметры приложения...]\n" -"Параметры приложения:\n" -" -h, --help Показать параметры справки\n" -" -V, --version Показать версию пакета\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 "ubl-settings-datetime version: " -msgstr "ubl-settings-datetime версия: " -- 2.35.1 From 670575cc546a28fffb8e902c2adf7378d256f7d3 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 22 Mar 2023 12:34:11 +0600 Subject: [PATCH 20/24] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20po=20=D0=B8=20pot=20=D1=84=D0=B0?= =?UTF-8?q?=D0=B9=D0=BB=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-datetime.pot | 17 +++-------------- ubl-settings-datetime_ru.po | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 25 deletions(-) diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot index e1feb1f..5677572 100644 --- a/ubl-settings-datetime.pot +++ b/ubl-settings-datetime.pot @@ -1,21 +1,10 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# Russian translations for PACKAGE package. +# Copyright (C) 2023 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Automatically generated, 2023. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-22 11:06+0600\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" msgid ":" msgstr "" diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index fa77ef2..ae2ef8a 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -1,21 +1,21 @@ -# Russian translations for PACKAGE package. -# Copyright (C) 2023 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Automatically generated, 2023. +# 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: ubconfig 1.0\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-22 11:06+0600\n" -"PO-Revision-Date: 2020-02-22 23:28+0600\n" -"Last-Translator: ublinux \n" -"Language-Team: Russian - UBLinux Team \n" +"Project-Id-Version: ubl-settings-datetime 1.0\n" +"Report-Msgid-Bugs-To: info@ublinux.com\n" +"POT-Creation-Date: 2023-01-01 00:00+0600\n" +"PO-Revision-Date: 2023-01-01 00:00+0600\n" +"Last-Translator: UBLinux Team \n" +"Language-Team: 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 ":" -- 2.35.1 From 264f31e0a696a42c2e12a835294e0a21f15de2e7 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 22 Mar 2023 12:39:14 +0600 Subject: [PATCH 21/24] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20po=20=D0=B8=20pot=20=D1=84=D0=B0?= =?UTF-8?q?=D0=B9=D0=BB=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-datetime.pot | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot index 5677572..5b15a61 100644 --- a/ubl-settings-datetime.pot +++ b/ubl-settings-datetime.pot @@ -3,6 +3,12 @@ # This file is distributed under the same license as the PACKAGE package. # Automatically generated, 2023. # +# 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 "" -- 2.35.1 From d6f362b8a7550e816bb5287712e85048ec972ac3 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 22 Mar 2023 12:42:18 +0600 Subject: [PATCH 22/24] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20pot=20=D1=84=D0=B0=D0=B9=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-datetime.pot | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot index 5b15a61..411dc9f 100644 --- a/ubl-settings-datetime.pot +++ b/ubl-settings-datetime.pot @@ -1,9 +1,4 @@ -# Russian translations for PACKAGE package. -# Copyright (C) 2023 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Automatically generated, 2023. -# -# Russian translations for ubl-settings-datetime package. +# Language translations for ubl-settings-datetime package. # Copyright (C) 2022, UBTech LLC # This file is distributed under the same license as the ubl-settings-datetime package. # UBLinux Team , 2022 @@ -11,6 +6,16 @@ #, fuzzy msgid "" msgstr "" +"Project-Id-Version: ubl-settings-datetime 1.0\n" +"Report-Msgid-Bugs-To: info@ublinux.com\n" +"POT-Creation-Date: 2023-01-01 00:00+0600\n" +"PO-Revision-Date: 2023-01-01 00:00+0600\n" +"Last-Translator: UBLinux Team \n" +"Language-Team: UBLinux Team \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" msgid ":" msgstr "" -- 2.35.1 From a0805990522d2e0e94790476cfb8b1151aebd6ee Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 22 Mar 2023 14:00:38 +0600 Subject: [PATCH 23/24] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B0=20?= =?UTF-8?q?=D1=84=D0=BE=D0=BD=D0=B0=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7=20?= =?UTF-8?q?=D0=A1++?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- #ubl-settings-datetime.glade# | 1344 ------------------------------- source/ubl-settings-datetime.cc | 11 +- source/ubl-settings-datetime.h | 3 + ubl-settings-datetime.css | 4 +- ubl-settings-datetime.glade | 170 ++-- 5 files changed, 105 insertions(+), 1427 deletions(-) delete mode 100644 #ubl-settings-datetime.glade# diff --git a/#ubl-settings-datetime.glade# b/#ubl-settings-datetime.glade# deleted file mode 100644 index 26f879f..0000000 --- a/#ubl-settings-datetime.glade# +++ /dev/null @@ -1,1344 +0,0 @@ - - - - - - False - О Программе - False - True - center - ubl-settings-datetime - dialog - True - False - False - ubl-settings-datetime - 1.2 - Copyright © 2023 - UBSoft Software LLC - Setting the date and time - https://ublinux.ru/ - Project Home Page - Это приложение распространяется без каких-либо гарантий. -Подробнее в <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General Public License, версии 2 или позднее</a>. - UBGroup - UBGroup - com.ublinux.ubl-settings-datetime - True - gpl-2-0 - - - False - vertical - 2 - - - False - end - - - - - - False - False - 0 - - - - - - - - - - True - False - False - False - 4 - - - True - False - Load global configuration - - - - - - True - False - Load local configuration - - - - - - True - False - False - False - 4 - - - True - False - Help - - - - - - True - False - About - - - - - - True - False - False - False - 4 - - - True - False - Save to global and local configuration - - - - - - True - False - Save global configuration - - - - - - True - False - Save local configuration - - - - - - 659 - False - - - True - False - vertical - - - True - False - vertical - - - True - False - - - True - False - 5 - 5 - 5 - 5 - 6 - 6 - 25 - 1 - - - False - True - 0 - - - - - True - False - start - 5 - 5 - 5 - 5 - 6 - 6 - - - - - - - True - True - 1 - - - - - False - True - 0 - - - - - True - False - vertical - - - True - False - - - True - False - - - 90 - True - False - 5 - 5 - 5 - 5 - 6 - 6 - 69 - com.ublinux.ubl-settings-datetime - - - False - True - 0 - - - - - True - False - - - True - False - - - True - False - vertical - - - 255 - True - False - Date and time settings - - - - - - - - - True - True - 0 - - - - - False - True - 0 - - - - - True - True - 0 - - - - - True - False - - - False - True - 1 - - - - - True - True - 1 - - - - - -1 - - - - - False - True - 0 - - - - - False - True - 1 - - - - - True - False - vertical - - - True - False - vertical - - - True - False - 5 - 5 - 5 - 5 - 0.019999999552965164 - in - - - True - False - 5 - 5 - 5 - vertical - - - True - False - - - 0 - True - False - 5 - 5 - 5 - 5 - 6 - 6 - Time: - True - 0 - - - False - True - 0 - - - - - True - True - 5 - 5 - 5 - 5 - 6 - 6 - 2 - 0.099999999776482579 - True - - - False - True - 1 - - - - - True - False - : - - - False - True - 2 - - - - - True - True - 5 - 5 - 5 - 5 - 6 - 6 - 2 - True - - - False - True - 3 - - - - - 20 - True - False - 5 - 5 - 5 - 5 - 6 - 6 - Date: - True - 0 - - - False - True - 4 - - - - - -1 - True - True - Date -Format: DD.MM.YYYY - 5 - 5 - 5 - 5 - 6 - 6 - - - True - True - 5 - - - - - True - True - True - Интерактивный выбор даты - 5 - 10 - 5 - 10 - 6 - 6 - - - True - False - x-office-calendar - - - - - False - True - 6 - - - - - False - True - 1 - - - - - True - False - - - 252 - True - True - True - 7 - 5 - 7 - 5 - 6 - 6 - - - True - False - center - center - - - True - False - 5 - 5 - 5 - 5 - media-playlist-repeat - - - False - True - 0 - - - - - True - False - center - center - Sync by - - - False - True - 1 - - - - - - - True - True - 0 - - - - - True - False - - - False - True - 1 - - - - - True - False - - - False - True - 2 - - - - - True - True - True - 5 - 10 - 5 - 10 - 6 - 6 - - - True - False - center - center - Synchronize hardware time - - - - - True - True - 3 - - - - - False - True - 3 - - - - - - - True - False - Current date and time - - - - - False - True - 0 - - - - - False - True - 1 - - - - - True - False - vertical - - - True - False - 5 - 5 - 5 - 5 - 0.019999999552965164 - in - - - True - False - 5 - 5 - 5 - vertical - - - True - False - - - True - False - 5 - 5 - 5 - 5 - 6 - 6 - - - False - True - 1 - - - - - True - True - Enter the name of the ntp server or its ip address. When entering multiple addresses, separate them with spaces. - center - 5 - 10 - 5 - 10 - 6 - 6 - - - True - True - 3 - - - - - False - True - 1 - - - - - - - True - False - Synchronize via NTP - - - - - False - True - 0 - - - - - False - True - 2 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 0.019999999552965164 - in - - - True - False - vertical - - - True - False - - - True - False - start - 8 - 5 - 8 - 5 - 6 - 13 - Synchronize hardware time: - - - False - True - 0 - - - - - True - False - 10 - 5 - 5 - 10 - 6 - 10 - False - False - - - True - True - 2 - - - - - False - True - 0 - - - - - True - False - - - True - False - - - False - True - 1 - - - - - True - False - 8 - 5 - 8 - 5 - 6 - 13 - Region: - 0 - - - False - True - 2 - - - - - True - False - 5 - 5 - 5 - 5 - 6 - 10 - False - False - - - True - True - 3 - - - - - True - False - 5 - 5 - 5 - 5 - 6 - 13 - Area: - 0 - - - False - True - 4 - - - - - True - False - 5 - 5 - 5 - 5 - 6 - 10 - False - False - - - True - True - 5 - - - - - 5 - True - False - - - False - True - 6 - - - - - True - False - - - False - True - 7 - - - - - False - True - 1 - - - - - - - True - False - Time Zone - - - - - False - True - 3 - - - - - False - True - 2 - - - - - False - True - 0 - - - - - - - True - False - True - - - True - False - start - 5 - 5 - 5 - 5 - 1 - False - ubl-settings-datetime - - - - - - - - True - False - 5 - 5 - 5 - 5 - 32 - com.ublinux.ubl-settings-datetime - - - - - True - False - - - True - True - False - True - True - menu - none - - - True - False - - - True - False - 5 - 5 - 5 - 5 - Load - - - False - True - 0 - - - - - True - False - pan-down-symbolic - - - False - True - 1 - - - - - - - False - True - 0 - - - - - - 1 - - - - - True - False - - - True - True - False - True - True - menu2 - none - - - True - False - - - True - False - 5 - 5 - 5 - 5 - Save - - - - False - True - 0 - - - - - True - False - pan-down-symbolic - - - False - True - 1 - - - - - - - False - True - 0 - - - - - True - True - False - True - True - menu1 - none - - - True - False - open-menu-symbolic - - - - - False - True - 1 - - - - - - end - 3 - - - - - - - both - True - - - - - - - 240 - 185 - False - btnChooseDate - bottom - none - - - True - True - 10 - 10 - 10 - 10 - 10 - 10 - 2023 - 1 - 10 - - - - - False - Внимание! - com.ublinux.ubl-settings-datetime - dialog - - - True - False - vertical - - - True - False - 5 - 5 - 5 - 5 - - - True - False - 5 - 5 - 5 - 6 - 6 - 50 - gtk-dialog-warning - - - True - True - 0 - - - - - 160 - True - False - start - center - 6 - 6 - Enter DHCP ! - - - True - True - 1 - - - - - False - True - 1 - - - - - OK - True - True - True - 5 - 5 - 5 - 5 - 3 - 3 - - - False - True - 1 - - - - - - - False - popup - Внимание! - center - com.ublinux.ubl-settings-datetime - dialog - - - True - False - vertical - - - True - False - 5 - 5 - 5 - 5 - - - True - False - 5 - 5 - 5 - 6 - 6 - 50 - gtk-dialog-warning - - - True - True - 0 - - - - - 160 - True - False - start - center - 5 - 5 - 5 - 5 - 6 - 6 - Enter DHCP ! - - - True - True - 1 - - - - - False - True - 1 - - - - - OK - True - True - True - 5 - 5 - 5 - 5 - 3 - 3 - - - False - True - 1 - - - - - - diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index f363fe7..99a11c9 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -7,6 +7,7 @@ const string path_glade = "/usr/share/ubl-settings-datetime/ui/"; const string app_name = "ubl-settings-datetime"; const string path_locale = "/usr/share/locale/"; const string path_css = "/usr/share/ubl-settings-datetime/css/ubl-settings-datetime.css"; +const string path_img_head_background = "/usr/share/ubl-settings-datetime/images/logo-background.png"; bool flag_datetime = false; bool flag_timezone = false; bool flag_ntp_mode = false; @@ -84,6 +85,10 @@ void MainWindow::settings() { map_error["ubconfig --source default get clock HWCLOCK_SYNC"] = string(gettext(": \"Hardware time\"")); this->get_builder(); this->add_CSS(); + Gtk::Widget *boxWidget; + builder->get_widget("boxColor", boxWidget); + overHead->add_overlay(*boxWidget); + ubl_make_plugs(boxSave,boxButton, socket_ext_id_I, socket_trd_id_I); year = 0; month = 0; @@ -224,8 +229,7 @@ void MainWindow::add_CSS() { Glib::RefPtr styleContext = Gtk::StyleContext::create(); Glib::RefPtr screen = Gdk::Screen::get_default();//get default screen styleContext->add_provider_for_screen(screen, cssProvider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);//add provider for screen in all application - Glib::RefPtr boxColor_css = boxColor->get_style_context(); - boxColor_css->add_class("cssboxColor1"); + imgHeadBackground->set(path_img_head_background); Glib::RefPtr lblHead_css = lblHead->get_style_context(); Glib::RefPtr boxButton_css = boxButton->get_style_context(); Glib::RefPtr boxSave_css = boxSave->get_style_context(); @@ -308,6 +312,9 @@ void MainWindow::get_builder() { builder->get_widget("imgSettings", imgSettings); builder->get_widget("imgSave", imgSave); builder->get_widget("boxWidgetFunc", boxWidgetFunc); + builder->get_widget("overHead", overHead); + builder->get_widget("imgHeadBackground", imgHeadBackground); + } void MainWindow::gui_exit() { diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 83ee0a5..cf0933d 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -27,6 +27,7 @@ extern const string path_glade; extern const string app_name; extern const string path_locale; extern const string path_css; +extern const string path_img_head_background; extern bool flag_datetime; extern bool flag_timezone; extern bool flag_ntp_mode; @@ -114,6 +115,8 @@ class MainWindow : public Gtk::ApplicationWindow { Gtk::Image *imgLoad; Gtk::Image *imgSave; Gtk::Image *imgSettings; + Gtk::Overlay *overHead; + Gtk::Image *imgHeadBackground; string array_hw[2]; string array_hw_local[2]; bool flag_load = false; diff --git a/ubl-settings-datetime.css b/ubl-settings-datetime.css index e323d55..57095ec 100644 --- a/ubl-settings-datetime.css +++ b/ubl-settings-datetime.css @@ -1,9 +1,7 @@ .boxInfoMessError{ background-color: #ea9999; } -.cssboxColor1{ - background: url("/usr/share/ubl-settings-datetime/images/logo-background.png") no-repeat; -} + .boxInfoMessOK{ background-color: #f3f0ac; } diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index 47400a5..9b4cd2a 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -51,6 +51,94 @@ + + True + False + + + 90 + True + False + 5 + 5 + 5 + 5 + 6 + 6 + 69 + com.ublinux.ubl-settings-datetime + + + False + True + 0 + + + + + True + False + + + True + False + + + True + False + vertical + + + 255 + True + False + Date and time settings + + + + + + + + + True + True + 0 + + + + + False + True + 0 + + + + + True + True + 0 + + + + + True + False + + + False + True + 1 + + + + + True + True + 1 + + + True False @@ -213,91 +301,17 @@ False vertical - + + 81 True False - - 90 + True False - 5 - 5 - 5 - 5 - 6 - 6 - 69 - com.ublinux.ubl-settings-datetime - - - False - True - 0 - - - - - True - False - - - True - False - - - True - False - vertical - - - 255 - True - False - Date and time settings - - - - - - - - - True - True - 0 - - - - - False - True - 0 - - - - - True - True - 0 - - - - - True - False - - - False - True - 1 - - - True - True - 1 + -1 -- 2.35.1 From bbf2a5248aced2d328c52b8b51cd3dc87534a497 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 22 Mar 2023 15:28:26 +0600 Subject: [PATCH 24/24] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D0=B4=D0=B8=D0=B7=D0=B0=D0=B9=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-datetime.glade | 145 ++++++++++++++++++++---------------- 1 file changed, 82 insertions(+), 63 deletions(-) diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index 9b4cd2a..a62872a 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -361,19 +361,81 @@ True False - - 0 + True False - 5 - 5 - 5 - 5 - 6 - 6 - Time: - True - 0 + + + 0 + True + False + 5 + 5 + 5 + 5 + 6 + 6 + Time: + True + 0 + + + False + True + 0 + + + + + True + True + 5 + 5 + 5 + 5 + 6 + 6 + 2 + 0.099999999776482579 + True + + + False + True + 1 + + + + + True + False + : + + + False + True + 2 + + + + + True + True + 5 + 5 + 5 + 5 + 6 + 6 + 2 + True + + + False + True + 3 + + False @@ -381,57 +443,6 @@ 0 - - - True - True - 5 - 5 - 5 - 5 - 6 - 6 - 2 - 0.099999999776482579 - True - - - False - True - 1 - - - - - True - False - : - - - False - True - 2 - - - - - True - True - 5 - 5 - 5 - 5 - 6 - 6 - 2 - True - - - False - True - 3 - - 20 @@ -512,7 +523,7 @@ Format: DD.MM.YYYY False - 252 + 0 True True True @@ -1153,6 +1164,14 @@ Format: DD.MM.YYYY + + both + True + + + + + 240 185 -- 2.35.1