diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index 15168cc..9374685 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -422,8 +422,6 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){ gtk_widget_set_sensitive(widgets->BackButton,0); if (main_config.config_save_thread) g_thread_join(main_config.config_save_thread); - // if (!main_config.install_thread&&!main_config.install_complete) - // main_config.install_thread = g_thread_new("InstallThread",(GThreadFunc)yon_installation_start,widgets); if (!main_config.progress_thread) main_config.progress_thread = gdk_threads_add_timeout(500,(GSourceFunc)yon_installation_progress_update,widgets); diff --git a/source/ubl-strings.h b/source/ubl-strings.h index e8cd942..84a4a37 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -115,4 +115,8 @@ #define DOCUMENTATION_CHECK_LABEL _("Always redirect to online documentation") #define OPEN_DOCUMENTATION_LABEL _("Open documentation") -#define INSTALLATION_ERROR _("Installation error") \ No newline at end of file +#define INSTALLATION_ERROR _("Installation error") +#define ATTENTION_NEXT_LABEL _("Attention! The UBLinux OS will be installed on the selected partition with OS already installed. All user data will be saved.") + +#define ERROR_HEAD_LABEL _("Error") +#define ERROR_LABEL _("Error has occured while installation process") \ No newline at end of file diff --git a/ubinstall-gtk.pot b/ubinstall-gtk.pot index bdbfe9d..ee1a341 100644 --- a/ubinstall-gtk.pot +++ b/ubinstall-gtk.pot @@ -462,6 +462,22 @@ msgstr "" msgid "Open documentation" msgstr "" +#: source/ubl-strings.h:102 +msgid "Installation error" +msgstr "" + +#: source/ubl-strings.h:102 +msgid "Attention! The UBLinux OS will be installed on the selected partition with OS already installed. All user data will be saved." +msgstr "" + +#: source/ubl-strings.h:102 +msgid "Error" +msgstr "" + +#: source/ubl-strings.h:102 +msgid "Error has occured while installation process" +msgstr "" + msgid "Afrikaans" msgstr "" diff --git a/ubinstall-gtk_ru.po b/ubinstall-gtk_ru.po index bf87102..0684f71 100644 --- a/ubinstall-gtk_ru.po +++ b/ubinstall-gtk_ru.po @@ -479,6 +479,22 @@ msgstr "Всегда перенаправлять" msgid "Open documentation" msgstr "Открыть документацию" +#: source/ubl-strings.h:102 +msgid "Installation error" +msgstr "Ошибка установки" + +#: source/ubl-strings.h:102 +msgid "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:102 +msgid "Error" +msgstr "Ошибка" + +#: source/ubl-strings.h:102 +msgid "Error has occured while installation process" +msgstr "Во время процесса установки произошла ошибка" + msgid "Afrikaans" msgstr "Африканский"