diff --git a/gramps2/src/DbPrompter.py b/gramps2/src/DbPrompter.py index f4ec31835..5a5bfa202 100644 --- a/gramps2/src/DbPrompter.py +++ b/gramps2/src/DbPrompter.py @@ -94,6 +94,7 @@ class DbPrompter: "on_ok_button1_clicked": self.save_ok_button_clicked, "destroy_passed_object": self.cancel_button_clicked, }) + wFs.get_widget('fileselection').set_title('%s - GRAMPS' % _('Save database')) def save_ok_button_clicked(self,obj): filename = obj.get_filename() diff --git a/gramps2/src/GenericFilter.py b/gramps2/src/GenericFilter.py index 5efb5a528..f0321f59e 100644 --- a/gramps2/src/GenericFilter.py +++ b/gramps2/src/GenericFilter.py @@ -130,7 +130,7 @@ class Everyone(Rule): class HasIdOf(Rule): """Rule that checks for a person with a specific GID""" - labels = [ _('ID') ] + labels = [ _('ID:') ] def name(self): return 'Has the Id' @@ -163,7 +163,7 @@ class IsDescendantOf(Rule): """Rule that checks for a person that is a descendant of a specified person""" - labels = [ _('ID') ] + labels = [ _('ID:') ] def name(self): return 'Is a descendant of' @@ -190,7 +190,7 @@ class IsDescendantFamilyOf(Rule): """Rule that checks for a person that is a descendant or the spouse of a descendant of a specified person""" - labels = [ _('ID') ] + labels = [ _('ID:') ] def name(self): return "Is a descendant family member of" @@ -226,7 +226,7 @@ class IsDescendantFamilyOf(Rule): class IsAncestorOf(Rule): """Rule that checks for a person that is an ancestor of a specified person""" - labels = [ _('ID') ] + labels = [ _('ID:') ] def name(self): return 'Is an ancestor of' @@ -253,7 +253,7 @@ class IsAncestorOf(Rule): class HasCommonAncestorWith(Rule): """Rule that checks for a person that has a common ancestor with a specified person""" - labels = [ _('ID') ] + labels = [ _('ID:') ] def name(self): return 'Has a common ancestor with' @@ -307,7 +307,7 @@ class IsMale(Rule): class HasEvent(Rule): """Rule that checks for a person with a particular value""" - labels = [ _('Personal Event'), _('Date'), _('Place'), _('Description') ] + labels = [ _('Personal event:'), _('Date:'), _('Place:'), _('Description:') ] def __init__(self,list): Rule.__init__(self,list) @@ -345,7 +345,7 @@ class HasFamilyEvent(Rule): """Rule that checks for a person who has a relationship event with a particular value""" - labels = [ _('Family Event'), _('Date'), _('Place'), _('Description') ] + labels = [ _('Family event:'), _('Date:'), _('Place:'), _('Description:') ] def __init__(self,list): Rule.__init__(self,list) @@ -384,9 +384,9 @@ class HasFamilyEvent(Rule): class HasRelationship(Rule): """Rule that checks for a person who has a particular relationship""" - labels = [ _('Number of Relationships'), - _('Relationship Type'), - _('Number of Children') ] + labels = [ _('Number of relationships:'), + _('Relationship type:'), + _('Number of children:') ] def name(self): return 'Has the relationships' @@ -434,7 +434,7 @@ class HasRelationship(Rule): class HasBirth(Rule): """Rule that checks for a person with a birth of a particular value""" - labels = [ _('Date'), _('Place'), _('Description') ] + labels = [ _('Date:'), _('Place:'), _('Description:') ] def __init__(self,list): Rule.__init__(self,list) @@ -466,7 +466,7 @@ class HasBirth(Rule): class HasDeath(Rule): """Rule that checks for a person with a death of a particular value""" - labels = [ _('Date'), _('Place'), _('Description') ] + labels = [ _('Date:'), _('Place:'), _('Description:') ] def __init__(self,list): Rule.__init__(self,list) @@ -498,7 +498,7 @@ class HasDeath(Rule): class HasAttribute(Rule): """Rule that checks for a person with a particular personal attribute""" - labels = [ _('Personal Attribute'), _('Value') ] + labels = [ _('Personal attribute:'), _('Value:') ] def name(self): return 'Has the personal attribute' @@ -519,7 +519,7 @@ class HasAttribute(Rule): class HasFamilyAttribute(Rule): """Rule that checks for a person with a particular family attribute""" - labels = [ _('Family Attribute'), _('Value') ] + labels = [ _('Family attribute:'), _('Value:') ] def name(self): return 'Has the family attribute' @@ -544,7 +544,7 @@ class HasFamilyAttribute(Rule): class HasNameOf(Rule): """Rule that checks for full or partial name matches""" - labels = [_('Given Name'),_('Surname'),_('Suffix'),_('Title')] + labels = [_('Given name:'),_('Family name:'),_('Suffix:'),_('Title:')] def name(self): return 'Has a name' @@ -572,7 +572,7 @@ class HasNameOf(Rule): class MatchesFilter(Rule): """Rule that checks against another filter""" - labels = [_('Filter Name')] + labels = [_('Filter name:')] def name(self): return 'Matches the filter named' diff --git a/gramps2/src/Makefile.am b/gramps2/src/Makefile.am index e2fb1346f..c927eba13 100644 --- a/gramps2/src/Makefile.am +++ b/gramps2/src/Makefile.am @@ -14,11 +14,103 @@ INTLLIBS= intl22.so # We only want optimized byte-compiled (.pyo) versions, no .pyc # In principle, this is handled by PYCFILES and PYOFILES, but # they don't seem to work so we edited the py-compile script instead -pkgpython_PYTHON = ${wildcard *.py} + +pkgpython_PYTHON = \ + AddMedia.py\ + AddrEdit.py\ + AddSpouse.py\ + ansel_utf8.py\ + AttrEdit.py\ + AutoComp.py\ + Bookmarks.py\ + Calendar.py\ + ChooseParents.py\ + const.py\ + DateEdit.py\ + Date.py\ + DbPrompter.py\ + DisplayTrace.py\ + DrawDoc.py\ + EditPerson.py\ + EditPlace.py\ + EditSource.py\ + Errors.py\ + EventEdit.py\ + FamilyView.py\ + Filter.py\ + Find.py\ + FontScale.py\ + FrenchRepublic.py\ + GedcomInfo.py\ + GenericFilter.py\ + GrampsCfg.py\ + gramps_main.py\ + GrampsParser.py\ + gramps.py\ + GrampsXML.py\ + GrampsZODB.py\ + GraphLayout.py\ + Gregorian.py\ + Hebrew.py\ + ImageSelect.py\ + ImgManip.py\ + intl.py\ + Julian.py\ + latin_ansel.py\ + latin_utf8.py\ + ListModel.py\ + LocEdit.py\ + Marriage.py\ + MediaView.py\ + MergeData.py\ + NameEdit.py\ + NoteEdit.py\ + PaperMenu.py\ + PedView.py\ + PlaceView.py\ + Plugins.py\ + QuestionDialog.py\ + QuickAdd.py\ + ReadXML.py\ + RelImage.py\ + RelLib.py\ + Report.py\ + SelectChild.py\ + sort.py\ + soundex.py\ + Sources.py\ + SourceView.py\ + SpreadSheetDoc.py\ + StartupDialog.py\ + StyleEditor.py\ + SubstKeywords.py\ + TarFile.py\ + TextDoc.py\ + UrlEdit.py\ + Utils.py\ + VersionControl.py\ + Witness.py\ + WriteXML.py # Use GNU make's ':=' syntax for nice wildcard use. # If not using GNU make, then list all files individually -GLADEFILES := ${wildcard *.glade} +GLADEFILES = \ + config.glade\ + dialog.glade\ + edit_person.glade\ + errdialogs.glade\ + gramps.glade\ + imagesel.glade\ + marriage.glade\ + mergedata.glade\ + places.glade\ + plugins.glade\ + preferences.glade\ + revision.glade\ + rule.glade\ + srcsel.glade\ + styles.glade + GRAPHICS = \ bad.png\ caution.png\ diff --git a/gramps2/src/Makefile.in b/gramps2/src/Makefile.in index 768716d6a..d50636905 100644 --- a/gramps2/src/Makefile.in +++ b/gramps2/src/Makefile.in @@ -119,16 +119,110 @@ LDFLAGS = @GNOMELIB@ @LDFLAGS@ -L@libdir@ @LIBS@ CLEANFILES = ${INTLLIBS} MOSTLYCLEANFILES = + # What are the PYTHON scripts for this package that need to be handled? # # We only want optimized byte-compiled (.pyo) versions, no .pyc # In principle, this is handled by PYCFILES and PYOFILES, but # they don't seem to work so we edited the py-compile script instead -pkgpython_PYTHON = ${wildcard *.py} +pkgpython_PYTHON = \ + AddMedia.py\ + AddrEdit.py\ + AddSpouse.py\ + ansel_utf8.py\ + AttrEdit.py\ + AutoComp.py\ + Bookmarks.py\ + Calendar.py\ + ChooseParents.py\ + const.py\ + DateEdit.py\ + Date.py\ + DbPrompter.py\ + DisplayTrace.py\ + DrawDoc.py\ + EditPerson.py\ + EditPlace.py\ + EditSource.py\ + Errors.py\ + EventEdit.py\ + FamilyView.py\ + Filter.py\ + Find.py\ + FontScale.py\ + FrenchRepublic.py\ + GedcomInfo.py\ + GenericFilter.py\ + GrampsCfg.py\ + gramps_main.py\ + GrampsParser.py\ + gramps.py\ + GrampsXML.py\ + GrampsZODB.py\ + GraphLayout.py\ + Gregorian.py\ + Hebrew.py\ + ImageSelect.py\ + ImgManip.py\ + intl.py\ + Julian.py\ + latin_ansel.py\ + latin_utf8.py\ + ListModel.py\ + LocEdit.py\ + Marriage.py\ + MediaView.py\ + MergeData.py\ + NameEdit.py\ + NoteEdit.py\ + PaperMenu.py\ + PedView.py\ + PlaceView.py\ + Plugins.py\ + QuestionDialog.py\ + QuickAdd.py\ + ReadXML.py\ + RelImage.py\ + RelLib.py\ + Report.py\ + SelectChild.py\ + sort.py\ + soundex.py\ + Sources.py\ + SourceView.py\ + SpreadSheetDoc.py\ + StartupDialog.py\ + StyleEditor.py\ + SubstKeywords.py\ + TarFile.py\ + TextDoc.py\ + UrlEdit.py\ + Utils.py\ + VersionControl.py\ + Witness.py\ + WriteXML.py + # Use GNU make's ':=' syntax for nice wildcard use. # If not using GNU make, then list all files individually -GLADEFILES := ${wildcard *.glade} +GLADEFILES = \ + config.glade\ + dialog.glade\ + edit_person.glade\ + errdialogs.glade\ + gramps.glade\ + imagesel.glade\ + marriage.glade\ + mergedata.glade\ + places.glade\ + plugins.glade\ + preferences.glade\ + revision.glade\ + rule.glade\ + srcsel.glade\ + styles.glade + + GRAPHICS = \ bad.png\ caution.png\ diff --git a/gramps2/src/MergeData.py b/gramps2/src/MergeData.py index c44f07ca8..4bac63692 100644 --- a/gramps2/src/MergeData.py +++ b/gramps2/src/MergeData.py @@ -60,6 +60,10 @@ class MergePeople: self.glade = gtk.glade.XML(const.mergeFile,"merge") self.top = self.glade.get_widget("merge") + + Utils.set_titles(self.top,self.glade.get_widget('title'), + _('Merge Places'), _('Select the title for the merged place')) + self.altname = self.glade.get_widget("altname") self.altbirth = self.glade.get_widget("altbirth") self.altdeath = self.glade.get_widget("altdeath") @@ -73,8 +77,11 @@ class MergePeople: fname = GrampsCfg.nameof(person1) mname = GrampsCfg.nameof(person2) - label_text = "Merge %s and %s" % (fname,mname) - self.glade.get_widget("progress").set_text(label_text) + + Utils.set_titles(self.top, self.glade.get_widget('title'), + _("Merge %s and %s") % (fname,mname), + _("Merge people")) + f1 = person1.getMainParents() f2 = person2.getMainParents() diff --git a/gramps2/src/Plugins.py b/gramps2/src/Plugins.py index 9b8dc80c8..ab01a852d 100644 --- a/gramps2/src/Plugins.py +++ b/gramps2/src/Plugins.py @@ -277,21 +277,25 @@ class PluginStatus: }) info = cStringIO.StringIO() - info.write(_("The following modules could not be loaded:")) - info.write("\n\n") - - for (file,msg) in _expect: - info.write("%s: %s\n\n" % (file,msg)) - for (file,msgs) in _failmsg: - error = str(msgs[0]) - if error[0:11] == "exceptions.": - error = error[11:] - info.write("%s: %s\n" % (file,error) ) - traceback.print_exception(msgs[0],msgs[1],msgs[2],None,info) - info.write('\n') - info.seek(0) - window.get_buffer().set_text(info.read()) + if len(_expect) + len(_failmsg) == 0: + window.get_buffer().set_text(_('All modules were successfully loaded.')) + else: + info.write(_("The following modules could not be loaded:")) + info.write("\n\n") + + for (file,msg) in _expect: + info.write("%s: %s\n\n" % (file,msg)) + + for (file,msgs) in _failmsg: + error = str(msgs[0]) + if error[0:11] == "exceptions.": + error = error[11:] + info.write("%s: %s\n" % (file,error) ) + traceback.print_exception(msgs[0],msgs[1],msgs[2],None,info) + info.write('\n') + info.seek(0) + window.get_buffer().set_text(info.read()) def close(self,obj): self.top.destroy() diff --git a/gramps2/src/StyleEditor.py b/gramps2/src/StyleEditor.py index b11dbad99..035f32c7d 100644 --- a/gramps2/src/StyleEditor.py +++ b/gramps2/src/StyleEditor.py @@ -63,10 +63,10 @@ class StyleListDisplay: self.sheetlist = stylesheetlist self.top = gtk.glade.XML(const.stylesFile,"styles") - title_label = self.top.get_widget('title') - title_label.set_text(Utils.title(_('Document Styles'))) - title_label.set_use_markup(gtk.TRUE) - + Utils.set_titles(self.top.get_widget('styles'), + self.top.get_widget('title'), + _('Document Styles')) + self.top.signal_autoconnect({ "destroy_passed_object" : Utils.destroy_passed_object, "on_ok_clicked" : self.on_ok_clicked, @@ -171,6 +171,9 @@ class StyleEditor: }) self.window = self.top.get_widget("editor") + + Utils.set_titles(self.window, self.top.get_widget('title'),_('Style editor')) + self.first = 1 titles = [(_('Paragraph'),0,130)] diff --git a/gramps2/src/VersionControl.py b/gramps2/src/VersionControl.py index 8bc73532e..8fc866535 100644 --- a/gramps2/src/VersionControl.py +++ b/gramps2/src/VersionControl.py @@ -74,13 +74,13 @@ class RevisionComment: self.filename = filename self.save = save_file self.top = gtk.glade.XML(const.revisionFile, "revcom") + self.win = self.top.get_widget("revcom") self.top.signal_autoconnect({ "on_savecomment_clicked" : self.on_savecomment_clicked, }) - Utils.set_title_label(self.top,_('Revision control comment')) + Utils.set_titles(self.win,self.top.get_widget('title'),_('Revision control comment')) self.text = self.top.get_widget("text") - self.win = self.top.get_widget("revcom") self.win.editable_enters(self.text) self.win.show() @@ -105,7 +105,9 @@ class RevisionSelect: "on_loadrev_clicked" : self.on_loadrev_clicked, }) - Utils.set_title_label(dialog,_('Select an older revision')) + Utils.set_titles(dialog.get_widget('revselect'), + dialog.get_widget('title'), + _('Select an older revision')) self.revlist = dialog.get_widget("revlist") l = self.vc.revision_list() diff --git a/gramps2/src/calendars/Makefile.am b/gramps2/src/calendars/Makefile.am index 7ece44b9f..fe871885a 100644 --- a/gramps2/src/calendars/Makefile.am +++ b/gramps2/src/calendars/Makefile.am @@ -1,7 +1,11 @@ # 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 + pkgpyexecdir = @pkgpyexecdir@/plugins pkgpythondir = @pkgpythondir@/plugins diff --git a/gramps2/src/config.glade b/gramps2/src/config.glade index 2b886a85c..9b8f87a15 100644 --- a/gramps2/src/config.glade +++ b/gramps2/src/config.glade @@ -46,7 +46,7 @@ Preferences dialog under the Settings menu. True - Researcher Information + Researcher information #53e00817c71b #53e00817e118 #d7a440c2e108 @@ -486,7 +486,7 @@ files, you may leave it blank. True - Numerical Date Formats + Numerical date formats #53e00817c71b #53e00817e118 #d7a440c2e108 @@ -634,7 +634,7 @@ numerical dates True - Alternate Calendar Support + Alternate calendar support #53e00817c71b #53e00817e118 #d7a440c2e108 @@ -731,7 +731,7 @@ more of these alternate calendars, enable alternate calendar support. True - LDS Extensions + LDS extensions #53e00817c71b #53e00817e118 #d7a440c2e108 @@ -790,7 +790,7 @@ change this option in the future in the Preferences dialog. 20 True True - Enable LDS Ordinance Support + Enable LDS ordinance support True GTK_RELIEF_NORMAL False diff --git a/gramps2/src/const.py b/gramps2/src/const.py index 83be7e94a..bd6e9ce8d 100644 --- a/gramps2/src/const.py +++ b/gramps2/src/const.py @@ -135,7 +135,7 @@ translators = u'Radek Malcic - Czech\n' \ # Constants # #------------------------------------------------------------------------- -picWidth = 200.0 +picWidth = 275.0 thumbScale = 96.0 xmlFile = "data.gramps" zodbFile = "gramps.zodb" diff --git a/gramps2/src/dialog.glade b/gramps2/src/dialog.glade index e69e2378e..5b8cededa 100644 --- a/gramps2/src/dialog.glade +++ b/gramps2/src/dialog.glade @@ -117,7 +117,7 @@ True - _Event Type: + _Event type: True False GTK_JUSTIFY_CENTER @@ -475,7 +475,7 @@ True True - _Private Record + _Private record True GTK_RELIEF_NORMAL False @@ -1052,7 +1052,7 @@ True True - _Private Record + _Private record True GTK_RELIEF_NORMAL False @@ -1605,7 +1605,7 @@ True - Church _Parish: + Church _parish: True False GTK_JUSTIFY_CENTER @@ -2031,7 +2031,7 @@ True True - _Private Record + _Private record True GTK_RELIEF_NORMAL False @@ -2875,7 +2875,7 @@ True - _Family Name: + _Family name: True False GTK_JUSTIFY_CENTER @@ -3008,7 +3008,7 @@ True - Family _Prefix: + Family _prefix: True False GTK_JUSTIFY_CENTER diff --git a/gramps2/src/docgen/Makefile.am b/gramps2/src/docgen/Makefile.am index df1dd8be2..677cac05c 100644 --- a/gramps2/src/docgen/Makefile.am +++ b/gramps2/src/docgen/Makefile.am @@ -1,6 +1,20 @@ # 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 + pkgpyexecdir = @pkgpyexecdir@/docgen pkgpythondir = @pkgpythondir@/docgen diff --git a/gramps2/src/edit_person.glade b/gramps2/src/edit_person.glade index 9fbb722be..82657f7cc 100644 --- a/gramps2/src/edit_person.glade +++ b/gramps2/src/edit_person.glade @@ -1261,7 +1261,7 @@ GTK_JUSTIFY_CENTER False False - 1 + 0 0.5 0 0 @@ -1279,7 +1279,7 @@ True - Prefix: + Family prefix: False False GTK_JUSTIFY_CENTER @@ -1327,7 +1327,7 @@ True - Last: + Family name: False False GTK_JUSTIFY_CENTER @@ -1351,7 +1351,7 @@ True - Given: + Given name: False False GTK_JUSTIFY_CENTER @@ -2949,7 +2949,7 @@ True - ZIP/Postal Code: + ZIP/Postal code: False False GTK_JUSTIFY_LEFT @@ -3631,7 +3631,7 @@ True - Web Address: + Web address: False False GTK_JUSTIFY_LEFT @@ -3726,7 +3726,7 @@ True - <b>Internet Addresses</b> + <b>Internet addresses</b> False True GTK_JUSTIFY_LEFT @@ -4071,7 +4071,7 @@ True - LDS _Temple: + LDS _temple: True False GTK_JUSTIFY_CENTER @@ -4279,7 +4279,7 @@ True - LDS Te_mple: + LDS te_mple: True False GTK_JUSTIFY_CENTER @@ -4547,7 +4547,7 @@ True - LD_S Temple: + LD_S temple: True False GTK_JUSTIFY_CENTER diff --git a/gramps2/src/errdialogs.glade b/gramps2/src/errdialogs.glade index 3f5b4ff99..e3dadacda 100644 --- a/gramps2/src/errdialogs.glade +++ b/gramps2/src/errdialogs.glade @@ -159,7 +159,7 @@ True True True - Close _without Saving + Close _without saving True GTK_RELIEF_NORMAL -9 diff --git a/gramps2/src/filters/Makefile.am b/gramps2/src/filters/Makefile.am index 45c96efef..8a0b0c1e6 100644 --- a/gramps2/src/filters/Makefile.am +++ b/gramps2/src/filters/Makefile.am @@ -1,6 +1,25 @@ # 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 + pkgpyexecdir = @pkgpyexecdir@/filters pkgpythondir = @pkgpythondir@/filters diff --git a/gramps2/src/gramps.glade b/gramps2/src/gramps.glade index e390c4965..c0d89ac0a 100644 --- a/gramps2/src/gramps.glade +++ b/gramps2/src/gramps.glade @@ -129,7 +129,7 @@ True - Reload Plugins + Reload plugins True @@ -265,7 +265,7 @@ True - _Add Bookmark + _Add bookmark True @@ -287,7 +287,7 @@ True - _Edit Bookmarks + _Edit bookmarks True @@ -315,7 +315,7 @@ True - Go to Bookmark + Go to bookmark True @@ -394,7 +394,7 @@ True - _User's Manual + _User's manual True @@ -415,7 +415,7 @@ True - _Writing Extensions + _Writing extensions True @@ -436,7 +436,7 @@ True - GRAMPS _Home Page + GRAMPS _home page True @@ -457,7 +457,7 @@ True - GRAMPS _Mailing Lists + GRAMPS _mailing lists True @@ -487,7 +487,7 @@ True - _Show Plugin Status + _Show plugin status True @@ -533,7 +533,7 @@ True - Open File + Open file Open True gtk-open @@ -544,7 +544,7 @@ True - Save File + Save file Save True gtk-save @@ -1597,7 +1597,7 @@ True - <b>Active Person</b> + <b>Active person</b> False True GTK_JUSTIFY_LEFT @@ -1621,7 +1621,7 @@ True - <b>Active Person's Parents</b> + <b>Active person's Parents</b> False True GTK_JUSTIFY_LEFT @@ -1669,7 +1669,7 @@ True - <b>Spouse's Parents</b> + <b>Spouse's parents</b> False True GTK_JUSTIFY_LEFT @@ -2524,7 +2524,7 @@ 10 True - Select File - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py index 043b0b20f..253eeb3ae 100755 --- a/gramps2/src/gramps_main.py +++ b/gramps2/src/gramps_main.py @@ -1036,6 +1036,7 @@ class Gramps: }) fileSelector = wFs.get_widget("fileselection") + fileSelector.set_title('%s - GRAMPS' % _('Save database')) fileSelector.show() def on_save_activate(self,obj): diff --git a/gramps2/src/marriage.glade b/gramps2/src/marriage.glade index bb421d12b..ceb211a70 100644 --- a/gramps2/src/marriage.glade +++ b/gramps2/src/marriage.glade @@ -124,7 +124,7 @@ True - _Relationship Type: + _Relationship type: True False GTK_JUSTIFY_CENTER @@ -946,7 +946,7 @@ True - <b>Primary Source</b> + <b>Primary source</b> False True GTK_JUSTIFY_CENTER diff --git a/gramps2/src/mergedata.glade b/gramps2/src/mergedata.glade index 276d1fdb0..c0a639b05 100644 --- a/gramps2/src/mergedata.glade +++ b/gramps2/src/mergedata.glade @@ -5,14 +5,14 @@ True - Merge Places - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True True False gramps.png - True + False @@ -37,6 +37,7 @@ + True @@ -49,7 +50,6 @@ - 0 @@ -66,9 +66,9 @@ 0 - + True - Select the title for the merged place + False False GTK_JUSTIFY_CENTER @@ -80,23 +80,12 @@ 0 - 0 + 6 False False - - - True - - - 10 - False - True - - - True @@ -265,14 +254,15 @@ True - Merge People - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True + 650 True False gramps.png - True + False @@ -290,7 +280,7 @@ True True True - Merge and Close + _Merge and close True GTK_RELIEF_NORMAL 0 @@ -303,7 +293,7 @@ True True True - Merge and Edit + Merge and _edit True GTK_RELIEF_NORMAL 0 @@ -339,9 +329,9 @@ 0 - + True - Merge People + False False GTK_JUSTIFY_CENTER @@ -373,13 +363,83 @@ GTK_SHADOW_ETCHED_IN - + + 12 True 14 - 3 + 4 False - 0 - 2 + 6 + 12 + + + + True + <b>General</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 4 + 0 + 1 + fill + + + + + + + True + Name: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 1 + 2 + fill + + + + + + + True + True + False + True + 0 + + True + * + False + + + 2 + 3 + 1 + 2 + + + @@ -393,500 +453,32 @@ True - 2 - 3 - 0 - 1 - shrink - - - - - - - True - Birth date - False - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 5 - 0 - - - 0 - 1 - 4 - 5 + 3 + 4 + 1 + 2 fill - - - True - Death Date - False - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 5 - 0 - - - 0 - 1 - 7 - 8 - fill - - - - - - - True - Mother - False - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 5 - 0 - - - 0 - 1 - 11 - 12 - fill - - - - - - - True - Name - False - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 5 - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - Birth Place - False - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 5 - 0 - - - 0 - 1 - 5 - 6 - fill - - - - - - - True - Death Place - False - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 5 - 0 - - - 0 - 1 - 8 - 9 - fill - - - - - - - True - True - False - True - 0 - - True - * - False - - - 1 - 2 - 4 - 5 - - - - - - - True - True - False - True - 0 - - True - * - False - - - 1 - 2 - 5 - 6 - - - - - - - True - True - False - True - 0 - - True - * - False - - - 1 - 2 - 7 - 8 - - - - - - - True - True - False - True - 0 - - True - * - False - - - 1 - 2 - 8 - 9 - - - - - - - True - True - False - True - 0 - - True - * - False - - - 1 - 2 - 10 - 11 - - - - - - - True - True - False - True - 0 - - True - * - False - - - 1 - 2 - 11 - 12 - - - - - - - True - Father - False - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 5 - 0 - - - 0 - 1 - 10 - 11 - fill - - - - - - - True - - - 0 - 3 - 9 - 10 - 5 - fill - fill - - - - - - True - - - 0 - 3 - 12 - 13 - 5 - fill - fill - - - - - - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - - - - - 1 - 3 - 13 - 14 - fill - fill - - - - - - True - Spouses - False - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0 - 5 - 0 - - - 0 - 1 - 13 - 14 - fill - - - - - - True - - - 0 - 3 - 6 - 7 - fill - - - - - - True - - - 0 - 3 - 3 - 4 - fill - - - - - - True - True - - True - GTK_RELIEF_NORMAL - False - False - True - bname1 - - - 2 - 3 - 10 - 12 - shrink - - - - - - - True - True - - True - GTK_RELIEF_NORMAL - True - False - True - bname1 - - - 2 - 3 - 7 - 9 - shrink - shrink - - - - - - True - True - - True - GTK_RELIEF_NORMAL - False - False - True - bname1 - - - 2 - 3 - 4 - 6 - shrink - shrink - - - True - ID + ID: False False GTK_JUSTIFY_CENTER False False - 1 + 0 0.5 - 5 + 0 0 - 0 - 1 + 1 + 2 2 3 fill @@ -907,35 +499,14 @@ False - 1 - 2 + 2 + 3 2 3 - - - True - True - False - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - - - - True @@ -949,8 +520,8 @@ bname1 - 2 - 3 + 3 + 4 2 3 fill @@ -959,15 +530,462 @@ - + True + Place: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 5 + 6 + fill + + + + + + + True + Date: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 4 + 5 + fill + + + + + + + True + True + False + True + 0 + + True + * + False + + + 2 + 3 + 4 + 5 + + + + + + + True + <b>Birth</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 0 - 3 - 1 - 2 + 4 + 3 + 4 fill + + + + + + + True + True + + True + GTK_RELIEF_NORMAL + False + False + True + bname1 + + + 3 + 4 + 4 + 6 + fill + + + + + + + True + True + False + True + 0 + + True + * + False + + + 2 + 3 + 5 + 6 + + + + + + + True + <b>Death</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 4 + 6 + 7 + fill + + + + + + + True + Date: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 7 + 8 + fill + + + + + + + True + Place: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 8 + 9 + fill + + + + + + + True + True + False + True + 0 + + True + * + False + + + 2 + 3 + 7 + 8 + + + + + + + True + True + False + True + 0 + + True + * + False + + + 2 + 3 + 8 + 9 + + + + + + + True + True + + True + GTK_RELIEF_NORMAL + True + False + True + bname1 + + + 3 + 4 + 7 + 9 + fill + + + + + + + True + <b>Parents</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 4 + 9 + 10 + fill + + + + + + + True + Mother: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 11 + 12 + fill + + + + + + + True + True + False + True + 0 + + True + * + False + + + 2 + 3 + 10 + 11 + + + + + + + True + True + False + True + 0 + + True + * + False + + + 2 + 3 + 11 + 12 + + + + + + + True + True + + True + GTK_RELIEF_NORMAL + False + False + True + bname1 + + + 3 + 4 + 10 + 12 + fill + + + + + + + True + <b>Spouses</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 4 + 12 + 13 + fill + + + + + + + True + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + False + False + True + + + + + 1 + 4 + 13 + 14 + fill + + + + + + True + Father: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 10 + 11 + fill + @@ -976,9 +994,9 @@ True - First Person + <b>First person</b> False - False + True GTK_JUSTIFY_LEFT False False @@ -1007,103 +1025,80 @@ GTK_SHADOW_ETCHED_IN - + + 12 True 14 - 3 + 4 False - 0 - 2 + 6 + 12 - + True - Death Date + Name: False False GTK_JUSTIFY_CENTER False False - 1 + 0 0.5 - 5 + 0 0 - 0 - 1 - 7 - 8 + 1 + 2 + 1 + 2 fill - + True - Mother + ID: False False GTK_JUSTIFY_CENTER False False - 1 + 0 0.5 - 5 + 0 0 - 0 - 1 - 11 - 12 + 1 + 2 + 2 + 3 fill - + True - Birth Place + Date: False False GTK_JUSTIFY_CENTER False False - 1 + 0 0.5 - 5 + 0 0 - 0 - 1 - 5 - 6 - fill - - - - - - - True - Birth date - False - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 5 - 0 - - - 0 - 1 + 1 + 2 4 5 fill @@ -1112,24 +1107,240 @@ - + True - Death Place + Place: False False GTK_JUSTIFY_CENTER False False - 1 + 0 0.5 - 5 + 0 + 0 + + + 1 + 2 + 5 + 6 + fill + + + + + + + True + Date: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 7 + 8 + fill + + + + + + + True + Place: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 8 + 9 + fill + + + + + + + True + Father: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 10 + 11 + fill + + + + + + + True + Mother: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 11 + 12 + fill + + + + + + + True + <b>General</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 0 0 - 1 - 8 - 9 + 4 + 0 + 1 + fill + + + + + + + True + <b>Birth</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 4 + 3 + 4 + fill + + + + + + + True + <b>Death</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 4 + 6 + 7 + fill + + + + + + + True + <b>Parents</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 4 + 9 + 10 + fill + + + + + + + True + <b>Spouses</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 4 + 12 + 13 fill @@ -1148,10 +1359,74 @@ False - 1 - 2 - 0 - 1 + 2 + 3 + 1 + 2 + + + + + + + True + True + + True + GTK_RELIEF_NORMAL + False + False + True + + + 3 + 4 + 1 + 2 + fill + + + + + + + True + True + False + True + 0 + + True + * + False + + + 2 + 3 + 2 + 3 + + + + + + + True + True + + True + GTK_RELIEF_NORMAL + False + False + True + radiobutton2 + + + 3 + 4 + 2 + 3 + fill @@ -1169,8 +1444,8 @@ False - 1 - 2 + 2 + 3 4 5 @@ -1190,14 +1465,36 @@ False - 1 - 2 + 2 + 3 5 6 + + + True + True + + True + GTK_RELIEF_NORMAL + False + False + True + radiobutton2 + + + 3 + 4 + 4 + 6 + fill + + + + True @@ -1211,8 +1508,8 @@ False - 1 - 2 + 2 + 3 7 8 @@ -1232,14 +1529,36 @@ False - 1 - 2 + 2 + 3 8 9 + + + True + True + + True + GTK_RELIEF_NORMAL + False + False + True + radiobutton2 + + + 3 + 4 + 7 + 9 + fill + + + + True @@ -1253,8 +1572,8 @@ False - 1 - 2 + 2 + 3 10 11 @@ -1274,190 +1593,14 @@ False - 1 - 2 + 2 + 3 11 12 - - - True - Spouses - False - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0 - 5 - 0 - - - 0 - 1 - 13 - 14 - fill - - - - - - True - Father - False - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 5 - 0 - - - 0 - 1 - 10 - 11 - fill - - - - - - - True - - - 0 - 3 - 9 - 10 - 5 - fill - fill - - - - - - True - - - 0 - 3 - 12 - 13 - 5 - fill - fill - - - - - - True - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - - - - - 1 - 3 - 13 - 14 - fill - fill - - - - - - True - - - 0 - 3 - 3 - 4 - fill - - - - - - True - - - 0 - 3 - 6 - 7 - fill - - - - - - True - True - - True - GTK_RELIEF_NORMAL - False - False - True - bname1 - - - 2 - 3 - 4 - 6 - shrink - - - - - - - True - True - - True - GTK_RELIEF_NORMAL - False - False - True - bname1 - - - 2 - 3 - 7 - 9 - shrink - - - - True @@ -1468,140 +1611,43 @@ False False True - bname1 + radiobutton2 - 2 - 3 + 3 + 4 10 12 - shrink - - - - - - - True - Name - False - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 5 - 0 - - - 0 - 1 - 0 - 1 fill - - True - ID - False - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 5 - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - + True True - False - True - 0 - - True - * - False + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + False + False + True + + 1 - 2 - 2 - 3 - - - - - - - True - True - - True - GTK_RELIEF_NORMAL - False - False - True - bname1 - - - 2 - 3 - 0 - 1 - shrink - - - - - - - True - True - - True - GTK_RELIEF_NORMAL - False - False - True - bname1 - - - 2 - 3 - 2 - 3 - fill - - - - - - - True - - - 0 - 3 - 1 - 2 + 4 + 13 + 14 fill @@ -1611,9 +1657,9 @@ True - Second Person + <b>Second person</b> False - False + True GTK_JUSTIFY_LEFT False False diff --git a/gramps2/src/places.glade b/gramps2/src/places.glade index cbf0c37a3..1c46b2e96 100644 --- a/gramps2/src/places.glade +++ b/gramps2/src/places.glade @@ -1462,7 +1462,7 @@ True - <b>Internet Addresses</b> + <b>Internet addresses</b> False True GTK_JUSTIFY_LEFT diff --git a/gramps2/src/plugins.glade b/gramps2/src/plugins.glade index fad0200f3..5b94f211c 100644 --- a/gramps2/src/plugins.glade +++ b/gramps2/src/plugins.glade @@ -370,7 +370,7 @@ True - Plugin Status - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -426,10 +426,10 @@ True True - True + False GTK_JUSTIFY_LEFT GTK_WRAP_NONE - True + False 0 0 0 diff --git a/gramps2/src/plugins/FilterEditor.py b/gramps2/src/plugins/FilterEditor.py index 3aabcef52..2c3d4c412 100644 --- a/gramps2/src/plugins/FilterEditor.py +++ b/gramps2/src/plugins/FilterEditor.py @@ -31,6 +31,7 @@ import const import GenericFilter import AutoComp import ListModel +import Utils from intl import gettext as _ _name2list = { @@ -54,6 +55,9 @@ class FilterEditor: self.delete = self.editor.get_widget('delete') self.test = self.editor.get_widget('test') + Utils.set_titles(self.editor_top,self.editor.get_widget('title'), + _('User defined filters')) + self.editor.signal_autoconnect({ 'on_add_clicked' : self.add_new_filter, 'on_edit_clicked' : self.edit_filter, @@ -104,7 +108,7 @@ class FilterEditor: store,iter = self.clist.get_selected() if iter: filt = self.clist.get_object(iter) - list = filt.apply(self.db.getPersonMap().values()) + list = filt.apply(self.db,self.db.getPersonMap().values()) ShowResults(list) def delete_filter(self,obj): @@ -118,6 +122,9 @@ class FilterEditor: self.filter = filter self.glade = gtk.glade.XML(const.filterFile,'define_filter') self.top = self.glade.get_widget('define_filter') + + Utils.set_titles(self.top,self.glade.get_widget('title'),_('Define filter')) + self.rule_list = self.glade.get_widget('rule_list') self.rlist = ListModel.ListModel(self.rule_list, [(_('Name'),-1,150),(_('Value'),-1,150)], @@ -220,6 +227,9 @@ class FilterEditor: self.frame = self.rule.get_widget('values') self.rname = self.rule.get_widget('rule_name') + Utils.set_titles(self.rule_top, self.rule.get_widget('title'), + _('Add rule')) + self.notebook = gtk.Notebook() self.notebook.set_show_tabs(0) self.notebook.set_show_border(0) @@ -303,8 +313,7 @@ class FilterEditor: self.draw_rules() def rule_changed(self,obj): - name = obj.get_text() - page = self.name2page[name] + page = self.name2page[obj.get_text()] self.notebook.set_current_page(page) def rule_ok(self,obj): @@ -330,6 +339,7 @@ class ShowResults: def __init__(self,plist): self.glade = gtk.glade.XML(const.filterFile,'test') self.top = self.glade.get_widget('test') + self.top.set_title('%s - GRAMPS' % _('Test Filter')) text = self.glade.get_widget('text') self.glade.signal_autoconnect({ 'on_close_clicked' : self.close, diff --git a/gramps2/src/plugins/Makefile.am b/gramps2/src/plugins/Makefile.am index eea043eb4..7836b671e 100644 --- a/gramps2/src/plugins/Makefile.am +++ b/gramps2/src/plugins/Makefile.am @@ -1,11 +1,57 @@ # 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\ + FullFamily.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 + pkgpyexecdir = @pkgpyexecdir@/plugins pkgpythondir = @pkgpythondir@/plugins -GLADEFILES := ${wildcard *.glade} +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 pkgdatadir = ${datadir}/@PACKAGE@/plugins diff --git a/gramps2/src/po/template.po b/gramps2/src/po/template.po index 38551366a..02e815f50 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: Wed Mar 5 22:46:04 2003\n" +"POT-Creation-Date: Thu Mar 6 19:16:10 2003\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,25 +24,22 @@ msgid "The filename supplied could not be found." msgstr "" #: AddSpouse.py:85 ChooseParents.py:55 EditPerson.py:206 FamilyView.py:146 -#: SelectChild.py:105 gramps_main.py:91 mergedata.glade:480 -#: mergedata.glade:1486 plugins/FilterEditor.py:123 +#: 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 -#: plugins/soundex.glade:108 rule.glade:115 +#: plugins/soundex.glade:108 msgid "Name" msgstr "" -#: AddSpouse.py:85 ChooseParents.py:55 FamilyView.py:146 GenericFilter.py:133 -#: GenericFilter.py:166 GenericFilter.py:193 GenericFilter.py:229 -#: GenericFilter.py:256 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 mergedata.glade:876 mergedata.glade:1510 +#: AddSpouse.py:85 ChooseParents.py:55 FamilyView.py:146 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 -#: gramps_main.py:92 mergedata.glade:408 mergedata.glade:1093 +#: gramps_main.py:92 msgid "Birth date" msgstr "" @@ -50,12 +47,16 @@ msgstr "" msgid "Choose Spouse/Partner of %s" msgstr "" -#: AddSpouse.py:108 const.py:431 const.py:439 plugins/FamilyGroup.py:299 +#: AddSpouse.py:100 +msgid "Choose Spouse/Partner" +msgstr "" + +#: AddSpouse.py:109 const.py:431 const.py:439 plugins/FamilyGroup.py:299 #: plugins/FamilyGroup.py:301 msgid "Married" msgstr "" -#: AddSpouse.py:204 const.py:433 const.py:441 +#: AddSpouse.py:205 const.py:433 const.py:441 msgid "Partners" msgstr "" @@ -221,18 +222,16 @@ msgid "Parent" msgstr "" #: ChooseParents.py:194 ChooseParents.py:399 FamilyView.py:377 -#: mergedata.glade:456 mergedata.glade:1045 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 +#: 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 -#: mergedata.glade:678 mergedata.glade:1311 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 +#: 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 msgid "Father" msgstr "" @@ -256,12 +255,16 @@ msgstr "" msgid "from %(start_date)s to %(stop_date)s" msgstr "" -#: DbPrompter.py:65 DbPrompter.py:116 gramps_main.py:987 revision.glade:131 +#: DbPrompter.py:65 DbPrompter.py:117 gramps_main.py:987 revision.glade:131 msgid "Open a database" msgstr "" -#: DbPrompter.py:105 gramps_main.py:774 gramps_main.py:1050 -#: gramps_main.py:1062 +#: DbPrompter.py:97 gramps_main.py:1039 +msgid "Save database" +msgstr "" + +#: DbPrompter.py:106 gramps_main.py:774 gramps_main.py:1051 +#: gramps_main.py:1063 msgid "No Comment Provided" msgstr "" @@ -282,8 +285,7 @@ msgstr "" msgid "Edit Person" msgstr "" -#: EditPerson.py:186 EditPerson.py:212 EditPlace.py:103 GenericFilter.py:310 -#: GenericFilter.py:348 GenericFilter.py:437 GenericFilter.py:469 const.py:353 +#: EditPerson.py:186 EditPerson.py:212 EditPlace.py:103 const.py:353 #: plugins/pafexport.glade:217 msgid "Description" msgstr "" @@ -292,22 +294,19 @@ msgstr "" msgid "Event" msgstr "" -#: EditPerson.py:187 EditPerson.py:200 GenericFilter.py:310 -#: GenericFilter.py:348 GenericFilter.py:437 GenericFilter.py:469 -#: Marriage.py:142 filters/After.py:55 filters/Before.py:55 +#: EditPerson.py:187 EditPerson.py:200 Marriage.py:142 filters/After.py:55 +#: filters/Before.py:55 msgid "Date" msgstr "" -#: EditPerson.py:187 GenericFilter.py:310 GenericFilter.py:348 -#: GenericFilter.py:437 GenericFilter.py:469 ImageSelect.py:845 -#: Marriage.py:142 filters/EventPlace.py:69 marriage.glade:362 +#: EditPerson.py:187 ImageSelect.py:845 Marriage.py:142 +#: filters/EventPlace.py:69 marriage.glade:362 msgid "Place" msgstr "" -#: EditPerson.py:194 EditSource.py:159 GenericFilter.py:501 -#: GenericFilter.py:522 ImageSelect.py:618 ImageSelect.py:741 +#: EditPerson.py:194 EditSource.py:159 ImageSelect.py:618 ImageSelect.py:741 #: ImageSelect.py:824 Marriage.py:143 marriage.glade:853 -#: plugins/FilterEditor.py:123 +#: plugins/FilterEditor.py:130 msgid "Value" msgstr "" @@ -351,23 +350,23 @@ msgstr "" msgid "If you close without saving, the changes you have made will be lost" msgstr "" -#: EditPerson.py:1154 +#: EditPerson.py:1153 msgid "Make the selected name the preferred name" msgstr "" -#: EditPerson.py:1217 Marriage.py:430 +#: EditPerson.py:1216 Marriage.py:430 msgid "GRAMPS ID value was not changed." msgstr "" -#: EditPerson.py:1218 +#: EditPerson.py:1217 msgid "You have attempted to change the GRAMPS ID to a value of %(grampsid)s. This value is already used by %(person)s." msgstr "" -#: EditPerson.py:1332 +#: EditPerson.py:1331 msgid "Problem changing the gender" msgstr "" -#: EditPerson.py:1333 +#: EditPerson.py:1332 msgid "" "Changing the gender caused problems with marriage information.\n" "Please check the person's marriages." @@ -495,11 +494,11 @@ msgstr "" msgid "%s: unknown" msgstr "" -#: FamilyView.py:432 Plugins.py:409 Plugins.py:410 Plugins.py:411 -#: Plugins.py:423 Plugins.py:424 Plugins.py:425 Witness.py:71 const.py:159 +#: FamilyView.py:432 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:1224 plugins/WebPage.py:288 +#: gramps_main.py:1225 plugins/WebPage.py:288 msgid "Unknown" msgstr "" @@ -531,7 +530,7 @@ msgstr "" msgid "Qualifier" msgstr "" -#: Filter.py:82 VersionControl.py:274 +#: Filter.py:82 VersionControl.py:276 msgid "No description" msgstr "" @@ -559,53 +558,85 @@ msgstr "" msgid "French Republican" msgstr "" -#: GenericFilter.py:310 plugins/FilterEditor.py:37 -msgid "Personal Event" +#: GenericFilter.py:133 GenericFilter.py:166 GenericFilter.py:193 +#: GenericFilter.py:229 GenericFilter.py:256 gramps.glade:2287 +#: imagesel.glade:529 imagesel.glade:1275 mergedata.glade:468 +#: mergedata.glade:1064 +msgid "ID:" msgstr "" -#: GenericFilter.py:348 plugins/FilterEditor.py:38 -msgid "Family Event" +#: GenericFilter.py:310 +msgid "Personal event:" +msgstr "" + +#: GenericFilter.py:310 GenericFilter.py:348 GenericFilter.py:437 +#: GenericFilter.py:469 edit_person.glade:1870 edit_person.glade:3658 +#: marriage.glade:410 places.glade:1394 +msgid "Description:" +msgstr "" + +#: GenericFilter.py:310 GenericFilter.py:348 GenericFilter.py:437 +#: GenericFilter.py:469 edit_person.glade:1918 marriage.glade:1499 +#: mergedata.glade:535 mergedata.glade:719 mergedata.glade:1112 +#: mergedata.glade:1160 +msgid "Place:" +msgstr "" + +#: GenericFilter.py:310 GenericFilter.py:348 GenericFilter.py:437 +#: GenericFilter.py:469 edit_person.glade:1966 edit_person.glade:2832 +#: marriage.glade:314 marriage.glade:1451 mergedata.glade:559 +#: mergedata.glade:695 mergedata.glade:1088 mergedata.glade:1136 +msgid "Date:" +msgstr "" + +#: GenericFilter.py:348 +msgid "Family event:" msgstr "" #: GenericFilter.py:387 -msgid "Number of Relationships" +msgid "Number of relationships:" msgstr "" -#: GenericFilter.py:388 plugins/FilterEditor.py:41 -msgid "Relationship Type" +#: GenericFilter.py:388 +msgid "Relationship type:" msgstr "" -#: GenericFilter.py:389 const.py:395 -msgid "Number of Children" +#: GenericFilter.py:389 +msgid "Number of children:" msgstr "" -#: GenericFilter.py:501 plugins/FilterEditor.py:39 -msgid "Personal Attribute" +#: GenericFilter.py:501 +msgid "Personal attribute:" msgstr "" -#: GenericFilter.py:522 plugins/FilterEditor.py:40 -msgid "Family Attribute" +#: GenericFilter.py:501 GenericFilter.py:522 edit_person.glade:2450 +#: imagesel.glade:836 imagesel.glade:1595 +msgid "Value:" msgstr "" -#: GenericFilter.py:547 -msgid "Given Name" +#: GenericFilter.py:522 +msgid "Family attribute:" msgstr "" -#: GenericFilter.py:547 -msgid "Suffix" +#: GenericFilter.py:547 edit_person.glade:1306 +msgid "Suffix:" msgstr "" -#: GenericFilter.py:547 MediaView.py:59 SourceView.py:54 Sources.py:75 -#: Sources.py:145 plugins/TimeLine.py:341 -msgid "Title" +#: GenericFilter.py:547 edit_person.glade:1330 +msgid "Family name:" msgstr "" -#: GenericFilter.py:547 filters/MatchSndEx.py:44 -msgid "Surname" +#: GenericFilter.py:547 edit_person.glade:1354 +msgid "Given name:" +msgstr "" + +#: GenericFilter.py:547 edit_person.glade:1378 gramps.glade:2381 +#: imagesel.glade:695 +msgid "Title:" msgstr "" #: GenericFilter.py:575 -msgid "Filter Name" +msgid "Filter name:" msgstr "" #: GenericFilter.py:716 @@ -812,7 +843,7 @@ msgstr "" msgid "Report Preferences" msgstr "" -#: GrampsCfg.py:107 config.glade:49 +#: GrampsCfg.py:107 msgid "Researcher Information" msgstr "" @@ -910,6 +941,11 @@ msgstr "" msgid "The GRAMPS ID that you chose for this relationship is already being used." msgstr "" +#: MediaView.py:59 SourceView.py:54 Sources.py:75 Sources.py:145 +#: plugins/TimeLine.py:341 +msgid "Title" +msgstr "" + #: MediaView.py:148 msgid "The file no longer exists" msgstr "" @@ -926,6 +962,22 @@ msgstr "" msgid "This media object is currently being used. If you delete this object, it will be removed from the database and from all records that reference it." msgstr "" +#: MergeData.py:65 +msgid "Merge Places" +msgstr "" + +#: MergeData.py:65 +msgid "Select the title for the merged place" +msgstr "" + +#: MergeData.py:82 +msgid "Merge %s and %s" +msgstr "" + +#: MergeData.py:83 +msgid "Merge people" +msgstr "" + #: NameEdit.py:78 msgid "Alternate Name Editor for %s" msgstr "" @@ -998,11 +1050,15 @@ msgstr "" msgid "Plugin status" msgstr "" -#: Plugins.py:280 +#: Plugins.py:282 +msgid "All modules were successfully loaded." +msgstr "" + +#: Plugins.py:284 msgid "The following modules could not be loaded:" msgstr "" -#: Plugins.py:406 Plugins.py:420 +#: Plugins.py:410 Plugins.py:424 msgid "Uncategorized" msgstr "" @@ -1295,7 +1351,7 @@ msgstr "" msgid "Report Options" msgstr "" -#: Report.py:766 gramps.glade:245 gramps.glade:976 plugins/FilterEditor.py:66 +#: Report.py:766 gramps.glade:245 gramps.glade:976 plugins/FilterEditor.py:70 #: plugins/eventcmp.glade:522 plugins/gedcomexport.glade:157 #: plugins/pafexport.glade:127 msgid "Filter" @@ -1352,7 +1408,7 @@ msgstr "" msgid "Source Information" msgstr "" -#: StyleEditor.py:67 +#: StyleEditor.py:68 msgid "Document Styles" msgstr "" @@ -1360,7 +1416,11 @@ msgstr "" msgid "Error saving stylesheet" msgstr "" -#: StyleEditor.py:176 +#: StyleEditor.py:175 +msgid "Style editor" +msgstr "" + +#: StyleEditor.py:179 msgid "Paragraph" msgstr "" @@ -1376,15 +1436,15 @@ msgstr "" msgid "default" msgstr "" -#: VersionControl.py:81 +#: VersionControl.py:82 msgid "Revision control comment" msgstr "" -#: VersionControl.py:108 +#: VersionControl.py:110 msgid "Select an older revision" msgstr "" -#: VersionControl.py:266 preferences.glade:590 +#: VersionControl.py:268 preferences.glade:590 msgid "RCS" msgstr "" @@ -1431,6 +1491,10 @@ msgid "" "Preferences dialog under the Settings menu." msgstr "" +#: config.glade:49 +msgid "Researcher information" +msgstr "" + #: config.glade:73 msgid "" "In order to create valid GEDCOM files, the following information\n" @@ -1440,7 +1504,8 @@ msgstr "" #: config.glade:103 edit_person.glade:1234 edit_person.glade:2014 #: edit_person.glade:2498 edit_person.glade:2904 gramps.glade:5558 -#: gramps.glade:5826 marriage.glade:434 marriage.glade:901 +#: gramps.glade:5826 marriage.glade:434 marriage.glade:901 mergedata.glade:402 +#: mergedata.glade:1040 rule.glade:525 msgid "Name:" msgstr "" @@ -1464,7 +1529,7 @@ msgstr "" msgid "Email:" msgstr "" -#: config.glade:247 +#: config.glade:247 edit_person.glade:2952 msgid "ZIP/Postal code:" msgstr "" @@ -1473,7 +1538,7 @@ msgid "Phone:" msgstr "" #: config.glade:489 -msgid "Numerical Date Formats" +msgid "Numerical date formats" msgstr "" #: config.glade:514 @@ -1497,7 +1562,7 @@ msgid "YYYY-MM-DD (ISO)" msgstr "" #: config.glade:637 -msgid "Alternate Calendar Support" +msgid "Alternate calendar support" msgstr "" #: config.glade:662 @@ -1513,7 +1578,7 @@ msgid "Enable support for alternate calendars" msgstr "" #: config.glade:734 -msgid "LDS Extensions" +msgid "LDS extensions" msgstr "" #: config.glade:760 @@ -1526,7 +1591,7 @@ msgid "" msgstr "" #: config.glade:793 -msgid "Enable LDS Ordinance Support" +msgid "Enable LDS ordinance support" msgstr "" #: config.glade:833 @@ -1576,7 +1641,7 @@ msgid "Foster" msgstr "" #: const.py:160 const.py:435 const.py:443 gramps.glade:1170 -#: mergedata.glade:229 +#: mergedata.glade:218 msgid "Other" msgstr "" @@ -1780,6 +1845,10 @@ msgstr "" msgid "Social Security Number" msgstr "" +#: const.py:395 +msgid "Number of Children" +msgstr "" + #: const.py:431 msgid "A legal or common-law relationship between a husband and wife" msgstr "" @@ -1833,7 +1902,7 @@ msgid "Accept changes and close window" msgstr "" #: dialog.glade:120 -msgid "_Event Type:" +msgid "_Event type:" msgstr "" #: dialog.glade:148 dialog.glade:1866 edit_person.glade:305 @@ -1861,13 +1930,15 @@ msgstr "" msgid "French" msgstr "" -#: dialog.glade:478 dialog.glade:1055 dialog.glade:2034 -msgid "_Private Record" +#: dialog.glade:478 dialog.glade:1055 dialog.glade:2034 dialog.glade:2654 +#: imagesel.glade:578 +msgid "_Private record" msgstr "" #: dialog.glade:504 dialog.glade:1164 dialog.glade:2258 dialog.glade:3296 #: edit_person.glade:1193 gramps.glade:4675 imagesel.glade:1560 -#: marriage.glade:279 places.glade:513 places.glade:543 +#: marriage.glade:279 mergedata.glade:378 mergedata.glade:1232 +#: places.glade:513 places.glade:543 msgid "General" msgstr "" @@ -1877,8 +1948,8 @@ msgstr "" #: edit_person.glade:3803 gramps.glade:2687 gramps.glade:3097 #: gramps.glade:3907 gramps.glade:4796 imagesel.glade:981 imagesel.glade:1763 #: marriage.glade:746 marriage.glade:1140 marriage.glade:1327 places.glade:899 -#: places.glade:1100 places.glade:1251 places.glade:1537 srcsel.glade:810 -#: styles.glade:138 +#: places.glade:1100 places.glade:1251 places.glade:1537 rule.glade:340 +#: rule.glade:804 srcsel.glade:810 styles.glade:138 msgid "_Add..." msgstr "" @@ -1888,7 +1959,8 @@ msgstr "" #: edit_person.glade:3820 gramps.glade:4812 imagesel.glade:997 #: imagesel.glade:1779 marriage.glade:762 marriage.glade:1156 #: marriage.glade:1343 places.glade:915 places.glade:1115 places.glade:1267 -#: places.glade:1553 srcsel.glade:826 styles.glade:150 +#: places.glade:1553 rule.glade:358 rule.glade:823 srcsel.glade:826 +#: styles.glade:150 msgid "_Edit..." msgstr "" @@ -1897,8 +1969,8 @@ msgstr "" #: edit_person.glade:2727 edit_person.glade:3357 edit_person.glade:3910 #: gramps.glade:4832 imagesel.glade:1015 imagesel.glade:1797 #: marriage.glade:779 marriage.glade:1173 marriage.glade:1360 places.glade:931 -#: places.glade:1131 places.glade:1283 places.glade:1639 srcsel.glade:843 -#: styles.glade:162 +#: places.glade:1131 places.glade:1283 places.glade:1639 rule.glade:376 +#: rule.glade:858 srcsel.glade:843 styles.glade:162 msgid "_Delete" msgstr "" @@ -1940,8 +2012,8 @@ msgstr "" msgid "_State:" msgstr "" -#: dialog.glade:1608 -msgid "Church _Parish:" +#: dialog.glade:1608 places.glade:315 +msgid "Church _parish:" msgstr "" #: dialog.glade:1794 dialog.glade:2531 dialog.glade:2778 gramps.glade:4447 @@ -1969,10 +2041,6 @@ msgstr "" msgid "_Description:" msgstr "" -#: dialog.glade:2654 imagesel.glade:578 -msgid "_Private record" -msgstr "" - #: dialog.glade:2764 gramps.glade:4433 marriage.glade:34 msgid "Reject changes and close" msgstr "" @@ -1981,8 +2049,8 @@ msgstr "" msgid "_Given name:" msgstr "" -#: dialog.glade:2878 -msgid "_Family Name:" +#: dialog.glade:2878 edit_person.glade:155 +msgid "_Family name:" msgstr "" #: dialog.glade:2906 edit_person.glade:205 @@ -2002,15 +2070,15 @@ msgstr "" msgid "P_rivate record" msgstr "" -#: dialog.glade:3011 -msgid "Family _Prefix:" +#: dialog.glade:3011 edit_person.glade:180 +msgid "Family _prefix:" msgstr "" #: dialog.glade:3627 preferences.glade:2380 msgid "_Person:" msgstr "" -#: dialog.glade:3655 +#: dialog.glade:3655 rule.glade:132 msgid "_Comment:" msgstr "" @@ -2085,14 +2153,6 @@ msgstr "" msgid "Accept changes and close dialog" msgstr "" -#: edit_person.glade:155 -msgid "_Family name:" -msgstr "" - -#: edit_person.glade:180 -msgid "Family _prefix:" -msgstr "" - #: edit_person.glade:255 msgid "_Nickname:" msgstr "" @@ -2170,7 +2230,7 @@ msgstr "" msgid "_unknown" msgstr "" -#: edit_person.glade:787 +#: edit_person.glade:787 mergedata.glade:604 mergedata.glade:1256 msgid "Birth" msgstr "" @@ -2186,7 +2246,7 @@ msgstr "" msgid "Pla_ce:" msgstr "" -#: edit_person.glade:994 +#: edit_person.glade:994 mergedata.glade:671 mergedata.glade:1280 msgid "Death" msgstr "" @@ -2208,23 +2268,7 @@ msgid "Confidence:" msgstr "" #: edit_person.glade:1282 -msgid "Prefix:" -msgstr "" - -#: edit_person.glade:1306 -msgid "Suffix:" -msgstr "" - -#: edit_person.glade:1330 -msgid "Last:" -msgstr "" - -#: edit_person.glade:1354 -msgid "Given:" -msgstr "" - -#: edit_person.glade:1378 gramps.glade:2381 imagesel.glade:695 -msgid "Title:" +msgid "Family prefix:" msgstr "" #: edit_person.glade:1402 edit_person.glade:1942 edit_person.glade:2426 @@ -2238,7 +2282,7 @@ msgid "Alternate name" msgstr "" #: edit_person.glade:1450 edit_person.glade:1990 edit_person.glade:2474 -#: edit_person.glade:3024 marriage.glade:529 +#: edit_person.glade:3024 marriage.glade:529 marriage.glade:949 msgid "Primary source" msgstr "" @@ -2262,24 +2306,10 @@ msgstr "" msgid "Event" msgstr "" -#: edit_person.glade:1870 edit_person.glade:3658 marriage.glade:410 -#: places.glade:1394 -msgid "Description:" -msgstr "" - #: edit_person.glade:1894 marriage.glade:386 msgid "Cause:" msgstr "" -#: edit_person.glade:1918 marriage.glade:1499 -msgid "Place:" -msgstr "" - -#: edit_person.glade:1966 edit_person.glade:2832 marriage.glade:314 -#: marriage.glade:1451 -msgid "Date:" -msgstr "" - #: edit_person.glade:2275 msgid "Create a new event" msgstr "" @@ -2302,10 +2332,6 @@ msgstr "" msgid "Attributes" msgstr "" -#: edit_person.glade:2450 imagesel.glade:836 imagesel.glade:1595 -msgid "Value:" -msgstr "" - #: edit_person.glade:2687 msgid "Create a new attribute" msgstr "" @@ -2323,10 +2349,6 @@ msgstr "" msgid "City/County:" msgstr "" -#: edit_person.glade:2952 -msgid "ZIP/Postal Code:" -msgstr "" - #: edit_person.glade:3000 edit_person.glade:3403 msgid "Addresses" msgstr "" @@ -2373,12 +2395,12 @@ msgstr "" msgid "Gallery" msgstr "" -#: edit_person.glade:3634 -msgid "Web Address:" +#: edit_person.glade:3634 places.glade:1370 +msgid "Web address:" msgstr "" #: edit_person.glade:3729 places.glade:1465 -msgid "Internet Addresses" +msgid "Internet addresses" msgstr "" #: edit_person.glade:3800 @@ -2406,7 +2428,7 @@ msgid "LDS baptism" msgstr "" #: edit_person.glade:4074 -msgid "LDS _Temple:" +msgid "LDS _temple:" msgstr "" #: edit_person.glade:4143 edit_person.glade:4442 edit_person.glade:4618 @@ -2419,7 +2441,7 @@ msgid "Endowment" msgstr "" #: edit_person.glade:4282 -msgid "LDS Te_mple:" +msgid "LDS te_mple:" msgstr "" #: edit_person.glade:4310 preferences.glade:2436 @@ -2431,7 +2453,7 @@ msgid "Dat_e:" msgstr "" #: edit_person.glade:4550 -msgid "LD_S Temple:" +msgid "LD_S temple:" msgstr "" #: edit_person.glade:4704 @@ -2457,7 +2479,7 @@ msgid "label1" msgstr "" #: errdialogs.glade:162 -msgid "Close _without Saving" +msgid "Close _without saving" msgstr "" #: filters/After.py:54 @@ -2504,6 +2526,10 @@ msgstr "" msgid "Names with same SoundEx code as ..." msgstr "" +#: filters/MatchSndEx.py:44 +msgid "Surname" +msgstr "" + #: filters/MatchSndEx2.py:39 msgid "Names with the specified SoundEx code" msgstr "" @@ -2565,7 +2591,7 @@ msgid "_Export" msgstr "" #: gramps.glade:132 -msgid "Reload Plugins" +msgid "Reload plugins" msgstr "" #: gramps.glade:171 @@ -2593,15 +2619,15 @@ msgid "_Bookmarks" msgstr "" #: gramps.glade:268 -msgid "_Add Bookmark" +msgid "_Add bookmark" msgstr "" #: gramps.glade:290 -msgid "_Edit Bookmarks" +msgid "_Edit bookmarks" msgstr "" #: gramps.glade:318 -msgid "Go to Bookmark" +msgid "Go to bookmark" msgstr "" #: gramps.glade:330 @@ -2625,19 +2651,19 @@ msgid "_Help" msgstr "" #: gramps.glade:397 -msgid "_User's Manual" +msgid "_User's manual" msgstr "" #: gramps.glade:418 -msgid "_Writing Extensions" +msgid "_Writing extensions" msgstr "" #: gramps.glade:439 -msgid "GRAMPS _Home Page" +msgid "GRAMPS _home page" msgstr "" #: gramps.glade:460 -msgid "GRAMPS _Mailing Lists" +msgid "GRAMPS _mailing lists" msgstr "" #: gramps.glade:481 @@ -2645,11 +2671,11 @@ msgid "_Report a bug" msgstr "" #: gramps.glade:490 -msgid "_Show Plugin Status" +msgid "_Show plugin status" msgstr "" #: gramps.glade:536 -msgid "Open File" +msgid "Open file" msgstr "" #: gramps.glade:537 @@ -2657,7 +2683,7 @@ msgid "Open" msgstr "" #: gramps.glade:547 -msgid "Save File" +msgid "Save file" msgstr "" #: gramps.glade:548 @@ -2708,7 +2734,7 @@ msgstr "" msgid "Edit the selected item" msgstr "" -#: gramps.glade:620 rule.glade:354 rule.glade:757 +#: gramps.glade:620 msgid "Edit" msgstr "" @@ -2729,7 +2755,7 @@ msgstr "" msgid "Show persons that do not match the filtering rule" msgstr "" -#: gramps.glade:1084 rule.glade:280 +#: gramps.glade:1084 msgid "Invert" msgstr "" @@ -2782,11 +2808,11 @@ msgid "Children" msgstr "" #: gramps.glade:1600 -msgid "Active Person" +msgid "Active person" msgstr "" #: gramps.glade:1624 -msgid "Active Person's Parents" +msgid "Active person's Parents" msgstr "" #: gramps.glade:1648 @@ -2794,7 +2820,7 @@ msgid "Spouse" msgstr "" #: gramps.glade:1672 -msgid "Spouse's Parents" +msgid "Spouse's parents" msgstr "" #: gramps.glade:1765 @@ -2841,10 +2867,6 @@ msgstr "" msgid "Path:" msgstr "" -#: gramps.glade:2287 imagesel.glade:529 imagesel.glade:1275 -msgid "ID:" -msgstr "" - #: gramps.glade:2406 msgid "Information" msgstr "" @@ -2853,11 +2875,7 @@ msgstr "" msgid "Media" msgstr "" -#: gramps.glade:2527 -msgid "Select File - GRAMPS" -msgstr "" - -#: gramps.glade:2734 +#: gramps.glade:2734 marriage.glade:127 msgid "_Relationship type:" msgstr "" @@ -3096,43 +3114,43 @@ msgstr "" msgid "GRAMPS could not find a previous version of the database" msgstr "" -#: gramps_main.py:1315 +#: gramps_main.py:1316 msgid "Loading %s..." msgstr "" -#: gramps_main.py:1410 +#: gramps_main.py:1411 msgid "No home person has been set." msgstr "" -#: gramps_main.py:1411 +#: gramps_main.py:1412 msgid "The home person may be set from the Settings menu." msgstr "" -#: gramps_main.py:1417 +#: gramps_main.py:1418 msgid "%s has been bookmarked" msgstr "" -#: gramps_main.py:1420 +#: gramps_main.py:1421 msgid "Could Not Set a Bookmark." msgstr "" -#: gramps_main.py:1421 +#: gramps_main.py:1422 msgid "A bookmark could not be set because no one was selected." msgstr "" -#: gramps_main.py:1433 +#: gramps_main.py:1434 msgid "Do you wish to set %s as the home person?" msgstr "" -#: gramps_main.py:1435 +#: gramps_main.py:1436 msgid "Set %s as the Home Person" msgstr "" -#: gramps_main.py:1436 +#: gramps_main.py:1437 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:1439 +#: gramps_main.py:1440 msgid "Set Home Person" msgstr "" @@ -3168,10 +3186,6 @@ msgstr "" msgid "Creates a new attribute from the above data" msgstr "" -#: marriage.glade:127 -msgid "_Relationship Type:" -msgstr "" - #: marriage.glade:217 msgid "_GRAMPS ID:" msgstr "" @@ -3184,10 +3198,6 @@ msgstr "" msgid "Delete selected event" msgstr "" -#: marriage.glade:949 -msgid "Primary Source" -msgstr "" - #: marriage.glade:1137 msgid "Create a new attribute for this marriage" msgstr "" @@ -3200,71 +3210,55 @@ msgstr "" msgid "Temple:" msgstr "" -#: mergedata.glade:8 -msgid "Merge Places - GRAMPS" -msgstr "" - -#: mergedata.glade:71 -msgid "Select the title for the merged place" -msgstr "" - -#: mergedata.glade:182 +#: mergedata.glade:171 msgid "Place 1" msgstr "" -#: mergedata.glade:205 +#: mergedata.glade:194 msgid "Place 2" msgstr "" -#: mergedata.glade:268 plugins/merge.glade:8 plugins/merge.glade:249 -msgid "Merge People - GRAMPS" +#: mergedata.glade:283 +msgid "_Merge and close" msgstr "" -#: mergedata.glade:293 -msgid "Merge and Close" +#: mergedata.glade:296 +msgid "Merge and _edit" msgstr "" -#: mergedata.glade:306 -msgid "Merge and Edit" +#: mergedata.glade:807 mergedata.glade:1304 +msgid "Parents" msgstr "" -#: mergedata.glade:344 plugins/merge.glade:311 -msgid "Merge People" +#: mergedata.glade:831 mergedata.glade:1208 +msgid "Mother:" msgstr "" -#: mergedata.glade:432 mergedata.glade:1021 -msgid "Death Date" +#: mergedata.glade:919 mergedata.glade:1328 +msgid "Spouses" msgstr "" -#: mergedata.glade:504 mergedata.glade:1069 -msgid "Birth Place" +#: mergedata.glade:971 mergedata.glade:1184 +msgid "Father:" msgstr "" -#: mergedata.glade:528 mergedata.glade:1117 -msgid "Death Place" +#: mergedata.glade:997 +msgid "First person" msgstr "" -#: mergedata.glade:761 mergedata.glade:1288 -msgid "Spouses" +#: mergedata.glade:1660 +msgid "Second person" msgstr "" -#: mergedata.glade:979 plugins/Merge.py:214 -msgid "First Person" -msgstr "" - -#: mergedata.glade:1614 plugins/Merge.py:215 -msgid "Second Person" -msgstr "" - -#: mergedata.glade:1681 +#: mergedata.glade:1727 msgid "Keep other name as an alternate name" msgstr "" -#: mergedata.glade:1699 +#: mergedata.glade:1745 msgid "Keep other birth event as an alternate birth event" msgstr "" -#: mergedata.glade:1717 +#: mergedata.glade:1763 msgid "Keep other death event as an alternate death event" msgstr "" @@ -3280,10 +3274,6 @@ msgstr "" msgid "L_atitude:" msgstr "" -#: places.glade:315 -msgid "Church _parish:" -msgstr "" - #: places.glade:578 msgid "County:" msgstr "" @@ -3300,10 +3290,6 @@ msgstr "" msgid "Other names" msgstr "" -#: places.glade:1370 -msgid "Web address:" -msgstr "" - #: plugins.glade:179 msgid "Select a report from those available on the left." msgstr "" @@ -3320,10 +3306,6 @@ msgstr "" msgid "Author's email:" msgstr "" -#: plugins.glade:373 -msgid "Plugin Status - GRAMPS" -msgstr "" - #: plugins/AncestorChart.py:217 plugins/AncestorChart.py:424 msgid "Ancestor Chart" msgstr "" @@ -3947,28 +3929,64 @@ msgstr "" msgid "Creates a family group report, showing information on a set of parents and their children." msgstr "" -#: plugins/FilterEditor.py:66 rule.glade:141 +#: plugins/FilterEditor.py:38 +msgid "Personal Event" +msgstr "" + +#: plugins/FilterEditor.py:39 +msgid "Family Event" +msgstr "" + +#: plugins/FilterEditor.py:40 +msgid "Personal Attribute" +msgstr "" + +#: plugins/FilterEditor.py:41 +msgid "Family Attribute" +msgstr "" + +#: plugins/FilterEditor.py:42 +msgid "Relationship Type" +msgstr "" + +#: plugins/FilterEditor.py:59 +msgid "User defined filters" +msgstr "" + +#: plugins/FilterEditor.py:70 msgid "Comment" msgstr "" -#: plugins/FilterEditor.py:372 +#: plugins/FilterEditor.py:126 +msgid "Define filter" +msgstr "" + +#: plugins/FilterEditor.py:231 +msgid "Add rule" +msgstr "" + +#: plugins/FilterEditor.py:342 +msgid "Test Filter" +msgstr "" + +#: plugins/FilterEditor.py:382 msgid "Custom Filter Editor" msgstr "" -#: plugins/FilterEditor.py:373 plugins/FilterEditor.py:386 +#: plugins/FilterEditor.py:383 plugins/FilterEditor.py:396 #: plugins/RelCalc.py:447 plugins/Verify.py:291 plugins/soundgen.py:86 msgid "Utilities" msgstr "" -#: plugins/FilterEditor.py:374 +#: plugins/FilterEditor.py:384 msgid "The Custom Filter Editor builds custom filters that can be used to select people included in reports, exports, and other utilities." msgstr "" -#: plugins/FilterEditor.py:385 +#: plugins/FilterEditor.py:395 msgid "System Filter Editor" msgstr "" -#: plugins/FilterEditor.py:387 +#: plugins/FilterEditor.py:397 msgid "The System Filter Editor builds custom filters that can be used by anyone on the system to select people included in reports, exports, and other utilities." msgstr "" @@ -4189,10 +4207,18 @@ msgstr "" msgid "Medium" msgstr "" +#: plugins/Merge.py:214 +msgid "First Person" +msgstr "" + #: plugins/Merge.py:214 msgid "Rating" msgstr "" +#: plugins/Merge.py:215 +msgid "Second Person" +msgstr "" + #: plugins/Merge.py:544 msgid "Find possible duplicate people" msgstr "" @@ -4949,6 +4975,10 @@ msgstr "" msgid "Close window when complete" msgstr "" +#: plugins/merge.glade:8 plugins/merge.glade:249 +msgid "Merge People - GRAMPS" +msgstr "" + #: plugins/merge.glade:24 msgid "Determining Possible Merges" msgstr "" @@ -4969,6 +4999,10 @@ msgstr "" msgid "Potential Merges" msgstr "" +#: plugins/merge.glade:311 +msgid "Merge People" +msgstr "" + #: plugins/merge.glade:366 msgid "Match Threshold" msgstr "" @@ -5201,7 +5235,7 @@ msgid "_Automatically load last database" msgstr "" #: preferences.glade:512 -msgid "Revision Control" +msgid "Revision control" msgstr "" #: preferences.glade:537 @@ -5277,18 +5311,18 @@ msgid "_Show calendar format selection menu" msgstr "" #: preferences.glade:1229 -msgid "Display Formats" +msgid "Display formats" msgstr "" #: preferences.glade:1253 -msgid "Entry Formats" +msgid "Entry formats" msgstr "" #: preferences.glade:1277 msgid "Calendars" msgstr "" -#: preferences.glade:1370 +#: preferences.glade:1370 rule.glade:105 msgid "_Name:" msgstr "" @@ -5313,7 +5347,7 @@ msgid "_Email:" msgstr "" #: preferences.glade:1770 -msgid "Researcher Information" +msgid "Researcher information" msgstr "" #: preferences.glade:1842 @@ -5357,7 +5391,7 @@ msgid "The default directory for the output of the Web Site report generators" msgstr "" #: preferences.glade:2132 -msgid "Report Preferences" +msgid "Report preferences" msgstr "" #: preferences.glade:2200 @@ -5444,92 +5478,56 @@ msgstr "" msgid "_Revert to an older version from revision control" msgstr "" -#: revision.glade:198 -msgid "Select an older revision - GRAMPS" -msgstr "" - -#: revision.glade:320 -msgid "Revison Control Comment - GRAMPS" -msgstr "" - #: revision.glade:400 msgid "Comment:" msgstr "" -#: rule.glade:8 -msgid "Define Filter - GRAMPS" +#: rule.glade:207 +msgid "E_xactly one rule must apply" msgstr "" -#: rule.glade:74 -msgid "Define Filter" +#: rule.glade:228 +msgid "At least _one rule must apply" msgstr "" -#: rule.glade:215 -msgid "Exactly one rule must apply" +#: rule.glade:250 +msgid "All _rules must apply" msgstr "" -#: rule.glade:236 -msgid "At least one rule must apply" +#: rule.glade:272 +msgid "_Invert" msgstr "" -#: rule.glade:258 -msgid "All rules must apply" +#: rule.glade:621 +msgid "Values" msgstr "" -#: rule.glade:393 -msgid "Add Rule - GRAMPS" +#: rule.glade:649 +msgid "Rule" msgstr "" -#: rule.glade:454 -msgid "Add Rule" -msgstr "" - -#: rule.glade:492 -msgid "Rule" -msgstr "" - -#: rule.glade:590 -msgid "Values" -msgstr "" - -#: rule.glade:625 -msgid "User Defined Filters - GRAMPS" -msgstr "" - -#: rule.glade:676 -msgid "User Defined Filters" -msgstr "" - -#: rule.glade:740 +#: rule.glade:801 msgid "Add a new filter" msgstr "" -#: rule.glade:754 +#: rule.glade:820 msgid "Edit the selected filter" msgstr "" -#: rule.glade:768 +#: rule.glade:839 +msgid "_Test..." +msgstr "" + +#: rule.glade:855 msgid "Delete the selected filter" msgstr "" -#: rule.glade:782 -msgid "Display people matching the filter" -msgstr "" - -#: rule.glade:822 -msgid "Test" -msgstr "" - -#: rule.glade:865 -msgid "Test Filter - GRAMPS" -msgstr "" - #: srcsel.glade:110 msgid "_Confidence:" msgstr "" #: srcsel.glade:138 -msgid "Source Details" +msgid "Source details" msgstr "" #: srcsel.glade:162 @@ -5549,23 +5547,15 @@ msgid "Publication information:" msgstr "" #: srcsel.glade:459 -msgid "Source Selection" +msgid "Source selection" msgstr "" #: srcsel.glade:783 msgid "Double click will edit the selected source" msgstr "" -#: styles.glade:9 -msgid "Document Styles - GRAMPS" -msgstr "" - -#: styles.glade:195 -msgid "Style Editor - GRAMPS" -msgstr "" - #: styles.glade:286 -msgid "Style _Name:" +msgid "Style _name:" msgstr "" #: styles.glade:401 @@ -5589,7 +5579,7 @@ msgid "_Underline" msgstr "" #: styles.glade:528 -msgid "Type Face" +msgid "Type face" msgstr "" #: styles.glade:552 @@ -5613,7 +5603,7 @@ msgid "_Swiss (Arial, Helvetica, sans-serif)" msgstr "" #: styles.glade:698 -msgid "Font Options" +msgid "Font options" msgstr "" #: styles.glade:745 @@ -5677,6 +5667,6 @@ msgid "Borders" msgstr "" #: styles.glade:1261 -msgid "Paragraph Options" +msgid "Paragraph options" msgstr "" diff --git a/gramps2/src/preferences.glade b/gramps2/src/preferences.glade index bab494856..c13df1d43 100644 --- a/gramps2/src/preferences.glade +++ b/gramps2/src/preferences.glade @@ -509,7 +509,7 @@ True - <b>Revision Control</b> + <b>Revision control</b> False True GTK_JUSTIFY_LEFT @@ -1226,7 +1226,7 @@ True - <b>Display Formats</b> + <b>Display formats</b> False True GTK_JUSTIFY_LEFT @@ -1250,7 +1250,7 @@ True - <b>Entry Formats</b> + <b>Entry formats</b> False True GTK_JUSTIFY_LEFT @@ -1767,7 +1767,7 @@ True - <b>Researcher Information</b> + <b>Researcher information</b> False True GTK_JUSTIFY_LEFT @@ -2129,7 +2129,7 @@ True - <b>Report Preferences</b> + <b>Report preferences</b> False True GTK_JUSTIFY_LEFT diff --git a/gramps2/src/revision.glade b/gramps2/src/revision.glade index 36e7ab645..544996116 100644 --- a/gramps2/src/revision.glade +++ b/gramps2/src/revision.glade @@ -195,7 +195,7 @@ True - Select an older revision - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -317,7 +317,7 @@ True - Revison Control Comment - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False diff --git a/gramps2/src/rule.glade b/gramps2/src/rule.glade index 376e0484f..02610309d 100644 --- a/gramps2/src/rule.glade +++ b/gramps2/src/rule.glade @@ -5,7 +5,7 @@ True - Define Filter - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -14,7 +14,7 @@ True False gramps.png - True + False @@ -39,6 +39,7 @@ + True @@ -52,7 +53,6 @@ - 0 @@ -69,9 +69,9 @@ 0 - + True - Define Filter + False False GTK_JUSTIFY_CENTER @@ -80,7 +80,7 @@ 0.5 0.5 0 - 0 + 6 0 @@ -89,39 +89,30 @@ - - - True - - - 5 - False - True - - - + 12 True 6 2 False - 0 - 0 + 6 + 12 True - Name - False + _Name: + True False GTK_JUSTIFY_CENTER False False - 1 + 0 0.5 0 0 + filter_name 0 @@ -138,16 +129,17 @@ True - Comment - False + _Comment: + True False GTK_JUSTIFY_CENTER False False - 1 + 0 0.5 0 0 + comment 0 @@ -212,7 +204,7 @@ True True - Exactly one rule must apply + E_xactly one rule must apply True GTK_RELIEF_NORMAL False @@ -233,7 +225,7 @@ True True - At least one rule must apply + At least _one rule must apply True GTK_RELIEF_NORMAL False @@ -255,7 +247,7 @@ True True - All rules must apply + All _rules must apply True GTK_RELIEF_NORMAL True @@ -277,7 +269,7 @@ True True - Invert + _Invert True GTK_RELIEF_NORMAL False @@ -302,22 +294,106 @@ - + + 12 True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT + False + 6 - + True - True - True - False - False - True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + True + + + + 0 + True + True + + + + + + True + False + 6 + + + + True + True + True + _Add... + True + GTK_RELIEF_NORMAL + + + + 0 + False + False + + + + + + True + False + True + True + _Edit... + True + GTK_RELIEF_NORMAL + + + + 0 + False + False + + + + + + True + False + True + True + _Delete + True + GTK_RELIEF_NORMAL + + + + 0 + False + False + + + + + + + + + 0 + False + True + @@ -332,44 +408,6 @@ True GTK_BUTTONBOX_SPREAD 30 - - - - True - True - True - gtk-add - True - GTK_RELIEF_NORMAL - - - - - - - True - False - True - True - Edit - True - GTK_RELIEF_NORMAL - - - - - - - True - False - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - - - 0 @@ -390,14 +428,16 @@ True - Add Rule - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False + 400 + 300 True False gramps.png - True + False @@ -421,6 +461,7 @@ 0 + True @@ -432,7 +473,6 @@ 0 - 0 @@ -449,9 +489,9 @@ 0 - + True - Add Rule + False False GTK_JUSTIFY_CENTER @@ -470,40 +510,36 @@ - - True - - - 5 - False - True - - - - - + + 12 True + 4 + 3 False - 0 + 6 + 8 - + True - Rule + Name: False False - GTK_JUSTIFY_CENTER + GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 0 0 - 5 - False - True + 1 + 2 + 1 + 2 + fill + @@ -560,46 +596,74 @@ - 5 - True - True + 2 + 3 + 1 + 2 + - - - 5 - False - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + + + + + True + <b>Values</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + 3 + 3 + 4 + fill + - + True - Values + <b>Rule</b> False - False + True GTK_JUSTIFY_LEFT False False - 0.5 + 0 0.5 - 0 + 4 0 - label_item + 0 + 3 + 0 + 1 + fill + @@ -622,15 +686,16 @@ True - User Defined Filters - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False + 400 350 True False gramps.png - True + False @@ -671,9 +736,9 @@ 0 - + True - User Defined Filters + False False GTK_JUSTIFY_CENTER @@ -692,33 +757,125 @@ - + + 6 True - - - 0 - False - True - - - - - - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT + False + 6 - + True - True - True - False - False - True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + True + + + + 0 + True + True + + + + + + True + False + 6 + + + + True + Add a new filter + True + True + _Add... + True + GTK_RELIEF_NORMAL + + + + 0 + False + False + + + + + + True + False + Edit the selected filter + True + True + _Edit... + True + GTK_RELIEF_NORMAL + + + + 0 + False + False + + + + + + True + True + _Test... + True + GTK_RELIEF_NORMAL + + + + 0 + False + False + + + + + + True + False + Delete the selected filter + True + True + _Delete + True + GTK_RELIEF_NORMAL + + + + 0 + False + False + + + + + + + + + 0 + False + True + @@ -733,115 +890,6 @@ True GTK_BUTTONBOX_SPREAD 30 - - - - True - Add a new filter - True - True - gtk-add - True - GTK_RELIEF_NORMAL - - - - - - - True - False - Edit the selected filter - True - True - Edit - True - GTK_RELIEF_NORMAL - - - - - - - True - False - Delete the selected filter - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - - - - - - - True - False - Display people matching the filter - True - True - GTK_RELIEF_NORMAL - - - - - True - 0.5 - 0.5 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-execute - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Test - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - 0 @@ -862,14 +910,16 @@ True - Test Filter - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False + 450 + 400 True False gramps.png - True + False diff --git a/gramps2/src/srcsel.glade b/gramps2/src/srcsel.glade index 1929a83df..bd7514f9f 100644 --- a/gramps2/src/srcsel.glade +++ b/gramps2/src/srcsel.glade @@ -135,7 +135,7 @@ True - <b>Source Details</b> + <b>Source details</b> False True GTK_JUSTIFY_LEFT @@ -456,7 +456,7 @@ True - <b>Source Selection</b> + <b>Source selection</b> False True GTK_JUSTIFY_LEFT diff --git a/gramps2/src/styles.glade b/gramps2/src/styles.glade index 55d1ec9da..d2d1190de 100644 --- a/gramps2/src/styles.glade +++ b/gramps2/src/styles.glade @@ -6,7 +6,7 @@ True - Document Styles - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True @@ -192,7 +192,7 @@ True - Style Editor - GRAMPS + GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True @@ -283,7 +283,7 @@ True - Style _Name: + Style _name: True False GTK_JUSTIFY_CENTER @@ -525,7 +525,7 @@ True - <b>Type Face</b> + <b>Type face</b> False True GTK_JUSTIFY_CENTER @@ -695,7 +695,7 @@ True - <b>Font Options</b> + <b>Font options</b> False True GTK_JUSTIFY_LEFT @@ -1258,7 +1258,7 @@ True - <b>Paragraph Options</b> + <b>Paragraph options</b> False True GTK_JUSTIFY_LEFT