Исправлена локализация в коде

source/ubl-settings-bootloader.cc

@@ -110,9 +110,9 @@ void MainWindow::fill_in_view() {
     treeViewIPT->set_model(list_store_IPT);
     treeViewOTT->set_model(list_store_OTT);
 
-    vec_Option_kernel = this->read_file_and_view("boot-options.csv", row_kernel, list_store_kernel);
-    vec_Option_IPT = this->read_file_and_view("input-options.csv", row_IPT, list_store_IPT);
-    vec_Option_OTT = this->read_file_and_view("output-options.csv", row_OTT, list_store_OTT);
+    vec_Option_kernel = this->read_file_and_view("cmdline-linux.csv", row_kernel, list_store_kernel);
+    vec_Option_IPT = this->read_file_and_view("grub-terminal-input.csv", row_IPT, list_store_IPT);
+    vec_Option_OTT = this->read_file_and_view("grub-terminal-output.csv", row_OTT, list_store_OTT);
     size_kernel = vec_Option_kernel.size();
     size_IPT = vec_Option_IPT.size();
     size_OTT = vec_Option_OTT.size();
@@ -431,7 +431,6 @@ void MainWindow::view_add_cell(Gtk::TreeModel::Row &row, Glib::RefPtr<Gtk::ListS
 
 void MainWindow::get_builder(){
     builder->get_widget("chbLoadVariantSelectionTimer", chbLoadVariantSelectionTimer);
-    builder->get_widget("chbLastSelectionWillBecome", chbLastSelectionWillBecome);
     builder->get_widget("lblInfoCommand", lblInfoCommand);
     builder->get_widget("lblInfoCommand1", lblInfoCommand1);
     builder->get_widget("lblInfoCommand2", lblInfoCommand2);
@@ -482,6 +481,8 @@ void MainWindow::get_builder(){
     builder->get_widget("chbPasswordProtecc", chbPasswordProtecc);
     builder->get_widget("entryPasswordProtecc", entryPasswordProtecc);
     builder->get_widget("entrySecurityLogin", entrySecurityLogin);
+    builder->get_widget("cmbDefaultDonw", cmbDefaultDonw);
+    
 }
 
 void MainWindow::localization(){
@@ -501,14 +502,13 @@ void MainWindow::localization(){
     lblInfoCommand->set_text(_("Command line parameters:"));
     lblInfoCommand1->set_text(_("Command line parameters:"));
     lblInfoCommand2->set_text(_("Command line parameters:"));
-    lblInfoDefaultDonw->set_text(_("Default download"));
+    lblInfoDefaultDonw->set_text(_("Load screen display mode:"));
     lblInfoSeconds->set_text(_("Seconds"));
     lblLoadMenu->set_text(_("Download menu"));
     lblInfoInputTerminal->set_text(_("Terminal for input"));
     lblInfoOutputTerminal->set_text(_("Terminal for output"));
     
-    chbLoadVariantSelectionTimer->set_label(_("Load variant selection timer"));
-    chbLastSelectionWillBecome->set_label(_("The last selection will become the default boot choice"));
+    chbLoadVariantSelectionTimer->set_label(_("Load option timer"));
     btnSynopsis->set_label(_("Help"));
     btnAbout->set_label(_("About"));
     btnSaveLocalGlob->set_label(_("Save to global and local configuration"));
@@ -519,22 +519,23 @@ void MainWindow::localization(){
     btnSave->set_label(_("Save"));
     btnLoad->set_label(_("Load"));
     this->set_title(_("ubl-settings-bootloader"));
+    lblSecurityLogin->set_tooltip_text(gettext("User name to enter boot configuration editing mode"));
 
-    lblDownloadMode->set_text(_("Download mode:"));
-    lblSecurityLogin->set_text(_("Security login:"));
-    lblPasswordProtec->set_text(_("Password protection:"));
+    lblDownloadMode->set_text(_("Load screen display mode:"));
+    lblSecurityLogin->set_text(_("Download menu user name:"));
+    lblPasswordProtec->set_text(_("Download menu user password:"));
 
-    chbSecurityLogin->append(_("Default"));
+    chbSecurityLogin->append(_("Not available"));
     chbSecurityLogin->append(_("Mine"));
 
-    chbPasswordProtecc->append(_("Default"));
+    chbPasswordProtecc->append(_("Not available"));
     chbPasswordProtecc->append(_("Mine"));
-    chbPasswordProtecc->append(_("Disabled"));
 
-    cmbDownloadMode->append(_("Loading animation, full log"));
-    cmbDownloadMode->append(_("Loading animation, no log"));
-    cmbDownloadMode->append(_("No loading animation, full log."));
-    cmbDownloadMode->append(_("No loading animation, minimal log."));
+    cmbDownloadMode->append(_("Loading animation with the magazine"));
+    cmbDownloadMode->append(_("Loading animation without a magazine"));
+    cmbDownloadMode->append(_("Нет анимации загрузки, полный журнал"));
+    cmbDownloadMode->append(_("Lack of loading animation with the output of the abbreviated log"));
+    cmbDefaultDonw->append(_("Last Successful Download"));
 }
 
 vector<string> MainWindow::get_setting_entry_all(string key, string cmd, Gtk::Entry &entry_text, std::map <string, string> &map_temp) {

source/ubl-settings-bootloader.h

@@ -61,7 +61,6 @@ class MainWindow : public Gtk::ApplicationWindow {
         Gtk::Label *lblInfoHead;
         Gtk::CheckButton *chbVgaText;
         Gtk::CheckButton *chbLoadVariantSelectionTimer;
-        Gtk::CheckButton *chbLastSelectionWillBecome;
         Gtk::Entry *entryKernel;
         Gtk::Entry *entryIPT;
         Gtk::Entry *entryOTT;
@@ -89,6 +88,7 @@ class MainWindow : public Gtk::ApplicationWindow {
         Gtk::TreeView *treeViewOTT;
         Gtk::Image *imgBG;
         Gtk::Overlay *overHead;
+        Gtk::ComboBoxText *cmbDefaultDonw;
         Gtk::ComboBoxText *cmbDownloadMode;
         Gtk::ComboBoxText *chbSecurityLogin;
         Gtk::ComboBoxText *chbPasswordProtecc;