diff --git a/.gitignore b/.gitignore index 8d239bc..2160adc 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,6 @@ source/**/main.o source/**/ubl_settings_datetime.o ubl-settings-datetime_ru.po~ reg/ -.vscode/ \ No newline at end of file +.vscode/ +terminal-commands/ +*# \ No newline at end of file diff --git a/source/main.cc b/source/main.cc index b1d135b..7272934 100644 --- a/source/main.cc +++ b/source/main.cc @@ -14,20 +14,17 @@ int main(int argc, char* argv[]) { // return system(cmd.c_str()); } setlocale(LC_ALL, ""); - bindtextdomain("ubl-settings-datetime", "/usr/share/locale/"); - bind_textdomain_codeset("ubl-settings-datetime", "UTF-8"); - textdomain("ubl-settings-datetime"); + textdomain(app_name); if (argc > 1){ str_argv = argv[1]; } if (str_argv.find("--socket-id") != std::string::npos){ - pars_flag(3, argc, argv); auto app = Gtk::Application::create(argc, argv, "org.gtkmm.example.plug"); auto builder = Gtk::Builder::create_from_resource(path_glade); + builder->set_translation_domain(app_name); Glib::init(); - setlocale(LC_ALL, ""); Glib::OptionContext context; CmdArgParser parser{ @@ -53,6 +50,7 @@ int main(int argc, char* argv[]) { pars_flag(1, argc, argv); auto app = Gtk::Application::create(len_argv, argv, "org.gtkmm.example.plug"); auto builder = Gtk::Builder::create_from_resource(path_glade); + builder->set_translation_domain(app_name); MainWindow* wnd = nullptr; builder->get_widget_derived("window", wnd); auto r = app->run(*wnd); diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index 4b9dfc1..f96fb12 100644 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -153,6 +153,7 @@ void MainWindow::lacalization() { lblHeadeWndWeb->set_text(name_app); windowMessDchp->set_title(str_attention); lblTimeBios->set_text(synchronize_hw); + headInfoLabel->set_text(setting_date_time); lblHW->set_text(string(synchronize_hw) + ":"); array_hw_local[0] = utc_time; array_hw_local[1] = str_local_time; @@ -161,6 +162,7 @@ void MainWindow::lacalization() { this->bubble_sort(array_hw, array_hw_local, 2); cbHw->append(array_hw_local[0]); cbHw->append(array_hw_local[1]); + set_title(str_date_time); lblhelpHeader->set_text(read_documentation_web); lblhelpText->set_text(redirected_documentation); @@ -168,6 +170,13 @@ void MainWindow::lacalization() { btnCancelHelp->set_label(cancel); chkAlwaysOpenHelp->set_label(always_redirect); lblwebHeaderName->set_label(name_app); + btnSaveLocalGlob->set_label(save_all); + btnSaveGlob->set_label(save_global); + btnSaveLocal->set_label(save_local); + btnLoadGlob->set_label(load_global); + btnLoadLocal->set_label(load_local); + btnhelp->set_label(str_help); + btnAbout->set_label(str_about_1); } void MainWindow::bubble_sort(string arr[],string arr_local[], int len_arr) { @@ -320,6 +329,7 @@ void MainWindow::get_builder() { builder->get_widget("boxWidgetFunc", boxWidgetFunc); builder->get_widget("overHead", overHead); builder->get_widget("imgHeadBackground", imgHeadBackground); + builder->get_widget("headInfoLabel", headInfoLabel); #ifdef WEBKIT_FOUND builder->get_widget("wndWeb", wndWeb); #endif @@ -1029,8 +1039,8 @@ struct MainWindow::Result MainWindow::wrapper_call(string cmd) { if ((response.find("(null)") == std::string::npos) && (response.length() != 0 )) { if (response.find("=") != std::string::npos) { if (response.find("\n") != std::string::npos) { - response = response.substr(response.find("=")+1,response.length()); - response = response.substr(0,response.find("\n")); + response = response.substr(response.find("\"")+1,response.length()); + response = response.substr(0,response.find("\"")); obj_result.response = response; obj_result.error = 0; } @@ -1174,8 +1184,12 @@ void MainWindow::entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhc warning_info-= 1; } } - } - else { + } else if (str_dhcp == "stop") { + this->write_config("stop", "dhcp"); + cbDhcp->set_active(3); + txtNtpServer->set_text(""); + txtNtpServer->set_sensitive(false); + } else { // btnUpdateDateTime->set_sensitive(false); if (str_dhcp == "") { this->write_config("", "dhcp"); @@ -1200,7 +1214,7 @@ void MainWindow::entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhc } else { this->write_config("", "dhcp"); - cbDhcp->set_active(3); + cbDhcp->set_active(0); txtNtpServer->set_text(""); txtNtpServer->set_sensitive(false); // btnUpdateDateTime->set_sensitive(true); diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index b711ca9..2092f6e 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -135,7 +135,7 @@ #define str_time_zone _("Time zone") #define str_date _("Date:") #define synchronize_hw _("Synchronize hardware time") -#define setting_date_time _("Setting the date and time") +#define setting_date_time _("Setting the system date and time") #define current_date_time _("Current date and time") #define data_format_d_m_y _("Date of\nFormat: DD.MM.YYYY") #define synchronize_ntp _("Synchronize via NTP") @@ -223,6 +223,7 @@ class MainWindow : public Gtk::ApplicationWindow { Gtk::Image *imgSettings; Gtk::Overlay *overHead; Gtk::Image *imgHeadBackground; + Gtk::Label *headInfoLabel; Gtk::Label *lblHeadeWndWeb; Gtk::Label *lblHeaderAboutTopic; diff --git a/ubl-settings-datetime.css b/ubl-settings-datetime.css index 8458a42..526a8f8 100644 --- a/ubl-settings-datetime.css +++ b/ubl-settings-datetime.css @@ -92,4 +92,8 @@ border-radius:2px; } .entry:focus { +} + +.marginright image{ + margin-right: 2px; } \ No newline at end of file diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index 57cdd14..adb26c4 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -1,7 +1,8 @@ - + + False Внимание! @@ -141,7 +142,7 @@ 5 5 2 - ubl-settings-datetime + Date and Time @@ -252,6 +253,186 @@ + + True + False + emblem-ok-symbolic + + + True + False + process-stop-symbolic + + + 450 + False + dialog-question-symbolic + + + True + False + 5 + 5 + 5 + 5 + vertical + + + True + False + + + True + False + start + 20 + 20 + dialog-question-symbolic + 6 + + + False + True + 0 + + + + + True + False + 10 + vertical + 5 + + + True + False + start + 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. + 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 + + + True + False + Date and Time + + + + + + + + Cancel + True + True + True + image2 + + + + + + Read Online + True + True + True + image1 + + + + end + 1 + + + + + True False @@ -464,35 +645,81 @@ 0.019999999552965164 in - + True False - 5 - 5 - 5 - vertical + 5 + 5 + 5 True False + vertical + 5 - + True False + 5 - - 0 + True False - 5 - 5 - 5 - 5 - 5 - 5 - Time: - True - 0 + 5 + + + True + False + Time: + True + 0 + + + False + True + 0 + + + + + True + True + 2 + 0.099999999776482579 + True + + + False + True + 1 + + + + + True + False + : + + + False + True + 2 + + + + + True + True + 2 + True + + + False + True + 3 + + False @@ -501,253 +728,168 @@ - + + 20 True - True - 5 - 5 - 5 - 5 - 5 - 5 - 2 - 0.099999999776482579 - True + False + Date: + True + 0 False True - 1 + 4 - + True - False - : + True + True + Интерактивный выбор даты + + + True + False + x-office-calendar + + False True - 2 + 5 - + + -1 True True - 5 - 5 - 5 - 5 - 5 - 5 - 2 - True + Date +Format: DD.MM.YYYY - False + True True - 3 + 5 False True - 0 + 1 - - 20 + True False - 5 - 5 - 5 - 5 - 5 - 5 - Date: - True - 0 - - - False - True - 4 - - - - - True - True - True - Интерактивный выбор даты - 5 - 10 - 5 - 10 - 5 - 5 + 5 - + + 0 + True + True + True + + + 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 - x-office-calendar + + False + True + 1 + - - - 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 - - + + + False + True + 2 + + + + + True + True + True - + True False center center - Sync by + Synchronize hardware time - - False - True - 1 - + + True + True + 3 + - - 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 - @@ -788,27 +930,46 @@ Format: DD.MM.YYYY 0.019999999552965164 in - + True False - 5 - 5 - 5 - vertical + 5 + 5 + 5 True False + vertical - + True False - 5 - 5 - 5 - 5 - 5 - 5 + 5 + + + True + False + + + 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 + + + True + True + 3 + + False @@ -816,31 +977,7 @@ Format: DD.MM.YYYY 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 - @@ -877,179 +1014,133 @@ Format: DD.MM.YYYY 0.019999999552965164 in - + True False - vertical + 5 + 5 + 5 True False + vertical + 5 - - 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 + 5 + + + True + False + start + Synchronize hardware time: + + + False + True + 0 + + + + + True + False + False + False + + + True + True + 2 + + - True + False True - 5 + 0 - + True False + 5 + + + True + False + Region: + 0 + + + False + True + 2 + + + + + True + False + False + False + + + True + True + 3 + + + + + True + False + Area: + 0 + + + False + True + 4 + + + + + 5 + True + False + + + False + True + 5 + + + + + True + False + False + False + + + True + True + 5 + + - False + True True - 7 + 1 - - False - True - 1 - @@ -1099,7 +1190,7 @@ Format: DD.MM.YYYY 5 1 False - ubl-settings-datetime + Date and Time @@ -1109,10 +1200,6 @@ Format: DD.MM.YYYY True False - 5 - 5 - 5 - 5 32 com.ublinux.ubl-settings-datetime @@ -1138,10 +1225,6 @@ Format: DD.MM.YYYY True False - 5 - 5 - 5 - 5 Load @@ -1200,10 +1283,6 @@ Format: DD.MM.YYYY True False - 5 - 5 - 5 - 5 Save - - - 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 @@ -1627,7 +1510,7 @@ Format: DD.MM.YYYY True False - ubl-settings-datetime + Date and Time diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot index 1644a6a..8cd9eca 100644 --- a/ubl-settings-datetime.pot +++ b/ubl-settings-datetime.pot @@ -23,6 +23,7 @@ msgstr "" #: source/ubl-settings-datetime.h:110 source/ubl-settings-datetime.h:109 #: source/ubl-settings-datetime.cc:81 source/ubl-settings-datetime.cc:82 #: source/ubl-settings-datetime.cc:83 source/ubl-settings-datetime.cc:84 +#: source/ubl-settings-datetime.h:119 msgid ": \"Date\"" msgstr "" @@ -36,7 +37,7 @@ msgstr "" #: source/ubl-settings-datetime.cc:73 source/ubl-settings-datetime.cc:74 #: source/ubl-settings-datetime.cc:80 source/ubl-settings-datetime.cc:81 #: source/ubl-settings-datetime.cc:85 source/ubl-settings-datetime.cc:62 -#: source/ubl-settings-datetime.cc:84 +#: source/ubl-settings-datetime.cc:84 source/ubl-settings-datetime.h:121 msgid ": \"Hardware time\"" msgstr "" @@ -51,6 +52,7 @@ msgstr "" #: source/ubl-settings-datetime.cc:72 source/ubl-settings-datetime.cc:78 #: source/ubl-settings-datetime.cc:79 source/ubl-settings-datetime.cc:82 #: source/ubl-settings-datetime.cc:63 source/ubl-settings-datetime.cc:81 +#: source/ubl-settings-datetime.h:122 msgid ": \"NTP\"" msgstr "" @@ -60,7 +62,7 @@ msgstr "" #: source/ubl-settings-datetime.cc:59 source/ubl-settings-datetime.cc:65 #: source/ubl-settings-datetime.cc:68 source/ubl-settings-datetime.cc:75 #: source/ubl-settings-datetime.cc:64 source/ubl-settings-datetime.cc:67 -#: source/ubl-settings-datetime.cc:74 +#: source/ubl-settings-datetime.cc:74 source/ubl-settings-datetime.h:120 msgid ": \"Time Zone\"" msgstr "" @@ -72,11 +74,12 @@ msgid "Abidjan" msgstr "" #: source/ubl-settings-datetime.h:70 source/ubl-settings-datetime.h:69 +#: source/ubl-settings-datetime.h:79 msgid "About" msgstr "" #: source/ubl-settings-datetime.h:71 source/ubl-settings-datetime.h:70 -#: source/ubl-settings-datetime.cc:137 +#: source/ubl-settings-datetime.cc:137 source/ubl-settings-datetime.h:80 msgid "About ubl-settings-datetime" msgstr "" @@ -119,7 +122,7 @@ msgid "Almaty" msgstr "" #: source/ubl-settings-datetime.h:82 source/ubl-settings-datetime.h:81 -#: source/ubl-settings-datetime.cc:173 +#: source/ubl-settings-datetime.cc:173 source/ubl-settings-datetime.h:91 msgid "Always redirect" msgstr "" @@ -134,7 +137,7 @@ msgstr "" #: source/ubl-settings-datetime.h:103 source/ubl-settings-datetime.h:102 #: source/ubl-settings-datetime.cc:898 source/ubl-settings-datetime.cc:834 -#: source/ubl-settings-datetime.cc:817 +#: source/ubl-settings-datetime.cc:817 source/ubl-settings-datetime.h:112 msgid "An invalid character is entered" msgstr "" @@ -175,6 +178,7 @@ msgid "Arctic" msgstr "" #: source/ubl-settings-datetime.h:108 source/ubl-settings-datetime.h:107 +#: source/ubl-settings-datetime.h:117 msgid "Argument not recognized\n" msgstr "" @@ -219,7 +223,7 @@ msgstr "" #: source/ubl-settings-datetime.h:122 source/ubl-settings-datetime.h:121 #: source/ubl-settings-datetime.cc:157 source/ubl-settings-datetime.cc:152 -#: source/ubl-settings-datetime.cc:147 +#: source/ubl-settings-datetime.cc:147 source/ubl-settings-datetime.h:131 msgid "Attention" msgstr "" @@ -383,7 +387,7 @@ msgid "Canberra" msgstr "" #: source/ubl-settings-datetime.h:81 source/ubl-settings-datetime.h:80 -#: source/ubl-settings-datetime.cc:172 +#: source/ubl-settings-datetime.cc:172 source/ubl-settings-datetime.h:90 msgid "Cancel" msgstr "" @@ -497,7 +501,7 @@ msgstr "" #: source/ubl-settings-datetime.h:66 source/ubl-settings-datetime.h:65 #: source/ubl-settings-datetime.cc:130 source/ubl-settings-datetime.cc:128 -#: source/ubl-settings-datetime.cc:123 +#: source/ubl-settings-datetime.cc:123 source/ubl-settings-datetime.h:75 msgid "Copyright © UBSoft LLC, 2022 - " msgstr "" @@ -521,7 +525,7 @@ msgstr "" #: source/ubl-settings-datetime.h:130 source/ubl-settings-datetime.h:129 #: source/ubl-settings-datetime.cc:147 source/ubl-settings-datetime.cc:143 -#: source/ubl-settings-datetime.cc:138 +#: source/ubl-settings-datetime.cc:138 source/ubl-settings-datetime.h:139 msgid "Current date and time" msgstr "" @@ -530,7 +534,7 @@ msgstr "" #: source/ubl-settings-datetime.h:115 source/ubl-settings-datetime.h:114 #: source/ubl-settings-datetime.cc:144 source/ubl-settings-datetime.cc:140 -#: source/ubl-settings-datetime.cc:135 +#: source/ubl-settings-datetime.cc:135 source/ubl-settings-datetime.h:124 msgid "DHCP" msgstr "" @@ -554,7 +558,7 @@ msgstr "" #: source/ubl-settings-datetime.h:119 source/ubl-settings-datetime.h:118 #: source/ubl-settings-datetime.cc:133 source/ubl-settings-datetime.cc:130 -#: source/ubl-settings-datetime.cc:125 +#: source/ubl-settings-datetime.cc:125 source/ubl-settings-datetime.h:128 msgid "Date and Time" msgstr "" @@ -562,12 +566,13 @@ msgstr "" #: source/ubl-settings-datetime.cc:1459 source/ubl-settings-datetime.cc:1477 #: source/ubl-settings-datetime.cc:1508 source/ubl-settings-datetime.cc:1395 #: source/ubl-settings-datetime.cc:1414 source/ubl-settings-datetime.cc:1445 +#: source/ubl-settings-datetime.h:109 msgid "Date and time are successfully synchronized" msgstr "" #: source/ubl-settings-datetime.h:131 source/ubl-settings-datetime.h:130 #: source/ubl-settings-datetime.cc:140 source/ubl-settings-datetime.cc:136 -#: source/ubl-settings-datetime.cc:131 +#: source/ubl-settings-datetime.cc:131 source/ubl-settings-datetime.h:140 msgid "" "Date of\n" "Format: DD.MM.YYYY" @@ -575,7 +580,7 @@ msgstr "" #: source/ubl-settings-datetime.h:127 source/ubl-settings-datetime.h:126 #: source/ubl-settings-datetime.cc:150 source/ubl-settings-datetime.cc:146 -#: source/ubl-settings-datetime.cc:141 +#: source/ubl-settings-datetime.cc:141 source/ubl-settings-datetime.h:136 msgid "Date:" msgstr "" @@ -593,7 +598,7 @@ msgstr "" #: source/ubl-settings-datetime.h:114 source/ubl-settings-datetime.h:113 #: source/ubl-settings-datetime.cc:143 source/ubl-settings-datetime.cc:139 -#: source/ubl-settings-datetime.cc:134 +#: source/ubl-settings-datetime.cc:134 source/ubl-settings-datetime.h:123 msgid "Default" msgstr "" @@ -611,7 +616,7 @@ msgstr "" #: source/ubl-settings-datetime.h:117 source/ubl-settings-datetime.h:116 #: source/ubl-settings-datetime.cc:146 source/ubl-settings-datetime.cc:142 -#: source/ubl-settings-datetime.cc:137 +#: source/ubl-settings-datetime.cc:137 source/ubl-settings-datetime.h:126 msgid "Disabled" msgstr "" @@ -681,6 +686,7 @@ msgstr "" #: source/ubl-settings-datetime.h:101 source/ubl-settings-datetime.h:100 #: source/ubl-settings-datetime.cc:867 source/ubl-settings-datetime.cc:1139 #: source/ubl-settings-datetime.cc:803 source/ubl-settings-datetime.cc:1075 +#: source/ubl-settings-datetime.h:110 msgid "Enter a list of NTP servers" msgstr "" @@ -690,7 +696,7 @@ msgstr "" #: source/ubl-settings-datetime.h:133 source/ubl-settings-datetime.h:132 #: source/ubl-settings-datetime.cc:141 source/ubl-settings-datetime.cc:137 -#: source/ubl-settings-datetime.cc:132 +#: source/ubl-settings-datetime.cc:132 source/ubl-settings-datetime.h:142 msgid "" "Enter the name of the ntp-server or its ip-address.\n" "When entering multiple addresses, separate them with commas." @@ -698,6 +704,7 @@ msgstr "" #: source/ubl-settings-datetime.h:102 source/ubl-settings-datetime.h:101 #: source/ubl-settings-datetime.cc:903 source/ubl-settings-datetime.cc:839 +#: source/ubl-settings-datetime.h:111 msgid "Error in the NTP server name" msgstr "" @@ -707,7 +714,7 @@ msgstr "" #: source/ubl-settings-datetime.h:92 source/ubl-settings-datetime.h:91 #: source/ubl-settings-datetime.cc:745 source/ubl-settings-datetime.cc:681 -#: source/ubl-settings-datetime.cc:678 +#: source/ubl-settings-datetime.cc:678 source/ubl-settings-datetime.h:101 msgid "Error saved local and global configuration" msgstr "" @@ -754,6 +761,7 @@ msgid "GMT-3" msgstr "" #: source/ubl-settings-datetime.h:86 source/ubl-settings-datetime.h:85 +#: source/ubl-settings-datetime.h:95 msgid "" "Setting up the date and time for UBLinux\n" "\n" @@ -795,25 +803,25 @@ msgstr "" #: source/ubl-settings-datetime.h:94 source/ubl-settings-datetime.h:93 #: source/ubl-settings-datetime.cc:757 source/ubl-settings-datetime.cc:693 -#: source/ubl-settings-datetime.cc:690 +#: source/ubl-settings-datetime.cc:690 source/ubl-settings-datetime.h:103 msgid "Global configuration downloaded successfully" msgstr "" #: source/ubl-settings-datetime.h:89 source/ubl-settings-datetime.h:88 #: source/ubl-settings-datetime.cc:733 source/ubl-settings-datetime.cc:669 -#: source/ubl-settings-datetime.cc:666 +#: source/ubl-settings-datetime.cc:666 source/ubl-settings-datetime.h:98 msgid "Global configuration read error" msgstr "" #: source/ubl-settings-datetime.h:96 source/ubl-settings-datetime.h:95 #: source/ubl-settings-datetime.cc:763 source/ubl-settings-datetime.cc:699 -#: source/ubl-settings-datetime.cc:696 +#: source/ubl-settings-datetime.cc:696 source/ubl-settings-datetime.h:105 msgid "Global configuration successfully written" msgstr "" #: source/ubl-settings-datetime.h:91 source/ubl-settings-datetime.h:90 #: source/ubl-settings-datetime.cc:741 source/ubl-settings-datetime.cc:677 -#: source/ubl-settings-datetime.cc:674 +#: source/ubl-settings-datetime.cc:674 source/ubl-settings-datetime.h:100 msgid "Global configuration write error" msgstr "" @@ -867,11 +875,13 @@ msgstr "" #: source/ubl-settings-datetime.h:105 source/ubl-settings-datetime.h:104 #: source/ubl-settings-datetime.cc:856 source/ubl-settings-datetime.cc:792 +#: source/ubl-settings-datetime.h:114 msgid "Hardware clock successfully synchronized" msgstr "" #: source/ubl-settings-datetime.h:106 source/ubl-settings-datetime.h:105 #: source/ubl-settings-datetime.cc:852 source/ubl-settings-datetime.cc:788 +#: source/ubl-settings-datetime.h:115 msgid "Hardware clock synchronization error" msgstr "" @@ -885,6 +895,7 @@ msgid "Hebron" msgstr "" #: source/ubl-settings-datetime.h:72 source/ubl-settings-datetime.h:71 +#: source/ubl-settings-datetime.h:81 msgid "Help" msgstr "" @@ -913,6 +924,7 @@ msgstr "" #: source/ubl-settings-datetime.cc:1503 source/ubl-settings-datetime.cc:1514 #: source/ubl-settings-datetime.cc:1440 source/ubl-settings-datetime.cc:1451 #: source/ubl-settings-datetime.cc:1402 source/ubl-settings-datetime.cc:1407 +#: source/ubl-settings-datetime.h:108 msgid "Incorrect date format" msgstr "" @@ -1089,45 +1101,47 @@ msgstr "" #: source/ubl-settings-datetime.h:74 source/ubl-settings-datetime.h:73 #: source/ubl-settings-datetime.cc:139 source/ubl-settings-datetime.cc:135 -#: source/ubl-settings-datetime.cc:130 +#: source/ubl-settings-datetime.cc:130 source/ubl-settings-datetime.h:83 msgid "Load" msgstr "" #: source/ubl-settings-datetime.h:78 source/ubl-settings-datetime.h:77 +#: source/ubl-settings-datetime.h:87 msgid "Load global configuration" msgstr "" #: source/ubl-settings-datetime.h:79 source/ubl-settings-datetime.h:78 +#: source/ubl-settings-datetime.h:88 msgid "Load local configuration" msgstr "" #: source/ubl-settings-datetime.h:93 source/ubl-settings-datetime.h:92 #: source/ubl-settings-datetime.cc:754 source/ubl-settings-datetime.cc:690 -#: source/ubl-settings-datetime.cc:687 +#: source/ubl-settings-datetime.cc:687 source/ubl-settings-datetime.h:102 msgid "Local configuration downloaded successfully" msgstr "" #: source/ubl-settings-datetime.h:88 source/ubl-settings-datetime.h:87 #: source/ubl-settings-datetime.cc:729 source/ubl-settings-datetime.cc:665 -#: source/ubl-settings-datetime.cc:662 +#: source/ubl-settings-datetime.cc:662 source/ubl-settings-datetime.h:97 msgid "Local configuration reading error" msgstr "" #: source/ubl-settings-datetime.h:95 source/ubl-settings-datetime.h:94 #: source/ubl-settings-datetime.cc:760 source/ubl-settings-datetime.cc:696 -#: source/ubl-settings-datetime.cc:693 +#: source/ubl-settings-datetime.cc:693 source/ubl-settings-datetime.h:104 msgid "Local configuration successfully written" msgstr "" #: source/ubl-settings-datetime.h:90 source/ubl-settings-datetime.h:89 #: source/ubl-settings-datetime.cc:737 source/ubl-settings-datetime.cc:673 -#: source/ubl-settings-datetime.cc:670 +#: source/ubl-settings-datetime.cc:670 source/ubl-settings-datetime.h:99 msgid "Local configuration write error" msgstr "" #: source/ubl-settings-datetime.h:121 source/ubl-settings-datetime.h:120 #: source/ubl-settings-datetime.cc:161 source/ubl-settings-datetime.cc:156 -#: source/ubl-settings-datetime.cc:151 +#: source/ubl-settings-datetime.cc:151 source/ubl-settings-datetime.h:130 msgid "Local time" msgstr "" @@ -1214,7 +1228,7 @@ msgstr "" #: source/ubl-settings-datetime.h:116 source/ubl-settings-datetime.h:115 #: source/ubl-settings-datetime.cc:145 source/ubl-settings-datetime.cc:141 -#: source/ubl-settings-datetime.cc:136 +#: source/ubl-settings-datetime.cc:136 source/ubl-settings-datetime.h:125 msgid "Manual" msgstr "" @@ -1341,6 +1355,7 @@ msgstr "" #: source/ubl-settings-datetime.h:104 source/ubl-settings-datetime.h:103 #: source/ubl-settings-datetime.cc:891 source/ubl-settings-datetime.cc:827 +#: source/ubl-settings-datetime.h:113 msgid "NTP server name is correct" msgstr "" @@ -1397,7 +1412,7 @@ msgstr "" #: source/ubl-settings-datetime.cc:533 source/ubl-settings-datetime.cc:434 #: source/ubl-settings-datetime.cc:466 source/ubl-settings-datetime.cc:497 #: source/ubl-settings-datetime.cc:433 source/ubl-settings-datetime.cc:464 -#: source/ubl-settings-datetime.cc:494 +#: source/ubl-settings-datetime.cc:494 source/ubl-settings-datetime.h:92 msgid "Nothing to save!" msgstr "" @@ -1508,7 +1523,7 @@ msgstr "" #: source/ubl-settings-datetime.h:69 source/ubl-settings-datetime.h:68 #: source/ubl-settings-datetime.cc:136 source/ubl-settings-datetime.cc:133 -#: source/ubl-settings-datetime.cc:128 +#: source/ubl-settings-datetime.cc:128 source/ubl-settings-datetime.h:78 msgid "Project Home Page" msgstr "" @@ -1546,7 +1561,7 @@ msgid "Rarotonga" msgstr "" #: source/ubl-settings-datetime.h:80 source/ubl-settings-datetime.h:79 -#: source/ubl-settings-datetime.cc:171 +#: source/ubl-settings-datetime.cc:171 source/ubl-settings-datetime.h:89 msgid "Read online" msgstr "" @@ -1558,7 +1573,7 @@ msgstr "" #: source/ubl-settings-datetime.h:125 source/ubl-settings-datetime.h:124 #: source/ubl-settings-datetime.cc:152 source/ubl-settings-datetime.cc:148 -#: source/ubl-settings-datetime.cc:143 +#: source/ubl-settings-datetime.cc:143 source/ubl-settings-datetime.h:134 msgid "Region:" msgstr "" @@ -1651,7 +1666,7 @@ msgstr "" #: source/ubl-settings-datetime.h:73 source/ubl-settings-datetime.h:72 #: source/ubl-settings-datetime.cc:138 source/ubl-settings-datetime.cc:134 -#: source/ubl-settings-datetime.cc:129 +#: source/ubl-settings-datetime.cc:129 source/ubl-settings-datetime.h:82 msgid "Save" msgstr "" @@ -1753,7 +1768,7 @@ msgstr "" #: source/ubl-settings-datetime.h:97 source/ubl-settings-datetime.h:96 #: source/ubl-settings-datetime.cc:766 source/ubl-settings-datetime.cc:702 -#: source/ubl-settings-datetime.cc:699 +#: source/ubl-settings-datetime.cc:699 source/ubl-settings-datetime.h:106 msgid "Successfully saved local and global configuration" msgstr "" @@ -1765,13 +1780,13 @@ msgstr "" #: source/ubl-settings-datetime.h:123 source/ubl-settings-datetime.h:122 #: source/ubl-settings-datetime.cc:154 source/ubl-settings-datetime.cc:150 -#: source/ubl-settings-datetime.cc:145 +#: source/ubl-settings-datetime.cc:145 source/ubl-settings-datetime.h:132 msgid "Sync by" msgstr "" #: source/ubl-settings-datetime.h:128 source/ubl-settings-datetime.h:127 #: source/ubl-settings-datetime.cc:158 source/ubl-settings-datetime.cc:153 -#: source/ubl-settings-datetime.cc:148 +#: source/ubl-settings-datetime.cc:148 source/ubl-settings-datetime.h:137 msgid "Synchronize hardware time" msgstr "" @@ -1782,7 +1797,7 @@ msgstr "" #: source/ubl-settings-datetime.h:132 source/ubl-settings-datetime.h:131 #: source/ubl-settings-datetime.cc:142 source/ubl-settings-datetime.cc:138 -#: source/ubl-settings-datetime.cc:133 +#: source/ubl-settings-datetime.cc:133 source/ubl-settings-datetime.h:141 msgid "Synchronize via NTP" msgstr "" @@ -1824,7 +1839,7 @@ msgstr "" #: source/ubl-settings-datetime.h:109 source/ubl-settings-datetime.h:108 #: source/ubl-settings-datetime.cc:122 source/ubl-settings-datetime.cc:120 -#: source/ubl-settings-datetime.cc:115 +#: source/ubl-settings-datetime.cc:115 source/ubl-settings-datetime.h:118 msgid "The program must be run as root" msgstr "" @@ -1853,13 +1868,13 @@ msgstr "" #: source/ubl-settings-datetime.h:126 source/ubl-settings-datetime.h:125 #: source/ubl-settings-datetime.cc:151 source/ubl-settings-datetime.cc:147 -#: source/ubl-settings-datetime.cc:142 +#: source/ubl-settings-datetime.cc:142 source/ubl-settings-datetime.h:135 msgid "Time zone" msgstr "" #: source/ubl-settings-datetime.h:118 source/ubl-settings-datetime.h:117 #: source/ubl-settings-datetime.cc:149 source/ubl-settings-datetime.cc:145 -#: source/ubl-settings-datetime.cc:140 +#: source/ubl-settings-datetime.cc:140 source/ubl-settings-datetime.h:127 msgid "Time:" msgstr "" @@ -1904,7 +1919,7 @@ msgstr "" #: source/ubl-settings-datetime.h:120 source/ubl-settings-datetime.h:119 #: source/ubl-settings-datetime.cc:160 source/ubl-settings-datetime.cc:155 -#: source/ubl-settings-datetime.cc:150 +#: source/ubl-settings-datetime.cc:150 source/ubl-settings-datetime.h:129 msgid "UTC time" msgstr "" @@ -1999,7 +2014,7 @@ msgid "Winnipeg" msgstr "" #: source/ubl-settings-datetime.h:84 source/ubl-settings-datetime.h:83 -#: source/ubl-settings-datetime.cc:168 +#: source/ubl-settings-datetime.cc:168 source/ubl-settings-datetime.h:93 msgid "Would you like to read documentation in the Web?" msgstr "" @@ -2028,12 +2043,13 @@ msgid "Yerevan" msgstr "" #: source/ubl-settings-datetime.h:85 source/ubl-settings-datetime.h:84 -#: source/ubl-settings-datetime.cc:169 +#: source/ubl-settings-datetime.cc:169 source/ubl-settings-datetime.h:94 msgid "" "You will be redirected to documentation website where documentation is\n" "translated and supported by community." msgstr "" +#: source/ubl-settings-datetime.h:138 msgid "Setting the system date and time" msgstr "" @@ -2048,7 +2064,7 @@ msgstr "" #: source/ubl-settings-datetime.h:124 source/ubl-settings-datetime.h:123 #: source/ubl-settings-datetime.cc:153 source/ubl-settings-datetime.cc:149 -#: source/ubl-settings-datetime.cc:144 +#: source/ubl-settings-datetime.cc:144 source/ubl-settings-datetime.h:133 msgid "Zone:" msgstr "" @@ -2060,7 +2076,7 @@ msgstr "" #: source/ubl-settings-datetime.h:68 source/ubl-settings-datetime.h:67 #: source/ubl-settings-datetime.cc:134 source/ubl-settings-datetime.cc:131 -#: source/ubl-settings-datetime.cc:126 +#: source/ubl-settings-datetime.cc:126 source/ubl-settings-datetime.h:77 msgid "https://wiki.ublinux.com" msgstr "" @@ -2076,12 +2092,24 @@ 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 +#: source/ubl-settings-datetime.cc:146 source/ubl-settings-datetime.h:76 msgid "ubl-settings-datetime" 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 -#: source/ubl-settings-datetime.cc:1606 +#: source/ubl-settings-datetime.cc:1606 source/ubl-settings-datetime.h:96 msgid "ubl-settings-datetime version: " msgstr "" + +#: source/ubl-settings-datetime.h:84 +msgid "Save in global and local configuration" +msgstr "" + +#: source/ubl-settings-datetime.h:85 +msgid "Save in local configuration" +msgstr "" + +#: source/ubl-settings-datetime.h:86 +msgid "Save in global configuration" +msgstr "" diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index 382da88..552096f 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -8,7 +8,7 @@ msgid "f1\n" msgstr "" "Project-Id-Version: ubl-settings-datetime 1.0\n" "Report-Msgid-Bugs-To: info@ublinux.com\n" -"POT-Creation-Date: 2023-04-25 15:44+0600\n" +"POT-Creation-Date: 2023-01-01 00:00+0600\n" "PO-Revision-Date: 2023-01-01 00:00+0600\n" "Last-Translator: UBLinux Team \n" "Language-Team: Russian - UBLinux Team \n" @@ -23,6 +23,7 @@ msgstr ":" #: source/ubl-settings-datetime.h:110 source/ubl-settings-datetime.h:109 #: source/ubl-settings-datetime.cc:81 source/ubl-settings-datetime.cc:82 #: source/ubl-settings-datetime.cc:83 source/ubl-settings-datetime.cc:84 +#: source/ubl-settings-datetime.h:119 msgid ": \"Date\"" msgstr ": \"Дата\"" @@ -36,47 +37,30 @@ msgstr ": \"Дата\"" #: source/ubl-settings-datetime.cc:73 source/ubl-settings-datetime.cc:74 #: source/ubl-settings-datetime.cc:80 source/ubl-settings-datetime.cc:81 #: source/ubl-settings-datetime.cc:85 source/ubl-settings-datetime.cc:62 -#: source/ubl-settings-datetime.cc:84 +#: source/ubl-settings-datetime.cc:84 source/ubl-settings-datetime.h:121 msgid ": \"Hardware time\"" msgstr ": \"Аппаратное время\"" -#: source/ubl-settings-datetime.h:113 source/ubl-settings-datetime.h:112 -#: source/ubl-settings-datetime.cc:60 source/ubl-settings-datetime.cc:62 -#: source/ubl-settings-datetime.cc:67 source/ubl-settings-datetime.cc:68 -#: source/ubl-settings-datetime.cc:69 source/ubl-settings-datetime.cc:70 -#: source/ubl-settings-datetime.cc:74 source/ubl-settings-datetime.cc:75 -#: source/ubl-settings-datetime.cc:76 source/ubl-settings-datetime.cc:77 -#: source/ubl-settings-datetime.cc:80 source/ubl-settings-datetime.cc:61 -#: source/ubl-settings-datetime.cc:64 source/ubl-settings-datetime.cc:71 -#: source/ubl-settings-datetime.cc:72 source/ubl-settings-datetime.cc:78 -#: source/ubl-settings-datetime.cc:79 source/ubl-settings-datetime.cc:82 -#: source/ubl-settings-datetime.cc:63 source/ubl-settings-datetime.cc:81 -msgid ": \"NTP\"" -msgstr "" - #: source/ubl-settings-datetime.h:111 source/ubl-settings-datetime.h:110 #: source/ubl-settings-datetime.cc:58 source/ubl-settings-datetime.cc:63 #: source/ubl-settings-datetime.cc:66 source/ubl-settings-datetime.cc:73 #: source/ubl-settings-datetime.cc:59 source/ubl-settings-datetime.cc:65 #: source/ubl-settings-datetime.cc:68 source/ubl-settings-datetime.cc:75 #: source/ubl-settings-datetime.cc:64 source/ubl-settings-datetime.cc:67 -#: source/ubl-settings-datetime.cc:74 +#: source/ubl-settings-datetime.cc:74 source/ubl-settings-datetime.h:120 msgid ": \"Time Zone\"" msgstr ": \"Временная зона\"" -#: source/ubl-settings-datetime.cc:58 source/ubl-settings-datetime.cc:57 -msgid ": \"xdg-open\"" -msgstr "" - msgid "Abidjan" msgstr "Абиджан" #: source/ubl-settings-datetime.h:70 source/ubl-settings-datetime.h:69 +#: source/ubl-settings-datetime.h:79 msgid "About" msgstr "О программе" #: source/ubl-settings-datetime.h:71 source/ubl-settings-datetime.h:70 -#: source/ubl-settings-datetime.cc:137 +#: source/ubl-settings-datetime.cc:137 source/ubl-settings-datetime.h:80 msgid "About ubl-settings-datetime" msgstr "О программе Дата и время" @@ -121,7 +105,7 @@ msgid "Almaty" msgstr "Алматы" #: source/ubl-settings-datetime.h:82 source/ubl-settings-datetime.h:81 -#: source/ubl-settings-datetime.cc:173 +#: source/ubl-settings-datetime.cc:173 source/ubl-settings-datetime.h:91 msgid "Always redirect" msgstr "Всегда перенаправлять" @@ -136,7 +120,7 @@ msgstr "Амстердам" #: source/ubl-settings-datetime.h:103 source/ubl-settings-datetime.h:102 #: source/ubl-settings-datetime.cc:898 source/ubl-settings-datetime.cc:834 -#: source/ubl-settings-datetime.cc:817 +#: source/ubl-settings-datetime.cc:817 source/ubl-settings-datetime.h:112 msgid "An invalid character is entered" msgstr "Введён недопустимый символ" @@ -177,6 +161,7 @@ msgid "Arctic" msgstr "Арктика" #: source/ubl-settings-datetime.h:108 source/ubl-settings-datetime.h:107 +#: source/ubl-settings-datetime.h:117 msgid "Argument not recognized\n" msgstr "Нepacпoзнaнный аргумент\n" @@ -221,7 +206,7 @@ msgstr "Атлантика" #: source/ubl-settings-datetime.h:122 source/ubl-settings-datetime.h:121 #: source/ubl-settings-datetime.cc:157 source/ubl-settings-datetime.cc:152 -#: source/ubl-settings-datetime.cc:147 +#: source/ubl-settings-datetime.cc:147 source/ubl-settings-datetime.h:131 msgid "Attention" msgstr "Внимание" @@ -385,7 +370,7 @@ msgid "Canberra" msgstr "Канберра" #: source/ubl-settings-datetime.h:81 source/ubl-settings-datetime.h:80 -#: source/ubl-settings-datetime.cc:172 +#: source/ubl-settings-datetime.cc:172 source/ubl-settings-datetime.h:90 msgid "Cancel" msgstr "Отменить" @@ -499,7 +484,7 @@ msgstr "Копенгаген" #: source/ubl-settings-datetime.h:66 source/ubl-settings-datetime.h:65 #: source/ubl-settings-datetime.cc:130 source/ubl-settings-datetime.cc:128 -#: source/ubl-settings-datetime.cc:123 +#: source/ubl-settings-datetime.cc:123 source/ubl-settings-datetime.h:75 msgid "Copyright © UBSoft LLC, 2022 - " msgstr "Авторские права © ООО \"Юбисофт\", 2022 - " @@ -523,19 +508,13 @@ msgstr "Кюрасао" #: source/ubl-settings-datetime.h:130 source/ubl-settings-datetime.h:129 #: source/ubl-settings-datetime.cc:147 source/ubl-settings-datetime.cc:143 -#: source/ubl-settings-datetime.cc:138 +#: source/ubl-settings-datetime.cc:138 source/ubl-settings-datetime.h:139 msgid "Current date and time" msgstr "Текущие дата и время" msgid "Currie" msgstr "Карри" -#: source/ubl-settings-datetime.h:115 source/ubl-settings-datetime.h:114 -#: source/ubl-settings-datetime.cc:144 source/ubl-settings-datetime.cc:140 -#: source/ubl-settings-datetime.cc:135 -msgid "DHCP" -msgstr "" - msgid "Dacca" msgstr "Дакка" @@ -556,7 +535,7 @@ msgstr "Дарвин" #: source/ubl-settings-datetime.h:119 source/ubl-settings-datetime.h:118 #: source/ubl-settings-datetime.cc:133 source/ubl-settings-datetime.cc:130 -#: source/ubl-settings-datetime.cc:125 +#: source/ubl-settings-datetime.cc:125 source/ubl-settings-datetime.h:128 msgid "Date and Time" msgstr "Дата и Время" @@ -564,12 +543,13 @@ msgstr "Дата и Время" #: source/ubl-settings-datetime.cc:1459 source/ubl-settings-datetime.cc:1477 #: source/ubl-settings-datetime.cc:1508 source/ubl-settings-datetime.cc:1395 #: source/ubl-settings-datetime.cc:1414 source/ubl-settings-datetime.cc:1445 +#: source/ubl-settings-datetime.h:109 msgid "Date and time are successfully synchronized" msgstr "Дата и время успешно синхронизированы" #: source/ubl-settings-datetime.h:131 source/ubl-settings-datetime.h:130 #: source/ubl-settings-datetime.cc:140 source/ubl-settings-datetime.cc:136 -#: source/ubl-settings-datetime.cc:131 +#: source/ubl-settings-datetime.cc:131 source/ubl-settings-datetime.h:140 msgid "" "Date of\n" "Format: DD.MM.YYYY" @@ -579,7 +559,7 @@ msgstr "" #: source/ubl-settings-datetime.h:127 source/ubl-settings-datetime.h:126 #: source/ubl-settings-datetime.cc:150 source/ubl-settings-datetime.cc:146 -#: source/ubl-settings-datetime.cc:141 +#: source/ubl-settings-datetime.cc:141 source/ubl-settings-datetime.h:136 msgid "Date:" msgstr "Дата:" @@ -597,7 +577,7 @@ msgstr "Фернанду-ди-Норонья" #: source/ubl-settings-datetime.h:114 source/ubl-settings-datetime.h:113 #: source/ubl-settings-datetime.cc:143 source/ubl-settings-datetime.cc:139 -#: source/ubl-settings-datetime.cc:134 +#: source/ubl-settings-datetime.cc:134 source/ubl-settings-datetime.h:123 msgid "Default" msgstr "По умолчанию" @@ -615,7 +595,7 @@ msgstr "Дили" #: source/ubl-settings-datetime.h:117 source/ubl-settings-datetime.h:116 #: source/ubl-settings-datetime.cc:146 source/ubl-settings-datetime.cc:142 -#: source/ubl-settings-datetime.cc:137 +#: source/ubl-settings-datetime.cc:137 source/ubl-settings-datetime.h:126 msgid "Disabled" msgstr "Отключено" @@ -685,6 +665,7 @@ msgstr "Энсенада" #: source/ubl-settings-datetime.h:101 source/ubl-settings-datetime.h:100 #: source/ubl-settings-datetime.cc:867 source/ubl-settings-datetime.cc:1139 #: source/ubl-settings-datetime.cc:803 source/ubl-settings-datetime.cc:1075 +#: source/ubl-settings-datetime.h:110 msgid "Enter a list of NTP servers" msgstr "Введите перечень NTP серверов" @@ -695,7 +676,7 @@ msgstr "Введите перечень NTP серверов" #: source/ubl-settings-datetime.h:133 source/ubl-settings-datetime.h:132 #: source/ubl-settings-datetime.cc:141 source/ubl-settings-datetime.cc:137 -#: source/ubl-settings-datetime.cc:132 +#: source/ubl-settings-datetime.cc:132 source/ubl-settings-datetime.h:142 msgid "" "Enter the name of the ntp-server or its ip-address.\n" "When entering multiple addresses, separate them with commas." @@ -705,6 +686,7 @@ msgstr "" #: source/ubl-settings-datetime.h:102 source/ubl-settings-datetime.h:101 #: source/ubl-settings-datetime.cc:903 source/ubl-settings-datetime.cc:839 +#: source/ubl-settings-datetime.h:111 msgid "Error in the NTP server name" msgstr "Ошибка в имени NTP сервера" @@ -715,7 +697,7 @@ msgstr "Ошибка в имени NTP сервера" #: source/ubl-settings-datetime.h:92 source/ubl-settings-datetime.h:91 #: source/ubl-settings-datetime.cc:745 source/ubl-settings-datetime.cc:681 -#: source/ubl-settings-datetime.cc:678 +#: source/ubl-settings-datetime.cc:678 source/ubl-settings-datetime.h:101 msgid "Error saved local and global configuration" msgstr "Ошибка сохранения локальной и глобальной конфигурации" @@ -762,6 +744,7 @@ msgid "GMT-3" msgstr "ГМТ-3" #: source/ubl-settings-datetime.h:86 source/ubl-settings-datetime.h:85 +#: source/ubl-settings-datetime.h:95 msgid "" "Setting up the date and time for UBLinux\n" "\n" @@ -820,25 +803,25 @@ msgstr "Глейс-Бей" #: source/ubl-settings-datetime.h:94 source/ubl-settings-datetime.h:93 #: source/ubl-settings-datetime.cc:757 source/ubl-settings-datetime.cc:693 -#: source/ubl-settings-datetime.cc:690 +#: source/ubl-settings-datetime.cc:690 source/ubl-settings-datetime.h:103 msgid "Global configuration downloaded successfully" msgstr "Успешно загружена глобальная конфигурация" #: source/ubl-settings-datetime.h:89 source/ubl-settings-datetime.h:88 #: source/ubl-settings-datetime.cc:733 source/ubl-settings-datetime.cc:669 -#: source/ubl-settings-datetime.cc:666 +#: source/ubl-settings-datetime.cc:666 source/ubl-settings-datetime.h:98 msgid "Global configuration read error" msgstr "Ошибка чтения глобальной конфигурации" #: source/ubl-settings-datetime.h:96 source/ubl-settings-datetime.h:95 #: source/ubl-settings-datetime.cc:763 source/ubl-settings-datetime.cc:699 -#: source/ubl-settings-datetime.cc:696 +#: source/ubl-settings-datetime.cc:696 source/ubl-settings-datetime.h:105 msgid "Global configuration successfully written" msgstr "Успешно записана глобальная конфигурация" #: source/ubl-settings-datetime.h:91 source/ubl-settings-datetime.h:90 #: source/ubl-settings-datetime.cc:741 source/ubl-settings-datetime.cc:677 -#: source/ubl-settings-datetime.cc:674 +#: source/ubl-settings-datetime.cc:674 source/ubl-settings-datetime.h:100 msgid "Global configuration write error" msgstr "Ошибка записи глобальной конфигурации" @@ -892,11 +875,13 @@ msgstr "Харбин" #: source/ubl-settings-datetime.h:105 source/ubl-settings-datetime.h:104 #: source/ubl-settings-datetime.cc:856 source/ubl-settings-datetime.cc:792 +#: source/ubl-settings-datetime.h:114 msgid "Hardware clock successfully synchronized" msgstr "Аппаратные часы успешно синхронизированы" #: source/ubl-settings-datetime.h:106 source/ubl-settings-datetime.h:105 #: source/ubl-settings-datetime.cc:852 source/ubl-settings-datetime.cc:788 +#: source/ubl-settings-datetime.h:115 msgid "Hardware clock synchronization error" msgstr "Ошибка синхронизации аппаратных часов" @@ -910,6 +895,7 @@ msgid "Hebron" msgstr "Хеврон" #: source/ubl-settings-datetime.h:72 source/ubl-settings-datetime.h:71 +#: source/ubl-settings-datetime.h:81 msgid "Help" msgstr "Справка" @@ -938,6 +924,7 @@ msgstr "Ховд" #: source/ubl-settings-datetime.cc:1503 source/ubl-settings-datetime.cc:1514 #: source/ubl-settings-datetime.cc:1440 source/ubl-settings-datetime.cc:1451 #: source/ubl-settings-datetime.cc:1402 source/ubl-settings-datetime.cc:1407 +#: source/ubl-settings-datetime.h:108 msgid "Incorrect date format" msgstr "Не верный формат даты" @@ -1114,45 +1101,47 @@ msgstr "Любляна" #: source/ubl-settings-datetime.h:74 source/ubl-settings-datetime.h:73 #: source/ubl-settings-datetime.cc:139 source/ubl-settings-datetime.cc:135 -#: source/ubl-settings-datetime.cc:130 +#: source/ubl-settings-datetime.cc:130 source/ubl-settings-datetime.h:83 msgid "Load" msgstr "Загрузить" #: source/ubl-settings-datetime.h:78 source/ubl-settings-datetime.h:77 +#: source/ubl-settings-datetime.h:87 msgid "Load global configuration" msgstr "Загрузить глобальную конфигурацию" #: source/ubl-settings-datetime.h:79 source/ubl-settings-datetime.h:78 +#: source/ubl-settings-datetime.h:88 msgid "Load local configuration" msgstr "Загрузить локальную конфигурацию" #: source/ubl-settings-datetime.h:93 source/ubl-settings-datetime.h:92 #: source/ubl-settings-datetime.cc:754 source/ubl-settings-datetime.cc:690 -#: source/ubl-settings-datetime.cc:687 +#: source/ubl-settings-datetime.cc:687 source/ubl-settings-datetime.h:102 msgid "Local configuration downloaded successfully" msgstr "Успешно загружена локальная конфигурация" #: source/ubl-settings-datetime.h:88 source/ubl-settings-datetime.h:87 #: source/ubl-settings-datetime.cc:729 source/ubl-settings-datetime.cc:665 -#: source/ubl-settings-datetime.cc:662 +#: source/ubl-settings-datetime.cc:662 source/ubl-settings-datetime.h:97 msgid "Local configuration reading error" msgstr "Ошибка чтения локальной конфигурации" #: source/ubl-settings-datetime.h:95 source/ubl-settings-datetime.h:94 #: source/ubl-settings-datetime.cc:760 source/ubl-settings-datetime.cc:696 -#: source/ubl-settings-datetime.cc:693 +#: source/ubl-settings-datetime.cc:693 source/ubl-settings-datetime.h:104 msgid "Local configuration successfully written" msgstr "Успешно записана локальная конфигурация" #: source/ubl-settings-datetime.h:90 source/ubl-settings-datetime.h:89 #: source/ubl-settings-datetime.cc:737 source/ubl-settings-datetime.cc:673 -#: source/ubl-settings-datetime.cc:670 +#: source/ubl-settings-datetime.cc:670 source/ubl-settings-datetime.h:99 msgid "Local configuration write error" msgstr "Ошибка записи локальной конфигурации" #: source/ubl-settings-datetime.h:121 source/ubl-settings-datetime.h:120 #: source/ubl-settings-datetime.cc:161 source/ubl-settings-datetime.cc:156 -#: source/ubl-settings-datetime.cc:151 +#: source/ubl-settings-datetime.cc:151 source/ubl-settings-datetime.h:130 msgid "Local time" msgstr "Локальное время" @@ -1239,7 +1228,7 @@ msgstr "Манила" #: source/ubl-settings-datetime.h:116 source/ubl-settings-datetime.h:115 #: source/ubl-settings-datetime.cc:145 source/ubl-settings-datetime.cc:141 -#: source/ubl-settings-datetime.cc:136 +#: source/ubl-settings-datetime.cc:136 source/ubl-settings-datetime.h:125 msgid "Manual" msgstr "Вручную" @@ -1367,6 +1356,7 @@ msgstr "Имя NTP сервера корректно" #: source/ubl-settings-datetime.h:104 source/ubl-settings-datetime.h:103 #: source/ubl-settings-datetime.cc:891 source/ubl-settings-datetime.cc:827 +#: source/ubl-settings-datetime.h:113 msgid "NTP server name is correct" msgstr "Имя NTP сервера корректно" @@ -1423,7 +1413,7 @@ msgstr "Северная Докота" #: source/ubl-settings-datetime.cc:533 source/ubl-settings-datetime.cc:434 #: source/ubl-settings-datetime.cc:466 source/ubl-settings-datetime.cc:497 #: source/ubl-settings-datetime.cc:433 source/ubl-settings-datetime.cc:464 -#: source/ubl-settings-datetime.cc:494 +#: source/ubl-settings-datetime.cc:494 source/ubl-settings-datetime.h:92 msgid "Nothing to save!" msgstr "Нечего сохранять!" @@ -1534,7 +1524,7 @@ msgstr "Прага" #: source/ubl-settings-datetime.h:69 source/ubl-settings-datetime.h:68 #: source/ubl-settings-datetime.cc:136 source/ubl-settings-datetime.cc:133 -#: source/ubl-settings-datetime.cc:128 +#: source/ubl-settings-datetime.cc:128 source/ubl-settings-datetime.h:78 msgid "Project Home Page" msgstr "Домашняя страница проекта" @@ -1572,7 +1562,7 @@ msgid "Rarotonga" msgstr "Раротонга" #: source/ubl-settings-datetime.h:80 source/ubl-settings-datetime.h:79 -#: source/ubl-settings-datetime.cc:171 +#: source/ubl-settings-datetime.cc:171 source/ubl-settings-datetime.h:89 msgid "Read online" msgstr "Прочитать онлайн" @@ -1584,7 +1574,7 @@ msgstr "Реджайна" #: source/ubl-settings-datetime.h:125 source/ubl-settings-datetime.h:124 #: source/ubl-settings-datetime.cc:152 source/ubl-settings-datetime.cc:148 -#: source/ubl-settings-datetime.cc:143 +#: source/ubl-settings-datetime.cc:143 source/ubl-settings-datetime.h:134 msgid "Region:" msgstr "Регион:" @@ -1677,7 +1667,7 @@ msgstr "Саскачеван" #: source/ubl-settings-datetime.h:73 source/ubl-settings-datetime.h:72 #: source/ubl-settings-datetime.cc:138 source/ubl-settings-datetime.cc:134 -#: source/ubl-settings-datetime.cc:129 +#: source/ubl-settings-datetime.cc:129 source/ubl-settings-datetime.h:82 msgid "Save" msgstr "Сохранить" @@ -1711,9 +1701,6 @@ msgstr "Настройка даты и времени в глобальной к msgid "Setting the date and time" msgstr "Настройка даты и времени" -msgid "Setting the system date and time" -msgstr "Настройка даты и времени системы" - msgid "Settings the date and time" msgstr "Настройки даты и времени" @@ -1782,7 +1769,7 @@ msgstr "Остановить сервис синхронизации" #: source/ubl-settings-datetime.h:97 source/ubl-settings-datetime.h:96 #: source/ubl-settings-datetime.cc:766 source/ubl-settings-datetime.cc:702 -#: source/ubl-settings-datetime.cc:699 +#: source/ubl-settings-datetime.cc:699 source/ubl-settings-datetime.h:106 msgid "Successfully saved local and global configuration" msgstr "Успешно сохранена локальная и глобальная конфигурация" @@ -1794,13 +1781,13 @@ msgstr "Сидней" #: source/ubl-settings-datetime.h:123 source/ubl-settings-datetime.h:122 #: source/ubl-settings-datetime.cc:154 source/ubl-settings-datetime.cc:150 -#: source/ubl-settings-datetime.cc:145 +#: source/ubl-settings-datetime.cc:145 source/ubl-settings-datetime.h:132 msgid "Sync by" msgstr "Синхронизировать" #: source/ubl-settings-datetime.h:128 source/ubl-settings-datetime.h:127 #: source/ubl-settings-datetime.cc:158 source/ubl-settings-datetime.cc:153 -#: source/ubl-settings-datetime.cc:148 +#: source/ubl-settings-datetime.cc:148 source/ubl-settings-datetime.h:137 msgid "Synchronize hardware time" msgstr "Синхронизировать аппаратное время" @@ -1811,7 +1798,7 @@ msgstr "Синхронизировать аппаратное время:" #: source/ubl-settings-datetime.h:132 source/ubl-settings-datetime.h:131 #: source/ubl-settings-datetime.cc:142 source/ubl-settings-datetime.cc:138 -#: source/ubl-settings-datetime.cc:133 +#: source/ubl-settings-datetime.cc:133 source/ubl-settings-datetime.h:141 msgid "Synchronize via NTP" msgstr "Синхронизировать через NTP" @@ -1853,7 +1840,7 @@ msgstr "Телл-Сити" #: source/ubl-settings-datetime.h:109 source/ubl-settings-datetime.h:108 #: source/ubl-settings-datetime.cc:122 source/ubl-settings-datetime.cc:120 -#: source/ubl-settings-datetime.cc:115 +#: source/ubl-settings-datetime.cc:115 source/ubl-settings-datetime.h:118 msgid "The program must be run as root" msgstr "Программа должна быть запущена с правами суперпользователя!" @@ -1884,13 +1871,13 @@ msgstr "Тимбукту" #: source/ubl-settings-datetime.h:126 source/ubl-settings-datetime.h:125 #: source/ubl-settings-datetime.cc:151 source/ubl-settings-datetime.cc:147 -#: source/ubl-settings-datetime.cc:142 +#: source/ubl-settings-datetime.cc:142 source/ubl-settings-datetime.h:135 msgid "Time zone" msgstr "Часовой пояс" #: source/ubl-settings-datetime.h:118 source/ubl-settings-datetime.h:117 #: source/ubl-settings-datetime.cc:149 source/ubl-settings-datetime.cc:145 -#: source/ubl-settings-datetime.cc:140 +#: source/ubl-settings-datetime.cc:140 source/ubl-settings-datetime.h:127 msgid "Time:" msgstr "Время:" @@ -1935,7 +1922,7 @@ msgstr "США" #: source/ubl-settings-datetime.h:120 source/ubl-settings-datetime.h:119 #: source/ubl-settings-datetime.cc:160 source/ubl-settings-datetime.cc:155 -#: source/ubl-settings-datetime.cc:150 +#: source/ubl-settings-datetime.cc:150 source/ubl-settings-datetime.h:129 msgid "UTC time" msgstr "Время по UTC" @@ -2030,7 +2017,7 @@ msgid "Winnipeg" msgstr "Виннипег" #: source/ubl-settings-datetime.h:84 source/ubl-settings-datetime.h:83 -#: source/ubl-settings-datetime.cc:168 +#: source/ubl-settings-datetime.cc:168 source/ubl-settings-datetime.h:93 msgid "Would you like to read documentation in the Web?" msgstr "Вы хотите прочитать справку в Сети?" @@ -2059,7 +2046,7 @@ msgid "Yerevan" msgstr "Ереван" #: source/ubl-settings-datetime.h:85 source/ubl-settings-datetime.h:84 -#: source/ubl-settings-datetime.cc:169 +#: source/ubl-settings-datetime.cc:169 source/ubl-settings-datetime.h:94 msgid "" "You will be redirected to documentation website where documentation is\n" "translated and supported by community." @@ -2067,6 +2054,10 @@ msgstr "" "Вы будете перенаправлены на сайт с документацией где страницы помощи\n" "переводятся и поддерживаются сообществом." +#: source/ubl-settings-datetime.h:138 +msgid "Setting the system date and time" +msgstr "Настройка даты и времени системы" + msgid "Yukon" msgstr "Юкон" @@ -2078,7 +2069,7 @@ msgstr "Запорожье" #: source/ubl-settings-datetime.h:124 source/ubl-settings-datetime.h:123 #: source/ubl-settings-datetime.cc:153 source/ubl-settings-datetime.cc:149 -#: source/ubl-settings-datetime.cc:144 +#: source/ubl-settings-datetime.cc:144 source/ubl-settings-datetime.h:133 msgid "Zone:" msgstr "Зона:" @@ -2090,7 +2081,7 @@ msgstr "Цюрих" #: source/ubl-settings-datetime.h:68 source/ubl-settings-datetime.h:67 #: source/ubl-settings-datetime.cc:134 source/ubl-settings-datetime.cc:131 -#: source/ubl-settings-datetime.cc:126 +#: source/ubl-settings-datetime.cc:126 source/ubl-settings-datetime.h:77 msgid "https://wiki.ublinux.com" msgstr "https://wiki.ublinux.ru" @@ -2103,12 +2094,24 @@ 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 +#: source/ubl-settings-datetime.cc:146 source/ubl-settings-datetime.h:76 msgid "ubl-settings-datetime" 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 -#: source/ubl-settings-datetime.cc:1606 +#: source/ubl-settings-datetime.cc:1606 source/ubl-settings-datetime.h:96 msgid "ubl-settings-datetime version: " msgstr "ubl-settings-datetime версия: " + +#: source/ubl-settings-datetime.h:84 +msgid "Save in global and local configuration" +msgstr "Сохранить в локальную конфигурацию" + +#: source/ubl-settings-datetime.h:85 +msgid "Save in local configuration" +msgstr "Сохранить в локальную конфигурацию" + +#: source/ubl-settings-datetime.h:86 +msgid "Save in global configuration" +msgstr "Сохранить в глобальную конфигурацию"