diff --git a/gnucash/import-export/csv-imp/assistant-csv-account-import.glade b/gnucash/import-export/csv-imp/assistant-csv-account-import.glade index 102da25bec..b119eb17b2 100644 --- a/gnucash/import-export/csv-imp/assistant-csv-account-import.glade +++ b/gnucash/import-export/csv-imp/assistant-csv-account-import.glade @@ -309,7 +309,7 @@ Cancel to abort. True False - label + label True @@ -354,6 +354,9 @@ Cancel to abort. False + + False + diff --git a/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp b/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp index 47a6f2b721..238faf40cc 100644 --- a/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp +++ b/gnucash/import-export/csv-imp/assistant-csv-price-import.cpp @@ -501,7 +501,7 @@ CsvImpPriceAssist::CsvImpPriceAssist () file_chooser = gtk_file_chooser_widget_new (GTK_FILE_CHOOSER_ACTION_OPEN); g_signal_connect (G_OBJECT(file_chooser), "file-activated", G_CALLBACK(csv_price_imp_file_confirm_cb), this); - auto button = gtk_button_new_with_label (_("OK")); + auto button = gtk_button_new_with_mnemonic (_("_OK")); gtk_widget_set_size_request (button, 100, -1); gtk_widget_show (button); auto h_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); @@ -1761,11 +1761,34 @@ void CsvImpPriceAssist::assist_summary_page_prepare () { auto text = std::string(""); - text += _("The prices were imported from the file '") + m_file_name + "'."; - text += _("\n\nThere were ") + std::to_string(price_imp->m_prices_added); - text += _(" Prices added, ") + std::to_string(price_imp->m_prices_duplicated); - text += _(" duplicated and ") + std::to_string(price_imp->m_prices_replaced); - text += _(" replaced."); + /* Translators: This is a ngettext(3) message, %d is the number of prices added */ + auto added_str = g_strdup_printf (ngettext ("%d added price", + "%d added prices", + price_imp->m_prices_added), + price_imp->m_prices_added); + /* Translators: This is a ngettext(3) message, %d is the number of duplicate prices */ + auto dupl_str = g_strdup_printf (ngettext ("%d duplicate price", + "%d duplicate prices", + price_imp->m_prices_duplicated), + price_imp->m_prices_duplicated); + /* Translators: This is a ngettext(3) message, %d is the number of replaced prices */ + auto repl_str = g_strdup_printf (ngettext ("%d replaced price", + "%d replaced prices", + price_imp->m_prices_replaced), + price_imp->m_prices_replaced); + auto msg = g_strdup_printf ( + _("The prices were imported from file '%s'.\n\n" + "Import summary:\n" + "- %s\n" + "- %s\n" + "- %s"), + m_file_name.c_str(), added_str, dupl_str,repl_str); + text += msg; + text += ""; + + g_free (added_str); + g_free (dupl_str); + g_free (repl_str); gtk_label_set_markup (GTK_LABEL(summary_label), text.c_str()); } diff --git a/gnucash/import-export/csv-imp/assistant-csv-price-import.glade b/gnucash/import-export/csv-imp/assistant-csv-price-import.glade index b1ba9c0a8c..d465787b54 100644 --- a/gnucash/import-export/csv-imp/assistant-csv-price-import.glade +++ b/gnucash/import-export/csv-imp/assistant-csv-price-import.glade @@ -73,6 +73,7 @@ Click on 'Forward' to proceed or 'Cancel' to Abort Import. intro True + False @@ -99,6 +100,7 @@ Select location and file name for the Import, then click 'OK'... Select File for Import + False @@ -1048,6 +1050,7 @@ For example intro True + False @@ -1082,6 +1085,7 @@ Cancel to abort.</b> confirm Import Prices Now + False @@ -1094,7 +1098,7 @@ Cancel to abort.</b> True False - label + label True True @@ -1109,6 +1113,7 @@ Cancel to abort.</b> summary Import Summary True + False @@ -1116,6 +1121,7 @@ Cancel to abort.</b> False + False diff --git a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp index f593a0c8cb..a13ddae0ed 100644 --- a/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp +++ b/gnucash/import-export/csv-imp/assistant-csv-trans-import.cpp @@ -423,7 +423,7 @@ CsvImpTransAssist::CsvImpTransAssist () file_chooser = gtk_file_chooser_widget_new (GTK_FILE_CHOOSER_ACTION_OPEN); g_signal_connect (G_OBJECT(file_chooser), "file-activated", G_CALLBACK(csv_tximp_file_confirm_cb), this); - auto button = gtk_button_new_with_label (_("OK")); + auto button = gtk_button_new_with_mnemonic (_("_OK")); gtk_widget_set_size_request (button, 100, -1); gtk_widget_show (button); auto h_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); diff --git a/gnucash/import-export/csv-imp/assistant-csv-trans-import.glade b/gnucash/import-export/csv-imp/assistant-csv-trans-import.glade index c15f378ead..3a7300b434 100644 --- a/gnucash/import-export/csv-imp/assistant-csv-trans-import.glade +++ b/gnucash/import-export/csv-imp/assistant-csv-trans-import.glade @@ -1174,7 +1174,7 @@ More information can be displayed by using the help button. True False - label + label True True @@ -1196,6 +1196,9 @@ More information can be displayed by using the help button. False + + False +