Merge pull request 'devel' (#35) from devel into master

Reviewed-on: YanTheKaller/ubl-settings-manager#35
3 years ago · a04223d202
parent 84955c4898 5630a07e73
commit a04223d202
11 changed files with 166 additions and 243 deletions
--- a/158
+++ b/158
@ -6,47 +6,49 @@ MAKEFILE_DIR := $(notdir $(patsubst %/,%,$(dir $(MAKEFILE_FILEPATH))))
 MAKEFILE_PATH := $(dir $(MAKEFILE_FILEPATH))

 CMAKE_COMMAND = cmake
-#CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source
-#CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile
-CMAKE_SOURCE_DIR = ./source
-CMAKE_BUILD_DIR = ./compile
-DEPENDS = cmake
+CMAKE_SOURCE_DIR = $(MAKEFILE_PATH)source
+CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile
+#CMAKE_SOURCE_DIR = ./source
+#CMAKE_BUILD_DIR = ./compile
+FILE_VERSION = VERSION.md
+DEPENDS = /bin/cmake
+PREFIX ?= /usr
 PKGNAME = $(MAKEFILE_DIR)
 #PKGNAME = ubl-settings-manager

 default_target: all

+.PHONY: all init depend debug prepare check build uninstall install clean up_ver help
+
 all: init build

 init:
 	@echo "Initialize ..."; \
-  	version="$$(cat VERSION.md)"; \
-	version=$${version:8}; \
-	search="s/string version_application.*"; \
-	replace="string version_application = \"$${version}\";"; \
-	sed -i -e "$$search/$$replace/gi" source/ubl-settings-manager.h; \
-  	echo "-- Build path: ${CMAKE_BUILD_DIR}"
-        
+	sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' ${FILE_VERSION} | cut -d" " -f2)\";/" -i source/ubl-settings-manager.h; \
+	echo "-- Build path: ${CMAKE_BUILD_DIR}"
+
 depend:
-	@echo "Check depends ..."; \
-	if [ ! -f /bin/cmake ]; then \
-	    echo "-- Depend 'cmake' not found !"; \
-	    exit 1; \
-	fi; \
+	@echo "Check depends ..."
+	@for FILE_DEPEND in $(DEPENDS); do \
+	    if [ ! -f $${FILE_DEPEND} ]; then \
+		echo "ERROR: Depend '$${FILE_DEPEND}' not found !"; \
+		exit 1; \
+	    fi; \
+	done; \
 	echo "Check depends: OK"
 #	$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1

 debug:
 	@echo "Debug ..."
 	if [ ! -d ${CMAKE_BUILD_DIR} ]; then \
-	    cmake -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="/usr"; \
+	    $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="${PREFIX}"; \
 	fi; \
 	echo "Debug: OK"

 prepare:
 	@echo "Prepare ..."; \
 	if [ ! -d ${CMAKE_BUILD_DIR} ]; then \
-	    cmake -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr"; \
+	    $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}"; \
 	fi; \
 	echo "Prepare: OK"

@ -66,65 +68,64 @@ build: depend prepare

 uninstall:
 	@echo "Uninstall ..."
+	@for FILE_PO in $(wildcard *.po); do \
+	    LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \
+	    FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \
+	    PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
+	    $(RM) "$${PATH_FILE_MO}"; \
+	done
 	@for SIZE in 16x16 32x32 48x48 scalable; do \
-	    $(RM) "/usr/share/icons/hicolor/$${SIZE}/apps/${PKGNAME}.svg"; \
-	    $(RM) "/usr/share/"${pkgname}"/images/${PKGNAME}.png"; \
+	    $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
+	    $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/com.ublinux.${PKGNAME}.png"; \
 	done
 	@for FILE_SVG in $(wildcard *.svg); do \
 	    for SIZE in 16x16 32x32 48x48 scalable; do \
-	        $(RM) "/usr/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \
+	        $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \
 	    done; \
 	done
-	@for FILE_PO in $(wildcard *.po); do \
-	    LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \
-	    FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \
-	    PATH_FILE_MO="/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
-	    $(RM) "/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
-	done
-	@$(RM) "/usr/bin/${PKGNAME}"
-	@$(RM) "/usr/share/applications/${PKGNAME}.desktop"
-	@$(RM) "/usr/share/icons/hicolor/scalable/apps/ru.ublinux.${PKGNAME}.svg"
-	@$(RM) "/usr/share/${PKGNAME}/ui/ublinux-logo.svg"
-	@$(RM) "/usr/share/${PKGNAME}/ui/${PKGNAME}.glade"
-	@$(RM) "/usr/share/${PKGNAME}/css/${PKGNAME}.css"
-	@$(RM) "/usr/share/${PKGNAME}/ui/${PKGNAME}-banner.png"
-	@$(RM) -d "/usr/share/${PKGNAME}/css"
-	@$(RM) -d "/usr/share/${PKGNAME}/ui"
-	@$(RM) -d "/usr/share/${PKGNAME}"
-	@$(RM) "/etc/xdg/${PKGNAME}/${PKGNAME}.conf"
-	@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null
-	@update-desktop-database --quiet 2>/dev/null
-	@touch /usr/share/applications
+	@$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}"
+	@$(RM) "${DESTDIR}${PREFIX}/etc/xdg/${PKGNAME}/${PKGNAME}.conf"
+	@$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop"
+	@$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg"
+	@$(RM) -rd "${DESTDIR}${PREFIX}/share/${PKGNAME}"
+	@if [ -z ${DESTDIR} ]; then \
+	    [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/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; \
+	fi
 	@echo "Uninstall: OK"

 install: check uninstall
 	@echo "Install ..."
 	@for FILE_PO in $(wildcard *.po); do \
 		LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \
-		install -dm755 /usr/share/locale/$${LANG}/LC_MESSAGES; \
+		install -dm755 "${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES"; \
 		FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \
-		PATH_FILE_MO="/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
-		echo  $${FILE_PO}; \
+		PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \
+		echo "$${FILE_PO}"; \
 		msgfmt "$${FILE_PO}" -v -f -o "$${PATH_FILE_MO}"; \
 	done
 	@for SIZE in 16 32 48; do \
-		install -dm755 /usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps; \
-		rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data ru.ublinux.${PKGNAME}.svg -o "/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/ru.ublinux.${PKGNAME}.svg"; \
+		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 -dm755 /usr/share/icons/hicolor/scalable/apps
-	@install -Dm644 -t /usr/share/icons/hicolor/scalable/apps/ ru.ublinux.${PKGNAME}.svg
-	@install -Dm755 -t /usr/bin/ ${CMAKE_BUILD_DIR}/${PKGNAME} 
-	@install -Dm644 -t /usr/share/applications/ ${PKGNAME}.desktop
-	@install -Dm755 /usr/share/${PKGNAME}/ -d ui
-	@install -Dm755 /usr/share/${PKGNAME}/ -d css
-	@install -Dm644 -t /usr/share/${PKGNAME}/ui/ ${PKGNAME}.glade
-	@install -Dm644 -t /usr/share/${PKGNAME}/css/ ${PKGNAME}.css
-	@install -Dm644 -t /usr/share/${PKGNAME}/ui/ ublinux-logo.svg
-	@install -Dm766 -t /etc/xdg/${PKGNAME}/ ${PKGNAME}.conf
-	@install -Dm644 -t /usr/share/${PKGNAME}/ui/ ${PKGNAME}-banner.png 
-	@gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null
-	@update-desktop-database --quiet 2>/dev/null 
-	@touch /usr/share/applications
+	@install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps"
+	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
+	@install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}"
+	@install -dm755 "${DESTDIR}${PREFIX}/etc/xdg"
+	@install -Dm744 -t "${DESTDIR}${PREFIX}/etc/xdg/${PKGNAME}/" "${PKGNAME}.conf"
+	@install -dm755 "${DESTDIR}${PREFIX}/share/applications"
+	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop"
+	@install -dm755 "${DESTDIR}${PREFIX}/share/${PKGNAME}"/{ui,css,images}
+	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/ui/" "${PKGNAME}.glade"
+	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/css/" "${PKGNAME}.css"
+	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/" "ublinux-logo.svg"
+	@install -Dm644 -t "${DESTDIR}${PREFIX}/share/${PKGNAME}/images/" "${PKGNAME}-banner.png"
+	@if [ -z ${DESTDIR} ]; then \
+	    [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/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; \
+	fi
 	@echo "Install: OK"

 clean:
@ -134,21 +135,24 @@ clean:
 	    echo "Clean: error, compile directory exist ${CMAKE_BUILD_DIR}"; \
 	else \
 	    echo "Clean: OK"; \
-	fi; \
-  	version="$$(cat VERSION.md)"; \
-	version=$${version:8}; \
-	search="s/string version_application.*"; \
-	echo $$search; \
-	replace="string version_application = ;"; \
-	sed -i -e "$$search/$$replace/gi" source/ubl-settings-manager.h; \
+	fi
+
+up_ver:
+	@CURRENT=$$(grep 'VERSION' ${FILE_VERSION} | cut -d" "  -f2); \
+	MAJOR=$$(cut -d. -f1 <<< $${CURRENT}); \
+	MINOR=$$(cut -d. -f2 <<< $${CURRENT}); \
+	VER="$${MAJOR}.$$(($${MINOR}+1))"; \
+	sed "s/VERSION *[[:digit:]]*.*/VERSION $${VER}/" -i ${FILE_VERSION}; \
+	echo "Updated version to VERSION.md: $${CURRENT} to $${VER}"

 help:
-	@echo "The following are some of the valid targets for this Makefile:"
-	@echo "... all (the default if no target is provided)"
-	@echo "... init"
-	@echo "... debug"
-	@echo "... prepare"
-	@echo "... compile"
-	@echo "... install"
-	@echo "... uninstall"
-	@echo "... clean"
+	@echo "The following are some of the valid targets for this Makefile:"; \
+	echo "... all (the default if no target is provided)"; \
+	echo "... init"; \
+	echo "... debug"; \
+	echo "... prepare"; \
+	echo "... compile"; \
+	echo "... install"; \
+	echo "... uninstall"; \
+	echo "... clean"; \
+	echo "... up_ver"
--- a/README.md
+++ b/README.md
@ -1,2 +1,28 @@
 # ubl-settings-manager
+# Выполнить
+# Build
+In order to build ubl-settings-manager you will need:
+
+- CMake
+- C compiler
+- GTK+ 3 & dependencies
+
+Once you have all the necessary dependencies, you can use:
+```sh
+$ make
+```
+
+# Installation
+After a successful build, just use:
+```sh
+$ sudo make install clean
+```
+
+# Uninstallation
+After a successful build, just use:
+```sh
+$ sudo make uninstall
+```
+
+![alt text](screenshot/screenshot.png)

--- a/com.ublinux.ubl-settings-manager.svg
+++ b/com.ublinux.ubl-settings-manager.svg
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@ -9,7 +9,11 @@ link_directories(${GTK_LIBRARY_DIRS})
 add_definitions(${GTK_CFLAGS_OTHER})

 #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -std=c++2a")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -lm")
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -lm")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
+	-O2 -pipe -fno-plt -fexceptions \
+        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
+        -fstack-clash-protection -fcf-protection")

 set(SOURCE_FILES
        ubl-settings-manager.c
--- a/source/ubl-settings-manager.c
+++ b/source/ubl-settings-manager.c
@ -1680,6 +1680,7 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them
    gtk_button_set_label(GTK_BUTTON(curWidgets->CancelHelpButton),_("Cancel"));
    gtk_button_set_label(GTK_BUTTON(curWidgets->settingsCancel),_("Close"));
    gtk_button_set_label(GTK_BUTTON(curWidgets->settingsAccept),_("Save and apply"));
+    gtk_button_set_label(GTK_BUTTON(curWidgets->SectionSettingsSaveButton),_("Apply"));
    gtk_button_set_label(GTK_BUTTON(curWidgets->AlwaysOpenDocumentation),_("Always redirect"));
    gtk_menu_item_set_label(GTK_MENU_ITEM(curWidgets->MenuItemSettings),_("Settings"));
    gtk_menu_item_set_label(GTK_MENU_ITEM(curWidgets->MenuItemDocumentation),_("About..."));
--- a/source/ubl-settings-manager.h
+++ b/source/ubl-settings-manager.h
@ -11,17 +11,17 @@
 #define CssPath "/usr/share/ubl-settings-manager/css/ubl-settings-manager.css"
 #define GlobalConfigPath "/etc/xdg/ubl-settings-manager/ubl-settings-manager.conf"
 #define UserConfigPath "/.config/ubl-settings-manager/ubl-settings-manager.conf"
-#define AppIconPath "ru.ublinux.ubl-settings-manager"
-#define AppBannerPath "/usr/share/ubl-settings-manager/ui/ubl-settings-manager-banner.png"
+#define AppIconPath "com.ublinux.ubl-settings-manager"
+#define AppBannerPath "/usr/share/ubl-settings-manager/images/ubl-settings-manager-banner.png"
 #define DesktopPath "/usr/share/applications/"
 #define IconPicturesPath "/usr/share/icons/hicolor/scalable/apps/"
-#define ublinux_logo "/usr/share/ubl-settings-manager/ui/ublinux-logo.svg"
+#define ublinux_logo "/usr/share/ubl-settings-manager/images/ublinux-logo.svg"
 #define LocalePath "/usr/share/locale" 
 #define LocaleName "ubl-settings-manager"
 #define ubl_settings_infoPath "ubl-settings-info"
 #define ubl_settings_infoPathLaunch "ubl-settings-info --socket-id="
 typedef char* string;
-string version_application = ;
+string version_application = "1.2";


 typedef struct apps{
--- a/ubl-settings-manager.css
+++ b/ubl-settings-manager.css
@ -19,41 +19,48 @@ background-color: #404040;
 	font-weight: bold;
 	
 }
-.roundborder * {
+.roundborder > * {
+	border-width:0px;
+}
+.roundborder:backdrop > * {
 	border-width:0px;
 	border-radius:5px;
 }
 .noborder {
 	border: none;
 }
-.menu:hover {	
-  	border-color:alpha(@theme_text_color, 0.01);
-}
-.menu {	
-  	border-color:alpha(@theme_text_color, 0.01);
-}
-.menu:hover >* {
-	border-color:alpha(@theme_text_color, 0.01);
-}
+
 .menuitembottom{
  margin-top:0px;
  margin-bottom:3px;
+  border-color:inherit;
+  border-left-width:inherit;
+  border-right-width:inherit;
 }
 .menuitemmiddle{
  margin-top:0px;
  margin-bottom:0px;
+  border-color:inherit;
+  border-left-width:inherit;
+  border-right-width:inherit;
 }

 .menuitemtop{
  margin-bottom:0px;
+  border-color:inherit;
+  border-top-width:inherit;
+  border-left-width:inherit;
+  border-right-width:inherit;
 }
 .menuitemtop *{
  margin:2px 2px 0 2px;
  padding: 5px 10px 3px 5px;
+  border:transparent;
 }
 .menuitemmiddle *{
  margin:0 2px 0 2px;
  padding: 3px 10px 3px 5px;
+  border:transparent;
 }
 .menuitembottom *{
  margin:0 2px 2px 2px;
@ -61,12 +68,23 @@ background-color: #404040;
 }
 .menuitemtop:hover {
  background:@theme_bg_color;
+  border-color:inherit;
+  border-top-width:inherit;
+  border-left-width:inherit;
+  border-right-width:inherit;
 }
 .menuitemmiddle:hover {
  background:@theme_bg_color;
+  border-color:inherit;
+  border-left-width:inherit;
+  border-right-width:inherit;
 }
 .menuitembottom:hover {
  background:@theme_bg_color;
+  border-color:inherit;
+  border-bottom-width:0px;
+  border-left-width:inherit;
+  border-right-width:inherit;
  
 }
 .menuitemtop:hover* {
@ -91,14 +109,17 @@ background-color: #404040;
 .workingbg, #workingbg {
 	background-color:@theme_base_color;
 }
+
 .workingbg.view.cell:selected {
 	background-color:@theme_selected_bg_color;
 }
+
 .workingbg.view.cell:hover {
 	background-color:darker(@theme_selected_bg_color);
 	color:@theme_selected_text_color;
 	border-radius:3px;
 }
+
 .bkim {
 	transition: 200ms ease-out;
    	background-image: none;
--- a/ubl-settings-manager.desktop
+++ b/ubl-settings-manager.desktop
@ -8,7 +8,7 @@ Comment=ubl-settings-manager
 Comment[ru]=Приложение для управления настройками UBLinux
 Type=Application
 Exec=ubl-settings-manager
-Icon=ru.ublinux.ubl-settings-manager
+Icon=com.ublinux.ubl-settings-manager
 Terminal=false
 X-XfcePluggable=false
 Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;
--- a/ubl-settings-manager.glade
+++ b/ubl-settings-manager.glade
@ -123,9 +123,6 @@
        </style>
      </object>
    </child>
-    <style>
-      <class name="menu"/>
-    </style>
  </object>
  <object class="GtkApplicationWindow" id="HelpSureWindow">
    <property name="can-focus">False</property>
@ -338,13 +335,10 @@
        <property name="label" translatable="yes">Documentation</property>
        <property name="use-underline">True</property>
        <style>
-          <class name="menuitemmiddle"/>
+          <class name="menuitembottom"/>
        </style>
      </object>
    </child>
-    <style>
-      <class name="menu"/>
-    </style>
  </object>
  <object class="GtkMenu">
    <property name="visible">True</property>
@ -1491,9 +1485,6 @@
                <child>
                  <placeholder/>
                </child>
-                <style>
-                  <class name="noborder"/>
-                </style>
              </object>
              <packing>
                <property name="expand">False</property>
--- a/ubl-settings-manager.pot
+++ b/ubl-settings-manager.pot
@ -1,128 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-17 18:00+0600\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: source/ubl-settings-manager.c:632
-msgid "Settings manager for UBLinux"
-msgstr ""
-
-#: source/ubl-settings-manager.c:633 source/ubl-settings-manager.c:1601
-#: source/ubl-settings-manager.c:1615 source/ubl-settings-manager.c:1674
-msgid "UBLinux Settings Manager"
-msgstr ""
-
-#: source/ubl-settings-manager.c:636
-msgid "Project Home Page"
-msgstr ""
-
-#: source/ubl-settings-manager.c:1600
-msgid "Back to all settings"
-msgstr ""
-
-#: source/ubl-settings-manager.c:1675
-msgid "Icon size"
-msgstr ""
-
-#: source/ubl-settings-manager.c:1676
-msgid "Window theme"
-msgstr ""
-
-#: source/ubl-settings-manager.c:1677
-msgid "Would you like to read documentation in the Web?"
-msgstr ""
-
-#: source/ubl-settings-manager.c:1678
-msgid ""
-"You will be redirected to documentation site, where user help pages are "
-"translated and supported by community."
-msgstr ""
-
-#: source/ubl-settings-manager.c:1679
-msgid "Read online"
-msgstr ""
-
-#: source/ubl-settings-manager.c:1680
-msgid "Cancel"
-msgstr ""
-
-#: source/ubl-settings-manager.c:1681
-msgid "Close"
-msgstr ""
-
-#: source/ubl-settings-manager.c:1682
-msgid "Save and apply"
-msgstr ""
-
-#: source/ubl-settings-manager.c:1683
-msgid "Always redirect"
-msgstr ""
-
-#: source/ubl-settings-manager.c:1684
-msgid "Settings"
-msgstr ""
-
-#: source/ubl-settings-manager.c:1685
-msgid "About..."
-msgstr ""
-
-#: source/ubl-settings-manager.c:1686
-msgid "Understood"
-msgstr ""
-
-#: source/ubl-settings-manager.c:1687
-msgid "Sections management"
-msgstr ""
-
-#: source/ubl-settings-manager.c:1792
-msgid "Standard theme"
-msgstr ""
-
-#: source/ubl-settings-manager.c:1793
-msgid "GNOME theme"
-msgstr ""
-
-#: source/ubl-settings-manager.h:8
-msgid "Version: "
-msgstr ""
-
-#: source/ubl-settings-manager.h:9
-msgid "ubl-settings-manager version: "
-msgstr ""
-
-#: source/ubl-settings-manager.h:9
-msgid ""
-"\n"
-"GTK settings manager for UBLinux\n"
-"Usage:  ubl-settings-manager [OPTIONS...]\n"
-"Options:\n"
-"  -h, --help\t\t  Show this help\n"
-"  -V, --version\t  \t  Show package version\n"
-"      --lock-settings Lock menu settings\n"
-msgstr ""
-
-msgid "Personal"
-msgstr ""
-
-msgid "Hardware"
-msgstr ""
-
-msgid "System"
-msgstr ""
-
-msgid "Misc"
-msgstr ""
--- a/ubl-settings-manager_ru.po
+++ b/ubl-settings-manager_ru.po
@ -1,18 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Russian translations for ubl-settings-manager package.
+# Copyright (C) 2022, UBTech LLC
+# This file is distributed under the same license as the ubl-settings-manager package.
+# UBLinux Team <info@ublinux.com>, 2022
 #
 #, fuzzy
-msgid "translateinfo\n"
+msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-16 12:28+0600\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Project-Id-Version: ubl-settings-manager 1.0\n"
+"Report-Msgid-Bugs-To: info@ublinux.com\n"
+"POT-Creation-Date: 2023-01-01 00:00+0600\n"
+"PO-Revision-Date: 2023-01-01 00:00+0600\n"
+"Last-Translator: UBLinux Team <info@ublinux.com>\n"
+"Language-Team: Russian - UBLinux Team <info@ublinux.com>\n"
+"Language: Russian\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@ -68,6 +68,10 @@ msgstr "Закрыть"
 msgid "Save and apply"
 msgstr "Сохранить и применить"

+#: source/ubl-settings-manager.c:1683
+msgid "Apply"
+msgstr "Применить"
+
 #: source/ubl-settings-manager.c:1666
 msgid "Always redirect"
 msgstr "Всегда перенаправлять"