Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

4796: merge (trunk -> 3.3)

Browse Source 
svn: r17007
This commit is contained in:
Jérôme Rapinat 2011-03-31 12:13:29 +00:00
parent ae70d3e5b0
commit 26a833ae15
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Utils.py
View File

@ -1199,7 +1199,7 @@ KEYWORDS = [("title", "t", _("Person|Title"), _("Person|TITLE")),
("common", "x", _("Name|Common"), _("Name|COMMON")), ("common", "x", _("Name|Common"), _("Name|COMMON")),
("initials", "i", _("Initials"), _("INITIALS")), ("initials", "i", _("Initials"), _("INITIALS")),
("suffix", "s", _("Suffix"), _("SUFFIX")), ("suffix", "s", _("Suffix"), _("SUFFIX")),
("primary", "m", _("Primary"), _("PRIMARY")), ("primary", "m", _("Name|Primary"), _("PRIMARY")),
("primary[pre]", "0m", _("Primary[pre]"), _("PRIMARY[PRE]")), ("primary[pre]", "0m", _("Primary[pre]"), _("PRIMARY[PRE]")),
("primary[sur]", "1m", _("Primary[sur]"), _("PRIMARY[SUR]")), ("primary[sur]", "1m", _("Primary[sur]"), _("PRIMARY[SUR]")),
("primary[con]", "2m", _("Primary[con]"), _("PRIMARY[CON]")), ("primary[con]", "2m", _("Primary[con]"), _("PRIMARY[CON]")),

6
src/gen/lib/eventroletype.py
View File

@ -28,7 +28,7 @@ Provide the different event roles.
# Python modules # Python modules
# #
#------------------------------------------------------------------------ #------------------------------------------------------------------------
from gen.ggettext import gettext as _ from gen.ggettext import sgettext as _
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -57,14 +57,14 @@ class EventRoleType(GrampsType):
_DATAMAP = [ _DATAMAP = [
(UNKNOWN, _("Unknown"), "Unknown"), (UNKNOWN, _("Unknown"), "Unknown"),
(CUSTOM, _("Custom"), "Custom"), (CUSTOM, _("Custom"), "Custom"),
(PRIMARY, _("Primary"), "Primary"), (PRIMARY, _("Role|Primary"), "Primary"),
(CLERGY, _("Clergy"), "Clergy"), (CLERGY, _("Clergy"), "Clergy"),
(CELEBRANT, _("Celebrant"), "Celebrant"), (CELEBRANT, _("Celebrant"), "Celebrant"),
(AIDE, _("Aide"), "Aide"), (AIDE, _("Aide"), "Aide"),
(BRIDE, _("Bride"), "Bride"), (BRIDE, _("Bride"), "Bride"),
(GROOM, _("Groom"), "Groom"), (GROOM, _("Groom"), "Groom"),
(WITNESS, _("Witness"), "Witness"), (WITNESS, _("Witness"), "Witness"),
(FAMILY, _("Family"), "Family"), (FAMILY, _("Role|Family"), "Family"),
(INFORMANT, _("Informant"), "Informant"), (INFORMANT, _("Informant"), "Informant"),
] ]