From d80cf85f0d020004249a5da13f1ad7caa652c48d Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 26 Aug 2024 09:09:53 +0600 Subject: [PATCH 01/15] Localisation fixes --- source/ubl-strings.h | 4 ++-- ubinstall-gtk.glade | 14 ++++++++------ ubinstall-gtk.pot | 10 +++++----- ubinstall-gtk_ru.po | 28 ++++++++++++++-------------- 4 files changed, 29 insertions(+), 27 deletions(-) diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 42384a7..7fe8d74 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -24,7 +24,7 @@ #define COMPLETION_TAB_LABEL _("Completion") #define COMMON_INSTALL_INFO_LABEL _("Deleting all data on the selected disk and then installing the UBLinux system") #define NEAR_INSTALL_LABEL _("Installation next to another system") -#define NEAR_INSTALL_INFO_LABEL _("Shrinking a partition and creating a new one for installing UBLinux") +#define NEAR_INSTALL_INFO_LABEL _("Shrinking a partition and creating a new one for installing OS") #define SHRINK_SECTION_INSTALL_LABEL _("Installation on the same partition as another system") #define SHRINK_SECTION_INSTALL_INFO_LABEL _("Unpacking the UBLinux file system into an existing system") #define ADDITIONAL_INSTALL_INFO_LABEL _("Selecting additional software to install from the repository via the Internet") @@ -57,7 +57,7 @@ #define INSTALLATION_COMPLETION_LABEL _("Installation completion") #define SELECT_DEVICE_LABEL _("Select device:") #define CHOOSE_SECTION_LABEL _("Choose a section:") -#define ATTENSION_LABEL _("Attention! The selected partition will be modified: the size will be reduced. In the resulting free space, a partition will be created into which the UBLinux OS will be\ninstalled.") +#define ATTENSION_LABEL _("Attention! The selected partition will be modified: the size will be reduced. In the resulting free space, a partition will be created into which the UBLinux OS will be\ninstalled.") #define DEVICE_LABEL _("Device") #define MARK_LABEL _("Mark") #define SIZE_LABEL _("Size") diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index 2988de9..b908df2 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -884,7 +884,7 @@ and help you install UBLinux on your computer True False - Shrinking a partition and creating a new one for installing UBLinux + Shrinking a partition and creating a new one for installing OS 0 @@ -960,7 +960,7 @@ and help you install UBLinux on your computer True False - Unpacking the UBLinux file system into an existing system + Unpacking into an existing system 0 @@ -3283,7 +3283,7 @@ or continue working in the UBLinux Live environment. True False - Shrinking a partition and creating a new one for installing UBLinux + Shrinking a partition and creating a new one for installing OS 0 @@ -3310,8 +3310,9 @@ or continue working in the UBLinux Live environment. True False - Attention! The selected partition will be modified: the size will be reduced. In the resulting free space, a partition will be created into which the UBLinux OS will be + <b>Attention!</b> The selected partition will be modified: the size will be reduced. In the resulting free space, a partition will be created into which the UBLinux OS will be installed. + True True 0 0 @@ -3884,7 +3885,7 @@ installed. True False - Unpacking the UBLinux file system into an existing system + Unpacking into an existing system 0 @@ -3911,7 +3912,8 @@ installed. True False - Attention! The UBLinux OS will be installed on the selected partition with OS already installed. All user data will be saved. + <b>Attention!</b> The UBLinux OS will be installed on the selected partition with OS already installed. All user data will be saved. + True True 0 0 diff --git a/ubinstall-gtk.pot b/ubinstall-gtk.pot index 77968d2..336bfbd 100644 --- a/ubinstall-gtk.pot +++ b/ubinstall-gtk.pot @@ -143,7 +143,7 @@ msgid "Installation next to another system" msgstr "" #: source/ubl-strings.h:24 -msgid "Shrinking a partition and creating a new one for installing UBLinux" +msgid "Shrinking a partition and creating a new one for installing OS" msgstr "" #: source/ubl-strings.h:25 @@ -151,7 +151,7 @@ msgid "Installation on the same partition as another system" msgstr "" #: source/ubl-strings.h:26 -msgid "Unpacking the UBLinux file system into an existing system" +msgid "Unpacking into an existing system" msgstr "" #: source/ubl-strings.h:27 @@ -261,7 +261,7 @@ msgstr "" #: source/ubl-strings.h:56 msgid "" -"Attention! The selected partition will be modified: the size will be " +"Attention! The selected partition will be modified: the size will be " "reduced. In the resulting free space, a partition will be created into which " "the UBLinux OS will be\n" "installed." @@ -326,7 +326,7 @@ msgstr "" #: source/ubl-strings.h:73 msgid "" -"Attention! The selected OC UBLinux components will be installed\n" +"Attention! The selected OC UBLinux components will be installed\n" "separately into the selected partition." msgstr "" @@ -529,7 +529,7 @@ msgstr "" #: source/ubl-strings.h:132 msgid "" -"Attention! The UBLinux OS will be installed on the selected partition with " +"Attention! The UBLinux OS will be installed on the selected partition with " "OS already installed. All user data will be saved." msgstr "" diff --git a/ubinstall-gtk_ru.po b/ubinstall-gtk_ru.po index 598c542..1f7041e 100644 --- a/ubinstall-gtk_ru.po +++ b/ubinstall-gtk_ru.po @@ -153,16 +153,16 @@ msgid "Installation next to another system" msgstr "Установка рядом с другой системой" #: source/ubl-strings.h:24 -msgid "Shrinking a partition and creating a new one for installing UBLinux" -msgstr "Уменьшение раздела и создание нового для установки UBLinux" +msgid "Shrinking a partition and creating a new one for installing OS" +msgstr "Уменьшение раздела и создание нового для установки ОС" #: source/ubl-strings.h:25 msgid "Installation on the same partition as another system" msgstr "Установка в раздел другой системы" #: source/ubl-strings.h:26 -msgid "Unpacking the UBLinux file system into an existing system" -msgstr "Установить систему UBLinux в уже существующую систему" +msgid "Unpacking into an existing system" +msgstr "Установка в раздел другой системы" #: source/ubl-strings.h:27 msgid "" @@ -264,7 +264,7 @@ msgstr "Пользователь" #: source/ubl-strings.h:54 msgid "Select device:" -msgstr "Выберите устройство хранения:" +msgstr "Выберите устройство:" #: source/ubl-strings.h:55 msgid "Choose a section:" @@ -272,14 +272,14 @@ msgstr "Выберите раздел:" #: source/ubl-strings.h:56 msgid "" -"Attention! The selected partition will be modified: the size will be " +"Attention! The selected partition will be modified: the size will be " "reduced. In the resulting free space, a partition will be created into which " "the UBLinux OS will be\n" "installed." msgstr "" -"Внимание! Выбранный раздел будет модифицирован: размер будет уменьшен. В " +"Внимание! Выбранный раздел будет модифицирован: размер будет уменьшен. В " "полученном свободном пространстве будет создан раздел, в который будет " -"произведена установка ОС UBLinux" +"произведена установка ОС." #: source/ubl-strings.h:57 msgid "Device" @@ -338,11 +338,11 @@ msgstr "" #: source/ubl-strings.h:73 msgid "" -"Attention! The selected OC UBLinux components will be installed\n" +"Attention! The selected OC UBLinux components will be installed\n" "separately into the selected partition." msgstr "" -"Внимание! В выбранный раздел будет произведена раздельная установка " -"выбранных компонентов ОС UBLinux/" +"Внимание! В выбранный раздел будет произведена раздельная установка " +"выбранных компонентов ОС UBLinux." #: source/ubl-strings.h:74 msgid "GRUB install" @@ -550,11 +550,11 @@ msgstr "Ошибка установки" #: source/ubl-strings.h:132 msgid "" -"Attention! The UBLinux OS will be installed on the selected partition with " +"Attention! The UBLinux OS will be installed on the selected partition with " "OS already installed. All user data will be saved." msgstr "" -"Внимание! ОС UBLinux будет установлена в выбранный раздел. Если не менять " -"тип ФС и не форматировать, все данные на разделе будут сохранены" +"Внимание! В выбранный раздел будет произведена установка системы. Если не менять " +"тип ФС и не форматировать, все данные на разделе будут сохранены." #: source/ubl-strings.h:134 msgid "Installation options" -- 2.35.1 From 61d115a3a445a66edbc69d7be97b0505e1195619 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 26 Aug 2024 10:06:27 +0600 Subject: [PATCH 02/15] Localisation edits --- source/ubinstall-gtk.c | 4 ++-- source/ubl-strings.h | 5 ++++- ubinstall-gtk.pot | 6 ++++++ ubinstall-gtk_ru.po | 6 ++++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index 4b27e00..cf833ef 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -1239,7 +1239,7 @@ void on_process_log_view(GtkWidget *,main_window *widgets){ g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_log_closed),dict); gtk_widget_set_sensitive(widgets->ReadFullLogButton,0); gtk_widget_set_sensitive(widgets->ReadShortLogButton,0); - yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,LOG_VIEW_LABEL,icon_path,"log_viewer"); + yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,INSTALL_LOG_LABEL,icon_path,"log_viewer"); window->command = yon_char_new(short_log_path); gdk_threads_add_timeout(500,(GSourceFunc)yon_read_log,window); } @@ -1252,7 +1252,7 @@ void on_summary_log_view(GtkWidget *,main_window *widgets){ g_signal_connect(G_OBJECT(window->Window),"destroy",G_CALLBACK(on_log_closed),dict); gtk_widget_set_sensitive(widgets->ReadFullLogButton,0); gtk_widget_set_sensitive(widgets->ReadShortLogButton,0); - yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,LOG_VIEW_LABEL,icon_path,"log_viewer"); + yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,PROGRESS_LOG_LABEL,icon_path,"log_viewer"); window->command = yon_char_new(full_log_path); gdk_threads_add_timeout(500,(GSourceFunc)yon_read_log,window); diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 7fe8d74..7e4e53e 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -173,4 +173,7 @@ #define ACCEPT_LABEL _("Accept") #define GPARTED_LABEL _("Start GParted") -#define EXIT_WARNING_LABEL _("Are you sure want to exit and interrupt installation process?") \ No newline at end of file +#define EXIT_WARNING_LABEL _("Are you sure want to exit and interrupt installation process?") + +#define PROGRESS_LOG_LABEL _("Progress log") +#define INSTALL_LOG_LABEL _("Installation log") \ No newline at end of file diff --git a/ubinstall-gtk.pot b/ubinstall-gtk.pot index 336bfbd..46e7711 100644 --- a/ubinstall-gtk.pot +++ b/ubinstall-gtk.pot @@ -616,6 +616,12 @@ msgstr "" msgid "Administrator" msgstr "" +msgid "Installation log" +msgstr "" + +msgid "Progress log" +msgstr "" + msgid "English, U.S.A.; Russian, Russia" msgstr "" diff --git a/ubinstall-gtk_ru.po b/ubinstall-gtk_ru.po index 1f7041e..518eec4 100644 --- a/ubinstall-gtk_ru.po +++ b/ubinstall-gtk_ru.po @@ -629,6 +629,12 @@ msgstr "Настройки" msgid "Administrator" msgstr "Администратор" +msgid "Installation log" +msgstr "Лог установки" + +msgid "Progress log" +msgstr "Лог прогресса" + #: source/ubl-strings.h:140 msgid "Read installation log" msgstr "Открыть лог установки" -- 2.35.1 From 2ccabba29905213e391bcb56a796b0cb7aea5a1c Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 26 Aug 2024 11:46:36 +0600 Subject: [PATCH 03/15] Remove keyboard layout button fix --- source/ubinstall-gtk.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index cf833ef..34621c5 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -719,6 +719,16 @@ void on_keyboard_clicked (GtkWidget *, main_window *widgets){ gtk_widget_show(window->MainWindow); } +void on_keyboard_removed(GtkWidget *, main_window *widgets); +void on_keyboard_removed(GtkWidget *, main_window *widgets){ + GtkTreeModel *model; + GtkTreeIter iter, childiter; + if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->LayoutTree)),&model,&iter)){ + gtk_tree_model_filter_convert_iter_to_child_iter(GTK_TREE_MODEL_FILTER(widgets->LayoutsFilter),&childiter,&iter); + gtk_tree_store_set(widgets->LayoutList,&childiter,3,0,-1); + } +} + void yon_language_selection_changed(GtkCellRenderer *, char *path, ubinstall_language_window *window); void yon_language_selection_changed(GtkCellRenderer *, char *path, ubinstall_language_window *window){ GtkTreeIter iter; @@ -2328,6 +2338,7 @@ main_window *yon_main_window_complete(){ g_signal_connect(G_OBJECT(widgets->AvailableLanguagesButton),"clicked",G_CALLBACK(on_language_clicked),widgets); g_signal_connect(G_OBJECT(widgets->RegionCombo),"changed",G_CALLBACK(on_region_changed),widgets); g_signal_connect(G_OBJECT(widgets->AddButton),"clicked",G_CALLBACK(on_keyboard_clicked),widgets); + g_signal_connect(G_OBJECT(widgets->RemoveButton),"clicked",G_CALLBACK(on_keyboard_removed),widgets); g_signal_connect(G_OBJECT(widgets->UsersToggle),"toggled",G_CALLBACK(on_toggle_block),NULL); g_signal_connect(G_OBJECT(widgets->LicenceToggle),"toggled",G_CALLBACK(on_toggle_block),NULL); -- 2.35.1 From b493a915992eca4794cd1185ff57cb9527584a5e Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 26 Aug 2024 11:57:08 +0600 Subject: [PATCH 04/15] Localisation fixes --- source/ubl-strings.h | 5 ++++- ubinstall-gtk.glade | 2 ++ ubinstall-gtk.pot | 6 ++++++ ubinstall-gtk_ru.po | 6 ++++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 7e4e53e..fb8f6a6 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -176,4 +176,7 @@ #define EXIT_WARNING_LABEL _("Are you sure want to exit and interrupt installation process?") #define PROGRESS_LOG_LABEL _("Progress log") -#define INSTALL_LOG_LABEL _("Installation log") \ No newline at end of file +#define INSTALL_LOG_LABEL _("Installation log") + +#define ADD_LAYOUT_LABEL _("Add layouts") +#define REMOVE_LAYOUT_LABEL _("Remove layout") \ No newline at end of file diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index b908df2..b8debf6 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -2159,6 +2159,7 @@ and help you install UBLinux on your computer False True True + Add layouts image13