diff --git a/Makefile b/Makefile
index 240f2a5..e166a62 100644
--- a/Makefile
+++ b/Makefile
@@ -75,8 +75,8 @@ uninstall:
$(RM) "$${PATH_FILE_MO}"; \
done
@for SIZE in 16x16 32x32 48x48 scalable; do \
- $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/ru.ublinux.${PKGNAME}.svg"; \
- $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/apps/ru.ublinux.${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 \
@@ -86,7 +86,7 @@ uninstall:
@$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}"
@$(RM) "${DESTDIR}/etc/xdg/${PKGNAME}/${PKGNAME}.conf"
@$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop"
- @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/ru.ublinux.${PKGNAME}.svg"
+ @$(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; \
@@ -107,10 +107,10 @@ install: check uninstall
done
@for SIZE in 16 32 48; do \
install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \
- rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "ru.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/ru.ublinux.${PKGNAME}.svg"; \
+ 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 "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps"
- @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "ru.ublinux.${PKGNAME}.svg"
+ @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}/etc/xdg"
@install -Dm744 -t "${DESTDIR}/etc/xdg/${PKGNAME}/" "${PKGNAME}.conf"
diff --git a/ru.ublinux.ubl-settings-manager.svg b/com.ublinux.ubl-settings-manager.svg
similarity index 100%
rename from ru.ublinux.ubl-settings-manager.svg
rename to com.ublinux.ubl-settings-manager.svg
diff --git a/source/ubl-settings-manager.h b/source/ubl-settings-manager.h
index 193626d..cb946fe 100644
--- a/source/ubl-settings-manager.h
+++ b/source/ubl-settings-manager.h
@@ -11,7 +11,7 @@
#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 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/"
diff --git a/ubl-settings-manager.desktop b/ubl-settings-manager.desktop
index afec07e..c16cec7 100644
--- 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;
diff --git a/ubl-settings-manager.glade b/ubl-settings-manager.glade
index d378256..19fc833 100644
--- a/ubl-settings-manager.glade
+++ b/ubl-settings-manager.glade
@@ -5,6 +5,10 @@
@@ -1299,7 +1307,7 @@
True
False
32
- ru.ublinux.ubl-settings-manager
+ com.ublinux.ubl-settings-manager
5
@@ -1573,7 +1581,7 @@
True
False
32
- ru.ublinux.ubl-settings-manager
+ com.ublinux.ubl-settings-manager
5
@@ -2001,7 +2009,7 @@
True
False
32
- ru.ublinux.ubl-settings-manager
+ com.ublinux.ubl-settings-manager
5
@@ -2076,7 +2084,7 @@
False
True
center
- ubl-settings-manager
+ com.ublinux.ubl-settings-manager
dialog
True
UBLinux Settings Manager
diff --git a/ubl-settings-manager.pot b/ubl-settings-manager.pot
index 4c5ebc1..8678dcd 100644
--- a/ubl-settings-manager.pot
+++ b/ubl-settings-manager.pot
@@ -1,70 +1,70 @@
-# 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 , YEAR.
+# Language 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 , 2022
#
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-22 11:23+0600\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: 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 \n"
+"Language-Team: UBLinux Team \n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: source/ubl-settings-manager.c:667
+#: source/ubl-settings-manager.c:632
msgid "Settings manager for UBLinux"
msgstr ""
-#: source/ubl-settings-manager.c:668 source/ubl-settings-manager.c:1655
-#: source/ubl-settings-manager.c:1669 source/ubl-settings-manager.c:1733
+#: 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:671
+#: source/ubl-settings-manager.c:636
msgid "Project Home Page"
msgstr ""
-#: source/ubl-settings-manager.c:1654
+#: source/ubl-settings-manager.c:1600
msgid "Back to all settings"
msgstr ""
-#: source/ubl-settings-manager.c:1734
+#: source/ubl-settings-manager.c:1675
msgid "Icon size"
msgstr ""
-#: source/ubl-settings-manager.c:1735
+#: source/ubl-settings-manager.c:1676
msgid "Window theme"
msgstr ""
-#: source/ubl-settings-manager.c:1736
+#: source/ubl-settings-manager.c:1677
msgid "Would you like to read documentation in the Web?"
msgstr ""
-#: source/ubl-settings-manager.c:1737
+#: 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:1738
+#: source/ubl-settings-manager.c:1679
msgid "Read online"
msgstr ""
-#: source/ubl-settings-manager.c:1739
+#: source/ubl-settings-manager.c:1680
msgid "Cancel"
msgstr ""
-#: source/ubl-settings-manager.c:1740
+#: source/ubl-settings-manager.c:1681
msgid "Close"
msgstr ""
-#: source/ubl-settings-manager.c:1741
+#: source/ubl-settings-manager.c:1682
msgid "Save and apply"
msgstr ""
@@ -72,23 +72,23 @@ msgstr ""
msgid "Apply"
msgstr ""
-#: source/ubl-settings-manager.c:1743
+#: source/ubl-settings-manager.c:1683
msgid "Always redirect"
msgstr ""
-#: source/ubl-settings-manager.c:1744
+#: source/ubl-settings-manager.c:1684
msgid "Settings"
msgstr ""
-#: source/ubl-settings-manager.c:1745
+#: source/ubl-settings-manager.c:1685
msgid "About..."
msgstr ""
-#: source/ubl-settings-manager.c:1746
+#: source/ubl-settings-manager.c:1686
msgid "Understood"
msgstr ""
-#: source/ubl-settings-manager.c:1747
+#: source/ubl-settings-manager.c:1687
msgid "Sections management"
msgstr ""
@@ -96,11 +96,11 @@ msgstr ""
msgid "Double click selection"
msgstr ""
-#: source/ubl-settings-manager.c:1853
+#: source/ubl-settings-manager.c:1792
msgid "Standard theme"
msgstr ""
-#: source/ubl-settings-manager.c:1854
+#: source/ubl-settings-manager.c:1793
msgid "GNOME theme"
msgstr ""
@@ -122,3 +122,16 @@ msgid ""
" -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 ""
+
diff --git a/ubl-settings-manager_ru.po b/ubl-settings-manager_ru.po
index 45497fa..c648825 100644
--- 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 , 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 , 2022
#
#, fuzzy
msgid "translation_info\n"
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-22 11:23+0600\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \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 \n"
+"Language-Team: Russian - UBLinux Team \n"
+"Language: Russian\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -50,8 +50,7 @@ msgstr "Вы хотите прочитать справку в Сети?"
msgid ""
"You will be redirected to documentation site, where user help pages are "
"translated and supported by community."
-msgstr "Вы будете перенаправлены на сайт с документацией, где страницы помощи"
-"переводятся и поддерживаются сообществом."
+msgstr "Вы будете перенаправлены на сайт с документацией где страницы помощи переводятся и поддерживаются сообществом."
#: source/ubl-settings-manager.c:1738
msgid "Read online"
@@ -124,9 +123,22 @@ msgid ""
" --lock-settings Lock menu settings\n"
msgstr ""
"\n"
-"GTK менеджер настроек для UBLinux\n"
-"Использование: ubl-settings-manager [АРГУМЕНТЫ...]"
+"GTK Менеджер настроек для UBLinux\n"
+"Использование: ubl-settings-manager [АРГУМЕНТЫ...]\n"
"Аргументы:\n"
" -h, --help\t\t Показать помощь\n"
" -V, --version\t \t Показать версию пакета\n"
-" --lock-settings Заблокировать окно настроек\n"
+" --lock-settings \t Заблокировать окно настроек\n"
+
+
+msgid "Personal"
+msgstr "Личные"
+
+msgid "Hardware"
+msgstr "Оборудование"
+
+msgid "System"
+msgstr "Система"
+
+msgid "Misc"
+msgstr "Прочее"