From 1df2e8f06070c7bdb0ddae0169ebb309895372b8 Mon Sep 17 00:00:00 2001 From: Michiel Nauta Date: Mon, 4 Apr 2011 20:23:02 +0000 Subject: [PATCH] Removed translation of string that doesn't need it svn: r17038 --- src/Merge/mergefamily.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Merge/mergefamily.py b/src/Merge/mergefamily.py index 49ef0d7d0..0c8ec2757 100644 --- a/src/Merge/mergefamily.py +++ b/src/Merge/mergefamily.py @@ -277,9 +277,9 @@ class MergeFamilyQuery(object): if phoenix_person is None: if titanic_person is not None: - raise MergeError(_("""When merging people where one person """ + raise MergeError("""When merging people where one person """ """doesn't exist, that "person" must be the person that """ - """will be deleted from the database.""")) + """will be deleted from the database.""") return elif titanic_person is None: if swapped: