Version 0.9 functionality

2 years ago · 74ffa3892b
parent 202e9d20ae
commit 74ffa3892b
8 changed files with 1110 additions and 62 deletions
--- a/source/ubinstall-gtk.c
+++ b/source/ubinstall-gtk.c
@ -298,6 +298,11 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){
            gtk_widget_hide(widgets->CancelInstallButton);
            gtk_widget_set_sensitive(widgets->BackButton,0);
            gtk_widget_set_sensitive(widgets->NextButton,1);
+            gtk_widget_set_sensitive(widgets->BackButton,0);
+            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);
+            gtk_image_set_from_icon_name(GTK_IMAGE(gtk_button_get_image(GTK_BUTTON(widgets->CancelInstallButton))),"com.ublinux.ubinstall-gtk.circle-exit-symbolic",GTK_ICON_SIZE_BUTTON);
        } break;
        case YON_PAGE_LICENCE:{
            gtk_widget_show(widgets->CancelInstallButton);
@ -330,8 +335,17 @@ void on_page_changed(GtkWidget *,GtkWidget *,int page, main_window *widgets){
        case YON_PAGE_USERS:
            gtk_widget_set_sensitive(widgets->NextButton,1);
            break;
-        case YON_PAGE_COMPLETION:
-            gtk_widget_set_sensitive(widgets->NextButton,0);
+        case YON_PAGE_COMPLETION:{
+            gtk_widget_set_sensitive(widgets->BackButton,0);
+            gtk_button_set_label(GTK_BUTTON(widgets->NextButton),RESTART_LABEL);
+            gtk_button_set_label(GTK_BUTTON(widgets->CancelInstallButton),EXIT_LABEL);
+            gtk_image_set_from_icon_name(GTK_IMAGE(gtk_button_get_image(GTK_BUTTON(widgets->NextButton))),"com.ublinux.libublsettingsui-gtk3.sync-symbolic",GTK_ICON_SIZE_BUTTON);
+            gtk_image_set_from_icon_name(GTK_IMAGE(gtk_button_get_image(GTK_BUTTON(widgets->CancelInstallButton))),"com.ublinux.libublsettingsui-gtk3.reset-symbolic",GTK_ICON_SIZE_BUTTON);
+            
+                int size=0;
+                config_str parameters = yon_config_get_all(&size);
+                main_config.config_save_thread = g_thread_new("savethread",(GThreadFunc)on_config_save,save_config_command(yon_char_parsed_to_string(parameters,size," ")));
+            }
            break;
        case YON_PAGE_INSTALL_COMMON:
        case YON_PAGE_INSTALL_SEPARATE:
@ -581,7 +595,12 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
                    yon_config_register(autologin_parameter,autologin_parameter_command,autologin);
                    yon_config_register(xkbmodel_parameter,xkbmodel_parameter_command,hostname);
                    yon_config_register(hostname_parameter,hostname_parameter_command,root_password);
+                    gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_COMPLETION);
                }break;
+                case YON_PAGE_COMPLETION:
+                    if (!system("reboot"))
+                    return;
+                break;
            }
        } break;
        case -1: { // Previous
@ -637,12 +656,12 @@ void on_additional_software_toggled(){

 }

-void on_near_installation_device_changed(GtkWidget *, main_window *widgets);
-void on_near_installation_device_changed(GtkWidget *, main_window *widgets){
+void on_near_installation_device_changed(GtkWidget *self, main_window *widgets);
+void on_near_installation_device_changed(GtkWidget *self, main_window *widgets){
    gtk_list_store_clear(widgets->PartitionsList);
    GtkTreeIter iter;
    GtkTreeModel *model;
-    if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->InstallationNearSysDevicesTree)),&model,&iter)){
+    if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(self)),&model,&iter)){
        char *disk_path="";
        gtk_tree_model_get(model,&iter,0,&disk_path,-1);
        int size;
@ -835,6 +854,7 @@ main_window *yon_main_window_complete(){
    g_signal_connect(G_OBJECT(widgets->SectionsToggle),"toggled",G_CALLBACK(on_toggle_block),NULL);
    g_signal_connect(G_OBJECT(widgets->InstallationToggle),"toggled",G_CALLBACK(on_toggle_block),NULL);
    g_signal_connect(G_OBJECT(widgets->InstallationNearSysDevicesTree),"cursor-changed",G_CALLBACK(on_near_installation_device_changed),widgets);
+    g_signal_connect(G_OBJECT(widgets->SamePlaceDeviceTree),"cursor-changed",G_CALLBACK(on_near_installation_device_changed),widgets);
    gtk_tree_model_filter_set_visible_column(GTK_TREE_MODEL_FILTER(widgets->LayoutsFilter),3);

    g_signal_connect(G_OBJECT(widgets->LanguageCombo),"changed",G_CALLBACK(on_locale_changed),widgets);
@ -877,7 +897,7 @@ main_window *yon_main_window_complete(){
        config_str cur = yon_char_parse(parsed[i],&cur_size,";");
        if (cur_size){
            gtk_list_store_append(widgets->LanguagesList,&iter);
-            gtk_list_store_set(widgets->LanguagesList,&iter,0,0,1,cur[1],2,cur[0],-1);
+            gtk_list_store_set(widgets->LanguagesList,&iter,0,0,1,_(cur[1]),2,cur[0],-1);
        }
        yon_char_parsed_free(cur,cur_size);
    }
--- a/source/ubinstall-gtk.h
+++ b/source/ubinstall-gtk.h
--- a/source/ubl-strings.h
+++ b/source/ubl-strings.h
@ -80,3 +80,25 @@
 #define PASSWORD_MISMATCH_LABEL _("Password mismatch")
 #define EMPTY_IMPORTANT_LABEL _("Empty important field")
 #define PASSWORD_SHORT_LABEL(min_size_char) yon_char_unite(_("Password must be at least")," ", min_size_char," ",_("characters"))
+
+#define RESTART_LABEL _("Restart PC")
+#define EXIT_LABEL _("Exit")
+#define CHOOSE_LABEL _("Choose file system type for the section:")
+#define SECTION_NAME_LABEL _("Section name:")
+#define FORMAT_LABEL _("Format")
+
+#define SUCCESS_LABEL _("You have UBLinux installed on your computer.\nYou can reboot and use your new system\nor continue working in the UBLinux Live environment.")
+
+#define LANGUAGES_TITLE_LABEL _("Available languages in the system")
+#define LAYOUTS_TITLE_LABEL _("Keyboard layout language")
+#define APPLY_LABEL _("Apply")
+#define SUCCESS_HEADER_LABEL _("Success")
+#define LAYOUT_LABEL _("Layout")
+#define DESIGNATION_LABEL _("Designation")
+#define SERIAL_LABEL _("Serial")
+#define SECTION_LABEL _("Section")
+#define CAPACITY_LABEL _("Capacity")
+#define FREE_SPACE_LABEL _("Free space")
+#define FS_LABEL _("File system")
+#define DEFAULTSWITCHING_LABEL _("Default (L_Alt + L_Shift)")
+#define DEFAULT_MODEL_LABEL _("Default (Regular 105-key)")
--- a/ubinstall-gtk-keyboard.glade
+++ b/ubinstall-gtk-keyboard.glade
@ -6,6 +6,7 @@
    <property name="width-request">200</property>
    <property name="height-request">400</property>
    <property name="can-focus">False</property>
+    <property name="modal">True</property>
    <property name="default-width">800</property>
    <property name="icon-name">com.ublinux.libublsettingsui-gtk3</property>
    <child>
--- a/ubinstall-gtk-language.glade
+++ b/ubinstall-gtk-language.glade
@ -16,6 +16,7 @@
    <property name="width-request">200</property>
    <property name="height-request">400</property>
    <property name="can-focus">False</property>
+    <property name="modal">True</property>
    <property name="default-width">800</property>
    <property name="icon-name">com.ublinux.ubinstall-gui</property>
    <child>
--- a/ubinstall-gtk.glade
+++ b/ubinstall-gtk.glade
@ -1411,7 +1411,7 @@ and help you install UBLinux on your computer</property>
                                <child>
                                  <object class="GtkEntry" id="AvailableLanguagesEntry">
                                    <property name="visible">True</property>
-                                    <property name="can-focus">True</property>
+                                    <property name="can-focus">False</property>
                                  </object>
                                  <packing>
                                    <property name="expand">True</property>
@ -2176,7 +2176,6 @@ and help you install UBLinux on your computer</property>
                        </child>
                        <child>
                          <object class="GtkImage">
-                            <property name="visible">True</property>
                            <property name="can-focus">False</property>
                          </object>
                          <packing>
@ -2185,6 +2184,43 @@ and help you install UBLinux on your computer</property>
                            <property name="position">1</property>
                          </packing>
                        </child>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">end</property>
+                            <property name="label" translatable="yes">Success</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                              <attribute name="size" value="14336"/>
+                            </attributes>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="valign">start</property>
+                            <property name="label" translatable="yes">You have UBLinux installed on your computer.
+You can reboot and use your new system
+or continue working in the UBLinux Live environment.</property>
+                            <property name="justify">center</property>
+                            <property name="wrap">True</property>
+                            <attributes>
+                              <attribute name="size" value="12288"/>
+                            </attributes>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
                      </object>
                      <packing>
                        <property name="position">9</property>
@ -2985,6 +3021,7 @@ installed.</property>
                              <object class="GtkComboBoxText" id="NextInstallationFilesystemTypeCombo">
                                <property name="visible">True</property>
                                <property name="can-focus">False</property>
+                                <property name="active">1</property>
                                <items>
                                  <item translatable="yes">ext3</item>
                                  <item translatable="yes">ext4</item>
@ -5812,7 +5849,6 @@ separately into the selected partition.</property>
        </child>
        <child>
          <object class="GtkMenuButton">
-            <property name="visible">True</property>
            <property name="can-focus">True</property>
            <property name="focus-on-click">False</property>
            <property name="receives-default">True</property>
--- a/ubinstall-gtk.pot
+++ b/ubinstall-gtk.pot
@ -1,20 +1,20 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Language translations for ubl-settings-keyboard package.
+# Copyright (C) 2022, UBTech LLC
+# This file is distributed under the same license as the ubl-settings-keyboard package.
+# UBLinux Team <info@ublinux.com>, 2022
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: ubl-settings-keyboard 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-25 16:43+0600\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2023-05-22 16:12+0600\n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
 "Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

 #: source/ubl-strings.h:1
@ -70,7 +70,7 @@ msgid "Reset application settings"
 msgstr ""

 #: source/ubl-strings.h:4
-msgid "ubinstall-gtk"
+msgid "ubinstall"
 msgstr ""

 #: source/ubl-strings.h:6
@ -300,33 +300,133 @@ msgid "Available languages in the system:"
 msgstr ""

 #: source/ubl-strings.h:66
+msgid "No device were chosen"
+msgstr ""
+
+#: source/ubl-strings.h:68
 msgid "Installation parameters"
 msgstr ""

-#: source/ubl-strings.h:69
+#: source/ubl-strings.h:71 source/ubl-strings.h:93
 msgid "Keyboard layout language"
 msgstr ""

-#: source/ubl-strings.h:71
+#: source/ubl-strings.h:73
 msgid "Region were not fullified"
 msgstr ""

-#: source/ubl-strings.h:72
+#: source/ubl-strings.h:74
 msgid "Zone were not fullified"
 msgstr ""

-#: source/ubl-strings.h:73
+#: source/ubl-strings.h:75
 msgid "Languages list is empty"
 msgstr ""

-#: source/ubl-strings.h:74
+#: source/ubl-strings.h:76
 msgid "System locale hasn't been chosen"
 msgstr ""

-#: source/ubl-strings.h:75
+#: source/ubl-strings.h:77
 msgid "Manual layouts has been chosen but empty"
 msgstr ""

+#: source/ubl-strings.h:79
+msgid "Password input"
+msgstr ""
+
+#: source/ubl-strings.h:80
+msgid "Password mismatch"
+msgstr ""
+
+#: source/ubl-strings.h:81
+msgid "Empty important field"
+msgstr ""
+
+#: source/ubl-strings.h:82
+msgid "Password must be at least"
+msgstr ""
+
+#: source/ubl-strings.h:82
+msgid "characters"
+msgstr ""
+
+#: source/ubl-strings.h:84
+msgid "Restart PC"
+msgstr ""
+
+#: source/ubl-strings.h:85
+msgid "Exit"
+msgstr ""
+
+#: source/ubl-strings.h:86
+msgid "Choose file system type for the section:"
+msgstr ""
+
+#: source/ubl-strings.h:87
+msgid "Section name:"
+msgstr ""
+
+#: source/ubl-strings.h:88
+msgid "Format"
+msgstr ""
+
+#: source/ubl-strings.h:90
+msgid ""
+"You have UBLinux installed on your computer.\n"
+"You can reboot and use your new system\n"
+"or continue working in the UBLinux Live environment."
+msgstr ""
+
+#: source/ubl-strings.h:92
+msgid "Available languages in the system"
+msgstr ""
+
+#: source/ubl-strings.h:94
+msgid "Apply"
+msgstr ""
+
+#: source/ubl-strings.h:95
+msgid "Success"
+msgstr ""
+
+#: source/ubl-strings.h:96
+msgid "Layout"
+msgstr ""
+
+#: source/ubl-strings.h:97
+msgid "Designation"
+msgstr ""
+
+#: source/ubl-strings.h:98
+msgid "Serial"
+msgstr ""
+
+#: source/ubl-strings.h:99
+msgid "Section"
+msgstr ""
+
+#: source/ubl-strings.h:100
+msgid "Capacity"
+msgstr ""
+
+#: source/ubl-strings.h:101
+msgid "Free space"
+msgstr ""
+
+#: source/ubl-strings.h:102
+msgid "File system"
+msgstr ""
+
+#: source/ubl-strings.h:103
+msgid "Default (L_Alt + L_Shift)"
+msgstr ""
+
+#: source/ubl-strings.h:104
+msgid "Default (Regular 105-key)"
+msgstr ""
+
+
 msgid "Afrikaans"
 msgstr ""

@ -549,32 +649,7 @@ msgstr ""
 msgid "Dell 101-key PC"
 msgstr ""

-msgid "Dell Latitude laptop"
-msgstr ""
-
-msgid "Dell Precision M65 laptop"
-msgstr ""

-msgid "Dell Inspiron 6000/8000 laptop"
-msgstr ""
-
-msgid "Dell Precision M laptop"
-msgstr ""
-
-msgid "Fujitsu-Siemens Amilo laptop"
-msgstr ""
-
-msgid "Hewlett-Packard Mini 110 laptop"
-msgstr ""
-
-msgid "Asus laptop"
-msgstr ""
-
-msgid "Apple laptop"
-msgstr ""
-
-msgid "eMachines m6800 laptop"
-msgstr ""

 msgid "Abidjan"
 msgstr ""
@ -2158,3 +2233,391 @@ msgstr ""

 msgid "Zurich"
 msgstr ""
+
+
+msgid "Afrikaans, South Africa"
+msgstr ""
+
+msgid "Arabic, United Arab Emirates"
+msgstr ""
+
+msgid "Arabic, Bahrain"
+msgstr ""
+
+msgid "Arabic, Algeria"
+msgstr ""
+
+msgid "Arabic, Egypt"
+msgstr ""
+
+msgid "Arabic, Iraq"
+msgstr ""
+
+msgid "Arabic, Jordan"
+msgstr ""
+
+msgid "Arabic, Kuwait"
+msgstr ""
+
+msgid "Arabic, Libya"
+msgstr ""
+
+msgid "Arabic, Morocco"
+msgstr ""
+
+msgid "Arabic, Oman"
+msgstr ""
+
+msgid "Arabic, Qatar"
+msgstr ""
+
+msgid "Arabic, Saudi Arabia"
+msgstr ""
+
+msgid "Arabic, Tunisia"
+msgstr ""
+
+msgid "Arabic, Yemen"
+msgstr ""
+
+msgid "Assamese, India"
+msgstr ""
+
+msgid "Azerbaijani, Azerbaijan"
+msgstr ""
+
+msgid "Belarusian, Belarus"
+msgstr ""
+
+msgid "Bulgarian, Bulgaria"
+msgstr ""
+
+msgid "Bengali, India"
+msgstr ""
+
+msgid "Bosnian, Bosnia and Herzegovina"
+msgstr ""
+
+msgid "Catalan, Spain"
+msgstr ""
+
+msgid "Czech, Czech Republic"
+msgstr ""
+
+msgid "Danish, Denmark"
+msgstr ""
+
+msgid "German, Austria"
+msgstr ""
+
+msgid "German, Belgium"
+msgstr ""
+
+msgid "German, Switzerland"
+msgstr ""
+
+msgid "German, Germany"
+msgstr ""
+
+msgid "German, Liechtenstein"
+msgstr ""
+
+msgid "German, Luxembourg"
+msgstr ""
+
+msgid "Greek, Cyprus"
+msgstr ""
+
+msgid "Greek, Greece"
+msgstr ""
+
+msgid "English, Australia"
+msgstr ""
+
+msgid "English, Botswana"
+msgstr ""
+
+msgid "English, Canada"
+msgstr ""
+
+msgid "English, United Kingdom"
+msgstr ""
+
+msgid "English, Hong Kong SAR China"
+msgstr ""
+
+msgid "English, Ireland"
+msgstr ""
+
+msgid "English, India"
+msgstr ""
+
+msgid "English, Malta"
+msgstr ""
+
+msgid "English, New Zealand"
+msgstr ""
+
+msgid "English, Philippines"
+msgstr ""
+
+msgid "English, Singapore"
+msgstr ""
+
+msgid "English, U.S.A."
+msgstr ""
+
+msgid "English, Zimbabwe"
+msgstr ""
+
+msgid "Spanish, Argentina"
+msgstr ""
+
+msgid "Spanish, Bolivia"
+msgstr ""
+
+msgid "Spanish, Chile"
+msgstr ""
+
+msgid "Spanish, Colombia"
+msgstr ""
+
+msgid "Spanish, Costa Rica"
+msgstr ""
+
+msgid "Spanish, Dominican Republic"
+msgstr ""
+
+msgid "Spanish, Ecuador"
+msgstr ""
+
+msgid "Spanish, Spain"
+msgstr ""
+
+msgid "Spanish, Guatemala"
+msgstr ""
+
+msgid "Spanish, Honduras"
+msgstr ""
+
+msgid "Spanish, Mexico"
+msgstr ""
+
+msgid "Spanish, Nicaragua"
+msgstr ""
+
+msgid "Spanish, Panama"
+msgstr ""
+
+msgid "Spanish, Peru"
+msgstr ""
+
+msgid "Spanish, Puerto Rico"
+msgstr ""
+
+msgid "Spanish, Paraguay"
+msgstr ""
+
+msgid "Spanish, El Salvador"
+msgstr ""
+
+msgid "Spanish, U.S.A."
+msgstr ""
+
+msgid "Spanish, Uruguay"
+msgstr ""
+
+msgid "Spanish, Venezuela"
+msgstr ""
+
+msgid "Estonian, Estonia"
+msgstr ""
+
+msgid "Finnish, Finland"
+msgstr ""
+
+msgid "French, Belgium"
+msgstr ""
+
+msgid "French, Canada"
+msgstr ""
+
+msgid "French, Switzerland"
+msgstr ""
+
+msgid "French, France"
+msgstr ""
+
+msgid "French, Luxembourg"
+msgstr ""
+
+msgid "Gujarati, India"
+msgstr ""
+
+msgid "Hebrew, Israel"
+msgstr ""
+
+msgid "Hindi, India"
+msgstr ""
+
+msgid "Croatian, Croatia"
+msgstr ""
+
+msgid "Hungarian, Hungary"
+msgstr ""
+
+msgid "Armenian, Armenia"
+msgstr ""
+
+msgid "Indonesian, Indonesia"
+msgstr ""
+
+msgid "Icelandic, Iceland"
+msgstr ""
+
+msgid "Italian, Switzerland"
+msgstr ""
+
+msgid "Italian, Italy"
+msgstr ""
+
+msgid "Japanese, Japan"
+msgstr ""
+
+msgid "Georgian, Georgia"
+msgstr ""
+
+msgid "Kazakh, Kazakhstan"
+msgstr ""
+
+msgid "Kannada, India"
+msgstr ""
+
+msgid "Korean, Korea"
+msgstr ""
+
+msgid "Kashmiri, India"
+msgstr ""
+
+msgid "Kurdish, Turkey"
+msgstr ""
+
+msgid "Kurdish (Sorani), Turkey"
+msgstr ""
+
+msgid "Kirghiz, Kyrgyzstan"
+msgstr ""
+
+msgid "Lithuanian, Lithuania"
+msgstr ""
+
+msgid "Latvian, Latvia"
+msgstr ""
+
+msgid "Macedonian, Macedonia"
+msgstr ""
+
+msgid "Malayalam, India"
+msgstr ""
+
+msgid "Marathi, India"
+msgstr ""
+
+msgid "Malay, Malaysia"
+msgstr ""
+
+msgid "Maltese, Malta"
+msgstr ""
+
+msgid "Bokmal, Norway"
+msgstr ""
+
+msgid "Dutch, Belgium"
+msgstr ""
+
+msgid "Dutch, Netherlands"
+msgstr ""
+
+msgid "Nynorsk, Norway"
+msgstr ""
+
+msgid "Oriya, India"
+msgstr ""
+
+msgid "Punjabi, India"
+msgstr ""
+
+msgid "Polish, Poland"
+msgstr ""
+
+msgid "Portuguese, Brazil"
+msgstr ""
+
+msgid "Portuguese, Portugal"
+msgstr ""
+
+msgid "Romanian, Romania"
+msgstr ""
+
+msgid "Russian, Russia"
+msgstr ""
+
+msgid "Russian, Ukraine"
+msgstr ""
+
+msgid "Sanskrit, India"
+msgstr ""
+
+msgid "Slovak, Slovakia"
+msgstr ""
+
+msgid "Slovenian, Slovenia"
+msgstr ""
+
+msgid "Albanian, Albania"
+msgstr ""
+
+msgid "Serbian, Montenegro"
+msgstr ""
+
+msgid "Serbian, Montenegro (Latin)"
+msgstr ""
+
+msgid "Serbian, Serbia"
+msgstr ""
+
+msgid "Serbian, Serbia (Latin)"
+msgstr ""
+
+msgid "Swedish, Sweden"
+msgstr ""
+
+msgid "Tamil, India"
+msgstr ""
+
+msgid "Telugu, India"
+msgstr ""
+
+msgid "Thai, Thailand"
+msgstr ""
+
+msgid "Turkish, Turkey"
+msgstr ""
+
+msgid "Ukrainian, Ukraine"
+msgstr ""
+
+msgid "Vietnamese, Vietnam"
+msgstr ""
+
+msgid "Simplified Chinese, China"
+msgstr ""
+
+msgid "Traditional Chinese, Hong Kong SAR China"
+msgstr ""
+
+msgid "Chinese, Singapore"
+msgstr ""
+
+msgid "Traditional Chinese, Taiwan"
+msgstr ""
--- a/ubinstall-gtk_ru.po
+++ b/ubinstall-gtk_ru.po
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ubinstal 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-06-25 16:43+0600\n"
+"POT-Creation-Date: 2023-05-22 16:12+0600\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@ -70,7 +70,8 @@ msgid "Reset application settings"
 msgstr "Удалить конфигурацию прилодения"

 #: source/ubl-strings.h:4
-msgid "ubinstall-gtk"
+#, fuzzy
+msgid "ubinstall"
 msgstr "Программа установки UBLinux"

 #: source/ubl-strings.h:6
@ -313,34 +314,135 @@ msgid "Available languages in the system:"
 msgstr "Доступные языки в системе:"

 #: source/ubl-strings.h:66
+msgid "No device were chosen"
+msgstr "Устройство не выбрано"
+
+#: source/ubl-strings.h:68
 msgid "Installation parameters"
 msgstr "Параметры установки"

-#: source/ubl-strings.h:69
-#, fuzzy
+#: source/ubl-strings.h:71 source/ubl-strings.h:93
 msgid "Keyboard layout language"
 msgstr "Раскладка клавиатуры"

-#: source/ubl-strings.h:71
+#: source/ubl-strings.h:73
 msgid "Region were not fullified"
 msgstr "Регион не был выбран"

-#: source/ubl-strings.h:72
+#: source/ubl-strings.h:74
 msgid "Zone were not fullified"
 msgstr "Зона не была выбрана"

-#: source/ubl-strings.h:73
+#: source/ubl-strings.h:75
 msgid "Languages list is empty"
 msgstr "Список доступных языков не был заполнен"

-#: source/ubl-strings.h:74
+#: source/ubl-strings.h:76
 msgid "System locale hasn't been chosen"
 msgstr "Язык системы не был выбран"

-#: source/ubl-strings.h:75
+#: source/ubl-strings.h:77
 msgid "Manual layouts has been chosen but empty"
 msgstr "Ручной выбор списка раскладок клавиатуры выбран, но список пуст"

+#: source/ubl-strings.h:79
+msgid "Password input"
+msgstr "Пароль"
+
+#: source/ubl-strings.h:80
+msgid "Password mismatch"
+msgstr "Пароли не совпадают"
+
+#: source/ubl-strings.h:81
+msgid "Empty important field"
+msgstr "Пустое важное поле"
+
+#: source/ubl-strings.h:82
+msgid "Password must be at least"
+msgstr "Пароль должен быть как минимум"
+
+#: source/ubl-strings.h:82
+msgid "characters"
+msgstr "символов"
+
+#: source/ubl-strings.h:84
+msgid "Restart PC"
+msgstr "Перезагрузка"
+
+#: source/ubl-strings.h:85
+msgid "Exit"
+msgstr "Выйти"
+
+#: source/ubl-strings.h:86
+msgid "Choose file system type for the section:"
+msgstr "Выберите тип файловой системы для раздела"
+
+#: source/ubl-strings.h:87
+msgid "Section name:"
+msgstr "Имя раздела:"
+
+#: source/ubl-strings.h:88
+msgid "Format"
+msgstr "Форматировать"
+
+#: source/ubl-strings.h:90
+msgid ""
+"You have UBLinux installed on your computer.\n"
+"You can reboot and use your new system\n"
+"or continue working in the UBLinux Live environment."
+msgstr ""
+"На вашем компьютере установлена система UBLinux.\n"
+"Вы можете перезагрузить и использовать свою новую систему\n"
+"или продолжить работу в среде UBLinux Live."
+
+#: source/ubl-strings.h:92
+msgid "Available languages in the system"
+msgstr "Доступные языки в системе"
+
+#: source/ubl-strings.h:94
+msgid "Apply"
+msgstr "Применить"
+
+#: source/ubl-strings.h:95
+msgid "Success"
+msgstr "Готово"
+
+#: source/ubl-strings.h:96
+msgid "Layout"
+msgstr "Раскладка клавиатуры"
+
+#: source/ubl-strings.h:97
+msgid "Designation"
+msgstr "Обозначение"
+
+#: source/ubl-strings.h:98
+msgid "Serial"
+msgstr "Серийный номер"
+
+#: source/ubl-strings.h:99
+msgid "Section"
+msgstr "Раздел"
+
+#: source/ubl-strings.h:100
+msgid "Capacity"
+msgstr "Объём"
+
+#: source/ubl-strings.h:101
+msgid "Free space"
+msgstr "Свободно"
+
+#: source/ubl-strings.h:102
+msgid "File system"
+msgstr "Тип ФС"
+
+#: source/ubl-strings.h:103
+msgid "Default (L_Alt + L_Shift)"
+msgstr "По умолчанию ((L_Alt + L_Shift))"
+
+#: source/ubl-strings.h:104
+msgid "Default (Regular 105-key)"
+msgstr "По умолчанию ((Regular 105-key))"
+
 msgid "Afrikaans"
 msgstr "Африканский"

@ -1217,7 +1319,6 @@ msgstr "Индиана-Старке"
 msgid "Indianapolis"
 msgstr "Индианаполис"

-
 msgid "Inuvik"
 msgstr "Инувик"

@ -2144,3 +2245,407 @@ msgstr "Зулу"

 msgid "Zurich"
 msgstr "Цюрих"
+
+msgid "Afrikaans, South Africa"
+msgstr "Африкаанс, Южная Африка"
+
+msgid "Arabic, United Arab Emirates"
+msgstr "Арабский, ОАЭ"
+
+msgid "Arabic, Bahrain"
+msgstr "Арабский, Бахрейн"
+
+msgid "Arabic, Algeria"
+msgstr "Арабский, Алжир"
+
+msgid "Arabic, Egypt"
+msgstr "Арабский, Египет"
+
+msgid "Arabic, Iraq"
+msgstr "Арабский, Ирак"
+
+msgid "Arabic, Jordan"
+msgstr "Арабский, Иордания"
+
+msgid "Arabic, Kuwait"
+msgstr "Арабский, Кувейт"
+
+msgid "Arabic, Libya"
+msgstr "Арабский, Ливия"
+
+msgid "Arabic, Morocco"
+msgstr "Арабский, Марокко"
+
+msgid "Arabic, Oman"
+msgstr "Арабский, Оман"
+
+msgid "Arabic, Qatar"
+msgstr "Арабский, Катар"
+
+msgid "Arabic, Saudi Arabia"
+msgstr "Арабский, Саудовская Аравия"
+
+msgid "Arabic, Tunisia"
+msgstr "Арабский, Тунис"
+
+msgid "Arabic, Yemen"
+msgstr "Арабский, Йемен"
+
+msgid "Assamese, India"
+msgstr "Ассамский, Индия"
+
+msgid "Azerbaijani, Azerbaijan"
+msgstr "Азербайджанский, Азербайджан"
+
+msgid "Belarusian, Belarus"
+msgstr "Белорусский, Беларусь"
+
+msgid "Bulgarian, Bulgaria"
+msgstr "Болгарский, Болгария"
+
+msgid "Bengali, India"
+msgstr "Бенгальский"
+
+msgid "Bosnian, Bosnia and Herzegovina"
+msgstr "Боснийский, Босния и Герцеговина"
+
+msgid "Catalan, Spain"
+msgstr "Каталанский, Испания"
+
+msgid "Czech, Czech Republic"
+msgstr "Чешский, Чехия"
+
+msgid "Danish, Denmark"
+msgstr "Датский, Дания"
+
+msgid "German, Austria"
+msgstr "Немецкий, Австрия"
+
+msgid "German, Belgium"
+msgstr "Немецкий, Бельгия"
+
+msgid "German, Switzerland"
+msgstr "Немецкий, Швейцария"
+
+msgid "German, Germany"
+msgstr "Немецкий, Германия"
+
+msgid "German, Liechtenstein"
+msgstr "Немецкий, Лихтенштейн"
+
+msgid "German, Luxembourg"
+msgstr "Немецгий, Люксембург"
+
+msgid "Greek, Cyprus"
+msgstr "Греческий, Кипр"
+
+msgid "Greek, Greece"
+msgstr "Греческий, Греция"
+
+msgid "English, Australia"
+msgstr "Английский, Австралия"
+
+msgid "English, Botswana"
+msgstr "Английский, Ботсвана"
+
+msgid "English, Canada"
+msgstr "Английский, Канада"
+
+msgid "English, United Kingdom"
+msgstr "Английский, Великобритания"
+
+msgid "English, Hong Kong SAR China"
+msgstr "Английский, Гонконг (САР Китая)"
+
+msgid "English, Ireland"
+msgstr "Английский, Ирландия"
+
+msgid "English, India"
+msgstr "Английский, Индия"
+
+msgid "English, Malta"
+msgstr "Английский, Мальта"
+
+msgid "English, New Zealand"
+msgstr "Английский, Новая Зеландия"
+
+msgid "English, Philippines"
+msgstr "Английский, Филиппины"
+
+msgid "English, Singapore"
+msgstr "Английский, Сингапур"
+
+msgid "English, U.S.A."
+msgstr "Английский, США"
+
+msgid "English, Zimbabwe"
+msgstr "Английский, Зимбабве"
+
+msgid "Spanish, Argentina"
+msgstr "Испанский, Аргентина"
+
+msgid "Spanish, Bolivia"
+msgstr "Испанский, Боливия"
+
+msgid "Spanish, Chile"
+msgstr "Испанский, Чили"
+
+msgid "Spanish, Colombia"
+msgstr "Испанский, Колумбия"
+
+msgid "Spanish, Costa Rica"
+msgstr "Испанский, Коста-Рика"
+
+msgid "Spanish, Dominican Republic"
+msgstr "Испанский, Доминиканская Республика"
+
+msgid "Spanish, Ecuador"
+msgstr "Испанский, Эквадор"
+
+msgid "Spanish, Spain"
+msgstr "Испанский, Испания"
+
+msgid "Spanish, Guatemala"
+msgstr "Испанский, Гватемала"
+
+msgid "Spanish, Honduras"
+msgstr "Испанский, Гондурас"
+
+msgid "Spanish, Mexico"
+msgstr "Испанский, Мексика"
+
+msgid "Spanish, Nicaragua"
+msgstr "Испанский, Никарагуа"
+
+msgid "Spanish, Panama"
+msgstr "Испанский, Панама"
+
+msgid "Spanish, Peru"
+msgstr "Испанский, Перу"
+
+msgid "Spanish, Puerto Rico"
+msgstr "Испанский, Пуэрто-Рико"
+
+msgid "Spanish, Paraguay"
+msgstr "Испанский, Парагвай"
+
+msgid "Spanish, El Salvador"
+msgstr "Испанский, Сальвадор"
+
+msgid "Spanish, U.S.A."
+msgstr "Испанский, США"
+
+msgid "Spanish, Uruguay"
+msgstr "Испанский, Уругвай"
+
+msgid "Spanish, Venezuela"
+msgstr "Испанский, Венесуэла"
+
+msgid "Estonian, Estonia"
+msgstr "Эстонский, Эстония"
+
+msgid "Finnish, Finland"
+msgstr "Финский, Финляндия"
+
+msgid "French, Belgium"
+msgstr "Французский, Бельгия"
+
+msgid "French, Canada"
+msgstr "Французский, Канада"
+
+msgid "French, Switzerland"
+msgstr "Французский, Швейцария"
+
+msgid "French, France"
+msgstr "Французский, Франция"
+
+msgid "French, Luxembourg"
+msgstr "Французский, Люксембург"
+
+msgid "Gujarati, India"
+msgstr "Гуджарати, Индия"
+
+msgid "Hebrew, Israel"
+msgstr "Иврит, Израиль"
+
+msgid "Hindi, India"
+msgstr "Хинди, Индия"
+
+msgid "Croatian, Croatia"
+msgstr "Хорватский, Хорватия"
+
+msgid "Hungarian, Hungary"
+msgstr "Венгерский, Венгрия"
+
+msgid "Armenian, Armenia"
+msgstr "Армянский, Армения"
+
+msgid "Indonesian, Indonesia"
+msgstr "Индонезийский, Индонезия"
+
+msgid "Icelandic, Iceland"
+msgstr "Исландский, Исландия"
+
+msgid "Italian, Switzerland"
+msgstr "Итальянский, Швейцария"
+
+msgid "Italian, Italy"
+msgstr "Итальянский, Италия"
+
+msgid "Japanese, Japan"
+msgstr "Японский, Япония"
+
+msgid "Georgian, Georgia"
+msgstr "Грузинский, Грузия"
+
+msgid "Kazakh, Kazakhstan"
+msgstr "Казахский, Казахстан"
+
+msgid "Kannada, India"
+msgstr "Каннада, Индия"
+
+msgid "Korean, Korea"
+msgstr "Корейский, Корея"
+
+msgid "Kashmiri, India"
+msgstr "Кашмирский, Индия"
+
+msgid "Kurdish, Turkey"
+msgstr "Курдский, Турция"
+
+msgid "Kurdish (Sorani), Turkey"
+msgstr "Курдский (сорани), Турция"
+
+msgid "Kirghiz, Kyrgyzstan"
+msgstr "Киргизский, Киргизстан"
+
+msgid "Lithuanian, Lithuania"
+msgstr "Литовский, Литва"
+
+msgid "Latvian, Latvia"
+msgstr "Латышский, Латвия"
+
+msgid "Macedonian, Macedonia"
+msgstr "Македонский, Македония"
+
+msgid "Malayalam, India"
+msgstr "Малаялам, Индия"
+
+msgid "Marathi, India"
+msgstr "Маратхи, Индия"
+
+msgid "Malay, Malaysia"
+msgstr "Малайский, Малазия"
+
+msgid "Maltese, Malta"
+msgstr "Мальтийский, Мальта"
+
+msgid "Bokmal, Norway"
+msgstr "Букмол, Норвегия"
+
+msgid "Dutch, Belgium"
+msgstr "Голландский, Бельгия"
+
+msgid "Dutch, Netherlands"
+msgstr "Голландский, Нидерланды"
+
+msgid "Nynorsk, Norway"
+msgstr "Нюнорск, Норвегия"
+
+msgid "Oriya, India"
+msgstr "Ория, Индия"
+
+msgid "Punjabi, India"
+msgstr "Панджаби, Индия"
+
+msgid "Polish, Poland"
+msgstr "Польский, Польша"
+
+msgid "Portuguese, Brazil"
+msgstr "Португальский, Бразилия"
+
+#, fuzzy
+msgid "Portuguese, Portugal"
+msgstr "Португальский, Португалия"
+
+#, fuzzy
+msgid "Romanian, Romania"
+msgstr "Румынский, Румыния"
+
+#, fuzzy
+msgid "Russian, Russia"
+msgstr "Русский, Россия"
+
+#, fuzzy
+msgid "Russian, Ukraine"
+msgstr "Русский, Украина"
+
+#, fuzzy
+msgid "Sanskrit, India"
+msgstr "Санскрит, Индия"
+
+msgid "Slovak, Slovakia"
+msgstr "Словацкий, Словакия"
+
+#, fuzzy
+msgid "Slovenian, Slovenia"
+msgstr "Словенский, Свловения"
+
+#, fuzzy
+msgid "Albanian, Albania"
+msgstr "Албанский, Албания"
+
+msgid "Serbian, Montenegro"
+msgstr "Сербский, Черногория"
+
+msgid "Serbian, Montenegro (Latin)"
+msgstr "Сербский, Черногория (латиница)"
+
+#, fuzzy
+msgid "Serbian, Serbia"
+msgstr "Сербский, Сербия"
+
+msgid "Serbian, Serbia (Latin)"
+msgstr "Сербский (латиница), Сербия"
+
+#, fuzzy
+msgid "Swedish, Sweden"
+msgstr "Шведский, Швеция"
+
+msgid "Tamil, India"
+msgstr "Тамильский, Индия"
+
+#, fuzzy
+msgid "Telugu, India"
+msgstr "Телугу, Индия"
+
+msgid "Thai, Thailand"
+msgstr "Тайский, Таиланд"
+
+#, fuzzy
+msgid "Turkish, Turkey"
+msgstr "Турецкий, Турция"
+
+#, fuzzy
+msgid "Ukrainian, Ukraine"
+msgstr "Украинский, Украина"
+
+#, fuzzy
+msgid "Vietnamese, Vietnam"
+msgstr "Вьетнамский, Вьетнам"
+
+#, fuzzy
+msgid "Simplified Chinese, China"
+msgstr "Упрощенный китайский, Китай"
+
+#, fuzzy
+msgid "Traditional Chinese, Hong Kong SAR China"
+msgstr "Традиционный китайский, Гонконг (САР Китая)"
+
+#, fuzzy
+msgid "Chinese, Singapore"
+msgstr "Китайский, Сингапур"
+
+#, fuzzy
+msgid "Traditional Chinese, Taiwan"
+msgstr "Традиционный китайский, Тайвань"