gnucash maint: Multiple changes pushed
Frank H.Ellenberger
fell at code.gnucash.org
Fri Sep 6 00:02:34 EDT 2019
Updated via https://github.com/Gnucash/gnucash/commit/bbcf19ae (commit)
via https://github.com/Gnucash/gnucash/commit/48e81d22 (commit)
via https://github.com/Gnucash/gnucash/commit/984d583e (commit)
via https://github.com/Gnucash/gnucash/commit/549ba9f6 (commit)
from https://github.com/Gnucash/gnucash/commit/1b22715a (commit)
commit bbcf19ae6adc6b3f94bc4428488628a9cf2df58b
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Fri Sep 6 05:59:55 2019 +0200
[I18N] use msgctxt for Reconciled flags
Final step for [Bug 797349] "A"ssociate header badly translated
diff --git a/libgnucash/app-utils/gnc-ui-util.c b/libgnucash/app-utils/gnc-ui-util.c
index ac13a58d7..24547664a 100644
--- a/libgnucash/app-utils/gnc-ui-util.c
+++ b/libgnucash/app-utils/gnc-ui-util.c
@@ -887,20 +887,6 @@ gnc_ui_account_get_tax_info_sub_acct_string (const Account *account)
return NULL;
}
-static const char *
-string_after_colon (const char *msgstr)
-{
- const char *string_at_colon;
- g_assert(msgstr);
- string_at_colon = strchr(msgstr, ':');
- if (string_at_colon)
- return string_at_colon + 1;
- else
- /* No colon found; we assume the translation contains only the
- part after the colon, similar to the disambiguation prefixes */
- return msgstr;
-}
-
/********************************************************************\
* gnc_get_reconcile_str *
* return the i18n'd string for the given reconciled flag *
@@ -914,22 +900,15 @@ gnc_get_reconcile_str (char reconciled_flag)
switch (reconciled_flag)
{
case NREC:
- /* Translators: For the following strings, the single letters
- after the colon are abbreviations of the word before the
- colon. You should only translate the letter *after* the colon. */
- return string_after_colon(_("not cleared:n"));
+ return C_("Reconciled flag 'not cleared'", "n");
case CREC:
- /* Translators: Please only translate the letter *after* the colon. */
- return string_after_colon(_("cleared:c"));
+ return C_("Reconciled flag 'cleared'", "c");
case YREC:
- /* Translators: Please only translate the letter *after* the colon. */
- return string_after_colon(_("reconciled:y"));
+ return C_("Reconciled flag 'reconciled'", "y");
case FREC:
- /* Translators: Please only translate the letter *after* the colon. */
- return string_after_colon(_("frozen:f"));
+ return C_("Reconciled flag 'frozen'", "f");
case VREC:
- /* Translators: Please only translate the letter *after* the colon. */
- return string_after_colon(_("void:v"));
+ return C_("Reconciled flag 'void'", "v");
default:
PERR("Bad reconciled flag\n");
return NULL;
commit 48e81d221dd6ca3dd868f5cfd60e12066c7df4b8
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Fri Sep 6 00:39:51 2019 +0200
Unify "Placeholder" headers with previous commit
Only impact: removed obsolete translator comment
diff --git a/gnucash/gnome-utils/dialog-options.c b/gnucash/gnome-utils/dialog-options.c
index f8d66fafd..a4a43dde9 100644
--- a/gnucash/gnome-utils/dialog-options.c
+++ b/gnucash/gnome-utils/dialog-options.c
@@ -716,10 +716,7 @@ gnc_set_default_gain_loss_account_widget(gnc_commodity *commodity)
col = gnc_tree_view_add_toggle_column(GNC_TREE_VIEW(
book_currency_data->default_gain_loss_account_widget),
_("Placeholder"),
- /* Translators: This string has a context prefix; the
- translation must only contain the part after
- the | character. */
- Q_("Column letter for 'Placeholder'|P"),
+ C_("Column header for 'Placeholder'", "P"),
"placeholder",
GNC_TREE_MODEL_ACCOUNT_COL_PLACEHOLDER,
GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
diff --git a/gnucash/gnome-utils/gnc-tree-view-account.c b/gnucash/gnome-utils/gnc-tree-view-account.c
index b6ce7d13f..f8f9e67ae 100644
--- a/gnucash/gnome-utils/gnc-tree-view-account.c
+++ b/gnucash/gnome-utils/gnc-tree-view-account.c
@@ -903,9 +903,7 @@ gnc_tree_view_account_new_with_root (Account *root, gboolean show_root)
NULL);
gnc_tree_view_add_toggle_column(view, _("Placeholder"),
- /* Translators: This string has a context prefix; the translation
- must only contain the part after the | character. */
- Q_("Column letter for 'Placeholder'|P"),
+ C_("Column header for 'Placeholder'", "P"),
"placeholder",
GNC_TREE_MODEL_ACCOUNT_COL_PLACEHOLDER,
GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
commit 984d583e198c29485ba7b3d29b39eb2dc056fd85
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Thu Sep 5 04:15:41 2019 +0200
[I18N] Use context for samples and column headers
Before we used a colon separated prefix, but thas was error prone.
The downside: Our translators have to review serveral messages.
Tip: Use a tool like KDiff3 for merging.
diff --git a/gnucash/gnome/reconcile-view.c b/gnucash/gnome/reconcile-view.c
index 97883957d..b300489ee 100644
--- a/gnucash/gnome/reconcile-view.c
+++ b/gnucash/gnome/reconcile-view.c
@@ -422,7 +422,7 @@ gnc_reconcile_view_init (GNCReconcileView *view)
param = gnc_search_param_simple_new();
gnc_search_param_set_param_fcn (param, QOF_TYPE_BOOLEAN,
gnc_reconcile_view_is_reconciled, view);
- gnc_search_param_set_title ((GNCSearchParam *) param, _("Reconciled:R") + 11);
+ gnc_search_param_set_title ((GNCSearchParam *) param, C_("Column header for 'Reconciled'", "R"));
gnc_search_param_set_justify ((GNCSearchParam *) param, GTK_JUSTIFY_CENTER);
gnc_search_param_set_passive ((GNCSearchParam *) param, FALSE);
gnc_search_param_set_non_resizeable ((GNCSearchParam *) param, TRUE);
diff --git a/gnucash/register/ledger-core/split-register-layout.c b/gnucash/register/ledger-core/split-register-layout.c
index 1553d4814..ef5441266 100644
--- a/gnucash/register/ledger-core/split-register-layout.c
+++ b/gnucash/register/ledger-core/split-register-layout.c
@@ -636,10 +636,8 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
DATE_CELL_TYPE_NAME,
/* Translators: The 'sample:' items are
strings which are not displayed, but only
- used to estimate widths. Please only
- translate the portion after the ':' and
- leave the rest ("sample:") as is. */
- N_("sample:12/12/2000") + 7,
+ used to estimate widths. */
+ C_("sample", "12/12/2000"),
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
@@ -647,7 +645,7 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
DDUE_CELL,
DATE_CELL_TYPE_NAME,
- N_("sample:12/12/2000") + 7,
+ C_("sample", "12/12/2000"),
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
@@ -655,12 +653,10 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
NUM_CELL,
NUM_CELL_TYPE_NAME,
- /* Translators: The 'sample:' items are
+ /* Translators: The 'sample' items are
strings which are not displayed, but only
- used to estimate widths. Please only
- translate the portion after the ':' and
- leave the rest ("sample:") as is. */
- N_("sample:99999") + 7,
+ used to estimate widths. */
+ C_("sample", "99999"),
CELL_ALIGN_LEFT,
FALSE,
FALSE);
@@ -668,7 +664,7 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
TNUM_CELL,
BASIC_CELL_TYPE_NAME,
- N_("sample:99999") + 7,
+ C_("sample", "99999"),
CELL_ALIGN_LEFT,
FALSE,
FALSE);
@@ -676,7 +672,7 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
DESC_CELL,
QUICKFILL_CELL_TYPE_NAME,
- N_("sample:Description of a transaction") + 7,
+ C_("sample", "Description of a transaction"),
CELL_ALIGN_LEFT,
TRUE,
FALSE);
@@ -692,11 +688,7 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
RECN_CELL,
RECN_CELL_TYPE_NAME,
- /* Translators: The abbreviation for 'Reconciled'
- in the header row of the register. Please only
- translate the portion after the ':' and
- leave the rest ("Reconciled:") as is. */
- N_("Reconciled:R") + 11,
+ C_("Column header for 'Reconciled'", "R"),
CELL_ALIGN_CENTER,
FALSE,
FALSE);
@@ -704,11 +696,7 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
ASSOC_CELL,
RECN_CELL_TYPE_NAME,
- /* Translators: The abbreviation for 'Associate'
- in the header row of the register. Please only
- translate the portion after the ':' and
- leave the rest ("Associate:") as is. */
- N_("Associate:A") + 10,
+ C_("Column header for 'Associate'", "A"),
CELL_ALIGN_CENTER,
FALSE,
FALSE);
@@ -716,7 +704,7 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
BALN_CELL,
PRICE_CELL_TYPE_NAME,
- N_("sample:999,999.000") + 7,
+ C_("sample", "999,999.000"),
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
@@ -724,7 +712,7 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
XFRM_CELL,
COMBO_CELL_TYPE_NAME,
- N_("Transfer"),
+ _("Transfer"),
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
@@ -732,7 +720,7 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
MXFRM_CELL,
COMBO_CELL_TYPE_NAME,
- N_("sample:Expenses:Automobile:Gasoline") + 7,
+ C_("sample", "Expenses:Automobile:Gasoline"),
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
@@ -740,7 +728,7 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
ACTN_CELL,
COMBO_CELL_TYPE_NAME,
- N_("sample:Expenses:Automobile:Gasoline") + 7,
+ C_("sample", "Expenses:Automobile:Gasoline"),
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
@@ -748,7 +736,7 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
MEMO_CELL,
QUICKFILL_CELL_TYPE_NAME,
- N_("sample:Memo field sample text string") + 7,
+ C_("sample", "Memo field sample text string"),
CELL_ALIGN_LEFT,
TRUE,
FALSE);
@@ -756,7 +744,7 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
DEBT_CELL,
PRICE_CELL_TYPE_NAME,
- N_("sample:999,999.000") + 7,
+ C_("sample", "999,999.000"),
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
@@ -764,7 +752,7 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
CRED_CELL,
PRICE_CELL_TYPE_NAME,
- N_("sample:999,999.000") + 7,
+ C_("sample", "999,999.000"),
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
@@ -772,7 +760,7 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
SHRS_CELL,
PRICE_CELL_TYPE_NAME,
- N_("sample:999,999.000") + 7,
+ C_("sample", "999,999.000"),
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
@@ -782,7 +770,7 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
PRIC_CELL,
PRICE_CELL_TYPE_NAME,
- N_("sample:999,999.000") + 7,
+ C_("sample", "999,999.000"),
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
@@ -790,7 +778,7 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
TDEBT_CELL,
PRICE_CELL_TYPE_NAME,
- N_("sample:999,999.000") + 7,
+ C_("sample", "999,999.000"),
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
@@ -798,7 +786,7 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
TCRED_CELL,
PRICE_CELL_TYPE_NAME,
- N_("sample:999,999.000") + 7,
+ C_("sample", "999,999.000"),
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
@@ -806,7 +794,7 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
TSHRS_CELL,
PRICE_CELL_TYPE_NAME,
- N_("sample:999,999.000") + 7,
+ C_("sample", "999,999.000"),
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
@@ -814,7 +802,7 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
TBALN_CELL,
PRICE_CELL_TYPE_NAME,
- N_("sample:999,999.000") + 7,
+ C_("sample", "999,999.000"),
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
@@ -834,7 +822,7 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
NOTES_CELL,
QUICKFILL_CELL_TYPE_NAME,
- N_("sample:Notes field sample text string") + 7,
+ C_("sample", "Notes field sample text string"),
CELL_ALIGN_LEFT,
FALSE,
TRUE);
@@ -842,7 +830,7 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
VNOTES_CELL,
BASIC_CELL_TYPE_NAME,
- N_("sample:No Particular Reason") + 7,
+ C_("sample", "No Particular Reason"),
CELL_ALIGN_RIGHT,
FALSE,
TRUE);
@@ -850,7 +838,7 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
FCRED_CELL,
FORMULA_CELL_TYPE_NAME,
- N_("sample:(x + 0.33 * y + (x+y) )") + 7,
+ C_("sample", "(x + 0.33 * y + (x+y) )"),
CELL_ALIGN_LEFT,
FALSE,
FALSE);
@@ -858,7 +846,7 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
FDEBT_CELL,
FORMULA_CELL_TYPE_NAME,
- N_("sample:(x + 0.33 * y + (x+y) )") + 7,
+ C_("sample", "(x + 0.33 * y + (x+y) )"),
CELL_ALIGN_LEFT,
FALSE,
FALSE);
@@ -866,7 +854,7 @@ gnc_split_register_layout_add_cells (SplitRegister *reg,
gnc_register_add_cell (layout,
RBALN_CELL,
PRICE_CELL_TYPE_NAME,
- N_("sample:999,999.000") + 7,
+ C_("sample", "999,999.000"),
CELL_ALIGN_RIGHT,
FALSE,
FALSE);
diff --git a/gnucash/register/ledger-core/split-register-model.c b/gnucash/register/ledger-core/split-register-model.c
index 9c6705a63..59c5281d8 100644
--- a/gnucash/register/ledger-core/split-register-model.c
+++ b/gnucash/register/ledger-core/split-register-model.c
@@ -303,7 +303,7 @@ gnc_split_register_get_recn_label (VirtualLocation virt_loc,
return _("Paid");
default:
- return _("Reconciled:R") + 11;
+ return C_("Column header for 'Reconciled'", "R");
}
}
@@ -325,7 +325,7 @@ static const char *
gnc_split_register_get_associate_label (VirtualLocation virt_loc,
gpointer user_data)
{
- return _("Associate:A") + 10;
+ return C_("Column header for 'Associate'", "A");
}
static const char *
commit 549ba9f68818561c233b630609b20adaf74b631a
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date: Sat Aug 31 20:57:08 2019 +0200
[I18N] Improve translator comments for Invoice Editing
diff --git a/gnucash/register/ledger-core/gncEntryLedgerLayout.c b/gnucash/register/ledger-core/gncEntryLedgerLayout.c
index 436badf14..0bae34c27 100644
--- a/gnucash/register/ledger-core/gncEntryLedgerLayout.c
+++ b/gnucash/register/ledger-core/gncEntryLedgerLayout.c
@@ -68,15 +68,19 @@ static void gnc_entry_ledger_layout_add_cells (GncEntryLedger *ledger,
gboolean span;
} cells[] =
{
- /* Translators: The 'sample:' items are strings which are not
+ /* Translators: The following strings are used for the layout of the
+ cells while editing invoices.
+ Important: The 'sample:' items are strings which are not
displayed, but only used to estimate widths. Please only
translate the portion after the ':' and leave the rest
- ("sample:") as is. */
+ ("sample:") as is.
+ This sample is for a checkbox */
{
ENTRY_INV_CELL, CHECKBOX_CELL_TYPE_NAME, N_("sample:X") + 7,
CELL_ALIGN_LEFT, FALSE, FALSE
},
{
+ /* Translators: This sample is for a date */
ENTRY_DATE_CELL, DATE_CELL_TYPE_NAME, N_("sample:12/12/2000") + 7,
CELL_ALIGN_RIGHT, FALSE, FALSE
},
@@ -101,13 +105,15 @@ static void gnc_entry_ledger_layout_add_cells (GncEntryLedger *ledger,
ENTRY_DISC_CELL, PRICE_CELL_TYPE_NAME, N_("sample:9,999.00") + 7,
CELL_ALIGN_RIGHT, FALSE, FALSE
},
- /* xgettext:no-c-format */
{
+ /* xgettext:no-c-format
+ Translators: Header for Discount Type */
ENTRY_DISTYPE_CELL, RECN_CELL_TYPE_NAME, N_("sample(DT):+%") + 11,
CELL_ALIGN_LEFT, FALSE, FALSE
},
- /* xgettext:no-c-format */
{
+ /* xgettext:no-c-format
+ Translators: Header for Discount How */
ENTRY_DISHOW_CELL, RECN_CELL_TYPE_NAME, N_("sample(DH):+%") + 11,
CELL_ALIGN_LEFT, FALSE, FALSE
},
@@ -122,10 +128,12 @@ static void gnc_entry_ledger_layout_add_cells (GncEntryLedger *ledger,
CELL_ALIGN_RIGHT, FALSE, FALSE
},
{
+ /* Translators: Abbreviation sample for Taxable? */
ENTRY_TAXABLE_CELL, CHECKBOX_CELL_TYPE_NAME, N_("sample:T?") + 7,
CELL_ALIGN_LEFT, FALSE, FALSE
},
{
+ /* Translators: Abbreviation sample for Tax Included */
ENTRY_TAXINCLUDED_CELL, CHECKBOX_CELL_TYPE_NAME, N_("sample:TI") + 7,
CELL_ALIGN_LEFT, FALSE, FALSE
},
@@ -142,6 +150,7 @@ static void gnc_entry_ledger_layout_add_cells (GncEntryLedger *ledger,
CELL_ALIGN_RIGHT, FALSE, FALSE
},
{
+ /* Translators: Abbreviation sample for Billable */
ENTRY_BILLABLE_CELL, CHECKBOX_CELL_TYPE_NAME, N_("sample:BI") + 7,
CELL_ALIGN_LEFT, FALSE, FALSE
},
Summary of changes:
gnucash/gnome-utils/dialog-options.c | 5 +-
gnucash/gnome-utils/gnc-tree-view-account.c | 4 +-
gnucash/gnome/reconcile-view.c | 2 +-
.../register/ledger-core/gncEntryLedgerLayout.c | 17 ++++--
.../register/ledger-core/split-register-layout.c | 68 +++++++++-------------
.../register/ledger-core/split-register-model.c | 4 +-
libgnucash/app-utils/gnc-ui-util.c | 31 ++--------
7 files changed, 51 insertions(+), 80 deletions(-)
More information about the gnucash-changes
mailing list