diff --git a/src/plugins/FtmStyleAncestors.py b/src/plugins/FtmStyleAncestors.py index 9a9db9726..c419020f8 100644 --- a/src/plugins/FtmStyleAncestors.py +++ b/src/plugins/FtmStyleAncestors.py @@ -298,6 +298,7 @@ class FtmAncestorReport(Report.Report): else: self.doc.write_text(_('%(event_name)s: %(place)s%(endnotes)s') % { 'event_name' : event.getName(), + 'endnotes' : self.endnotes(event), 'place' : event.getPlaceName() }) self.doc.end_paragraph() @@ -361,7 +362,9 @@ class FtmAncestorReport(Report.Report): }) else: self.doc.write_text(_('She married %(spouse)s%(endnotes)s ') % { - 'spouse' : spouse.getPrimaryName().getRegularName(),}) + 'spouse' : spouse.getPrimaryName().getRegularName(), + 'endnotes' : self.endnotes(event), + }) self.doc.write_text(' ') death = spouse.getDeath() @@ -381,19 +384,21 @@ class FtmAncestorReport(Report.Report): if bplace: if ddate: if dplace: - self.doc.write_text(_("He was born %(birth_date)s in %(birth_place)s" + self.doc.write_text(_("%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s" "%(birth_endnotes)s, " "and died %(death_date)s in %(death_place)s" "%(death_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_date' : bdate, 'birth_place' : bplace, 'death_date' : ddate,'death_place' : dplace, 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), }) else: - self.doc.write_text(_("He was born %(birth_date)s in %(birth_place)s" + self.doc.write_text(_("%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s" "%(birth_endnotes)s, " "and died %(death_date)s%(death_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_date' : bdate, 'birth_place' : bplace, 'death_date' : ddate, 'birth_endnotes' : self.endnotes(birth), @@ -401,48 +406,54 @@ class FtmAncestorReport(Report.Report): }) else: if dplace: - self.doc.write_text(_("He was born %(birth_date)s in %(birth_place)s" + self.doc.write_text(_("%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s" "%(birth_endnotes)s, " "and died in %(death_place)s%(death_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_date' : bdate, 'birth_place' : bplace, 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), 'death_place' : dplace, }) else: - self.doc.write_text(_("He was born %(birth_date)s in " + self.doc.write_text(_("%(male_name)s%(endnotes)s was born %(birth_date)s in " "%(birth_place)s%(birth_endnotes)s. ") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_date' : bdate, 'birth_place' : bplace, 'birth_endnotes' : self.endnotes(birth), }) else: if ddate: if dplace: - self.doc.write_text(_("He was born %(birth_date)s%(birth_endnotes)s, " + self.doc.write_text(_("%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, " "and died %(death_date)s in %(death_place)s" "%(death_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_date' : bdate, 'death_date' : ddate, 'death_place' : dplace, 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), }) else: - self.doc.write_text(_("He was born %(birth_date)s%(birth_endnotes)s, " + self.doc.write_text(_("%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, " "and died %(death_date)s%(death_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_date' : bdate, 'death_date' : ddate, 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), }) else: if dplace: - self.doc.write_text(_("He was born %(birth_date)s%(birth_endnotes)s, " + self.doc.write_text(_("%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, " "and died in %(death_place)s%(death_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_date' : bdate, 'death_place' : dplace, 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), }) else: - self.doc.write_text(_("He was born %(birth_date)s%(birth_endnotes)s. ") % { + self.doc.write_text(_("%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s. ") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_date' : bdate, 'birth_endnotes' : self.endnotes(birth), }) @@ -450,49 +461,56 @@ class FtmAncestorReport(Report.Report): if bplace: if ddate: if dplace: - self.doc.write_text(_("He 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 in %(death_place)s" "%(death_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_place' : bplace, 'death_date' : ddate, 'death_place' : dplace, 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), }) else: - self.doc.write_text(_("He 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.") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), 'birth_place' : bplace, 'death_date' : ddate, }) else: if dplace: - self.doc.write_text(_("He 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 in %(death_place)s%(death_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_place' : bplace,'death_place' : dplace, 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), }) else: - self.doc.write_text(_("He 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. ") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_place' : bplace, 'birth_endnotes' : self.endnotes(birth), }) else: if ddate: if dplace: - self.doc.write_text(_("He died %(death_date)s in " + self.doc.write_text(_("%(male_name)s%(endnotes)s died %(death_date)s in " "%(death_place)s%(death_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'death_date' : ddate, 'death_place' : dplace, 'death_endnotes' : self.endnotes(death), }) else: - self.doc.write_text(_("He died %(death_date)s%(death_endnotes)s.") % { + self.doc.write_text(_("%(male_name)s%(endnotes)s died %(death_date)s%(death_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'death_date' : ddate, 'death_endnotes' : self.endnotes(death), }) else: if dplace: - self.doc.write_text(_("He died in %(death_place)s%(death_endnotes)s.") % { + self.doc.write_text(_("%(male_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'death_endnotes' : self.endnotes(death), 'death_place' : dplace, }) @@ -501,19 +519,21 @@ class FtmAncestorReport(Report.Report): if bplace: if ddate: if dplace: - self.doc.write_text(_("She was born %(birth_date)s in %(birth_place)s" + self.doc.write_text(_("%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s" "%(birth_endnotes)s, " "and died %(death_date)s in %(death_place)s" "%(death_endnotes)s.") % { + 'female_name' : _('She'), 'endnotes' : '', 'birth_date' : bdate, 'birth_place' : bplace, 'death_date' : ddate,'death_place' : dplace, 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), }) else: - self.doc.write_text(_("She was born %(birth_date)s in %(birth_place)s" + self.doc.write_text(_("%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s" "%(birth_endnotes)s, " "and died %(death_date)s%(death_endnotes)s.") % { + 'female_name' : _('She'), 'endnotes' : '', 'birth_date' : bdate, 'birth_place' : bplace, 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), @@ -521,16 +541,17 @@ class FtmAncestorReport(Report.Report): }) else: if dplace: - self.doc.write_text(_("She was born %(birth_date)s in %(birth_place)s" + self.doc.write_text(_("%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s" "%(birth_endnotes)s, " "and died in %(death_place)s%(death_endnotes)s.") % { + 'female_name' : _('She'), 'endnotes' : '', 'birth_date' : bdate, 'birth_place' : bplace, 'death_place' : dplace, 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), }) else: - self.doc.write_text(_("She was born %(birth_date)s in %(birth_place)s" + self.doc.write_text(_("%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s" "%(birth_endnotes)s. ") % { 'birth_endnotes' : self.endnotes(birth), 'birth_date' : bdate, 'birth_place' : bplace, @@ -538,31 +559,35 @@ class FtmAncestorReport(Report.Report): else: if ddate: if dplace: - self.doc.write_text(_("She was born %(birth_date)s%(birth_endnotes)s, " + self.doc.write_text(_("%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, " "and died %(death_date)s in %(death_place)s" "%(death_endnotes)s.") % { + 'female_name' : _('She'), 'endnotes' : '', 'birth_date' : bdate, 'death_date' : ddate, 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), 'death_place' : dplace, }) else: - self.doc.write_text(_("She was born %(birth_date)s%(birth_endnotes)s, " + self.doc.write_text(_("%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, " "and died %(death_date)s%(death_endnotes)s.") % { + 'female_name' : _('She'), 'endnotes' : '', 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), 'birth_date' : bdate, 'death_date' : ddate, }) else: if dplace: - self.doc.write_text(_("She was born %(birth_date)s%(birth_endnotes)s, " + self.doc.write_text(_("%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_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), 'birth_date' : bdate, 'death_place' : dplace, }) else: - self.doc.write_text(_("She was born %(birth_date)s%(birth_endnotes)s. ") % { + self.doc.write_text(_("%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s. ") % { + 'female_name' : _('She'), 'endnotes' : '', 'birth_endnotes' : self.endnotes(birth), 'birth_date' : bdate, }) @@ -570,48 +595,55 @@ class FtmAncestorReport(Report.Report): if bplace: if ddate: if dplace: - self.doc.write_text(_("She 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 %(death_date)s in %(death_place)s%(death_endnotes)s.") % { + 'female_name' : _('She'), 'endnotes' : '', 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), 'birth_place' : bplace, 'death_date' : ddate, 'death_place' : dplace, }) else: - self.doc.write_text(_("She 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 %(death_date)s%(death_endnotes)s.") % { + 'female_name' : _('She'), 'endnotes' : '', 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), 'birth_place' : bplace, 'death_date' : ddate, }) else: if dplace: - self.doc.write_text(_("She 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.") % { + 'female_name' : _('She'), 'endnotes' : '', 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), 'birth_place' : bplace,'death_place' : dplace, }) else: - self.doc.write_text(_("She 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. ") % { + 'female_name' : _('She'), 'endnotes' : '', 'birth_endnotes' : self.endnotes(birth), 'birth_place' : bplace, }) else: if ddate: if dplace: - self.doc.write_text(_("She died %(death_date)s in " + self.doc.write_text(_("%(female_name)s%(endnotes)s died %(death_date)s in " "%(death_place)s%(death_endnotes)s.") % { + 'female_name' : _('She'), 'endnotes' : '', 'death_endnotes' : self.endnotes(death), 'death_date' : ddate, 'death_place' : dplace, }) else: - self.doc.write_text(_("She 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(_("She 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, }) @@ -645,10 +677,10 @@ class FtmAncestorReport(Report.Report): elif father: if dead: self.doc.write_text(_("He was the son of %(father)s.") % { - 'father' : mother.getPrimaryName().getRegularName(), }) + 'father' : father.getPrimaryName().getRegularName(), }) else: self.doc.write_text(_("He is the son of %(father)s.") % { - 'father' : mother.getPrimaryName().getRegularName(), }) + 'father' : father.getPrimaryName().getRegularName(), }) else: if mother and father: if dead: @@ -669,10 +701,10 @@ class FtmAncestorReport(Report.Report): elif father: if dead: self.doc.write_text(_("She was the daughter of %(father)s.") % { - 'father' : mother.getPrimaryName().getRegularName(), }) + 'father' : father.getPrimaryName().getRegularName(), }) else: self.doc.write_text(_("She is the daughter of %(father)s.") % { - 'father' : mother.getPrimaryName().getRegularName(), }) + 'father' : father.getPrimaryName().getRegularName(), }) self.doc.write_text(' '); diff --git a/src/plugins/FtmStyleDescendants.py b/src/plugins/FtmStyleDescendants.py index 79861f0b7..5dcf1af64 100644 --- a/src/plugins/FtmStyleDescendants.py +++ b/src/plugins/FtmStyleDescendants.py @@ -437,7 +437,7 @@ class FtmDescendantReport(Report.Report): if ddate: if dplace: self.doc.write_text(_("%(male_name)s%(endnotes)s " - "was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s " + "was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, " "and died %(death_date)s in %(death_place)s%(death_endnotes)s.") % { 'male_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()), 'birth_date' : bdate, 'birth_place' : bplace, @@ -446,7 +446,7 @@ class FtmDescendantReport(Report.Report): 'death_endnotes' : self.endnotes(death) }) else: self.doc.write_text(_("%(male_name)s%(endnotes)s " - "was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s " + "was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, " "and died %(death_date)s%(death_endnotes)s.") % { 'male_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()), 'birth_date' : bdate, 'birth_place' : bplace, 'death_date' : ddate, @@ -455,7 +455,7 @@ class FtmDescendantReport(Report.Report): else: if dplace: self.doc.write_text(_("%(male_name)s%(endnotes)s " - "was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s " + "was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, " "and died in %(death_place)s%(death_endnotes)s.") % { 'male_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()), 'birth_date' : bdate, 'birth_place' : bplace, 'death_place' : dplace, @@ -471,7 +471,7 @@ class FtmDescendantReport(Report.Report): if ddate: if dplace: self.doc.write_text(_("%(male_name)s%(endnotes)s " - "was born %(birth_date)s%(birth_endnotes)s " + "was born %(birth_date)s%(birth_endnotes)s, " "and died %(death_date)s in %(death_place)s%(death_endnotes)s.") % { 'male_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()), 'birth_date' : bdate, @@ -480,7 +480,7 @@ class FtmDescendantReport(Report.Report): 'death_endnotes' : self.endnotes(death) }) else: self.doc.write_text(_("%(male_name)s%(endnotes)s " - "was born %(birth_date)s%(birth_endnotes)s " + "was born %(birth_date)s%(birth_endnotes)s, " "and died %(death_date)s%(death_endnotes)s.") % { 'male_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()), 'birth_date' : bdate, 'death_date' : ddate, @@ -489,7 +489,7 @@ class FtmDescendantReport(Report.Report): else: if dplace: self.doc.write_text(_("%(male_name)s%(endnotes)s " - "was born %(birth_date)s%(birth_endnotes)s " + "was born %(birth_date)s%(birth_endnotes)s, " "and died in %(death_place)s%(death_endnotes)s.") % { 'male_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()), 'birth_date' : bdate, 'death_place' : dplace, @@ -505,7 +505,7 @@ class FtmDescendantReport(Report.Report): if ddate: if dplace: self.doc.write_text(_("%(male_name)s%(endnotes)s " - "was born in %(birth_place)s%(birth_endnotes)s " + "was born in %(birth_place)s%(birth_endnotes)s, " "and died %(death_date)s in %(death_place)s%(death_endnotes)s.") % { 'male_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()), 'birth_place' : bplace, @@ -514,7 +514,7 @@ class FtmDescendantReport(Report.Report): 'death_endnotes' : self.endnotes(death) }) else: self.doc.write_text(_("%(male_name)s%(endnotes)s " - "was born in %(birth_place)s%(birth_endnotes)s " + "was born in %(birth_place)s%(birth_endnotes)s, " "and died %(death_date)s%(death_endnotes)s.") % { 'male_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()), 'birth_place' : bplace, 'death_date' : ddate, @@ -523,7 +523,7 @@ class FtmDescendantReport(Report.Report): else: if dplace: self.doc.write_text(_("%(male_name)s%(endnotes)s " - "was born in %(birth_place)s%(birth_endnotes)s " + "was born in %(birth_place)s%(birth_endnotes)s, " "and died in %(death_place)s%(death_endnotes)s.") % { 'male_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()), 'birth_place' : bplace, 'death_place' : dplace, @@ -565,7 +565,7 @@ class FtmDescendantReport(Report.Report): if ddate: if dplace: self.doc.write_text(_("%(female_name)s%(endnotes)s " - "was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s " + "was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, " "and died %(death_date)s in %(death_place)s%(death_endnotes)s.") % { 'female_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()), 'birth_date' : bdate, 'birth_place' : bplace, @@ -574,7 +574,7 @@ class FtmDescendantReport(Report.Report): 'death_endnotes' : self.endnotes(death) }) else: self.doc.write_text(_("%(female_name)s%(endnotes)s " - "was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s " + "was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, " "and died %(death_date)s%(death_endnotes)s.") % { 'female_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()), 'birth_date' : bdate, 'birth_place' : bplace, 'death_date' : ddate, @@ -583,7 +583,7 @@ class FtmDescendantReport(Report.Report): else: if dplace: self.doc.write_text(_("%(female_name)s%(endnotes)s " - "was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s " + "was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, " "and died in %(death_place)s%(death_endnotes)s.") % { 'female_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()), 'birth_date' : bdate, 'birth_place' : bplace, 'death_place' : dplace, @@ -599,7 +599,7 @@ class FtmDescendantReport(Report.Report): if ddate: if dplace: self.doc.write_text(_("%(female_name)s%(endnotes)s " - "was born %(birth_date)s%(birth_endnotes)s " + "was born %(birth_date)s%(birth_endnotes)s, " "and died %(death_date)s in %(death_place)s%(death_endnotes)s.") % { 'female_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()), 'birth_date' : bdate, @@ -608,7 +608,7 @@ class FtmDescendantReport(Report.Report): 'death_endnotes' : self.endnotes(death) }) else: self.doc.write_text(_("%(female_name)s%(endnotes)s " - "was born %(birth_date)s%(birth_endnotes)s " + "was born %(birth_date)s%(birth_endnotes)s, " "and died %(death_date)s%(death_endnotes)s.") % { 'female_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()), 'birth_date' : bdate, 'death_date' : ddate, @@ -617,7 +617,7 @@ class FtmDescendantReport(Report.Report): else: if dplace: self.doc.write_text(_("%(female_name)s%(endnotes)s " - "was born %(birth_date)s%(birth_endnotes)s " + "was born %(birth_date)s%(birth_endnotes)s, " "and died in %(death_place)s%(death_endnotes)s.") % { 'female_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()), 'birth_date' : bdate, 'death_place' : dplace, @@ -633,7 +633,7 @@ class FtmDescendantReport(Report.Report): if ddate: if dplace: self.doc.write_text(_("%(female_name)s%(endnotes)s " - "was born in %(birth_place)s%(birth_endnotes)s " + "was born in %(birth_place)s%(birth_endnotes)s, " "and died %(death_date)s in %(death_place)s%(death_endnotes)s.") % { 'female_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()), 'birth_place' : bplace, @@ -642,7 +642,7 @@ class FtmDescendantReport(Report.Report): 'death_endnotes' : self.endnotes(death) }) else: self.doc.write_text(_("%(female_name)s%(endnotes)s " - "was born in %(birth_place)s%(birth_endnotes)s " + "was born in %(birth_place)s%(birth_endnotes)s, " "and died %(death_date)s%(death_endnotes)s.") % { 'female_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()), 'birth_place' : bplace, 'death_date' : ddate, @@ -651,7 +651,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 " + "was born in %(birth_place)s%(birth_endnotes)s, " "and died in %(death_place)s%(death_endnotes)s.") % { 'female_name' : child_name, 'endnotes' : self.endnotes(child.getPrimaryName()), 'birth_place' : bplace, 'death_place' : dplace, @@ -775,19 +775,21 @@ class FtmDescendantReport(Report.Report): if bplace: if ddate: if dplace: - self.doc.write_text(_("He was born %(birth_date)s in %(birth_place)s" - "%(birth_endnotes)s, " - "and died %(death_date)s in %(death_place)s" - "%(death_endnotes)s.") % { + self.doc.write_text(_("%(male_name)s%(endnotes)s was born %(birth_date)s " + "in %(birth_place)s%(birth_endnotes)s, " + "and died %(death_date)s in %(death_place)s" + "%(death_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_date' : bdate, 'birth_place' : bplace, 'death_date' : ddate,'death_place' : dplace, 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), }) else: - self.doc.write_text(_("He was born %(birth_date)s in %(birth_place)s" - "%(birth_endnotes)s, " - "and died %(death_date)s%(death_endnotes)s.") % { + self.doc.write_text(_("%(male_name)s%(endnotes)s was born %(birth_date)s " + "in %(birth_place)s%(birth_endnotes)s, " + "and died %(death_date)s%(death_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_date' : bdate, 'birth_place' : bplace, 'death_date' : ddate, 'birth_endnotes' : self.endnotes(birth), @@ -795,48 +797,55 @@ class FtmDescendantReport(Report.Report): }) else: if dplace: - self.doc.write_text(_("He was born %(birth_date)s in %(birth_place)s" - "%(birth_endnotes)s, " - "and died in %(death_place)s%(death_endnotes)s.") % { + self.doc.write_text(_("%(male_name)s%(endnotes)s was born %(birth_date)s " + "in %(birth_place)s %(birth_endnotes)s, " + "and died in %(death_place)s%(death_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_date' : bdate, 'birth_place' : bplace, 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), 'death_place' : dplace, }) else: - self.doc.write_text(_("He was born %(birth_date)s in " - "%(birth_place)s%(birth_endnotes)s. ") % { + self.doc.write_text(_("%(male_name)s%(endnotes)s was born %(birth_date)s in " + "%(birth_place)s%(birth_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_date' : bdate, 'birth_place' : bplace, 'birth_endnotes' : self.endnotes(birth), }) else: if ddate: if dplace: - self.doc.write_text(_("He was born %(birth_date)s%(birth_endnotes)s, " + self.doc.write_text(_("%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, " "and died %(death_date)s in %(death_place)s" "%(death_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_date' : bdate, 'death_date' : ddate, 'death_place' : dplace, 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), }) else: - self.doc.write_text(_("He was born %(birth_date)s%(birth_endnotes)s, " + self.doc.write_text(_("%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, " "and died %(death_date)s%(death_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_date' : bdate, 'death_date' : ddate, 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), }) else: if dplace: - self.doc.write_text(_("He was born %(birth_date)s%(birth_endnotes)s, " + self.doc.write_text(_("%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, " "and died in %(death_place)s%(death_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_date' : bdate, 'death_place' : dplace, 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), }) else: - self.doc.write_text(_("He was born %(birth_date)s%(birth_endnotes)s. ") % { + self.doc.write_text(_("%(male_name)s%(endnotes)s was born " + "%(birth_date)s%(birth_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_date' : bdate, 'birth_endnotes' : self.endnotes(birth), }) @@ -844,49 +853,59 @@ class FtmDescendantReport(Report.Report): if bplace: if ddate: if dplace: - self.doc.write_text(_("He 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 in %(death_place)s" "%(death_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_place' : bplace, 'death_date' : ddate, 'death_place' : dplace, 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), }) else: - self.doc.write_text(_("He 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.") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), 'birth_place' : bplace, 'death_date' : ddate, }) else: if dplace: - self.doc.write_text(_("He 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 in %(death_place)s%(death_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_place' : bplace,'death_place' : dplace, 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), }) else: - self.doc.write_text(_("He 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.") % { + 'male_name' : _('He'), 'endnotes' : '', 'birth_place' : bplace, 'birth_endnotes' : self.endnotes(birth), }) else: if ddate: if dplace: - self.doc.write_text(_("He died %(death_date)s in " + self.doc.write_text(_("%(male_name)s%(endnotes)s died %(death_date)s in " "%(death_place)s%(death_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'death_date' : ddate, 'death_place' : dplace, 'death_endnotes' : self.endnotes(death), }) else: - self.doc.write_text(_("He died %(death_date)s%(death_endnotes)s.") % { + self.doc.write_text(_("%(male_name)s%(endnotes)s " + "died %(death_date)s%(death_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'death_date' : ddate, 'death_endnotes' : self.endnotes(death), }) else: if dplace: - self.doc.write_text(_("He died in %(death_place)s%(death_endnotes)s.") % { + self.doc.write_text(_("%(male_name)s%(endnotes)s died " + "in %(death_place)s%(death_endnotes)s.") % { + 'male_name' : _('He'), 'endnotes' : '', 'death_endnotes' : self.endnotes(death), 'death_place' : dplace, }) @@ -895,19 +914,21 @@ class FtmDescendantReport(Report.Report): if bplace: if ddate: if dplace: - self.doc.write_text(_("She was born %(birth_date)s in %(birth_place)s" + self.doc.write_text(_("%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s" "%(birth_endnotes)s, " "and died %(death_date)s in %(death_place)s" "%(death_endnotes)s.") % { + 'female_name' : _('She'), 'endnotes' : '', 'birth_date' : bdate, 'birth_place' : bplace, 'death_date' : ddate,'death_place' : dplace, 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), }) else: - self.doc.write_text(_("She was born %(birth_date)s in %(birth_place)s" + self.doc.write_text(_("%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s" "%(birth_endnotes)s, " "and died %(death_date)s%(death_endnotes)s.") % { + 'female_name' : _('She'), 'endnotes' : '', 'birth_date' : bdate, 'birth_place' : bplace, 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), @@ -915,48 +936,55 @@ class FtmDescendantReport(Report.Report): }) else: if dplace: - self.doc.write_text(_("She was born %(birth_date)s in %(birth_place)s" + self.doc.write_text(_("%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s" "%(birth_endnotes)s, " "and died in %(death_place)s%(death_endnotes)s.") % { + 'female_name' : _('She'), 'endnotes' : '', 'birth_date' : bdate, 'birth_place' : bplace, 'death_place' : dplace, 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), }) else: - self.doc.write_text(_("She was born %(birth_date)s in %(birth_place)s" - "%(birth_endnotes)s. ") % { + self.doc.write_text(_("%(female_name)s%(endnotes)s was born %(birth_date)s " + "in %(birth_place)s %(birth_endnotes)s.") % { + 'female_name' : _('She'), 'endnotes' : '', 'birth_endnotes' : self.endnotes(birth), 'birth_date' : bdate, 'birth_place' : bplace, }) else: if ddate: if dplace: - self.doc.write_text(_("She was born %(birth_date)s%(birth_endnotes)s, " + self.doc.write_text(_("%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, " "and died %(death_date)s in %(death_place)s" "%(death_endnotes)s.") % { + 'female_name' : _('She'), 'endnotes' : '', 'birth_date' : bdate, 'death_date' : ddate, 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), 'death_place' : dplace, }) else: - self.doc.write_text(_("She was born %(birth_date)s%(birth_endnotes)s, " + self.doc.write_text(_("%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, " "and died %(death_date)s%(death_endnotes)s.") % { + 'female_name' : _('She'), 'endnotes' : '', 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), 'birth_date' : bdate, 'death_date' : ddate, }) else: if dplace: - self.doc.write_text(_("She was born %(birth_date)s%(birth_endnotes)s, " + self.doc.write_text(_("%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_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), 'birth_date' : bdate, 'death_place' : dplace, }) else: - self.doc.write_text(_("She was born %(birth_date)s%(birth_endnotes)s. ") % { + self.doc.write_text(_("%(female_name)s%(endnotes)s was " + "born %(birth_date)s%(birth_endnotes)s.") % { + 'female_name' : _('She'), 'endnotes' : '', 'birth_endnotes' : self.endnotes(birth), 'birth_date' : bdate, }) @@ -964,48 +992,58 @@ class FtmDescendantReport(Report.Report): if bplace: if ddate: if dplace: - self.doc.write_text(_("She 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 %(death_date)s in %(death_place)s%(death_endnotes)s.") % { + 'female_name' : _('She'), 'endnotes' : '', 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), 'birth_place' : bplace, 'death_date' : ddate, 'death_place' : dplace, }) else: - self.doc.write_text(_("She 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 %(death_date)s%(death_endnotes)s.") % { + 'female_name' : _('She'), 'endnotes' : '', 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), 'birth_place' : bplace, 'death_date' : ddate, }) else: if dplace: - self.doc.write_text(_("She 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.") % { + 'female_name' : _('She'), 'endnotes' : '', 'birth_endnotes' : self.endnotes(birth), 'death_endnotes' : self.endnotes(death), 'birth_place' : bplace,'death_place' : dplace, }) else: - self.doc.write_text(_("She 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.") % { + 'female_name' : _('She'), 'endnotes' : '', 'birth_endnotes' : self.endnotes(birth), 'birth_place' : bplace, }) else: if ddate: if dplace: - self.doc.write_text(_("She died %(death_date)s in " + self.doc.write_text(_("%(female_name)s%(endnotes)s died %(death_date)s in " "%(death_place)s%(death_endnotes)s.") % { + 'female_name' : _('She'), 'endnotes' : '', 'death_endnotes' : self.endnotes(death), 'death_date' : ddate, 'death_place' : dplace, }) else: - self.doc.write_text(_("She 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(_("She 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/po/template.po b/src/po/template.po index 5ea72c69a..8610764e3 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: Mon May 26 20:24:32 2003\n" +"POT-Creation-Date: Tue May 27 12:15:23 2003\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3521,10 +3521,10 @@ msgstr "" #: plugins/AncestorChart.py:245 plugins/AncestorReport.py:262 #: plugins/DesGraph.py:335 plugins/FamilyGroup.py:417 -#: plugins/FtmStyleAncestors.py:734 plugins/FtmStyleAncestors.py:739 -#: plugins/FtmStyleAncestors.py:744 plugins/FtmStyleAncestors.py:749 -#: plugins/FtmStyleDescendants.py:1128 plugins/FtmStyleDescendants.py:1133 -#: plugins/FtmStyleDescendants.py:1138 plugins/FtmStyleDescendants.py:1143 +#: plugins/FtmStyleAncestors.py:766 plugins/FtmStyleAncestors.py:771 +#: plugins/FtmStyleAncestors.py:776 plugins/FtmStyleAncestors.py:781 +#: plugins/FtmStyleDescendants.py:1166 plugins/FtmStyleDescendants.py:1171 +#: plugins/FtmStyleDescendants.py:1176 plugins/FtmStyleDescendants.py:1181 #: plugins/IndivComplete.py:528 plugins/IndivSummary.py:371 msgid "The basic style used for the text display." msgstr "" @@ -3532,7 +3532,7 @@ msgstr "" #: plugins/AncestorChart.py:428 plugins/AncestorReport.py:393 #: plugins/DescendReport.py:288 plugins/DetAncestralReport.py:976 #: plugins/DetDescendantReport.py:850 plugins/FamilyGroup.py:570 -#: plugins/FtmStyleAncestors.py:881 plugins/FtmStyleDescendants.py:1275 +#: plugins/FtmStyleAncestors.py:913 plugins/FtmStyleDescendants.py:1313 #: plugins/GraphViz.py:451 plugins/IndivComplete.py:671 #: plugins/IndivSummary.py:504 plugins/Summary.py:162 plugins/TimeLine.py:464 #: plugins/WebPage.py:1273 @@ -3628,27 +3628,27 @@ msgstr "" #: plugins/DescendReport.py:124 plugins/DescendReport.py:287 #: plugins/DetAncestralReport.py:977 plugins/DetDescendantReport.py:851 #: plugins/FamilyGroup.py:344 plugins/FamilyGroup.py:569 -#: plugins/FtmStyleAncestors.py:695 plugins/FtmStyleAncestors.py:880 -#: plugins/FtmStyleDescendants.py:1089 plugins/FtmStyleDescendants.py:1274 +#: plugins/FtmStyleAncestors.py:727 plugins/FtmStyleAncestors.py:912 +#: plugins/FtmStyleDescendants.py:1127 plugins/FtmStyleDescendants.py:1312 #: plugins/IndivComplete.py:446 plugins/IndivComplete.py:672 #: plugins/IndivSummary.py:317 plugins/IndivSummary.py:505 msgid "Text Reports" msgstr "" #: plugins/AncestorReport.py:234 plugins/DetAncestralReport.py:677 -#: plugins/FtmStyleAncestors.py:704 +#: plugins/FtmStyleAncestors.py:736 msgid "Save Ancestor Report" msgstr "" #: plugins/AncestorReport.py:248 plugins/DescendReport.py:148 -#: plugins/FamilyGroup.py:408 plugins/FtmStyleAncestors.py:719 -#: plugins/FtmStyleDescendants.py:1113 plugins/IndivComplete.py:502 +#: plugins/FamilyGroup.py:408 plugins/FtmStyleAncestors.py:751 +#: plugins/FtmStyleDescendants.py:1151 plugins/IndivComplete.py:502 #: plugins/IndivSummary.py:345 plugins/TimeLine.py:399 plugins/WebPage.py:960 msgid "The style used for the title of the page." msgstr "" -#: plugins/AncestorReport.py:257 plugins/FtmStyleAncestors.py:729 -#: plugins/FtmStyleDescendants.py:1123 +#: plugins/AncestorReport.py:257 plugins/FtmStyleAncestors.py:761 +#: plugins/FtmStyleDescendants.py:1161 msgid "The style used for the generation header." msgstr "" @@ -3902,12 +3902,42 @@ msgstr "" #: plugins/DetAncestralReport.py:204 plugins/DetAncestralReport.py:451 #: plugins/DetAncestralReport.py:521 plugins/DetDescendantReport.py:216 #: plugins/DetDescendantReport.py:458 plugins/DetDescendantReport.py:526 +#: plugins/FtmStyleAncestors.py:391 plugins/FtmStyleAncestors.py:401 +#: plugins/FtmStyleAncestors.py:412 plugins/FtmStyleAncestors.py:421 +#: plugins/FtmStyleAncestors.py:431 plugins/FtmStyleAncestors.py:440 +#: plugins/FtmStyleAncestors.py:449 plugins/FtmStyleAncestors.py:456 +#: plugins/FtmStyleAncestors.py:467 plugins/FtmStyleAncestors.py:475 +#: plugins/FtmStyleAncestors.py:484 plugins/FtmStyleAncestors.py:491 +#: plugins/FtmStyleAncestors.py:500 plugins/FtmStyleAncestors.py:506 +#: plugins/FtmStyleAncestors.py:513 plugins/FtmStyleDescendants.py:782 +#: plugins/FtmStyleDescendants.py:792 plugins/FtmStyleDescendants.py:803 +#: plugins/FtmStyleDescendants.py:812 plugins/FtmStyleDescendants.py:822 +#: plugins/FtmStyleDescendants.py:831 plugins/FtmStyleDescendants.py:840 +#: plugins/FtmStyleDescendants.py:848 plugins/FtmStyleDescendants.py:859 +#: plugins/FtmStyleDescendants.py:867 plugins/FtmStyleDescendants.py:876 +#: plugins/FtmStyleDescendants.py:884 plugins/FtmStyleDescendants.py:893 +#: plugins/FtmStyleDescendants.py:900 plugins/FtmStyleDescendants.py:908 msgid "He" msgstr "" #: plugins/DetAncestralReport.py:206 plugins/DetAncestralReport.py:457 #: plugins/DetAncestralReport.py:519 plugins/DetDescendantReport.py:218 #: plugins/DetDescendantReport.py:464 plugins/DetDescendantReport.py:528 +#: plugins/FtmStyleAncestors.py:526 plugins/FtmStyleAncestors.py:536 +#: plugins/FtmStyleAncestors.py:547 plugins/FtmStyleAncestors.py:565 +#: plugins/FtmStyleAncestors.py:574 plugins/FtmStyleAncestors.py:583 +#: plugins/FtmStyleAncestors.py:590 plugins/FtmStyleAncestors.py:600 +#: plugins/FtmStyleAncestors.py:608 plugins/FtmStyleAncestors.py:617 +#: plugins/FtmStyleAncestors.py:624 plugins/FtmStyleAncestors.py:633 +#: plugins/FtmStyleAncestors.py:639 plugins/FtmStyleAncestors.py:646 +#: plugins/FtmStyleDescendants.py:921 plugins/FtmStyleDescendants.py:931 +#: plugins/FtmStyleDescendants.py:942 plugins/FtmStyleDescendants.py:951 +#: plugins/FtmStyleDescendants.py:961 plugins/FtmStyleDescendants.py:970 +#: plugins/FtmStyleDescendants.py:979 plugins/FtmStyleDescendants.py:987 +#: plugins/FtmStyleDescendants.py:997 plugins/FtmStyleDescendants.py:1005 +#: plugins/FtmStyleDescendants.py:1014 plugins/FtmStyleDescendants.py:1022 +#: plugins/FtmStyleDescendants.py:1031 plugins/FtmStyleDescendants.py:1038 +#: plugins/FtmStyleDescendants.py:1046 msgid "She" msgstr "" @@ -4310,216 +4340,235 @@ msgstr "" msgid "%(event_name)s: %(place)s%(endnotes)s" msgstr "" -#: plugins/FtmStyleAncestors.py:323 plugins/FtmStyleDescendants.py:717 +#: plugins/FtmStyleAncestors.py:324 plugins/FtmStyleDescendants.py:717 msgid "He married %(spouse)s %(date)s in %(place)s%(endnotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:329 plugins/FtmStyleDescendants.py:723 +#: plugins/FtmStyleAncestors.py:330 plugins/FtmStyleDescendants.py:723 msgid "She married %(spouse)s %(date)s in %(place)s%(endnotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:336 plugins/FtmStyleDescendants.py:730 +#: plugins/FtmStyleAncestors.py:337 plugins/FtmStyleDescendants.py:730 msgid "He married %(spouse)s %(date)s%(endnotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:341 plugins/FtmStyleAncestors.py:352 +#: plugins/FtmStyleAncestors.py:342 plugins/FtmStyleAncestors.py:353 #: plugins/FtmStyleDescendants.py:735 plugins/FtmStyleDescendants.py:746 msgid "She married %(spouse)s in %(place)s%(endnotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:347 plugins/FtmStyleDescendants.py:741 +#: plugins/FtmStyleAncestors.py:348 plugins/FtmStyleDescendants.py:741 msgid "He married %(spouse)s in %(place)s%(endnotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:358 plugins/FtmStyleDescendants.py:752 +#: plugins/FtmStyleAncestors.py:359 plugins/FtmStyleDescendants.py:752 msgid "He married %(spouse)s%(endnotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:363 +#: plugins/FtmStyleAncestors.py:364 msgid "She married %(spouse)s%(endnotes)s " msgstr "" -#: plugins/FtmStyleAncestors.py:384 plugins/FtmStyleDescendants.py:778 -msgid "He was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s." +#: plugins/FtmStyleAncestors.py:387 plugins/FtmStyleDescendants.py:439 +#: plugins/FtmStyleDescendants.py:778 +msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:394 plugins/FtmStyleDescendants.py:788 -msgid "He was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s." +#: plugins/FtmStyleAncestors.py:398 plugins/FtmStyleDescendants.py:448 +#: plugins/FtmStyleDescendants.py:789 +msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:404 plugins/FtmStyleDescendants.py:798 -msgid "He was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s." +#: plugins/FtmStyleAncestors.py:409 plugins/FtmStyleDescendants.py:457 +msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:413 plugins/FtmStyleDescendants.py:807 -msgid "He was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s. " +#: plugins/FtmStyleAncestors.py:419 +msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s. " msgstr "" -#: plugins/FtmStyleAncestors.py:421 plugins/FtmStyleDescendants.py:815 -msgid "He was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s." +#: plugins/FtmStyleAncestors.py:428 plugins/FtmStyleDescendants.py:473 +#: plugins/FtmStyleDescendants.py:819 +msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:430 plugins/FtmStyleDescendants.py:824 -msgid "He was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s." +#: plugins/FtmStyleAncestors.py:438 plugins/FtmStyleDescendants.py:482 +#: plugins/FtmStyleDescendants.py:829 +msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:438 plugins/FtmStyleDescendants.py:832 -msgid "He was born %(birth_date)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s." +#: plugins/FtmStyleAncestors.py:447 plugins/FtmStyleDescendants.py:491 +#: plugins/FtmStyleDescendants.py:838 +msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:445 plugins/FtmStyleDescendants.py:839 -msgid "He was born %(birth_date)s%(birth_endnotes)s. " +#: plugins/FtmStyleAncestors.py:455 +msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s. " msgstr "" -#: plugins/FtmStyleAncestors.py:453 plugins/FtmStyleDescendants.py:847 -msgid "He was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s." +#: plugins/FtmStyleAncestors.py:464 plugins/FtmStyleDescendants.py:507 +#: plugins/FtmStyleDescendants.py:856 +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:461 plugins/FtmStyleDescendants.py:855 -msgid "He was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s$(death_endnotes)s." +#: 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." msgstr "" -#: plugins/FtmStyleAncestors.py:469 plugins/FtmStyleDescendants.py:863 -msgid "He was born in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s." +#: plugins/FtmStyleAncestors.py:482 plugins/FtmStyleDescendants.py:525 +#: plugins/FtmStyleDescendants.py:874 +msgid "%(male_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:476 plugins/FtmStyleDescendants.py:870 -msgid "He was born in %(birth_place)s%(birth_endnotes)s. " +#: plugins/FtmStyleAncestors.py:490 +msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s. " msgstr "" -#: plugins/FtmStyleAncestors.py:483 plugins/FtmStyleDescendants.py:877 -msgid "He died %(death_date)s in %(death_place)s%(death_endnotes)s." +#: plugins/FtmStyleAncestors.py:498 plugins/FtmStyleDescendants.py:541 +#: plugins/FtmStyleDescendants.py:891 +msgid "%(male_name)s%(endnotes)s died %(death_date)s in %(death_place)s%(death_endnotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:489 plugins/FtmStyleDescendants.py:883 -msgid "He died %(death_date)s%(death_endnotes)s." +#: plugins/FtmStyleAncestors.py:505 plugins/FtmStyleDescendants.py:547 +#: plugins/FtmStyleDescendants.py:898 +msgid "%(male_name)s%(endnotes)s died %(death_date)s%(death_endnotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:495 plugins/FtmStyleDescendants.py:889 -msgid "He died in %(death_place)s%(death_endnotes)s." +#: plugins/FtmStyleAncestors.py:512 plugins/FtmStyleDescendants.py:554 +#: plugins/FtmStyleDescendants.py:906 +msgid "%(male_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:504 plugins/FtmStyleDescendants.py:898 -msgid "She was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s." +#: plugins/FtmStyleAncestors.py:522 plugins/FtmStyleDescendants.py:567 +#: plugins/FtmStyleDescendants.py:917 +msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:514 plugins/FtmStyleDescendants.py:908 -msgid "She was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s." +#: plugins/FtmStyleAncestors.py:533 plugins/FtmStyleDescendants.py:576 +#: plugins/FtmStyleDescendants.py:928 +msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:524 plugins/FtmStyleDescendants.py:918 -msgid "She was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s." +#: plugins/FtmStyleAncestors.py:544 plugins/FtmStyleDescendants.py:585 +#: plugins/FtmStyleDescendants.py:939 +msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:533 plugins/FtmStyleDescendants.py:927 -msgid "She was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s. " +#: plugins/FtmStyleAncestors.py:554 +msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s. " msgstr "" -#: plugins/FtmStyleAncestors.py:541 plugins/FtmStyleDescendants.py:935 -msgid "She was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s." +#: plugins/FtmStyleAncestors.py:562 plugins/FtmStyleDescendants.py:601 +#: plugins/FtmStyleDescendants.py:958 +msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:550 plugins/FtmStyleDescendants.py:944 -msgid "She was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s." +#: plugins/FtmStyleAncestors.py:572 plugins/FtmStyleDescendants.py:610 +#: plugins/FtmStyleDescendants.py:968 +msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:558 plugins/FtmStyleDescendants.py:952 -msgid "She was born %(birth_date)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s." +#: plugins/FtmStyleAncestors.py:581 plugins/FtmStyleDescendants.py:619 +#: plugins/FtmStyleDescendants.py:977 +msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:565 plugins/FtmStyleDescendants.py:959 -msgid "She was born %(birth_date)s%(birth_endnotes)s. " +#: plugins/FtmStyleAncestors.py:589 +msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s. " msgstr "" -#: plugins/FtmStyleAncestors.py:573 plugins/FtmStyleDescendants.py:967 -msgid "She was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s." +#: plugins/FtmStyleAncestors.py:598 plugins/FtmStyleDescendants.py:635 +#: plugins/FtmStyleDescendants.py:995 +msgid "%(female_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:580 plugins/FtmStyleDescendants.py:974 -msgid "She was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s." +#: plugins/FtmStyleAncestors.py:606 plugins/FtmStyleDescendants.py:644 +#: plugins/FtmStyleDescendants.py:1003 +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:588 plugins/FtmStyleDescendants.py:982 -msgid "She 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: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:595 plugins/FtmStyleDescendants.py:989 -msgid "She was born in %(birth_place)s%(birth_endnotes)s. " +#: plugins/FtmStyleAncestors.py:623 +msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s. " msgstr "" -#: plugins/FtmStyleAncestors.py:602 plugins/FtmStyleDescendants.py:996 -msgid "She died %(death_date)s in %(death_place)s%(death_endnotes)s." +#: plugins/FtmStyleAncestors.py:631 plugins/FtmStyleDescendants.py:669 +#: plugins/FtmStyleDescendants.py:1029 +msgid "%(female_name)s%(endnotes)s died %(death_date)s in %(death_place)s%(death_endnotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:608 plugins/FtmStyleDescendants.py:1002 -msgid "She died %(death_date)s$(death_endotes)s." +#: plugins/FtmStyleAncestors.py:638 +msgid "%(female_name)s%(endnotes)s died %(death_date)s$(death_endotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:614 plugins/FtmStyleDescendants.py:1008 -msgid "She died in %(death_place)s$(death_endnotes)s." +#: plugins/FtmStyleAncestors.py:645 +msgid "%(female_name)s%(endnotes)s died in %(death_place)s$(death_endnotes)s." msgstr "" -#: plugins/FtmStyleAncestors.py:631 plugins/FtmStyleDescendants.py:1025 +#: plugins/FtmStyleAncestors.py:663 plugins/FtmStyleDescendants.py:1063 msgid "He was the son of %(father)s and %(mother)s." msgstr "" -#: plugins/FtmStyleAncestors.py:635 plugins/FtmStyleDescendants.py:1029 +#: plugins/FtmStyleAncestors.py:667 plugins/FtmStyleDescendants.py:1067 msgid "He is the son of %(father)s and %(mother)s." msgstr "" -#: plugins/FtmStyleAncestors.py:640 plugins/FtmStyleDescendants.py:1034 +#: plugins/FtmStyleAncestors.py:672 plugins/FtmStyleDescendants.py:1072 msgid "He was the son of %(mother)s." msgstr "" -#: plugins/FtmStyleAncestors.py:643 plugins/FtmStyleDescendants.py:1037 +#: plugins/FtmStyleAncestors.py:675 plugins/FtmStyleDescendants.py:1075 msgid "He is the son of %(mother)s." msgstr "" -#: plugins/FtmStyleAncestors.py:647 plugins/FtmStyleDescendants.py:1041 +#: plugins/FtmStyleAncestors.py:679 plugins/FtmStyleDescendants.py:1079 msgid "He was the son of %(father)s." msgstr "" -#: plugins/FtmStyleAncestors.py:650 plugins/FtmStyleDescendants.py:1044 +#: plugins/FtmStyleAncestors.py:682 plugins/FtmStyleDescendants.py:1082 msgid "He is the son of %(father)s." msgstr "" -#: plugins/FtmStyleAncestors.py:655 plugins/FtmStyleDescendants.py:1049 +#: plugins/FtmStyleAncestors.py:687 plugins/FtmStyleDescendants.py:1087 msgid "She was the daughter of %(father)s and %(mother)s." msgstr "" -#: plugins/FtmStyleAncestors.py:659 plugins/FtmStyleDescendants.py:1053 +#: plugins/FtmStyleAncestors.py:691 plugins/FtmStyleDescendants.py:1091 msgid "She is the daughter of %(father)s and %(mother)s." msgstr "" -#: plugins/FtmStyleAncestors.py:664 plugins/FtmStyleDescendants.py:1058 +#: plugins/FtmStyleAncestors.py:696 plugins/FtmStyleDescendants.py:1096 msgid "She was the daughter of %(mother)s." msgstr "" -#: plugins/FtmStyleAncestors.py:667 plugins/FtmStyleDescendants.py:1061 +#: plugins/FtmStyleAncestors.py:699 plugins/FtmStyleDescendants.py:1099 msgid "She is the daughter of %(mother)s." msgstr "" -#: plugins/FtmStyleAncestors.py:671 plugins/FtmStyleDescendants.py:1065 +#: plugins/FtmStyleAncestors.py:703 plugins/FtmStyleDescendants.py:1103 msgid "She was the daughter of %(father)s." msgstr "" -#: plugins/FtmStyleAncestors.py:674 plugins/FtmStyleDescendants.py:1068 +#: plugins/FtmStyleAncestors.py:706 plugins/FtmStyleDescendants.py:1106 msgid "She is the daughter of %(father)s." msgstr "" -#: plugins/FtmStyleAncestors.py:695 +#: plugins/FtmStyleAncestors.py:727 msgid "FTM Style Ancestral Report" msgstr "" -#: plugins/FtmStyleAncestors.py:699 +#: plugins/FtmStyleAncestors.py:731 msgid "FTM Style Ancestral Report for %s" msgstr "" -#: plugins/FtmStyleAncestors.py:879 +#: plugins/FtmStyleAncestors.py:911 msgid "FTM Style Ancestor Report" msgstr "" -#: plugins/FtmStyleAncestors.py:882 +#: plugins/FtmStyleAncestors.py:914 msgid "Produces a textual ancestral report similar to Family Tree Maker." msgstr "" @@ -4559,127 +4608,47 @@ msgstr "" msgid "Children of %(person_name)s are:" msgstr "" -#: plugins/FtmStyleDescendants.py:439 -msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s and died %(death_date)s in %(death_place)s%(death_endnotes)s." -msgstr "" - -#: plugins/FtmStyleDescendants.py:448 -msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s and died %(death_date)s%(death_endnotes)s." -msgstr "" - -#: plugins/FtmStyleDescendants.py:457 -msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s and died in %(death_place)s%(death_endnotes)s." -msgstr "" - -#: plugins/FtmStyleDescendants.py:465 +#: plugins/FtmStyleDescendants.py:465 plugins/FtmStyleDescendants.py:810 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s." msgstr "" -#: plugins/FtmStyleDescendants.py:473 -msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s and died %(death_date)s in %(death_place)s%(death_endnotes)s." -msgstr "" - -#: plugins/FtmStyleDescendants.py:482 -msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s and died %(death_date)s%(death_endnotes)s." -msgstr "" - -#: plugins/FtmStyleDescendants.py:491 -msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s and died in %(death_place)s%(death_endnotes)s." -msgstr "" - -#: plugins/FtmStyleDescendants.py:499 +#: plugins/FtmStyleDescendants.py:499 plugins/FtmStyleDescendants.py:846 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s." msgstr "" -#: plugins/FtmStyleDescendants.py:507 -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/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." +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:525 -msgid "%(male_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:533 +#: plugins/FtmStyleDescendants.py:533 plugins/FtmStyleDescendants.py:882 msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s." msgstr "" -#: plugins/FtmStyleDescendants.py:541 -msgid "%(male_name)s%(endnotes)s died %(death_date)s in %(death_place)s%(death_endnotes)s." -msgstr "" - -#: plugins/FtmStyleDescendants.py:547 -msgid "%(male_name)s%(endnotes)s died %(death_date)s%(death_endnotes)s." -msgstr "" - -#: plugins/FtmStyleDescendants.py:554 -msgid "%(male_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s." -msgstr "" - #: plugins/FtmStyleDescendants.py:560 msgid "%(male_name)s%(endnotes)s." msgstr "" -#: plugins/FtmStyleDescendants.py:567 -msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s and died %(death_date)s in %(death_place)s%(death_endnotes)s." -msgstr "" - -#: plugins/FtmStyleDescendants.py:576 -msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s and died %(death_date)s%(death_endnotes)s." -msgstr "" - -#: plugins/FtmStyleDescendants.py:585 -msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s and died in %(death_place)s%(death_endnotes)s." -msgstr "" - #: plugins/FtmStyleDescendants.py:593 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s." msgstr "" -#: plugins/FtmStyleDescendants.py:601 -msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s and died %(death_date)s in %(death_place)s%(death_endnotes)s." -msgstr "" - -#: plugins/FtmStyleDescendants.py:610 -msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s and died %(death_date)s%(death_endnotes)s." -msgstr "" - -#: plugins/FtmStyleDescendants.py:619 -msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s and died in %(death_place)s%(death_endnotes)s." -msgstr "" - -#: plugins/FtmStyleDescendants.py:627 +#: plugins/FtmStyleDescendants.py:627 plugins/FtmStyleDescendants.py:985 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s." msgstr "" -#: plugins/FtmStyleDescendants.py:635 -msgid "%(female_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/FtmStyleDescendants.py:644 -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/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." +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:661 plugins/FtmStyleDescendants.py:1020 msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s." msgstr "" -#: plugins/FtmStyleDescendants.py:669 -msgid "%(female_name)s%(endnotes)s died %(death_date)s in %(death_place)s%(death_endnotes)s." -msgstr "" - #: plugins/FtmStyleDescendants.py:675 msgid "%(female_name)s%(endnotes)s died %(death_date)s%(death_endnotes)s." msgstr "" -#: plugins/FtmStyleDescendants.py:682 +#: plugins/FtmStyleDescendants.py:682 plugins/FtmStyleDescendants.py:1044 msgid "%(female_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s." msgstr "" @@ -4691,19 +4660,31 @@ msgstr "" msgid "She married %(spouse)s%(endnotes)s." msgstr "" -#: plugins/FtmStyleDescendants.py:1089 plugins/FtmStyleDescendants.py:1273 +#: plugins/FtmStyleDescendants.py:800 +msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s %(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s." +msgstr "" + +#: plugins/FtmStyleDescendants.py:949 +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 "" -#: plugins/FtmStyleDescendants.py:1093 +#: plugins/FtmStyleDescendants.py:1131 msgid "FTM Style Descendant Report for %s" msgstr "" -#: plugins/FtmStyleDescendants.py:1098 +#: plugins/FtmStyleDescendants.py:1136 msgid "Save FTM Style Descendant Report" msgstr "" -#: plugins/FtmStyleDescendants.py:1276 +#: plugins/FtmStyleDescendants.py:1314 msgid "Produces a textual descendant report similar to Family Tree Maker." msgstr ""