Lolalisation fix; Fixed skip configuration button

pull/160/head
parent d14118a909
commit 18b23bf23e

@ -451,7 +451,7 @@ msgid "Installation configuration has ended"
msgstr "" msgstr ""
#: source/ubl-strings.h:124 #: source/ubl-strings.h:124
msgid "system installation is about to begin" msgid "System installation is about to begin"
msgstr "" msgstr ""
#: source/ubl-strings.h:126 #: source/ubl-strings.h:126
@ -1184,3 +1184,7 @@ msgstr ""
#: source/ubl-strings.h:331 #: source/ubl-strings.h:331
msgid "About system installation" msgid "About system installation"
msgstr "" msgstr ""
#: source/ubl-strings.h:331
msgid "Repeating values"
msgstr ""

@ -471,7 +471,7 @@ msgid "Installation configuration has ended"
msgstr "Настройка установщика завершена" msgstr "Настройка установщика завершена"
#: source/ubl-strings.h:124 #: source/ubl-strings.h:124
msgid "system installation is about to begin" msgid "System installation is about to begin"
msgstr "Начало установки системы" msgstr "Начало установки системы"
#: source/ubl-strings.h:126 #: source/ubl-strings.h:126
@ -3024,3 +3024,7 @@ msgstr "Зулу"
msgid "Zurich" msgid "Zurich"
msgstr "Цюрих" msgstr "Цюрих"
#: source/ubl-strings.h:331
msgid "Repeating values"
msgstr "Повторяющиеся значения"

@ -372,7 +372,7 @@ void yon_page_init(main_window *widgets, enum YON_PAGES page){
break; break;
case YON_PAGE_INSTALL_ADVANCED: case YON_PAGE_INSTALL_ADVANCED:
yon_install_advanced_init(widgets); yon_install_advanced_init(widgets);
[[fallthrough]]; __attribute__((fallthrough));
case YON_PAGE_INSTALL_COMMON: case YON_PAGE_INSTALL_COMMON:
case YON_PAGE_INSTALL_SEPARATE: case YON_PAGE_INSTALL_SEPARATE:
case YON_PAGE_INSTALL_SAME_PARTITION: case YON_PAGE_INSTALL_SAME_PARTITION:
@ -448,8 +448,12 @@ void on_system_setup_pass(GtkWidget *, main_window *widgets){
main_config.save_configured=1; main_config.save_configured=1;
if (main_config.configure_mode){ if (main_config.configure_mode){
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_CONFIGURE_END); gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_CONFIGURE_END);
} else {
if (main_config.install_complete) {
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_COMPLETION);
} else { } else {
gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION); gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION);
} }
}
yon_page_update(widgets); yon_page_update(widgets);
} }

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.2 --> <!-- Generated with glade 3.40.0 -->
<interface domain="ubinstall-gtk"> <interface domain="ubinstall-gtk">
<requires lib="gtk+" version="3.24"/> <requires lib="gtk+" version="3.24"/>
<!-- interface-css-provider-path ubinstall-gtk.css --> <!-- interface-css-provider-path ubinstall-gtk.css -->
@ -152,7 +152,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="margin-bottom">2</property> <property name="margin-bottom">2</property>
<property name="label" translatable="yes">UBLinux installation</property> <property name="label" translatable="yes">System installation</property>
<attributes> <attributes>
<attribute name="weight" value="bold"/> <attribute name="weight" value="bold"/>
</attributes> </attributes>

@ -766,7 +766,6 @@ agreement</property>
<property name="margin-top">5</property> <property name="margin-top">5</property>
<property name="margin-bottom">5</property> <property name="margin-bottom">5</property>
<property name="tab-pos">left</property> <property name="tab-pos">left</property>
<property name="show-tabs">False</property>
<child> <child>
<object class="GtkBox"> <object class="GtkBox">
<property name="visible">True</property> <property name="visible">True</property>

Loading…
Cancel
Save