From 7f768fb78806859453d12d7f595d01c6935a9eb9 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 17 May 2023 16:55:04 +0600 Subject: [PATCH 1/7] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D1=82=D1=81=D1=82=D1=83=D0=BF=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-datetime.glade | 80 ++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index c44a817..f055c4b 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 ! @@ -163,8 +163,8 @@ 5 5 5 - 6 - 6 + 5 + 5 69 com.ublinux.ubl-settings-datetime @@ -354,8 +354,8 @@ 5 5 5 - 6 - 6 + 5 + 5 25 1 @@ -374,8 +374,8 @@ 5 5 5 - 6 - 6 + 5 + 5 @@ -473,8 +473,8 @@ 5 5 5 - 6 - 6 + 5 + 5 Time: True 0 @@ -493,8 +493,8 @@ 5 5 5 - 6 - 6 + 5 + 5 2 0.099999999776482579 True @@ -525,8 +525,8 @@ 5 5 5 - 6 - 6 + 5 + 5 2 True @@ -552,8 +552,8 @@ 5 5 5 - 6 - 6 + 5 + 5 Date: True 0 @@ -575,8 +575,8 @@ Format: DD.MM.YYYY 5 5 5 - 6 - 6 + 5 + 5 True @@ -594,8 +594,8 @@ Format: DD.MM.YYYY 10 5 10 - 6 - 6 + 5 + 5 True @@ -607,7 +607,7 @@ Format: DD.MM.YYYY False True - 6 + 5 @@ -631,8 +631,8 @@ Format: DD.MM.YYYY 5 7 5 - 6 - 6 + 5 + 5 True @@ -709,8 +709,8 @@ Format: DD.MM.YYYY 10 5 10 - 6 - 6 + 5 + 5 True @@ -792,8 +792,8 @@ Format: DD.MM.YYYY 5 5 5 - 6 - 6 + 5 + 5 False @@ -811,8 +811,8 @@ Format: DD.MM.YYYY 10 5 10 - 6 - 6 + 5 + 5 True @@ -879,7 +879,7 @@ Format: DD.MM.YYYY 5 8 5 - 6 + 5 13 Synchronize hardware time: @@ -897,7 +897,7 @@ Format: DD.MM.YYYY 5 5 10 - 6 + 5 10 False False @@ -938,7 +938,7 @@ Format: DD.MM.YYYY 5 8 5 - 6 + 5 13 Region: 0 @@ -957,7 +957,7 @@ Format: DD.MM.YYYY 5 5 5 - 6 + 5 10 False False @@ -976,7 +976,7 @@ Format: DD.MM.YYYY 5 5 5 - 6 + 5 13 Area: 0 @@ -995,7 +995,7 @@ Format: DD.MM.YYYY 5 5 5 - 6 + 5 10 False False @@ -1015,7 +1015,7 @@ Format: DD.MM.YYYY False True - 6 + 5 @@ -1321,7 +1321,7 @@ Format: DD.MM.YYYY 20 20 dialog-warning-symbolic - 6 + 5 False @@ -1422,7 +1422,7 @@ Format: DD.MM.YYYY 20 20 dialog-question-symbolic - 6 + 5 False From cba6960fb85f63714cf4be8adb24e0aa28d51078 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 17 May 2023 17:16:01 +0600 Subject: [PATCH 2/7] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=BD=D0=B5=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- #ubl-settings-datetime.glade# | 1636 +++++++++++++++++++++++++++++++ source/ubl-settings-datetime.cc | 2 +- ubl-settings-datetime.glade | 67 +- 3 files changed, 1671 insertions(+), 34 deletions(-) create mode 100644 #ubl-settings-datetime.glade# diff --git a/#ubl-settings-datetime.glade# b/#ubl-settings-datetime.glade# new file mode 100644 index 0000000..96c2b7d --- /dev/null +++ b/#ubl-settings-datetime.glade# @@ -0,0 +1,1636 @@ + + + + + + False + Внимание! + com.ublinux.ubl-settings-datetime + dialog + + + True + False + vertical + + + True + False + 5 + 5 + 5 + 5 + + + True + False + 5 + 5 + 5 + 5 + 5 + 50 + gtk-dialog-warning + + + True + True + 0 + + + + + 160 + True + False + start + center + 5 + 5 + Enter DHCP ! + + + True + True + 1 + + + + + False + True + 1 + + + + + OK + True + True + True + 5 + 5 + 5 + 5 + 3 + 3 + + + False + True + 1 + + + + + + + False + False + True + center + com.ublinux.ubl-settings-datetime + dialog + True + True + ubl-settings-datetime + 1.0 + Copyright © 2022 - 2023, UBSoft 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 + + + True + False + vertical + 2 + + + False + end + + + False + False + 1 + + + + + + + + + + True + False + True + + + True + False + 5 + 5 + 5 + 5 + 2 + ubl-settings-datetime + + + + + + + + + + True + False + + + 90 + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 69 + com.ublinux.ubl-settings-datetime + + + False + True + 0 + + + + + True + False + + + True + False + + + True + False + vertical + + + 255 + True + False + Date and Time + 0.25 + + + + + + + True + True + 0 + + + + + False + True + 0 + + + + + True + True + 0 + + + + + True + False + + + False + True + 1 + + + + + True + True + 1 + + + + + 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 configuration + + + + + + True + False + Save to global configuration + + + + + + True + False + Save to local configuration + + + + + + 659 + False + com.ublinux.ubl-settings-datetime + + + True + False + vertical + + + True + False + vertical + + + True + False + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 25 + 1 + + + False + True + 0 + + + + + True + False + start + 5 + 5 + 5 + 5 + 5 + 5 + + + + + + + True + True + 1 + + + + + False + True + 0 + + + + + True + False + vertical + + + 81 + True + False + + + True + False + start + + + -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 + + + True + False + + + 0 + True + False + 5 + 5 + 5 + 5 + 5 + 5 + Time: + True + 0 + + + False + True + 0 + + + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + 2 + 0.099999999776482579 + True + + + False + True + 1 + + + + + True + False + : + + + False + True + 2 + + + + + True + True + 5 + 5 + 5 + 5 + 5 + 5 + 2 + True + + + False + True + 3 + + + + + False + True + 0 + + + + + 20 + True + False + 5 + 5 + 5 + 5 + 5 + 5 + Date: + True + 0 + + + False + True + 4 + + + + + True + True + True + Интерактивный выбор даты + 5 + 10 + 5 + 10 + 5 + 5 + + + True + False + x-office-calendar + + + + + False + True + 5 + + + + + -1 + True + True + Date +Format: DD.MM.YYYY + 5 + 5 + 5 + 5 + 5 + 5 + + + True + True + 5 + + + + + False + True + 1 + + + + + True + False + + + 0 + True + True + True + 7 + 5 + 7 + 5 + 5 + 5 + + + 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 + 5 + 5 + + + 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 + 5 + 5 + + + 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 + 5 + 5 + + + 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 + 5 + 13 + Synchronize hardware time: + + + False + True + 0 + + + + + True + False + 10 + 5 + 5 + 10 + 5 + 10 + False + False + + + True + True + 2 + + + + + False + True + 0 + + + + + True + False + + + True + False + + + False + True + 1 + + + + + True + False + 8 + 5 + 8 + 5 + 5 + 13 + Region: + 0 + + + False + True + 2 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 10 + False + False + + + True + True + 3 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 13 + Area: + 0 + + + False + True + 4 + + + + + 5 + True + False + + + False + True + 5 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 10 + False + False + + + True + True + 5 + + + + + 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 + + + + + + + both + True + + + + + + + 240 + 185 + False + btnChooseDate + bottom + none + + + True + True + 10 + 10 + 10 + 10 + 10 + 10 + 2023 + 1 + 10 + + + + + False + start + False + + + True + False + vertical + + + True + False + + + True + False + center + start + 20 + 20 + 20 + 20 + 20 + 20 + dialog-warning-symbolic + 5 + + + False + True + 1 + + + + + True + False + center + center + 10 + 25 + 10 + 25 + 20 + 20 + Enter DHCP ! + True + 0 + + + True + True + 2 + + + + + True + True + 0 + + + + + Close + True + True + True + 5 + 5 + 5 + 5 + 5 + 5 + + + False + True + 2 + + + + + + + True + False + Attention + True + + + True + False + 32 + com.ublinux.ubl-settings-datetime + 5 + + + + + + + False + start + start + False + 450 + 250 + dialog-question-symbolic + + + True + False + vertical + + + True + False + + + True + False + start + 20 + 20 + dialog-question-symbolic + 5 + + + False + True + 0 + + + + + True + False + vertical + + + True + False + start + 10 + 5 + Would you like to read documentation in the Web? + True + 0 + + + + + + + False + True + 0 + + + + + True + False + start + start + 10 + 10 + You will be redirected to documentation website where documentation is translated and supported by community. + True + 0 + + + + True + True + 1 + + + + + Always redirect to online documentation + True + True + False + end + 10 + True + + + + False + True + 2 + + + + + + True + True + 1 + + + + + + True + True + 0 + + + + + True + False + 5 + 5 + 5 + 5 + 5 + 5 + 30 + True + + + Cancel + True + True + True + + + + True + True + 0 + + + + + Read Online + True + True + True + + + + True + True + 1 + + + + + False + True + 1 + + + + + + + True + False + True + + + True + False + ubl-settings-datetime + + + + + + + + True + False + 32 + dialog-question-symbolic + + + + + + + 800 + 600 + False + True + True + com.ublinux.ubl-settings-datetime + center + + + + + + True + False + True + + + True + False + ubl-settings-datetime + + + + + True + False + 32 + com.ublinux.ubl-settings-datetime + 5 + + + + + + diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index f7db74a..285a28c 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -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/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index f055c4b..6145e91 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -192,7 +192,8 @@ 255 True False - Date and time settings + Date and Time + 0.20999999344348907 @@ -564,26 +565,6 @@ 4 - - - -1 - True - True - Date -Format: DD.MM.YYYY - 5 - 5 - 5 - 5 - 5 - 5 - - - True - True - 5 - - True @@ -610,6 +591,26 @@ Format: DD.MM.YYYY 5 + + + -1 + True + True + Date +Format: DD.MM.YYYY + 5 + 5 + 5 + 5 + 5 + 5 + + + True + True + 5 + + False @@ -987,6 +988,18 @@ Format: DD.MM.YYYY 4 + + + 5 + True + False + + + False + True + 5 + + True @@ -1006,18 +1019,6 @@ Format: DD.MM.YYYY 5 - - - 5 - True - False - - - False - True - 5 - - True From 5a9458ce9b14082b7924a6daaef440d330ff23d6 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 17 May 2023 17:16:34 +0600 Subject: [PATCH 3/7] fix --- #ubl-settings-datetime.glade# | 1636 --------------------------------- ubl-settings-datetime.glade | 2 +- 2 files changed, 1 insertion(+), 1637 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 96c2b7d..0000000 --- a/#ubl-settings-datetime.glade# +++ /dev/null @@ -1,1636 +0,0 @@ - - - - - - False - Внимание! - com.ublinux.ubl-settings-datetime - dialog - - - True - False - vertical - - - True - False - 5 - 5 - 5 - 5 - - - True - False - 5 - 5 - 5 - 5 - 5 - 50 - gtk-dialog-warning - - - True - True - 0 - - - - - 160 - True - False - start - center - 5 - 5 - Enter DHCP ! - - - True - True - 1 - - - - - False - True - 1 - - - - - OK - True - True - True - 5 - 5 - 5 - 5 - 3 - 3 - - - False - True - 1 - - - - - - - False - False - True - center - com.ublinux.ubl-settings-datetime - dialog - True - True - ubl-settings-datetime - 1.0 - Copyright © 2022 - 2023, UBSoft 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 - - - True - False - vertical - 2 - - - False - end - - - False - False - 1 - - - - - - - - - - True - False - True - - - True - False - 5 - 5 - 5 - 5 - 2 - ubl-settings-datetime - - - - - - - - - - True - False - - - 90 - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 69 - com.ublinux.ubl-settings-datetime - - - False - True - 0 - - - - - True - False - - - True - False - - - True - False - vertical - - - 255 - True - False - Date and Time - 0.25 - - - - - - - True - True - 0 - - - - - False - True - 0 - - - - - True - True - 0 - - - - - True - False - - - False - True - 1 - - - - - True - True - 1 - - - - - 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 configuration - - - - - - True - False - Save to global configuration - - - - - - True - False - Save to local configuration - - - - - - 659 - False - com.ublinux.ubl-settings-datetime - - - True - False - vertical - - - True - False - vertical - - - True - False - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 25 - 1 - - - False - True - 0 - - - - - True - False - start - 5 - 5 - 5 - 5 - 5 - 5 - - - - - - - True - True - 1 - - - - - False - True - 0 - - - - - True - False - vertical - - - 81 - True - False - - - True - False - start - - - -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 - - - True - False - - - 0 - True - False - 5 - 5 - 5 - 5 - 5 - 5 - Time: - True - 0 - - - False - True - 0 - - - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - 2 - 0.099999999776482579 - True - - - False - True - 1 - - - - - True - False - : - - - False - True - 2 - - - - - True - True - 5 - 5 - 5 - 5 - 5 - 5 - 2 - True - - - False - True - 3 - - - - - False - True - 0 - - - - - 20 - True - False - 5 - 5 - 5 - 5 - 5 - 5 - Date: - True - 0 - - - False - True - 4 - - - - - True - True - True - Интерактивный выбор даты - 5 - 10 - 5 - 10 - 5 - 5 - - - True - False - x-office-calendar - - - - - False - True - 5 - - - - - -1 - True - True - Date -Format: DD.MM.YYYY - 5 - 5 - 5 - 5 - 5 - 5 - - - True - True - 5 - - - - - False - True - 1 - - - - - True - False - - - 0 - True - True - True - 7 - 5 - 7 - 5 - 5 - 5 - - - 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 - 5 - 5 - - - 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 - 5 - 5 - - - 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 - 5 - 5 - - - 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 - 5 - 13 - Synchronize hardware time: - - - False - True - 0 - - - - - True - False - 10 - 5 - 5 - 10 - 5 - 10 - False - False - - - True - True - 2 - - - - - False - True - 0 - - - - - True - False - - - True - False - - - False - True - 1 - - - - - True - False - 8 - 5 - 8 - 5 - 5 - 13 - Region: - 0 - - - False - True - 2 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 10 - False - False - - - True - True - 3 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 13 - Area: - 0 - - - False - True - 4 - - - - - 5 - True - False - - - False - True - 5 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 10 - False - False - - - True - True - 5 - - - - - 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 - - - - - - - both - True - - - - - - - 240 - 185 - False - btnChooseDate - bottom - none - - - True - True - 10 - 10 - 10 - 10 - 10 - 10 - 2023 - 1 - 10 - - - - - False - start - False - - - True - False - vertical - - - True - False - - - True - False - center - start - 20 - 20 - 20 - 20 - 20 - 20 - dialog-warning-symbolic - 5 - - - False - True - 1 - - - - - True - False - center - center - 10 - 25 - 10 - 25 - 20 - 20 - Enter DHCP ! - True - 0 - - - True - True - 2 - - - - - True - True - 0 - - - - - Close - True - True - True - 5 - 5 - 5 - 5 - 5 - 5 - - - False - True - 2 - - - - - - - True - False - Attention - True - - - True - False - 32 - com.ublinux.ubl-settings-datetime - 5 - - - - - - - False - start - start - False - 450 - 250 - dialog-question-symbolic - - - True - False - vertical - - - True - False - - - True - False - start - 20 - 20 - dialog-question-symbolic - 5 - - - False - True - 0 - - - - - True - False - vertical - - - True - False - start - 10 - 5 - Would you like to read documentation in the Web? - True - 0 - - - - - - - False - True - 0 - - - - - True - False - start - start - 10 - 10 - You will be redirected to documentation website where documentation is translated and supported by community. - True - 0 - - - - True - True - 1 - - - - - Always redirect to online documentation - True - True - False - end - 10 - True - - - - False - True - 2 - - - - - - True - True - 1 - - - - - - True - True - 0 - - - - - True - False - 5 - 5 - 5 - 5 - 5 - 5 - 30 - True - - - Cancel - True - True - True - - - - True - True - 0 - - - - - Read Online - True - True - True - - - - True - True - 1 - - - - - False - True - 1 - - - - - - - True - False - True - - - True - False - ubl-settings-datetime - - - - - - - - True - False - 32 - dialog-question-symbolic - - - - - - - 800 - 600 - False - True - True - com.ublinux.ubl-settings-datetime - center - - - - - - True - False - True - - - True - False - ubl-settings-datetime - - - - - True - False - 32 - com.ublinux.ubl-settings-datetime - 5 - - - - - - diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index 6145e91..96c2b7d 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -193,7 +193,7 @@ True False Date and Time - 0.20999999344348907 + 0.25 From 3f8afbd560d7b347641c6af8a34cd7428297c371 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Wed, 17 May 2023 18:02:48 +0600 Subject: [PATCH 4/7] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BE=D0=BA?= 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 | 2 +- ubl-settings-datetime_ru.po | 7 +------ 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 285a28c..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); diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index 96c2b7d..a947538 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -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 Это приложение распространяется без каких-либо гарантий. diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index d25c7fd..02323fc 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -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 From 274bbea1fb672aec00e71e740f94a88e012f6105 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Thu, 18 May 2023 09:26:42 +0600 Subject: [PATCH 5/7] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20?= =?UTF-8?q?=D0=B2=20about?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ubl-settings-datetime_ru.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index 02323fc..5fe669d 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 "Аккра" From f315cc8ba59b8f3ed31ec60d0cb7076743d6f7e1 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Thu, 18 May 2023 11:36:04 +0600 Subject: [PATCH 6/7] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D1=82=D1=81=D1=82=D1=83=D0=BF=D1=8B=20=D0=B2=20?= =?UTF-8?q?=D0=BE=D0=BA=D0=BD=D0=B5=20=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=20=D0=B1=D1=80=D0=B0=D1=83=D0=B7=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/ubl-settings-datetime.h | 2 +- ubl-settings-datetime_ru.po | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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_ru.po b/ubl-settings-datetime_ru.po index 5fe669d..0812ab1 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -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" From 3a69082dcf14b8508f0fe3408cce492e9466eb9d Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Thu, 18 May 2023 11:41:58 +0600 Subject: [PATCH 7/7] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ""