From 26a833ae15d5f340b820ffa093ba47c1a9cbafd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?= Date: Thu, 31 Mar 2011 12:13:29 +0000 Subject: [PATCH] 4796: merge (trunk -> 3.3) svn: r17007 --- src/Utils.py | 2 +- src/gen/lib/eventroletype.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Utils.py b/src/Utils.py index 92c4449b1..beb354b3e 100644 --- a/src/Utils.py +++ b/src/Utils.py @@ -1199,7 +1199,7 @@ KEYWORDS = [("title", "t", _("Person|Title"), _("Person|TITLE")), ("common", "x", _("Name|Common"), _("Name|COMMON")), ("initials", "i", _("Initials"), _("INITIALS")), ("suffix", "s", _("Suffix"), _("SUFFIX")), - ("primary", "m", _("Primary"), _("PRIMARY")), + ("primary", "m", _("Name|Primary"), _("PRIMARY")), ("primary[pre]", "0m", _("Primary[pre]"), _("PRIMARY[PRE]")), ("primary[sur]", "1m", _("Primary[sur]"), _("PRIMARY[SUR]")), ("primary[con]", "2m", _("Primary[con]"), _("PRIMARY[CON]")), diff --git a/src/gen/lib/eventroletype.py b/src/gen/lib/eventroletype.py index da979f8ba..cda9c31d1 100644 --- a/src/gen/lib/eventroletype.py +++ b/src/gen/lib/eventroletype.py @@ -28,7 +28,7 @@ Provide the different event roles. # Python modules # #------------------------------------------------------------------------ -from gen.ggettext import gettext as _ +from gen.ggettext import sgettext as _ #------------------------------------------------------------------------- # @@ -57,14 +57,14 @@ class EventRoleType(GrampsType): _DATAMAP = [ (UNKNOWN, _("Unknown"), "Unknown"), (CUSTOM, _("Custom"), "Custom"), - (PRIMARY, _("Primary"), "Primary"), + (PRIMARY, _("Role|Primary"), "Primary"), (CLERGY, _("Clergy"), "Clergy"), (CELEBRANT, _("Celebrant"), "Celebrant"), (AIDE, _("Aide"), "Aide"), (BRIDE, _("Bride"), "Bride"), (GROOM, _("Groom"), "Groom"), (WITNESS, _("Witness"), "Witness"), - (FAMILY, _("Family"), "Family"), + (FAMILY, _("Role|Family"), "Family"), (INFORMANT, _("Informant"), "Informant"), ]