source/ubinstall-gtk.c

@@ -555,18 +555,18 @@ if (window->Window){
 return 0;
 }
 
-void on_process_log_view(GtkWidget *,main_window *widgets);
-void on_process_log_view(GtkWidget *,main_window *widgets){
+void on_process_log_view(GtkWidget *);
+void on_process_log_view(GtkWidget *){
     log_window *window = yon_log_window_new();
-    yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->MainWindow),LOG_VIEW_LABEL,icon_path,"log_viewer");
+    yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,LOG_VIEW_LABEL,icon_path,"log_viewer");
     window->command = yon_char_new(short_log_path);
     gdk_threads_add_timeout(500,(GSourceFunc)yon_read_log,window);
 }
 
-void on_summary_log_view(GtkWidget *,main_window *widgets);
-void on_summary_log_view(GtkWidget *,main_window *widgets){
+void on_summary_log_view(GtkWidget *);
+void on_summary_log_view(GtkWidget *){
     log_window *window = yon_log_window_new();
-    yon_gtk_window_setup(GTK_WINDOW(window->Window),GTK_WINDOW(widgets->MainWindow),LOG_VIEW_LABEL,icon_path,"log_viewer");
+    yon_gtk_window_setup(GTK_WINDOW(window->Window),NULL,LOG_VIEW_LABEL,icon_path,"log_viewer");
     window->command = yon_char_new(full_log_path);
     gdk_threads_add_timeout(500,(GSourceFunc)yon_read_log,window);
 
@@ -1025,11 +1025,41 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){
                     }break;
 
                 case YON_PAGE_OPTIONS_SEPARATE:{
-                    yon_install_options_save(widgets->SeparateDevicesTree,widgets->SeparateSysSectionTree,"system_only",widgets);
+                    GtkTreeModel *model;
+                    GtkTreeIter iter;
+                    if (!gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->SeparateSysSectionTree)),&model,&iter)){
+                        yon_ubl_status_box_spawn(GTK_CONTAINER(widgets->StatusBox),NO_DEVICE_CHOSEN_LABEL,5,BACKGROUND_IMAGE_FAIL_TYPE);
+                        yon_ubl_status_highlight_incorrect(gtk_widget_get_parent(widgets->SeparateSysSectionTree));
+                        return;
+                    }
+                    gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_OPTIONS_SEPARATE_USRDATA);
                     }break;
 
                 case YON_PAGE_OPTIONS_SEPARATE_USRDATA:{
-                    yon_install_options_save(widgets->SeparateUserDevicesTree,widgets->SeparateUserSysSectionTree,"system_only",widgets);
+                    GtkTreeIter iter,itar;
+                    GtkTreeModel *model,*model2;
+                    if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->SeparateDevicesTree)),&model,&iter)){
+                        if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->SeparateSysSectionTree)),&model2,&itar)){
+                            char *cur_device, *system_section, *user_section;
+                            gtk_tree_model_get(model,&iter,0,&cur_device,-1);
+                            gtk_tree_model_get(model2,&itar,0,&system_section,-1);
+                            if (gtk_tree_selection_get_selected(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->SeparateUserSysSectionTree)),&model2,&itar)){
+                                gtk_tree_model_get(model2,&itar,0,&user_section,-1);
+                                yon_config_register(AUTOINSTALL_DEVICE,AUTOINSTALL_DEVICE_command,cur_device);
+                                yon_config_register(part_parameter,part_parameter_command,yon_char_unite(system_section,",",user_section,NULL));
+                                yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"custom");
+                                gtk_notebook_set_current_page(GTK_NOTEBOOK(widgets->Notebook),YON_PAGE_INSTALLATION_BEGIN);
+                                return;
+                            } else {
+
+                            }
+                        } else {
+
+                        }
+                    } else {
+
+                    }
+                    
                 } break;
 
                 case YON_PAGE_OPTIONS_OS_ONLY:{
@@ -1161,6 +1191,56 @@ void on_partition_changed(GtkWidget *self, main_window *widgets){
     
 }
 
+void on_separate_installation_changed(GtkWidget *self, main_window *widgets);
+void on_separate_installation_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(self)),&model,&iter)){
+        gtk_tree_selection_select_iter(gtk_tree_view_get_selection(GTK_TREE_VIEW(widgets->SeparateUserDevicesTree)),&iter);
+        char *disk_path="";
+        gtk_tree_model_get(model,&iter,0,&disk_path,-1);
+        int size;
+        config_str parsed;
+        parsed = yon_config_load(get_parts_and_devices_command,&size);
+        char *string = yon_char_parsed_to_string(parsed,size,"");
+        struct json_object *root;
+        struct json_object *blockdevices;
+        root = json_tokener_parse(string);
+        json_object_object_get_ex(root, "blockdevices", &blockdevices);
+        for (long unsigned int i = 0; i < json_object_array_length(blockdevices); i++) {
+            struct json_object *device = json_object_array_get_idx(blockdevices, i);
+            struct json_object *type, *path, *size, *model, *fstype, *fsused;
+
+            json_object_object_get_ex(device, "type", &type);
+            if (strcmp("part",json_object_get_string(type)))
+                continue;
+            json_object_object_get_ex(device, "path", &path);
+            if (!strstr(json_object_get_string(path),disk_path)){
+                continue;
+            }
+            json_object_object_get_ex(device, "size", &size);
+            json_object_object_get_ex(device, "model", &model);
+            json_object_object_get_ex(device, "fstype", &fstype);
+            json_object_object_get_ex(device, "fsused", &fsused);
+
+            float free_space=0;
+            char *free_space_string="";
+            if (size&&fsused){
+                free_space = atof(json_object_get_string(size))-atof(json_object_get_string(fsused));
+                free_space_string = yon_char_append(yon_char_from_float(free_space)," ");
+                free_space_string[strlen(free_space_string)-1]=json_object_get_string(size)[strlen(json_object_get_string(size))-1]; 
+            }
+            // gtk_spin_button_set_value(GTK_SPIN_BUTTON(widgets->InstallationNearSizeSpin),0.0);
+            gtk_adjustment_set_upper(gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(widgets->InstallationNearSizeSpin)),0.0);
+            gtk_list_store_append(widgets->PartitionsList,&iter);
+            gtk_list_store_set(widgets->PartitionsList,&iter,0,json_object_get_string(path),1,json_object_get_string(size),2,free_space_string,3,json_object_get_string(fstype),-1);
+        }
+        yon_char_parsed_free(parsed,size);
+    }
+}
+
 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);
@@ -1376,7 +1456,7 @@ main_window *yon_main_window_complete(){
     widgets->SeparateSysSectionTree = yon_gtk_builder_get_widget(builder,"SeparateSysSectionTree");
     widgets->GpartedSeparateUserButton = yon_gtk_builder_get_widget(builder,"GpartedSeparateUserButton");
     widgets->SeparateUserDevicesTree = yon_gtk_builder_get_widget(builder,"SeparateUserDevicesTree");
-    widgets->SeparateUserSysSectionTree = yon_gtk_builder_get_widget(builder,"SeparateUse-rSysSectionTree");
+    widgets->SeparateUserSysSectionTree = yon_gtk_builder_get_widget(builder,"SeparateUserSysSectionTree");
 
     widgets->GpartedOSButton = yon_gtk_builder_get_widget(builder,"GpartedOSButton");
     widgets->OSDevicesTree = yon_gtk_builder_get_widget(builder,"OSDevicesTree");
@@ -1393,8 +1473,8 @@ main_window *yon_main_window_complete(){
     widgets->AdditionalSoftwareList = GTK_LIST_STORE(gtk_builder_get_object(builder,"AdditionalSoftwareList"));
     widgets->PartitionsList = GTK_LIST_STORE(gtk_builder_get_object(builder,"PartitionsList"));
 
-    g_signal_connect(G_OBJECT(widgets->ReadFullLogButton),"clicked",G_CALLBACK(on_summary_log_view),widgets);
-    g_signal_connect(G_OBJECT(widgets->ReadShortLogButton),"clicked",G_CALLBACK(on_process_log_view),widgets);
+    g_signal_connect(G_OBJECT(widgets->ReadFullLogButton),"clicked",G_CALLBACK(on_process_log_view),widgets);
+    g_signal_connect(G_OBJECT(widgets->ReadShortLogButton),"clicked",G_CALLBACK(on_summary_log_view),widgets);
 
     g_signal_connect(G_OBJECT(widgets->GpartedCommonButton),"clicked",G_CALLBACK(on_gparted_open),NULL);
     g_signal_connect(G_OBJECT(widgets->GpartedSameButton),"clicked",G_CALLBACK(on_gparted_open),NULL);
@@ -1419,6 +1499,9 @@ main_window *yon_main_window_complete(){
     g_signal_connect(G_OBJECT(widgets->CompletionToggle),"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);
+    g_signal_connect(G_OBJECT(widgets->UserdataDevicesTree),"cursor-changed",G_CALLBACK(on_near_installation_device_changed),widgets);
+    g_signal_connect(G_OBJECT(widgets->OSDevicesTree),"cursor-changed",G_CALLBACK(on_near_installation_device_changed),widgets);
+    g_signal_connect(G_OBJECT(widgets->SeparateDevicesTree),"cursor-changed",G_CALLBACK(on_separate_installation_changed),widgets);
 
     g_signal_connect(G_OBJECT(widgets->ConfigurationModeMenuItem),"toggled",G_CALLBACK(on_configuration_mode_switch),widgets);
     g_signal_connect(G_OBJECT(widgets->DocumentationMenuItem),"activate",G_CALLBACK(on_open_documentation_confirmation),widgets);

source/ubl-strings.h

@@ -70,7 +70,7 @@
 
 #define ADVANCED_INSTALLATION_HEAD_LABEL _("Advanced installation mode")
 #define ADVANCED_INSTALLATION_LABEL _("Installing OS files, user data on different partitions, creating RAID, etc.")
-#define ADVANCED_INSTALLATION_ATTENTION_LABEL _("Attention! The selected OC UBLinux components will be installed\nseparately into the selected partition.")
+#define ADVANCED_INSTALLATION_ATTENTION_LABEL _("Attention! The selected OS UBLinux components will be installed\nseparately into the selected partition.")
 #define GRUB_INSTALL_HEAD_LABEL _("GRUB install")
 #define GRUB_INSTALL_LABEL _("Install the GRUB bootloader")
 #define GRUB_UPDATE_HEAD_LABEL _("GRUB update")
@@ -137,4 +137,4 @@
 #define ERROR_HEAD_LABEL _("Error")
 #define ERROR_LABEL _("Error has occured while installation process")
 
-#define LOG_VIEW_LABEL _("Log exploration")
+#define LOG_VIEW_LABEL _("Log exploration")

ubinstall-gtk-log-view.glade

@@ -7,7 +7,6 @@
     <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-gtk</property>
     <child>

ubinstall-gtk.glade

@@ -203,8 +203,11 @@
   </object>
   <object class="GtkWindow" id="MainWindow">
     <property name="width-request">800</property>
+    <property name="height-request">500</property>
     <property name="visible">True</property>
     <property name="can-focus">False</property>
+    <property name="default-width">800</property>
+    <property name="default-height">500</property>
     <property name="icon-name">com.ublinux.ubinstall-gtk</property>
     <child>
       <object class="GtkBox">
@@ -916,6 +919,7 @@ and help you install UBLinux on your computer</property>
                                         </child>
                                         <child>
                                           <object class="GtkRadioButton" id="InstallationWindowsRadio">
+                                            <property name="visible">True</property>
                                             <property name="can-focus">True</property>
                                             <property name="receives-default">False</property>
                                             <property name="draw-indicator">True</property>
@@ -4037,7 +4041,7 @@ installed.</property>
                                           <object class="GtkLabel">
                                             <property name="visible">True</property>
                                             <property name="can-focus">False</property>
-                                            <property name="label" translatable="yes">Attention! The selected OC UBLinux components will be installed
+                                            <property name="label" translatable="yes">Attention! The selected OS UBLinux components will be installed
 separately into the selected partition.</property>
                                             <property name="xalign">0</property>
                                           </object>
@@ -5547,6 +5551,7 @@ separately into the selected partition.</property>
                                             <child>
                                               <object class="GtkTreeView" id="SeparateUserDevicesTree">
                                                 <property name="visible">True</property>
+                                                <property name="sensitive">False</property>
                                                 <property name="can-focus">True</property>
                                                 <property name="model">DevicesList</property>
                                                 <property name="search-column">0</property>
@@ -5825,7 +5830,7 @@ separately into the selected partition.</property>
                                                   <object class="GtkLabel">
                                                     <property name="visible">True</property>
                                                     <property name="can-focus">False</property>
-                                                    <property name="label" translatable="yes">Separate installation</property>
+                                                    <property name="label" translatable="yes">OS only</property>
                                                     <property name="xalign">0</property>
                                                     <attributes>
                                                       <attribute name="size" value="15360"/>
@@ -5841,7 +5846,7 @@ separately into the selected partition.</property>
                                                   <object class="GtkLabel">
                                                     <property name="visible">True</property>
                                                     <property name="can-focus">False</property>
-                                                    <property name="label" translatable="yes">Installing OS components and user data on different disk partitions</property>
+                                                    <property name="label" translatable="yes">Installing only OS components without user data</property>
                                                     <property name="xalign">0</property>
                                                   </object>
                                                   <packing>
@@ -6193,7 +6198,7 @@ separately into the selected partition.</property>
                                                   <object class="GtkLabel">
                                                     <property name="visible">True</property>
                                                     <property name="can-focus">False</property>
-                                                    <property name="label" translatable="yes">Separate installation</property>
+                                                    <property name="label" translatable="yes">User data only</property>
                                                     <property name="xalign">0</property>
                                                     <attributes>
                                                       <attribute name="size" value="15360"/>
@@ -6209,7 +6214,7 @@ separately into the selected partition.</property>
                                                   <object class="GtkLabel">
                                                     <property name="visible">True</property>
                                                     <property name="can-focus">False</property>
-                                                    <property name="label" translatable="yes">Installing OS components and user data on different disk partitions</property>
+                                                    <property name="label" translatable="yes">Installing only user data without OS components</property>
                                                     <property name="xalign">0</property>
                                                   </object>
                                                   <packing>

ubinstall-gtk.pot

@@ -129,7 +129,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: source/ubl-strings.h:21 source/ubl-strings.h:51
+#: source/ubl-strings.h:21 source/ubl-strings.h:52
 msgid "Completion"
 msgstr ""
 
@@ -175,7 +175,7 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: source/ubl-strings.h:32 source/ubl-strings.h:52
+#: source/ubl-strings.h:32 source/ubl-strings.h:53
 msgid "Installation completion"
 msgstr ""
 
@@ -243,23 +243,23 @@ msgstr ""
 msgid "Computer name:"
 msgstr ""
 
-#: source/ubl-strings.h:49
+#: source/ubl-strings.h:50
 msgid "Automatically"
 msgstr ""
 
-#: source/ubl-strings.h:50
+#: source/ubl-strings.h:51
 msgid "User"
 msgstr ""
 
-#: source/ubl-strings.h:53
+#: source/ubl-strings.h:54
 msgid "Select device:"
 msgstr ""
 
-#: source/ubl-strings.h:54
+#: source/ubl-strings.h:55
 msgid "Choose a section:"
 msgstr ""
 
-#: source/ubl-strings.h:55
+#: source/ubl-strings.h:56
 msgid ""
 "Attention! The selected partition will be modified: the size will be "
 "reduced. In the resulting free space, a partition will be created into which "
@@ -267,223 +267,282 @@ msgid ""
 "installed."
 msgstr ""
 
-#: source/ubl-strings.h:56
+#: source/ubl-strings.h:57
 msgid "Device"
 msgstr ""
 
-#: source/ubl-strings.h:57
+#: source/ubl-strings.h:58
 msgid "Mark"
 msgstr ""
 
-#: source/ubl-strings.h:58
+#: source/ubl-strings.h:59
 msgid "Size"
 msgstr ""
 
-#: source/ubl-strings.h:59
+#: source/ubl-strings.h:60
 msgid "Free"
 msgstr ""
 
-#: source/ubl-strings.h:60
+#: source/ubl-strings.h:61
 msgid "Specify the size of the new partition for UBLinux OS:"
 msgstr ""
 
-#: source/ubl-strings.h:61
+#: source/ubl-strings.h:62
 msgid "Tb"
 msgstr ""
 
-#: source/ubl-strings.h:62
+#: source/ubl-strings.h:63
 msgid "Gb"
 msgstr ""
 
-#: source/ubl-strings.h:63
+#: source/ubl-strings.h:64
 msgid "Mb"
 msgstr ""
 
-#: source/ubl-strings.h:64
+#: source/ubl-strings.h:65
 msgid "Available languages in the system:"
 msgstr ""
 
-#: source/ubl-strings.h:66
+#: source/ubl-strings.h:67
 msgid "No device were chosen"
 msgstr ""
 
-#: source/ubl-strings.h:68
+#: source/ubl-strings.h:69
 msgid "Installation parameters"
 msgstr ""
 
-#: source/ubl-strings.h:71 source/ubl-strings.h:93
-msgid "Keyboard layout language"
+#: source/ubl-strings.h:71
+msgid "Advanced installation mode"
+msgstr ""
+
+#: source/ubl-strings.h:72
+msgid ""
+"Installing OS files, user data on different partitions, creating RAID, etc."
 msgstr ""
 
 #: source/ubl-strings.h:73
-msgid "Region were not fullified"
+msgid ""
+"Attention! The selected OC UBLinux components will be installed\n"
+"separately into the selected partition."
 msgstr ""
 
 #: source/ubl-strings.h:74
-msgid "Zone were not fullified"
+msgid "GRUB install"
 msgstr ""
 
 #: source/ubl-strings.h:75
-msgid "Languages list is empty"
+msgid "Install the GRUB bootloader"
 msgstr ""
 
 #: source/ubl-strings.h:76
-msgid "System locale hasn't been chosen"
+msgid "GRUB update"
 msgstr ""
 
 #: source/ubl-strings.h:77
-msgid "Manual layouts has been chosen but empty"
+msgid "Update (reinstall) the GRUB bootloader"
+msgstr ""
+
+#: source/ubl-strings.h:78
+msgid "Separate installation"
 msgstr ""
 
 #: source/ubl-strings.h:79
-msgid "Password input"
+msgid "Installing OS components and user data on different disk partitions"
 msgstr ""
 
 #: source/ubl-strings.h:80
-msgid "Password mismatch"
+msgid "OS only"
 msgstr ""
 
 #: source/ubl-strings.h:81
-msgid "Empty important field"
+msgid "Installing only OS components without user data"
 msgstr ""
 
 #: source/ubl-strings.h:82
+msgid "User data only"
+msgstr ""
+
+#: source/ubl-strings.h:83
+msgid "Installing only user data without OS components"
+msgstr ""
+
+#: source/ubl-strings.h:85 source/ubl-strings.h:107
+msgid "Keyboard layout language"
+msgstr ""
+
+#: source/ubl-strings.h:87
+msgid "Region were not fullified"
+msgstr ""
+
+#: source/ubl-strings.h:88
+msgid "Zone were not fullified"
+msgstr ""
+
+#: source/ubl-strings.h:89
+msgid "Languages list is empty"
+msgstr ""
+
+#: source/ubl-strings.h:90
+msgid "System locale hasn't been chosen"
+msgstr ""
+
+#: source/ubl-strings.h:91
+msgid "Manual layouts has been chosen but empty"
+msgstr ""
+
+#: source/ubl-strings.h:93
+msgid "Password input"
+msgstr ""
+
+#: source/ubl-strings.h:94
+msgid "Password mismatch"
+msgstr ""
+
+#: source/ubl-strings.h:95
+msgid "Empty important field"
+msgstr ""
+
+#: source/ubl-strings.h:96
 msgid "Password must be at least"
 msgstr ""
 
-#: source/ubl-strings.h:82
+#: source/ubl-strings.h:96
 msgid "characters"
 msgstr ""
 
-#: source/ubl-strings.h:84
+#: source/ubl-strings.h:98
 msgid "Restart PC"
 msgstr ""
 
-#: source/ubl-strings.h:85
+#: source/ubl-strings.h:99
 msgid "Exit"
 msgstr ""
 
-#: source/ubl-strings.h:86
+#: source/ubl-strings.h:100
 msgid "Choose file system type for the section:"
 msgstr ""
 
-#: source/ubl-strings.h:87
+#: source/ubl-strings.h:101
 msgid "Section name:"
 msgstr ""
 
-#: source/ubl-strings.h:88
+#: source/ubl-strings.h:102
 msgid "Format"
 msgstr ""
 
-#: source/ubl-strings.h:90
+#: source/ubl-strings.h:104
 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
+#: source/ubl-strings.h:106
 msgid "Available languages in the system"
 msgstr ""
 
-#: source/ubl-strings.h:94
+#: source/ubl-strings.h:108
 msgid "Apply"
 msgstr ""
 
-#: source/ubl-strings.h:95
+#: source/ubl-strings.h:109
 msgid "Success"
 msgstr ""
 
-#: source/ubl-strings.h:96
+#: source/ubl-strings.h:110
 msgid "Layout"
 msgstr ""
 
-#: source/ubl-strings.h:97
+#: source/ubl-strings.h:111
 msgid "Designation"
 msgstr ""
 
-#: source/ubl-strings.h:98
+#: source/ubl-strings.h:112
 msgid "Serial"
 msgstr ""
 
-#: source/ubl-strings.h:99
+#: source/ubl-strings.h:113
 msgid "Section"
 msgstr ""
 
-#: source/ubl-strings.h:100
+#: source/ubl-strings.h:114
 msgid "Capacity"
 msgstr ""
 
-#: source/ubl-strings.h:101
+#: source/ubl-strings.h:115
 msgid "Free space"
 msgstr ""
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:116
 msgid "File system"
 msgstr ""
 
-#: source/ubl-strings.h:103
+#: source/ubl-strings.h:117
 msgid "Default (L_Alt + L_Shift)"
 msgstr ""
 
-#: source/ubl-strings.h:104
+#: source/ubl-strings.h:118
 msgid "Default (Regular 105-key)"
 msgstr ""
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:120
 msgid "Installation configuration has ended"
 msgstr ""
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:121
 msgid "UBLinux OS installation is about to begin"
 msgstr ""
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:123
 msgid "Documentation"
 msgstr ""
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:124
 msgid "About"
 msgstr ""
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:126
 msgid "Would you like to read documentation in the Web?"
 msgstr ""
 
-#: source/ubl-strings.h:102
-msgid "You will be redirected to documentation website where documentation is\ntranslated and supported by community."
+#: source/ubl-strings.h:127
+msgid ""
+"You will be redirected to documentation website where documentation is\n"
+"translated and supported by community."
 msgstr ""
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:128
 msgid "Always redirect to online documentation"
 msgstr ""
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:129
 msgid "Open documentation"
 msgstr ""
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:131
 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."
+#: source/ubl-strings.h:132
+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:134
 msgid "Installation options"
 msgstr ""
 
-#: source/ubl-strings.h:102
-msgid "Error"
+#: source/ubl-strings.h:136
+msgid "Configuration mode"
 msgstr ""
 
-#: source/ubl-strings.h:102
-msgid "Error has occured while installation process"
+#: source/ubl-strings.h:137
+msgid "Error"
 msgstr ""
 
-#: source/ubl-strings.h:136
-msgid "Configuration mode"
+#: source/ubl-strings.h:138
+msgid "Error has occured while installation process"
 msgstr ""
 
 #: source/ubl-strings.h:140

ubinstall-gtk_ru.po

@@ -137,7 +137,7 @@ msgstr "Клавиатура"
 msgid "Users"
 msgstr "Пользователи"
 
-#: source/ubl-strings.h:21 source/ubl-strings.h:51
+#: source/ubl-strings.h:21 source/ubl-strings.h:52
 msgid "Completion"
 msgstr "Завершение"
 
@@ -186,7 +186,7 @@ msgstr "Тэг"
 msgid "Description"
 msgstr "Описание"
 
-#: source/ubl-strings.h:32 source/ubl-strings.h:52
+#: source/ubl-strings.h:32 source/ubl-strings.h:53
 msgid "Installation completion"
 msgstr "Завершение установки"
 
@@ -254,23 +254,23 @@ msgstr "Пароль администратора (root):"
 msgid "Computer name:"
 msgstr "Имя компьютера"
 
-#: source/ubl-strings.h:49
+#: source/ubl-strings.h:50
 msgid "Automatically"
 msgstr "Автоматически"
 
-#: source/ubl-strings.h:50
+#: source/ubl-strings.h:51
 msgid "User"
 msgstr "Пользователь"
 
-#: source/ubl-strings.h:53
+#: source/ubl-strings.h:54
 msgid "Select device:"
 msgstr "Выберите устройство хранения:"
 
-#: source/ubl-strings.h:54
+#: source/ubl-strings.h:55
 msgid "Choose a section:"
 msgstr "Выберите раздел:"
 
-#: source/ubl-strings.h:55
+#: source/ubl-strings.h:56
 msgid ""
 "Attention! The selected partition will be modified: the size will be "
 "reduced. In the resulting free space, a partition will be created into which "
@@ -281,115 +281,170 @@ msgstr ""
 "полученном свободном пространстве будет создан раздел, в который будет "
 "произведена установка ОС UBLinux"
 
-#: source/ubl-strings.h:56
+#: source/ubl-strings.h:57
 msgid "Device"
 msgstr "Устройство"
 
-#: source/ubl-strings.h:57
+#: source/ubl-strings.h:58
 msgid "Mark"
 msgstr "Метка"
 
-#: source/ubl-strings.h:58
+#: source/ubl-strings.h:59
 msgid "Size"
 msgstr "Размер"
 
-#: source/ubl-strings.h:59
+#: source/ubl-strings.h:60
 msgid "Free"
 msgstr "Свободно"
 
-#: source/ubl-strings.h:60
+#: source/ubl-strings.h:61
 msgid "Specify the size of the new partition for UBLinux OS:"
 msgstr "Укажите размер нового раздела для ОС UBLinux:"
 
-#: source/ubl-strings.h:61
+#: source/ubl-strings.h:62
 msgid "Tb"
 msgstr "Тб"
 
-#: source/ubl-strings.h:62
+#: source/ubl-strings.h:63
 msgid "Gb"
 msgstr "Гб"
 
-#: source/ubl-strings.h:63
+#: source/ubl-strings.h:64
 msgid "Mb"
 msgstr "Мб"
 
-#: source/ubl-strings.h:64
+#: source/ubl-strings.h:65
 msgid "Available languages in the system:"
 msgstr "Доступные языки в системе:"
 
-#: source/ubl-strings.h:66
+#: source/ubl-strings.h:67
 msgid "No device were chosen"
 msgstr "Устройство не выбрано"
 
-#: source/ubl-strings.h:68
+#: source/ubl-strings.h:69
 msgid "Installation parameters"
 msgstr "Параметры установки"
 
-#: source/ubl-strings.h:71 source/ubl-strings.h:93
+#: source/ubl-strings.h:71
+msgid "Advanced installation mode"
+msgstr "Расширенный режим установки"
+
+#: source/ubl-strings.h:72
+msgid ""
+"Installing OS files, user data on different partitions, creating RAID, etc."
+msgstr "Установка файлов ОС, пользовательских данныъ на разные разделы, создание RAID и др."
+
+#: source/ubl-strings.h:73
+msgid ""
+"Attention! The selected OS UBLinux components will be installed\n"
+"separately into the selected partition."
+msgstr "Внимание! В выбранный раздел будет произведена раздельная установка выбранных компонентов ОС UBLinux/"
+
+#: source/ubl-strings.h:74
+msgid "GRUB install"
+msgstr "Установка GRUB"
+
+#: source/ubl-strings.h:75
+msgid "Install the GRUB bootloader"
+msgstr "Установить загрузсик GRUB"
+
+#: source/ubl-strings.h:76
+msgid "GRUB update"
+msgstr "Обновление GRUB"
+
+#: source/ubl-strings.h:77
+msgid "Update (reinstall) the GRUB bootloader"
+msgstr "Обновить (переустановить) загрузчик GRUB"
+
+#: source/ubl-strings.h:78
+msgid "Separate installation"
+msgstr "Раздельная установка"
+
+#: source/ubl-strings.h:79
+msgid "Installing OS components and user data on different disk partitions"
+msgstr "Установка компонентов ОС и пользовательских данных на разные разделы диска"
+
+#: source/ubl-strings.h:80
+msgid "OS only"
+msgstr "Только ОС"
+
+#: source/ubl-strings.h:81
+msgid "Installing only OS components without user data"
+msgstr "Установка только компоненов ОС без пользовательских данных"
+
+#: source/ubl-strings.h:82
+msgid "User data only"
+msgstr "Только пользовательские данные"
+
+#: source/ubl-strings.h:83
+msgid "Installing only user data without OS components"
+msgstr "Установка только пользовательских данных без компонентов ОС"
+
+#: source/ubl-strings.h:85 source/ubl-strings.h:107
 msgid "Keyboard layout language"
 msgstr "Раскладка клавиатуры"
 
-#: source/ubl-strings.h:73
+#: source/ubl-strings.h:87
 msgid "Region were not fullified"
 msgstr "Регион не был выбран"
 
-#: source/ubl-strings.h:74
+#: source/ubl-strings.h:88
 msgid "Zone were not fullified"
 msgstr "Зона не была выбрана"
 
-#: source/ubl-strings.h:75
+#: source/ubl-strings.h:89
 msgid "Languages list is empty"
 msgstr "Список доступных языков не был заполнен"
 
-#: source/ubl-strings.h:76
+#: source/ubl-strings.h:90
 msgid "System locale hasn't been chosen"
 msgstr "Язык системы не был выбран"
 
-#: source/ubl-strings.h:77
+#: source/ubl-strings.h:91
 msgid "Manual layouts has been chosen but empty"
 msgstr "Ручной выбор списка раскладок клавиатуры выбран, но список пуст"
 
-#: source/ubl-strings.h:79
+#: source/ubl-strings.h:93
 msgid "Password input"
 msgstr "Пароль"
 
-#: source/ubl-strings.h:80
+#: source/ubl-strings.h:94
 msgid "Password mismatch"
 msgstr "Пароли не совпадают"
 
-#: source/ubl-strings.h:81
+#: source/ubl-strings.h:95
 msgid "Empty important field"
 msgstr "Пустое важное поле"
 
-#: source/ubl-strings.h:82
+#: source/ubl-strings.h:96
 msgid "Password must be at least"
 msgstr "Пароль должен быть как минимум"
 
-#: source/ubl-strings.h:82
+#: source/ubl-strings.h:96
 msgid "characters"
 msgstr "символов"
 
-#: source/ubl-strings.h:84
+#: source/ubl-strings.h:98
 msgid "Restart PC"
 msgstr "Перезагрузка"
 
-#: source/ubl-strings.h:85
+#: source/ubl-strings.h:99
 msgid "Exit"
 msgstr "Выйти"
 
-#: source/ubl-strings.h:86
+#: source/ubl-strings.h:100
 msgid "Choose file system type for the section:"
 msgstr "Выберите тип файловой системы для раздела"
 
-#: source/ubl-strings.h:87
+#: source/ubl-strings.h:101
 msgid "Section name:"
 msgstr "Имя раздела:"
 
-#: source/ubl-strings.h:88
+#: source/ubl-strings.h:102
 msgid "Format"
 msgstr "Форматировать"
 
-#: source/ubl-strings.h:90
+#: source/ubl-strings.h:104
 msgid ""
 "You have UBLinux installed on your computer.\n"
 "You can reboot and use your new system\n"
@@ -399,75 +454,75 @@ msgstr ""
 "Вы можете перезагрузить и использовать свою новую систему\n"
 "или продолжить работу в среде UBLinux Live."
 
-#: source/ubl-strings.h:92
+#: source/ubl-strings.h:106
 msgid "Available languages in the system"
 msgstr "Доступные языки в системе"
 
-#: source/ubl-strings.h:94
+#: source/ubl-strings.h:108
 msgid "Apply"
 msgstr "Применить"
 
-#: source/ubl-strings.h:95
+#: source/ubl-strings.h:109
 msgid "Success"
 msgstr "Готово"
 
-#: source/ubl-strings.h:96
+#: source/ubl-strings.h:110
 msgid "Layout"
 msgstr "Раскладка клавиатуры"
 
-#: source/ubl-strings.h:97
+#: source/ubl-strings.h:111
 msgid "Designation"
 msgstr "Обозначение"
 
-#: source/ubl-strings.h:98
+#: source/ubl-strings.h:112
 msgid "Serial"
 msgstr "Серийный номер"
 
-#: source/ubl-strings.h:99
+#: source/ubl-strings.h:113
 msgid "Section"
 msgstr "Раздел"
 
-#: source/ubl-strings.h:100
+#: source/ubl-strings.h:114
 msgid "Capacity"
 msgstr "Объём"
 
-#: source/ubl-strings.h:101
+#: source/ubl-strings.h:115
 msgid "Free space"
 msgstr "Свободно"
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:116
 msgid "File system"
 msgstr "Тип ФС"
 
-#: source/ubl-strings.h:103
+#: source/ubl-strings.h:117
 msgid "Default (L_Alt + L_Shift)"
 msgstr "По умолчанию (L_Alt + L_Shift)"
 
-#: source/ubl-strings.h:104
+#: source/ubl-strings.h:118
 msgid "Default (Regular 105-key)"
 msgstr "По умолчанию (Обычная 105-клавишная)"
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:120
 msgid "Installation configuration has ended"
 msgstr "Настройка установщика завершена"
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:121
 msgid "UBLinux OS installation is about to begin"
 msgstr "Начало установки ОС UBLinux"
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:123
 msgid "Documentation"
 msgstr "Документация"
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:124
 msgid "About"
 msgstr "О программе"
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:126
 msgid "Would you like to read documentation in the Web?"
 msgstr "Вы хотите прочитать документацию в Сети?"
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:127
 msgid ""
 "You will be redirected to documentation website where documentation is\n"
 "translated and supported by community."
@@ -476,38 +531,42 @@ msgstr ""
 "переводится\n"
 "и поддерживается сообществом"
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:128
 msgid "Always redirect to online documentation"
 msgstr "Всегда перенаправлять"
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:129
 msgid "Open documentation"
 msgstr "Открыть документацию"
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:131
 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:132
+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:134
 msgid "Installation options"
 msgstr "Параметры установки"
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:136
+msgid "Configuration mode"
+msgstr "Режим конфигурации"
+
+#: source/ubl-strings.h:137
 msgid "Error"
 msgstr "Ошибка"
 
-#: source/ubl-strings.h:102
+#: source/ubl-strings.h:138
 msgid "Error has occured while installation process"
 msgstr "Во время процесса установки произошла ошибка"
 
-#: source/ubl-strings.h:136
-msgid "Configuration mode"
-msgstr "Режим конфигурации"
-
 #: source/ubl-strings.h:140
 msgid "Log exploration"
 msgstr "Просмотр лога"