gnucash maint: Multiple changes pushed
Geert Janssens
gjanssens at code.gnucash.org
Sun Mar 28 14:51:55 EDT 2021
Updated via https://github.com/Gnucash/gnucash/commit/5d1e4cee (commit)
via https://github.com/Gnucash/gnucash/commit/a4cab54a (commit)
via https://github.com/Gnucash/gnucash/commit/0b6b88b7 (commit)
via https://github.com/Gnucash/gnucash/commit/5a10279f (commit)
from https://github.com/Gnucash/gnucash/commit/f2f81631 (commit)
commit 5d1e4ceef9f8b10ddeca9dc2df69d1366bd9ad9d
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Mar 24 21:43:49 2021 +0100
i18n - fix several source string issues brought up by translators on weblate
diff --git a/gnucash/gnome-utils/dialog-dup-trans.c b/gnucash/gnome-utils/dialog-dup-trans.c
index 6db255881..40d98678f 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 09254df3a..badb40347 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 d7b00ff87..1e1cdef2e 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 08db75155..ce290d4cd 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
<object class="GtkLabel" id="finish_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes"><b>Press Apply to add the Prices.
-Cancel to abort.</b></property>
+ <property name="label" translatable="yes"><b>Press "Apply" to add the Prices.
+"Cancel" to abort.</b></property>
<property name="use_markup">True</property>
<property name="justify">center</property>
<property name="wrap">True</property>
diff --git a/gnucash/gtkbuilder/assistant-csv-trans-import.glade b/gnucash/gtkbuilder/assistant-csv-trans-import.glade
index 606d975e3..d82ef16b7 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.</property>
+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.</property>
<property name="wrap">True</property>
</object>
<packing>
diff --git a/gnucash/import-export/aqb/assistant-ab-initial.glade b/gnucash/import-export/aqb/assistant-ab-initial.glade
index 6e17766c4..806186880 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 1116daeb6..24fca216a 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 <exception>
#include <map>
#include <string>
+#include <boost/locale.hpp>
#include <boost/regex.hpp>
#include <boost/regex/icu.hpp>
+#include <gnc-locale-utils.hpp>
#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 dac6baf8e..cdf61e65c 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 <string>
#include <vector>
+#include <boost/locale.hpp>
#include <boost/regex.hpp>
#include <boost/regex/icu.hpp>
+#include <gnc-locale-utils.hpp>
#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);
}
commit a4cab54afc384d3d8d71d3e6d9586ef6853abd3b
Author: Geert Janssens <geert at kobaltwit.be>
Date: Wed Mar 24 13:02:39 2021 +0100
i18n - Reuse strings for less translation work
diff --git a/gnucash/gtkbuilder/dialog-preferences.glade b/gnucash/gtkbuilder/dialog-preferences.glade
index 28a475744..df512c2b9 100644
--- a/gnucash/gtkbuilder/dialog-preferences.glade
+++ b/gnucash/gtkbuilder/dialog-preferences.glade
@@ -1856,7 +1856,7 @@ many months before the current month</property>
<object class="GtkBox" id="pref/general/assoc-head">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_markup" translatable="yes">Path head for Linked File Relative Paths</property>
+ <property name="tooltip_markup" translatable="yes">Path head for Linked Files Relative Paths</property>
<child>
<placeholder/>
</child>
diff --git a/gnucash/report/reports/standard/income-gst-statement.scm b/gnucash/report/reports/standard/income-gst-statement.scm
index b2362edcf..712e7338a 100644
--- a/gnucash/report/reports/standard/income-gst-statement.scm
+++ b/gnucash/report/reports/standard/income-gst-statement.scm
@@ -158,7 +158,7 @@ for taxes paid on expenses, and type LIABILITY for taxes collected on sales.")
(gnc:register-option
options
(gnc:make-multichoice-callback-option
- pagename-format (N_ "Report format")
+ pagename-format (N_ "Report Format")
"a" (G_ "Report Format") 'default
(list (vector 'default
(G_ "Default Format")
diff --git a/gnucash/report/trep-engine.scm b/gnucash/report/trep-engine.scm
index f6e1a31ee..973fcf886 100644
--- a/gnucash/report/trep-engine.scm
+++ b/gnucash/report/trep-engine.scm
@@ -116,7 +116,7 @@
(N_ "Transaction Filter excludes matched strings"))
(define optname-transaction-matcher-caseinsensitive
(N_ "Transaction Filter is case insensitive"))
-(define optname-reconcile-status (N_ "Reconcile Status"))
+(define optname-reconcile-status (N_ "Reconciled Status"))
(define optname-void-transactions (N_ "Void Transactions"))
(define optname-closing-transactions (N_ "Closing transactions"))
diff --git a/libgnucash/app-utils/options.scm b/libgnucash/app-utils/options.scm
index be2d8b65b..2dba75358 100644
--- a/libgnucash/app-utils/options.scm
+++ b/libgnucash/app-utils/options.scm
@@ -1824,6 +1824,7 @@ the option '~a'."))
("Common Currency" "Currency" "Common Currency")
("Show original currency amount" "Currency" "Show original currency amount")
("Report's currency" "Currency" "Report's currency")
+ ("Reconcile Status" #f "Reconciled Status")
;; new-owner-report.scm, renamed Oct 2020 to differentiate with
;; Document Links:
("Links" #f "Transaction Links")
@@ -1831,6 +1832,7 @@ the option '~a'."))
("Individual Taxes" #f "Use Detailed Tax Summary")
;; income-gst-statement.scm
("default format" #f "Default Format")
+ ("Report format" #f "Report Format")
))
(define (lookup-option section name)
commit 0b6b88b771aa21a1e15cfb2e549d2e3827d9c169
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Mar 20 16:39:30 2021 +0100
i18n - several minor tweaks to cope with translation issues in weblate
diff --git a/doc/tip_of_the_day.list.c b/doc/tip_of_the_day.list.c
index 9e27ee4d0..e2ac872f9 100644
--- a/doc/tip_of_the_day.list.c
+++ b/doc/tip_of_the_day.list.c
@@ -60,7 +60,7 @@ the remainder of the transaction as it was last entered.")
Transfer register column, and GnuCash will complete the name from \
your list of accounts. For subaccounts, type the first letter(s) \
of the parent account, followed by ':' and the first letter(s) of \
-the subaccount (e.g. A:C for Assets:Cash.)")
+the subaccount (e.g. A:C for Assets:Cash).")
N_( "Want to see all your subaccount transactions in one register? \
From the Accounts tab in the main window, highlight the parent account \
diff --git a/gnucash/gnome/gnc-plugin-page-report.c b/gnucash/gnome/gnc-plugin-page-report.c
index 1178ed377..fce3a8a47 100644
--- a/gnucash/gnome/gnc-plugin-page-report.c
+++ b/gnucash/gnome/gnc-plugin-page-report.c
@@ -1194,10 +1194,10 @@ gnc_plugin_page_report_constr_init(GncPluginPageReport *plugin_page, gint report
gchar *saved_reports_path = gnc_build_userdata_path (SAVED_REPORTS_FILE);
gchar *report_save_str = g_strdup_printf (
_("Update the current report's saved configuration. "
- "The report configuration will be saved in the file %s. "), saved_reports_path);
+ "The report configuration will be saved in the file %s."), saved_reports_path);
gchar *report_saveas_str = g_strdup_printf (
- _("Add the current report's configuration to the `Reports->Saved Report Configurations' menu. "
- "The report configuration will be saved in the file %s. "), saved_reports_path);
+ _("Add the current report's configuration to the 'Reports->Saved Report Configurations' menu. "
+ "The report configuration will be saved in the file %s."), saved_reports_path);
GtkActionEntry report_actions[] =
{
diff --git a/gnucash/gschemas/org.gnucash.gschema.xml.in b/gnucash/gschemas/org.gnucash.gschema.xml.in
index bc4964d24..8f1f808f8 100644
--- a/gnucash/gschemas/org.gnucash.gschema.xml.in
+++ b/gnucash/gschemas/org.gnucash.gschema.xml.in
@@ -282,12 +282,12 @@
</key>
<key name="default-style-ledger" type="b">
<default>true</default>
- <summary>Show all transactions on one line. (Two in double line mode.)</summary>
+ <summary>Show all transactions on one line or in double line mode on two.</summary>
<description>This field specifies the default view style when opening a new register window. Possible values are "ledger", "auto-ledger" and "journal". The "ledger" setting says to show each transaction on one or two lines. The "auto-ledger" setting does the same, but also expands only the current transaction to show all splits. The "journal" setting shows all transactions in expanded form.</description>
</key>
<key name="default-style-autoledger" type="b">
<default>false</default>
- <summary>Automatically expand the current transaction to show all splits. All other transactions are shown on one line. (Two in double line mode.)</summary>
+ <summary>Automatically expand the current transaction to show all splits. All other transactions are shown on one line or in double line mode on two.</summary>
<description>This field specifies the default view style when opening a new register window. Possible values are "ledger", "auto-ledger" and "journal". The "ledger" setting says to show each transaction on one or two lines. The "auto-ledger" setting does the same, but also expands only the current transaction to show all splits. The "journal" setting shows all transactions in expanded form.</description>
</key>
<key name="default-style-journal" type="b">
@@ -371,7 +371,7 @@ For example setting this to 2.0 will display reports at twice their typical size
<key name="filename-format" type="s">
<default>'%1$s-%2$s-%3$s'</default>
<summary>PDF export file name format</summary>
- <description>This setting chooses the file name for PDF export. This is a sprintf(3) string with three arguments: "%1$s" is the report name such as "Invoice". "%2$s" is the number of the report, which for an invoice report is the invoice number. "%3$s" is the date of the report, formatted according to the filename-date-format setting. (Note: Any characters that are not allowed in filenames, such as '/', will be replaced with underscores '_' in the resulting file name.)</description>
+ <description>This setting chooses the file name for PDF export. This is a sprintf(3) string with three arguments: "%1$s" is the report name such as "Invoice". "%2$s" is the number of the report, which for an invoice report is the invoice number. "%3$s" is the date of the report, formatted according to the filename-date-format setting. Note: Any characters that are not allowed in filenames, such as '/', will be replaced with underscores '_' in the resulting file name.</description>
</key>
<key name="filename-date-format" type="s">
<default>'locale'</default>
diff --git a/gnucash/gtkbuilder/dialog-preferences.glade b/gnucash/gtkbuilder/dialog-preferences.glade
index bb4c98671..28a475744 100644
--- a/gnucash/gtkbuilder/dialog-preferences.glade
+++ b/gnucash/gtkbuilder/dialog-preferences.glade
@@ -2754,8 +2754,8 @@ many months before the current month</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_markup">Show all transactions on one line. (Two in double line mode.)</property>
- <property name="tooltip_text" translatable="yes">Show all transactions on one line. (Two in double line mode.)</property>
+ <property name="tooltip_markup">Show all transactions on one line or in double line mode on two.</property>
+ <property name="tooltip_text" translatable="yes">Show all transactions on one line or in double line mode on two.</property>
<property name="halign">start</property>
<property name="use_underline">True</property>
<property name="active">True</property>
@@ -2773,8 +2773,8 @@ many months before the current month</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
- <property name="tooltip_markup">Automatically expand the current transaction to show all splits. All other transactions are shown on one line. (Two in double line mode.)</property>
- <property name="tooltip_text" translatable="yes">Automatically expand the current transaction to show all splits. All other transactions are shown on one line. (Two in double line mode.)</property>
+ <property name="tooltip_markup">Automatically expand the current transaction to show all splits. All other transactions are shown on one line or in double line mode on two.</property>
+ <property name="tooltip_text" translatable="yes">Automatically expand the current transaction to show all splits. All other transactions are shown on one line or in double line mode on two.</property>
<property name="halign">start</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
diff --git a/gnucash/import-export/aqb/assistant-ab-initial.glade b/gnucash/import-export/aqb/assistant-ab-initial.glade
index 96b082ed5..6e17766c4 100644
--- a/gnucash/import-export/aqb/assistant-ab-initial.glade
+++ b/gnucash/import-export/aqb/assistant-ab-initial.glade
@@ -51,17 +51,15 @@ You first need to apply for Online Banking access at your bank. If your bank dec
* The Internet address of your bank's Online Banking server
* For HBCI Online Banking, information about the cryptographic public key of your bank ("Ini-Letter").
-This information will be needed in the following. Press "Next" now.
+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.
-Press "Cancel" if you do not wish to setup any Online Banking connection now.
-
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.
-Click on "Next" to proceed or "Cancel" to Abort Import.</property>
+Click on "Next" to proceed or "Cancel" if you don not wish to setup any online banking connection now.</property>
<property name="wrap">True</property>
</object>
<packing>
diff --git a/gnucash/import-export/csv-imp/gnc-import-tx.cpp b/gnucash/import-export/csv-imp/gnc-import-tx.cpp
index ba060e9ed..459cbfcb1 100644
--- a/gnucash/import-export/csv-imp/gnc-import-tx.cpp
+++ b/gnucash/import-export/csv-imp/gnc-import-tx.cpp
@@ -668,7 +668,7 @@ void GncTxImport::create_transaction (std::vector<parse_line_t>::iterator& parse
{
// Oops - the user didn't select an Account column *and* we didn't get a default value either!
// Note if you get here this suggests a bug in the code!
- error_message = _("No account column selected and no default account specified either.\n"
+ error_message = _("No account column selected and no base account specified either.\n"
"This should never happen. Please report this as a bug.");
PINFO("User warning: %s", error_message.c_str());
throw std::invalid_argument(error_message);
commit 5a10279f22c490c6b644f44446f7366a1fc3bb27
Author: Geert Janssens <geert at kobaltwit.be>
Date: Sat Mar 20 11:54:23 2021 +0100
i18n - Extract common parts of the long intro text to reduce translation effort
diff --git a/gnucash/import-export/csv-exp/assistant-csv-export.c b/gnucash/import-export/csv-exp/assistant-csv-export.c
index ec4edb8b9..656ca4629 100644
--- a/gnucash/import-export/csv-exp/assistant-csv-export.c
+++ b/gnucash/import-export/csv-exp/assistant-csv-export.c
@@ -94,36 +94,31 @@ static const gchar *finish_trans_search_gl_string = N_(
"You can also verify your selections by clicking on \"Back\" or \"Cancel\" to abort the export.\n");
static const gchar *start_tree_string = N_(
- "This assistant will help you export the Account Tree to a file\n"
+ "This assistant will help you export the Account Tree to a file"
"with the separator specified below.\n\n"
"Select the settings you require for the file and then click \"Next\" "
"to proceed or \"Cancel\" to abort the export.\n");
-static const gchar *start_trans_string = N_(
- "This assistant will help you export the Transactions to a file\n"
+static const gchar *start_trans_common_string = N_(
+ "This assistant will help you export the Transactions to a file "
"with the separator specified below.\n\n"
- "There will be multiple rows for each transaction and may "
- "require further manipulation to get them in a format you can use.\n\n"
- "Each Transaction will appear once in the export and will be listed in "
- "the order the accounts were processed\n\n"
+ "%s\n\n"
+ "While a transaction may have splits in several of the selected accounts "
+ "it will only be exported once. It will appear under the first processed "
+ "account it has a split in.\n\n"
"Price/Rate output format is controlled by the Preference setting,\n"
- "General->Force Prices to display as decimals\n\n"
+ "Numbers, Date, Time->Force Prices to display as decimals\n\n"
"Select the settings you require for the file and then click \"Next\" "
"to proceed or \"Cancel\" to abort the export.\n");
+static const gchar *start_trans__multi_string = N_(
+ "There will be multiple rows for each transaction with each row "
+ "representing one split.\n\n");
+
static const gchar *start_trans_simple_string = N_(
- "This assistant will help you export the Transactions to a file\n"
- "with the separator specified below.\n\n"
- "There will be multiple rows for each transaction and may require further "
- "manipulation to get them in a format you can use. Each Transaction will "
- "appear once in the export and will be listed in the order the accounts "
- "were processed\n\n"
- "Price/Rate output format is controlled by the Preference setting,\n"
- "General->Force Prices to display as decimals\n\n"
- "By selecting the simple layout, the output will be equivalent to a single "
- "row register view and as such some of the transfer detail could be lost.\n\n"
- "Select the settings you require for the file and then click \"Next\" "
- "to proceed or \"Cancel\" to abort the export.\n");
+ "There will be one row for each transaction, equivalent to a single row "
+ "in a register in 'Basic Ledger' mode. As such some transfer detail "
+ "could be lost.\n\n");
/**************************************************
@@ -668,16 +663,22 @@ csv_export_assistant_start_page_prepare (GtkAssistant *assistant,
{
CsvExportInfo *info = user_data;
+
+
/* Set Start page text */
if (info->export_type == XML_EXPORT_TREE)
gtk_label_set_text (GTK_LABEL(info->start_label), gettext (start_tree_string));
else
{
+ gchar *label_string = NULL;
/* General Journal and search registers are always multi-line exported */
if ((info->export_type == XML_EXPORT_REGISTER) && (info->account == NULL))
- gtk_label_set_text (GTK_LABEL(info->start_label), gettext (start_trans_string));
+ label_string = g_strdup_printf (_(start_trans_common_string), _(start_trans__multi_string));
else
- gtk_label_set_text (GTK_LABEL(info->start_label), gettext (start_trans_simple_string));
+ label_string = g_strdup_printf (_(start_trans_common_string), _(start_trans_simple_string));
+
+ gtk_label_set_text (GTK_LABEL(info->start_label), label_string);
+ g_free (label_string);
}
/* Enable the Assistant Buttons */
Summary of changes:
doc/tip_of_the_day.list.c | 2 +-
gnucash/gnome-utils/dialog-dup-trans.c | 2 +-
gnucash/gnome/gnc-plugin-page-invoice.c | 6 +--
gnucash/gnome/gnc-plugin-page-report.c | 6 +--
gnucash/gnucash.cpp | 2 +-
gnucash/gschemas/org.gnucash.gschema.xml.in | 6 +--
.../gtkbuilder/assistant-csv-price-import.glade | 6 +--
.../gtkbuilder/assistant-csv-trans-import.glade | 2 +-
gnucash/gtkbuilder/dialog-preferences.glade | 10 ++---
.../import-export/aqb/assistant-ab-initial.glade | 8 ++--
.../import-export/csv-exp/assistant-csv-export.c | 45 +++++++++++-----------
.../import-export/csv-imp/gnc-imp-props-price.cpp | 16 +++++---
gnucash/import-export/csv-imp/gnc-imp-props-tx.cpp | 40 ++++++++++---------
gnucash/import-export/csv-imp/gnc-import-tx.cpp | 2 +-
.../reports/standard/income-gst-statement.scm | 2 +-
gnucash/report/trep-engine.scm | 2 +-
libgnucash/app-utils/options.scm | 2 +
17 files changed, 84 insertions(+), 75 deletions(-)
More information about the gnucash-changes
mailing list