Merge pull request 'Application remake with C - version 2.0' (#147) from YanTheKaller/ubl-settings-datetime:master into master

Reviewed-on: #147

.gitignore

@@ -1,14 +1,12 @@
-main.cpp
+.vscode/
-ubl-settings-datetime.glade~
-test.cpp
 ubl-settings-datetime
-a.out
+*~
+build/
 compile/
-source/**/ubl_settings_datetime
+*#
-source/**/main.o
-source/**/ubl_settings_datetime.o
-ubl-settings-datetime_ru.po~
-reg/
-.vscode/
 terminal-commands/
-*#
+source/ubl-cmake.h
+vgcore*
+.BUILD.md
+.updatebuild.sh
+.install.sh

Makefile

@@ -11,8 +11,8 @@ CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile
 DEPENDS = /bin/cmake
 PREFIX ?= /usr/local
 PKGNAME = $(MAKEFILE_DIR)
-FILE_VER = source/${PKGNAME}.cc
+FILE_VER = source/${PKGNAME}.h
-PKGIDENT = $(subst /,-,$(subst /usr,,${PREFIX}))
+PKGIDENT=$(subst /,-,${PREFIX})
 
 default_target: all
 
@@ -94,7 +94,6 @@ uninstall:
 	done
 	@$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}"
 	@$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop"
-	@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg"
 	@$(RM) "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy"
 	@if [ -z ${DESTDIR} ]; then \
 	    [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
@@ -117,18 +116,19 @@ install: check uninstall
 		install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \
 		rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
 	done
-	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
+	@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
-	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg"
+	@cp ./com.ublinux.${PKGNAME}.policy ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy
-	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg"
+	@sed -e 's+/usr/bin+${PREFIX}/bin+' -e 's+.run+${PKGIDENT}.run+g' ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy -i
-	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.alert.svg"
 	@install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}"
 	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop"
-	@install -Dm644  "com.ublinux.${PKGNAME}.policy" "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy"
+	@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg"
-	@sed -e '\|annotate key=|s|/usr/bin|${PREFIX}/bin|' -e '/action id=/s/\.run/${PKGIDENT}\.run/' -i ${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy
+	@install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg"
+	@install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "${CMAKE_BUILD_DIR}/com.ublinux.${PKGNAME}${PKGIDENT}.policy"
+	@ldconfig -n /usr/local/lib
 	@if [ -z ${DESTDIR} ]; then \
-	    [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \
+	    [ -d "${DESTDIR}/usr/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}/usr/share/icons/hicolor/" &>/dev/null || true; \
 	    update-desktop-database --quiet &>/dev/null || true; \
-	    [ -d "${DESTDIR}${PREFIX}/share/applications" ] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \
+	    [ -d "${DESTDIR}/usr/share/applications" ] && touch "${DESTDIR}/usr/share/applications" &>/dev/null || true; \
 	fi
 	@echo "Install: OK"
 
@@ -147,7 +147,7 @@ help:
 	echo "... init"; \
 	echo "... debug"; \
 	echo "... prepare"; \
-	echo "... build"; \
+	echo "... compile"; \
 	echo "... install"; \
 	echo "... uninstall"; \
-	echo "... clean"
+	echo "... clean"

gresource.xml

@@ -2,6 +2,7 @@
 <gresources>
   <gresource prefix="/com/ublinux/ui">
     <file>ubl-settings-datetime.glade</file>
+    <file>ubl-settings-datetime-error.glade</file>
   </gresource>
   <gresource prefix="/com/ublinux/css">
     <file>ubl-settings-datetime.css</file>

source/CMakeLists.txt

@@ -3,21 +3,15 @@ project(ubl-settings-datetime)
 
 find_package(PkgConfig REQUIRED)
 
-pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
+pkg_check_modules(GTK REQUIRED gtk+-3.0)
-include_directories(${GTK3_INCLUDE_DIRS})
+include_directories(${GTK_INCLUDE_DIRS})
-link_directories(${GTK3_LIBRARY_DIRS})
+link_directories(${GTK_LIBRARY_DIRS})
-add_definitions(${GTK3_CFLAGS_OTHER})
+add_definitions(${GTK_CFLAGS_OTHER})
-
+
-pkg_check_modules(GTKMM30 REQUIRED gtkmm-3.0)
+pkg_check_modules(VTE291 REQUIRED vte-2.91)
-include_directories(${GTKMM30_INCLUDE_DIRS})
+include_directories(${VTE291_INCLUDE_DIRS})
-link_directories(${GTKMM30_LIBRARY_DIRS})
+link_directories(${VTE291_LIBRARY_DIRS})
-add_definitions(${GTKMM30_CFLAGS_OTHER})
+add_definitions(${VTE291_CFLAGS_OTHER})
-
-#pkg_check_modules(VTE291 REQUIRED vte-2.91)
-#include_directories(${VTE291_INCLUDE_DIRS})
-#link_directories(${VTE291_LIBRARY_DIRS})
-#add_definitions(${VTE291_CFLAGS_OTHER})
-find_package(ICU REQUIRED COMPONENTS uc dt in io)
 
 find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0)
 
@@ -30,10 +24,6 @@ if(WEBKIT_LIBRARIES_FOUND)
         add_definitions(${WEBKIT_CFLAGS_OTHER})
 endif()
 
-configure_file(ubl-cmake.in ubl-cmake.h)
-
-file(COPY ${CMAKE_CURRENT_BINARY_DIR}/ubl-cmake.h DESTINATION ./)
-
 set(GRESOURCE_C   resources.c)
 set(GRESOURCE_XML gresource.xml)
 
@@ -42,6 +32,7 @@ add_custom_target(GLADE ubl-settings-datetime.glade)
 
 set(DEPENDFILES 
                 ../ubl-settings-datetime.glade
+                ../ubl-settings-datetime-error.glade
                 ../gresource.xml
                 ../ubl-settings-datetime-banner.png
                 ../ubl-settings-datetime.css
@@ -67,31 +58,34 @@ add_custom_target(
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C}
 )
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
+add_definitions(-DVTE_INCLUDE)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
 	-O2 -pipe -fno-plt -fexceptions \
-         -Wformat -Werror=format-security \
+        -Wformat -Werror=format-security \
         -fstack-clash-protection -fcf-protection")
         
 string(FIND "${CMAKE_CXX_FLAGS}" "-D_FORTIFY_SOURCE" FORTIFY_FOUND)
 
 if(FORTIFY_FOUND EQUAL -1)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wp,-D_FORTIFY_SOURCE=2")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wp,-D_FORTIFY_SOURCE=2")
 endif()
-         
+        
 set(SOURCE_FILES
-        ubl-util-standard.h
+        ubl-settings-datetime.c
-        ubl-util-standard.c
-        main.cc 
-        ubl-settings-datetime.cc 
         ubl-settings-datetime.h
-        ${CMAKE_CURRENT_BINARY_DIR}/ubl-cmake.h) 
+        ubl-strings.h
+        )
 
 set(LIBRARIES
-        ${GTK3_LIBRARIES}
+        ${GTK_LIBRARIES}
-        ${GTKMM30_LIBRARIES}
         ${WEBKIT_LIBRARIES}
-        ${ICU_LIBRARIES}
+        ${UTILS_LIBRARIES}
-        pthread)
+       ${VTE291_LIBRARIES}
+        pthread
+        ublsettings
+        ublsettings-gtk3
+        ublsettingsui-gtk3)
 
 
 add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C})
@@ -102,5 +96,4 @@ set_source_files_properties(
     PROPERTIES GENERATED TRUE
 )
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)
-add_dependencies(${PROJECT_NAME} dummy-resource)
+add_dependencies(${PROJECT_NAME} dummy-resource)
-

source/main.cc

@@ -1,115 +0,0 @@
-#include "ubl-settings-datetime.h"
-
-void pars_flag(int index_start, int argc, char* argv[]);
-
-int main(int argc, char* argv[]) {
-    string str_argv= "";
-    string str_cmd_argv = "";
-    for (int i=1; i<argc; i++){
-        str_cmd_argv+= to_string(*argv[i]) + " ";
-    }  
-    if (geteuid() != 0){
-        string cmd = "";
-        // cmd = cmd + "pkexec " + app_name + " " + str_cmd_argv;
-        // return system(cmd.c_str());
-    }
-    setlocale(LC_ALL, "");
-    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();
-        Glib::OptionContext context;
-    
-        CmdArgParser parser{
-            "Socket ID",
-            "Command line argument for socket ID communication.",
-            "No help available, sorry"
-        };
-
-        context.set_main_group(parser);
-        context.parse(argc, argv); 
-
-        ::Window socketID = parser.GetSocketID();
-
-        // Handle plug:
-        SettingsPlug plug{socketID, builder};
-        plug.show();
-    
-        app->run(plug);
-        return 0;
-    }
-    else if (str_argv.find("-") != std::string::npos || argc == 1){
-        int len_argv = 1;
-        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);
-        delete wnd;
-        return r;
-    }
-    else{
-        cout << no_recognized;
-        return 0;
-    }
-}
-
-void pars_flag(int index_start, int argc, char* argv[]){
-    string str_argv = "";
-    for (int i = index_start; i<argc; i++){
-        str_argv = argv[i];
-        if (str_argv == "--help" || str_argv == "-h"){
-            help();
-            exit(1);
-        }
-        else if (str_argv == "--version" || str_argv == "-v"){
-            string version = string(str_version) + version_application + "\n";
-            cout << version.c_str();
-            exit(1);
-        }
-        else if (str_argv == "--lock-datetime"){
-            flag_datetime = true;
-        }
-        else if (str_argv == "--lock-timezone"){
-            flag_timezone = true;
-        }
-        else if (str_argv == "--lock-ntp-mode"){
-            flag_ntp_mode = true;
-        }
-        else if (str_argv == "--lock-ntp-edit"){
-            flag_ntp_edit = true;
-        }
-        else if (str_argv == "--lock-save"){
-            flag_save = true;
-            flag_save_local = true;
-            flag_save_global = true;
-        }
-        else if (str_argv == "--lock-save-local"){
-            flag_save_local = true;
-        }
-        else if (str_argv == "--lock-save-global"){
-            flag_save_global = true;
-        }
-        else if (str_argv == "--lock-load-global"){
-            flag_load_global = true;
-        }
-        else if (str_argv == "--lock-sync-hwclock"){
-            flag_sync_hwclock = true;
-        }
-        else{
-            if (index_start == 1){
-                g_print(no_recognized);
-            }
-        }
-            
-    }
-}

source/ubl-cmake.in

@@ -1 +0,0 @@
-#cmakedefine WEBKIT_FOUND

source/ubl-settings-datetime.c

@@ -0,0 +1,417 @@
+#include "ubl-settings-datetime.h"
+
+config main_config;
+
+//functions
+void yon_save_parameters(main_window *widgets){
+    int mode = gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->DHCPCombo));
+    switch(mode){
+        case 0:yon_config_register(NTPSERVERS_parameter,NTPSERVERS_parameter_command,"default");
+            break;
+        case 1:yon_config_register(NTPSERVERS_parameter,NTPSERVERS_parameter_command,"stop");
+            break;
+        case 2:yon_config_register(NTPSERVERS_parameter,NTPSERVERS_parameter_command,"dhcp");
+            break;
+        case 3:
+            char *value = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->NTPEntry));
+            if (yon_char_is_empty(value)) {
+                yon_ubl_status_box_render(EMPTY_IMPORTANT_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
+                yon_ubl_status_highlight_incorrect(widgets->NTPEntry);
+                return;
+            }
+            yon_config_register(NTPSERVERS_parameter,NTPSERVERS_parameter_command,value);
+            break;
+    }
+    const char *region = gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->RegionCombo));
+    const char *zone = gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->ZoneCombo));
+
+    if (!yon_char_is_empty(region)&&!yon_char_is_empty(zone)){
+        char *zone_parameter = yon_char_unite(region,"/",zone,NULL);
+        yon_config_register(ZONE_parameter,ZONE_parameter_command,zone_parameter);
+        free(zone_parameter);
+    }
+
+    if (gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->TimeSyncTypeCombo))==0){
+        yon_config_register(HWCLOCK_SYNC_parameter,HWCLOCK_SYNC_parameter_command,"localtime");
+    } else {
+        yon_config_register(HWCLOCK_SYNC_parameter,HWCLOCK_SYNC_parameter_command,"utc");
+    }
+
+}
+
+void on_config_save(GtkWidget *, main_window *widgets){
+    main_config.load_mode=3;
+    yon_save_parameters(widgets);
+    yon_save_proceed(NULL,YON_CONFIG_BOTH,config_get_global_command,NULL);
+}
+
+void on_config_save_global(GtkWidget *, main_window *widgets){
+    main_config.load_mode=0;
+    yon_save_parameters(widgets);
+    yon_save_proceed(NULL,YON_CONFIG_BOTH,config_get_global_command,NULL);
+}
+
+void on_config_save_local(GtkWidget *, main_window *widgets){
+    main_config.load_mode=1;
+    yon_save_parameters(widgets);
+    yon_save_proceed(NULL,YON_CONFIG_BOTH,config_get_global_command,NULL);
+}
+
+void on_config_save_custom(GtkWidget *, main_window *widgets){
+    main_config.load_mode=3;
+    yon_save_parameters(widgets);
+    yon_save_proceed(NULL,YON_CONFIG_BOTH,config_get_global_command,NULL);
+}
+
+void on_config_load_global(){
+    yon_load_proceed(YON_CONFIG_GLOBAL);
+    
+}
+
+void on_config_load_local(){
+    yon_load_proceed(YON_CONFIG_LOCAL);
+    
+}
+
+void on_config_load_custom(){
+    yon_load_proceed(YON_CONFIG_CUSTOM);
+}
+
+void yon_load_proceed(YON_CONFIG_TYPE type){
+    yon_config_clean();
+    if (!yon_char_is_empty(config_get_default_command))
+        yon_config_load_config(YON_CONFIG_DEFAULT,config_get_default_command,NULL);
+    if (type==YON_CONFIG_GLOBAL){
+		yon_config_load_config(type,config_get_global_command,NULL);
+	} else if (type==YON_CONFIG_LOCAL){
+		yon_config_load_config(type,config_get_local_command,NULL);
+    } else if (type==YON_CONFIG_CUSTOM){
+		char *path="";
+        textdomain(template_ui_LocaleName);
+		GtkWidget *dialog = gtk_file_chooser_dialog_new(template_app_information.app_title,NULL,GTK_FILE_CHOOSER_ACTION_SAVE,CANCEL_LABEL,GTK_RESPONSE_CANCEL,OPEN_LABEL,GTK_RESPONSE_ACCEPT,NULL);
+        textdomain(LocaleName);
+        gtk_window_set_icon_name(GTK_WINDOW(dialog),icon_name);
+        gtk_window_set_title(GTK_WINDOW(dialog),TITLE_LABEL);
+        GtkFileFilter *filter = gtk_file_filter_new();
+		gtk_file_filter_add_pattern(filter,"*.ini");
+        gtk_file_filter_set_name(filter, "*.ini");
+		gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog),filter);
+		gtk_widget_show(dialog);
+		int response = gtk_dialog_run(GTK_DIALOG(dialog));
+		if (response == GTK_RESPONSE_ACCEPT){
+			char *file = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
+			if (!yon_char_is_empty(file)){
+				path=file;
+			}
+			gtk_widget_destroy(dialog);
+		} else {
+			gtk_widget_destroy(dialog);
+		}
+        char *command = yon_config_get_custom_command(path);
+		yon_config_load_config(type,command,NULL);
+	}
+}
+
+void yon_interface_update(main_window *widgets){
+    char *ntp = config(NTPSERVERS_parameter);
+    char *zone = config(ZONE_parameter);
+    if (!yon_char_is_empty(zone)&&strstr(zone,"/")){
+        char *region = yon_char_divide_search(zone,"/",-1);
+        gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->RegionCombo),region);
+        while (gtk_events_pending()) gtk_main_iteration();
+        gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->ZoneCombo),zone);
+        free(zone);
+        free(region);
+    }
+    if (!yon_char_is_empty(ntp)){
+        if (!strcmp(ntp,"stop")){
+            gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->DHCPCombo),1);
+            gtk_widget_set_sensitive(widgets->NTPEntry,0);
+        } else if (!strcmp(ntp,"default")){
+            gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->DHCPCombo),0);
+            gtk_widget_set_sensitive(widgets->NTPEntry,0);
+        } else if (!strcmp(ntp,"dhcp")){
+            gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->DHCPCombo),2);
+            gtk_widget_set_sensitive(widgets->NTPEntry,0);
+        } else {
+            gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->DHCPCombo),3);
+            gtk_widget_set_sensitive(widgets->NTPEntry,1);
+            gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),ntp);
+        }
+    } else {
+        gtk_entry_set_text(GTK_ENTRY(widgets->NTPEntry),"");
+    }
+
+    char *hwclock_sync = config(HWCLOCK_SYNC_parameter);
+    if (!yon_char_is_empty(hwclock_sync)){
+        if (!strcmp(hwclock_sync,"utc")){
+            gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->TimeSyncTypeCombo),1);
+        } else {
+            gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->TimeSyncTypeCombo),0);
+        }
+    }
+
+    GDateTime *datetime = g_date_time_new_now_local();
+    char *time = g_date_time_format(datetime,"%H %M");
+    char *date = g_date_time_format(datetime,"%Y:%m:%d");
+    gtk_calendar_select_month(GTK_CALENDAR(widgets->DateCalendar),g_date_time_get_month(datetime),g_date_time_get_year(datetime));
+    gtk_calendar_select_day(GTK_CALENDAR(widgets->DateCalendar),g_date_time_get_day_of_month(datetime));
+
+    if (!yon_char_is_empty(time)){
+        char *hour = yon_char_divide_search(time," ",-1);
+        double hours = atof(hour);
+        double minutes = atof(time);
+        gtk_spin_button_set_value(GTK_SPIN_BUTTON(widgets->HourSpin),hours);
+        gtk_spin_button_set_value(GTK_SPIN_BUTTON(widgets->MinuteSpin),minutes);
+        free(hour);
+        free(time);
+    } else {
+        gtk_spin_button_set_value(GTK_SPIN_BUTTON(widgets->HourSpin),0.0f);
+        gtk_spin_button_set_value(GTK_SPIN_BUTTON(widgets->MinuteSpin),0.0f);
+    }
+
+    if (!yon_char_is_empty(date)){
+        gtk_entry_set_text(GTK_ENTRY(widgets->DateEntry),date);
+    } else {
+        gtk_entry_set_text(GTK_ENTRY(widgets->DateEntry),"");
+    }
+}
+
+void on_date_clicked(GtkWidget *,main_window *widgets){
+    gtk_popover_popup(GTK_POPOVER(widgets->DatePopover));
+}
+
+void on_region_changed(GtkComboBox *self, main_window *widgets){
+    char *active = (char*)gtk_combo_box_get_active_id(self);
+    active = yon_char_append("/usr/share/zoneinfo/",active);
+    int size;
+    gtk_combo_box_text_remove_all(GTK_COMBO_BOX_TEXT(widgets->ZoneCombo));
+    if (yon_file_is_directory(active)){
+        config_str parsed = yon_file_ls(active,&size);
+        for (int i=0;i<size;i++){
+            gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->ZoneCombo),parsed[i],_(parsed[i]));
+        }
+        if (size) yon_char_parsed_free(parsed,size);
+        gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->ZoneCombo),0);
+    }
+    free(active);
+}
+
+struct datetime_arg {
+    char *time;
+    const char *date;
+};
+
+void *on_sync_error(void*){
+    yon_ubl_status_box_render(SYNC_ERROR_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
+    g_thread_exit(NULL);
+    return NULL;
+}
+
+void *yon_sync_thread_start(void *arg){
+    struct datetime_arg *data = (struct datetime_arg*)arg;
+    char *command_time = time_sync_command(data->time);
+    char *command_date = date_sync_command(data->date);
+    char *command = yon_char_unite(command_time,"; ",command_date,NULL);
+    free(command_time);
+    free(command_date);
+    if (system(yon_debug_output("%s\n",command))){
+        g_thread_new("status_thread",(GThreadFunc)on_sync_error,NULL);
+    };
+    pthread_exit(NULL);
+}
+
+void on_sync_clicked(GtkWidget *, main_window *widgets){
+    char *hour = yon_char_from_long((long)gtk_spin_button_get_value(GTK_SPIN_BUTTON(widgets->HourSpin)));
+    char *minute = yon_char_from_long((long)gtk_spin_button_get_value(GTK_SPIN_BUTTON(widgets->MinuteSpin)));
+    GDateTime *datetime = g_date_time_new_now_local();
+    char *second = g_date_time_format(datetime, "%S");
+    char *time = yon_char_unite(hour,":",minute,":",second,NULL);
+
+    const char *date = gtk_entry_get_text(GTK_ENTRY(widgets->DateEntry));
+
+    struct datetime_arg *data = malloc(sizeof(struct datetime_arg));
+    data->date=NULL;
+    data->time=time;
+    if (!yon_char_is_empty(date)){
+        int size;
+        config_str parsed = yon_char_parse((char*)date,&size,":");
+        data->date=yon_char_parsed_to_string(parsed,size,"");
+        yon_char_parsed_free(parsed,size);
+    }
+    free(hour);
+    free(minute);
+    free(second);
+
+    pthread_t tid;
+    pthread_attr_t attr;
+    pthread_attr_init(&attr); 
+    pthread_create(&tid,&attr,yon_sync_thread_start,data);
+
+}
+
+void on_ntp_sync(GtkWidget *, main_window *widgets){
+    int mode = gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->DHCPCombo));
+    switch(mode){
+        case 0:
+            gtk_widget_set_sensitive(widgets->NTPEntry,0);
+            break;
+        case 1:
+            gtk_widget_set_sensitive(widgets->NTPEntry,0);
+            break;
+        case 2:
+            gtk_widget_set_sensitive(widgets->NTPEntry,0);
+            break;
+        case 3:
+            gtk_widget_set_sensitive(widgets->NTPEntry,1);
+            break;
+    }
+}
+
+void *yon_sync_hardware_thread_start(void*){
+    if (system(hardware_datetime_sync_command)){
+        g_thread_new("status_thread",(GThreadFunc)on_sync_error,NULL);
+    }
+    pthread_exit(NULL);
+}
+
+void on_sync_hardware_clicked(){
+    pthread_t tid;
+    pthread_attr_t attr;
+    pthread_attr_init(&attr); 
+    pthread_create(&tid,&attr,yon_sync_hardware_thread_start,NULL);
+}
+
+// standard functions
+
+void on_date_accept(GtkWidget *,main_window *widgets){
+    guint year=0, month=0, day=0;
+    gtk_calendar_get_date(GTK_CALENDAR(widgets->DateCalendar),&year,&month,&day);
+    char *ye_str = yon_char_from_int(year);
+    char *mo_str = yon_char_from_int(++month);
+    char *da_str = yon_char_from_int(day);
+    char *date = yon_char_unite(ye_str,":",month<10?"0":"",mo_str,":",day<10?"0":"",da_str,NULL);
+    gtk_entry_set_text(GTK_ENTRY(widgets->DateEntry),date);
+    gtk_popover_popdown(GTK_POPOVER(widgets->DatePopover));
+    free(date);
+}
+
+void on_date_cancel(GtkWidget *, main_window *widgets){
+    gtk_popover_popdown(GTK_POPOVER(widgets->DatePopover));
+}
+
+/**config_init() 
+ * [EN] 
+ *  
+ * [RU] 
+ * Функция инициализации всех параметров конфигурации 
+*/ 
+void config_init(){ 
+    main_config.always_open_documentation=0; 
+    main_config.socket_id=-1; 
+    main_config.save_socket_id=-1; 
+    main_config.load_socket_id=-1; 
+    main_config.lock_help=0; 
+    main_config.lock_help=0; 
+    main_config.lock_load_global=0; 
+    main_config.lock_save_global=0; 
+    main_config.lock_save_local=0; 
+    main_config.load_mode=1;
+}
+
+/**yon_main_window_complete(main_window *widgets) 
+ * [EN] 
+ *  
+ * [RU] 
+ * Функция настройки основного окна приложения. [widgets] - структура со стандартным интерфейсом. 
+*/ 
+void yon_main_window_complete(main_window *widgets){ 
+    widgets = yon_remalloc(widgets,sizeof(main_window)); 
+    GtkBuilder *builder = gtk_builder_new_from_resource(glade_path); 
+    gtk_box_pack_start(GTK_BOX(widgets->InterfaceBox),yon_gtk_builder_get_widget(builder,"BoxMain"),1,1,0); 
+
+    // Custom widgets configuration 
+    {
+        widgets->HourSpin = yon_gtk_builder_get_widget(builder,"HourSpin");
+        widgets->MinuteSpin = yon_gtk_builder_get_widget(builder,"MinuteSpin");
+        widgets->DateEntry = yon_gtk_builder_get_widget(builder,"DateEntry");
+        widgets->DateButton = yon_gtk_builder_get_widget(builder,"DateButton");
+        widgets->SyncButton = yon_gtk_builder_get_widget(builder,"SyncButton");
+        widgets->SyncHardwareButton = yon_gtk_builder_get_widget(builder,"SyncHardwareButton");
+        widgets->DHCPCombo = yon_gtk_builder_get_widget(builder,"DHCPCombo");
+        widgets->NTPEntry = yon_gtk_builder_get_widget(builder,"NTPEntry");
+        widgets->TimeSyncTypeCombo = yon_gtk_builder_get_widget(builder,"TimeSyncTypeCombo");
+        widgets->RegionCombo = yon_gtk_builder_get_widget(builder,"RegionCombo");
+        widgets->ZoneCombo = yon_gtk_builder_get_widget(builder,"ZoneCombo");
+        widgets->DatePopover = yon_gtk_builder_get_widget(builder,"DatePopover");
+        widgets->DateCalendar = yon_gtk_builder_get_widget(builder,"DateCalendar");
+        widgets->DateCancelButton = yon_gtk_builder_get_widget(builder,"DateCancelButton");
+        widgets->DateAcceptButton = yon_gtk_builder_get_widget(builder,"DateAcceptButton");
+
+        widgets->zone_list = GTK_LIST_STORE(gtk_builder_get_object(builder,"liststore1"));
+    }
+    // Signal configuration
+    {
+    g_signal_connect(G_OBJECT(widgets->SaveMenuItem),"activate",G_CALLBACK(on_config_save),widgets);
+    g_signal_connect(G_OBJECT(widgets->SaveGlobalMenuItem),"activate",G_CALLBACK(on_config_save_global),widgets);
+    g_signal_connect(G_OBJECT(widgets->SaveLocalMenuItem),"activate",G_CALLBACK(on_config_save_local),widgets);
+    g_signal_connect(G_OBJECT(widgets->SaveCustomMenuItem),"activate",G_CALLBACK(on_config_save_custom),widgets);
+
+    g_signal_connect(G_OBJECT(widgets->LoadGlobalMenuItem),"activate",G_CALLBACK(on_config_load_global),widgets);
+    g_signal_connect(G_OBJECT(widgets->LoadLocalMenuItem),"activate",G_CALLBACK(on_config_load_local),widgets);
+    g_signal_connect(G_OBJECT(widgets->LoadCustomMenuItem),"activate",G_CALLBACK(on_config_load_custom),widgets);
+    
+    g_signal_connect(G_OBJECT(widgets->DHCPCombo),"changed",G_CALLBACK(on_ntp_sync),widgets);
+    g_signal_connect(G_OBJECT(widgets->SyncButton),"clicked",G_CALLBACK(on_sync_clicked),widgets);
+    g_signal_connect(G_OBJECT(widgets->SyncHardwareButton),"clicked",G_CALLBACK(on_sync_hardware_clicked),widgets);
+    g_signal_connect(G_OBJECT(widgets->RegionCombo),"changed",G_CALLBACK(on_region_changed),widgets);
+
+    g_signal_connect(G_OBJECT(widgets->DateButton),"clicked",G_CALLBACK(on_date_clicked),widgets);
+    g_signal_connect(G_OBJECT(widgets->DateCancelButton),"clicked",G_CALLBACK(on_date_cancel),widgets);
+    g_signal_connect(G_OBJECT(widgets->DateAcceptButton),"clicked",G_CALLBACK(on_date_accept),widgets);
+    }
+    // Initial data loading
+    {
+
+        int size;
+        config_str parsed = yon_dir_get_contents(zone_path,&size);
+        for (int i=0;i<size;i++){
+            if (!strstr(parsed[i],".")&&strcmp(parsed[i],"posix")&&strcmp(parsed[i],"right")){
+                char *path = yon_char_append(zone_path,parsed[i]);
+                if (yon_file_is_directory(path)){
+                    gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(widgets->RegionCombo),parsed[i],_(parsed[i]));
+                }
+                free(path);
+            }
+        }
+        if (size) yon_char_parsed_free(parsed,size);
+        gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->RegionCombo),0);
+    }
+
+    yon_load_proceed(YON_CONFIG_LOCAL);
+    yon_interface_update(widgets);
+}
+
+int main(int argc, char *argv[]){ 
+    local=setlocale(LC_ALL, "");
+    textdomain (LocaleName);
+    config_init();
+    
+    yon_ubl_connect_config((_template_config*)&main_config); 
+    yon_ubl_window_init(TITLE_LABEL,TITLE_INFO_LABEL,LocaleName,CssPath,LocaleName,version_application,WIKI_LINK);
+	config_str unfound = NULL;
+	int size=0;
+	yon_ubl_setup_arguments(argc,argv,&unfound,&size,NULL);
+    gtk_init(&argc,&argv);
+    template_main_window *widgets = yon_ubl_window_setup(); 
+    yon_main_window_complete((main_window*)widgets);
+    char *path = yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL);
+    yon_window_config_load(path);
+    if (getuid()!=0){
+        textdomain(template_ui_LocaleName);
+        yon_ubl_status_box_render(ROOT_WARNING_LABEL,BACKGROUND_IMAGE_FAIL_TYPE);
+        textdomain(LocaleName);
+    }
+    gtk_main();
+    return 0;
+}

source/ubl-settings-datetime.h

@@ -1,378 +1,139 @@
-#ifndef UBL_SETTINGS_DATETIME_H
+#include <gtk/gtk.h>
-#define UBL_SETTINGS_DATETIME_H
+#include <gtk/gtkx.h>
-#include <gtkmm/window.h>
+#include <locale.h>
-#include <glibmm/i18n.h>
-#include <gtkmm/plug.h>
-#include <gtkmm/stock.h>
-#include <gtkmm.h>
-#include <iostream>
-#include <map>
-#include <string>
-#include <array>
-#include <vector>
-#include <fstream>
-#include <filesystem>
 #include <stdio.h>
-#include <unicode/timezone.h>
+#include <unistd.h>
-#include <unicode/calendar.h>
+#include <stdlib.h>
-#include <map>
+#include <libintl.h>
-#include <pwd.h>
+#include <getopt.h>
-#include <dlfcn.h>
+#include <libintl.h>
-#include "ubl-util-standard.c"
+#include <libublsettings.h>
-#include "../compile/ubl-cmake.h"
+#include <libublsettings-gtk3.h>
+#include <libublsettingsui-gtk3.h>
 #ifdef WEBKIT_FOUND
+    #include <webkit2/webkit2.h>
+#endif 
+#include "ubl-strings.h"
 
-#include <webkit2/webkit2.h>
+#define WIKI_LINK "https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/ubl-settings-TEMPLATE"
-#endif
+
-
+#define _(String) gettext(String)
-
+
-#define const_link_doc "https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/ubl-settings-datetime"
+#define glade_path "/com/ublinux/ui/ubl-settings-datetime.glade"
-#define cmd_xdg "xdg-open "
+#define banner_path "/com/ublinux/images/ubl-settings-datetime-banner.png"
-#define cmd_execute "su -l %s -c \" DISPLAY=$DISPLAY %s \""
+#define CssPath "/com/ublinux/css/ubl-settings-datetime.css"
-#define get_NTPSERVERS_DEFAULT "ubconfig --source default get [] NTPSERVERS_DEFAULT"
+#define config_path yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL)
-#define get_global_NTPSERVERS "ubconfig --default --source global get network NTPSERVERS"
+
-#define get_system_ZONE "ubconfig --default --source system get clock ZONE"
+#define LocalePath "/usr/share/locale" 
-#define get_system_NTPSERVERS "ubconfig --default --source system get network NTPSERVERS"
+#define LocaleName "ubl-settings-datetime"
-#define get_system_HWCLOCK_SYNC "ubconfig --default --source system get clock HWCLOCK_SYNC"
+
-#define get_global_ZONE "ubconfig --default --source global get clock ZONE"
+#define icon_name "com.ublinux.ubl-settings-datetime"
-#define get_global_HWCLOCK_SYNC "ubconfig --source global get clock HWCLOCK_SYNC"
+
-#define set_system_ZONE "ubconfig --target system set clock ZONE="
+#define yon_config_get_custom_command(target) yon_char_unite("ubconfig --source ",target," get clock HWCLOCK_SYNC ZONE","; ", "ubconfig --source ",target," get et network NTPSERVERS",NULL)
-#define set_global_HWCLOCK_SYNC_utc "ubconfig --target global --noexecute set clock HWCLOCK_SYNC=utc"
+#define config_get_local_command "ubconfig --source system get clock HWCLOCK_SYNC ZONE", "ubconfig --source system get network NTPSERVERS"
-#define set_global_HWCLOCK_SYNC_localtime "ubconfig --target global --noexecute set clock HWCLOCK_SYNC=localtime"
+#define config_get_global_command "ubconfig --source global get clock HWCLOCK_SYNC ZONE", "ubconfig --source global get network NTPSERVERS"
-#define set_system_HWCLOCK_SYNC_localtime "ubconfig --target system set clock HWCLOCK_SYNC=localtime"
+#define config_get_default_command "ubconfig --source default get clock ZONE HWCLOCK_SYNC"
-#define set_system_HWCLOCK_SYNC_utc "ubconfig --target system set clock HWCLOCK_SYNC=utc"
+
-#define remove_global_NTPSERVERS "ubconfig --target global --noexecute remove network NTPSERVERS"
+#define config_get_global_only_parameters ""
-#define set_system_NTPSERVERS_default "ubconfig --target system set network NTPSERVERS=default"
+#define config_get_local_only_parameters ""
-#define set_system_NTPSERVERS_dhcp "ubconfig --target system set network NTPSERVERS=dhcp"
+
-#define set_system_NTPSERVERS "ubconfig --target system set network NTPSERVERS=\""
+#define NTPSERVERS_parameter "NTPSERVERS"
-#define remove_system_NTPSERVERS "ubconfig --target system remove network NTPSERVERS"
+#define NTPSERVERS_parameter_command "ubconfig --source global get network NTPSERVERS"
-#define set_global_ZONE "ubconfig --target global --noexecute set clock ZONE="
+#define HWCLOCK_SYNC_parameter "HWCLOCK_SYNC"
-
+#define HWCLOCK_SYNC_parameter_command "ubconfig --source global get clock HWCLOCK_SYNC"
-#define set_all_ZONE "ubconfig set clock ZONE="
+#define ZONE_parameter "ZONE"
-#define set_all_NTPSERVERS_default "ubconfig set network NTPSERVERS=default"
+#define ZONE_parameter_command "ubconfig --source global get clock ZONE"
-#define set_all_NTPSERVERS_dhcp "ubconfig set network NTPSERVERS=dhcp"
+
-#define set_all_NTPSERVERS "ubconfig set network NTPSERVERS=\""
+#define time_sync_command(time) yon_char_unite("date +%T -s \"",time,"\"",NULL)
-#define remove_all_NTPSERVERS "ubconfig remove network NTPSERVERS"
+#define date_sync_command(date) yon_char_unite("date +%Y%m%d -s \"",date,"\"",NULL)
-#define set_all_HWCLOCK_SYNC_localtime "ubconfig set clock HWCLOCK_SYNC=localtime"
+
-#define set_all_HWCLOCK_SYNC_utc "ubconfig set clock HWCLOCK_SYNC=utc"
+#define hardware_datetime_sync_command "hwclock --systohc"
-
+
-#define set_global_NTPSERVERS_default "ubconfig --target global --noexecute set network NTPSERVERS=default"
+#define zone_path "/usr/share/zoneinfo/"
-#define set_global_NTPSERVERS_dhcp "ubconfig --target global --noexecute set network NTPSERVERS=dhcp"
+
-#define set_global_NTPSERVERS "ubconfig --target global --noexecute set network NTPSERVERS=\""
+typedef char* string;
-#define set_hwclock "hwclock --systohc"
+string version_application;
-#define icon_checked "com.ublinux.ubl-settings-datetime.checked"
+
-#define icon_warning "com.ublinux.ubl-settings-datetime.warning"
+char *local;
-#define get_global_defalult_HWCLOCK_SYNC "ubconfig --default --source global get clock HWCLOCK_SYNC"
+
-#define path_app "/usr/bin/"
+typedef struct {
-#define path_glade "/com/ublinux/ui/ubl-settings-datetime.glade"
+    template_config_fields
-#define app_name "ubl-settings-datetime"
+
-#define path_locale "/usr/share/locale/"
+} config;
-#define path_css "/com/ublinux/css/ubl-settings-datetime.css"
+
-#define path_img_head_background "/com/ublinux/images/ubl-settings-datetime-banner.png"
+typedef struct {
-
+    template_window_fields
-
+    GtkWidget *HourSpin;
-#include <gtkmm/plug.h>
+    GtkWidget *MinuteSpin;
-#define copyright _("Copyright © UBSoft LLC, 2022 - ")
+    GtkWidget *DateEntry;
-#define name_app _("ubl-settings-datetime") 
+    GtkWidget *DateButton;
-#define website _("https://wiki.ublinux.com")
+    GtkWidget *SyncButton;
-#define home_page _("Project Home Page")
+    GtkWidget *SyncHardwareButton;
-#define str_about_1 _("About") 
+    GtkWidget *DHCPCombo;
-#define str_about _("About ubl-settings-datetime")
+    GtkWidget *NTPEntry;
-#define str_help _("Help")
+    GtkWidget *TimeSyncTypeCombo;
-#define str_save _("Save")
+    GtkWidget *RegionCombo;
-#define str_load _("Load")
+    GtkWidget *ZoneCombo;
-#define save_all _("Save in global and local configuration")
+
-#define save_local _("Save in local configuration")
+    GtkListStore *zone_list;
-#define save_global _("Save in global configuration")
+
-#define load_global _("Load global configuration")
+    GtkWidget *DatePopover;
-#define load_local _("Load local configuration")
+    GtkWidget *DateCalendar;
-#define read_online _("Read online")
+    GtkWidget *DateAcceptButton;
-#define cancel _("Cancel")
+    GtkWidget *DateCancelButton;
-#define always_redirect _("Always redirect")
+} main_window;
-#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 website where documentation is\n""translated and supported by community.")
+typedef struct {
-#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")
+    GtkWidget *Window;
-#define str_version _("ubl-settings-datetime version: ")
+    GtkWidget *HeaderLabel;
-#define local_read_error _("Local configuration reading error")
+
-#define global_read_error _("Global configuration read error")
+    GtkWidget *AlwaysOpenCheck;
-#define local_write_error _("Local configuration write error")
+
-#define global_write_error _("Global configuration write error")
+    GtkWidget *CloseButton;
-#define error_save_all _("Error saved local and global configuration")
+    GtkWidget *AcceptButton;
-#define local_load_ok _("Local configuration downloaded successfully")
+} documentation_confirmation_window;
-#define global_load_ok _("Global configuration downloaded successfully")
+
-#define local_ok_written _("Local configuration successfully written")
+void yon_load_proceed(YON_CONFIG_TYPE type);
-#define global_ok_written _("Global configuration successfully written")
+
-#define successfully_save_all _("Successfully saved local and global configuration")
+void config_init();
-
+
-#define incorrect_date_f _("Incorrect date format")
+void yon_main_window_complete(main_window *widgets);
-#define date_time_ok_synchronized _("Date and time are successfully synchronized")
+
-#define entry_list_ntp _("Enter a list of NTP servers")
+void on_region_changed(GtkComboBox *self, main_window *widgets);
-#define error_ntp_name _("Error in the NTP server name")
+
-#define invalid_character_entry _("An invalid character is entered")
+void yon_interface_update(main_window *widgets);
-#define ntp_server_ok _("NTP server name is correct")
+
-#define hardware_clock_ok _("Hardware clock successfully synchronized")
+void *on_sync_error(void*);
-#define hardware_clock_error _("Hardware clock synchronization error")
+
-
+void *yon_sync_hardware_thread_start(void*);
-#define no_recognized _("Argument not recognized\n")
+void *yon_sync_thread_start(void*);
-#define program_as_root _("The program must be run as root")
+
-#define str_date_flag _(": \"Date\"")
+void on_sync_hardware_clicked();
-#define str_time_zone_flag _(": \"Time Zone\"")
+void on_sync_clicked(GtkWidget *, main_window *widgets);
-#define str_hardware_time_flag _(": \"Hardware time\"")
+
-#define str_NTP_flag _(": \"NTP\"")
+void on_ntp_sync(GtkWidget *, main_window *widgets);
-#define str_default _("Default")
+
-#define str_DHCP _("DHCP")
+void yon_save_parameters(main_window *widgets);
-#define str_manual _("Manual")
+
-#define str_disabled _("Disabled")
+void on_config_save(GtkWidget *, main_window *widgets);
-#define str_time _("Time:")
+
-#define str_date_time _("Date and Time")
+void on_config_save_global(GtkWidget *, main_window *widgets);
-#define utc_time _("UTC time")
+
-#define str_local_time _("Local time")
+void on_config_save_local(GtkWidget *, main_window *widgets);
-#define str_attention _("Attention")
+
-#define str_sync_by _("Sync by")
+void on_config_save_custom(GtkWidget *, main_window *widgets);
-#define str_zone _("Zone:")
+
-#define str_region _("Region:")
+void on_config_load_global();
-#define str_time_zone _("Time zone")
+
-#define str_date _("Date:")
+void on_config_load_local();
-#define synchronize_hw _("Synchronize hardware time")
+
-#define setting_date_time _("Setting the system date and time")
+void on_config_load_custom();
-#define current_date_time _("Current date and time")
+
-#define data_format_d_m_y _("Date of\nFormat: DD.MM.YYYY")
+void yon_load_proceed(YON_CONFIG_TYPE type);
-#define synchronize_ntp _("Synchronize via NTP")
+
-#define enter_name_ntp_tooltip _("Enter the name of the ntp-server or its ip-address.\nWhen entering multiple addresses, separate them with commas.")
+void on_date_clicked(GtkWidget *,main_window *widgets);
-#define info_box_ok_css "boxInfoMessOK"
+
-#define info_box_error_css "boxInfoMessError"
+void on_date_accept(GtkWidget *,main_window *widgets);
-
+
-using namespace std;
+void on_date_cancel(GtkWidget *, main_window *widgets);
-extern bool flag_datetime;
-extern bool flag_timezone;
-extern bool flag_ntp_mode;
-extern bool flag_ntp_edit;
-extern bool flag_save;
-extern bool flag_save_local;
-extern bool flag_save_global;
-extern bool flag_load_global;
-extern bool flag_sync_hwclock;
-extern int socket_ext_id_I;
-extern int socket_trd_id_I;
-extern string version_application;
-
-class MainWindow : public Gtk::ApplicationWindow {
-    public:
-        Glib::RefPtr<Gtk::Builder> builder;
-        Gtk::Button *btnUpdateDateTime;
-        Gtk::Button *btnChooseDate;
-        Gtk::Button *btnMessClose;
-        Gtk::ComboBoxText *cbDhcp;
-        Gtk::SpinButton *numTimeHrs;
-        Gtk::SpinButton *numTimeMin;
-        Gtk::Box *boxColor;
-        Gtk::ComboBoxText *cbRegion;
-        Gtk::ComboBoxText *cbZone;
-        Gtk::Window *windowMessDchp;
-        Gtk::Popover *popCalendar;
-        Gtk::Calendar *cldrDate;
-        Gtk::Label *lblMessage;
-        Gtk::Label *lblDateTimeSetting;
-        Gtk::Label *lblHead;
-        Gtk::Label *lblTime;
-        Gtk::Label *lblData;
-        Gtk::Label *lblTimeZone;
-        Gtk::Label *lblReg;
-        Gtk::Label *lblZone;
-        Gtk::Label *lblSynchronizebChk;
-        Gtk::Label *lblSynchronizebChkGLob;
-        Gtk::Label *lblSynchronizeBtn;
-        Gtk::Label *lblTimeBios;
-        Gtk::Label *lblSave;
-        Gtk::Label *lblLoad;
-        Gtk::Button *btnHardwareTime;
-        Gtk::CheckButton *cbxSynchronizeNtp;
-        Gtk::Entry *txtNtpServer;
-        Gtk::Entry *txtDate;
-        Gtk::Button *btnLoad;
-        Gtk::Button *btnSave;
-        Gtk::Button *btnSettings; 
-        Gtk::AboutDialog *aboutWindows;
-        Gtk::ButtonBox *btnBoxAboutDialog;
-        Gtk::Box *boxWidgetFunc;
-        Gtk::Box *boxInfoError; 
-        Gtk::Label *lblWarning;
-        Gtk::Image *imgInfo;
-        std::map <string, vector<string>> time_reg_map;
-        std::map <string, vector<string>> time_reg_map_local;
-        Gtk::MenuItem *btnSaveLocalGlob;
-        Gtk::MenuItem *btnSaveLocal;
-        Gtk::MenuItem *btnSaveGlob;
-        Gtk::MenuItem *btnLoadGlob;
-        Gtk::MenuItem *btnLoadLocal;
-        Gtk::MenuItem *btnAbout;
-        Gtk::MenuItem *btnhelp;
-        Gtk::HeaderBar *headerBar;
-        Gtk::Label *lblHeader;
-        Gtk::Label *lblHW;
-        Gtk::ComboBoxText *cbHw;
-        Gtk::Box *boxDateTime;
-        Gtk::Widget *boxButton;
-        Gtk::Widget *boxSave;
-        Gtk::Widget *standartHead;
-        Gtk::Widget *plugBox;
-        Gtk::Window *window;
-        Gtk::Image *imgLoad;
-        Gtk::Image *imgSave;
-        Gtk::Image *imgSettings;
-        Gtk::Overlay *overHead;
-        Gtk::Image *imgHeadBackground;
-        Gtk::Label *headInfoLabel;
-        Gtk::Label *lblHeadeWndWeb;
-        Gtk::Label *lblHeaderAboutTopic;
-
-        Gtk::Label *lblwebHeaderName;
-        Gtk::Label *lblhelpText;
-        Gtk::Label *lblhelpHeader;
-        Gtk::CheckButton *chkAlwaysOpenHelp;
-        Gtk::Button *btnReadHelp;
-        Gtk::Button *btnCancelHelp;
-        Gtk::Window *wndShowWeb;
-        bool flag_open_browser = false;
-        #ifdef WEBKIT_FOUND
-            Gtk::Window *wndWeb;
-            Gtk::Widget *three;
-            WebKitWebView *my_web_kit = NULL;
-        #endif
-        string array_hw[2];
-        string array_hw_local[2];
-        bool flag_load = false;
-        unsigned int year = 0;
-        unsigned int month = 0;
-        unsigned int day = 0;
-        string default_get_dhcp = "";
-        int error_info = 0;
-        int warning_info = 0;
-        string cmd_error = "";
-        int index_error = 0;
-        int flag_local_global_load = 2;
-        int hour;
-        int minute;
-        string str_region_buff = "";
-        string str_zone_buff = "";
-        string global_lick_doc = "";
-        int count_edit = 0;
-        bool flag_global = false;
-        bool flag_local = false;
-        bool flag_global_local = false;
-        template<typename Type>
-        struct Result{
-            Type response;
-            int error;
-        };
-        vector<string> array_region_local;
-        vector<string> array_region;
-        std::map <string, string> map_error;
-        
-        std::map <string, string> map_config_data_global;
-        std::map <string, string> map_config_data_local;
-        std::map <string, string> map_config_data_global_local;
-        std::map <string, string> map_config_data_global_old;
-        std::map <string, string> map_config_data_local_old;
-        std::map <string, string> map_config_data_global_local_old;
-        
-
-        
-    public:
-        MainWindow(BaseObjectType* obj, Glib::RefPtr<Gtk::Builder> const& builder);
-        MainWindow(Glib::RefPtr<Gtk::Builder> const& builder);
-        ~MainWindow();
-        void open_browser();
-        void log_mess_error(string &cmd);
-        void set_hardware_clock(string &local, string &etc);
-        void info_warning_error(int mess);
-        void help_show();
-        void temp_help_show();
-        void open_help();
-        void get_hardware_clock(string cmd);
-        void save_global_local_cfg();
-        void fill_in_reg_zone(string cmd);
-        void load_globl_cfg();
-        void save_local_cfg();
-        void template_open_browser(string link_doc);
-        void event_zone();
-        bool focus_ntp(GdkEventFocus* event);
-        bool check_config(string key, int key_save);
-        void event_log_hw();
-        void write_config(string data, string key);
-        string get_ubconfig_value(string cmd);
-        void save_global_cfg();
-        void save_Dhcp(string &cmd_default, string &cmd_dhcp, string &remove, string &cmd_set_ntp);
-        void load_local_cfg();
-        bool post_entry_data();
-        void lacalization();
-        void settings();
-        void flag_block_gui();
-        void add_CSS();
-        bool check_is_string_ntp(string &str_ntp);
-        bool check_is_num_ntp(string &str_ntp);
-        void get_builder();
-        void event();
-        bool wrapper_check_ntp(string &str_ntp);
-        bool validate_domen(string &str_ntp);
-        bool validate_ip_address(string &str_ntp);
-        void gui_mess_close();
-        bool focus_ntp_text() ;
-        void event_entry_cbDhcp();
-        void get_calendar();
-        void calendar_show();
-        void entry_dhcp_mess(string cmd_get_dhcp, string cmd_default_get_dhcp);
-        void get_config();
-        void enter_zone(string &cmd);
-        void set_ntp_toggle();
-        void append_region_zone(string region, string zone, Gtk::ComboBoxText *tmpCbReg, Gtk::ComboBoxText *tmpCbZone);
-        string call(string cmd);
-        void append_zone();
-        void append_zone_glob();
-        void update_time_date();
-        void bubble_sort(string arr[],string arr_local[], int len_arr);
-        void update_hour_minute();
-        void update_calendar();
-        void read_file();
-        void parse_text_date();
-        void hardware_clock();
-        void set_ntp_toggle_glob();
-        void wind_close_ntp();
-        void wrapper_system(string cmd, string thread_str);
-        void info_status_app(string stule);
-        void wrapper_update_time_date();
-        string zone_file_read(string zone);
-        void sort_zone(vector<string> *time_reg_map_local,vector<string> *time_reg_map);
-        array<string, 2> split_region_zone(string &read_reg_zon_cfg);
-        string str_remove(std::string& source, const std::string to_remove);
-        vector<std::string> split(const std::string &s, char delim);
-        struct Result<string> wrapper_call(string cmd);
-        bool check_ntp(string &str_ntp);
-        vector<int> find_all(string &str_ntp, string substr);
-    
-        
-};
-
-
-class CmdArgParser : public Glib::OptionGroup {
-public:
-    CmdArgParser(const std::string& p_name, const std::string& p_description, const std::string& p_help);
-    ::Window GetSocketID() const;
-private:
-    int m_socketID = 0;
-
-};
-class SettingsPlug : public Gtk::Plug{
-public:
-    Gtk::Window *window;
-    SettingsPlug(::Window p_socketID, Glib::RefPtr<Gtk::Builder> builder);
-
-private:
-    Gtk::Widget *plugBox;
-    Gtk::Widget *parent;
-};
-
-void wrapper_help_show(GtkWidget *self, char* link, gpointer user_data);
-void help();
-#endif

source/ubl-settings-datetime.h.in

@@ -1 +0,0 @@
-#cmakedefine WEBKIT_FOUND

source/ubl-strings.h

@@ -0,0 +1,24 @@
+
+#define TITLE_LABEL _("Date and time")
+#define TITLE_INFO_LABEL _("Date and time configuration")
+
+#define SYNC_ERROR_LABEL _("Syncronisation error")
+#define EMPTY_IMPORTANT_LABEL _("Important field is empty")
+
+#define ACCEPT_LABEL _("Accept")
+#define CANCEL_LABEL _("Cancel")
+#define CURRENT_DATETIME_LABEL _("Current date and time")
+#define TIME_LABEL _("Time:")
+#define DATE_LABEL _("Date:")
+#define SYNC_LABEL _("Synchronize")
+#define SYNC_HARDWARE_BUTTON_LABEL _("Synchronize hardware time")
+#define SYNC_HARDWARE_LABEL _("Synchronize hardware time:")
+#define SYNC_NTP_LABEL _("Synchronize via NTP")
+#define DEFAULT_LABEL _("Default")
+#define STOPPED_LABEL _("Stopped")
+#define MANUAL_LABEL _("Manual")
+#define MANUAL_TOOLTIP_LABEL _("Enter the name of the ntp server or its ip address. When entering multiple addresses, separate them with spaces.")
+#define TIME_ZONE_LABEL _("Time Zone")
+#define REGION_LABEL _("Region:")
+#define ZONE_LABEL _("Zone:")
+#define LOCAL_TIME_LABEL _("Local time")

source/ubl-util-standard.c

@@ -1,91 +0,0 @@
-#include "ubl-util-standard.h"
-#ifndef __cplusplus
-#ifndef UBL_GET_STANDARD_UI
-#define UBL_GET_STANDARD_UI
-
-
-inline returnstruct *ubl_make_plugs(GtkWidget *LeftWidget, GtkWidget *RightWidget, int left_plug_id, int right_plug_id){
-    returnstruct *ret=(returnstruct*)malloc(sizeof(returnstruct*));
-    if (left_plug_id>0&&LeftWidget){
-        GtkWidget *plug=gtk_plug_new(left_plug_id);
-        GtkWidget *toplug=LeftWidget;
-        if (gtk_widget_get_parent(GTK_WIDGET(toplug))){
-            g_object_ref(G_OBJECT(toplug));
-            GtkWidget *parent=gtk_widget_get_parent(toplug);
-            gtk_container_remove(GTK_CONTAINER(parent),toplug);
-            gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug));
-        } else 
-            gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug));
-        gtk_widget_show(GTK_WIDGET(plug));
-        ret->plugLeft=plug;
-    }
-    if (right_plug_id>0&&RightWidget){
-        GtkWidget *plug=gtk_plug_new(right_plug_id);
-        GtkWidget *toplug=RightWidget;
-        if (gtk_widget_get_parent(GTK_WIDGET(toplug))){
-            g_object_ref(G_OBJECT(toplug));
-            GtkWidget *parent=gtk_widget_get_parent(toplug);
-            gtk_container_remove(GTK_CONTAINER(parent),toplug);
-            gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug));
-        } else 
-            gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug));
-        gtk_widget_show(GTK_WIDGET(plug));
-        ret->plugRight=plug;
-    }
-    return ret;
-}
-
-#endif
-
-#else
-
-
-inline void ubl_make_plugs(Gtk::Widget *LeftWidget, Gtk::Widget *RightWidget, int left_plug_id, int right_plug_id){
-    if (left_plug_id>0&&LeftWidget){
-        GtkWidget *plug=gtk_plug_new(left_plug_id);
-        GtkWidget *toplug=GTK_WIDGET(LeftWidget->gobj());
-        {GdkScreen *screen = gtk_widget_get_screen(plug);
-        gtk_widget_set_app_paintable(plug,TRUE);
-        GdkVisual *colormap = gdk_screen_get_rgba_visual(screen);
-        gtk_widget_set_visual(plug, colormap);}
-        {GdkScreen *screen = gtk_widget_get_screen(toplug);
-        gtk_widget_set_app_paintable(toplug,TRUE);
-        GdkVisual *colormap = gdk_screen_get_rgba_visual(screen);
-        gtk_widget_set_visual(toplug, colormap);}
-        if (gtk_widget_get_parent(GTK_WIDGET(toplug))){
-            g_object_ref(G_OBJECT(toplug));
-            GtkWidget *parent=gtk_widget_get_parent(toplug);
-            gtk_container_remove(GTK_CONTAINER(parent),toplug);
-            gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug));
-        } else 
-            gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug));
-        gtk_widget_show(GTK_WIDGET(plug));
-        gtk_style_context_add_class(gtk_widget_get_style_context(plug),"bkim");
-        gtk_style_context_add_class(gtk_widget_get_style_context(toplug),"bkim");
-        gtk_style_context_add_class(gtk_widget_get_style_context(plug),"primary-toolbar");
-    }
-    if (right_plug_id>0&&RightWidget){
-        GtkWidget *plug=gtk_plug_new(right_plug_id);
-        GtkWidget *toplug=GTK_WIDGET(RightWidget->gobj());
-        {GdkScreen *screen = gtk_widget_get_screen(plug);
-        gtk_widget_set_app_paintable(plug,TRUE);
-        GdkVisual *colormap = gdk_screen_get_rgba_visual(screen);
-        gtk_widget_set_visual(plug, colormap);}
-        {GdkScreen *screen = gtk_widget_get_screen(toplug);
-        gtk_widget_set_app_paintable(toplug,TRUE);
-        GdkVisual *colormap = gdk_screen_get_rgba_visual(screen);
-        gtk_widget_set_visual(toplug, colormap);}
-        if (gtk_widget_get_parent(GTK_WIDGET(toplug))){
-            g_object_ref(G_OBJECT(toplug));
-            GtkWidget *parent=gtk_widget_get_parent(toplug);
-            gtk_container_remove(GTK_CONTAINER(parent),toplug);
-            gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug));
-        } else 
-            gtk_container_add(GTK_CONTAINER(plug),GTK_WIDGET(toplug));
-        gtk_widget_show(GTK_WIDGET(plug));
-        gtk_style_context_add_class(gtk_widget_get_style_context(plug),"bkim");
-        gtk_style_context_add_class(gtk_widget_get_style_context(toplug),"bkim");
-        gtk_style_context_add_class(gtk_widget_get_style_context(plug),"primary-toolbar");
-    }
-}
-#endif

source/ubl-util-standard.h

@@ -1,20 +0,0 @@
-#ifndef __cplusplus
-#include <gtk/gtk.h>
-#include <gtk/gtkx.h>
-
-typedef struct {
-    GtkWidget *plugLeft;
-    GtkWidget *plugRight;
-
-
-} returnstruct;
-static returnstruct *ubl_make_plugs(GtkWidget *LeftWidget, GtkWidget *RightWidget, int left_plug_id, int right_plug_id);
-#else
-#include <gtkmm.h>
-#include <gtkmm/stock.h>
-#include <gtkmm/window.h>
-#include <gtkmm/plug.h>
-
-
-static void ubl_make_plugs(Gtk::Widget *LeftWidget, Gtk::Widget *RightWidget, int left_plug_id, int right_plug_id);
-#endif

ubl-settings-datetime.pot

@@ -17,81 +17,92 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid ":"
+#: source/ubl-strings.h:2
-msgstr ""
+msgid "Date and time"
-
-#: 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 ""
-
-#: source/ubl-settings-datetime.h:112 source/ubl-settings-datetime.h:111
-#: source/ubl-settings-datetime.cc:59 source/ubl-settings-datetime.cc:61
-#: source/ubl-settings-datetime.cc:64 source/ubl-settings-datetime.cc:65
-#: 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:60 source/ubl-settings-datetime.cc:63
-#: source/ubl-settings-datetime.cc:66 source/ubl-settings-datetime.cc:67
-#: 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.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
-#: source/ubl-settings-datetime.h:122
-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.h:120
-msgid ": \"Time Zone\""
-msgstr ""
-
-#: source/ubl-settings-datetime.cc:58 source/ubl-settings-datetime.cc:57
-msgid ": \"xdg-open\""
 msgstr ""
 
-msgid "Abidjan"
+#: source/ubl-strings.h:3
+msgid "Datetime configuration"
 msgstr ""
 
-#: source/ubl-settings-datetime.h:70 source/ubl-settings-datetime.h:69
+#: source/ubl-strings.h:5
-#: source/ubl-settings-datetime.h:79
+msgid "Syncronisation error"
-msgid "About"
 msgstr ""
 
-#: source/ubl-settings-datetime.h:71 source/ubl-settings-datetime.h:70
+#: source/ubl-strings.h:7
-#: source/ubl-settings-datetime.cc:137 source/ubl-settings-datetime.h:80
+msgid "Accept"
-msgid "About ubl-settings-datetime"
 msgstr ""
 
-msgid "Accra"
+#: source/ubl-strings.h:8
+msgid "Cancel"
 msgstr ""
 
-msgid "Acre"
+#: source/ubl-strings.h:9
+msgid "Current date and time"
+msgstr ""
+
+#: source/ubl-strings.h:10
+msgid "Time:"
 msgstr ""
 
+#: source/ubl-strings.h:11
+msgid "Date:"
+msgstr ""
+
+#: source/ubl-strings.h:12
+msgid "Synchronize"
+msgstr ""
+
+#: source/ubl-strings.h:13
+msgid "Synchronize hardware time"
+msgstr ""
+
+#: source/ubl-strings.h:14
+msgid "Synchronize via NTP"
+msgstr ""
+
+#: source/ubl-strings.h:15
+msgid "Default"
+msgstr ""
+
+#: source/ubl-strings.h:16
+msgid "Stopped"
+msgstr ""
+
+#: source/ubl-strings.h:17
+msgid "Manual"
+msgstr ""
+
+#: source/ubl-strings.h:18
 msgid ""
-"Active service detected\n"
+"Enter the name of the ntp server or its ip address. When entering multiple "
-"Automatic time and date synchronization service detected"
+"addresses, separate them with spaces."
+msgstr ""
+
+#: source/ubl-strings.h:19
+msgid "Time Zone"
+msgstr ""
+
+#: source/ubl-strings.h:20
+msgid "Region:"
+msgstr ""
+
+#: source/ubl-strings.h:21
+msgid "Zone:"
+msgstr ""
+
+#: source/ubl-strings.h:22
+msgid "Local time"
+msgstr ""
+
+
+msgid "Abidjan"
+msgstr ""
+
+msgid "Accra"
+msgstr ""
+
+msgid "Acre"
 msgstr ""
 
 msgid "Adak"
@@ -121,11 +132,6 @@ msgstr ""
 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.h:91
-msgid "Always redirect"
-msgstr ""
-
 msgid "America"
 msgstr ""
 
@@ -135,12 +141,6 @@ msgstr ""
 msgid "Amsterdam"
 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.h:112
-msgid "An invalid character is entered"
-msgstr ""
-
 msgid "Anadyr"
 msgstr ""
 
@@ -177,11 +177,6 @@ msgstr ""
 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 ""
-
 msgid "Arizona"
 msgstr ""
 
@@ -221,12 +216,6 @@ msgstr ""
 msgid "Atlantic"
 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.h:131
-msgid "Attention"
-msgstr ""
-
 msgid "Atyrau"
 msgstr ""
 
@@ -236,9 +225,6 @@ msgstr ""
 msgid "Australia"
 msgstr ""
 
-msgid "Automatic time synchronization"
-msgstr ""
-
 msgid "Azores"
 msgstr ""
 
@@ -386,11 +372,6 @@ msgstr ""
 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.h:90
-msgid "Cancel"
-msgstr ""
-
 msgid "Cancun"
 msgstr ""
 
@@ -430,12 +411,6 @@ msgstr ""
 msgid "Chagos"
 msgstr ""
 
-msgid "Change the NTPSERVERS parameter"
-msgstr ""
-
-msgid "Change zone setting"
-msgstr ""
-
 msgid "Chatham"
 msgstr ""
 
@@ -499,12 +474,6 @@ msgstr ""
 msgid "Copenhagen"
 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.h:75
-msgid "Copyright © UBSoft LLC, 2022 - "
-msgstr ""
-
 msgid "Coral_Harbour"
 msgstr ""
 
@@ -523,21 +492,6 @@ msgstr ""
 msgid "Curacao"
 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.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 source/ubl-settings-datetime.h:124
-msgid "DHCP"
-msgstr ""
-
 msgid "Dacca"
 msgstr ""
 
@@ -556,34 +510,6 @@ msgstr ""
 msgid "Darwin"
 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.h:128
-msgid "Date and Time"
-msgstr ""
-
-#: source/ubl-settings-datetime.h:100 source/ubl-settings-datetime.h:99
-#: 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.h:140
-msgid ""
-"Date of\n"
-"Format: DD.MM.YYYY"
-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.h:136
-msgid "Date:"
-msgstr ""
-
 msgid "Davis"
 msgstr ""
 
@@ -596,12 +522,6 @@ msgstr ""
 msgid "DeNoronha"
 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.h:123
-msgid "Default"
-msgstr ""
-
 msgid "Denver"
 msgstr ""
 
@@ -614,12 +534,6 @@ msgstr ""
 msgid "Dili"
 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.h:126
-msgid "Disabled"
-msgstr ""
-
 msgid "Djibouti"
 msgstr ""
 
@@ -683,41 +597,6 @@ msgstr ""
 msgid "Ensenada"
 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 ""
-
-#: source/ubl-settings-datetime.cc:791 source/ubl-settings-datetime.cc:1054
-msgid "Enter a list of ntp servers"
-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.h:142
-msgid ""
-"Enter the name of the ntp-server or its ip-address.\n"
-"When entering multiple addresses, separate them with commas."
-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 ""
-
-#: source/ubl-settings-datetime.cc:821
-msgid "Error in the ntp name"
-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.h:101
-msgid "Error saved local and global configuration"
-msgstr ""
-
 msgid "Eucla"
 msgstr ""
 
@@ -760,26 +639,6 @@ msgstr ""
 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"
-"Usage:  ubl-settings-datetime [OPTIONS...]\n"
-"Options:\n"
-"  -h, --help\t Show this help\n"
-"  -V, --version\t         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"
-msgstr ""
-
 msgid "Gaborone"
 msgstr ""
 
@@ -801,33 +660,6 @@ msgstr ""
 msgid "Glace_Bay"
 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.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.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.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.h:100
-msgid "Global configuration write error"
-msgstr ""
-
-msgid "Global customization"
-msgstr ""
-
 msgid "Godthab"
 msgstr ""
 
@@ -873,18 +705,6 @@ msgstr ""
 msgid "Harbin"
 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 ""
-
 msgid "Havana"
 msgstr ""
 
@@ -894,11 +714,6 @@ msgstr ""
 msgid "Hebron"
 msgstr ""
 
-#: source/ubl-settings-datetime.h:72 source/ubl-settings-datetime.h:71
-#: source/ubl-settings-datetime.h:81
-msgid "Help"
-msgstr ""
-
 msgid "Helsinki"
 msgstr ""
 
@@ -920,14 +735,6 @@ msgstr ""
 msgid "Hovd"
 msgstr ""
 
-#: source/ubl-settings-datetime.h:99 source/ubl-settings-datetime.h:98
-#: 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 ""
-
 msgid "Indian"
 msgstr ""
 
@@ -940,9 +747,6 @@ msgstr ""
 msgid "Indianapolis"
 msgstr ""
 
-msgid "Interactive date picker"
-msgstr ""
-
 msgid "Inuvik"
 msgstr ""
 
@@ -1099,52 +903,6 @@ msgstr ""
 msgid "Ljubljana"
 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.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.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.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.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.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.h:130
-msgid "Local time"
-msgstr ""
-
 msgid "Lome"
 msgstr ""
 
@@ -1226,12 +984,6 @@ msgstr ""
 msgid "Manila"
 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.h:125
-msgid "Manual"
-msgstr ""
-
 msgid "Maputo"
 msgstr ""
 
@@ -1349,16 +1101,6 @@ msgstr ""
 msgid "NSW"
 msgstr ""
 
-#: source/ubl-settings-datetime.cc:818
-msgid "NTP is correct"
-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 ""
-
 msgid "Nairobi"
 msgstr ""
 
@@ -1407,15 +1149,6 @@ msgstr ""
 msgid "North_Dokota"
 msgstr ""
 
-#: source/ubl-settings-datetime.h:83 source/ubl-settings-datetime.h:82
-#: source/ubl-settings-datetime.cc:473 source/ubl-settings-datetime.cc:502
-#: 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.h:92
-msgid "Nothing to save!"
-msgstr ""
-
 msgid "Nouakchott"
 msgstr ""
 
@@ -1521,12 +1254,6 @@ msgstr ""
 msgid "Prague"
 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.h:78
-msgid "Project Home Page"
-msgstr ""
-
 msgid "Puerto_Rico"
 msgstr ""
 
@@ -1560,23 +1287,12 @@ msgstr ""
 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.h:89
-msgid "Read online"
-msgstr ""
-
 msgid "Recife"
 msgstr ""
 
 msgid "Regina"
 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.h:134
-msgid "Region:"
-msgstr ""
-
 msgid "Resolute"
 msgstr ""
 
@@ -1664,45 +1380,12 @@ msgstr ""
 msgid "Saskatchewan"
 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.h:82
-msgid "Save"
-msgstr ""
-
-#: source/ubl-settings-datetime.h:77 source/ubl-settings-datetime.h:76
-msgid "Save to global configuration"
-msgstr ""
-
-#: source/ubl-settings-datetime.h:76 source/ubl-settings-datetime.h:75
-msgid "Save to local configuration"
-msgstr ""
-
-#: source/ubl-settings-datetime.h:75 source/ubl-settings-datetime.h:74
-msgid "Save configuration"
-msgstr ""
-
 msgid "Scoresbysund"
 msgstr ""
 
-msgid "Select the method of hardware time synchronization"
-msgstr ""
-
 msgid "Seoul"
 msgstr ""
 
-msgid "Setting date and time in global configuration"
-msgstr ""
-
-#: source/ubl-settings-datetime.h:129 source/ubl-settings-datetime.h:128
-#: source/ubl-settings-datetime.cc:148 source/ubl-settings-datetime.cc:144
-#: source/ubl-settings-datetime.cc:139
-msgid "Setting the date and time"
-msgstr ""
-
-msgid "Settings the date and time"
-msgstr ""
-
 msgid "Shanghai"
 msgstr ""
 
@@ -1763,44 +1446,12 @@ msgstr ""
 msgid "Stockholm"
 msgstr ""
 
-msgid "Stop the synchronization service"
-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.h:106
-msgid "Successfully saved local and global configuration"
-msgstr ""
-
 msgid "Swift_Current"
 msgstr ""
 
 msgid "Sydney"
 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.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.h:137
-msgid "Synchronize hardware time"
-msgstr ""
-
-#: source/ubl-settings-datetime.cc:159 source/ubl-settings-datetime.cc:154
-#: source/ubl-settings-datetime.cc:149
-msgid "Synchronize hardware time:"
-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.h:141
-msgid "Synchronize via NTP"
-msgstr ""
-
 msgid "Syowa"
 msgstr ""
 
@@ -1837,17 +1488,6 @@ msgstr ""
 msgid "Tell_City"
 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.h:118
-msgid "The program must be run as root"
-msgstr ""
-
-msgid ""
-"The program must be run with \n"
-"superuser privileges!"
-msgstr ""
-
 msgid "Thimbu"
 msgstr ""
 
@@ -1866,18 +1506,6 @@ msgstr ""
 msgid "Timbuktu"
 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.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.h:127
-msgid "Time:"
-msgstr ""
-
 msgid "Tirane"
 msgstr ""
 
@@ -1917,12 +1545,6 @@ msgstr ""
 msgid "US"
 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.h:129
-msgid "UTC time"
-msgstr ""
-
 msgid "Ujung_Pandang"
 msgstr ""
 
@@ -2013,11 +1635,6 @@ msgstr ""
 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.h:93
-msgid "Would you like to read documentation in the Web?"
-msgstr ""
-
 msgid "Yakutat"
 msgstr ""
 
@@ -2042,17 +1659,6 @@ msgstr ""
 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.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 ""
-
 msgid "Yukon"
 msgstr ""
 
@@ -2062,54 +1668,8 @@ msgstr ""
 msgid "Zaporozhye"
 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.h:133
-msgid "Zone:"
-msgstr ""
-
 msgid "Zulu"
 msgstr ""
 
 msgid "Zurich"
-msgstr ""
+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.h:77
-msgid "https://wiki.ublinux.com"
-msgstr ""
-
-#: source/ubl-settings-datetime.cc:387
-msgid ""
-"https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/"
-msgstr ""
-
-#: source/ubl-settings-datetime.cc:174
-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 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.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 ""

ubl-settings-datetime_ru.po

@@ -17,52 +17,92 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-msgid ":"
+#: source/ubl-strings.h:2
-msgstr ":"
+msgid "Date and time"
-
+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 ": \"Дата\""
-
-#: source/ubl-settings-datetime.h:112 source/ubl-settings-datetime.h:111
-#: source/ubl-settings-datetime.cc:59 source/ubl-settings-datetime.cc:61
-#: source/ubl-settings-datetime.cc:64 source/ubl-settings-datetime.cc:65
-#: 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:60 source/ubl-settings-datetime.cc:63
-#: source/ubl-settings-datetime.cc:66 source/ubl-settings-datetime.cc:67
-#: 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.h:121
-msgid ": \"Hardware time\""
-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.h:120
-msgid ": \"Time Zone\""
-msgstr ": \"Временная зона\""
 
-msgid "Abidjan"
+#: source/ubl-strings.h:3
-msgstr "Абиджан"
+msgid "Date and time configuration"
+msgstr "Настройка даты и времени системы"
+
+#: source/ubl-strings.h:5
+msgid "Syncronisation error"
+msgstr "Ошибка синхронизации аппаратных часов"
+
+#: source/ubl-strings.h:7
+msgid "Accept"
+msgstr "Принять"
+
+#: source/ubl-strings.h:8
+msgid "Cancel"
+msgstr "Отменить"
+
+#: source/ubl-strings.h:9
+msgid "Current date and time"
+msgstr "Текущие дата и время"
+
+#: source/ubl-strings.h:10
+msgid "Time:"
+msgstr "Время:"
+
+#: source/ubl-strings.h:11
+msgid "Date:"
+msgstr "Дата:"
+
+#: source/ubl-strings.h:12
+msgid "Synchronize"
+msgstr "Синхронизировать"
 
-#: source/ubl-settings-datetime.h:70 source/ubl-settings-datetime.h:69
+#: source/ubl-strings.h:13
-#: source/ubl-settings-datetime.h:79
+msgid "Synchronize hardware time"
-msgid "About"
+msgstr "Синхронизировать аппаратное время"
-msgstr "О программе"
+
+#: source/ubl-strings.h:13
+msgid "Synchronize hardware time:"
+msgstr "Синхронизировать аппаратное время:"
+
+#: source/ubl-strings.h:14
+msgid "Synchronize via NTP"
+msgstr "Синхронизировать через NTP"
+
+#: source/ubl-strings.h:15
+msgid "Default"
+msgstr "По умолчанию"
 
-#: source/ubl-settings-datetime.h:71 source/ubl-settings-datetime.h:70
+#: source/ubl-strings.h:16
-#: source/ubl-settings-datetime.cc:137 source/ubl-settings-datetime.h:80
+msgid "Stopped"
-msgid "About ubl-settings-datetime"
+msgstr "Остановлен"
-msgstr "О программе Дата и время"
+
+#: source/ubl-strings.h:17
+msgid "Manual"
+msgstr "Вручную"
+
+#: source/ubl-strings.h:18
+msgid ""
+"Enter the name of the ntp server or its ip address. When entering multiple "
+"addresses, separate them with spaces."
+msgstr ""
+"Введите имя ntp-сервера или его ip-адрес.\n"
+"При вводе нескольких адресов, разделяйте их запятыми."
+
+#: source/ubl-strings.h:19
+msgid "Time Zone"
+msgstr "Часовой пояс"
+
+#: source/ubl-strings.h:20
+msgid "Region:"
+msgstr "Регион:"
+
+#: source/ubl-strings.h:21
+msgid "Zone:"
+msgstr "Зона:"
+
+#: source/ubl-strings.h:22
+msgid "Local time"
+msgstr "Локальное время"
+
+msgid "Abidjan"
+msgstr "Абиджан"
 
 msgid "Accra"
 msgstr "Аккра"
@@ -70,13 +110,6 @@ msgstr "Аккра"
 msgid "Acre"
 msgstr "Акр"
 
-msgid ""
-"Active service detected\n"
-"Automatic time and date synchronization service detected"
-msgstr ""
-"Обнаружен активный сервис\n"
-"автоматической синхронизации времени и даты"
-
 msgid "Adak"
 msgstr "Адак"
 
@@ -104,11 +137,6 @@ msgstr "Алжир"
 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.h:91
-msgid "Always redirect"
-msgstr "Всегда перенаправлять"
-
 msgid "America"
 msgstr "Америка"
 
@@ -118,12 +146,6 @@ msgstr "Амман"
 msgid "Amsterdam"
 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.h:112
-msgid "An invalid character is entered"
-msgstr "Введён недопустимый символ"
-
 msgid "Anadyr"
 msgstr "Анадырь"
 
@@ -160,11 +182,6 @@ msgstr "Арагуайна"
 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"
-
 msgid "Arizona"
 msgstr "Аризона"
 
@@ -204,12 +221,6 @@ msgstr "Атка"
 msgid "Atlantic"
 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.h:131
-msgid "Attention"
-msgstr "Внимание"
-
 msgid "Atyrau"
 msgstr "Атырау"
 
@@ -219,9 +230,6 @@ msgstr "Окленд"
 msgid "Australia"
 msgstr "Австралия"
 
-msgid "Automatic time synchronization"
-msgstr "Автоматическая синхронизация времени"
-
 msgid "Azores"
 msgstr "Азорские острова"
 
@@ -369,11 +377,6 @@ msgstr "Канари"
 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.h:90
-msgid "Cancel"
-msgstr "Отменить"
-
 msgid "Cancun"
 msgstr "Канкун"
 
@@ -413,12 +416,6 @@ msgstr "Сеута"
 msgid "Chagos"
 msgstr "Чагос"
 
-msgid "Change the NTPSERVERS parameter"
-msgstr "Изменить параметр NTPSERVERS"
-
-msgid "Change zone setting"
-msgstr "Изменить параметр зоны"
-
 msgid "Chatham"
 msgstr "Чатем"
 
@@ -482,12 +479,6 @@ msgstr "Континентальный"
 msgid "Copenhagen"
 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.h:75
-msgid "Copyright © UBSoft LLC, 2022 - "
-msgstr "Авторские права © ООО \"Юбисофт\", 2022 - "
-
 msgid "Coral_Harbour"
 msgstr "Корал Харбор"
 
@@ -506,15 +497,6 @@ msgstr "Куяба"
 msgid "Curacao"
 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.h:139
-msgid "Current date and time"
-msgstr "Текущие дата и время"
-
-msgid "Currie"
-msgstr "Карри"
-
 msgid "Dacca"
 msgstr "Дакка"
 
@@ -533,36 +515,6 @@ msgstr "Дар-эс-Салам"
 msgid "Darwin"
 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.h:128
-msgid "Date and Time"
-msgstr "Дата и Время"
-
-#: source/ubl-settings-datetime.h:100 source/ubl-settings-datetime.h:99
-#: 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.h:140
-msgid ""
-"Date of\n"
-"Format: DD.MM.YYYY"
-msgstr ""
-"Дата\n"
-"Формат: ДД.ММ.ГГГГ"
-
-#: 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.h:136
-msgid "Date:"
-msgstr "Дата:"
-
 msgid "Davis"
 msgstr "Дэвис"
 
@@ -575,12 +527,6 @@ msgstr "Доусон Крик"
 msgid "DeNoronha"
 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.h:123
-msgid "Default"
-msgstr "По умолчанию"
-
 msgid "Denver"
 msgstr "Денвер"
 
@@ -593,12 +539,6 @@ msgstr "Дакка"
 msgid "Dili"
 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.h:126
-msgid "Disabled"
-msgstr "Отключено"
-
 msgid "Djibouti"
 msgstr "Джибути"
 
@@ -662,45 +602,6 @@ msgstr "Эндербери"
 msgid "Ensenada"
 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 серверов"
-
-#: source/ubl-settings-datetime.cc:791 source/ubl-settings-datetime.cc:1054
-#, fuzzy
-msgid "Enter a list of ntp servers"
-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.h:142
-msgid ""
-"Enter the name of the ntp-server or its ip-address.\n"
-"When entering multiple addresses, separate them with commas."
-msgstr ""
-"Введите имя ntp-сервера или его ip-адрес.\n"
-"При вводе нескольких адресов, разделяйте их запятыми."
-
-#: 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 сервера"
-
-#: source/ubl-settings-datetime.cc:821
-#, fuzzy
-msgid "Error in the ntp name"
-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.h:101
-msgid "Error saved local and global configuration"
-msgstr "Ошибка сохранения локальной и глобальной конфигурации"
-
 msgid "Eucla"
 msgstr "Евкла"
 
@@ -743,43 +644,6 @@ msgstr "ГМТ-1"
 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"
-"Usage:  ubl-settings-datetime [OPTIONS...]\n"
-"Options:\n"
-"  -h, --help\t Show this help\n"
-"  -V, --version\t         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"
-msgstr ""
-"GTK-утилита настройки даты и времени для UBLinux\n"
-"\n"
-"Использование:  ubl-settings-datetime [Параметры приложения...]\n"
-"Параметры приложения:\n"
-"  -h, --help\t        Показать параметры справки\n"
-"  -V, --version\t        Показать версию пакета\n"
-"    --lock-datetime     Блокировка изменения даты и времени\n"
-"    --lock-timezone     Блокировка изменения часового пояса\n"
-"    --lock-ntp-mode     Блокировка выбора режима NTP\n"
-"    --lock-ntp-edit     Блокировка перечня NTP серверов\n"
-"    --lock-sync-hwclock Блокировка выбора режима синхронизации аппаратного "
-"времени\n"
-"    --lock-save         Блокировка сохранения локальной и глобальной "
-"конфигурации\n"
-"    --lock-save-local   Блокировка сохранения локальной конфигурации\n"
-"    --lock-save-global  Блокировка сохранения глобальной конфигурации\n"
-"    --lock-load-global  Блокировка загрузки глобальной конфигурации\n"
-
 msgid "Gaborone"
 msgstr "Габороне"
 
@@ -801,33 +665,6 @@ msgstr "Гибралтар"
 msgid "Glace_Bay"
 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.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.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.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.h:100
-msgid "Global configuration write error"
-msgstr "Ошибка записи глобальной конфигурации"
-
-msgid "Global customization"
-msgstr "Глобальная настройка"
-
 msgid "Godthab"
 msgstr "Годтаб"
 
@@ -873,18 +710,6 @@ msgstr "Хараре"
 msgid "Harbin"
 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 "Ошибка синхронизации аппаратных часов"
-
 msgid "Havana"
 msgstr "Гавана"
 
@@ -894,11 +719,6 @@ msgstr "Гавайи"
 msgid "Hebron"
 msgstr "Хеврон"
 
-#: source/ubl-settings-datetime.h:72 source/ubl-settings-datetime.h:71
-#: source/ubl-settings-datetime.h:81
-msgid "Help"
-msgstr "Справка"
-
 msgid "Helsinki"
 msgstr "Хельсинки"
 
@@ -920,14 +740,6 @@ msgstr "Гонолулу"
 msgid "Hovd"
 msgstr "Ховд"
 
-#: source/ubl-settings-datetime.h:99 source/ubl-settings-datetime.h:98
-#: 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 "Не верный формат даты"
-
 msgid "Indian"
 msgstr "Индиана"
 
@@ -940,9 +752,6 @@ msgstr "Индиана-Старке"
 msgid "Indianapolis"
 msgstr "Индианаполис"
 
-msgid "Interactive date picker"
-msgstr "Интерактивный выбор даты"
-
 msgid "Inuvik"
 msgstr "Инувик"
 
@@ -1099,52 +908,6 @@ msgstr "Лиссабон"
 msgid "Ljubljana"
 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.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.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.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.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.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.h:130
-msgid "Local time"
-msgstr "Локальное время"
-
 msgid "Lome"
 msgstr "Ломе"
 
@@ -1226,12 +989,6 @@ msgstr "Манаус"
 msgid "Manila"
 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.h:125
-msgid "Manual"
-msgstr "Вручную"
-
 msgid "Maputo"
 msgstr "Мапуту"
 
@@ -1349,17 +1106,6 @@ msgstr "Мускат"
 msgid "NSW"
 msgstr "Новый Южный Уэльс"
 
-#: source/ubl-settings-datetime.cc:818
-#, fuzzy
-msgid "NTP is correct"
-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 сервера корректно"
-
 msgid "Nairobi"
 msgstr "Найроби"
 
@@ -1408,15 +1154,6 @@ msgstr "Север"
 msgid "North_Dokota"
 msgstr "Северная Докота"
 
-#: source/ubl-settings-datetime.h:83 source/ubl-settings-datetime.h:82
-#: source/ubl-settings-datetime.cc:473 source/ubl-settings-datetime.cc:502
-#: 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.h:92
-msgid "Nothing to save!"
-msgstr "Нечего сохранять!"
-
 msgid "Nouakchott"
 msgstr "Нуакшот"
 
@@ -1522,12 +1259,6 @@ msgstr "Порту-Велью"
 msgid "Prague"
 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.h:78
-msgid "Project Home Page"
-msgstr "Домашняя страница проекта"
-
 msgid "Puerto_Rico"
 msgstr "Пуэрто-Рико"
 
@@ -1561,23 +1292,12 @@ msgstr "Ранкин-Инлет"
 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.h:89
-msgid "Read online"
-msgstr "Прочитать онлайн"
-
 msgid "Recife"
 msgstr "Ресифи"
 
 msgid "Regina"
 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.h:134
-msgid "Region:"
-msgstr "Регион:"
-
 msgid "Resolute"
 msgstr "Резольют"
 
@@ -1665,45 +1385,12 @@ msgstr "Саратов"
 msgid "Saskatchewan"
 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.h:82
-msgid "Save"
-msgstr "Сохранить"
-
-#: source/ubl-settings-datetime.h:77 source/ubl-settings-datetime.h:76
-msgid "Save to global configuration"
-msgstr "Сохранить в глобальную конфигурацию"
-
-#: source/ubl-settings-datetime.h:76 source/ubl-settings-datetime.h:75
-msgid "Save to local configuration"
-msgstr "Сохранить в локальную конфигурацию"
-
-#: source/ubl-settings-datetime.h:75 source/ubl-settings-datetime.h:74
-msgid "Save configuration"
-msgstr "Сохранить конфигурацию"
-
 msgid "Scoresbysund"
 msgstr "Скорсбисунд"
 
-msgid "Select the method of hardware time synchronization"
-msgstr "Выберите способ синхронизации аппаратного времени"
-
 msgid "Seoul"
 msgstr "Сеул"
 
-msgid "Setting date and time in global configuration"
-msgstr "Настройка даты и времени в глобальной конфигурации"
-
-#: source/ubl-settings-datetime.h:129 source/ubl-settings-datetime.h:128
-#: source/ubl-settings-datetime.cc:148 source/ubl-settings-datetime.cc:144
-#: source/ubl-settings-datetime.cc:139
-msgid "Setting the date and time"
-msgstr "Настройка даты и времени"
-
-msgid "Settings the date and time"
-msgstr "Настройки даты и времени"
-
 msgid "Shanghai"
 msgstr "Шанхай"
 
@@ -1764,44 +1451,12 @@ msgstr "Стэнли"
 msgid "Stockholm"
 msgstr "Стокгольм"
 
-msgid "Stop the synchronization service"
-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.h:106
-msgid "Successfully saved local and global configuration"
-msgstr "Успешно сохранена локальная и глобальная конфигурация"
-
 msgid "Swift_Current"
 msgstr "Суифт-Каррент"
 
 msgid "Sydney"
 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.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.h:137
-msgid "Synchronize hardware time"
-msgstr "Синхронизировать аппаратное время"
-
-#: source/ubl-settings-datetime.cc:159 source/ubl-settings-datetime.cc:154
-#: source/ubl-settings-datetime.cc:149
-msgid "Synchronize hardware time:"
-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.h:141
-msgid "Synchronize via NTP"
-msgstr "Синхронизировать через NTP"
-
 msgid "Syowa"
 msgstr "Сёва"
 
@@ -1838,19 +1493,6 @@ msgstr "Тель-Авив"
 msgid "Tell_City"
 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.h:118
-msgid "The program must be run as root"
-msgstr "Программа должна быть запущена с правами суперпользователя!"
-
-msgid ""
-"The program must be run with \n"
-"superuser privileges!"
-msgstr ""
-"Программа должна быть запущена с правами \n"
-"суперпользователя!"
-
 msgid "Thimbu"
 msgstr "Тимбу"
 
@@ -1869,18 +1511,6 @@ msgstr "Тихуана"
 msgid "Timbuktu"
 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.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.h:127
-msgid "Time:"
-msgstr "Время:"
-
 msgid "Tirane"
 msgstr "Тиран"
 
@@ -1920,12 +1550,6 @@ msgstr "Тунис"
 msgid "US"
 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.h:129
-msgid "UTC time"
-msgstr "Время по UTC"
-
 msgid "Ujung_Pandang"
 msgstr "Уджунг_Панданг"
 
@@ -2016,11 +1640,6 @@ msgstr "Виндхук"
 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.h:93
-msgid "Would you like to read documentation in the Web?"
-msgstr "Вы хотите прочитать справку в Сети?"
-
 msgid "Yakutat"
 msgstr "Якутат"
 
@@ -2045,19 +1664,6 @@ msgstr "Йеллоунайф"
 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.h:94
-msgid ""
-"You will be redirected to documentation website where documentation is\n"
-"translated and supported by community."
-msgstr ""
-"Вы будете перенаправлены на сайт с документацией где страницы помощи\n"
-"переводятся и поддерживаются сообществом."
-
-#: source/ubl-settings-datetime.h:138
-msgid "Setting the system date and time"
-msgstr "Настройка даты и времени системы"
-
 msgid "Yukon"
 msgstr "Юкон"
 
@@ -2067,51 +1673,8 @@ msgstr "Загреб"
 msgid "Zaporozhye"
 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.h:133
-msgid "Zone:"
-msgstr "Зона:"
-
 msgid "Zulu"
 msgstr "Зулу"
 
 msgid "Zurich"
 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.h:77
-msgid "https://wiki.ublinux.com"
-msgstr "https://wiki.ublinux.ru"
-
-#: source/ubl-settings-datetime.cc:387
-msgid ""
-"https://wiki.ublinux.com/ru/Программное_обеспечение/Программы_и_утилиты/Все/"
-msgstr ""
-"https://wiki.ublinux.ru/ru/Программное_обеспечение/Программы_и_утилиты/Все/"
-
-#: 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.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.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 "Сохранить в глобальную конфигурацию"