From 38bda7a1095d1f7ac45990bf75a382b761da487c Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Wed, 7 Mar 2007 15:45:32 +0000 Subject: [PATCH] =?UTF-8?q?2007-03-07=20=20Stefan=20Bj=C3=B6rk=20=20=20=09*=20src/Filters/Rules/=5FHasMarkerBase.py?= =?UTF-8?q?=20(HasMarkerBase):=20fix=20typo=20=09*=20src/GrampsWidgets.py:?= =?UTF-8?q?=20better=20wording?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit svn: r8283 --- gramps2/ChangeLog | 4 ++++ gramps2/src/Assistant.py | 12 ++++++------ gramps2/src/Filters/Rules/_HasMarkerBase.py | 2 +- gramps2/src/GrampsDb/_ReadGedcom.py | 3 +++ gramps2/src/GrampsWidgets.py | 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 2f63de301..c7f0b947e 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,7 @@ +2007-03-07 Stefan Björk + * src/Filters/Rules/_HasMarkerBase.py (HasMarkerBase): fix typo + * src/GrampsWidgets.py: better wording + 2007-03-06 Brian Matherly * src/plugins/NarrativeWeb.py: * src/ReportBase/_ReportUtils.py: diff --git a/gramps2/src/Assistant.py b/gramps2/src/Assistant.py index fd78eae7d..f54447fd1 100644 --- a/gramps2/src/Assistant.py +++ b/gramps2/src/Assistant.py @@ -327,12 +327,12 @@ if __name__ == "__main__": a = Assistant(complete) a.add_text_page('Getting started', 'Welcome to GRAMPS, the Genealogical Research ' - 'and Analysis Management Programming System.\n' - 'Several options and information need to be gathered ' - 'before GRAMPS is ready to be used. Any of this ' - 'information can be changed in the future in the ' - 'Preferences dialog under the Settings menu.') - + 'and Analysis Management Programming System.\n' + 'Several options and information need to be gathered ' + 'before GRAMPS is ready to be used. Any of this ' + 'information can be changed in the future in the ' + 'Preferences dialog under the Settings menu.') + box = gtk.VBox() box.set_spacing(12) table = gtk.Table(8,4) diff --git a/gramps2/src/Filters/Rules/_HasMarkerBase.py b/gramps2/src/Filters/Rules/_HasMarkerBase.py index d5d209d4c..0608d41e3 100644 --- a/gramps2/src/Filters/Rules/_HasMarkerBase.py +++ b/gramps2/src/Filters/Rules/_HasMarkerBase.py @@ -46,7 +46,7 @@ class HasMarkerBase(Rule): labels = [ _('Marker type:')] name = _('Has marker of') - description = _("Matches markers of a partikular type") + description = _("Matches markers of a particular type") category = _('General filters') def apply(self,db,obj): diff --git a/gramps2/src/GrampsDb/_ReadGedcom.py b/gramps2/src/GrampsDb/_ReadGedcom.py index 19fb5a76f..06c64ef08 100644 --- a/gramps2/src/GrampsDb/_ReadGedcom.py +++ b/gramps2/src/GrampsDb/_ReadGedcom.py @@ -230,6 +230,8 @@ def importData(database, filename, callback=None, use_trans=False): def import2(database, filename, callback, codeset, use_trans): # add some checking here + import time + t = time.time() try: np = NoteParser(filename, False, codeset) g = GedcomParser(database,filename, callback, codeset, np.get_map(), @@ -259,6 +261,7 @@ def import2(database, filename, callback, codeset, use_trans): except Errors.GedcomError, msg: ErrorDialog(_('Error reading GEDCOM file'), str(msg)) return + print time.time() - t #------------------------------------------------------------------------- # diff --git a/gramps2/src/GrampsWidgets.py b/gramps2/src/GrampsWidgets.py index eec998b04..59c6ae49a 100644 --- a/gramps2/src/GrampsWidgets.py +++ b/gramps2/src/GrampsWidgets.py @@ -87,7 +87,7 @@ class LinkLabel(gtk.EventBox): self.tooltips = gtk.Tooltips() text = '%s' % self.orig_text - msg = _('Click to make the active person\n' + msg = _('Click to change the active person\n' 'Right click to display the edit menu') if not Config.get(Config.RELEDITBTN): msg += "\n" + _('Edit icons can be enabled in the Preferences dialog')