From 199b2f8ecd8a5876573b88c6ca3061c05fa9e805 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 19 May 2025 18:11:51 +0600 Subject: [PATCH] Title label changes, localisation changes --- source/ubl-settings-logging.c | 8 ++- source/ubl-settings-logging.h | 1 + source/ubl-strings.h | 5 +- ubl-settings-logging-journald.glade | 4 +- ubl-settings-logging-logrotate-table.glade | 2 +- ubl-settings-logging-logrotate.glade | 4 +- ubl-settings-logging.pot | 43 +++++++-------- ubl-settings-logging_ru.po | 61 ++++++++++++---------- 8 files changed, 70 insertions(+), 58 deletions(-) diff --git a/source/ubl-settings-logging.c b/source/ubl-settings-logging.c index cca7ffd..917dd05 100644 --- a/source/ubl-settings-logging.c +++ b/source/ubl-settings-logging.c @@ -100,8 +100,8 @@ void yon_journald_size_update(journald_window *window){ if (logsize){ if (logsize[0][strlen(logsize[0])-1]=='\n') logsize[0][strlen(logsize[0])-1]='\0'; + gtk_label_set_text(GTK_LABEL(window->LogSizeLabel),logsize[0]); } - gtk_label_set_text(GTK_LABEL(window->LogSizeLabel),logsize[0]); } int yon_load_proceed(YON_CONFIG_TYPE type){ @@ -2423,7 +2423,7 @@ add_log_window *on_add_open(main_window *widgets){ window->LogPathsBox=yon_gtk_builder_get_widget(builder,"LogPathsBox"); window->NameEntry=yon_gtk_builder_get_widget(builder,"NameEntry"); window->StatusBox=yon_gtk_builder_get_widget(builder,"StatusBox"); - gtk_window_set_title(GTK_WINDOW(window->MainWindow),MONITOR_TITLE_LABEL); + window->HeaderLabel=yon_gtk_builder_get_widget(builder,"headerTopic"); gtk_window_set_transient_for(GTK_WINDOW(window->MainWindow),GTK_WINDOW(widgets->Window)); window->log_name=NULL; dictionary *dict = NULL; @@ -2616,6 +2616,10 @@ void on_log_edit(GtkWidget *,main_window *widgets){ gtk_widget_set_sensitive(window->JournaldButton,0); gtk_widget_set_sensitive(window->LogrotateButton,0); } + char *title = malloc(sizeof(char)*strlen(JOURNALD_LOG_TITLE_LABEL)+strlen(name)+1); + sprintf(title,JOURNALD_LOG_TITLE_LABEL,name); + gtk_label_set_text(GTK_LABEL(window->HeaderLabel),title); + gtk_window_set_title(GTK_WINDOW(window->MainWindow),title); if (!strcmp(name,"journald")){ gtk_widget_hide(window->LogrotateButton); gtk_widget_hide(window->MetalogButton); diff --git a/source/ubl-settings-logging.h b/source/ubl-settings-logging.h index cce5896..9967926 100644 --- a/source/ubl-settings-logging.h +++ b/source/ubl-settings-logging.h @@ -173,6 +173,7 @@ typedef struct { typedef struct { GtkWidget *MainWindow; GtkWidget *StatusBox; + GtkWidget *HeaderLabel; GtkWidget *adjustment1; GtkWidget *adjustment2; GtkWidget *CancelButton; diff --git a/source/ubl-strings.h b/source/ubl-strings.h index e2217b2..86657bf 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -62,7 +62,7 @@ #define LOG_LABEL _("Log") //ubl-settings-logging-journald.glade -#define JOURNALD_TITLE_LABEL _("Journald configuration") +#define JOURNALD_TITLE_LABEL _("JournalD journal rotation and storage 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 _("Logrotate configuration") +#define LOGROTATE_TITLE_LABEL _("Logrotate log rotation and storage configuration") #define LOGROTATE_LOG_JOURNAL_TAB_LABEL _("Log/Journal:") #define PATHS_LABEL _("Paths to log and journals files") #define ON_LABEL _("On") @@ -195,6 +195,7 @@ #define NAME_LABEL _("Name:") #define TOTAL_LOG_SIZE_LABEL _("Log size:") #define NO_FILES_FOUND_LABEL _("Journal/log files were not found") +#define JOURNALD_LOG_TITLE_LABEL _("Journal \"%s\" configuration") //ubl-settings-logging-rules.glade #define RULES_TITLE_LABEL _("Rules") diff --git a/ubl-settings-logging-journald.glade b/ubl-settings-logging-journald.glade index b126026..ddfbc81 100644 --- a/ubl-settings-logging-journald.glade +++ b/ubl-settings-logging-journald.glade @@ -1,5 +1,5 @@ - + @@ -993,7 +993,7 @@ 5 5 2 - Journald configuration + JournalD journal rotation and storage configuration diff --git a/ubl-settings-logging-logrotate-table.glade b/ubl-settings-logging-logrotate-table.glade index 9d6f8a4..6dcbca0 100644 --- a/ubl-settings-logging-logrotate-table.glade +++ b/ubl-settings-logging-logrotate-table.glade @@ -361,7 +361,7 @@ 5 5 2 - Logs and events - logrotate table + Logrotate table diff --git a/ubl-settings-logging-logrotate.glade b/ubl-settings-logging-logrotate.glade index 01f3093..c72d20c 100644 --- a/ubl-settings-logging-logrotate.glade +++ b/ubl-settings-logging-logrotate.glade @@ -1,5 +1,5 @@ - + @@ -2108,7 +2108,7 @@ 5 5 2 - Logrotate configuration + Logrotate log rotation and storage configuration diff --git a/ubl-settings-logging.pot b/ubl-settings-logging.pot index 89e91f7..cd3b994 100644 --- a/ubl-settings-logging.pot +++ b/ubl-settings-logging.pot @@ -281,7 +281,7 @@ msgstr "" msgid "Type of forwarded messages:" msgstr "" -#: source/ubl-strings.h:79 +#: source/ubl-strings.h:79 source/ubl-strings.h:191 msgid "Journal configuration" msgstr "" @@ -691,10 +691,6 @@ msgstr "" msgid "Remove log configuration" msgstr "" -#: source/ubl-strings.h:191 -msgid "Journal configuration" -msgstr "" - #: source/ubl-strings.h:192 msgid "Path (-s):" msgstr "" @@ -719,66 +715,71 @@ msgstr "" msgid "Journal/log files were not found" msgstr "" -#: source/ubl-strings.h:200 -msgid "Rules" +#: source/ubl-strings.h:198 +#, c-format +msgid "Journal \"%s\" configuration" msgstr "" #: source/ubl-strings.h:201 -msgid "Owner rules" +msgid "Rules" msgstr "" #: source/ubl-strings.h:202 -msgid "Group rules" +msgid "Owner rules" msgstr "" #: source/ubl-strings.h:203 -msgid "Public rules" +msgid "Group rules" msgstr "" #: source/ubl-strings.h:204 -msgid "Read" +msgid "Public rules" msgstr "" #: source/ubl-strings.h:205 -msgid "Write" +msgid "Read" msgstr "" #: source/ubl-strings.h:206 -msgid "Execute" +msgid "Write" msgstr "" #: source/ubl-strings.h:207 +msgid "Execute" +msgstr "" + +#: source/ubl-strings.h:208 msgid "Value:" msgstr "" -#: source/ubl-strings.h:210 +#: source/ubl-strings.h:211 msgid ": no such file(s)" msgstr "" -#: source/ubl-strings.h:211 +#: source/ubl-strings.h:212 msgid "Parameter" msgstr "" -#: source/ubl-strings.h:212 +#: source/ubl-strings.h:213 msgid "Old value" msgstr "" -#: source/ubl-strings.h:213 +#: source/ubl-strings.h:214 msgid "New value" msgstr "" -#: source/ubl-strings.h:215 +#: source/ubl-strings.h:216 msgid "Choose a path" msgstr "" -#: source/ubl-strings.h:216 +#: source/ubl-strings.h:217 msgid "Saving" msgstr "" -#: source/ubl-strings.h:218 +#: source/ubl-strings.h:219 msgid "Authorization has been elevated" msgstr "" -#: source/ubl-strings.h:219 +#: source/ubl-strings.h:220 msgid "Authorization has been unelevated" msgstr "" diff --git a/ubl-settings-logging_ru.po b/ubl-settings-logging_ru.po index a0c2cfe..10d8f94 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 "Journald configuration" -msgstr "Конфигурация сервиса journald" +msgid "JournalD journal rotation and storage configuration" +msgstr "Настройка ротации и хранения журналов JournalD" #: source/ubl-strings.h:66 msgid "Description:" @@ -286,7 +286,7 @@ msgstr "TTY:" msgid "Type of forwarded messages:" msgstr "Тип перенаправляемых сообщений:" -#: source/ubl-strings.h:79 +#: source/ubl-strings.h:79 source/ubl-strings.h:191 msgid "Journal configuration" msgstr "Настройка файла журнала" @@ -375,7 +375,7 @@ msgid "Reset" msgstr "По умолчанию" #: source/ubl-strings.h:103 -msgid "Logrotate configuration" +msgid "Logrotate log rotation and storage configuration" msgstr "Настройка ротации и хранения журналов Logrotate" #: source/ubl-strings.h:104 @@ -723,77 +723,82 @@ msgstr "Размер лога:" msgid "Journal/log files were not found" msgstr "Файлы журналов/логов не были найдены" -#: source/ubl-strings.h:200 +#: source/ubl-strings.h:198 +#, fuzzy, c-format +msgid "Journal \"%s\" configuration" +msgstr "Настройка журналов \"%s\"" + +#: source/ubl-strings.h:201 msgid "Rules" msgstr "Правила" -#: source/ubl-strings.h:201 +#: source/ubl-strings.h:202 msgid "Owner rules" msgstr "Правила владельца" -#: source/ubl-strings.h:202 +#: source/ubl-strings.h:203 msgid "Group rules" msgstr "Правила группы" -#: source/ubl-strings.h:203 +#: source/ubl-strings.h:204 msgid "Public rules" msgstr "Правила остальных" -#: source/ubl-strings.h:204 +#: source/ubl-strings.h:205 msgid "Read" msgstr "Чтение" -#: source/ubl-strings.h:205 +#: source/ubl-strings.h:206 msgid "Write" msgstr "Запись" -#: source/ubl-strings.h:206 +#: source/ubl-strings.h:207 msgid "Execute" msgstr "Исполнение" -#: source/ubl-strings.h:207 +#: source/ubl-strings.h:208 msgid "Value:" msgstr "Значение:" -#: source/ubl-strings.h:210 +#: source/ubl-strings.h:211 msgid ": no such file(s)" msgstr ": файл(ы) не найден(ы)" -#: source/ubl-strings.h:211 +#: source/ubl-strings.h:212 msgid "Parameter" msgstr "Параметр" -#: source/ubl-strings.h:212 +#: source/ubl-strings.h:213 msgid "Old value" msgstr "Старое значение" -#: source/ubl-strings.h:213 +#: source/ubl-strings.h:214 msgid "New value" msgstr "Новое значение" -#: source/ubl-strings.h:215 +#: source/ubl-strings.h:216 msgid "Choose a path" msgstr "Выбор пути" -#: source/ubl-strings.h:216 +#: source/ubl-strings.h:217 msgid "Saving" msgstr "Сохранение" -#: source/ubl-strings.h:218 +#: source/ubl-strings.h:219 msgid "Authorization has been elevated" msgstr "" -#: source/ubl-strings.h:219 +#: source/ubl-strings.h:220 msgid "Authorization has been unelevated" msgstr "" -msgid "System event log rotation service" -msgstr "Служба ротации системных журналов событий" +#~ msgid "System event log rotation service" +#~ msgstr "Служба ротации системных журналов событий" -msgid "" -"Service for collecting messages from system events of active network " -"devices" -msgstr "Сервис сбора сообщений системных событий активных сетевых устройств" +#~ msgid "" +#~ "Service for collecting messages from system events of active network " +#~ "devices" +#~ msgstr "Сервис сбора сообщений системных событий активных сетевых устройств" -msgid "Log inspector" -msgstr "Просмотр журнала" +#~ msgid "Log inspector" +#~ msgstr "Просмотр журнала"