master #67

Merged
asmeron merged 3 commits from YanTheKaller/ubinstall-gtk:master into master 1 year ago

@ -95,7 +95,7 @@ add_definitions(-DVTE_INCLUDE)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
-O2 -pipe -fno-plt -fexceptions \ -O2 -pipe -fno-plt -fexceptions \
-Wformat -Werror=format-security \ -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) string(FIND "${CMAKE_CXX_FLAGS}" "-D_FORTIFY_SOURCE" FORTIFY_FOUND)

@ -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->CancelInstallButton,0);
gtk_widget_set_sensitive(widgets->BackButton,0); gtk_widget_set_sensitive(widgets->BackButton,0);
gtk_widget_set_sensitive(widgets->NextButton,1); 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->NextButton),NEXT_LABEL);
gtk_button_set_label(GTK_BUTTON(widgets->CancelInstallButton),CANCEL_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); 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);

@ -47,7 +47,7 @@ msgstr "Показать версию пакета"
#: source/ubl-strings.h:2 #: source/ubl-strings.h:2
msgid "Lock this help menu" msgid "Lock this help menu"
msgstr "Залокировать эту подсазку" msgstr "Заблокировать эту подсазку"
#: source/ubl-strings.h:2 #: source/ubl-strings.h:2
msgid "Lock configuration saving" msgid "Lock configuration saving"
@ -67,7 +67,7 @@ msgstr "Заблокировать загрузку глобальной кон
#: source/ubl-strings.h:2 #: source/ubl-strings.h:2
msgid "Reset application settings" msgid "Reset application settings"
msgstr "Удалить конфигурацию прилодения" msgstr "Удалить конфигурацию приложения"
#: source/ubl-strings.h:4 #: source/ubl-strings.h:4
#, fuzzy #, fuzzy

Loading…
Cancel
Save