diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index f7db74a..88ff657 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -130,7 +130,7 @@ void MainWindow::lacalization() { tm *ltm = localtime(&now); unsigned int year = 1900+ ltm->tm_year; string str_authors = string(copyright) + to_string(year); - aboutWindows->set_program_name(name_app); + aboutWindows->set_program_name(app_name); aboutWindows->set_copyright(str_authors); aboutWindows->set_comments(str_date_time); aboutWindows->set_website(website); @@ -147,7 +147,7 @@ void MainWindow::lacalization() { cbDhcp->append(str_manual); cbDhcp->append(str_disabled); lblDateTimeSetting->set_text(current_date_time); - lblHead->set_text(setting_date_time); + lblHead->set_text(str_date_time); lblTime->set_text(str_time); lblData->set_text(str_date); lblTimeZone->set_text(str_time_zone); diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 90bb0fa..6425c94 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -91,7 +91,7 @@ #define always_redirect _("Always redirect") #define nothing_save _("Nothing to save!") #define read_documentation_web _("Would you like to read documentation in the Web?") -#define redirected_documentation _("You will be redirected to documentation site, where user help pages are ""translated and supported by community.") +#define redirected_documentation _("You will be redirected to documentation website where documentation is\n""translated and supported by community.") #define str_help_h _("Setting up the date and time for UBLinux\n\n""Usage: ubl-settings-datetime [OPTIONS...]\n""Options:\n"" -h, --help Show this help\n"" -V, --version Show package version\n"" --lock-datetime Lock date and time changes\n"" --lock-timezone Lock time zone changes\n"" --lock-ntp-mode Lock NTP mode selection\n"" --lock-ntp-edit Lock editing NTP servers\n"" --lock-sync-hwclock Lock sync hwclock mode selection\n"" --lock-save Lock saving local and global configuration\n"" --lock-save-local Lock save global configuration\n"" --lock-save-global Lock load global configuration\n"" --lock-load-global Lock load global configuration\n") #define str_version _("ubl-settings-datetime version: ") #define local_read_error _("Local configuration reading error") diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index c44a817..a947538 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -27,8 +27,8 @@ 5 5 5 - 6 - 6 + 5 + 5 50 gtk-dialog-warning @@ -45,8 +45,8 @@ False start center - 6 - 6 + 5 + 5 Enter DHCP ! @@ -96,7 +96,7 @@ ubl-settings-datetime 1.0 Copyright © 2022 - 2023, UBSoft LLC - Setting the date and time + Date and Time https://ublinux.ru/ Project Home Page Это приложение распространяется без каких-либо гарантий. @@ -163,8 +163,8 @@ 5 5 5 - 6 - 6 + 5 + 5 69 com.ublinux.ubl-settings-datetime @@ -192,7 +192,8 @@ 255 True False - Date and time settings + Date and Time + 0.25 @@ -354,8 +355,8 @@ 5 5 5 - 6 - 6 + 5 + 5 25 1 @@ -374,8 +375,8 @@ 5 5 5 - 6 - 6 + 5 + 5 @@ -473,8 +474,8 @@ 5 5 5 - 6 - 6 + 5 + 5 Time: True 0 @@ -493,8 +494,8 @@ 5 5 5 - 6 - 6 + 5 + 5 2 0.099999999776482579 True @@ -525,8 +526,8 @@ 5 5 5 - 6 - 6 + 5 + 5 2 True @@ -552,8 +553,8 @@ 5 5 5 - 6 - 6 + 5 + 5 Date: True 0 @@ -564,26 +565,6 @@ 4 - - - -1 - True - True - Date -Format: DD.MM.YYYY - 5 - 5 - 5 - 5 - 6 - 6 - - - True - True - 5 - - True @@ -594,8 +575,8 @@ Format: DD.MM.YYYY 10 5 10 - 6 - 6 + 5 + 5 True @@ -607,7 +588,27 @@ Format: DD.MM.YYYY False True - 6 + 5 + + + + + -1 + True + True + Date +Format: DD.MM.YYYY + 5 + 5 + 5 + 5 + 5 + 5 + + + True + True + 5 @@ -631,8 +632,8 @@ Format: DD.MM.YYYY 5 7 5 - 6 - 6 + 5 + 5 True @@ -709,8 +710,8 @@ Format: DD.MM.YYYY 10 5 10 - 6 - 6 + 5 + 5 True @@ -792,8 +793,8 @@ Format: DD.MM.YYYY 5 5 5 - 6 - 6 + 5 + 5 False @@ -811,8 +812,8 @@ Format: DD.MM.YYYY 10 5 10 - 6 - 6 + 5 + 5 True @@ -879,7 +880,7 @@ Format: DD.MM.YYYY 5 8 5 - 6 + 5 13 Synchronize hardware time: @@ -897,7 +898,7 @@ Format: DD.MM.YYYY 5 5 10 - 6 + 5 10 False False @@ -938,7 +939,7 @@ Format: DD.MM.YYYY 5 8 5 - 6 + 5 13 Region: 0 @@ -957,7 +958,7 @@ Format: DD.MM.YYYY 5 5 5 - 6 + 5 10 False False @@ -976,7 +977,7 @@ Format: DD.MM.YYYY 5 5 5 - 6 + 5 13 Area: 0 @@ -987,6 +988,18 @@ Format: DD.MM.YYYY 4 + + + 5 + True + False + + + False + True + 5 + + True @@ -995,7 +1008,7 @@ Format: DD.MM.YYYY 5 5 5 - 6 + 5 10 False False @@ -1006,18 +1019,6 @@ Format: DD.MM.YYYY 5 - - - 5 - True - False - - - False - True - 6 - - True @@ -1321,7 +1322,7 @@ Format: DD.MM.YYYY 20 20 dialog-warning-symbolic - 6 + 5 False @@ -1422,7 +1423,7 @@ Format: DD.MM.YYYY 20 20 dialog-question-symbolic - 6 + 5 False diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot index 2110e3a..a570d35 100644 --- a/ubl-settings-datetime.pot +++ b/ubl-settings-datetime.pot @@ -2030,7 +2030,7 @@ msgstr "" #: source/ubl-settings-datetime.h:85 source/ubl-settings-datetime.h:84 #: source/ubl-settings-datetime.cc:169 msgid "" -"You will be redirected to documentation site, where user help pages are " +"You will be redirected to documentation website where documentation is\n" "translated and supported by community." msgstr "" diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index d25c7fd..0812ab1 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -78,7 +78,7 @@ msgstr "О программе" #: source/ubl-settings-datetime.h:71 source/ubl-settings-datetime.h:70 #: source/ubl-settings-datetime.cc:137 msgid "About ubl-settings-datetime" -msgstr "О программе Настройка даты и времени" +msgstr "О программе Дата и время" msgid "Accra" msgstr "Аккра" @@ -2058,10 +2058,10 @@ msgstr "Ереван" #: source/ubl-settings-datetime.h:85 source/ubl-settings-datetime.h:84 #: source/ubl-settings-datetime.cc:169 msgid "" -"You will be redirected to documentation site, where user help pages are " +"You will be redirected to documentation website where documentation is\n" "translated and supported by community." msgstr "" -"Вы будете перенаправлены на сайт с документацией где страницы помощи " +"Вы будете перенаправлены на сайт с документацией где страницы помощи\n" "переводятся и поддерживаются сообществом." msgid "Yukon" @@ -2097,17 +2097,12 @@ msgid "" msgstr "" "https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/" -#: source/ubl-settings-datetime.cc:174 -#, fuzzy -msgid "ubl-settings-bootloader" -msgstr "О программе Загрузка системы" - #: source/ubl-settings-datetime.h:67 source/ubl-settings-datetime.h:66 #: source/ubl-settings-datetime.cc:131 source/ubl-settings-datetime.cc:155 #: source/ubl-settings-datetime.cc:156 source/ubl-settings-datetime.cc:151 #: source/ubl-settings-datetime.cc:146 msgid "ubl-settings-datetime" -msgstr "Настройка даты и времени" +msgstr "Дата и время" #: source/ubl-settings-datetime.h:87 source/ubl-settings-datetime.h:86 #: source/ubl-settings-datetime.cc:1714 source/ubl-settings-datetime.cc:1651