diff --git a/locale/ubinstall-gtk.pot b/locale/ubinstall-gtk.pot index 2271d1b..14ba39c 100644 --- a/locale/ubinstall-gtk.pot +++ b/locale/ubinstall-gtk.pot @@ -451,7 +451,7 @@ msgid "Installation configuration has ended" msgstr "" #: source/ubl-strings.h:124 -msgid "system installation is about to begin" +msgid "System installation is about to begin" msgstr "" #: source/ubl-strings.h:126 @@ -1183,4 +1183,8 @@ msgstr "" #: source/ubl-strings.h:331 msgid "About system installation" -msgstr "" \ No newline at end of file +msgstr "" + +#: source/ubl-strings.h:331 +msgid "Repeating values" +msgstr "" diff --git a/locale/ubinstall-gtk_ru.po b/locale/ubinstall-gtk_ru.po index 033d640..12c1eb2 100644 --- a/locale/ubinstall-gtk_ru.po +++ b/locale/ubinstall-gtk_ru.po @@ -471,7 +471,7 @@ msgid "Installation configuration has ended" msgstr "Настройка установщика завершена" #: source/ubl-strings.h:124 -msgid "system installation is about to begin" +msgid "System installation is about to begin" msgstr "Начало установки системы" #: source/ubl-strings.h:126 @@ -3023,4 +3023,8 @@ msgid "Zulu" msgstr "Зулу" msgid "Zurich" -msgstr "Цюрих" \ No newline at end of file +msgstr "Цюрих" + +#: source/ubl-strings.h:331 +msgid "Repeating values" +msgstr "Повторяющиеся значения" \ No newline at end of file diff --git a/source/ubinstall-gtk-page-switch.c b/source/ubinstall-gtk-page-switch.c index 4cd7a13..24ca3c8 100644 --- a/source/ubinstall-gtk-page-switch.c +++ b/source/ubinstall-gtk-page-switch.c @@ -372,7 +372,7 @@ void yon_page_init(main_window *widgets, enum YON_PAGES page){ break; case YON_PAGE_INSTALL_ADVANCED: yon_install_advanced_init(widgets); - [[fallthrough]]; + __attribute__((fallthrough)); case YON_PAGE_INSTALL_COMMON: case YON_PAGE_INSTALL_SEPARATE: case YON_PAGE_INSTALL_SAME_PARTITION: @@ -449,7 +449,11 @@ void on_system_setup_pass(GtkWidget *, main_window *widgets){ if (main_config.configure_mode){ gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_CONFIGURE_END); } else { - gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION); + if (main_config.install_complete) { + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_COMPLETION); + } else { + gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION); + } } yon_page_update(widgets); } \ No newline at end of file diff --git a/ubinstall-gtk-configuration-mode.glade b/ubinstall-gtk-configuration-mode.glade index f4e73df..676b330 100644 --- a/ubinstall-gtk-configuration-mode.glade +++ b/ubinstall-gtk-configuration-mode.glade @@ -1,5 +1,5 @@ - + @@ -152,7 +152,7 @@ True False 2 - UBLinux installation + System installation diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index 53a7dd8..201d8e3 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -766,7 +766,6 @@ agreement 5 5 left - False True