From 6883b0590d713c61a9f78f3f9f30fa1b11666af6 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sat, 8 Mar 2003 05:59:20 +0000 Subject: [PATCH] Bug fixes from pychecker svn: r1333 --- gramps2/src/FamilyView.py | 17 +- gramps2/src/Makefile.am | 3 + gramps2/src/Makefile.in | 3 + gramps2/src/Marriage.py | 5 +- gramps2/src/calendars/Makefile.in | 13 +- gramps2/src/docgen/Makefile.in | 23 ++- gramps2/src/filters/Makefile.in | 22 ++- gramps2/src/gramps.py | 2 - gramps2/src/gramps_main.py | 9 - gramps2/src/plugins/AncestorChart.py | 1 + gramps2/src/plugins/AncestorReport.py | 3 + gramps2/src/plugins/DesGraph.py | 1 + gramps2/src/plugins/DescendReport.py | 2 + gramps2/src/plugins/FamilyGroup.py | 4 + gramps2/src/plugins/IndivComplete.py | 6 +- gramps2/src/plugins/IndivSummary.py | 4 + gramps2/src/plugins/Makefile.in | 57 ++++++- gramps2/src/plugins/TimeLine.py | 3 + gramps2/src/plugins/WebPage.py | 1 - gramps2/src/po/template.po | 237 ++++++++++++++------------ 20 files changed, 264 insertions(+), 152 deletions(-) diff --git a/gramps2/src/FamilyView.py b/gramps2/src/FamilyView.py index 3b5328a2f..181f39755 100644 --- a/gramps2/src/FamilyView.py +++ b/gramps2/src/FamilyView.py @@ -18,13 +18,6 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -#------------------------------------------------------------------------- -# -# standard python modules -# -#------------------------------------------------------------------------- -import pickle - #------------------------------------------------------------------------- # # GTK/Gnome modules @@ -49,7 +42,6 @@ import SelectChild import DisplayTrace import Marriage import ChooseParents -import RelLib from intl import gettext as _ from QuestionDialog import QuestionDialog,WarningDialog @@ -427,15 +419,8 @@ class FamilyView: self.child_map = {} - attr = "" for child in child_list: status = _("Unknown") - if child.getGender() == RelLib.Person.male: - gender = const.male - elif child.getGender() == RelLib.Person.female: - gender = const.female - else: - gender = const.unknown for fam in child.getParentList(): if fam[0] == family: if self.person == family.getFather(): @@ -491,6 +476,7 @@ class FamilyView: def del_sp_parents(self,obj): if not self.selected_spouse or len(self.selected_spouse.getParentList()) == 0: return + n = GrampsCfg.nameof(self.selected_spouse) QuestionDialog(_('Remove Parents of %s') % n, _('Removing the parents of a person removes the person as a ' 'child of the parents. The parents are not removed from the ' @@ -602,7 +588,6 @@ class FamilyView: if not iter: return id = self.child_model.get_value(iter,2) - person = self.parent.db.getPerson(id) bits_per = 8; # we're going to pass a string data = str(('child',id)); sel_data.set(sel_data.target, bits_per, data) diff --git a/gramps2/src/Makefile.am b/gramps2/src/Makefile.am index c927eba13..ba5ef3b8a 100644 --- a/gramps2/src/Makefile.am +++ b/gramps2/src/Makefile.am @@ -153,6 +153,9 @@ grampslib.so: grampslib_wrap.c trans: po/template.po ./build_po +check: + pychecker $(pkgpython_PYTHON) + install-data-local: ${INSTALL} -d ${prefix}/share/pixmaps ${INSTALL_DATA} gramps.png ${prefix}/share/pixmaps diff --git a/gramps2/src/Makefile.in b/gramps2/src/Makefile.in index d50636905..336589ecf 100644 --- a/gramps2/src/Makefile.in +++ b/gramps2/src/Makefile.in @@ -575,6 +575,9 @@ grampslib.so: grampslib_wrap.c trans: po/template.po ./build_po +check: + pychecker $(pkgpython_PYTHON) + install-data-local: ${INSTALL} -d ${prefix}/share/pixmaps ${INSTALL_DATA} gramps.png ${prefix}/share/pixmaps diff --git a/gramps2/src/Marriage.py b/gramps2/src/Marriage.py index 5e2b492a8..ea65d75b0 100644 --- a/gramps2/src/Marriage.py +++ b/gramps2/src/Marriage.py @@ -43,7 +43,7 @@ import RelLib import ImageSelect import Date -from QuestionDialog import QuestionDialog, WarningDialog +from QuestionDialog import QuestionDialog, WarningDialog, SaveDialog from intl import gettext as _ #------------------------------------------------------------------------- @@ -400,8 +400,7 @@ class Marriage: if self.did_data_change(): global quit self.quit = obj - - SaveDialog(_('Save Changes?' % n), + SaveDialog(_('Save Changes?'), _('If you close without saving, the changes you ' 'have made will be lost'), self.cancel_callback, diff --git a/gramps2/src/calendars/Makefile.in b/gramps2/src/calendars/Makefile.in index 42b637f91..05b227c31 100644 --- a/gramps2/src/calendars/Makefile.in +++ b/gramps2/src/calendars/Makefile.in @@ -13,6 +13,10 @@ # PARTICULAR PURPOSE. @SET_MAKE@ + +# This is the src/plugins level Makefile for Gramps +# Use GNU make's ':=' syntax for nice wildcard use. +# If not using GNU make, then list all .py files individually SHELL = @SHELL@ srcdir = @srcdir@ @@ -105,15 +109,16 @@ ZIP = @ZIP@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ + pkgpyexecdir = @pkgpyexecdir@/plugins pkgpythondir = @pkgpythondir@/plugins pyexecdir = @pyexecdir@ pythondir = @pythondir@ -# This is the src/plugins level Makefile for Gramps -# Use GNU make's ':=' syntax for nice wildcard use. -# If not using GNU make, then list all .py files individually -pkgpython_PYTHON := ${wildcard *.py} +pkgpython_PYTHON = \ + Islamic.py \ + Persian.py + subdir = src/calendars mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = diff --git a/gramps2/src/docgen/Makefile.in b/gramps2/src/docgen/Makefile.in index aa5835c49..de365f608 100644 --- a/gramps2/src/docgen/Makefile.in +++ b/gramps2/src/docgen/Makefile.in @@ -13,6 +13,10 @@ # PARTICULAR PURPOSE. @SET_MAKE@ + +# This is the src/docgen level Makefile for Gramps +# Use GNU make's ':=' syntax for nice wildcard use. +# If not using GNU make, then list all .py files individually SHELL = @SHELL@ srcdir = @srcdir@ @@ -104,15 +108,26 @@ ZIP = @ZIP@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ + pkgpyexecdir = @pkgpyexecdir@/docgen pkgpythondir = @pkgpythondir@/docgen pyexecdir = @pyexecdir@ pythondir = @pythondir@ -# This is the src/docgen level Makefile for Gramps -# Use GNU make's ':=' syntax for nice wildcard use. -# If not using GNU make, then list all .py files individually -pkgpython_PYTHON := ${wildcard *.py} +pkgpython_PYTHON = \ + AbiWordDoc.py\ + HtmlDoc.py\ + KwordDoc.py\ + LaTeXDoc.py\ + OpenDrawDoc.py\ + OpenOfficeDoc.py\ + OpenSpreadSheet.py\ + PdfDoc.py\ + PdfDrawDoc.py\ + PSDrawDoc.py\ + RTFDoc.py\ + SvgDrawDoc.py + subdir = src/docgen mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = diff --git a/gramps2/src/filters/Makefile.in b/gramps2/src/filters/Makefile.in index 92fd7ad81..87645b93b 100644 --- a/gramps2/src/filters/Makefile.in +++ b/gramps2/src/filters/Makefile.in @@ -104,6 +104,7 @@ ZIP = @ZIP@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ + pkgpyexecdir = @pkgpyexecdir@/filters pkgpythondir = @pkgpythondir@/filters pyexecdir = @pyexecdir@ @@ -112,7 +113,26 @@ pythondir = @pythondir@ # This is the src/filters level Makefile for Gramps # Use GNU make's ':=' syntax for nice wildcard use. # If not using GNU make, then list all .py files individually -pkgpython_PYTHON := ${wildcard *.py} +pkgpython_PYTHON = \ + After.py\ + AltFam.py\ + Before.py\ + Disconnected.py\ + EventPlace.py\ + EventType.py\ + Females.py\ + HavePhotos.py\ + IncompleteNames.py\ + Males.py\ + MatchSndEx2.py\ + MatchSndEx.py\ + MutlipleMarriages.py\ + NeverMarried.py\ + NoBirthdate.py\ + NoChildren.py\ + RegExMatch.py\ + SubString.py + subdir = src/filters mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_CLEAN_FILES = diff --git a/gramps2/src/gramps.py b/gramps2/src/gramps.py index f7bded3be..4b1f754c3 100755 --- a/gramps2/src/gramps.py +++ b/gramps2/src/gramps.py @@ -1,6 +1,5 @@ #! /usr/bin/python -O -import const import sys import os import locale @@ -35,7 +34,6 @@ else: # #------------------------------------------------------------------------- import gramps_main -import const if len(sys.argv) > 1: arg = sys.argv[1] diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py index 253eeb3ae..eb91fafa9 100755 --- a/gramps2/src/gramps_main.py +++ b/gramps2/src/gramps_main.py @@ -997,9 +997,6 @@ class Gramps: def on_revert_activate(self,obj): if self.db.getSavePath() != "": - msg = _("Do you wish to abandon your changes and " - "revert to the last saved database?") - QuestionDialog(_('Revert to last saved database?'), _('Reverting to the last saved database ' 'will cause all unsaved changes to be lost, and ' @@ -1007,8 +1004,6 @@ class Gramps: _('Revert'), self.revert_query) else: - msg = _("Cannot revert to a previous database, since " - "one does not exist") WarningDialog(_('Could Not Revert to the Previous Database.'), _('GRAMPS could not find a previous version of ' 'the database')) @@ -1431,8 +1426,6 @@ class Gramps: def on_default_person_activate(self,obj): if self.active_person: name = self.active_person.getPrimaryName().getRegularName() - msg = _("Do you wish to set %s as the home person?") % name - QuestionDialog(_('Set %s as the Home Person') % name, _('Once a Home Person is defined, pressing the ' 'Home button on the toolbar will make the home ' @@ -1507,7 +1500,5 @@ def set_panel(obj): # #------------------------------------------------------------------------- if __name__ == '__main__': - import gnome - Gramps(None) gtk.mainloop() diff --git a/gramps2/src/plugins/AncestorChart.py b/gramps2/src/plugins/AncestorChart.py index 609c68f5b..17654e35d 100644 --- a/gramps2/src/plugins/AncestorChart.py +++ b/gramps2/src/plugins/AncestorChart.py @@ -245,6 +245,7 @@ class AncestorChartDialog(Report.DrawReportDialog): f.set_type_face(TextDoc.FONT_SANS_SERIF) p = TextDoc.ParagraphStyle() p.set_font(f) + p.set_description(_('The basic style used for the text display.')) self.default_style.add_style("Normal",p) def make_report(self): diff --git a/gramps2/src/plugins/AncestorReport.py b/gramps2/src/plugins/AncestorReport.py index d65df33a1..2a269a2ad 100644 --- a/gramps2/src/plugins/AncestorReport.py +++ b/gramps2/src/plugins/AncestorReport.py @@ -245,6 +245,7 @@ class AncestorReportDialog(Report.TextReportDialog): para.set_font(font) para.set_header_level(1) para.set(pad=0.5) + para.set_description(_('The style used for the title of the page.')) self.default_style.add_style("Title",para) font = TextDoc.FontStyle() @@ -253,10 +254,12 @@ class AncestorReportDialog(Report.TextReportDialog): para.set_font(font) para.set_header_level(2) para.set(pad=0.5) + para.set_description(_('The style used for the generation header.')) self.default_style.add_style("Generation",para) para = TextDoc.ParagraphStyle() para.set(first_indent=-1.0,lmargin=1.0,pad=0.25) + para.set_description(_('The basic style used for the text display.')) self.default_style.add_style("Entry",para) def make_report(self): diff --git a/gramps2/src/plugins/DesGraph.py b/gramps2/src/plugins/DesGraph.py index cfe44a873..1818500bf 100644 --- a/gramps2/src/plugins/DesGraph.py +++ b/gramps2/src/plugins/DesGraph.py @@ -332,6 +332,7 @@ class DescendantReportDialog(Report.DrawReportDialog): f.set_type_face(TextDoc.FONT_SANS_SERIF) p = TextDoc.ParagraphStyle() p.set_font(f) + p.set_description(_('The basic style used for the text display.')) self.default_style.add_style("Normal",p) def make_report(self): diff --git a/gramps2/src/plugins/DescendReport.py b/gramps2/src/plugins/DescendReport.py index 932eaa785..f7c655a92 100644 --- a/gramps2/src/plugins/DescendReport.py +++ b/gramps2/src/plugins/DescendReport.py @@ -145,6 +145,7 @@ class DescendantReportDialog(Report.TextReportDialog): p = TextDoc.ParagraphStyle() p.set_header_level(1) p.set_font(f) + p.set_description(_("The style used for the title of the page.")) self.default_style.add_style("Title",p) f = TextDoc.FontStyle() @@ -152,6 +153,7 @@ class DescendantReportDialog(Report.TextReportDialog): p = TextDoc.ParagraphStyle() p.set_font(f) p.set_left_margin(max(10.0,float(i-1))) + p.set_description(_("The style used for the level %d display.") % i) self.default_style.add_style("Level%d" % i,p) def make_report(self): diff --git a/gramps2/src/plugins/FamilyGroup.py b/gramps2/src/plugins/FamilyGroup.py index b85e9bc26..998ff61a0 100644 --- a/gramps2/src/plugins/FamilyGroup.py +++ b/gramps2/src/plugins/FamilyGroup.py @@ -405,6 +405,7 @@ class FamilyGroupDialog(Report.TextReportDialog): font.set_bold(1) para = TextDoc.ParagraphStyle() para.set_font(font) + para.set_description(_("The style used for the title of the page.")) self.default_style.add_style('Title',para) font = TextDoc.FontStyle() @@ -413,6 +414,7 @@ class FamilyGroupDialog(Report.TextReportDialog): font.set_bold(0) para = TextDoc.ParagraphStyle() para.set_font(font) + para.set_description(_('The basic style used for the text display.')) self.default_style.add_style('Normal',para) font = TextDoc.FontStyle() @@ -421,6 +423,7 @@ class FamilyGroupDialog(Report.TextReportDialog): font.set_bold(1) para = TextDoc.ParagraphStyle() para.set_font(font) + para.set_description(_('The style used for the text related to the children.')) self.default_style.add_style('ChildText',para) font = TextDoc.FontStyle() @@ -429,6 +432,7 @@ class FamilyGroupDialog(Report.TextReportDialog): font.set_bold(1) para = TextDoc.ParagraphStyle() para.set_font(font) + para.set_description(_("The style used for the parent's name")) self.default_style.add_style('ParentName',para) #------------------------------------------------------------------------ diff --git a/gramps2/src/plugins/IndivComplete.py b/gramps2/src/plugins/IndivComplete.py index 85e6e0bb7..45a0b1034 100644 --- a/gramps2/src/plugins/IndivComplete.py +++ b/gramps2/src/plugins/IndivComplete.py @@ -335,7 +335,7 @@ class IndivComplete: self.d.end_cell() def write_report(self): - ind_list = self.filter.apply(seld.database,self.database.getPersonMap().values()) + ind_list = self.filter.apply(self.database,self.database.getPersonMap().values()) count = 0 for self.person in ind_list: self.write_person(count) @@ -499,6 +499,7 @@ class IndivSummaryDialog(Report.TextReportDialog): p = TextDoc.ParagraphStyle() p.set_alignment(TextDoc.PARA_ALIGN_CENTER) p.set_font(font) + p.set_description(_("The style used for the title of the page.")) self.default_style.add_style("Title",p) font = TextDoc.FontStyle() @@ -508,6 +509,7 @@ class IndivSummaryDialog(Report.TextReportDialog): font.set_italic(1) p = TextDoc.ParagraphStyle() p.set_font(font) + p.set_description(_("The style used category labels.")) self.default_style.add_style("TableTitle",p) font = TextDoc.FontStyle() @@ -516,12 +518,14 @@ class IndivSummaryDialog(Report.TextReportDialog): font.set_size(12) p = TextDoc.ParagraphStyle() p.set_font(font) + p.set_description(_("The style used for the spouse's name.")) self.default_style.add_style("Spouse",p) font = TextDoc.FontStyle() font.set_size(12) p = TextDoc.ParagraphStyle() p.set_font(font) + para.set_description(_('The basic style used for the text display.')) self.default_style.add_style("Normal",p) def setup_report_options(self): diff --git a/gramps2/src/plugins/IndivSummary.py b/gramps2/src/plugins/IndivSummary.py index cb23245db..5003f39a9 100644 --- a/gramps2/src/plugins/IndivSummary.py +++ b/gramps2/src/plugins/IndivSummary.py @@ -342,6 +342,7 @@ class IndivSummaryDialog(Report.TextReportDialog): p = TextDoc.ParagraphStyle() p.set_alignment(TextDoc.PARA_ALIGN_CENTER) p.set_font(font) + p.set_description(_("The style used for the title of the page.")) self.default_style.add_style("Title",p) font = TextDoc.FontStyle() @@ -351,6 +352,7 @@ class IndivSummaryDialog(Report.TextReportDialog): font.set_italic(1) p = TextDoc.ParagraphStyle() p.set_font(font) + p.set_description(_("The style used category labels.")) self.default_style.add_style("TableTitle",p) font = TextDoc.FontStyle() @@ -359,12 +361,14 @@ class IndivSummaryDialog(Report.TextReportDialog): font.set_size(12) p = TextDoc.ParagraphStyle() p.set_font(font) + p.set_description(_("The style used for the spouse's name.")) self.default_style.add_style("Spouse",p) font = TextDoc.FontStyle() font.set_size(12) p = TextDoc.ParagraphStyle() p.set_font(font) + para.set_description(_('The basic style used for the text display.')) self.default_style.add_style("Normal",p) def setup_report_options(self): diff --git a/gramps2/src/plugins/Makefile.in b/gramps2/src/plugins/Makefile.in index 7b0dce6e6..c6b02e560 100644 --- a/gramps2/src/plugins/Makefile.in +++ b/gramps2/src/plugins/Makefile.in @@ -13,6 +13,10 @@ # PARTICULAR PURPOSE. @SET_MAKE@ + +# This is the src/plugins level Makefile for Gramps +# Use GNU make's ':=' syntax for nice wildcard use. +# If not using GNU make, then list all .py files individually SHELL = @SHELL@ srcdir = @srcdir@ @@ -105,17 +109,60 @@ ZIP = @ZIP@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ + pkgpyexecdir = @pkgpyexecdir@/plugins pkgpythondir = @pkgpythondir@/plugins pyexecdir = @pyexecdir@ pythondir = @pythondir@ -# This is the src/plugins level Makefile for Gramps -# Use GNU make's ':=' syntax for nice wildcard use. -# If not using GNU make, then list all .py files individually -pkgpython_PYTHON := ${wildcard *.py} +pkgpython_PYTHON = \ + AncestorChart.py\ + AncestorReport.py\ + ChangeTypes.py\ + Check.py\ + count_anc.py\ + Desbrowser.py\ + DescendReport.py\ + DesGraph.py\ + DetAncestralReport.py\ + DetDescendantReport.py\ + EventCmp.py\ + FamilyGroup.py\ + FilterEditor.py\ + GraphViz.py\ + IndivComplete.py\ + IndivSummary.py\ + Merge.py\ + PatchNames.py\ + ReadGedcom.py\ + ReadNative.py\ + RelCalc.py\ + ReorderIds.py\ + soundgen.py\ + Summary.py\ + TimeLine.py\ + Verify.py\ + WebPage.py\ + WriteGedcom.py\ + WritePkg.py + + +GLADEFILES = \ + changetype.glade\ + desbrowse.glade\ + eventcmp.glade\ + gedcomexport.glade\ + gedcomimport.glade\ + merge.glade\ + pafexport.glade\ + patchnames.glade\ + pkgexport.glade\ + readgedcom.glade\ + relcalc.glade\ + soundex.glade\ + summary.glade\ + verify.glade -GLADEFILES := ${wildcard *.glade} pkgdata_DATA = ${GLADEFILES} dist_pkgdata_DATA = ${pkgdata_DATA} diff --git a/gramps2/src/plugins/TimeLine.py b/gramps2/src/plugins/TimeLine.py index 201bf1785..833196fbc 100644 --- a/gramps2/src/plugins/TimeLine.py +++ b/gramps2/src/plugins/TimeLine.py @@ -370,6 +370,7 @@ class TimeLineDialog(Report.DrawReportDialog): f.set_type_face(TextDoc.FONT_SANS_SERIF) p = TextDoc.ParagraphStyle() p.set_font(f) + para.set_description(_("The style used for the person's name.")) self.default_style.add_style("Name",p) f = TextDoc.FontStyle() @@ -377,6 +378,7 @@ class TimeLineDialog(Report.DrawReportDialog): f.set_type_face(TextDoc.FONT_SANS_SERIF) p = TextDoc.ParagraphStyle() p.set_font(f) + para.set_description(_("The style used for the year labels.")) self.default_style.add_style("Label",p) f = TextDoc.FontStyle() @@ -384,6 +386,7 @@ class TimeLineDialog(Report.DrawReportDialog): f.set_type_face(TextDoc.FONT_SANS_SERIF) p = TextDoc.ParagraphStyle() p.set_font(f) + p.set_description(_("The style used for the title of the page.")) self.default_style.add_style("Title",p) def make_report(self): diff --git a/gramps2/src/plugins/WebPage.py b/gramps2/src/plugins/WebPage.py index 6bf891089..5501136fb 100644 --- a/gramps2/src/plugins/WebPage.py +++ b/gramps2/src/plugins/WebPage.py @@ -959,7 +959,6 @@ class WebReportDialog(Report.ReportDialog): p = TextDoc.ParagraphStyle() p.set(align=TextDoc.PARA_ALIGN_CENTER,font=font) p.set_description(_("The style used for the title of the page.")) - self.default_style.add_style("Title",p) font = TextDoc.FontStyle() diff --git a/gramps2/src/po/template.po b/gramps2/src/po/template.po index abf561535..cc954da91 100644 --- a/gramps2/src/po/template.po +++ b/gramps2/src/po/template.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GRAMPS VERSION\n" -"POT-Creation-Date: Fri Mar 7 21:56:51 2003\n" +"POT-Creation-Date: Fri Mar 7 22:49:58 2003\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -23,7 +23,7 @@ msgstr "" msgid "The filename supplied could not be found." msgstr "" -#: AddSpouse.py:85 ChooseParents.py:55 EditPerson.py:206 FamilyView.py:146 +#: AddSpouse.py:85 ChooseParents.py:55 EditPerson.py:206 FamilyView.py:138 #: SelectChild.py:105 gramps_main.py:91 plugins/FilterEditor.py:130 #: plugins/IndivComplete.py:370 plugins/IndivSummary.py:211 #: plugins/RelCalc.py:322 plugins/TimeLine.py:330 plugins/WebPage.py:274 @@ -31,14 +31,14 @@ msgstr "" msgid "Name" msgstr "" -#: AddSpouse.py:85 ChooseParents.py:55 FamilyView.py:146 ImageSelect.py:824 +#: AddSpouse.py:85 ChooseParents.py:55 FamilyView.py:138 ImageSelect.py:824 #: MediaView.py:59 PlaceView.py:48 SelectChild.py:105 SourceView.py:54 #: Sources.py:75 Sources.py:145 Witness.py:54 gramps_main.py:91 #: plugins/RelCalc.py:322 msgid "ID" msgstr "" -#: AddSpouse.py:85 ChooseParents.py:55 FamilyView.py:147 SelectChild.py:105 +#: AddSpouse.py:85 ChooseParents.py:55 FamilyView.py:139 SelectChild.py:105 #: gramps_main.py:92 msgid "Birth date" msgstr "" @@ -221,14 +221,14 @@ msgstr "" msgid "Parent" msgstr "" -#: ChooseParents.py:194 ChooseParents.py:399 FamilyView.py:377 +#: ChooseParents.py:194 ChooseParents.py:399 FamilyView.py:369 #: plugins/FamilyGroup.py:208 plugins/IndivComplete.py:197 #: plugins/IndivComplete.py:199 plugins/IndivComplete.py:410 #: plugins/IndivSummary.py:272 plugins/WebPage.py:293 plugins/WebPage.py:296 msgid "Mother" msgstr "" -#: ChooseParents.py:195 ChooseParents.py:400 FamilyView.py:376 +#: ChooseParents.py:195 ChooseParents.py:400 FamilyView.py:368 #: plugins/FamilyGroup.py:195 plugins/IndivComplete.py:189 #: plugins/IndivComplete.py:191 plugins/IndivComplete.py:405 #: plugins/IndivSummary.py:258 plugins/WebPage.py:292 plugins/WebPage.py:295 @@ -259,12 +259,12 @@ msgstr "" msgid "Open a database" msgstr "" -#: DbPrompter.py:97 gramps_main.py:1039 +#: DbPrompter.py:97 gramps_main.py:1034 msgid "Save database" msgstr "" -#: DbPrompter.py:106 gramps_main.py:774 gramps_main.py:1051 -#: gramps_main.py:1063 +#: DbPrompter.py:106 gramps_main.py:774 gramps_main.py:1046 +#: gramps_main.py:1058 msgid "No Comment Provided" msgstr "" @@ -346,7 +346,7 @@ msgstr "" msgid "Save Changes to %s?" msgstr "" -#: EditPerson.py:810 EditPerson.py:827 Marriage.py:405 +#: EditPerson.py:810 EditPerson.py:827 Marriage.py:404 msgid "If you close without saving, the changes you have made will be lost" msgstr "" @@ -354,7 +354,7 @@ msgstr "" msgid "Make the selected name the preferred name" msgstr "" -#: EditPerson.py:1216 Marriage.py:430 +#: EditPerson.py:1216 Marriage.py:429 msgid "GRAMPS ID value was not changed." msgstr "" @@ -462,63 +462,63 @@ msgstr "" msgid "Event Editor" msgstr "" -#: FamilyView.py:147 gramps_main.py:91 plugins/IndivComplete.py:381 +#: FamilyView.py:139 gramps_main.py:91 plugins/IndivComplete.py:381 #: plugins/IndivSummary.py:225 plugins/WebPage.py:284 plugins/WebPage.py:286 #: plugins/WebPage.py:288 msgid "Gender" msgstr "" -#: FamilyView.py:148 +#: FamilyView.py:140 msgid "Status" msgstr "" -#: FamilyView.py:231 +#: FamilyView.py:223 msgid "Remove %s as a spouse of %s?" msgstr "" -#: FamilyView.py:232 +#: FamilyView.py:224 msgid "Removing a spouse removes the relationship betwen the spouse and the active person. It does not remove the spouse from the database" msgstr "" -#: FamilyView.py:235 +#: FamilyView.py:227 msgid "Remove Spouse" msgstr "" -#: FamilyView.py:393 +#: FamilyView.py:385 msgid "" "%s: %s\n" "\tRelationship: %s" msgstr "" -#: FamilyView.py:395 +#: FamilyView.py:387 msgid "%s: unknown" msgstr "" -#: FamilyView.py:432 Plugins.py:413 Plugins.py:414 Plugins.py:415 +#: FamilyView.py:423 Plugins.py:413 Plugins.py:414 Plugins.py:415 #: Plugins.py:427 Plugins.py:428 Plugins.py:429 Witness.py:71 const.py:159 #: const.py:434 const.py:442 gramps.glade:3502 gramps.glade:3695 #: gramps.glade:4117 gramps.glade:4297 gramps.glade:5775 gramps.glade:6021 -#: gramps_main.py:1225 plugins/WebPage.py:288 +#: gramps_main.py:1220 plugins/WebPage.py:288 msgid "Unknown" msgstr "" -#: FamilyView.py:480 FamilyView.py:494 +#: FamilyView.py:465 FamilyView.py:480 msgid "Remove Parents of %s" msgstr "" -#: FamilyView.py:481 FamilyView.py:495 +#: FamilyView.py:466 FamilyView.py:481 msgid "Removing the parents of a person removes the person as a child of the parents. The parents are not removed from the database, and the relationship between the parents is not removed." msgstr "" -#: FamilyView.py:485 FamilyView.py:499 +#: FamilyView.py:470 FamilyView.py:485 msgid "Remove Parents" msgstr "" -#: FamilyView.py:593 +#: FamilyView.py:579 msgid "Attempt to Reorder Children Failed" msgstr "" -#: FamilyView.py:594 +#: FamilyView.py:580 msgid "Children must be ordered by their birth dates." msgstr "" @@ -928,16 +928,16 @@ msgstr "" msgid "Marriage/Relationship Editor" msgstr "" -#: Marriage.py:107 Marriage.py:566 Marriage.py:584 Utils.py:132 +#: Marriage.py:107 Marriage.py:565 Marriage.py:583 Utils.py:132 #: plugins/Check.py:161 plugins/Check.py:180 msgid "%s and %s" msgstr "" -#: Marriage.py:404 +#: Marriage.py:403 msgid "Save Changes?" msgstr "" -#: Marriage.py:431 +#: Marriage.py:430 msgid "The GRAMPS ID that you chose for this relationship is already being used." msgstr "" @@ -3091,70 +3091,58 @@ msgid "Delete Person" msgstr "" #: gramps_main.py:1000 -msgid "Do you wish to abandon your changes and revert to the last saved database?" -msgstr "" - -#: gramps_main.py:1003 msgid "Revert to last saved database?" msgstr "" -#: gramps_main.py:1004 +#: gramps_main.py:1001 msgid "Reverting to the last saved database will cause all unsaved changes to be lost, and the last saved database will be loaded." msgstr "" -#: gramps_main.py:1007 +#: gramps_main.py:1004 msgid "Revert" msgstr "" -#: gramps_main.py:1010 -msgid "Cannot revert to a previous database, since one does not exist" -msgstr "" - -#: gramps_main.py:1012 +#: gramps_main.py:1007 msgid "Could Not Revert to the Previous Database." msgstr "" -#: gramps_main.py:1013 +#: gramps_main.py:1008 msgid "GRAMPS could not find a previous version of the database" msgstr "" -#: gramps_main.py:1316 +#: gramps_main.py:1311 msgid "Loading %s..." msgstr "" -#: gramps_main.py:1411 +#: gramps_main.py:1406 msgid "No home person has been set." msgstr "" -#: gramps_main.py:1412 +#: gramps_main.py:1407 msgid "The home person may be set from the Settings menu." msgstr "" -#: gramps_main.py:1418 +#: gramps_main.py:1413 msgid "%s has been bookmarked" msgstr "" -#: gramps_main.py:1421 +#: gramps_main.py:1416 msgid "Could Not Set a Bookmark." msgstr "" -#: gramps_main.py:1422 +#: gramps_main.py:1417 msgid "A bookmark could not be set because no one was selected." msgstr "" -#: gramps_main.py:1434 -msgid "Do you wish to set %s as the home person?" -msgstr "" - -#: gramps_main.py:1436 +#: gramps_main.py:1429 msgid "Set %s as the Home Person" msgstr "" -#: gramps_main.py:1437 +#: gramps_main.py:1430 msgid "Once a Home Person is defined, pressing the Home button on the toolbar will make the home person the active person." msgstr "" -#: gramps_main.py:1440 +#: gramps_main.py:1433 msgid "Set Home Person" msgstr "" @@ -3310,14 +3298,14 @@ msgstr "" msgid "Author's email:" msgstr "" -#: plugins/AncestorChart.py:217 plugins/AncestorChart.py:424 +#: plugins/AncestorChart.py:217 plugins/AncestorChart.py:425 msgid "Ancestor Chart" msgstr "" -#: plugins/AncestorChart.py:217 plugins/AncestorChart.py:425 -#: plugins/DesGraph.py:308 plugins/DesGraph.py:459 plugins/FullFamily.py:105 +#: plugins/AncestorChart.py:217 plugins/AncestorChart.py:426 +#: plugins/DesGraph.py:308 plugins/DesGraph.py:460 plugins/FullFamily.py:105 #: plugins/FullFamily.py:170 plugins/GraphViz.py:78 plugins/GraphViz.py:448 -#: plugins/TimeLine.py:310 plugins/TimeLine.py:448 +#: plugins/TimeLine.py:310 plugins/TimeLine.py:451 msgid "Graphical Reports" msgstr "" @@ -3339,16 +3327,22 @@ msgstr "" msgid "Allows you to customize the data in the boxes in the report" msgstr "" -#: plugins/AncestorChart.py:426 plugins/AncestorReport.py:386 -#: plugins/DescendReport.py:282 plugins/DetAncestralReport.py:972 -#: plugins/DetDescendantReport.py:850 plugins/FamilyGroup.py:562 +#: plugins/AncestorChart.py:248 plugins/AncestorReport.py:262 +#: plugins/DesGraph.py:335 plugins/FamilyGroup.py:417 +#: plugins/IndivComplete.py:528 plugins/IndivSummary.py:371 +msgid "The basic style used for the text display." +msgstr "" + +#: plugins/AncestorChart.py:427 plugins/AncestorReport.py:389 +#: plugins/DescendReport.py:284 plugins/DetAncestralReport.py:972 +#: plugins/DetDescendantReport.py:850 plugins/FamilyGroup.py:566 #: plugins/FullFamily.py:171 plugins/GraphViz.py:447 -#: plugins/IndivComplete.py:663 plugins/IndivSummary.py:496 -#: plugins/Summary.py:146 plugins/TimeLine.py:447 plugins/WebPage.py:1269 +#: plugins/IndivComplete.py:667 plugins/IndivSummary.py:500 +#: plugins/Summary.py:146 plugins/TimeLine.py:450 plugins/WebPage.py:1268 msgid "Beta" msgstr "" -#: plugins/AncestorChart.py:427 plugins/FullFamily.py:172 +#: plugins/AncestorChart.py:428 plugins/FullFamily.py:172 msgid "Produces a graphical ancestral tree graph" msgstr "" @@ -3429,16 +3423,16 @@ msgstr "" msgid " and was buried in %s." msgstr "" -#: plugins/AncestorReport.py:225 plugins/AncestorReport.py:384 +#: plugins/AncestorReport.py:225 plugins/AncestorReport.py:387 msgid "Ahnentafel Report" msgstr "" -#: plugins/AncestorReport.py:225 plugins/AncestorReport.py:385 -#: plugins/DescendReport.py:124 plugins/DescendReport.py:281 +#: plugins/AncestorReport.py:225 plugins/AncestorReport.py:388 +#: plugins/DescendReport.py:124 plugins/DescendReport.py:283 #: plugins/DetAncestralReport.py:973 plugins/DetDescendantReport.py:851 -#: plugins/FamilyGroup.py:344 plugins/FamilyGroup.py:561 -#: plugins/IndivComplete.py:446 plugins/IndivComplete.py:664 -#: plugins/IndivSummary.py:317 plugins/IndivSummary.py:497 +#: plugins/FamilyGroup.py:344 plugins/FamilyGroup.py:565 +#: plugins/IndivComplete.py:446 plugins/IndivComplete.py:668 +#: plugins/IndivSummary.py:317 plugins/IndivSummary.py:501 msgid "Text Reports" msgstr "" @@ -3446,7 +3440,17 @@ msgstr "" msgid "Save Ancestor Report" msgstr "" -#: plugins/AncestorReport.py:387 +#: plugins/AncestorReport.py:248 plugins/DescendReport.py:148 +#: plugins/FamilyGroup.py:408 plugins/IndivComplete.py:502 +#: plugins/IndivSummary.py:345 plugins/TimeLine.py:389 plugins/WebPage.py:961 +msgid "The style used for the title of the page." +msgstr "" + +#: plugins/AncestorReport.py:257 +msgid "The style used for the generation header." +msgstr "" + +#: plugins/AncestorReport.py:390 msgid "Produces a textual ancestral report" msgstr "" @@ -3547,7 +3551,7 @@ msgstr "" msgid "Checks the database for integrity problems, fixing the problems that it can" msgstr "" -#: plugins/DesGraph.py:308 plugins/DesGraph.py:458 +#: plugins/DesGraph.py:308 plugins/DesGraph.py:459 msgid "Descendant Graph" msgstr "" @@ -3559,11 +3563,11 @@ msgstr "" msgid "Save Descendant Graph" msgstr "" -#: plugins/DesGraph.py:460 plugins/DescendReport.py:283 +#: plugins/DesGraph.py:461 plugins/DescendReport.py:285 msgid "Generates a list of descendants of the active person" msgstr "" -#: plugins/DesGraph.py:461 +#: plugins/DesGraph.py:462 msgid "Alpha" msgstr "" @@ -3585,7 +3589,7 @@ msgstr "" msgid "Descendants of %s" msgstr "" -#: plugins/DescendReport.py:124 plugins/DescendReport.py:280 +#: plugins/DescendReport.py:124 plugins/DescendReport.py:282 msgid "Descendant Report" msgstr "" @@ -3597,6 +3601,10 @@ msgstr "" msgid "Save Descendant Report" msgstr "" +#: plugins/DescendReport.py:156 +msgid "The style used for the level %d display." +msgstr "" + #: plugins/DetAncestralReport.py:115 plugins/DetDescendantReport.py:125 msgid "Child of %s and %s is:" msgstr "" @@ -3900,7 +3908,7 @@ msgid "Aids in the analysis of data by allowing the development of custom filter msgstr "" #: plugins/FamilyGroup.py:117 plugins/FamilyGroup.py:344 -#: plugins/FamilyGroup.py:560 +#: plugins/FamilyGroup.py:564 msgid "Family Group Report" msgstr "" @@ -3929,7 +3937,15 @@ msgstr "" msgid "Save Family Group Report" msgstr "" -#: plugins/FamilyGroup.py:563 +#: plugins/FamilyGroup.py:426 +msgid "The style used for the text related to the children." +msgstr "" + +#: plugins/FamilyGroup.py:435 +msgid "The style used for the parent's name" +msgstr "" + +#: plugins/FamilyGroup.py:567 msgid "Creates a family group report, showing information on a set of parents and their children." msgstr "" @@ -4179,7 +4195,7 @@ msgid "Include Source Information" msgstr "" #: plugins/IndivComplete.py:446 plugins/IndivComplete.py:450 -#: plugins/IndivComplete.py:662 +#: plugins/IndivComplete.py:666 msgid "Complete Individual Report" msgstr "" @@ -4187,11 +4203,20 @@ msgstr "" msgid "Save Complete Individual Report" msgstr "" -#: plugins/IndivComplete.py:665 +#: plugins/IndivComplete.py:512 plugins/IndivSummary.py:355 +msgid "The style used category labels." +msgstr "" + +#: plugins/IndivComplete.py:521 plugins/IndivSummary.py:364 +#: plugins/WebPage.py:1019 +msgid "The style used for the spouse's name." +msgstr "" + +#: plugins/IndivComplete.py:669 msgid "Produces a complete report on the selected people." msgstr "" -#: plugins/IndivSummary.py:317 plugins/IndivSummary.py:495 +#: plugins/IndivSummary.py:317 plugins/IndivSummary.py:499 msgid "Individual Summary" msgstr "" @@ -4203,7 +4228,7 @@ msgstr "" msgid "Save Individual Summary" msgstr "" -#: plugins/IndivSummary.py:498 +#: plugins/IndivSummary.py:502 msgid "Produces a detailed report on the selected person." msgstr "" @@ -4664,11 +4689,19 @@ msgstr "" msgid "Sort by" msgstr "" -#: plugins/TimeLine.py:442 +#: plugins/TimeLine.py:373 +msgid "The style used for the person's name." +msgstr "" + +#: plugins/TimeLine.py:381 +msgid "The style used for the year labels." +msgstr "" + +#: plugins/TimeLine.py:445 msgid "Generates a timeline graph." msgstr "" -#: plugins/TimeLine.py:446 +#: plugins/TimeLine.py:449 msgid "Timeline Graph" msgstr "" @@ -4774,11 +4807,11 @@ msgstr "" msgid "GRAMPS ID link URL" msgstr "" -#: plugins/WebPage.py:897 plugins/WebPage.py:1267 +#: plugins/WebPage.py:897 plugins/WebPage.py:1266 msgid "Generate Web Site" msgstr "" -#: plugins/WebPage.py:897 plugins/WebPage.py:1268 +#: plugins/WebPage.py:897 plugins/WebPage.py:1267 msgid "Web Page" msgstr "" @@ -4794,67 +4827,59 @@ msgstr "" msgid "Descendant Families of %s" msgstr "" -#: plugins/WebPage.py:961 -msgid "The style used for the title of the page." -msgstr "" - -#: plugins/WebPage.py:969 +#: plugins/WebPage.py:968 msgid "The style used for the header that identifies facts and events." msgstr "" -#: plugins/WebPage.py:977 +#: plugins/WebPage.py:976 msgid "The style used for the header for the notes section." msgstr "" -#: plugins/WebPage.py:984 +#: plugins/WebPage.py:983 msgid "The style used for the copyright notice." msgstr "" -#: plugins/WebPage.py:991 +#: plugins/WebPage.py:990 msgid "The style used for the header for the sources section." msgstr "" -#: plugins/WebPage.py:998 +#: plugins/WebPage.py:997 msgid "The style used on the index page that labels each section." msgstr "" -#: plugins/WebPage.py:1005 +#: plugins/WebPage.py:1004 msgid "The style used for the header for the image section." msgstr "" -#: plugins/WebPage.py:1012 +#: plugins/WebPage.py:1011 msgid "The style used for the header for the marriages and children section." msgstr "" -#: plugins/WebPage.py:1020 -msgid "The style used for the spouse's name." -msgstr "" - -#: plugins/WebPage.py:1027 +#: plugins/WebPage.py:1026 msgid "The style used for the general data labels." msgstr "" -#: plugins/WebPage.py:1034 +#: plugins/WebPage.py:1033 msgid "The style used for the general data." msgstr "" -#: plugins/WebPage.py:1041 +#: plugins/WebPage.py:1040 msgid "The style used for the description of images." msgstr "" -#: plugins/WebPage.py:1048 +#: plugins/WebPage.py:1047 msgid "The style used for the notes associated with images." msgstr "" -#: plugins/WebPage.py:1055 +#: plugins/WebPage.py:1054 msgid "The style used for the source information." msgstr "" -#: plugins/WebPage.py:1062 +#: plugins/WebPage.py:1061 msgid "The style used for the note information." msgstr "" -#: plugins/WebPage.py:1270 +#: plugins/WebPage.py:1269 msgid "Generates web (HTML) pages for individuals, or a set of individuals." msgstr ""