diff --git a/gnucash/gnome-utils/dialog-dup-trans.c b/gnucash/gnome-utils/dialog-dup-trans.c index 6db2558812..40d98678f3 100644 --- a/gnucash/gnome-utils/dialog-dup-trans.c +++ b/gnucash/gnome-utils/dialog-dup-trans.c @@ -145,7 +145,7 @@ gnc_dup_trans_dialog_create (GtkWidget * parent, DupTransDialog *dt_dialog, { GtkWidget *dialog; GtkBuilder *builder; - const gchar *tt = _("Use +- keys to increment/decrement number"); + const gchar *tt = _("Use +- keys to increment/decrement number."); builder = gtk_builder_new (); gnc_builder_add_from_file (builder, "gnc-plugin-page-register.glade", "num_adjustment"); diff --git a/gnucash/gnome/gnc-plugin-page-invoice.c b/gnucash/gnome/gnc-plugin-page-invoice.c index 09254df3ad..badb40347d 100644 --- a/gnucash/gnome/gnc-plugin-page-invoice.c +++ b/gnucash/gnome/gnc-plugin-page-invoice.c @@ -378,7 +378,7 @@ static action_toolbar_labels invoice_action_tooltips[] = { {"BusinessNewInvoiceAction", N_("Create a new invoice for the same owner as the current one")}, {"BlankEntryAction", N_("Move to the blank entry at the bottom of the invoice")}, {"ToolsProcessPaymentAction", N_("Enter a payment for the owner of this invoice") }, - {"ReportsCompanyReportAction", N_("Open a company report window for the owner of this invoice") }, + {"ReportsCompanyReportAction", N_("Open a customer report window for the owner of this invoice") }, {"BusinessLinkAction", N_("Manage Document Link")}, {"BusinessLinkOpenAction", N_("Open Linked Document")}, {NULL, NULL}, @@ -399,7 +399,7 @@ static action_toolbar_labels bill_action_tooltips[] = { {"BusinessNewInvoiceAction", N_("Create a new bill for the same owner as the current one")}, {"BlankEntryAction", N_("Move to the blank entry at the bottom of the bill")}, {"ToolsProcessPaymentAction", N_("Enter a payment for the owner of this bill") }, - {"ReportsCompanyReportAction", N_("Open a company report window for the owner of this bill") }, + {"ReportsCompanyReportAction", N_("Open a vendor report window for the owner of this bill") }, {"BusinessLinkAction", N_("Manage Document Link")}, {"BusinessLinkOpenAction", N_("Open Linked Document")}, {NULL, NULL}, @@ -420,7 +420,7 @@ static action_toolbar_labels voucher_action_tooltips[] = { {"BusinessNewInvoiceAction", N_("Create a new voucher for the same owner as the current one")}, {"BlankEntryAction", N_("Move to the blank entry at the bottom of the voucher")}, {"ToolsProcessPaymentAction", N_("Enter a payment for the owner of this voucher") }, - {"ReportsCompanyReportAction", N_("Open a company report window for the owner of this voucher") }, + {"ReportsCompanyReportAction", N_("Open a employee report window for the owner of this voucher") }, {"BusinessLinkAction", N_("Manage Document Link")}, {"BusinessLinkOpenAction", N_("Open Linked Document")}, {NULL, NULL}, diff --git a/gnucash/gnucash.cpp b/gnucash/gnucash.cpp index d7b00ff87a..1e1cdef2e6 100644 --- a/gnucash/gnucash.cpp +++ b/gnucash/gnucash.cpp @@ -399,7 +399,7 @@ main(int argc, char ** argv) std::cerr << bl::format (bl::translate ("Run '{1} --help' to see a full list of available command line options.")) % *argv[0] << "\n" << bl::translate ("Error: could not initialize graphical user interface and option add-price-quotes was not set.\n" - " Perhaps you need to set the $DISPLAY environment variable?"); + "Perhaps you need to set the $DISPLAY environment variable?"); return 1; } diff --git a/gnucash/gtkbuilder/assistant-csv-price-import.glade b/gnucash/gtkbuilder/assistant-csv-price-import.glade index 08db75155e..ce290d4cd8 100644 --- a/gnucash/gtkbuilder/assistant-csv-price-import.glade +++ b/gnucash/gtkbuilder/assistant-csv-price-import.glade @@ -72,7 +72,7 @@ Examples are "FTSE","RR.L","21/11/2016",5.345,"GBP" and CURRENCY;USD;2016-11-21; There is an option for specifying the start row, end row and an option to skip alternate rows beginning from the start row which can be used if you have some header text. Also there is an option to over write existing prices for that day if required. -Lastly, for repeated imports the preview page has buttons to Load and Save the settings. To save the settings, tweak the settings to your preferences (optionally starting from an existing preset), then (optionally change the settings name and press the Save Settings button. Note you can't save to built-in presets. +Lastly, for repeated imports the preview page has buttons to Load and Save the settings. To save the settings, tweak the settings to your preferences (optionally) starting from an existing preset), then (optionally change the settings name and press the Save Settings button. Note you can't save to built-in presets. This operation is not reversible, so make sure you have a working backup. @@ -1023,8 +1023,8 @@ For example True False - <b>Press Apply to add the Prices. -Cancel to abort.</b> + <b>Press "Apply" to add the Prices. +"Cancel" to abort.</b> True center True diff --git a/gnucash/gtkbuilder/assistant-csv-trans-import.glade b/gnucash/gtkbuilder/assistant-csv-trans-import.glade index 606d975e39..d82ef16b75 100644 --- a/gnucash/gtkbuilder/assistant-csv-trans-import.glade +++ b/gnucash/gtkbuilder/assistant-csv-trans-import.glade @@ -66,7 +66,7 @@ Apart from a choice of delimiter, there are several options to tweak the importe The importer can handle files where transactions are split over multiple lines, with each line representing one split. -Lastly, for repeated imports the preview page has buttons to Load and Save the settings. To save the settings, tweak the settings to your preferences (optionally starting from an existing preset), then (optionally change the settings name and press the Save Settings button. Note you can't save to built-in presets. +Lastly, for repeated imports the preview page has buttons to Load and Save the settings. To save the settings, tweak the settings to your preferences (optionally starting from an existing preset), then (optionally) change the settings name and press the Save Settings button. Note you can't save to built-in presets. True diff --git a/gnucash/import-export/aqb/assistant-ab-initial.glade b/gnucash/import-export/aqb/assistant-ab-initial.glade index 6e17766c40..8061868803 100644 --- a/gnucash/import-export/aqb/assistant-ab-initial.glade +++ b/gnucash/import-export/aqb/assistant-ab-initial.glade @@ -55,7 +55,7 @@ This information will be needed in the following. NOTE: NO WARRANTIES FOR ANYTHING. Some banks run a poorly implemented Online Banking server. You should not rely on time-critical transfers through Online Banking, because sometimes the bank does not give you correct feedback when a transfer is rejected. -Lastly, for repeated imports the preview page has buttons to Load and Save the settings. To save the settings, tweak the settings to your preferences (optionally starting from an existing preset), then (optionally change the settings name and press the Save Settings button. Note you can't save to built-in presets. +Lastly, for repeated imports the preview page has buttons to Load and Save the settings. To save the settings, tweak the settings to your preferences (optionally starting from an existing preset), then (optionally) change the settings name and press the Save Settings button. Note you can't save to built-in presets. This operation is not reversible, so make sure you have a working backup. diff --git a/gnucash/import-export/csv-imp/gnc-imp-props-price.cpp b/gnucash/import-export/csv-imp/gnc-imp-props-price.cpp index 1116daeb61..24fca216a9 100644 --- a/gnucash/import-export/csv-imp/gnc-imp-props-price.cpp +++ b/gnucash/import-export/csv-imp/gnc-imp-props-price.cpp @@ -37,10 +37,14 @@ extern "C" { #include #include #include +#include #include #include +#include #include "gnc-imp-props-price.hpp" +namespace bl = boost::locale; + G_GNUC_UNUSED static QofLogModule log_module = GNC_MOD_IMPORT; /* This map contains a set of strings representing the different column types. */ @@ -231,17 +235,17 @@ void GncImportPrice::set (GncPricePropType prop_type, const std::string& value, } catch (const std::invalid_argument& e) { - auto err_str = std::string(_(gnc_price_col_type_strs[prop_type])) + - std::string(_(" could not be understood.\n")) + - e.what(); + auto err_str = (bl::format (bl::translate ("Column '{1}' could not be understood.\n")) % + bl::translate (gnc_price_col_type_strs[prop_type])).str(gnc_get_boost_locale()) + + e.what(); m_errors.emplace(prop_type, err_str); throw std::invalid_argument (err_str); } catch (const std::out_of_range& e) { - auto err_str = std::string(_(gnc_price_col_type_strs[prop_type])) + - std::string(_(" could not be understood.\n")) + - e.what(); + auto err_str = (bl::format (bl::translate ("Column '{1}' could not be understood.\n")) % + bl::translate (gnc_price_col_type_strs[prop_type])).str(gnc_get_boost_locale()) + + e.what(); m_errors.emplace(prop_type, err_str); throw std::invalid_argument (err_str); } diff --git a/gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp b/gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp index dac6baf8e2..cdf61e65cd 100644 --- a/gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp +++ b/gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp @@ -46,10 +46,14 @@ extern "C" { #include #include +#include #include #include +#include #include "gnc-imp-props-tx.hpp" +namespace bl = boost::locale; + G_GNUC_UNUSED static QofLogModule log_module = GNC_MOD_IMPORT; /* This map contains a set of strings representing the different column types. */ @@ -286,17 +290,17 @@ void GncPreTrans::set (GncTransPropType prop_type, const std::string& value) } catch (const std::invalid_argument& e) { - auto err_str = std::string(_(gnc_csv_col_type_strs[prop_type])) + - std::string(_(" could not be understood.\n")) + - e.what(); + auto err_str = (bl::format (bl::translate ("Column '{1}' could not be understood.\n")) % + bl::translate (gnc_csv_col_type_strs[prop_type])).str(gnc_get_boost_locale()) + + e.what(); m_errors.emplace(prop_type, err_str); throw std::invalid_argument (err_str); } catch (const std::out_of_range& e) { - auto err_str = std::string(_(gnc_csv_col_type_strs[prop_type])) + - std::string(_(" could not be understood.\n")) + - e.what(); + auto err_str = (bl::format (bl::translate ("Column '{1}' could not be understood.\n")) % + bl::translate (gnc_csv_col_type_strs[prop_type])).str(gnc_get_boost_locale()) + + e.what(); m_errors.emplace(prop_type, err_str); throw std::invalid_argument (err_str); } @@ -505,17 +509,17 @@ void GncPreSplit::set (GncTransPropType prop_type, const std::string& value) } catch (const std::invalid_argument& e) { - auto err_str = std::string(_(gnc_csv_col_type_strs[prop_type])) + - std::string(_(" could not be understood.\n")) + - e.what(); + auto err_str = (bl::format (bl::translate ("Column '{1}' could not be understood.\n")) % + bl::translate (gnc_csv_col_type_strs[prop_type])).str(gnc_get_boost_locale()) + + e.what(); m_errors.emplace(prop_type, err_str); throw std::invalid_argument (err_str); } catch (const std::out_of_range& e) { - auto err_str = std::string(_(gnc_csv_col_type_strs[prop_type])) + - std::string(_(" could not be understood.\n")) + - e.what(); + auto err_str = (bl::format (bl::translate ("Column '{1}' could not be understood.\n")) % + bl::translate (gnc_csv_col_type_strs[prop_type])).str(gnc_get_boost_locale()) + + e.what(); m_errors.emplace(prop_type, err_str); throw std::invalid_argument (err_str); } @@ -568,17 +572,17 @@ void GncPreSplit::add (GncTransPropType prop_type, const std::string& value) } catch (const std::invalid_argument& e) { - auto err_str = std::string(_(gnc_csv_col_type_strs[prop_type])) + - std::string(_(" could not be understood.\n")) + - e.what(); + auto err_str = (bl::format (bl::translate ("Column '{1}' could not be understood.\n")) % + bl::translate (gnc_csv_col_type_strs[prop_type])).str(gnc_get_boost_locale()) + + e.what(); m_errors.emplace(prop_type, err_str); throw std::invalid_argument (err_str); } catch (const std::out_of_range& e) { - auto err_str = std::string(_(gnc_csv_col_type_strs[prop_type])) + - std::string(_(" could not be understood.\n")) + - e.what(); + auto err_str = (bl::format (bl::translate ("Column '{1}' could not be understood.\n")) % + bl::translate (gnc_csv_col_type_strs[prop_type])).str(gnc_get_boost_locale()) + + e.what(); m_errors.emplace(prop_type, err_str); throw std::invalid_argument (err_str); }