Title label changes, localisation changes

pull/141/head
Ivan Yartsev 3 months ago
parent 3a9203dc1b
commit 199b2f8ecd

@ -100,8 +100,8 @@ void yon_journald_size_update(journald_window *window){
if (logsize){ if (logsize){
if (logsize[0][strlen(logsize[0])-1]=='\n') if (logsize[0][strlen(logsize[0])-1]=='\n')
logsize[0][strlen(logsize[0])-1]='\0'; 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){ 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->LogPathsBox=yon_gtk_builder_get_widget(builder,"LogPathsBox");
window->NameEntry=yon_gtk_builder_get_widget(builder,"NameEntry"); window->NameEntry=yon_gtk_builder_get_widget(builder,"NameEntry");
window->StatusBox=yon_gtk_builder_get_widget(builder,"StatusBox"); 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)); gtk_window_set_transient_for(GTK_WINDOW(window->MainWindow),GTK_WINDOW(widgets->Window));
window->log_name=NULL; window->log_name=NULL;
dictionary *dict = 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->JournaldButton,0);
gtk_widget_set_sensitive(window->LogrotateButton,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")){ if (!strcmp(name,"journald")){
gtk_widget_hide(window->LogrotateButton); gtk_widget_hide(window->LogrotateButton);
gtk_widget_hide(window->MetalogButton); gtk_widget_hide(window->MetalogButton);

@ -173,6 +173,7 @@ typedef struct {
typedef struct { typedef struct {
GtkWidget *MainWindow; GtkWidget *MainWindow;
GtkWidget *StatusBox; GtkWidget *StatusBox;
GtkWidget *HeaderLabel;
GtkWidget *adjustment1; GtkWidget *adjustment1;
GtkWidget *adjustment2; GtkWidget *adjustment2;
GtkWidget *CancelButton; GtkWidget *CancelButton;

@ -62,7 +62,7 @@
#define LOG_LABEL _("Log") #define LOG_LABEL _("Log")
//ubl-settings-logging-journald.glade //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_DESCRIPTION_LABEL _("Description:")
#define JOURNAL_STORAGE_LABEL _("Journal storage place:") #define JOURNAL_STORAGE_LABEL _("Journal storage place:")
#define COMPRESSION_LABEL _("Use compression:") #define COMPRESSION_LABEL _("Use compression:")
@ -100,7 +100,7 @@
#define RESET_LABEL _("Reset") #define RESET_LABEL _("Reset")
//ubl-settings-logging-logrotate.glade //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 LOGROTATE_LOG_JOURNAL_TAB_LABEL _("Log/Journal:")
#define PATHS_LABEL _("Paths to log and journals files") #define PATHS_LABEL _("Paths to log and journals files")
#define ON_LABEL _("On") #define ON_LABEL _("On")
@ -195,6 +195,7 @@
#define NAME_LABEL _("Name:") #define NAME_LABEL _("Name:")
#define TOTAL_LOG_SIZE_LABEL _("Log size:") #define TOTAL_LOG_SIZE_LABEL _("Log size:")
#define NO_FILES_FOUND_LABEL _("Journal/log files were not found") #define NO_FILES_FOUND_LABEL _("Journal/log files were not found")
#define JOURNALD_LOG_TITLE_LABEL _("Journal \"%s\" configuration")
//ubl-settings-logging-rules.glade //ubl-settings-logging-rules.glade
#define RULES_TITLE_LABEL _("Rules") #define RULES_TITLE_LABEL _("Rules")

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

@ -361,7 +361,7 @@
<property name="margin-start">5</property> <property name="margin-start">5</property>
<property name="margin-end">5</property> <property name="margin-end">5</property>
<property name="margin-bottom">2</property> <property name="margin-bottom">2</property>
<property name="label" translatable="yes">Logs and events - logrotate table</property> <property name="label" translatable="yes">Logrotate table</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>

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

@ -281,7 +281,7 @@ msgstr ""
msgid "Type of forwarded messages:" msgid "Type of forwarded messages:"
msgstr "" msgstr ""
#: source/ubl-strings.h:79 #: source/ubl-strings.h:79 source/ubl-strings.h:191
msgid "Journal configuration" msgid "Journal configuration"
msgstr "" msgstr ""
@ -691,10 +691,6 @@ msgstr ""
msgid "Remove log configuration" msgid "Remove log configuration"
msgstr "" msgstr ""
#: source/ubl-strings.h:191
msgid "Journal configuration"
msgstr ""
#: source/ubl-strings.h:192 #: source/ubl-strings.h:192
msgid "Path (-s):" msgid "Path (-s):"
msgstr "" msgstr ""
@ -719,66 +715,71 @@ msgstr ""
msgid "Journal/log files were not found" msgid "Journal/log files were not found"
msgstr "" msgstr ""
#: source/ubl-strings.h:200 #: source/ubl-strings.h:198
msgid "Rules" #, c-format
msgid "Journal \"%s\" configuration"
msgstr "" msgstr ""
#: source/ubl-strings.h:201 #: source/ubl-strings.h:201
msgid "Owner rules" msgid "Rules"
msgstr "" msgstr ""
#: source/ubl-strings.h:202 #: source/ubl-strings.h:202
msgid "Group rules" msgid "Owner rules"
msgstr "" msgstr ""
#: source/ubl-strings.h:203 #: source/ubl-strings.h:203
msgid "Public rules" msgid "Group rules"
msgstr "" msgstr ""
#: source/ubl-strings.h:204 #: source/ubl-strings.h:204
msgid "Read" msgid "Public rules"
msgstr "" msgstr ""
#: source/ubl-strings.h:205 #: source/ubl-strings.h:205
msgid "Write" msgid "Read"
msgstr "" msgstr ""
#: source/ubl-strings.h:206 #: source/ubl-strings.h:206
msgid "Execute" msgid "Write"
msgstr "" msgstr ""
#: source/ubl-strings.h:207 #: source/ubl-strings.h:207
msgid "Execute"
msgstr ""
#: source/ubl-strings.h:208
msgid "Value:" msgid "Value:"
msgstr "" msgstr ""
#: source/ubl-strings.h:210 #: source/ubl-strings.h:211
msgid ": no such file(s)" msgid ": no such file(s)"
msgstr "" msgstr ""
#: source/ubl-strings.h:211 #: source/ubl-strings.h:212
msgid "Parameter" msgid "Parameter"
msgstr "" msgstr ""
#: source/ubl-strings.h:212 #: source/ubl-strings.h:213
msgid "Old value" msgid "Old value"
msgstr "" msgstr ""
#: source/ubl-strings.h:213 #: source/ubl-strings.h:214
msgid "New value" msgid "New value"
msgstr "" msgstr ""
#: source/ubl-strings.h:215 #: source/ubl-strings.h:216
msgid "Choose a path" msgid "Choose a path"
msgstr "" msgstr ""
#: source/ubl-strings.h:216 #: source/ubl-strings.h:217
msgid "Saving" msgid "Saving"
msgstr "" msgstr ""
#: source/ubl-strings.h:218 #: source/ubl-strings.h:219
msgid "Authorization has been elevated" msgid "Authorization has been elevated"
msgstr "" msgstr ""
#: source/ubl-strings.h:219 #: source/ubl-strings.h:220
msgid "Authorization has been unelevated" msgid "Authorization has been unelevated"
msgstr "" msgstr ""

@ -235,8 +235,8 @@ msgid "Log"
msgstr "Запись лога" msgstr "Запись лога"
#: source/ubl-strings.h:65 #: source/ubl-strings.h:65
msgid "Journald configuration" msgid "JournalD journal rotation and storage configuration"
msgstr "Конфигурация сервиса journald" msgstr "Настройка ротации и хранения журналов JournalD"
#: source/ubl-strings.h:66 #: source/ubl-strings.h:66
msgid "Description:" msgid "Description:"
@ -286,7 +286,7 @@ msgstr "TTY:"
msgid "Type of forwarded messages:" msgid "Type of forwarded messages:"
msgstr "Тип перенаправляемых сообщений:" msgstr "Тип перенаправляемых сообщений:"
#: source/ubl-strings.h:79 #: source/ubl-strings.h:79 source/ubl-strings.h:191
msgid "Journal configuration" msgid "Journal configuration"
msgstr "Настройка файла журнала" msgstr "Настройка файла журнала"
@ -375,7 +375,7 @@ msgid "Reset"
msgstr "По умолчанию" msgstr "По умолчанию"
#: source/ubl-strings.h:103 #: source/ubl-strings.h:103
msgid "Logrotate configuration" msgid "Logrotate log rotation and storage configuration"
msgstr "Настройка ротации и хранения журналов Logrotate" msgstr "Настройка ротации и хранения журналов Logrotate"
#: source/ubl-strings.h:104 #: source/ubl-strings.h:104
@ -723,77 +723,82 @@ msgstr "Размер лога:"
msgid "Journal/log files were not found" msgid "Journal/log files were not found"
msgstr "Файлы журналов/логов не были найдены" 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" msgid "Rules"
msgstr "Правила" msgstr "Правила"
#: source/ubl-strings.h:201 #: source/ubl-strings.h:202
msgid "Owner rules" msgid "Owner rules"
msgstr "Правила владельца" msgstr "Правила владельца"
#: source/ubl-strings.h:202 #: source/ubl-strings.h:203
msgid "Group rules" msgid "Group rules"
msgstr "Правила группы" msgstr "Правила группы"
#: source/ubl-strings.h:203 #: source/ubl-strings.h:204
msgid "Public rules" msgid "Public rules"
msgstr "Правила остальных" msgstr "Правила остальных"
#: source/ubl-strings.h:204 #: source/ubl-strings.h:205
msgid "Read" msgid "Read"
msgstr "Чтение" msgstr "Чтение"
#: source/ubl-strings.h:205 #: source/ubl-strings.h:206
msgid "Write" msgid "Write"
msgstr "Запись" msgstr "Запись"
#: source/ubl-strings.h:206 #: source/ubl-strings.h:207
msgid "Execute" msgid "Execute"
msgstr "Исполнение" msgstr "Исполнение"
#: source/ubl-strings.h:207 #: source/ubl-strings.h:208
msgid "Value:" msgid "Value:"
msgstr "Значение:" msgstr "Значение:"
#: source/ubl-strings.h:210 #: source/ubl-strings.h:211
msgid ": no such file(s)" msgid ": no such file(s)"
msgstr ": файл(ы) не найден(ы)" msgstr ": файл(ы) не найден(ы)"
#: source/ubl-strings.h:211 #: source/ubl-strings.h:212
msgid "Parameter" msgid "Parameter"
msgstr "Параметр" msgstr "Параметр"
#: source/ubl-strings.h:212 #: source/ubl-strings.h:213
msgid "Old value" msgid "Old value"
msgstr "Старое значение" msgstr "Старое значение"
#: source/ubl-strings.h:213 #: source/ubl-strings.h:214
msgid "New value" msgid "New value"
msgstr "Новое значение" msgstr "Новое значение"
#: source/ubl-strings.h:215 #: source/ubl-strings.h:216
msgid "Choose a path" msgid "Choose a path"
msgstr "Выбор пути" msgstr "Выбор пути"
#: source/ubl-strings.h:216 #: source/ubl-strings.h:217
msgid "Saving" msgid "Saving"
msgstr "Сохранение" msgstr "Сохранение"
#: source/ubl-strings.h:218 #: source/ubl-strings.h:219
msgid "Authorization has been elevated" msgid "Authorization has been elevated"
msgstr "" msgstr ""
#: source/ubl-strings.h:219 #: source/ubl-strings.h:220
msgid "Authorization has been unelevated" msgid "Authorization has been unelevated"
msgstr "" msgstr ""
msgid "System event log rotation service" #~ msgid "System event log rotation service"
msgstr "Служба ротации системных журналов событий" #~ msgstr "Служба ротации системных журналов событий"
msgid "" #~ msgid ""
"Service for collecting messages from system events of active network " #~ "Service for collecting messages from system events of active network "
"devices" #~ "devices"
msgstr "Сервис сбора сообщений системных событий активных сетевых устройств" #~ msgstr "Сервис сбора сообщений системных событий активных сетевых устройств"
msgid "Log inspector" #~ msgid "Log inspector"
msgstr "Просмотр журнала" #~ msgstr "Просмотр журнала"

Loading…
Cancel
Save