Applications
/
ubl-settings-datetime
8
0
Fork 3
Code Issues 4 Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request 'develop' (#120) from develop into master

Browse Source 
Reviewed-on: #120
pull/122/head
Dmitry Razumov 3 years ago
parent 54ccc706e6 8866b1d30d
commit 387c336e2e
5 changed files with 80 additions and 84 deletions
Show Stats Download Patch File Download Diff File

4
source/ubl-settings-datetime.cc
Unescape View File

@ -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);

2
source/ubl-settings-datetime.h
Unescape View File

@ -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")

143
ubl-settings-datetime.glade
Unescape View File

@ -27,8 +27,8 @@
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<property name="pixel-size">50</property>
<property name="icon-name">gtk-dialog-warning</property>
</object>
@ -45,8 +45,8 @@
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="valign">center</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<property name="label" translatable="yes">Enter DHCP !</property>
</object>
<packing>
@ -96,7 +96,7 @@
<property name="program-name">ubl-settings-datetime</property>
<property name="version">1.0</property>
<property name="copyright" translatable="yes">Copyright © 2022 - 2023, UBSoft LLC</property>
<property name="comments" translatable="yes">Setting the date and time</property>
<property name="comments" translatable="yes">Date and Time</property>
<property name="website">https://ublinux.ru/</property>
<property name="website-label" translatable="yes">Project Home Page</property>
<property name="license" translatable="yes">Это приложение распространяется без каких-либо гарантий.
@ -163,8 +163,8 @@
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<property name="pixel-size">69</property>
<property name="icon-name">com.ublinux.ubl-settings-datetime</property>
</object>
@ -192,7 +192,8 @@
<property name="width-request">255</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Date and time settings</property>
<property name="label" translatable="yes">Date and Time</property>
<property name="xalign">0.25</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="size" value="15360"/>
@ -354,8 +355,8 @@
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<property name="pixel-size">25</property>
<property name="icon_size">1</property>
</object>
@ -374,8 +375,8 @@
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<attributes>
<attribute name="weight" value="bold"/>
<attribute name="foreground" value="#4d4d4d4d4d4d"/>
@ -473,8 +474,8 @@
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<property name="label" translatable="yes" context="Time" comments="Time">Time:</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
@ -493,8 +494,8 @@
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<property name="width-chars">2</property>
<property name="progress-pulse-step">0.099999999776482579</property>
<property name="numeric">True</property>
@ -525,8 +526,8 @@
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<property name="width-chars">2</property>
<property name="numeric">True</property>
</object>
@ -552,8 +553,8 @@
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<property name="label" translatable="yes" context="Date" comments="Date">Date:</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
@ -564,26 +565,6 @@
<property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="txtDate">
<property name="width-request">-1</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="tooltip-text" translatable="yes" context="Date of&#10;Format: DD.MM.YYYY" comments="Date of&#10;Format: DD.MM.YYYY">Date
Format: DD.MM.YYYY</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkButton" id="btnChooseDate">
<property name="visible">True</property>
@ -594,8 +575,8 @@ Format: DD.MM.YYYY</property>
<property name="margin-right">10</property>
<property name="margin-start">5</property>
<property name="margin-end">10</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
@ -607,7 +588,27 @@ Format: DD.MM.YYYY</property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">6</property>
<property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="txtDate">
<property name="width-request">-1</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="tooltip-text" translatable="yes" context="Date of&#10;Format: DD.MM.YYYY" comments="Date of&#10;Format: DD.MM.YYYY">Date
Format: DD.MM.YYYY</property>
<property name="margin-left">5</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
</object>
@ -631,8 +632,8 @@ Format: DD.MM.YYYY</property>
<property name="margin-right">5</property>
<property name="margin-start">7</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
@ -709,8 +710,8 @@ Format: DD.MM.YYYY</property>
<property name="margin-right">10</property>
<property name="margin-start">5</property>
<property name="margin-end">10</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
<child>
<object class="GtkLabel" id="lblTimeBios">
<property name="visible">True</property>
@ -792,8 +793,8 @@ Format: DD.MM.YYYY</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
</object>
<packing>
<property name="expand">False</property>
@ -811,8 +812,8 @@ Format: DD.MM.YYYY</property>
<property name="margin-right">10</property>
<property name="margin-start">5</property>
<property name="margin-end">10</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="margin-top">5</property>
<property name="margin-bottom">5</property>
</object>
<packing>
<property name="expand">True</property>
@ -879,7 +880,7 @@ Format: DD.MM.YYYY</property>
<property name="margin-right">5</property>
<property name="margin-start">8</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-top">5</property>
<property name="margin-bottom">13</property>
<property name="label" translatable="yes">Synchronize hardware time:</property>
</object>
@ -897,7 +898,7 @@ Format: DD.MM.YYYY</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">10</property>
<property name="margin-top">6</property>
<property name="margin-top">5</property>
<property name="margin-bottom">10</property>
<property name="hexpand">False</property>
<property name="vexpand">False</property>
@ -938,7 +939,7 @@ Format: DD.MM.YYYY</property>
<property name="margin-right">5</property>
<property name="margin-start">8</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-top">5</property>
<property name="margin-bottom">13</property>
<property name="label" translatable="yes" context="Region" comments="Region">Region:</property>
<property name="xalign">0</property>
@ -957,7 +958,7 @@ Format: DD.MM.YYYY</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-top">5</property>
<property name="margin-bottom">10</property>
<property name="hexpand">False</property>
<property name="vexpand">False</property>
@ -976,7 +977,7 @@ Format: DD.MM.YYYY</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-top">5</property>
<property name="margin-bottom">13</property>
<property name="label" translatable="yes" context="Zone" comments="Zone">Area:</property>
<property name="xalign">0</property>
@ -987,6 +988,18 @@ Format: DD.MM.YYYY</property>
<property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="width-request">5</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="cbZone">
<property name="visible">True</property>
@ -995,7 +1008,7 @@ Format: DD.MM.YYYY</property>
<property name="margin-right">5</property>
<property name="margin-start">5</property>
<property name="margin-end">5</property>
<property name="margin-top">6</property>
<property name="margin-top">5</property>
<property name="margin-bottom">10</property>
<property name="hexpand">False</property>
<property name="vexpand">False</property>
@ -1006,18 +1019,6 @@ Format: DD.MM.YYYY</property>
<property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="width-request">5</property>
<property name="visible">True</property>
<property name="can-focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">6</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
@ -1321,7 +1322,7 @@ Format: DD.MM.YYYY</property>
<property name="margin-top">20</property>
<property name="margin-bottom">20</property>
<property name="icon-name">dialog-warning-symbolic</property>
<property name="icon_size">6</property>
<property name="icon_size">5</property>
</object>
<packing>
<property name="expand">False</property>
@ -1422,7 +1423,7 @@ Format: DD.MM.YYYY</property>
<property name="xpad">20</property>
<property name="ypad">20</property>
<property name="icon-name">dialog-question-symbolic</property>
<property name="icon_size">6</property>
<property name="icon_size">5</property>
</object>
<packing>
<property name="expand">False</property>

2
ubl-settings-datetime.pot
Unescape View File

@ -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 ""

13
ubl-settings-datetime_ru.po
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save