From 1d3ccf31b6c43058c6264c49e36b13e51389a2ba Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 23 Apr 2025 14:35:25 +0600 Subject: [PATCH] Fixes --- logging_services.csv | 2 +- source/ubl-strings.h | 16 +++++++------- ubl-settings-logging-add.glade | 2 +- ubl-settings-logging-inspector.glade | 2 +- ubl-settings-logging-journald.glade | 2 +- ubl-settings-logging-logrotate.glade | 4 ++-- ubl-settings-logging-rules.glade | 4 ++-- ubl-settings-logging.pot | 14 ++++++------ ubl-settings-logging_ru.po | 32 ++++++++++++---------------- 9 files changed, 37 insertions(+), 41 deletions(-) diff --git a/logging_services.csv b/logging_services.csv index 23bf5a3..ef1971c 100644 --- a/logging_services.csv +++ b/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 \ No newline at end of file diff --git a/source/ubl-strings.h b/source/ubl-strings.h index ce56d73..e2217b2 100644 --- a/source/ubl-strings.h +++ b/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") \ No newline at end of file diff --git a/ubl-settings-logging-add.glade b/ubl-settings-logging-add.glade index a87b313..d6c5e32 100644 --- a/ubl-settings-logging-add.glade +++ b/ubl-settings-logging-add.glade @@ -456,7 +456,7 @@ 5 5 2 - Logs and events - journal configuration + Journal configuration diff --git a/ubl-settings-logging-inspector.glade b/ubl-settings-logging-inspector.glade index 037b2d4..9232a8b 100644 --- a/ubl-settings-logging-inspector.glade +++ b/ubl-settings-logging-inspector.glade @@ -373,7 +373,7 @@ 5 5 2 - Logs and events - log inspector + Log inspector diff --git a/ubl-settings-logging-journald.glade b/ubl-settings-logging-journald.glade index 3ba8bf9..abf1442 100644 --- a/ubl-settings-logging-journald.glade +++ b/ubl-settings-logging-journald.glade @@ -993,7 +993,7 @@ 5 5 2 - Logs and events - journald configuration + Journald configuration diff --git a/ubl-settings-logging-logrotate.glade b/ubl-settings-logging-logrotate.glade index 0400aa9..01f3093 100644 --- a/ubl-settings-logging-logrotate.glade +++ b/ubl-settings-logging-logrotate.glade @@ -1,5 +1,5 @@ - + @@ -2108,7 +2108,7 @@ 5 5 2 - Logs and events - logrotate configuration + Logrotate configuration diff --git a/ubl-settings-logging-rules.glade b/ubl-settings-logging-rules.glade index 620b09a..6bc1560 100644 --- a/ubl-settings-logging-rules.glade +++ b/ubl-settings-logging-rules.glade @@ -1,5 +1,5 @@ - + @@ -367,7 +367,7 @@ 5 5 2 - Logs and events - rules + Rules diff --git a/ubl-settings-logging.pot b/ubl-settings-logging.pot index 3242972..89e91f7 100644 --- a/ubl-settings-logging.pot +++ b/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 diff --git a/ubl-settings-logging_ru.po b/ubl-settings-logging_ru.po index 31ec5c2..e9f0ab4 100644 --- a/ubl-settings-logging_ru.po +++ b/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 "Просмотр журнала"