From 89ad092ac12e7269bc4405b71a8ead9b60080c32 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Sun, 25 Mar 2018 08:58:36 -0700 Subject: [PATCH] Don't strip newlines from builder files. Fixes #10514. --- gramps/gui/glade.py | 4 ++-- gramps/gui/glade/editcitation.glade | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gramps/gui/glade.py b/gramps/gui/glade.py index 1dcc0226e..842564cd2 100644 --- a/gramps/gui/glade.py +++ b/gramps/gui/glade.py @@ -144,7 +144,7 @@ class Glade(Gtk.Builder): if toplevel: loadlist = [toplevel] + also_load with open(path, 'r', encoding='utf-8') as builder_file: - data = builder_file.read().replace('\n', '') + data = builder_file.read() if is_quartz(): data = data.replace('GDK_CONTROL_MASK', 'GDK_META_MASK') self.add_objects_from_string(data, loadlist) @@ -152,7 +152,7 @@ class Glade(Gtk.Builder): # toplevel not given else: with open(path, 'r', encoding='utf-8') as builder_file: - data = builder_file.read().replace('\n', '') + data = builder_file.read() if is_quartz(): data = data.replace('GDK_CONTROL_MASK', 'GDK_META_MASK') self.add_from_string(data) diff --git a/gramps/gui/glade/editcitation.glade b/gramps/gui/glade/editcitation.glade index 9d76da4a3..552b8b635 100644 --- a/gramps/gui/glade/editcitation.glade +++ b/gramps/gui/glade/editcitation.glade @@ -199,10 +199,10 @@ True False Conveys the submitter's quantitative evaluation of the credibility of a piece of information, based upon its supporting evidence. It is not intended to eliminate the receiver's need to evaluate the evidence for themselves. -/Very Low =Unreliable evidence or estimated data. -/Low =Questionable reliability of evidence (interviews, census, oral genealogies, or potential for bias for example, an autobiography). -/High =Secondary evidence, data officially recorded sometime after event. -/Very High =Direct and primary evidence used, or by dominance of the evidence. +-Very Low =Unreliable evidence or estimated data. +-Low =Questionable reliability of evidence (interviews, census, oral genealogies, or potential for bias for example, an autobiography). +-High =Secondary evidence, data officially recorded sometime after event. +-Very High =Direct and primary evidence used, or by dominance of the evidence. True confidence_model