diff --git a/src/plugins/FtmStyleAncestors.py b/src/plugins/FtmStyleAncestors.py index c419020f8..d9a2dd233 100644 --- a/src/plugins/FtmStyleAncestors.py +++ b/src/plugins/FtmStyleAncestors.py @@ -471,7 +471,7 @@ class FtmAncestorReport(Report.Report): }) else: 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' : '', 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), @@ -613,7 +613,7 @@ class FtmAncestorReport(Report.Report): else: if dplace: 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' : '', 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), @@ -635,14 +635,14 @@ class FtmAncestorReport(Report.Report): 'death_date' : ddate, 'death_place' : dplace, }) 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' : '', 'death_endnotes' : self.endnotes(death), 'death_date' : ddate, }) else: 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' : '', 'death_endnotes' : self.endnotes(death), 'birth_date' : bdate, 'death_place' : dplace, diff --git a/src/plugins/FtmStyleDescendants.py b/src/plugins/FtmStyleDescendants.py index 5dcf1af64..a1a2ef7f2 100644 --- a/src/plugins/FtmStyleDescendants.py +++ b/src/plugins/FtmStyleDescendants.py @@ -863,7 +863,7 @@ class FtmDescendantReport(Report.Report): }) else: 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' : '', 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), @@ -1010,7 +1010,7 @@ class FtmDescendantReport(Report.Report): else: if dplace: 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' : '', 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), diff --git a/src/po/template.po b/src/po/template.po index 8610764e3..742f5564e 100644 --- a/src/po/template.po +++ b/src/po/template.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "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" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \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." msgstr "" -#: plugins/FtmStyleAncestors.py:473 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." +#: plugins/FtmStyleAncestors.py:473 plugins/FtmStyleDescendants.py:516 +#: 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 "" #: 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." msgstr "" -#: plugins/FtmStyleAncestors.py:615 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." +#: plugins/FtmStyleAncestors.py:615 plugins/FtmStyleDescendants.py:653 +#: 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 "" #: 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." msgstr "" -#: plugins/FtmStyleAncestors.py:638 -msgid "%(female_name)s%(endnotes)s died %(death_date)s$(death_endotes)s." +#: plugins/FtmStyleAncestors.py:638 plugins/FtmStyleDescendants.py:1036 +msgid "%(female_name)s%(endnotes)s died %(death_date)s%(death_endotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:645 -msgid "%(female_name)s%(endnotes)s died in %(death_place)s$(death_endnotes)s." +#: plugins/FtmStyleAncestors.py:645 plugins/FtmStyleDescendants.py:682 +#: plugins/FtmStyleDescendants.py:1044 +msgid "%(female_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s." msgstr "" #: 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." 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 msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s." msgstr "" @@ -4636,10 +4635,6 @@ msgstr "" msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s." 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 msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s." msgstr "" @@ -4648,10 +4643,6 @@ msgstr "" msgid "%(female_name)s%(endnotes)s died %(death_date)s%(death_endnotes)s." 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 msgid "%(female_name)s%(endnotes)s." msgstr "" @@ -4668,10 +4659,6 @@ msgstr "" msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s %(birth_endnotes)s." 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 msgid "FTM Style Descendant Report" msgstr ""