From 64bbfc7d78d40571b6c41f74233f708d1e08e19a Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Sun, 22 Feb 2004 19:24:31 +0000 Subject: [PATCH] * src/plugins/DetAncestralReport.py: Translation corrections. Change "was" to "is". * src/plugins/DetDescendantReport.py: Translation corrections. Change "was" to "is". * src/plugins/FtmStyleAncestors.py (print_more_about): Translate event names. Add description. * src/plugins/FtmStyleDescendants.py (print_more_about, print_more_about_families): Translate event names. Add description. * src/po/de.po: Change Priesterweihe to Ordination. * src/plugins/FamilyGroup.py: Translation corrections. svn: r2895 --- ChangeLog | 12 ++++++++++++ src/plugins/DetAncestralReport.py | 24 ++++++++++++------------ src/plugins/DetDescendantReport.py | 26 +++++++++++++------------- src/plugins/FamilyGroup.py | 2 +- src/plugins/FtmStyleAncestors.py | 16 +++++++++------- src/plugins/FtmStyleDescendants.py | 30 +++++++++++++++++------------- src/po/de.po | 4 ++-- 7 files changed, 66 insertions(+), 48 deletions(-) diff --git a/ChangeLog b/ChangeLog index 490a70df5..86a11ce9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2004-02-22 Alex Roitman + * src/plugins/DetAncestralReport.py: Translation corrections. + Change "was" to "is". + * src/plugins/DetDescendantReport.py: Translation corrections. + Change "was" to "is". + * src/plugins/FtmStyleAncestors.py (print_more_about): + Translate event names. Add description. + * src/plugins/FtmStyleDescendants.py (print_more_about, + print_more_about_families): Translate event names. Add description. + * src/po/de.po: Change Priesterweihe to Ordination. + * src/plugins/FamilyGroup.py: Translation corrections. + 2004-02-21 Alex Roitman * src/ImageSelect.py: Corrections. * src/RelLib.py: Corrections. diff --git a/src/plugins/DetAncestralReport.py b/src/plugins/DetAncestralReport.py index c3eab4acb..426ee3726 100644 --- a/src/plugins/DetAncestralReport.py +++ b/src/plugins/DetAncestralReport.py @@ -391,12 +391,12 @@ class DetAncestorReport(Report.Report): """ Ouptut parents sentence Statement format: - FIRSTNAME was the son of FATHER and MOTHER. - FIRSTNAME was the son of FATHER. - FIRSTNAME was the son of MOTHER. - FIRSTNAME was the daughter of FATHER and MOTHER. - FIRSTNAME was the daughter of FATHER. - FIRSTNAME was the daughter of MOTHER. + FIRSTNAME is the son of FATHER and MOTHER. + FIRSTNAME is the son of FATHER. + FIRSTNAME is the son of MOTHER. + FIRSTNAME is the daughter of FATHER and MOTHER. + FIRSTNAME is the daughter of FATHER. + FIRSTNAME is the daughter of MOTHER. """ ext_family= person.get_main_parents_family_id() if ext_family != None: @@ -411,24 +411,24 @@ class DetAncestorReport(Report.Report): if person.get_gender() == RelLib.Person.male: if father != "": if mother != "": - self.doc.write_text(_(" %s was the son of %s and %s.") % \ + self.doc.write_text(_(" %s is the son of %s and %s.") % \ (firstName, father, mother)) else: - self.doc.write_text(_(" %s was the son of %s.") % \ + self.doc.write_text(_(" %s is the son of %s.") % \ (firstName, father)) else: - self.doc.write_text(_(" %s was the son of %s.") % \ + self.doc.write_text(_(" %s is the son of %s.") % \ (firstName, mother)) else: if father != "": if mother != "": - self.doc.write_text(_(" %s was the daughter of %s and %s.") % \ + self.doc.write_text(_(" %s is the daughter of %s and %s.") % \ (firstName, father, mother)) else: - self.doc.write_text(_(" %s was the daughter of %s.") % \ + self.doc.write_text(_(" %s is the daughter of %s.") % \ (firstName, father)) else: - self.doc.write_text(_(" %s was the daughter of %s.") % \ + self.doc.write_text(_(" %s is the daughter of %s.") % \ (firstName, mother)) diff --git a/src/plugins/DetDescendantReport.py b/src/plugins/DetDescendantReport.py index 7b7454e27..4751b7548 100644 --- a/src/plugins/DetDescendantReport.py +++ b/src/plugins/DetDescendantReport.py @@ -398,12 +398,12 @@ class DetDescendantReport(Report.Report): """ Ouptut parents sentence Statement format: - FIRSTNAME was the son of FATHER and MOTHER. - FIRSTNAME was the son of FATHER. - FIRSTNAME was the son of MOTHER. - FIRSTNAME was the daughter of FATHER and MOTHER. - FIRSTNAME was the daughter of FATHER. - FIRSTNAME was the daughter of MOTHER. + FIRSTNAME is the son of FATHER and MOTHER. + FIRSTNAME is the son of FATHER. + FIRSTNAME is the son of MOTHER. + FIRSTNAME is the daughter of FATHER and MOTHER. + FIRSTNAME is the daughter of FATHER. + FIRSTNAME is the daughter of MOTHER. """ ext_family= person.get_main_parents_family_id() if ext_family != None: @@ -418,24 +418,24 @@ class DetDescendantReport(Report.Report): if person.get_gender() == RelLib.Person.male: if father != "": if mother != "": - self.doc.write_text(_(" %s was the son of %s and %s.") % \ + self.doc.write_text(_(" %s is the son of %s and %s.") % \ (firstName, father, mother)) else: - self.doc.write_text(_(" %s was the son of %s.") % \ + self.doc.write_text(_(" %s is the son of %s.") % \ (firstName, father)) else: - self.doc.write_text(_(" %s was the son of %s.") % \ + self.doc.write_text(_(" %s is the son of %s.") % \ (firstName, mother)) else: if father != "": if mother != "": - self.doc.write_text(_(" %s was the daughter of %s and %s.") % \ + self.doc.write_text(_(" %s is the daughter of %s and %s.") % \ (firstName, father, mother)) else: - self.doc.write_text(_(" %s was the daughter of %s.") % \ + self.doc.write_text(_(" %s is the daughter of %s.") % \ (firstName, father)) else: - self.doc.write_text(_(" %s was the daughter of %s.") % \ + self.doc.write_text(_(" %s is the daughter of %s.") % \ (firstName, mother)) @@ -591,7 +591,7 @@ class DetDescendantReport(Report.Report): self.doc.start_paragraph("DDR-Title") if spouseName != "": - name = spouseName + " and " + name + name = spouseName + _(" and ") + name title = _("Detailed Descendant Report for %s") % name self.doc.write_text(title) diff --git a/src/plugins/FamilyGroup.py b/src/plugins/FamilyGroup.py index 5a4f0ab19..c93f4f69d 100644 --- a/src/plugins/FamilyGroup.py +++ b/src/plugins/FamilyGroup.py @@ -271,7 +271,7 @@ class FamilyGroup: self.doc.end_row() families = len(person.get_family_id_list()) - self.dump_child_event('FGR-TextChild1','Birth',person.get_birth()) + self.dump_child_event('FGR-TextChild1',_('Birth'),person.get_birth()) if families == 0: self.dump_child_event('FGR-TextChild2',_('Death'),person.get_death()) else: diff --git a/src/plugins/FtmStyleAncestors.py b/src/plugins/FtmStyleAncestors.py index d22436835..dd190027b 100644 --- a/src/plugins/FtmStyleAncestors.py +++ b/src/plugins/FtmStyleAncestors.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2003 Donald N. Allingham +# Copyright (C) 2003-2004 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -517,21 +517,23 @@ class FtmAncestorReport(Report.Report): self.doc.start_paragraph('FTA-Details') if date and place: - self.doc.write_text(_('%(event_name)s: %(date)s, %(place)s%(endnotes)s') % { - 'event_name' : event.get_name(), + self.doc.write_text(_('%(event_name)s: %(date)s, %(place)s%(endnotes)s. ') % { + 'event_name' : _(event.get_name()), 'date' : event.get_date(), 'endnotes' : self.endnotes(event), 'place' : event.get_place_name() }) elif date: - self.doc.write_text(_('%(event_name)s: %(date)s%(endnotes)s') % { - 'event_name' : event.get_name(), + self.doc.write_text(_('%(event_name)s: %(date)s%(endnotes)s. ') % { + 'event_name' : _(event.get_name()), 'endnotes' : self.endnotes(event), 'date' : event.get_date()}) else: - self.doc.write_text(_('%(event_name)s: %(place)s%(endnotes)s') % { - 'event_name' : event.get_name(), + self.doc.write_text(_('%(event_name)s: %(place)s%(endnotes)s. ') % { + 'event_name' : _(event.get_name()), 'endnotes' : self.endnotes(event), 'place' : event.get_place_name() }) + if event.get_description(): + self.doc.write_text(event.get_description()) self.doc.end_paragraph() def print_spouse(self,person): diff --git a/src/plugins/FtmStyleDescendants.py b/src/plugins/FtmStyleDescendants.py index a30a53b31..aad85d026 100644 --- a/src/plugins/FtmStyleDescendants.py +++ b/src/plugins/FtmStyleDescendants.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2003 Donald N. Allingham +# Copyright (C) 2003-2004 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -550,21 +550,23 @@ class FtmDescendantReport(Report.Report): self.doc.start_paragraph('FTD-Details') if date and place: - self.doc.write_text(_('%(event_name)s: %(date)s, %(place)s%(endnotes)s') % { - 'event_name' : event.get_name(), + self.doc.write_text(_('%(event_name)s: %(date)s, %(place)s%(endnotes)s. ') % { + 'event_name' : _(event.get_name()), 'date' : event.get_date(), 'endnotes' : self.endnotes(event), 'place' : event.get_place_name() }) elif date: - self.doc.write_text(_('%(event_name)s: %(date)s%(endnotes)s') % { - 'event_name' : event.get_name(), + self.doc.write_text(_('%(event_name)s: %(date)s%(endnotes)s. ') % { + 'event_name' : _(event.get_name()), 'endnotes' : self.endnotes(event), 'date' : event.get_date()}) else: - self.doc.write_text(_('%(event_name)s: %(place)s%(endnotes)s') % { - 'event_name' : event.get_name(), + self.doc.write_text(_('%(event_name)s: %(place)s%(endnotes)s. ') % { + 'event_name' : _(event.get_name()), 'endnotes' : self.endnotes(event), 'place' : event.get_place_name() }) + if event.get_description(): + self.doc.write_text(event.get_description()) self.doc.end_paragraph() @@ -593,21 +595,23 @@ class FtmDescendantReport(Report.Report): self.doc.start_paragraph('FTD-Details') if date and place: - self.doc.write_text(_('%(event_name)s: %(date)s, %(place)s%(endnotes)s') % { - 'event_name' : event.get_name(), + self.doc.write_text(_('%(event_name)s: %(date)s, %(place)s%(endnotes)s. ') % { + 'event_name' : _(event.get_name()), 'date' : event.get_date(), 'endnotes' : self.endnotes(event), 'place' : event.get_place_name() }) elif date: - self.doc.write_text(_('%(event_name)s: %(date)s%(endnotes)s') % { - 'event_name' : event.get_name(), + self.doc.write_text(_('%(event_name)s: %(date)s%(endnotes)s. ') % { + 'event_name' : _(event.get_name()), 'endnotes' : self.endnotes(event), 'date' : event.get_date()}) else: - self.doc.write_text(_('%(event_name)s: %(place)s%(endnotes)s') % { - 'event_name' : event.get_name(), + self.doc.write_text(_('%(event_name)s: %(place)s%(endnotes)s. ') % { + 'event_name' : _(event.get_name()), 'endnotes' : self.endnotes(event), 'place' : event.get_place_name() }) + if event.get_description(): + self.doc.write_text(event.get_description()) self.doc.end_paragraph() diff --git a/src/po/de.po b/src/po/de.po index 515e50afe..4e9f25fab 100644 --- a/src/po/de.po +++ b/src/po/de.po @@ -2495,7 +2495,7 @@ msgstr "Beruf" #: const.py:312 msgid "Ordination" -msgstr "Priesterweihe" +msgstr "Ordination" #: const.py:313 msgid "Probate" @@ -4603,7 +4603,7 @@ msgstr "%(name)ss %(grandparents)s väterlicherseits" #: plugins/Ancestors.py:356 msgid "(no photo)" -msgstr "(keine Foto)" +msgstr "(kein Foto)" #: plugins/Ancestors.py:372 msgid " (mentioned above)."