svn: r1596
This commit is contained in:
Alex Roitman 2003-05-27 18:06:45 +00:00
parent ba83e6c767
commit 2de702052c
3 changed files with 18 additions and 31 deletions

View File

@ -471,7 +471,7 @@ class FtmAncestorReport(Report.Report):
}) })
else: else:
self.doc.write_text(_("%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, " self.doc.write_text(_("%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
"and died %(death_date)s$(death_endnotes)s.") % { "and died %(death_date)s%(death_endnotes)s.") % {
'male_name' : _('He'), 'endnotes' : '', 'male_name' : _('He'), 'endnotes' : '',
'birth_endnotes' : self.endnotes(birth), 'birth_endnotes' : self.endnotes(birth),
'death_endnotes' : self.endnotes(death), 'death_endnotes' : self.endnotes(death),
@ -613,7 +613,7 @@ class FtmAncestorReport(Report.Report):
else: else:
if dplace: if dplace:
self.doc.write_text(_("%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, " self.doc.write_text(_("%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
"and died in %(death_place)s$(death_endnotes)s.") % { "and died in %(death_place)s%(death_endnotes)s.") % {
'female_name' : _('She'), 'endnotes' : '', 'female_name' : _('She'), 'endnotes' : '',
'birth_endnotes' : self.endnotes(birth), 'birth_endnotes' : self.endnotes(birth),
'death_endnotes' : self.endnotes(death), 'death_endnotes' : self.endnotes(death),
@ -635,14 +635,14 @@ class FtmAncestorReport(Report.Report):
'death_date' : ddate, 'death_place' : dplace, 'death_date' : ddate, 'death_place' : dplace,
}) })
else: else:
self.doc.write_text(_("%(female_name)s%(endnotes)s died %(death_date)s$(death_endotes)s.") % { self.doc.write_text(_("%(female_name)s%(endnotes)s died %(death_date)s%(death_endotes)s.") % {
'female_name' : _('She'), 'endnotes' : '', 'female_name' : _('She'), 'endnotes' : '',
'death_endnotes' : self.endnotes(death), 'death_endnotes' : self.endnotes(death),
'death_date' : ddate, 'death_date' : ddate,
}) })
else: else:
if dplace: if dplace:
self.doc.write_text(_("%(female_name)s%(endnotes)s died in %(death_place)s$(death_endnotes)s.") % { self.doc.write_text(_("%(female_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s.") % {
'female_name' : _('She'), 'endnotes' : '', 'female_name' : _('She'), 'endnotes' : '',
'death_endnotes' : self.endnotes(death), 'death_endnotes' : self.endnotes(death),
'birth_date' : bdate, 'death_place' : dplace, 'birth_date' : bdate, 'death_place' : dplace,

View File

@ -863,7 +863,7 @@ class FtmDescendantReport(Report.Report):
}) })
else: else:
self.doc.write_text(_("%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, " self.doc.write_text(_("%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
"and died %(death_date)s$(death_endnotes)s.") % { "and died %(death_date)s%(death_endnotes)s.") % {
'male_name' : _('He'), 'endnotes' : '', 'male_name' : _('He'), 'endnotes' : '',
'birth_endnotes' : self.endnotes(birth), 'birth_endnotes' : self.endnotes(birth),
'death_endnotes' : self.endnotes(death), 'death_endnotes' : self.endnotes(death),
@ -1010,7 +1010,7 @@ class FtmDescendantReport(Report.Report):
else: else:
if dplace: if dplace:
self.doc.write_text(_("%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, " self.doc.write_text(_("%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
"and died in %(death_place)s$(death_endnotes)s.") % { "and died in %(death_place)s%(death_endnotes)s.") % {
'female_name' : _('She'), 'endnotes' : '', 'female_name' : _('She'), 'endnotes' : '',
'birth_endnotes' : self.endnotes(birth), 'birth_endnotes' : self.endnotes(birth),
'death_endnotes' : self.endnotes(death), 'death_endnotes' : self.endnotes(death),

View File

@ -5,7 +5,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: GRAMPS VERSION\n" "Project-Id-Version: GRAMPS VERSION\n"
"POT-Creation-Date: Tue May 27 12:15:23 2003\n" "POT-Creation-Date: Tue May 27 12:56:19 2003\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -4411,8 +4411,9 @@ msgstr ""
msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s." msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
msgstr "" msgstr ""
#: plugins/FtmStyleAncestors.py:473 plugins/FtmStyleDescendants.py:865 #: plugins/FtmStyleAncestors.py:473 plugins/FtmStyleDescendants.py:516
msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s$(death_endnotes)s." #: plugins/FtmStyleDescendants.py:865
msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
msgstr "" msgstr ""
#: plugins/FtmStyleAncestors.py:482 plugins/FtmStyleDescendants.py:525 #: plugins/FtmStyleAncestors.py:482 plugins/FtmStyleDescendants.py:525
@ -4487,8 +4488,9 @@ msgstr ""
msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s." msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
msgstr "" msgstr ""
#: plugins/FtmStyleAncestors.py:615 plugins/FtmStyleDescendants.py:1012 #: plugins/FtmStyleAncestors.py:615 plugins/FtmStyleDescendants.py:653
msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s$(death_endnotes)s." #: plugins/FtmStyleDescendants.py:1012
msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
msgstr "" msgstr ""
#: plugins/FtmStyleAncestors.py:623 #: plugins/FtmStyleAncestors.py:623
@ -4500,12 +4502,13 @@ msgstr ""
msgid "%(female_name)s%(endnotes)s died %(death_date)s in %(death_place)s%(death_endnotes)s." msgid "%(female_name)s%(endnotes)s died %(death_date)s in %(death_place)s%(death_endnotes)s."
msgstr "" msgstr ""
#: plugins/FtmStyleAncestors.py:638 #: plugins/FtmStyleAncestors.py:638 plugins/FtmStyleDescendants.py:1036
msgid "%(female_name)s%(endnotes)s died %(death_date)s$(death_endotes)s." msgid "%(female_name)s%(endnotes)s died %(death_date)s%(death_endotes)s."
msgstr "" msgstr ""
#: plugins/FtmStyleAncestors.py:645 #: plugins/FtmStyleAncestors.py:645 plugins/FtmStyleDescendants.py:682
msgid "%(female_name)s%(endnotes)s died in %(death_place)s$(death_endnotes)s." #: plugins/FtmStyleDescendants.py:1044
msgid "%(female_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s."
msgstr "" msgstr ""
#: plugins/FtmStyleAncestors.py:663 plugins/FtmStyleDescendants.py:1063 #: plugins/FtmStyleAncestors.py:663 plugins/FtmStyleDescendants.py:1063
@ -4616,10 +4619,6 @@ msgstr ""
msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s." msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s."
msgstr "" msgstr ""
#: plugins/FtmStyleDescendants.py:516
msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
msgstr ""
#: plugins/FtmStyleDescendants.py:533 plugins/FtmStyleDescendants.py:882 #: plugins/FtmStyleDescendants.py:533 plugins/FtmStyleDescendants.py:882
msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s." msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s."
msgstr "" msgstr ""
@ -4636,10 +4635,6 @@ msgstr ""
msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s." msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s."
msgstr "" msgstr ""
#: plugins/FtmStyleDescendants.py:653
msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
msgstr ""
#: plugins/FtmStyleDescendants.py:661 plugins/FtmStyleDescendants.py:1020 #: plugins/FtmStyleDescendants.py:661 plugins/FtmStyleDescendants.py:1020
msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s." msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s."
msgstr "" msgstr ""
@ -4648,10 +4643,6 @@ msgstr ""
msgid "%(female_name)s%(endnotes)s died %(death_date)s%(death_endnotes)s." msgid "%(female_name)s%(endnotes)s died %(death_date)s%(death_endnotes)s."
msgstr "" msgstr ""
#: plugins/FtmStyleDescendants.py:682 plugins/FtmStyleDescendants.py:1044
msgid "%(female_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s."
msgstr ""
#: plugins/FtmStyleDescendants.py:688 #: plugins/FtmStyleDescendants.py:688
msgid "%(female_name)s%(endnotes)s." msgid "%(female_name)s%(endnotes)s."
msgstr "" msgstr ""
@ -4668,10 +4659,6 @@ msgstr ""
msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s %(birth_endnotes)s." msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s %(birth_endnotes)s."
msgstr "" msgstr ""
#: plugins/FtmStyleDescendants.py:1036
msgid "%(female_name)s%(endnotes)s died %(death_date)s%(death_endotes)s."
msgstr ""
#: plugins/FtmStyleDescendants.py:1127 plugins/FtmStyleDescendants.py:1311 #: plugins/FtmStyleDescendants.py:1127 plugins/FtmStyleDescendants.py:1311
msgid "FTM Style Descendant Report" msgid "FTM Style Descendant Report"
msgstr "" msgstr ""