From b6c8c1117ed9fc1fe44baa4886a3fe29f7c6fbbf Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 25 Jan 2023 14:18:08 +0000 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=B1=D0=B0=D0=B3=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.cc | 9 +++++++-- ubl-settings-datetime_ru.po | 18 +++--------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 45536bf..7b71ed0 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -92,7 +92,7 @@ void MainWindow::lacalization(){ _lblSynchronizeBtn->set_text(gettext("Sync by")); _lblDateTimeSettingGlob->set_text(gettext("Setting date and time in global configuration")); this->set_title(gettext("ubl-settings-datetime")); - _mess_dchp->set_title("Warning!"); + _mess_dchp->set_title(gettext("Warning!")); } void MainWindow::flag_block_gui(){ @@ -560,7 +560,11 @@ void MainWindow::read_file(){ string key_reg = entry.path().filename().string(); string path_dir = "/usr/share/zoneinfo/"+key_reg; if (fs::is_directory(path_dir)){ - vector zone; + if (key_reg!="Pacific"){ + if (key_reg!="posix"){ + if (key_reg!="Etc"){ + if (key_reg!="right"){ + vector zone; zone.push_back(""); for (const auto & entry_zone : fs::directory_iterator(path_dir)){ std::ifstream in1(entry_zone.path()); // окрываем файл для чтения @@ -575,6 +579,7 @@ void MainWindow::read_file(){ key_reg = string(gettext(key_reg.c_str())); time_reg_map.insert({key_reg, zone}); + }}}} } } in.close(); diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index 9c9da17..fdf671c 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -5,21 +5,6 @@ # msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-01-24 15:14+0000\n" -"PO-Revision-Date: 2023-01-24 15:14+0000\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"Language: ru\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -msgid "Warning!" -msgstr "Внимание!" msgid "Manually" msgstr "Вручную" @@ -86,3 +71,6 @@ msgstr "Настройка даты и времени в глобальной к msgid "Incorrect date format" msgstr "Не верный формат даты" + +msgid "Warning!" +msgstr "Внимание!"