Fixes

logging_services.csv

@@ -1,5 +1,5 @@
 Service_Name;Service_Description;Сommand_Start;Сommand_Stop;Сommand_Enable;Сommand_Disable;Сommand_Status;Сommand_Status_Active;Сommand_Status_Enabled
 journald;System event log;systemctl start systemd-journald.service;systemctl stop systemd-journald.service;ubconfig set [system] SERVICES_DISABLE--=systemd-journald.service SERVICES_ENABLE++=systemd-journald.service;ubconfig set [system] SERVICES_ENABLE--=systemd-journald.service SERVICES_DISABLE++=systemd-journald.service;systemctl status systemd-journald.service --no-pager;systemctl --quiet is-active systemd-journald.service;systemctl --quiet is-enabled systemd-journald.service
-logrotate;System event log rotation service;systemctl start logrotate.timer;systemctl stop logrotate.timer logrotate.service;ubconfig set [system] SERVICES_DISABLE--=logrotate.timer SERVICES_ENABLE++=logrotate.timer;ubconfig set [system] SERVICES_ENABLE--=logrotate.timer SERVICES_DISABLE++=logrotate.timer;systemctl status logrotate.service --no-pager;systemctl --quiet is-active logrotate.service;systemctl --quiet is-enabled logrotate.service
+logrotate;System event log rotation service;systemctl start logrotate.timer logrotate.service;systemctl stop logrotate.timer logrotate.service;ubconfig set [system] SERVICES_DISABLE--=logrotate.timer SERVICES_ENABLE++=logrotate.timer;ubconfig set [system] SERVICES_ENABLE--=logrotate.timer SERVICES_DISABLE++=logrotate.timer;systemctl status logrotate.timer --no-pager;systemctl --quiet is-active logrotate.timer;systemctl --quiet is-enabled logrotate.timer
 #metalog;System event log;systemctl start metalog.service;systemctl stop metalog.service;ubconfig set [system] SERVICES_DISABLE--=metalog.service SERVICES_ENABLE++=metalog.service;ubconfig set [system] SERVICES_ENABLE--=metalog.service SERVICES_DISABLE++=metalog.service;systemctl status metalog.service --no-pager;systemctl --quiet is-active metalog.service;systemctl --quiet is-enabled metalog.service
 #syslog-ng;Service for collecting messages from system events of active network devices;systemctl start syslog-ng.service;systemctl stop syslog-ng.service;ubconfig set [system] SERVICES_DISABLE--=syslog-ng.service SERVICES_ENABLE++=syslog-ng.service;ubconfig set [system] SERVICES_ENABLE--=syslog-ng.service SERVICES_DISABLE++=syslog-ng.service;systemctl status syslog-ng.service --no-pager;systemctl --quiet is-active syslog-ng.service;systemctl --quiet is-enabled syslog-ng.service

source/ubl-strings.h

@@ -47,7 +47,7 @@
 #define SERVICE_MANAGEMENT_TOOLTIP _("Manage service")
 
 //ubl-settings-logging-inspector.glade
-#define INSPECTOR_TITLE_LABEL(target) yon_char_unite(_("Inspect")," ",target,NULL)
+#define INSPECTOR_TITLE_LABEL(target) yon_char_unite(_("Inspect")," \"",target,"\"",NULL)
 #define TOOLTIP_BOOT_LABEL _("Show messages since the current system boot")
 #define TOOLTIP_FOLLOW_LABEL _("Follow for new messages")
 #define TOOLTIP_KERNEL_LABEL _("Show kernel ring buffer")
@@ -62,7 +62,7 @@
 #define LOG_LABEL _("Log")
 
 //ubl-settings-logging-journald.glade
-#define JOURNALD_TITLE_LABEL _("Logs and events - journald configuration")
+#define JOURNALD_TITLE_LABEL _("Journald configuration")
 #define JOURNAL_DESCRIPTION_LABEL _("Description:")
 #define JOURNAL_STORAGE_LABEL _("Journal storage place:")
 #define COMPRESSION_LABEL _("Use compression:")
@@ -100,7 +100,7 @@
 #define RESET_LABEL _("Reset")
 
 //ubl-settings-logging-logrotate.glade
-#define LOGROTATE_TITLE_LABEL _("Logs and events - logrotate configuration")
+#define LOGROTATE_TITLE_LABEL _("Logrotate configuration")
 #define LOGROTATE_LOG_JOURNAL_TAB_LABEL _("Log/Journal:")
 #define PATHS_LABEL _("Paths to log and journals files")
 #define ON_LABEL _("On")
@@ -179,7 +179,7 @@
 #define COMMAND_INVALID_LABEL _("Command is invalid")
 
 //ubl-settings-logging-logrotate-table.glade
-#define TABLE_TITLE_LABEL _("Logs and events - logrotate table")
+#define TABLE_TITLE_LABEL _("Logrotate table")
 #define SYSTEM_CONFIGURATION_LABEL _("System configuration")
 #define APPLITATIONS_CONFIGURATION_LABEL _("Applications configuration")
 #define IMPORT_CONFIGURATION_LABEL _("Import log configuration")
@@ -188,7 +188,7 @@
 #define CONFIGURE_CONFIGURATION_LABEL _("Configure log")
 
 //ubl-settings-logging-add.glade
-#define MONITOR_TITLE_LABEL _("Logs and events - journal configuration")
+#define MONITOR_TITLE_LABEL _("Journal configuration")
 #define ADD_PATHS_LABEL _("Path (-s):")
 #define CONTROL_LABEL _("Control:")
 #define LOG_FILE_LABEL _("Log file")
@@ -197,7 +197,7 @@
 #define NO_FILES_FOUND_LABEL _("Journal/log files were not found")
 
 //ubl-settings-logging-rules.glade
-#define RULES_TITLE_LABEL _("Logs and events - rules")
+#define RULES_TITLE_LABEL _("Rules")
 #define OWNER_LABEL _("Owner rules")
 #define GROUP_LABEL _("Group rules")
 #define PUBLIC_LABEL _("Public rules")
@@ -212,8 +212,8 @@
 #define OLD_VALUE_LABEL _("Old value")
 #define NEW_VALUE_LABEL _("New value")
 
-#define FILECHOOSER_TITLE_LABEL _("Logs and events - choose a path")
-#define SAVE_TITLE_LABEL _("Logs and events - saving")
+#define FILECHOOSER_TITLE_LABEL _("Choose a path")
+#define SAVE_TITLE_LABEL _("Saving")
 
 #define AUTHTORIZED_LABEL _("Authorization has been elevated")
 #define UNAUTHTORIZED_LABEL _("Authorization has been unelevated")

ubl-settings-logging-add.glade

@@ -456,7 +456,7 @@
             <property name="margin-start">5</property>
             <property name="margin-end">5</property>
             <property name="margin-bottom">2</property>
-            <property name="label" translatable="yes">Logs and events - journal configuration</property>
+            <property name="label" translatable="yes">Journal configuration</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>

ubl-settings-logging-inspector.glade

@@ -373,7 +373,7 @@
             <property name="margin-start">5</property>
             <property name="margin-end">5</property>
             <property name="margin-bottom">2</property>
-            <property name="label" translatable="yes">Logs and events - log inspector</property>
+            <property name="label" translatable="yes">Log inspector</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>

ubl-settings-logging-journald.glade

@@ -993,7 +993,7 @@
             <property name="margin-start">5</property>
             <property name="margin-end">5</property>
             <property name="margin-bottom">2</property>
-            <property name="label" translatable="yes">Logs and events - journald configuration</property>
+            <property name="label" translatable="yes">Journald configuration</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>

ubl-settings-logging-logrotate.glade

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.40.0 -->
+<!-- Generated with glade 3.38.2 -->
 <interface domain="ubl-settings-logging">
   <requires lib="gtk+" version="3.24"/>
   <!-- interface-css-provider-path ubl-settings-logging.css -->
@@ -2108,7 +2108,7 @@
             <property name="margin-start">5</property>
             <property name="margin-end">5</property>
             <property name="margin-bottom">2</property>
-            <property name="label" translatable="yes">Logs and events - logrotate configuration</property>
+            <property name="label" translatable="yes">Logrotate configuration</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>

ubl-settings-logging-rules.glade

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.40.0 -->
+<!-- Generated with glade 3.38.2 -->
 <interface domain="ubl-settings-logging">
   <requires lib="gtk+" version="3.24"/>
   <!-- interface-css-provider-path ubl-settings-logging.css -->
@@ -367,7 +367,7 @@
             <property name="margin-start">5</property>
             <property name="margin-end">5</property>
             <property name="margin-bottom">2</property>
-            <property name="label" translatable="yes">Logs and events - rules</property>
+            <property name="label" translatable="yes">Rules</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>

ubl-settings-logging.pot

@@ -230,7 +230,7 @@ msgid "Log"
 msgstr ""
 
 #: source/ubl-strings.h:65
-msgid "Logs and events - journald configuration"
+msgid "Journald configuration"
 msgstr ""
 
 #: source/ubl-strings.h:66
@@ -370,7 +370,7 @@ msgid "Reset"
 msgstr ""
 
 #: source/ubl-strings.h:103
-msgid "Logs and events - logrotate configuration"
+msgid "Logrotate configuration"
 msgstr ""
 
 #: source/ubl-strings.h:104
@@ -668,7 +668,7 @@ msgid "Command is invalid"
 msgstr ""
 
 #: source/ubl-strings.h:182
-msgid "Logs and events - logrotate table"
+msgid "Logrotate table"
 msgstr ""
 
 #: source/ubl-strings.h:183
@@ -692,7 +692,7 @@ msgid "Remove log configuration"
 msgstr ""
 
 #: source/ubl-strings.h:191
-msgid "Logs and events - journal configuration"
+msgid "Journal configuration"
 msgstr ""
 
 #: source/ubl-strings.h:192
@@ -720,7 +720,7 @@ msgid "Journal/log files were not found"
 msgstr ""
 
 #: source/ubl-strings.h:200
-msgid "Logs and events - rules"
+msgid "Rules"
 msgstr ""
 
 #: source/ubl-strings.h:201
@@ -768,11 +768,11 @@ msgid "New value"
 msgstr ""
 
 #: source/ubl-strings.h:215
-msgid "Logs and events - choose a path"
+msgid "Choose a path"
 msgstr ""
 
 #: source/ubl-strings.h:216
-msgid "Logs and events - saving"
+msgid "Saving"
 msgstr ""
 
 #: source/ubl-strings.h:218

ubl-settings-logging_ru.po

@@ -235,8 +235,8 @@ msgid "Log"
 msgstr "Запись лога"
 
 #: source/ubl-strings.h:65
-msgid "Logs and events - journald configuration"
-msgstr "Логи и журналы событий - конфигурация сервиса journald"
+msgid "Journald configuration"
+msgstr "Конфигурация сервиса journald"
 
 #: source/ubl-strings.h:66
 msgid "Description:"
@@ -375,8 +375,8 @@ msgid "Reset"
 msgstr "По умолчанию"
 
 #: source/ubl-strings.h:103
-msgid "Logs and events - logrotate configuration"
-msgstr "Логи и журналы событий - конфигурация сервиса logrotate"
+msgid "Logrotate configuration"
+msgstr "Конфигурация сервиса logrotate"
 
 #: source/ubl-strings.h:104
 msgid "Log/Journal:"
@@ -676,8 +676,8 @@ msgid "Command is invalid"
 msgstr "Неверная команда"
 
 #: source/ubl-strings.h:182
-msgid "Logs and events - logrotate table"
-msgstr "Логи и журналы событий - таблица журналов logrotate"
+msgid "Logrotate table"
+msgstr "Таблица журналов logrotate"
 
 #: source/ubl-strings.h:183
 msgid "System configuration"
@@ -699,10 +699,6 @@ msgstr "Добавить конфигурацию лога"
 msgid "Remove log configuration"
 msgstr "Удалить конфигурацию лога"
 
-#: source/ubl-strings.h:191
-msgid "Logs and events - journal configuration"
-msgstr "Логи и журналы событий - конфигурация журнала"
-
 #: source/ubl-strings.h:192
 msgid "Path (-s):"
 msgstr "Путь (-и):"
@@ -728,8 +724,8 @@ msgid "Journal/log files were not found"
 msgstr "Файлы журналов/логов не были найдены"
 
 #: source/ubl-strings.h:200
-msgid "Logs and events - rules"
-msgstr "Логи и журналы событий - правила"
+msgid "Rules"
+msgstr "Правила"
 
 #: source/ubl-strings.h:201
 msgid "Owner rules"
@@ -776,12 +772,12 @@ msgid "New value"
 msgstr "Новое значение"
 
 #: source/ubl-strings.h:215
-msgid "Logs and events - choose a path"
-msgstr "Логи и журналы событий - Выбор пути"
+msgid "Choose a path"
+msgstr "Выбор пути"
 
 #: source/ubl-strings.h:216
-msgid "Logs and events - saving"
-msgstr "Логи и журналы событий - сохранение"
+msgid "Saving"
+msgstr "Сохранение"
 
 #: source/ubl-strings.h:218
 msgid "Authorization has been elevated"
@@ -799,5 +795,5 @@ msgid ""
 "devices"
 msgstr "Сервис сбора сообщений системных событий активных сетевых устройств"
 
-msgid "Logs and events - log inspector"
-msgstr "Логи и журналы событий - просмотр журнала"
+msgid "Log inspector"
+msgstr "Просмотр журнала"