gnucash master: Multiple changes pushed

[Frank H.Ellenberger]

Updated	 via  https://github.com/Gnucash/gnucash/commit/af51e737 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/c69f0eb5 (commit)
	from  https://github.com/Gnucash/gnucash/commit/6bfd8536 (commit)



commit af51e737e7f11ce3314cc4185ee44a3440b9c83f
Merge: 6bfd85368 c69f0eb5f
Author: Frank H. Ellenberger <frank.h.ellenberger at gmail.com>
Date:   Fri Jun 26 15:47:38 2020 +0200

    Merge PR #744


commit c69f0eb5f3152bd8ed795c8feed91687b2b6fae0
Author: Christian Stimming <christian at cstimming.de>
Date:   Thu Jun 25 22:31:12 2020 +0200

    i18n: Fix missing context in single-character translated strings
    
    The single-character column heading "C" is used for "Color" in one
    place,
    and for "Cleared" in another place. Obviously this must be fixed by
    adding
    context, otherwise grossly wrong translations will show up (as is
    currently
    the case for German and the "Cleared" column in the import matcher)
    PR #744

diff --git a/gnucash/gnome-utils/gnc-tree-view-account.c b/gnucash/gnome-utils/gnc-tree-view-account.c
index e690b48ec..960f098e1 100644
--- a/gnucash/gnome-utils/gnc-tree-view-account.c
+++ b/gnucash/gnome-utils/gnc-tree-view-account.c
@@ -920,7 +920,7 @@ gnc_tree_view_account_new_with_root (Account *root, gboolean show_root)
 
     /* Translators: The C is the column title and stands for Color, this should be one character */
     acc_color_column
-        = gnc_tree_view_add_text_column(view, _("C"), "account-color", NULL,
+        = gnc_tree_view_add_text_column(view, C_("Column header for 'Color'", "C"), "account-color", NULL,
                                         "xx",
                                         GNC_TREE_VIEW_COLUMN_DATA_NONE,
                                         GNC_TREE_VIEW_COLUMN_VISIBLE_ALWAYS,
diff --git a/gnucash/import-export/import-main-matcher.c b/gnucash/import-export/import-main-matcher.c
index 305c71a65..3473ef4ad 100644
--- a/gnucash/import-export/import-main-matcher.c
+++ b/gnucash/import-export/import-main-matcher.c
@@ -802,17 +802,14 @@ gnc_gen_trans_init_view (GNCImportMainMatcher *info,
     add_text_column (view, _("Description"), DOWNLOADED_COL_DESCRIPTION, FALSE);
     add_text_column (view, _("Memo"), DOWNLOADED_COL_MEMO, TRUE);
     add_toggle_column (view,
-                       /* toggle column: add new transaction */
-                       _("A"), DOWNLOADED_COL_ACTION_ADD,
+                       C_("Column header for 'Adding transaction'", "A"), DOWNLOADED_COL_ACTION_ADD,
                        G_CALLBACK(gnc_gen_trans_add_toggled_cb), info);
     column = add_toggle_column (view,
-            /* toggle column: update existing transaction & mark it reconciled */
-            _("U+C"), DOWNLOADED_COL_ACTION_UPDATE,
+                               C_("Column header for 'Updating plus Clearing transaction'", "U+C"), DOWNLOADED_COL_ACTION_UPDATE,
                                G_CALLBACK(gnc_gen_trans_update_toggled_cb), info);
     gtk_tree_view_column_set_visible (column, show_update);
     add_toggle_column (view,
-            /* toggle column: mark existing transaction reconciled */
-            _("C"), DOWNLOADED_COL_ACTION_CLEAR,
+                       C_("Column header for 'Clearing transaction'", "C"), DOWNLOADED_COL_ACTION_CLEAR,
                       G_CALLBACK(gnc_gen_trans_clear_toggled_cb), info);
 
     /* The last column has multiple renderers */



Summary of changes:
 gnucash/gnome-utils/gnc-tree-view-account.c | 2 +-
 gnucash/import-export/import-main-matcher.c | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)