2007-03-07 Stefan Björk <skalman@acc.umu.se>

* src/Filters/Rules/_HasMarkerBase.py (HasMarkerBase): fix typo
	* src/GrampsWidgets.py: better wording



svn: r8283
This commit is contained in:
Don Allingham 2007-03-07 15:45:32 +00:00
parent 0b5492a1a9
commit 38bda7a109
5 changed files with 15 additions and 8 deletions

View File

@ -1,3 +1,7 @@
2007-03-07 Stefan Björk <skalman@acc.umu.se>
* src/Filters/Rules/_HasMarkerBase.py (HasMarkerBase): fix typo
* src/GrampsWidgets.py: better wording
2007-03-06 Brian Matherly <brian@gramps-project.org> 2007-03-06 Brian Matherly <brian@gramps-project.org>
* src/plugins/NarrativeWeb.py: * src/plugins/NarrativeWeb.py:
* src/ReportBase/_ReportUtils.py: * src/ReportBase/_ReportUtils.py:

View File

@ -46,7 +46,7 @@ class HasMarkerBase(Rule):
labels = [ _('Marker type:')] labels = [ _('Marker type:')]
name = _('Has marker of') name = _('Has marker of')
description = _("Matches markers of a partikular type") description = _("Matches markers of a particular type")
category = _('General filters') category = _('General filters')
def apply(self,db,obj): def apply(self,db,obj):

View File

@ -230,6 +230,8 @@ def importData(database, filename, callback=None, use_trans=False):
def import2(database, filename, callback, codeset, use_trans): def import2(database, filename, callback, codeset, use_trans):
# add some checking here # add some checking here
import time
t = time.time()
try: try:
np = NoteParser(filename, False, codeset) np = NoteParser(filename, False, codeset)
g = GedcomParser(database,filename, callback, codeset, np.get_map(), 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: except Errors.GedcomError, msg:
ErrorDialog(_('Error reading GEDCOM file'), str(msg)) ErrorDialog(_('Error reading GEDCOM file'), str(msg))
return return
print time.time() - t
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #

View File

@ -87,7 +87,7 @@ class LinkLabel(gtk.EventBox):
self.tooltips = gtk.Tooltips() self.tooltips = gtk.Tooltips()
text = '<span underline="single">%s</span>' % self.orig_text text = '<span underline="single">%s</span>' % 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') 'Right click to display the edit menu')
if not Config.get(Config.RELEDITBTN): if not Config.get(Config.RELEDITBTN):
msg += "\n" + _('Edit icons can be enabled in the Preferences dialog') msg += "\n" + _('Edit icons can be enabled in the Preferences dialog')