From f54104a71b89ad96221201a6feb0c0aa9dce4d25 Mon Sep 17 00:00:00 2001
From: Nick Hall <nick-h@gramps-project.org>
Date: Fri, 25 Feb 2022 19:57:19 +0000
Subject: [PATCH] Fix translation context regression

---
 gramps/gui/configure.py                    | 22 +++++++++++-----------
 gramps/plugins/gramplet/welcomegramplet.py |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gramps/gui/configure.py b/gramps/gui/configure.py
index a072f24f8..f69537666 100644
--- a/gramps/gui/configure.py
+++ b/gramps/gui/configure.py
@@ -865,19 +865,19 @@ class GrampsPreferences(ConfigureDialog):
                                 _("Common")),
             "%s, %s %s (%s)" % (_("Surname"), _("Given"), _("Suffix"),
                                 _("Nickname")),
-            "%s, %s %s (%s)" % (_("Surname"), _("Name|Common"), _("Suffix"),
+            "%s, %s %s (%s)" % (_("Surname"), _("Common", "Name"), _("Suffix"),
                                 _("Nickname")),
-            "%s, %s %s" % (_("Surname"), _("Name|Common"), _("Suffix")),
+            "%s, %s %s" % (_("Surname"), _("Common", "Name"), _("Suffix")),
             "%s, %s %s (%s)" % (_("SURNAME"), _("Given"), _("Suffix"),
                                 _("Call")),
-            "%s, %s (%s)" % (_("Surname"), _("Given"), _("Name|Common")),
-            "%s, %s (%s)" % (_("Surname"), _("Name|Common"), _("Nickname")),
+            "%s, %s (%s)" % (_("Surname"), _("Given"), _("Common", "Name")),
+            "%s, %s (%s)" % (_("Surname"), _("Common", "Name"), _("Nickname")),
             "%s %s" % (_("Given"), _("Surname")),
             "%s %s, %s" % (_("Given"), _("Surname"), _("Suffix")),
             "%s %s %s" % (_("Given"), _("NotPatronymic"), _("Patronymic")),
             "%s, %s %s (%s)" % (_("SURNAME"), _("Given"), _("Suffix"),
-                                _("Common")),
-            "%s, %s (%s)" % (_("SURNAME"), _("Given"), _("Name|Common")),
+                                _("Common", "Name")),
+            "%s, %s (%s)" % (_("SURNAME"), _("Given"), _("Common", "Name")),
             "%s, %s (%s)" % (_("SURNAME"), _("Given"), _("Nickname")),
             "%s %s" % (_("Given"), _("SURNAME")),
             "%s %s, %s" % (_("Given"), _("SURNAME"), _("Suffix")),
@@ -890,19 +890,19 @@ class GrampsPreferences(ConfigureDialog):
                                 ("Common")),
             "%s, %s %s (%s)" % (("Surname"), ("Given"), ("Suffix"),
                                 ("Nickname")),
-            "%s, %s %s (%s)" % (("Surname"), ("Name|Common"), ("Suffix"),
+            "%s, %s %s (%s)" % (("Surname"), ("Common"), ("Suffix"),
                                 ("Nickname")),
-            "%s, %s %s" % (("Surname"), ("Name|Common"), ("Suffix")),
+            "%s, %s %s" % (("Surname"), ("Common"), ("Suffix")),
             "%s, %s %s (%s)" % (("SURNAME"), ("Given"), ("Suffix"),
                                 ("Call")),
-            "%s, %s (%s)" % (("Surname"), ("Given"), ("Name|Common")),
-            "%s, %s (%s)" % (("Surname"), ("Name|Common"), ("Nickname")),
+            "%s, %s (%s)" % (("Surname"), ("Given"), ("Common")),
+            "%s, %s (%s)" % (("Surname"), ("Common"), ("Nickname")),
             "%s %s" % (("Given"), ("Surname")),
             "%s %s, %s" % (("Given"), ("Surname"), ("Suffix")),
             "%s %s %s" % (("Given"), ("NotPatronymic"), ("Patronymic")),
             "%s, %s %s (%s)" % (("SURNAME"), ("Given"), ("Suffix"),
                                 ("Common")),
-            "%s, %s (%s)" % (("SURNAME"), ("Given"), ("Name|Common")),
+            "%s, %s (%s)" % (("SURNAME"), ("Given"), ("Common")),
             "%s, %s (%s)" % (("SURNAME"), ("Given"), ("Nickname")),
             "%s %s" % (("Given"), ("SURNAME")),
             "%s %s, %s" % (("Given"), ("SURNAME"), ("Suffix")),
diff --git a/gramps/plugins/gramplet/welcomegramplet.py b/gramps/plugins/gramplet/welcomegramplet.py
index 5b23611b8..5597e6df8 100644
--- a/gramps/plugins/gramplet/welcomegramplet.py
+++ b/gramps/plugins/gramplet/welcomegramplet.py
@@ -118,7 +118,7 @@ class WelcomeGramplet(Gramplet):
             ' lists and Discourse forum to share ideas and techniques.\n\n')
         welcome += linkst(_('Gramps online manual'),
                           URL_WIKISTRING + URL_MANUAL_PAGE +
-                          _('locale_suffix|')) + '\n\n'
+                          _('', 'locale_suffix')) + '\n\n'
         welcome += linkst(_('Ask questions on gramps-users mailing list'),
                           '%(gramps_home_url)scontact/' %
                           {'gramps_home_url': URL_HOMEPAGE}) + '\n\n'