From 6807ec102863b30f616c87f4a7373c1319836665 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 22 May 2023 15:51:22 +0600 Subject: [PATCH 1/3] Fixed russian localisation --- ubl-settings-video_ru.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubl-settings-video_ru.po b/ubl-settings-video_ru.po index 688b256..8ab4c78 100644 --- a/ubl-settings-video_ru.po +++ b/ubl-settings-video_ru.po @@ -145,7 +145,7 @@ msgstr "Не выключать дисплей" #: source/ubl-settings-video-strings.h:12 msgid "Create modeline for current resolution with CVT" -msgstr "Создать modeline для укащанного разрешения с помощью CVT" +msgstr "Создать modeline для указанного разрешения с помощью CVT" #: source/ubl-settings-video-strings.h:13 msgid "Use \"CVT Reduced Blanking\"" From 30c3ced8000aa0ac8121d97bf1ebf05334bf23db Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 23 May 2023 09:10:10 +0600 Subject: [PATCH 2/3] Fixed translation --- ubl-settings-video_ru.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ubl-settings-video_ru.po b/ubl-settings-video_ru.po index 8ab4c78..f4a6268 100644 --- a/ubl-settings-video_ru.po +++ b/ubl-settings-video_ru.po @@ -150,7 +150,7 @@ msgstr "Создать modeline для указанного разрешения #: source/ubl-settings-video-strings.h:13 msgid "Use \"CVT Reduced Blanking\"" msgstr "" -"Использовать \"CVT Reduced Blanking\" уменьшения пропускной способности\n" +"Использовать \"CVT Reduced Blanking\" для уменьшения пропускной способности\n" "для дисплеев с высоким разрешением" #: source/ubl-settings-video-strings.h:14 @@ -438,11 +438,11 @@ msgstr "Настройки экрана сохранены" #: source/ubl-settings-video-strings.h:98 msgid "Global configuration loading succseeded." -msgstr "Успешно загружена глобальная конфигураци" +msgstr "Успешно загружена глобальная конфигурация" #: source/ubl-settings-video-strings.h:99 msgid "Local configuration loading succseeded." -msgstr "Успешно загружена локальная конфигураци" +msgstr "Успешно загружена локальная конфигурация" #: source/ubl-settings-video-strings.h:101 msgid "Local and global configuration saving succseeded." From 988e897394431c215f6ba2bdb21fa0daf7e3c797 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 23 May 2023 17:20:57 +0600 Subject: [PATCH 3/3] App Head rework --- source/ubl-settings-video-strings.h | 1 + source/ubl-settings-video.c | 4 +- source/ubl-settings-video.h | 1 + ubl-settings-video.glade | 58 +++++++++++++++++++++++------ ubl-settings-video.pot | 4 ++ ubl-settings-video_ru.po | 4 ++ 6 files changed, 60 insertions(+), 12 deletions(-) diff --git a/source/ubl-settings-video-strings.h b/source/ubl-settings-video-strings.h index b43592a..0b8ac84 100644 --- a/source/ubl-settings-video-strings.h +++ b/source/ubl-settings-video-strings.h @@ -3,6 +3,7 @@ #define PARAMETER_DEFAULT_LABEL _("Default settings") #define MONITOR_LABEL _("Monitor ") #define SETTINGS_VIDEO_TITLE_LABEL _("Video adapter and display settings") +#define SETTINGS_VIDEO_TITLE_INFO_LABEL _("Video output settings and videocard drivers insallation") #define MONITOR_PORT_LABEL _("Port: ") #define MONITOR_RESOLUTION_LABEL _("Resolution (px): ") #define MONITOR_FREQUENCY_LABEL _("Frequency (Hz): ") diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index 65c9171..e2644a7 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -1536,6 +1536,7 @@ void yon_setup_widgets(widgets_dict *widgets) widgets->appsPackBox = yon_gtk_builder_get_widget(widgets->builder, "appsPackBox"); widgets->MainWindow = yon_gtk_builder_get_widget(widgets->builder, "MainWindow"); widgets->headBox = yon_gtk_builder_get_widget(widgets->builder, "headBox"); + widgets->headTitleLabel = yon_gtk_builder_get_widget(widgets->builder, "headTitleLabel"); widgets->headInfoLabel = yon_gtk_builder_get_widget(widgets->builder, "headInfoLabel"); widgets->mainPlugBox = yon_gtk_builder_get_widget(widgets->builder, "mainPlugBox"); widgets->mainErrorBox = yon_gtk_builder_get_widget(widgets->builder, "mainErrorBox"); @@ -1685,7 +1686,8 @@ void yon_setup_widgets(widgets_dict *widgets) gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widgets->mainExtraFixGapCombo), GAP_FIX_1_LABEL); gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(widgets->mainExtraFixGapCombo), GAP_FIX_2_LABEL); gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->mainExtraFixGapCombo),0); - gtk_label_set_text(GTK_LABEL(widgets->headInfoLabel), SETTINGS_VIDEO_TITLE_LABEL); + gtk_label_set_text(GTK_LABEL(widgets->headTitleLabel), SETTINGS_VIDEO_TITLE_LABEL); + gtk_label_set_text(GTK_LABEL(widgets->headInfoLabel), SETTINGS_VIDEO_TITLE_INFO_LABEL); gtk_label_set_text(GTK_LABEL(widgets->mainDriverFailsafeNvidiaLabel), FAILSAFE_NVIDIA_LABEL); gtk_label_set_text(GTK_LABEL(widgets->mainDriverFailsafeAMDLabel), FAILSAFE_ATI_LABEL); gtk_label_set_text(GTK_LABEL(widgets->mainDriverFrameLabel), DRIVER_LABEL); diff --git a/source/ubl-settings-video.h b/source/ubl-settings-video.h index 19d458f..1b6a679 100644 --- a/source/ubl-settings-video.h +++ b/source/ubl-settings-video.h @@ -180,6 +180,7 @@ typedef struct GtkWidget *extraPrimusunChooseAppsButton; GtkWidget *MainWindow; GtkWidget *headBox; + GtkWidget *headTitleLabel; GtkWidget *headInfoLabel; GtkWidget *mainPlugBox; GtkWidget *mainErrorBox; diff --git a/ubl-settings-video.glade b/ubl-settings-video.glade index 450bc79..66c9a44 100644 --- a/ubl-settings-video.glade +++ b/ubl-settings-video.glade @@ -619,21 +619,57 @@ translated and supported by community. False vertical - - 255 + True False - Video output configuration - - - - - + vertical + + + 255 + True + False + end + UBLinux Multiseat + 0 + + + + + + + + True + True + 0 + + + + + 255 + True + False + start + Multiseat management + 0 + + + + + + + + True + True + 1 + + - True + False True 0 diff --git a/ubl-settings-video.pot b/ubl-settings-video.pot index 5edbd00..5a90cda 100644 --- a/ubl-settings-video.pot +++ b/ubl-settings-video.pot @@ -62,6 +62,10 @@ msgstr "" msgid "Video adapter and display settings" msgstr "" +#: source/ubl-settings-video-strings.h:2 source/ubl-settings-video-strings.h:5 +msgid "Video output settings and videocard drivers insallation" +msgstr "" + #: source/ubl-settings-video-strings.h:2 msgid "Usage:" msgstr "" diff --git a/ubl-settings-video_ru.po b/ubl-settings-video_ru.po index f4a6268..9e86819 100644 --- a/ubl-settings-video_ru.po +++ b/ubl-settings-video_ru.po @@ -67,6 +67,10 @@ msgstr "Версия менеджера настроек вывода изобр msgid "Video adapter and display settings" msgstr "Настройка видеоадаптера и дисплея" +#: source/ubl-settings-video-strings.h:2 source/ubl-settings-video-strings.h:5 +msgid "Video output settings and videocard drivers insallation" +msgstr "Настройка вывода изображения и установка драйвера видеокарты" + #: source/ubl-settings-video-strings.h:2 msgid "Usage:" msgstr "Использование:"