diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index c6b48b7..343d406 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -55,32 +55,32 @@ MainWindow::MainWindow(Glib::RefPtr const& builder) { } void MainWindow::settings() { - map_error["xdg-open https://wiki.ublinux.ru/ru/home"] = string(_(" : xdg-open")); - map_error["/usr/bin/ubconfig --default --source system get clock ZONE"] = string(_(" : Time Zone")); - map_error["hwclock --systohc"] = string(_(" : Hardware time")); - map_error["/usr/bin/ubconfig --default --source system get network NTPSERVERS"] = string(_(" : NTP")); - map_error["/usr/bin/ubconfig --source=default get NTPSERVERS_DEFAULT"] = string(_(" : NTP")); - map_error["/usr/bin/ubconfig --default --source system get clock HWCLOCK_SYNC"] = string(_(" : Hardware time")); - map_error["/usr/bin/ubconfig --default --source global get network NTPSERVERS"] = string(_(" : NTP")); - map_error["/usr/bin/ubconfig --default --source global get clock ZONE"] = string(_(" : Time Zone")); - map_error["/usr/bin/ubconfig --default --source global get clock HWCLOCK_SYNC"] = string(_(" : Hardware time")); - map_error["/usr/bin/ubconfig --source global get clock HWCLOCK_SYNC"] = string(_(" : Hardware time")); - map_error["/usr/bin/ubconfig --target system set clock ZONE="] = string(_(" : Time Zone")); - map_error["/usr/bin/ubconfig --target system set network NTPSERVERS=default"] = string(_(" : NTP")); - map_error["/usr/bin/ubconfig --target system set network NTPSERVERS=dhcp"] = string(_(" : NTP")); - map_error["/usr/bin/ubconfig --target system set network NTPSERVERS=\""] = string(_(" : NTP")); - map_error["/usr/bin/ubconfig --target system remove network NTPSERVERS"] = string(_(" : NTP")); - map_error["/usr/bin/ubconfig --target system set clock HWCLOCK_SYNC=localtime"] = string(_(" : Hardware time")); - map_error["/usr/bin/ubconfig --target system set clock HWCLOCK_SYNC=utc"] = string(_(" : Hardware time")); - map_error["/usr/bin/ubconfig --target global set clock ZONE="] = string(_(" : Time Zone")); - map_error["/usr/bin/ubconfig --target global set network NTPSERVERS=default"] = string(_(" : NTP")); - map_error["/usr/bin/ubconfig --target global set network NTPSERVERS=dhcp"] = string(_(" : NTP")); - map_error["/usr/bin/ubconfig --target global set network NTPSERVERS=\""] = string(_(" : NTP")); - map_error["/usr/bin/ubconfig --target global remove network NTPSERVERS"] = string(_(" : NTP")); - map_error["/usr/bin/ubconfig --target global set clock HWCLOCK_SYNC=localtime"] = string(_(" : Hardware time")); - map_error["/usr/bin/ubconfig --target global set clock HWCLOCK_SYNC=utc"] = string(_(" : Hardware time")); - map_error["date +%Y%m%d -s \""] = string(_(" : Date")); - map_error["date +%T -s \""] = ""; + map_error["xdg-open https://wiki.ublinux.ru/ru/home"] = string(_(": \"xdg-open\"")); + map_error["/usr/bin/ubconfig --default --source system get clock ZONE"] = string(_(": \"Time Zone\"")); + map_error["hwclock --systohc"] = string(_(": \"Hardware time\"")); + map_error["/usr/bin/ubconfig --default --source system get network NTPSERVERS"] = string(_(": \"NTP\"")); + map_error["/usr/bin/ubconfig --source=default get NTPSERVERS_DEFAULT"] = string(_(": \"NTP\"")); + map_error["/usr/bin/ubconfig --default --source system get clock HWCLOCK_SYNC"] = string(_(": \"Hardware time\"")); + map_error["/usr/bin/ubconfig --default --source global get network NTPSERVERS"] = string(_(": \"NTP\"")); + map_error["/usr/bin/ubconfig --default --source global get clock ZONE"] = string(_(": \"Time Zone\"")); + map_error["/usr/bin/ubconfig --default --source global get clock HWCLOCK_SYNC"] = string(_(": \"Hardware time\"")); + map_error["/usr/bin/ubconfig --source global get clock HWCLOCK_SYNC"] = string(_(": \"Hardware time\"")); + map_error["/usr/bin/ubconfig --target system set clock ZONE="] = string(_(": \"Time Zone\"")); + map_error["/usr/bin/ubconfig --target system set network NTPSERVERS=default"] = string(_(": \"NTP\"")); + map_error["/usr/bin/ubconfig --target system set network NTPSERVERS=dhcp"] = string(_(": \"NTP\"")); + map_error["/usr/bin/ubconfig --target system set network NTPSERVERS=\""] = string(_(": \"NTP\"")); + map_error["/usr/bin/ubconfig --target system remove network NTPSERVERS"] = string(_(": \"NTP\"")); + map_error["/usr/bin/ubconfig --target system set clock HWCLOCK_SYNC=localtime"] = string(_(": \"Hardware time\"")); + map_error["/usr/bin/ubconfig --target system set clock HWCLOCK_SYNC=utc"] = string(_(": \"Hardware time\"")); + map_error["/usr/bin/ubconfig --target global set clock ZONE="] = string(_(": \"Time Zone\"")); + map_error["/usr/bin/ubconfig --target global set network NTPSERVERS=default"] = string(_(": \"NTP\"")); + map_error["/usr/bin/ubconfig --target global set network NTPSERVERS=dhcp"] = string(_(": \"NTP\"")); + map_error["/usr/bin/ubconfig --target global set network NTPSERVERS=\""] = string(_(": \"NTP\"")); + map_error["/usr/bin/ubconfig --target global remove network NTPSERVERS"] = string(_(": \"NTP\"")); + map_error["/usr/bin/ubconfig --target global set clock HWCLOCK_SYNC=localtime"] = string(_(": \"Hardware time\"")); + map_error["/usr/bin/ubconfig --target global set clock HWCLOCK_SYNC=utc"] = string(_(": \"Hardware time\"")); + map_error["date +%Y%m%d -s \""] = string(_(": \"Date\"")); + map_error["date +%T -s \""] = string(_(": \"Date\"")); this->get_builder(); this->add_CSS(); ubl_make_plugs(boxSave,boxButton, socket_ext_id_I, socket_trd_id_I); @@ -97,6 +97,9 @@ void MainWindow::settings() { this->flag_block_gui(); btnBoxAboutDialog->set_visible(false); this->event(); + string c = "/usr/bin/ubconfig --default --source global get clock ZONE"; + this->log_mess_error(c); + error_info=1000; this->parse_text_date(); this->download_local_cfg(); } diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index a2a5d98..14cad13 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -1774,14 +1774,14 @@ msgstr "Справка" msgid "Date and Time" msgstr "Дата и Время" -msgid " : Hardware time" -msgstr " : Аппаратного времени" +msgid ": \"Hardware time\"" +msgstr ": \"Аппаратное время\"" -msgid " : Time Zone" -msgstr " : Временной зоны " +msgid ": \"Time Zone\"" +msgstr ": \"Временная зона\"" -msgid " : Date" -msgstr " : Даты " +msgid ": \"Date\"" +msgstr ": \"Дата\"" msgid "Local configuration reading error" msgstr "Ошибка чтения локальной конфигурации"