diff --git a/source/ubl-settings-logging.c b/source/ubl-settings-logging.c
index 06fce32..d4fbee4 100644
--- a/source/ubl-settings-logging.c
+++ b/source/ubl-settings-logging.c
@@ -167,7 +167,7 @@ saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...){
window->type=type;
yon_window_config_custom_window_setup(GTK_WINDOW(window->Window),"SaveWindow");
yon_window_config_custom_window_get(GTK_WINDOW(window->Window),"SaveWindow");
- gtk_window_set_title(GTK_WINDOW(window->Window),TITLE_LABEL);
+ gtk_window_set_title(GTK_WINDOW(window->Window),SAVE_TITLE_LABEL);
g_signal_connect(G_OBJECT(window->CancelButton),"clicked",G_CALLBACK(on_close_subwindow),NULL);
g_signal_connect(G_OBJECT(window->SaveButton),"clicked", G_CALLBACK(on_save_parameters),window);
g_signal_connect(G_OBJECT(window->ToggleCell),"toggled", G_CALLBACK(on_save_window_parameter_switched),window);
@@ -700,7 +700,7 @@ void on_inspector_open(GtkWidget *self, main_window *widgets){
window->JournaldTree=yon_gtk_builder_get_widget(builder,"JournaldTree");
window->list=GTK_LIST_STORE(gtk_builder_get_object(builder,"liststore1"));
yon_window_config_custom_window_setup(GTK_WINDOW(window->MainWindow),"InspectorWindow");
- gtk_window_set_title(GTK_WINDOW(window->MainWindow),TITLE_LABEL);
+ gtk_window_set_title(GTK_WINDOW(window->MainWindow),INSPECTOR_TITLE_LABEL);
gtk_window_set_transient_for(GTK_WINDOW(window->MainWindow),GTK_WINDOW(widgets->Window));
GtkTreeModel *model = GTK_TREE_MODEL(widgets->list);
GList *list = gtk_tree_view_get_columns(GTK_TREE_VIEW(window->JournaldTree));
@@ -897,7 +897,7 @@ void on_logrotate_configuration_path_filechooser_open(GtkWidget *self, logrotate
gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog->FileChooser),filter);
dictionary *dict = NULL;
- gtk_window_set_title(GTK_WINDOW(dialog->FileChooser),TITLE_LABEL);
+ gtk_window_set_title(GTK_WINDOW(dialog->FileChooser),FILECHOOSER_TITLE_LABEL);
yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window);
yon_dictionary_add_or_create_if_exists_with_data(dict,"dialog",dialog);
g_signal_connect(G_OBJECT(dialog->CancelButton),"clicked",G_CALLBACK(on_close_subwindow),"FileDialog");
@@ -1117,7 +1117,7 @@ void on_rules_open(GtkWidget *self,GtkEntry *entry){
window->CancelButton=yon_gtk_builder_get_widget(builder,"CancelButton");
window->SaveButton=yon_gtk_builder_get_widget(builder,"SaveButton");
yon_window_config_custom_window_set(GTK_WINDOW(window->Window),"RulesWindow");
- gtk_window_set_title(GTK_WINDOW(window->Window),TITLE_LABEL);
+ gtk_window_set_title(GTK_WINDOW(window->Window),RULES_TITLE_LABEL);
dictionary *dict = NULL;
yon_dictionary_add_or_create_if_exists_with_data(dict,"entry",entry);
yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window);
@@ -1164,7 +1164,7 @@ void on_filechooser_open(GtkWidget *self, logrotate_configure_window *window){
gtk_window_set_transient_for(GTK_WINDOW(window->MainWindow),GTK_WINDOW(window->MainWindow));
dictionary *dict = NULL;
- gtk_window_set_title(GTK_WINDOW(dialog->FileChooser),TITLE_LABEL);
+ gtk_window_set_title(GTK_WINDOW(dialog->FileChooser),FILECHOOSER_TITLE_LABEL);
yon_dictionary_add_or_create_if_exists_with_data(dict,"window",window);
yon_dictionary_add_or_create_if_exists_with_data(dict,"dialog",dialog);
g_signal_connect(G_OBJECT(dialog->FileOrDirCheck),"toggled",G_CALLBACK(on_filechooser_mode_switch),dialog);
@@ -1574,7 +1574,7 @@ logrotate_configure_window *yon_logrotate_window_new(char *paths, logrotate_wind
window->StatusBox=yon_gtk_builder_get_widget(builder,"StatusBox");
yon_window_config_custom_window_get(GTK_WINDOW(window->MainWindow),"LogrotateWindow");
- gtk_window_set_title(GTK_WINDOW(window->MainWindow),TITLE_LABEL);
+ gtk_window_set_title(GTK_WINDOW(window->MainWindow),LOGROTATE_TITLE_LABEL);
if (dialog)
gtk_window_set_transient_for(GTK_WINDOW(window->MainWindow),GTK_WINDOW(dialog->Window));
window->paths=paths;
@@ -1971,7 +1971,7 @@ void on_logrotate_tab_open(GtkWidget *self, main_window *widgets){
window->RemoveButton = yon_gtk_builder_get_widget(builder,"RemoveButton");
window->StatusBox = yon_gtk_builder_get_widget(builder,"StatusBox");
yon_window_config_custom_window_get(GTK_WINDOW(window->Window),"LogrotateTabWindow");
- gtk_window_set_title(GTK_WINDOW(window->Window),TITLE_LABEL);
+ gtk_window_set_title(GTK_WINDOW(window->Window),TABLE_TITLE_LABEL);
gtk_window_set_transient_for(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->Window));
@@ -2208,7 +2208,7 @@ journald_window *yon_journald_open(GtkWidget *self, main_window *widgets){
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_window_set_title(GTK_WINDOW(window->MainWindow),TITLE_LABEL);
+ gtk_window_set_title(GTK_WINDOW(window->MainWindow),JOURNALD_TITLE_LABEL);
g_signal_connect(G_OBJECT(window->CancelButton),"clicked",G_CALLBACK(on_close_subwindow),"JournaldWindow");
g_signal_connect(G_OBJECT(window->SaveButton),"clicked",G_CALLBACK(on_journald_save),window);
@@ -2411,7 +2411,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),TITLE_LABEL);
+ gtk_window_set_title(GTK_WINDOW(window->MainWindow),MONITOR_TITLE_LABEL);
gtk_window_set_transient_for(GTK_WINDOW(window->MainWindow),GTK_WINDOW(widgets->Window));
dictionary *dict = NULL;
yon_dictionary_add_or_create_if_exists_with_data(dict,"widgets",widgets);
@@ -2500,7 +2500,7 @@ void on_log_path_filechooser_open(GtkWidget *self, GtkEntry *entry){
gtk_window_set_transient_for(GTK_WINDOW(dialog->FileChooser),GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(entry))));
dictionary *dict = NULL;
- gtk_window_set_title(GTK_WINDOW(dialog->FileChooser),TITLE_LABEL);
+ gtk_window_set_title(GTK_WINDOW(dialog->FileChooser),FILECHOOSER_TITLE_LABEL);
yon_dictionary_add_or_create_if_exists_with_data(dict,"entry",entry);
yon_dictionary_add_or_create_if_exists_with_data(dict,"dialog",dialog);
diff --git a/source/ubl-strings.h b/source/ubl-strings.h
index 4369a01..19adcda 100644
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@@ -72,6 +72,7 @@
#define XSESSION_DESCRIPTION_LABEL _("Graphics X session log")
//ubl-settings-logging-inspector.glade
+#define INSPECTOR_TITLE_LABEL _("Logs and events - log inspector")
#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")
@@ -86,6 +87,7 @@
#define LOG_LABEL _("Log")
//ubl-settings-logging-journald.glade
+#define JOURNALD_TITLE_LABEL _("Logs and events - journald configuration")
#define JOURNAL_DESCRIPTION_LABEL _("Description:")
#define JOURNAL_STORAGE_LABEL _("Journal storage place:")
#define COMPRESSION_LABEL _("Use compression:")
@@ -123,6 +125,7 @@
#define RESET_LABEL _("Reset")
//ubl-settings-logging-logrotate.glade
+#define LOGROTATE_TITLE_LABEL _("Logs and events - logrotate configuration")
#define LOGROTATE_LOG_JOURNAL_TAB_LABEL _("Log/Journal:")
#define PATHS_LABEL _("Paths to log and journals files")
#define ON_LABEL _("On")
@@ -200,10 +203,12 @@
#define WRITE_IMPORTANT_LABEL _("Write down all important fields")
//ubl-settings-logging-logrotate-table.glade
+#define TABLE_TITLE_LABEL _("Logs and events - logrotate table")
#define SYSTEM_CONFIGURATION_LABEL _("System configuration")
#define APPLITATIONS_CONFIGURATION_LABEL _("Applications configuration")
//ubl-settings-logging-add.glade
+#define MONITOR_TITLE_LABEL _("Logs and events - journal configuration")
#define ADD_PATHS_LABEL _("Path (-s):")
#define CONTROL_LABEL _("Control:")
#define LOG_FILE_LABEL _("Log file")
@@ -211,6 +216,7 @@
#define TOTAL_LOG_SIZE_LABEL _("Log size:")
//ubl-settings-logging-rules.glade
+#define RULES_TITLE_LABEL _("Logs and events - rules")
#define OWNER_LABEL _("Owner rules")
#define GROUP_LABEL _("Group rules")
#define PUBLIC_LABEL _("Public rules")
@@ -223,4 +229,7 @@
#define PATH_NOT_FOUND_LABEL _(": no such file(s)")
#define PARAMETER_LABEL _("Parameter")
#define OLD_VALUE_LABEL _("Old value")
-#define NEW_VALUE_LABEL _("New value")
\ No newline at end of file
+#define NEW_VALUE_LABEL _("New value")
+
+#define FILECHOOSER_TITLE_LABEL _("Logs and events - choose a path")
+#define SAVE_TITLE_LABEL _("Logs and events - saving")
\ No newline at end of file
diff --git a/ubl-settings-logging-add.glade b/ubl-settings-logging-add.glade
index 17d09b7..6373ad5 100644
--- a/ubl-settings-logging-add.glade
+++ b/ubl-settings-logging-add.glade
@@ -3,13 +3,6 @@
-
+
+
+
+
-
-
-
-
diff --git a/ubl-settings-logging-inspector.glade b/ubl-settings-logging-inspector.glade
index ccb270a..037b2d4 100644
--- a/ubl-settings-logging-inspector.glade
+++ b/ubl-settings-logging-inspector.glade
@@ -373,7 +373,7 @@
5
5
2
- Logs and events
+ Logs and events - log inspector
diff --git a/ubl-settings-logging-journald.glade b/ubl-settings-logging-journald.glade
index 1e71c7e..d448e17 100644
--- a/ubl-settings-logging-journald.glade
+++ b/ubl-settings-logging-journald.glade
@@ -1037,7 +1037,7 @@
5
5
2
- Logs and events
+ Logs and events - journald configuration
diff --git a/ubl-settings-logging-logrotate-table.glade b/ubl-settings-logging-logrotate-table.glade
index fc75f46..9e5aa4d 100644
--- a/ubl-settings-logging-logrotate-table.glade
+++ b/ubl-settings-logging-logrotate-table.glade
@@ -171,6 +171,9 @@