Merge pull request 'master' (#110) from Igor1/ubl-settings-datetime:master into develop

Reviewed-on: #110
pull/112/head
Dmitry Razumov 3 years ago
commit fe1aee048b

@ -32,19 +32,20 @@ $ sudo make uninstall
# Usage # Usage
```sh ```sh
$ ubl-settings-datetime --help $ ubl-settings-datetime --help
GTK settings datetime for UBLinux Setting up the date and time for UBLinux
Usage: ubl-settings-datetime [OPTIONS...] Usage: ubl-settings-datetime [OPTIONS...]
Options: Options:
-h, --help Show this help -h, --help Show this help
-V, --version Show package version -V, --version Show package version
--lock-datetime Locking date and time changes --lock-datetime Lock date and time changes
--lock-timezone Locking time zone change --lock-timezone Lock time zone changes
--lock-ntp-mode Locking the NTP mode selection --lock-ntp-mode Lock NTP mode selection
--lock-ntp-edit Lock editing NTP servers --lock-ntp-edit Lock editing NTP servers
--lock-save Locking of local and global configuration saving --lock-sync-hwclock Lock sync hwclock mode selection
--lock-save-local Locking the local configuration save --lock-save Lock saving local and global configuration
--lock-save-global Locking the global configuration save --lock-save-local Lock save global configuration
--lock-save-global Lock load global configuration
--lock-load-global Lock load global configuration --lock-load-global Lock load global configuration
$ ubl-settings-datetime --version $ ubl-settings-datetime --version

@ -83,7 +83,7 @@
#define nothing_save _("Nothing to save!") #define nothing_save _("Nothing to save!")
#define read_documentation_web _("Would you like to read documentation in the Web?") #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 site, where user help pages are ""translated and supported by community.")
#define str_help_h _("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") #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 str_version _("ubl-settings-datetime version: ")
#define local_read_error _("Local configuration reading error") #define local_read_error _("Local configuration reading error")
#define global_read_error _("Global configuration read error") #define global_read_error _("Global configuration read error")

@ -301,7 +301,7 @@
<object class="GtkMenuItem" id="btnSaveLocalGlob"> <object class="GtkMenuItem" id="btnSaveLocalGlob">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Save in global and local configuration</property> <property name="label" translatable="yes">Save to global and local configuration</property>
<style> <style>
<class name="menuitemtop"/> <class name="menuitemtop"/>
</style> </style>
@ -311,7 +311,7 @@
<object class="GtkMenuItem" id="btnSaveGlob"> <object class="GtkMenuItem" id="btnSaveGlob">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Save in global configuration</property> <property name="label" translatable="yes">Save to global configuration</property>
<style> <style>
<class name="menuitemmiddle"/> <class name="menuitemmiddle"/>
</style> </style>
@ -321,7 +321,7 @@
<object class="GtkMenuItem" id="btnSaveLocal"> <object class="GtkMenuItem" id="btnSaveLocal">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="label" translatable="yes">Save in local configuration</property> <property name="label" translatable="yes">Save to local configuration</property>
<style> <style>
<class name="menuitembottom"/> <class name="menuitembottom"/>
</style> </style>

@ -755,7 +755,7 @@ msgstr ""
#: source/ubl-settings-datetime.h:86 source/ubl-settings-datetime.h:85 #: source/ubl-settings-datetime.h:86 source/ubl-settings-datetime.h:85
msgid "" msgid ""
"GTK settings datetime for UBLinux\n" "Setting up the date and time for UBLinux\n"
"\n" "\n"
"Usage: ubl-settings-datetime [OPTIONS...]\n" "Usage: ubl-settings-datetime [OPTIONS...]\n"
"Options:\n" "Options:\n"
@ -1656,15 +1656,15 @@ msgid "Save"
msgstr "" msgstr ""
#: source/ubl-settings-datetime.h:77 source/ubl-settings-datetime.h:76 #: source/ubl-settings-datetime.h:77 source/ubl-settings-datetime.h:76
msgid "Save in global configuration" msgid "Save to global configuration"
msgstr "" msgstr ""
#: source/ubl-settings-datetime.h:76 source/ubl-settings-datetime.h:75 #: source/ubl-settings-datetime.h:76 source/ubl-settings-datetime.h:75
msgid "Save in local configuration" msgid "Save to local configuration"
msgstr "" msgstr ""
#: source/ubl-settings-datetime.h:75 source/ubl-settings-datetime.h:74 #: source/ubl-settings-datetime.h:75 source/ubl-settings-datetime.h:74
msgid "Save in global and local configuration" msgid "Save to global and local configuration"
msgstr "" msgstr ""
msgid "Scoresbysund" msgid "Scoresbysund"

@ -763,7 +763,7 @@ msgstr "ГМТ-3"
#: source/ubl-settings-datetime.h:86 source/ubl-settings-datetime.h:85 #: source/ubl-settings-datetime.h:86 source/ubl-settings-datetime.h:85
msgid "" msgid ""
"GTK settings datetime for UBLinux\n" "Setting up the date and time for UBLinux\n"
"\n" "\n"
"Usage: ubl-settings-datetime [OPTIONS...]\n" "Usage: ubl-settings-datetime [OPTIONS...]\n"
"Options:\n" "Options:\n"
@ -1682,15 +1682,15 @@ msgid "Save"
msgstr "Сохранить" msgstr "Сохранить"
#: source/ubl-settings-datetime.h:77 source/ubl-settings-datetime.h:76 #: source/ubl-settings-datetime.h:77 source/ubl-settings-datetime.h:76
msgid "Save in global configuration" msgid "Save to global configuration"
msgstr "Сохранить в глобальную конфигурацию" msgstr "Сохранить в глобальную конфигурацию"
#: source/ubl-settings-datetime.h:76 source/ubl-settings-datetime.h:75 #: source/ubl-settings-datetime.h:76 source/ubl-settings-datetime.h:75
msgid "Save in local configuration" msgid "Save to local configuration"
msgstr "Сохранить в локальную конфигурацию" msgstr "Сохранить в локальную конфигурацию"
#: source/ubl-settings-datetime.h:75 source/ubl-settings-datetime.h:74 #: source/ubl-settings-datetime.h:75 source/ubl-settings-datetime.h:74
msgid "Save in global and local configuration" msgid "Save to global and local configuration"
msgstr "Сохранить в глобальную и локальную конфигурацию" msgstr "Сохранить в глобальную и локальную конфигурацию"
msgid "Scoresbysund" msgid "Scoresbysund"

Loading…
Cancel
Save