diff --git a/source/ubinstall-gtk.c b/source/ubinstall-gtk.c index 5eb446a..6a31f18 100644 --- a/source/ubinstall-gtk.c +++ b/source/ubinstall-gtk.c @@ -4,6 +4,37 @@ config main_config; //functions +void on_toggle_button_switch_on(GtkWidget *, GtkToggleButton *toggle){ + gtk_toggle_button_set_active(toggle,1); +} + +void on_autohostname_check(GtkWidget *, main_window *widgets){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->HostnameSensitiveCheck),1); + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->AutoHostnameCheck))){ + gtk_widget_set_sensitive(widgets->HotnameEntry,0); + }else{ + gtk_widget_set_sensitive(widgets->HotnameEntry,1); + } +} + +void on_autohostname_sensitiveness_check(GtkWidget *, main_window *widgets){ + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->HostnameSensitiveCheck))){ + gtk_widget_set_sensitive(widgets->AutoHostnameCheck,1); + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->AutoHostnameCheck))){ + gtk_widget_set_sensitive(widgets->HotnameEntry,0); + } else + gtk_widget_set_sensitive(widgets->HotnameEntry,1); + } else { + gtk_widget_set_sensitive(widgets->HotnameEntry,0); + gtk_widget_set_sensitive(widgets->AutoHostnameCheck,0); + } +} + +void on_hostname_entry_changed (GtkWidget *, main_window *widgets){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->HostnameSensitiveCheck),1); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->AutoHostnameCheck),0); +} + void _yon_saving_threaded(char *final_command); void _yon_saving_threaded(char *final_command){ FILE *file = popen(final_command,"r"); @@ -79,6 +110,25 @@ void yon_load_proceed(YON_CONFIG_TYPE type){ } void yon_interface_update(main_window *widgets){ + // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->RegionSensitiveCheck),0); + // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->LanguagesSensitiveCheck),0); + // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->MainLanguageSensitiveCheck),0); + // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->KeyboardModelSensitiveCheck),0); + // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->OptionsSensitiveCheck),0); + // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->LayoutSensitiveCheck),0); + // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->UsernameSensitiveCheck),0); + // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->LoginSensitiveCheck),0); + // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->PasswordSensitiveCheck),0); + // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->AutologinSensitiveCheck),0); + // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->RootPasswordSensitiveCheck),0); + // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->HostnameSensitiveCheck),0); + // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->CommonFilesystemSensitiveCheck),0); + // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->CommonSectionSensitiveCheck),0); + // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->NextSizeSensitiveCheck),0); + // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->NextFSTypeSensitiveCheck),0); + // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->NextLabelSensitiveCheck),0); + // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->SameFSTypeSensitiveCheck),0); + // gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->SameLabelSensitiveCheck),0); if (widgets){}; enum YON_PAGES page=YON_PAGE_COMPLETED; char *type = config(AUTOINSTALL_TYPE_INSTALL); @@ -144,14 +194,19 @@ void yon_interface_update(main_window *widgets){ } if (format&&!strcmp(format,"yes")) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->NextInstallationFormatCheck),1); else gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->NextInstallationFormatCheck),main_config.format_default); + if (!yon_char_is_empty(fs_type)) gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->NextInstallationFilesystemTypeCombo),fs_type); + if (device_label) gtk_entry_set_text(GTK_ENTRY(widgets->NextInstallationSectionNameEntry),device_label); + else + gtk_entry_set_text(GTK_ENTRY(widgets->NextInstallationSectionNameEntry),""); } break; case YON_PAGE_INSTALL_SAME_PARTITION:{ device_tree = widgets->SamePlaceDeviceTree; part_tree = widgets->SamePlacePartTree; - gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->SameInstallationFilesystemTypeCombo),fs_type); + if (!yon_char_is_empty(fs_type)) + gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->SameInstallationFilesystemTypeCombo),fs_type); if (format&&!strcmp(format,"yes")) gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->SameInstallationFormatCheck),1); else gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->SameInstallationFormatCheck),main_config.format_default); if (device_label) @@ -198,6 +253,10 @@ void yon_interface_update(main_window *widgets){ default:{}break; } + + + + GtkTreeIter iter; char *cur_device=""; if (page!=YON_PAGE_OPTIONS_SEPARATE && !yon_char_is_empty(device)){ @@ -236,10 +295,17 @@ void yon_interface_update(main_window *widgets){ } if (!yon_char_is_empty(chosen_langs)){ gtk_entry_set_text(GTK_ENTRY(widgets->AvailableLanguagesEntry),chosen_langs); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->LanguagesSensitiveCheck),1); free(chosen_langs); + } else { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->LanguagesSensitiveCheck),0); + gtk_entry_set_text(GTK_ENTRY(widgets->AvailableLanguagesEntry),""); } // gtk_tree_model_filter_refilter(GTK_TREE_MODEL_FILTER(widgets->LanguagesFilter)); } else { + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->LanguagesSensitiveCheck),0); + gtk_entry_set_text(GTK_ENTRY(widgets->AvailableLanguagesEntry),""); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->LanguagesSensitiveCheck),0); for_iter(widgets->LanguagesList,&iter){ gtk_list_store_set((widgets->LanguagesList),&iter,0,0,-1); } @@ -251,11 +317,12 @@ void yon_interface_update(main_window *widgets){ char *zone = config(zone_parameter); char *region = NULL; - if (!yon_char_is_empty(zone)) region = yon_char_divide_search(zone,"/",-1); + if (!yon_char_is_empty(zone)) region = yon_char_divide_search(zone,"/",-1); else {gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->RegionSensitiveCheck),0);} if (!yon_char_is_empty(region)){ gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->RegionCombo),region); } else { gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->RegionCombo),0); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->RegionSensitiveCheck),0); } if (!yon_char_is_empty(zone)){ @@ -272,6 +339,7 @@ void yon_interface_update(main_window *widgets){ }; } else { gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->LanguageCombo),0); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->MainLanguageSensitiveCheck),0); } @@ -281,11 +349,18 @@ void yon_interface_update(main_window *widgets){ if (!yon_char_is_empty(kbmodel)){ gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->KeyboardModelCombo),kbmodel); - } else gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->KeyboardModelCombo),0); + } else { + gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->KeyboardModelCombo),0); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->KeyboardModelSensitiveCheck),0); + + } if (!yon_char_is_empty(optinos)){ gtk_combo_box_set_active_id(GTK_COMBO_BOX(widgets->LayoutBindingCombo),optinos); - } else gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->LayoutBindingCombo),0); + } else { + gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->LayoutBindingCombo),0); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->OptionsSensitiveCheck),0); + } if (!yon_char_is_empty(layout)){ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->ManualLayoutRadio),1); @@ -302,6 +377,7 @@ void yon_interface_update(main_window *widgets){ for_iter(widgets->LayoutList,&iter){ gtk_tree_store_set((widgets->LayoutList),&iter,3,0,-1); } + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->LayoutSensitiveCheck),0); } char *user_name = config(user_name_parameter); @@ -313,11 +389,17 @@ void yon_interface_update(main_window *widgets){ if (!yon_char_is_empty(user_name)){ gtk_entry_set_text(GTK_ENTRY(widgets->LoginEntry),user_name); - } else gtk_entry_set_text(GTK_ENTRY(widgets->LoginEntry),""); + } else { + gtk_entry_set_text(GTK_ENTRY(widgets->LoginEntry),""); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->LoginSensitiveCheck),0); + } if (!yon_char_is_empty(user_gecos)){ gtk_entry_set_text(GTK_ENTRY(widgets->UserNameEntry),user_gecos); - } else gtk_entry_set_text(GTK_ENTRY(widgets->UserNameEntry),""); + } else { + gtk_entry_set_text(GTK_ENTRY(widgets->UserNameEntry),""); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->UsernameSensitiveCheck),0); + } if (!yon_char_is_empty(user_password)){ gtk_entry_set_text(GTK_ENTRY(widgets->PasswordEntry),user_password); @@ -325,6 +407,8 @@ void yon_interface_update(main_window *widgets){ } else { gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->PasswordCombo),0); gtk_entry_set_text(GTK_ENTRY(widgets->PasswordEntry),""); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->PasswordSensitiveCheck),0); + } if (!yon_char_is_empty(root_password)){ @@ -333,6 +417,7 @@ void yon_interface_update(main_window *widgets){ } else { gtk_combo_box_set_active(GTK_COMBO_BOX(widgets->AdminPasswordCombo),0); gtk_entry_set_text(GTK_ENTRY(widgets->AdminPasswordEntry),""); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->RootPasswordSensitiveCheck),0); } if (!yon_char_is_empty(autologin)){ @@ -340,41 +425,47 @@ void yon_interface_update(main_window *widgets){ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->AutologinCheck),1); else gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->AutologinCheck),0); - } else + } else { gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->AutologinCheck),main_config.autologin_default); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->AutologinSensitiveCheck),0); + } if (!yon_char_is_empty(hostname)){ if (strcmp(hostname,"auto")){ gtk_entry_set_text(GTK_ENTRY(widgets->HotnameEntry),hostname); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->AutoHostnameCheck),0); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->HostnameSensitiveCheck),1); } else{ gtk_entry_set_text(GTK_ENTRY(widgets->HotnameEntry),""); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->AutoHostnameCheck),1); } } else { gtk_entry_set_text(GTK_ENTRY(widgets->HotnameEntry),""); + g_signal_handlers_block_by_func(G_OBJECT(widgets->AutoHostnameCheck),on_autohostname_check,widgets); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->AutoHostnameCheck),1); + g_signal_handlers_unblock_by_func(G_OBJECT(widgets->AutoHostnameCheck),on_autohostname_check,widgets); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widgets->HostnameSensitiveCheck),0); } - if (fs_type) free(fs_type); - if (device_label) free(device_label); - if (format) free(format); - if (part_size) free(part_size); - if (user_name) free(user_name); - if (user_gecos) free(user_gecos); - if (user_password) free(user_password); - if (root_password) free(root_password); - if (autologin) free(autologin); - if (hostname) free(hostname); - if (kbmodel) free(kbmodel); - if (optinos) free(optinos); - if (layout) free(layout); - if (language) free(language); - if (zone) free(zone); - if (system_locale) free(system_locale); - if (region) free(region); - if (device) free(device); - if (part) free(part); + // if (fs_type) free(fs_type); + // if (device_label) free(device_label); + // if (format) free(format); + // if (part_size) free(part_size); + // if (user_name) free(user_name); + // if (user_gecos) free(user_gecos); + // if (user_password) free(user_password); + // if (root_password) free(root_password); + // if (autologin) free(autologin); + // if (hostname) free(hostname); + // if (kbmodel) free(kbmodel); + // if (optinos) free(optinos); + // if (layout) free(layout); + // if (language) free(language); + // if (zone) free(zone); + // if (system_locale) free(system_locale); + // if (region) free(region); + // if (device) free(device); + // if (part) free(part); } void on_config_local_load(GtkWidget *,main_window *widgets); @@ -1177,7 +1268,7 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){ } else { yon_config_remove_by_key(xkblayout_parameter); } - if (!gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->KeyboardModelCombo))&>k_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->KeyboardModelSensitiveCheck))){ + if (gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->KeyboardModelCombo))&>k_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->KeyboardModelSensitiveCheck))){ char *model = (char*)gtk_combo_box_get_active_id(GTK_COMBO_BOX(widgets->KeyboardModelCombo)); // char *layout_switch; if (!yon_char_is_empty(model)) @@ -1213,15 +1304,15 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){ gtk_tree_model_get(model,&iter,0,&device,-1); yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"fast"); yon_config_register(AUTOINSTALL_DEVICE,AUTOINSTALL_DEVICE_command,device); - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->LayoutSensitiveCheck))){ - yon_config_register(device_label_parameter,device_label_parameter_command,device_name); + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->CommonSectionSensitiveCheck))){ + yon_config_register(device_label_parameter,device_label_parameter_command,device_name); } else { yon_config_remove_by_key(device_label_parameter); } if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->CommonFilesystemSensitiveCheck))){ - yon_config_register(part_type_parameter,part_type_parameter_command,file_system_type); + yon_config_register(part_type_parameter,part_type_parameter_command,file_system_type); } else { - yon_config_remove_by_key(device_label_parameter); + yon_config_remove_by_key(part_type_parameter); } if (!main_config.configure_mode) @@ -1256,15 +1347,15 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){ } else yon_config_remove_by_key(part_size_parameter); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->NextLabelSensitiveCheck))){ char *device_name = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->NextInstallationSectionNameEntry)); - char *part; - gtk_tree_model_get(model,&iter,0,&part,-1); - yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"next"); - yon_config_register(AUTOINSTALL_DEVICE,AUTOINSTALL_DEVICE_command,device); - yon_config_register(part_parameter,part_parameter_command,part); yon_config_register(device_label_parameter,device_label_parameter_command,device_name); } else { yon_config_remove_by_key(device_label_parameter); } + char *part; + gtk_tree_model_get(model,&iter,0,&part,-1); + yon_config_register(AUTOINSTALL_TYPE_INSTALL,AUTOINSTALL_TYPE_INSTALL_command,"next"); + yon_config_register(AUTOINSTALL_DEVICE,AUTOINSTALL_DEVICE_command,device); + yon_config_register(part_parameter,part_parameter_command,part); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->NextFSTypeSensitiveCheck))){ if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->NextInstallationFormatCheck))){ yon_config_register(device_format_parameter,device_format_parameter_command,"no"); @@ -1398,11 +1489,11 @@ void on_page_navigation_clicked(GtkWidget *self, main_window *widgets){ yon_config_register(hostname_parameter,hostname_parameter_command,"auto"); } else { if (!yon_char_is_empty(gtk_entry_get_text(GTK_ENTRY(widgets->HotnameEntry)))){ - yon_config_remove_by_key(hostname_parameter); + char *hostname = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->HotnameEntry)); + yon_config_register(hostname_parameter,hostname_parameter_command,hostname); } else { - char *hostname = (char*)gtk_entry_get_text(GTK_ENTRY(widgets->HotnameEntry)); - yon_config_register(hostname_parameter,hostname_parameter_command,hostname); + yon_config_remove_by_key(hostname_parameter); } } @@ -1876,9 +1967,7 @@ main_window *yon_main_window_complete(){ widgets = yon_remalloc(widgets,sizeof(main_window)); GtkBuilder *builder = gtk_builder_new_from_resource(glade_path); gtk_builder_add_callback_symbol(builder,"yon_gtk_widget_set_sensitive_from_toggle_button",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button)); - gtk_builder_add_callback_symbol(builder,"yon_gtk_toggle_button_set_inactive_from_toggle",G_CALLBACK(yon_gtk_toggle_button_set_inactive_from_toggle)); - gtk_builder_add_callback_symbol(builder,"yon_gtk_toggle_button_set_inactive_from_entry",G_CALLBACK(yon_gtk_toggle_button_set_inactive_from_entry)); - gtk_builder_add_callback_symbol(builder,"yon_gtk_toggle_button_set_inactive_from_combo_box",G_CALLBACK(yon_gtk_toggle_button_set_inactive_from_combo_box)); + gtk_builder_add_callback_symbol(builder,"on_toggle_button_switch_on",G_CALLBACK(on_toggle_button_switch_on)); // Custom widgets configuration widgets->builder = builder; @@ -2096,6 +2185,9 @@ main_window *yon_main_window_complete(){ g_signal_connect(G_OBJECT(widgets->NextInstallationFormatCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button),widgets->NextInstallationFilesystemTypeCombo); g_signal_connect(G_OBJECT(widgets->SameInstallationFormatCheck),"toggled",G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button),widgets->SameInstallationFilesystemTypeCombo); + g_signal_connect(G_OBJECT(widgets->HostnameSensitiveCheck),"toggled",G_CALLBACK(on_autohostname_sensitiveness_check),widgets); + g_signal_connect(G_OBJECT(widgets->AutoHostnameCheck),"toggled",G_CALLBACK(on_autohostname_check),widgets); + g_signal_connect(G_OBJECT(widgets->HotnameEntry),"changed",G_CALLBACK(on_hostname_entry_changed),widgets); // g_signal_connect(G_OBJECT(widgets->InstallationToggle),"toggled",G_CALLBACK(on_toggle_block),widgets); diff --git a/source/ubinstall-gtk.h b/source/ubinstall-gtk.h index 608bd39..133639c 100755 --- a/source/ubinstall-gtk.h +++ b/source/ubinstall-gtk.h @@ -119,9 +119,9 @@ NULL #define open_gparted_command "gparted" -#define AUTOINSTALL_TYPE_INSTALL_command "ubconfig --source global get autoinstall AUTOINSTALL[install_type]" -#define AUTOINSTALL_DEVICE_command "ubconfig --source global get autoinstall AUTOINSTALL[device]" -#define part_parameter_command "ubconfig --source global get autoinstall AUTOINSTALL[part]" +#define AUTOINSTALL_TYPE_INSTALL_command "ubconfig --source global get [autoinstall] AUTOINSTALL[install_type]" +#define AUTOINSTALL_DEVICE_command "ubconfig --source global get [autoinstall] AUTOINSTALL[device]" +#define part_parameter_command "ubconfig --source global get [autoinstall] AUTOINSTALL[part]" #define PASSWORD_DEFAULT "ublinux" @@ -446,4 +446,10 @@ char *yon_save_command_prepare(char *command, char *target); void yon_interface_update(main_window *widgets); void on_summary_log_view(GtkWidget *); -void on_near_installation_device_changed(GtkWidget *self, main_window *widgets); \ No newline at end of file +void on_near_installation_device_changed(GtkWidget *self, main_window *widgets); + +void on_toggle_button_switch_on(GtkWidget *, GtkToggleButton *toggle); + +void on_autohostname_sensitiveness_check(GtkWidget *, main_window *widgets); +void on_autohostname_check(GtkWidget *, main_window *widgets); +void on_hostname_entry_changed (GtkWidget *, main_window *widgets); \ No newline at end of file diff --git a/ubinstall-gtk.glade b/ubinstall-gtk.glade index 7cec106..c1441ab 100644 --- a/ubinstall-gtk.glade +++ b/ubinstall-gtk.glade @@ -1638,7 +1638,7 @@ and help you install UBLinux on your computer True False False - + False @@ -1676,7 +1676,7 @@ and help you install UBLinux on your computer True False False - + False @@ -1756,7 +1756,7 @@ and help you install UBLinux on your computer True False False - + True @@ -1829,7 +1829,7 @@ and help you install UBLinux on your computer False LanguagesFilter 2 - + @@ -1968,7 +1968,7 @@ and help you install UBLinux on your computer Default (Regular 105-key) - + True @@ -2050,7 +2050,7 @@ and help you install UBLinux on your computer Scroll Lock Left Ctrl+Left Win - + True @@ -2119,7 +2119,7 @@ and help you install UBLinux on your computer False True True - + False @@ -2136,7 +2136,7 @@ and help you install UBLinux on your computer False True DefaultLayoutRadio - + False @@ -2368,7 +2368,7 @@ and help you install UBLinux on your computer False True Super Admin - + True @@ -2424,7 +2424,7 @@ and help you install UBLinux on your computer False True superadmin - + True @@ -2451,7 +2451,6 @@ and help you install UBLinux on your computer False True - @@ -2485,7 +2484,7 @@ and help you install UBLinux on your computer Default Set a password - + False @@ -2502,7 +2501,6 @@ and help you install UBLinux on your computer ****** password - True @@ -2574,7 +2572,6 @@ and help you install UBLinux on your computer False True - @@ -2608,7 +2605,7 @@ and help you install UBLinux on your computer Default Set a password - + False @@ -2625,7 +2622,6 @@ and help you install UBLinux on your computer ****** password - True @@ -2662,8 +2658,6 @@ and help you install UBLinux on your computer False False True - - @@ -2693,7 +2687,6 @@ and help you install UBLinux on your computer False True ubstation - True @@ -2709,7 +2702,6 @@ and help you install UBLinux on your computer True False True - False @@ -3207,7 +3199,7 @@ or continue working in the UBLinux Live environment. xfs zfs - + True @@ -3261,7 +3253,7 @@ or continue working in the UBLinux Live environment. True False True - + True @@ -3722,6 +3714,7 @@ installed. 0,0 adjustment1 1 + False @@ -3740,7 +3733,7 @@ installed. Gb Tb - + False @@ -3773,7 +3766,6 @@ installed. False False True - @@ -3814,7 +3806,7 @@ installed. xfs zfs - + True @@ -3829,7 +3821,6 @@ installed. False True False - True True @@ -3885,7 +3876,7 @@ installed. True False True - + True @@ -4309,7 +4300,6 @@ installed. False False True - @@ -4350,7 +4340,7 @@ installed. xfs zfs - + True @@ -4365,9 +4355,8 @@ installed. False True False - True True - + False @@ -4421,7 +4410,7 @@ installed. True False True - + True diff --git a/ubinstall-gtk_ru.po b/ubinstall-gtk_ru.po index 88ee4a7..285dfed 100644 --- a/ubinstall-gtk_ru.po +++ b/ubinstall-gtk_ru.po @@ -583,7 +583,7 @@ msgid "Load local configuration" msgstr "Загрузить локальную конфигурацию" msgid "Load from specific file" -msgstr "Зашрузить из файла" +msgstr "Загрузить из файла" msgid "Save configuration" msgstr "Сохранить конфигурацию"