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



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(-)