diff --git a/Makefile b/Makefile
index 68b6ddb..5021398 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,6 @@ uninstall:
$(RM) "$${PATH_FILE_MO}"; \
done
@for SIZE in 16x16 32x32 48x48 scalable; do \
- $(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 \
@@ -120,11 +119,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 "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
+ rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "icons/com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \
done
@install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}"
@install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop"
- @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg"
@for FILE_ICON in $(wildcard icons/*/*.svg); do \
SUB_NAME=$${FILE_ICON#*/}; SUB_NAME=$${SUB_NAME%/*}; \
install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/$${SUB_NAME}" $${FILE_ICON}; \
diff --git a/gresource.xml b/gresource.xml
index e05ccdb..3cfc297 100644
--- a/gresource.xml
+++ b/gresource.xml
@@ -16,9 +16,6 @@
ubl-settings-logging.css
-
- ubl-settings-logging-banner.png
-
journals_list.csv
logging_services.csv
diff --git a/com.ublinux.ubl-settings-logging.svg b/icons/apps/com.ublinux.ubl-settings-logging.svg
similarity index 100%
rename from com.ublinux.ubl-settings-logging.svg
rename to icons/apps/com.ublinux.ubl-settings-logging.svg
diff --git a/locale/ubl-settings-logging_ru.po b/locale/ubl-settings-logging_ru.po
index 30a22ca..95d502f 100644
--- a/locale/ubl-settings-logging_ru.po
+++ b/locale/ubl-settings-logging_ru.po
@@ -467,7 +467,7 @@ msgstr "Настройки файлов и папок"
#: source/ubl-strings.h:137
msgid "Delay compression by one journal in queue:"
-msgstr "Отложить сжание на один журнал в очереди:"
+msgstr "Отложить сжатие на один журнал в очереди:"
#: source/ubl-strings.h:138
msgid "Compression configuration"
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index f92bf0d..c111278 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -48,7 +48,6 @@ set(DEPENDFILES
../ubl-settings-logging-terminal.glade
../ubl-settings-logging-saving.glade
../gresource.xml
- ../ubl-settings-logging-banner.png
../ubl-settings-logging.css
../journals_list.csv
../logging_services.csv
diff --git a/ubl-settings-logging-banner.png b/ubl-settings-logging-banner.png
deleted file mode 100644
index 8eb67cb..0000000
Binary files a/ubl-settings-logging-banner.png and /dev/null differ
diff --git a/ubl-settings-logging-logrotate.glade b/ubl-settings-logging-logrotate.glade
index 8b731dc..7d041d2 100644
--- a/ubl-settings-logging-logrotate.glade
+++ b/ubl-settings-logging-logrotate.glade
@@ -140,6 +140,7 @@
+
+ False
+ True
+ 0
+
+
+
+
False
True
- 7
+ 1
@@ -1257,14 +1273,14 @@
False
True
- 8
+ 2
False
True
- 0
+ 1
@@ -1290,7 +1306,7 @@
False
True
- 1
+ 2
diff --git a/ubl-settings-logging.glade b/ubl-settings-logging.glade
index 3d3ffbb..ddfb7d9 100644
--- a/ubl-settings-logging.glade
+++ b/ubl-settings-logging.glade
@@ -1,5 +1,5 @@
-