From bf11f79e03808dce825b93c92cec848230d16116 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 6 Sep 2024 17:13:35 +0600 Subject: [PATCH 1/3] Localisation fixes --- ubinstall-gtk_ru.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ubinstall-gtk_ru.po b/ubinstall-gtk_ru.po index 36ae6c3..fa83994 100644 --- a/ubinstall-gtk_ru.po +++ b/ubinstall-gtk_ru.po @@ -47,7 +47,7 @@ msgstr "Показать версию пакета" #: source/ubl-strings.h:2 msgid "Lock this help menu" -msgstr "Залокировать эту подсазку" +msgstr "Заблокировать эту подсазку" #: source/ubl-strings.h:2 msgid "Lock configuration saving" @@ -67,7 +67,7 @@ msgstr "Заблокировать загрузку глобальной кон #: source/ubl-strings.h:2 msgid "Reset application settings" -msgstr "Удалить конфигурацию прилодения" +msgstr "Удалить конфигурацию приложения" #: source/ubl-strings.h:4 #, fuzzy -- 2.35.1 From 8a03f4e59bdf814c70eefc6c41e0889dea1e7771 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 6 Sep 2024 17:20:38 +0600 Subject: [PATCH 2/3] Test fix for buttons label --- source/ubinstall-gtk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index 0539b52..0bad52b 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -1080,6 +1080,7 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){ gtk_widget_set_sensitive(widgets->CancelInstallButton,0); gtk_widget_set_sensitive(widgets->BackButton,0); gtk_widget_set_sensitive(widgets->NextButton,1); + textdomain(LocaleName); gtk_button_set_label(GTK_BUTTON(widgets->NextButton),NEXT_LABEL); gtk_button_set_label(GTK_BUTTON(widgets->CancelInstallButton),CANCEL_LABEL); gtk_image_set_from_icon_name(GTK_IMAGE(gtk_button_get_image(GTK_BUTTON(widgets->NextButton))),"com.ublinux.ubinstall-gtk.arrow-right-symbolic",GTK_ICON_SIZE_BUTTON); -- 2.35.1 From 313541042e4a8b5ec2a0c135b784e13c38a144c5 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 6 Sep 2024 17:35:13 +0600 Subject: [PATCH 3/3] removed debug flags --- source/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index b60df14..a3e0cae 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -95,7 +95,7 @@ add_definitions(-DVTE_INCLUDE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \ -O2 -pipe -fno-plt -fexceptions \ -Wformat -Werror=format-security \ - -fstack-clash-protection -fcf-protection -fsanitize=address -fno-omit-frame-pointer") + -fstack-clash-protection -fcf-protection") string(FIND "${CMAKE_CXX_FLAGS}" "-D_FORTIFY_SOURCE" FORTIFY_FOUND) -- 2.35.1