diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c
index 724558e..87c8c1a 100644
--- a/source/ubl-settings-video.c
+++ b/source/ubl-settings-video.c
@@ -20,6 +20,13 @@ void on_proprietary_driver_window_open(GtkWidget *self){
GtkBuilder *builder=gtk_builder_new_from_file(glade_path);
GtkWidget *window=yon_gtk_builder_get_widget(builder,"ProprietaryDriverChooseWindow");
GtkWidget *closeButton=yon_gtk_builder_get_widget(builder,"ProprietaryCloseButton");
+ GtkWidget *acceptButton=yon_gtk_builder_get_widget(builder,"ProprietaryAcceptButton");
+ GtkWidget *columnDriver=yon_gtk_builder_get_widget(builder,"ProprietaryDriverColumn");
+ GtkWidget *columnDescription=yon_gtk_builder_get_widget(builder,"ProprietaryDescriptionColumn");
+ gtk_button_set_label(GTK_BUTTON(closeButton),_("Cancel"));
+ gtk_button_set_label(GTK_BUTTON(acceptButton),_("Accept"));
+ gtk_tree_view_column_set_title(GTK_TREE_VIEW_COLUMN(columnDriver),_("Driver"));
+ gtk_tree_view_column_set_title(GTK_TREE_VIEW_COLUMN(columnDescription),_("Description"));
gtk_widget_show(window);
g_signal_connect(G_OBJECT(closeButton), "clicked", G_CALLBACK(on_close_subwindow), NULL);
@@ -212,7 +219,8 @@ void on_confugure_monitor_settings(GtkWidget *self, MonitorSettings *settings){
// gtk_label_set_text(GTK_LABEL(monitors->templateMonitorConfigurationDoNotSwitchOffLabel),_("Do not switch display off"));
gtk_button_set_label(GTK_BUTTON(monitors->templateMonitorConfigurationMainRadio),_("Main monitor"));
gtk_button_set_label(GTK_BUTTON(monitors->templateMonitorConfigurationParameterLineCheck),_("through parameter line:"));
- gtk_button_set_label(GTK_BUTTON(monitors->templateMonitorConfigurationDoNotSwitchOffCheck),_("DPMS off"));
+ // gtk_button_set_label(GTK_BUTTON(monitors->templateMonitorConfigurationDoNotSwitchOffCheck),_("DPMS off"));
+ gtk_button_set_label(GTK_BUTTON(monitors->templateMonitorConfigurationCancelButton),_("Cancel"));
gtk_widget_show(monitors->templateMonitorConfigurationWindow);
char *addln=NULL;
if (!settings->curconfig||!((monitorconfig*)settings->curconfig->data)->resolution) addln=_("Default settings");
diff --git a/source/ubl-settings-video.h b/source/ubl-settings-video.h
index 56b9fc6..3f34972 100644
--- a/source/ubl-settings-video.h
+++ b/source/ubl-settings-video.h
@@ -31,11 +31,11 @@
#define load_drivers_global_command "/usr/bin/ubconfig --default --source global get video FAILSAFENVIDIA FAILSAFEATI OPTIRUN PRIMUSRUN "
-#define save_drivers_global_command "/usr/bin/ubconfig --default --source global set video FAILSAFENVIDIA=%s FAILSAFEATI=%s OPTIRUN=%s PRIMUSRUN=%s "
+#define save_drivers_global_command "/usr/bin/ubconfig --target global set video FAILSAFENVIDIA=%s FAILSAFEATI=%s OPTIRUN=%s PRIMUSRUN=%s "
#define load_drivers_local_command "/usr/bin/ubconfig --default --source system get video FAILSAFENVIDIA FAILSAFEATI OPTIRUN PRIMUSRUN "
-#define save_drivers_local_command "/usr/bin/ubconfig --default --source system set video FAILSAFENVIDIA=%s FAILSAFEATI=%s OPTIRUN=%s PRIMUSRUN=%s "
+#define save_drivers_local_command "/usr/bin/ubconfig --target system set video FAILSAFENVIDIA=%s FAILSAFEATI=%s OPTIRUN=%s PRIMUSRUN=%s "
char *local;
diff --git a/ubl-settings-video.desktop b/ubl-settings-video.desktop
index 4b2a3ed..b2b9897 100644
--- a/ubl-settings-video.desktop
+++ b/ubl-settings-video.desktop
@@ -1,11 +1,11 @@
[Desktop Entry]
Encoding=UTF-8
Name=ubl-settings-video
-Name[ru]=Настройки Видеовывода
+Name[ru]=Настройки Видеоадаптера и дисплея
GenericName=ubl-settings-video
-GenericName[ru]=Настройки Видеовывода
-Comment=ubl-settings-video
-Comment[ru]=Приложение для управления настройками видеовывода для UBLinux
+GenericName[ru]=Настройки Видеоадаптера и дисплея
+Comment=Application for managing video adapter and display settings
+Comment[ru]=Приложение для управления настройками видеоадаптера и дисплея
Type=Application
Exec=ubl-settings-video
Icon=com.ublinux.ubl-settings-video
diff --git a/ubl-settings-video.glade b/ubl-settings-video.glade
index 5be249b..2ee72e6 100644
--- a/ubl-settings-video.glade
+++ b/ubl-settings-video.glade
@@ -1461,7 +1461,7 @@
-
-
+
Description
@@ -1518,7 +1518,7 @@
-
+
Accept
True
True
@@ -1796,20 +1796,6 @@
3
-
-
- True
- False
-
-
-
-
-
- True
- True
- 4
-
-
True
@@ -1874,6 +1860,7 @@
False
True
+ end
6
diff --git a/ubl-settings-video_ru.po b/ubl-settings-video_ru.po
index f21a5f7..fc99cdd 100644
--- a/ubl-settings-video_ru.po
+++ b/ubl-settings-video_ru.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ubl-settings-manager 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-04 18:00+0000\n"
+"POT-Creation-Date: 2023-04-05 10:05+0000\n"
"PO-Revision-Date: 2023-01-01 00:00+0600\n"
"Last-Translator: UBLinux Team \n"
"Language-Team: UBLinux Team \n"
@@ -17,178 +17,186 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: source/ubl-settings-video.c:80 source/ubl-settings-video.c:384
+#: source/ubl-settings-video.c:26 source/ubl-settings-video.c:223
+msgid "Cancel"
+msgstr "Отмена"
+
+#: source/ubl-settings-video.c:27
+msgid "Accept"
+msgstr "Принять"
+
+#: source/ubl-settings-video.c:28 source/ubl-settings-video.c:386
+msgid "Driver"
+msgstr "Драйвер"
+
+#: source/ubl-settings-video.c:29
+msgid "Description"
+msgstr "Описание"
+
+#: source/ubl-settings-video.c:87 source/ubl-settings-video.c:392
msgid "UBlinux Video Configuration"
msgstr "Видеокарта/Экран"
-#: source/ubl-settings-video.c:82
+#: source/ubl-settings-video.c:89
msgid "Progect Home Page"
msgstr "Домашняя страница проекта"
-#: source/ubl-settings-video.c:83
+#: source/ubl-settings-video.c:90
#, fuzzy
msgid "Videocard and monitor configuration manager"
msgstr "Настройка вывода изображения"
-#: source/ubl-settings-video.c:208
+#: source/ubl-settings-video.c:215
msgid "Monitor: "
msgstr "Монитор: "
-#: source/ubl-settings-video.c:209
+#: source/ubl-settings-video.c:216
msgid "Resolution (px): "
msgstr "Разрешение (px): "
-#: source/ubl-settings-video.c:210
+#: source/ubl-settings-video.c:217
msgid "Frequency (Hz): "
msgstr "Обновления (Hz): "
-#: source/ubl-settings-video.c:211
+#: source/ubl-settings-video.c:218
msgid "Rotation: "
msgstr "Вращение: "
-#: source/ubl-settings-video.c:213
+#: source/ubl-settings-video.c:220
#, fuzzy
msgid "Main monitor"
msgstr "Основной"
-#: source/ubl-settings-video.c:214
+#: source/ubl-settings-video.c:221
msgid "through parameter line:"
msgstr "Через строку параметра: "
-#: source/ubl-settings-video.c:215
-msgid "DPMS off"
-msgstr "DMPS выключен"
-
-#: source/ubl-settings-video.c:218 source/ubl-settings-video.c:223
-#: source/ubl-settings-video.c:225 source/ubl-settings-video.c:228
-#: source/ubl-settings-video.c:230 source/ubl-settings-video.c:250
+#: source/ubl-settings-video.c:226 source/ubl-settings-video.c:231
+#: source/ubl-settings-video.c:233 source/ubl-settings-video.c:236
+#: source/ubl-settings-video.c:238 source/ubl-settings-video.c:258
msgid "Default settings"
msgstr "По умолчанию"
-#: source/ubl-settings-video.c:366
+#: source/ubl-settings-video.c:374
msgid "Don't use"
msgstr "Не использовать"
-#: source/ubl-settings-video.c:367 source/ubl-settings-video.c:369
+#: source/ubl-settings-video.c:375 source/ubl-settings-video.c:377
msgid "Off"
msgstr "Выключить"
-#: source/ubl-settings-video.c:368 source/ubl-settings-video.c:370
+#: source/ubl-settings-video.c:376 source/ubl-settings-video.c:378
msgid "fbdev"
msgstr "fbdev"
-#: source/ubl-settings-video.c:372
+#: source/ubl-settings-video.c:380
msgid "1st variant. May cause perfomance drops in video games"
msgstr "1 вариант. Может снизить производительность в играх"
-#: source/ubl-settings-video.c:373
+#: source/ubl-settings-video.c:381
msgid "2nd variant. May not work on specific video cards"
msgstr "2 вариант. Не на каждой карте может сработать"
-#: source/ubl-settings-video.c:374
+#: source/ubl-settings-video.c:382
msgid "Video output configuration"
msgstr "Настройка вывода изображения"
-#: source/ubl-settings-video.c:375
+#: source/ubl-settings-video.c:383
#, fuzzy
msgid "Proprietary driver: "
msgstr "Проприетарный драйвер: "
-#: source/ubl-settings-video.c:376
+#: source/ubl-settings-video.c:384
#, fuzzy
msgid "Failsafe driver nVidia: "
msgstr "Отказоучтойчивый драйвер nVidia: "
-#: source/ubl-settings-video.c:377
+#: source/ubl-settings-video.c:385
#, fuzzy
msgid "Failsafe driver AMD/ATI: "
msgstr "Отказоустойчивый драйвер AMD/ATI: "
-#: source/ubl-settings-video.c:378
-msgid "Driver"
-msgstr "Драйвер"
-
-#: source/ubl-settings-video.c:380
+#: source/ubl-settings-video.c:388
msgid "Monitor configuration"
msgstr "Настройка экрана"
-#: source/ubl-settings-video.c:381
+#: source/ubl-settings-video.c:389
msgid "Hybrid graphics"
msgstr "Гибридная графика"
-#: source/ubl-settings-video.c:382
+#: source/ubl-settings-video.c:390
msgid "Fix frame gap (nVidia)"
msgstr "Исправить разрыв кадров (nVidia)"
-#: source/ubl-settings-video.c:383
+#: source/ubl-settings-video.c:391
msgid "Extra"
msgstr "Дополнительно"
-#: source/ubl-settings-video.c:385
+#: source/ubl-settings-video.c:393
msgid "Load"
msgstr "Загрузить"
-#: source/ubl-settings-video.c:386
+#: source/ubl-settings-video.c:394
msgid "Save"
msgstr "Сохранить"
-#: source/ubl-settings-video.c:388
+#: source/ubl-settings-video.c:396
msgid "On"
msgstr "Включить"
-#: source/ubl-settings-video.c:389
+#: source/ubl-settings-video.c:397
msgid "Automatically choose and use driver"
msgstr "Автоматический выбор и использование драйвера"
-#: source/ubl-settings-video.c:390
+#: source/ubl-settings-video.c:398
#, fuzzy
msgid "Launch programms through optirun (nVidia): "
msgstr "Запуск программ через (nVidia)"
-#: source/ubl-settings-video.c:391
+#: source/ubl-settings-video.c:399
#, fuzzy
msgid "Launch programs through primusun (nVidia): "
msgstr "Запуск программ через (nVidia)"
-#: source/ubl-settings-video.c:392
+#: source/ubl-settings-video.c:400
msgid "discrete video only (AMD/ATI)"
msgstr "Только дискретное видео (AMD/ATI)"
-#: source/ubl-settings-video.c:394
+#: source/ubl-settings-video.c:402
#, fuzzy
msgid "Load from global configuration"
msgstr "Загрузить глобальную конфигурацию"
-#: source/ubl-settings-video.c:395
+#: source/ubl-settings-video.c:403
#, fuzzy
msgid "Load from local configuration"
msgstr "Загрузить локальную конфигуруцию"
-#: source/ubl-settings-video.c:396
+#: source/ubl-settings-video.c:404
#, fuzzy
msgid "Save to global an local configuration"
msgstr "Сохранить в глобальную и локальную конфигурацию"
-#: source/ubl-settings-video.c:397
+#: source/ubl-settings-video.c:405
#, fuzzy
msgid "Save to global configuration"
msgstr "Сохранить в глобальную конфигурацию"
-#: source/ubl-settings-video.c:398
+#: source/ubl-settings-video.c:406
#, fuzzy
msgid "Save to local configuration"
msgstr "Схоранить в локальную конфигурацию"
-#: source/ubl-settings-video.c:399
+#: source/ubl-settings-video.c:407
#, fuzzy
msgid "Documentation"
msgstr "Справка"
-#: source/ubl-settings-video.c:400
+#: source/ubl-settings-video.c:408
msgid "About"
msgstr "О программе"
-#: source/ubl-settings-video.c:430
+#: source/ubl-settings-video.c:438
msgid "Configuration has been loaded"
msgstr "Конфигурация была загружена"
@@ -211,3 +219,6 @@ msgstr "Успешное сохранение глобальной конфиг
#, fuzzy
msgid "Saving to local configuration Succeeded"
msgstr "Успешное сохранение локальной конфигурации"
+
+#~ msgid "DPMS off"
+#~ msgstr "DMPS выключен"