diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 2a3b1bc1c..5b4714bff 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,6 @@ +2005-07-08 Alex Roitman + * various: merge changes made in gramps20 branch with main trunk. + 2005-06-24 Martin Hawlisch * src/GrampsBSDDB.py (upgrade): Disable upgrade_7 until this is properly working to not accidently destroy a database from gramps20 diff --git a/gramps2/NEWS b/gramps2/NEWS index 3eaaeafb3..d2ea2fdaf 100644 --- a/gramps2/NEWS +++ b/gramps2/NEWS @@ -1,3 +1,20 @@ +Version 2.0.5 -- the "It's certainly uncontaminated by cheese" release +* New filters based on personal notes. +* New routine for checking and removing corrupted source references in + the Check and Repair tool. +* Bug fixes. + +Version 2.0.4 -- the "That's enough music for now, lads." release +* Speedups for "select" dialogs in Family View. +* Filters are working in reports again. +* vCal and vCard plugins are back. +* Gender guessing is back for new people. +* GEDCOM export fixes. +* Other bug fixes. + +Version 2.0.3 -- the "Mynd you, møøse bites Kan be pretty nasti..." release +* Fixed Date handler bug that would not allow dates to be updated. + Version 2.0.2 -- the "Little fermented curd will do the trick" release * Updated German translation (Anton Huber). * Usability improvements for large databases. diff --git a/gramps2/src/AddSpouse.py b/gramps2/src/AddSpouse.py index 54157a1c0..68b1139a4 100644 --- a/gramps2/src/AddSpouse.py +++ b/gramps2/src/AddSpouse.py @@ -42,6 +42,7 @@ from gettext import gettext as _ #------------------------------------------------------------------------- import gtk.glade import gnome +import gobject #------------------------------------------------------------------------- # @@ -100,8 +101,6 @@ class AddSpouse: self.renderer = gtk.CellRendererText() - self.slist = PeopleModel.PeopleModel(self.db,self.filter) - self.spouse_list.set_model(self.slist) self.selection = self.spouse_list.get_selection() self.selection.connect('changed',self.select_row) self.add_columns(self.spouse_list) @@ -116,7 +115,7 @@ class AddSpouse: Utils.set_titles(self.window, self.glade.get_widget('title'),title, _('Choose Spouse/Partner')) - + self.glade.signal_autoconnect({ "on_select_spouse_clicked" : self.select_spouse_clicked, "on_spouse_help_clicked" : self.on_spouse_help_clicked, @@ -130,22 +129,18 @@ class AddSpouse: RelLib.Family.CUSTOM,RelLib.Family.MARRIED) self.set_gender() - self.update_data() + self.window.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH)) + gobject.idle_add(self.update_data) def build_all(self): - filt = GenericFilter.GenericFilter() - filt.add_rule(GenericFilter.Everyone([])) - return filt + return None def build_likely(self,gender): birth_ref = self.person.get_birth_ref() death_ref = self.person.get_death_ref() filt = GenericFilter.GenericFilter() - if gender == RelLib.Person.MALE: - filt.add_rule(GenericFilter.IsFemale([])) - else: - filt.add_rule(GenericFilter.IsMale([])) + filt.add_rule(LikelyFilter([self.person.handle,self.person.gender])) if birth_ref: birth = self.db.get_event_from_handle(birth_ref.ref) @@ -162,16 +157,13 @@ class AddSpouse: def add_columns(self,tree): column = gtk.TreeViewColumn(_('Name'), self.renderer,text=0) column.set_resizable(True) - #column.set_clickable(True) column.set_min_width(225) tree.append_column(column) column = gtk.TreeViewColumn(_('ID'), self.renderer,text=1) column.set_resizable(True) - #column.set_clickable(True) column.set_min_width(75) tree.append_column(column) column = gtk.TreeViewColumn(_('Birth date'), self.renderer,text=3) - #column.set_resizable(True) column.set_clickable(True) tree.append_column(column) @@ -194,9 +186,9 @@ class AddSpouse: """ idlist = self.get_selected_ids() if idlist and idlist[0]: - self.ok.set_sensitive(1) + self.ok.set_sensitive(True) else: - self.ok.set_sensitive(0) + self.ok.set_sensitive(False) def new_spouse_clicked(self,obj): """ @@ -227,7 +219,7 @@ class AddSpouse: been closed. """ person = epo.person - self.update_data(person.get_handle()) + self.update_data() self.slist = PeopleModel.PeopleModel(self.db,self.filter) self.slist.rebuild_data() @@ -321,7 +313,7 @@ class AddSpouse: m.on_add_clicked() def relation_type_changed(self,obj): - self.update_data() + gobject.idle_add(self.update_data) def all_filter(self, person): return person.get_gender() != self.sgender @@ -387,18 +379,61 @@ class AddSpouse: else: self.sgender = RelLib.Person.FEMALE - def update_data(self,person = None): + def update_data(self): """ Called whenever the relationship type changes. Rebuilds the the potential spouse list. """ - + self.window.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH)) + while(gtk.events_pending()): + gtk.main_iteration() self.slist = PeopleModel.PeopleModel(self.db,self.filter) self.spouse_list.set_model(self.slist) + self.window.window.set_cursor(None) def on_show_toggled(self,obj): if self.filter == self.likely: self.filter = self.all else: self.filter = self.likely - self.update_data() + gobject.idle_add(self.update_data) + + +#------------------------------------------------------------------------- +# +# Likely Filters +# +#------------------------------------------------------------------------- +class LikelyFilter(GenericFilter.Rule): + + category = _('General filters') + + def prepare(self,db): + person = db.get_person_from_handle(self.list[0]) + if person.birth_handle: + birth = db.get_event_from_handle(person.birth_handle) + dateobj = Date.Date(birth.date) + year = dateobj.get_year() + dateobj.set_year(year+40) + self.lower = dateobj.sortval + dateobj.set_year(year-40) + self.upper = dateobj.sortval + else: + self.upper = None + self.lower = None + + if person.gender == RelLib.Person.MALE: + self.gender = RelLib.Person.FEMALE + else: + self.gender = RelLib.Person.MALE + + def apply(self,db,person): + if person.gender != self.gender: + return False + if not person.birth_handle or (self.upper == None and + self.lower == None): + return True + event = db.get_event_from_handle(person.birth_handle) + return (event.date == None or event.date.sortval == 0 or + self.lower > event.date.sortval > self.upper) + diff --git a/gramps2/src/ChooseParents.py b/gramps2/src/ChooseParents.py index f6aa99fe6..422ea72df 100644 --- a/gramps2/src/ChooseParents.py +++ b/gramps2/src/ChooseParents.py @@ -42,6 +42,7 @@ from gettext import gettext as _ #------------------------------------------------------------------------- import gtk.glade import gtk.gdk +import gobject import gnome #------------------------------------------------------------------------- @@ -107,19 +108,25 @@ class ChooseParents: self.parent_selected = 0 self.renderer = gtk.CellRendererText() - db.connect('person-add', self.redraw) + db.connect('person-add', self.person_added) db.connect('person-update', self.redraw) db.connect('person-delete', self.redraw) - db.connect('person-rebuild', self.redraw) + db.connect('person-rebuild', self.redraw_all) # set default filters self.all_males_filter = GenericFilter.GenericFilter() self.all_males_filter.add_rule(GenericFilter.IsMale([])) - self.likely_males_filter = self.build_likely(True) self.all_females_filter = GenericFilter.GenericFilter() self.all_females_filter.add_rule(GenericFilter.IsFemale([])) - self.likely_females_filter = self.build_likely(False) + + bh = person.birth_handle + if bh and self.db.get_event_from_handle(bh).date.sortval != 0: + self.likely_females_filter = self.build_likely(False) + self.likely_males_filter = self.build_likely(True) + else: + self.likely_males_filter = self.all_males_filter + self.likely_females_filter = self.all_females_filter self.father_filter = self.likely_males_filter self.mother_filter = self.likely_females_filter @@ -133,6 +140,11 @@ class ChooseParents: self.glade = gtk.glade.XML(const.gladeFile,"familyDialog","gramps") self.window = self.glade.get_widget("familyDialog") + self.flabel = self.glade.get_widget("flabel") + self.mlabel = self.glade.get_widget("mlabel") + self.window.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH)) + self.mlabel.set_label("%s" % _("Loading...")) + self.flabel.set_label("%s" % _("Loading...")) name = NameDisplay.displayer.display(self.person) self.title_text = _("Choose the Parents of %s") % name @@ -145,14 +157,11 @@ class ChooseParents: self.title = self.glade.get_widget("chooseTitle") self.father_list = self.glade.get_widget("father_list") self.mother_list = self.glade.get_widget("mother_list") - self.flabel = self.glade.get_widget("flabel") - self.mlabel = self.glade.get_widget("mlabel") self.showallf = self.glade.get_widget('showallf') self.showallm = self.glade.get_widget('showallm') self.add_itself_to_menu() - - self.build_father_list() - self.build_mother_list() + + gobject.idle_add(self.draw_list) if gtk.gdk.screen_height() > 700: self.father_list.set_size_request(-1,150) @@ -201,7 +210,20 @@ class ChooseParents: self.window.show() + def draw_list(self): + self.build_father_list() + self.build_mother_list() + self.window.window.set_cursor(None) + def build_likely(self,is_male): + filt = GenericFilter.GenericFilter() + if is_male: + filt.add_rule(LikelyFather([self.person.handle])) + else: + filt.add_rule(LikelyMother([self.person.handle])) + return filt + + def build_likely2(self,is_male): birth_ref = self.person.get_birth_ref() filt = GenericFilter.GenericFilter() @@ -242,21 +264,32 @@ class ChooseParents: self.redrawm() def add_columns(self,tree): + column = gtk.TreeViewColumn(_('Name'), self.renderer,text=0) column.set_resizable(True) column.set_clickable(True) column.set_sort_column_id(0) - column.set_min_width(225) + + column.set_fixed_width(255) + column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) + tree.append_column(column) column = gtk.TreeViewColumn(_('ID'), self.renderer,text=1) column.set_resizable(True) column.set_clickable(True) column.set_sort_column_id(1) - column.set_min_width(75) + + column.set_fixed_width(75) + column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) + #column.set_min_width(75) + tree.append_column(column) column = gtk.TreeViewColumn(_('Birth date'), self.renderer,text=3) #column.set_resizable(True) column.set_clickable(True) + column.set_fixed_width(150) + column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED) + tree.append_column(column) def on_delete_event(self,obj,b): @@ -298,10 +331,48 @@ class ChooseParents: """Display the relevant portion of GRAMPS manual""" gnome.help_display('gramps-manual','gramps-edit-quick') + def person_added(self,handle_list): + update_father = False + update_mother = False + + for handle in handle_list: + person = self.db.get_person_from_handle(handle) + if person.get_gender() == RelLib.Person.MALE: + update_father = True + elif person.get_gender() == RelLib.Person.FEMALE: + update_mother = True + + if update_father: + self.person_added_base(handle_list,self.father_model, + self.father_filter) + if update_mother: + self.person_added_base(handle_list,self.mother_model, + self.mother_filter) + + def person_added_base(self,handle_list,model,data_filter): + for node in handle_list: + person = self.db.get_person_from_handle(node) + top = person.get_primary_name().get_group_name() + model.rebuild_data(data_filter) + if not model.is_visable(node): + continue + if (not model.sname_sub.has_key(top) or + len(model.sname_sub[top]) == 1): + path = model.on_get_path(top) + pnode = model.get_iter(path) + model.row_inserted(path,pnode) + path = model.on_get_path(node) + pnode = model.get_iter(path) + model.row_inserted(path,pnode) + def redraw(self,handle_list): self.redrawf() self.redrawm() + def redraw_all(self): + self.redrawf() + self.redrawm() + def redrawf(self): """Redraws the potential father list""" self.father_model = PeopleModel.PeopleModel(self.db,self.father_filter) @@ -315,8 +386,8 @@ class ChooseParents: def redrawm(self): """Redraws the potential mother list""" self.mother_model = PeopleModel.PeopleModel(self.db,self.mother_filter) - self.mother_list.set_model(self.mother_model) + self.mother_list.set_model(self.mother_model) if self.type[0] == RelLib.Family.CIVIL_UNION: self.mlabel.set_label("%s" % _("Pa_rent")) else: @@ -537,7 +608,7 @@ class ChooseParents: self.father_list.scroll_to_cell(path,None,1,0.5,0) except KeyError: self.father_filter = self.all_males_filter - self.showallf_toggled(None) + self.redrawf() path = self.father_model.on_get_path(handle) top_path = self.father_model.on_get_path(name) self.father_list.expand_row(top_path,0) @@ -552,7 +623,7 @@ class ChooseParents: self.mother_list.scroll_to_cell(path,None,1,0.5,0) except: self.mother_filter = self.all_females_filter - self.showallm_toggled(None) + self.redrawm() path = self.mother_model.on_get_path(handle) top_path = self.mother_model.on_get_path(name) self.mother_list.expand_row(top_path,0) @@ -743,3 +814,51 @@ class ModifyParents: trans = self.db.transaction_begin() self.db.commit_person(self.person,trans) self.db.transaction_commit(trans,_("Modify Parents")) + +#------------------------------------------------------------------------- +# +# Likely Filters +# +#------------------------------------------------------------------------- +class LikelyFilter(GenericFilter.Rule): + + category = _('General filters') + + def prepare(self,db): + person = db.get_person_from_handle(self.list[0]) + birth = db.get_event_from_handle(person.birth_handle) + dateobj = Date.Date(birth.date) + year = dateobj.get_year() + dateobj.set_year(year-10) + self.lower = dateobj.sortval + dateobj.set_year(year-70) + self.upper = dateobj.sortval + + def apply(self,db,person): + if person.gender != self.gender: + return False + if not person.birth_handle: + return True + event = db.get_event_from_handle(person.birth_handle) + return (event.date == None or event.date.sortval == 0 or + self.lower > event.date.sortval > self.upper) + +class LikelyFather(LikelyFilter): + + name = _('Likely Father') + description = _('Matches likely fathers') + + def __init__(self,data_list): + GenericFilter.Rule.__init__(self,data_list) + self.gender = RelLib.Person.MALE + + +class LikelyMother(LikelyFilter): + + name = _('Likely Mother') + description = _('Matches likely mothers') + + def __init__(self,data_list): + GenericFilter.Rule.__init__(self,data_list) + self.gender = RelLib.Person.FEMALE + diff --git a/gramps2/src/Date.py b/gramps2/src/Date.py index 7bc6164ae..04ad5e534 100644 --- a/gramps2/src/Date.py +++ b/gramps2/src/Date.py @@ -156,12 +156,12 @@ class Date: instance IN ALL REGARDS. Needed, because the __cmp__ only looks at the sorting value, and ignores the modifiers/comments. """ - + if self.modifier == other.modifier and self.modifier == MOD_TEXTONLY: + return self.text == other.text return (self.calendar == other.calendar and self.modifier == other.modifier and self.quality == other.quality and self.dateval == other.dateval and - self.text == other.text and self.sortval == other.sortval) def __str__(self): @@ -340,6 +340,7 @@ class Date: """ """ self.dateval = self.dateval[0:2] + (year,) + self.dateval[3:] + self.calc_sort_value() def get_year_valid(self): return self._get_low_item_valid(_POS_YR) @@ -458,6 +459,12 @@ class Date: if text: self.text = text + def calc_sort_value(self): + year = max(self.dateval[_POS_YR],1) + month = max(self.dateval[_POS_MON],1) + day = max(self.dateval[_POS_DAY],1) + self.sortval = _calendar_convert[self.calendar](year,month,day) + def convert_calendar(self,calendar): """ Converts the date from the current calendar to the specified diff --git a/gramps2/src/EditPerson.py b/gramps2/src/EditPerson.py index 8195c6bdf..600f79fb9 100644 --- a/gramps2/src/EditPerson.py +++ b/gramps2/src/EditPerson.py @@ -95,12 +95,17 @@ class EditPerson: self.dp = DateHandler.parser self.dd = DateHandler.displayer + self.orig_handle = person.get_handle() + # UGLY HACK to refresh person object from handle if that exists + # done to ensure that the person object is not stale, as it could + # have been changed by something external (merge, tool, etc). + if self.orig_handle: + person = db.get_person_from_handle(self.orig_handle) self.person = person - self.orig_surname = person.get_primary_name().get_group_name() + self.orig_surname = self.person.get_primary_name().get_group_name() self.parent = parent - self.orig_handle = self.person.get_handle() if self.parent.child_windows.has_key(self.orig_handle): - self.parent.child_windows[self.person.get_handle()].present(None) + self.parent.child_windows[self.orig_handle].present(None) return self.db = db self.callback = callback diff --git a/gramps2/src/EditPlace.py b/gramps2/src/EditPlace.py index e33c93002..585eb19ee 100644 --- a/gramps2/src/EditPlace.py +++ b/gramps2/src/EditPlace.py @@ -247,11 +247,25 @@ class EditPlace: self.add_itself_to_menu() self.top_window.get_widget('ok').set_sensitive(not self.db.readonly) self.top.show() + + self.pdmap = {} + self.build_pdmap() + if self.ref_not_loaded: Utils.temp_label(self.refs_label,self.top) gobject.idle_add(self.display_references) self.ref_not_loaded = 0 + def build_pdmap(self): + self.pdmap.clear() + cursor = self.db.get_place_cursor() + data = cursor.next() + while data: + if data[1][2]: + self.pdmap[data[1][2]] = data[0] + data = cursor.next() + cursor.close() + def on_delete_event(self,obj,b): self.glry.close() self.close_child_windows() @@ -375,6 +389,15 @@ class EditPlace: format = self.preform.get_active() mloc = self.place.get_main_location() + title = self.title.get_text() + if self.pdmap.has_key(title) and self.pdmap[title] != self.place.handle: + import QuestionDialog + QuestionDialog.ErrorDialog(_("Place title is already in use"), + _("Each place must have a unique title, and " + "title you have selected is already used by " + "another place")) + return + self.set(self.city,mloc.get_city,mloc.set_city) self.set(self.parish,mloc.get_parish,mloc.set_parish) self.set(self.state,mloc.get_state,mloc.set_state) diff --git a/gramps2/src/FamilyView.py b/gramps2/src/FamilyView.py index e435fd344..7169d794c 100644 --- a/gramps2/src/FamilyView.py +++ b/gramps2/src/FamilyView.py @@ -818,28 +818,45 @@ class FamilyView: family = self.family + # determine the child model, node = self.child_selection.get_selected() if not node: return - handle = self.child_model.get_value(node,_HANDLE_COL) child = self.parent.db.get_person_from_handle(handle) - trans = self.parent.db.transaction_begin() - + # remove the child from the family and the family from the child family.remove_child_handle(child.get_handle()) child.remove_parent_family_handle(family.get_handle()) - if len(family.get_child_handle_list()) == 0: - if family.get_father_handle() == None: - self.delete_family_from(family.get_mother_handle(),trans) - elif family.get_mother_handle() == None: - self.delete_family_from(family.get_father_handle(),trans) + # begin transaction + trans = self.parent.db.transaction_begin() + # if there are no children left, and the spouse is empty, delete the + # family + mother_handle = family.get_mother_handle() + father_handle = family.get_father_handle() + no_of_kids = len(family.get_child_handle_list()) + + self.parent.db.disable_all_signals() + + if no_of_kids == 0 and (mother_handle == None or father_handle == None): + if family.get_father_handle() == None: + temp = self.parent.db.get_person_from_handle(family.get_mother_handle()) + temp.get_family_handle_list().remove(family.get_handle()) + elif family.get_mother_handle() == None: + temp = self.parent.db.get_person_from_handle(family.get_father_handle()) + temp.get_family_handle_list().remove(family.get_handle()) + self.parent.db.remove_family(family.get_handle(),trans) + else: + self.parent.db.commit_family(family,trans) + + # commit the transaction self.parent.db.commit_person(child,trans) - self.parent.db.commit_family(family,trans) n = child.get_primary_name().get_regular_name() self.parent.db.transaction_commit(trans,_("Remove Child (%s)") % n) + self.parent.db.enable_all_signals() + self.parent.db.emit('family-update',([family.get_handle()],)) def remove_spouse(self,obj): if self.selected_spouse: @@ -863,32 +880,27 @@ class FamilyView: cur_spouse = self.selected_spouse cur_family = self.family + # Remove spouse from the family if cur_spouse.get_handle() == cur_family.get_father_handle(): cur_family.set_father_handle(None) else: cur_family.set_mother_handle(None) trans = self.parent.db.transaction_begin() - + + #If the spouse is defined, remove the family from the spouse if cur_spouse: cur_spouse.remove_family_handle(cur_family.get_handle()) self.parent.db.commit_person(cur_spouse,trans) - self.parent.db.commit_family(cur_family,trans) - + # if there are no children, remove it from the current person + # and delete the family if len(cur_family.get_child_handle_list()) == 0: - mother_id = cur_family.get_mother_handle() - father_id = cur_family.get_father_handle() - - for handle in [father_id, mother_id]: - if handle: - p = self.parent.db.get_person_from_handle(handle) - p.remove_family_handle(cur_family.get_handle()) - self.parent.db.commit_person(p,trans) - -# if len(cur_person.get_family_handle_list()) > 0: -# handle = cur_person.get_family_handle_list()[0] -# family = self.parent.db.find_family_from_handle(handle,trans) + cur_person.remove_family_handle(cur_family.get_handle()) + self.parent.db.commit_person(cur_person,trans) + self.parent.db.remove_family(cur_family.get_handle(),trans) + else: + self.parent.db.commit_family(cur_family,trans) person_id = cur_person.get_handle() self.person = self.parent.db.get_person_from_handle(person_id) @@ -1142,16 +1154,6 @@ class FamilyView: else: return _("%s: unknown") % (l) - def delete_family_from(self,person_handle,trans): - person = self.parent.db.get_person_from_handle(person_handle) - person.remove_family_handle(self.family.get_handle()) - self.parent.db.remove_family(self.family.get_handle(),trans) - flist = self.person.get_family_handle_list() - if len(flist) > 0: - self.family = self.parent.db.get_family_from_handle(flist[0]) - else: - self.family = None - def display_marriage(self,family): if not family: self.family = None @@ -1160,6 +1162,7 @@ class FamilyView: return hlist = family.get_child_handle_list() + self.child_model = DisplayModels.ChildModel(hlist,self.parent.db) self.child_list.set_model(self.child_model) self.family = self.parent.db.get_family_from_handle(family.get_handle()) @@ -1572,10 +1575,10 @@ class FamilyView: pname = self.person.get_primary_name() return (pname.get_surname_prefix(),pname.get_surname()) elif self.family: - fid = self.family.get_father_handle() - f = self.parent.db.get_family_from_handle(fid) - if f: - pname = f.get_primary_name() + father_handle = self.family.get_father_handle() + if father_handle: + father = self.parent.db.get_person_from_handle(father_handle) + pname = father.get_primary_name() return (pname.get_surname_prefix(),pname.get_surname()) return ("","") @@ -1584,10 +1587,12 @@ class FamilyView: def latin_american(self,val): if self.family: - father = self.family.get_father_handle() - mother = self.family.get_mother_handle() - if not father or not mother: + father_handle = self.family.get_father_handle() + mother_handle = self.family.get_mother_handle() + if not father_handle or not mother_handle: return ("","") + father = self.parent.db.get_person_from_handle(father_handle) + mother = self.parent.db.get_person_from_handle(mother_handle) fsn = father.get_primary_name().get_surname() msn = mother.get_primary_name().get_surname() if not father or not mother: @@ -1604,9 +1609,10 @@ class FamilyView: if self.person.get_gender() == RelLib.Person.MALE: fname = self.person.get_primary_name().get_first_name() elif self.family: - f = self.family.get_father_handle() - if f: - fname = f.get_primary_name().get_first_name() + father_handle = self.family.get_father_handle() + if father_handle: + father = self.parent.db.get_person_from_handle(father_handle) + fname = father.get_primary_name().get_first_name() if fname: fname = fname.split()[0] if val == 0: diff --git a/gramps2/src/GenericFilter.py b/gramps2/src/GenericFilter.py index c9d53d154..57a9063be 100644 --- a/gramps2/src/GenericFilter.py +++ b/gramps2/src/GenericFilter.py @@ -37,6 +37,7 @@ from xml.sax import make_parser,handler,SAXParseException # #------------------------------------------------------------------------- import os +import sets from gettext import gettext as _ #------------------------------------------------------------------------- @@ -266,7 +267,7 @@ class HasIdOf(Rule): #------------------------------------------------------------------------- # -# HasIdOf +# IsDefaultPerson # #------------------------------------------------------------------------- class IsDefaultPerson(Rule): @@ -276,11 +277,16 @@ class IsDefaultPerson(Rule): category = _('General filters') description = _("Matches the default person") - def apply(self,db,person): - def_person = db.get_default_person() - if def_person: - return person.handle == def_person.handle - return False + def prepare(self,db): + p = db.get_default_person() + if p: + self.def_handle = p.get_handle() + self.apply = self.apply_real + else: + self.apply = lambda db,p: False + + def apply_real(self,db,person): + return person.handle == self.def_handle #------------------------------------------------------------------------- # @@ -294,10 +300,16 @@ class IsBookmarked(Rule): category = _('General filters') description = _("Matches the people on the bookmark list") - def apply(self,db,person): - if person.handle in db.get_bookmarks(): - return True - return False + def prepare(self,db): + bookmarks = db.get_bookmarks() + if len(bookmarks) == 0: + self.apply = lambda db,p : False + else: + self.bookmarks = sets.Set(bookmarks) + self.apply = self.apply_real + + def apply_real(self,db,person): + return person.handle in self.bookmarks #------------------------------------------------------------------------- # @@ -342,7 +354,7 @@ class HasUnknownGender(Rule): description = _('Matches all people with unknown gender') def apply(self,db,person): - return person.get_gender() == RelLib.Person.UNKNOWN + return person.gender == RelLib.Person.UNKNOWN #------------------------------------------------------------------------- # @@ -369,8 +381,8 @@ class IsDescendantOf(Rule): except IndexError: first = True try: - root_handle = db.get_person_from_gramps_id(self.list[0]).get_handle() - self.init_list(root_handle,first) + root_person = db.get_person_from_gramps_id(self.list[0]) + self.init_list(root_person,first) except: pass @@ -380,18 +392,17 @@ class IsDescendantOf(Rule): def apply(self,db,person): return self.map.has_key(person.handle) - def init_list(self,handle,first): - if not handle: + def init_list(self,person,first): + if not person: return if not first: - self.map[handle] = 1 + self.map[person.handle] = 1 - p = self.db.get_person_from_handle(handle) - for fam_id in p.get_family_handle_list(): + for fam_id in person.get_family_handle_list(): fam = self.db.get_family_from_handle(fam_id) if fam: for child_handle in fam.get_child_handle_list(): - self.init_list(child_handle,0) + self.init_list(self.db.get_person_from_handle(child_handle),0) #------------------------------------------------------------------------- # @@ -408,8 +419,8 @@ class IsDescendantOfFilterMatch(IsDescendantOf): description = _("Matches people that are descendants of anybody matched by a filter") - def __init__(self,list): - IsDescendantOf.__init__(self,list) +# def __init__(self,list): +# IsDescendantOf.__init__(self,list) def prepare(self,db): self.db = db @@ -425,8 +436,9 @@ class IsDescendantOfFilterMatch(IsDescendantOf): filt = MatchesFilter(self.list) filt.prepare(db) for person_handle in db.get_person_handles(sort_handles=False): - if filt.apply (db, person_handle): - self.init_list (person_handle,first) + person = db.get_person_from_handle( person_handle) + if filt.apply (db, person): + self.init_list (person,first) filt.reset() def reset(self): @@ -454,8 +466,8 @@ class IsLessThanNthGenerationDescendantOf(Rule): self.db = db self.map = {} try: - root_handle = db.get_person_from_gramps_id(self.list[0]).get_handle() - self.init_list(root_handle,0) + root_person = db.get_person_from_gramps_id(self.list[0]) + self.init_list(root_person,0) except: pass @@ -465,19 +477,18 @@ class IsLessThanNthGenerationDescendantOf(Rule): def apply(self,db,person): return self.map.has_key(person.handle) - def init_list(self,handle,gen): - if not handle: + def init_list(self,person,gen): + if not person: return if gen: - self.map[handle] = 1 + self.map[person.handle] = 1 if gen >= int(self.list[1]): return - p = self.db.get_person_from_handle(handle) - for fam_id in p.get_family_handle_list(): + for fam_id in person.get_family_handle_list(): fam = self.db.get_family_from_handle(fam_id) for child_handle in fam.get_child_handle_list(): - self.init_list(child_handle,gen+1) + self.init_list(self.db.get_person_from_handle(child_handle),gen+1) #------------------------------------------------------------------------- # @@ -499,8 +510,8 @@ class IsMoreThanNthGenerationDescendantOf(Rule): self.db = db self.map = {} try: - root_handle = db.get_person_from_gramps_id(self.list[0]).get_handle() - self.init_list(root_handle,0) + root_person = db.get_person_from_gramps_id(self.list[0]) + self.init_list(root_person,0) except: pass @@ -510,17 +521,16 @@ class IsMoreThanNthGenerationDescendantOf(Rule): def apply(self,db,person): return self.map.has_key(person.handle) - def init_list(self,handle,gen): - if not handle: + def init_list(self,person,gen): + if not person: return if gen >= int(self.list[1]): - self.map[handle] = 1 + self.map[person.handle] = 1 - p = self.db.get_person_from_handle(handle) - for fam_id in p.get_family_handle_list(): + for fam_id in person.get_family_handle_list(): fam = self.db.get_family_from_handle(fam_id) for child_handle in fam.get_child_handle_list(): - self.init_list(child_handle,gen+1) + self.init_list(self.db.get_person_from_handle(child_handle),gen+1) #------------------------------------------------------------------------- # @@ -542,8 +552,9 @@ class IsChildOfFilterMatch(Rule): filt = MatchesFilter(self.list) filt.prepare(db) for person_handle in db.get_person_handles(sort_handles=False): - if filt.apply (db, person_handle): - self.init_list (person_handle) + person = db.get_person_from_handle( person_handle) + if filt.apply (db, person): + self.init_list (person) filt.reset() def reset(self): @@ -552,11 +563,10 @@ class IsChildOfFilterMatch(Rule): def apply(self,db,person): return self.map.has_key(person.handle) - def init_list(self,handle): - if not handle: + def init_list(self,person): + if not person: return - p = self.db.get_person_from_handle(handle) - for fam_id in p.get_family_handle_list(): + for fam_id in person.get_family_handle_list(): fam = self.db.get_family_from_handle(fam_id) for child_handle in fam.get_child_handle_list(): self.map[child_handle] = 1 @@ -580,8 +590,9 @@ class IsSiblingOfFilterMatch(Rule): filt = MatchesFilter(self.list) filt.prepare(db) for person_handle in db.get_person_handles(sort_handles=False): - if filt.apply (db, person_handle): - self.init_list (person_handle) + person = db.get_person_from_handle( person_handle) + if filt.apply (db, person): + self.init_list (person) filt.reset() def reset(self): @@ -590,11 +601,10 @@ class IsSiblingOfFilterMatch(Rule): def apply(self,db,person): return self.map.has_key(person.handle) - def init_list(self,handle): - if not handle: + def init_list(self,person): + if not person: return - p = self.db.get_person_from_handle(handle) - fam_id = p.get_main_parents_family_handle() + fam_id = person.get_main_parents_family_handle() fam = self.db.get_family_from_handle(fam_id) if fam: for child_handle in fam.get_child_handle_list(): @@ -614,13 +624,13 @@ class IsDescendantFamilyOf(Rule): name = _('Descendant family members of ') category = _('Descendant filters') description = _("Matches people that are descendants or the spouse " - "of a descendant of a specified person") + "of a descendant of a specified person") def apply(self,db,person): self.map = {} self.orig_handle = person.handle self.db = db - return self.search(handle,1) + return self.search(person.handle,1) def search(self,handle,val): try: @@ -674,8 +684,8 @@ class IsAncestorOf(Rule): except IndexError: first = 1 try: - root_handle = db.get_person_from_gramps_id(self.list[0]).get_handle() - self.init_ancestor_list(db,root_handle,first) + root_person = db.get_person_from_gramps_id(self.list[0]) + self.init_ancestor_list(db,root_person,first) except: pass @@ -685,23 +695,22 @@ class IsAncestorOf(Rule): def apply(self,db,person): return self.map.has_key(person.handle) - def init_ancestor_list(self,db,handle,first): - if not handle: + def init_ancestor_list(self,db,person,first): + if not person: return if not first: - self.map[handle] = 1 + self.map[person.handle] = 1 - p = db.get_person_from_handle(handle) - fam_id = p.get_main_parents_family_handle() + fam_id = person.get_main_parents_family_handle() fam = db.get_family_from_handle(fam_id) if fam: f_id = fam.get_father_handle() m_id = fam.get_mother_handle() if f_id: - self.init_ancestor_list(db,f_id,0) + self.init_ancestor_list(db,db.get_person_from_handle(f_id),0) if m_id: - self.init_ancestor_list(db,m_id,0) + self.init_ancestor_list(db,db.get_person_from_handle(m_id),0) #------------------------------------------------------------------------- # @@ -736,8 +745,9 @@ class IsAncestorOfFilterMatch(IsAncestorOf): filt = MatchesFilter(self.list) filt.prepare(db) for person_handle in db.get_person_handles(sort_handles=False): - if filt.apply (db, person_handle): - self.init_ancestor_list (db,person_handle,first) + person = db.get_person_from_handle( person_handle) + if filt.apply (db, person): + self.init_ancestor_list (db,person,first) filt.reset() def reset(self): @@ -868,8 +878,9 @@ class IsParentOfFilterMatch(Rule): filt = MatchesFilter(self.list) filt.prepare(db) for person_handle in db.get_person_handles(sort_handles=False): - if filt.apply (db, person_handle): - self.init_list (person_handle) + person = db.get_person_from_handle(person_handle) + if filt.apply (db, person): + self.init_list (person) filt.reset() def reset(self): @@ -878,9 +889,8 @@ class IsParentOfFilterMatch(Rule): def apply(self,db,person): return self.map.has_key(person.handle) - def init_list(self,handle): - p = self.db.get_person_from_handle(handle) - for fam_id,frel,mrel in p.get_parent_family_handle_list(): + def init_list(self,person): + for fam_id,frel,mrel in person.get_parent_family_handle_list(): fam = self.db.get_family_from_handle(fam_id) for parent_id in [fam.get_father_handle (), fam.get_mother_handle ()]: if parent_id: @@ -946,6 +956,7 @@ class HasCommonAncestorWithFilterMatch(HasCommonAncestorWith): def __init__(self,list): HasCommonAncestorWith.__init__(self,list) + self.ancestor_cache = {} def init_ancestor_cache(self,db): filt = MatchesFilter(self.list) @@ -953,7 +964,7 @@ class HasCommonAncestorWithFilterMatch(HasCommonAncestorWith): def init(self,h): self.ancestor_cache[h] = 1 for handle in db.get_person_handles(sort_handles=False): if (not self.ancestor_cache.has_key (handle) - and filt.apply (db, handle)): + and filt.apply (db, db.get_person_from_handle(handle))): for_each_ancestor(db,[handle],init,self) filt.reset() @@ -1297,10 +1308,9 @@ class SearchName(Rule): description = _("Matches people with a specified (partial) name") category = _('General filters') - def apply(self,db,handle): + def apply(self,db,person): self.f = self.list[0] - p = db.get_person_from_handle(handle) - n = NameDisplay.displayer.display(p) + n = NameDisplay.displayer.display(person) return self.f and n.upper().find(self.f.upper()) != -1 #------------------------------------------------------------------------- @@ -1356,13 +1366,13 @@ class MatchesFilter(Rule): for rule in filt.flist: rule.reset() - def apply(self,db,handle): + def apply(self,db,person): for filt in SystemFilters.get_filters(): if filt.get_name() == self.list[0]: - return filt.check(handle) + return filt.check(person.handle) for filt in CustomFilters.get_filters(): if filt.get_name() == self.list[0]: - return filt.check(db,handle) + return filt.check(db,person.handle) return False #------------------------------------------------------------------------- @@ -1386,9 +1396,9 @@ class IsSpouseOfFilterMatch(Rule): for spouse_id in [family.get_father_handle (), family.get_mother_handle ()]: if not spouse_id: continue - if spouse_id == handle: + if spouse_id == person.handle: continue - if filt.apply (db, spouse_id): + if filt.apply (db, db.get_person_from_handle( spouse_id)): return True return False @@ -1404,7 +1414,8 @@ class HaveAltFamilies(Rule): def apply(self,db,person): for (fam,rel1,rel2) in person.get_parent_family_handle_list(): - if rel1 == RelLib.Person.CHILD_ADOPTED or rel2 == RelLib.Person.CHILD_ADOPTED: + if rel1 == RelLib.Person.CHILD_ADOPTED \ + or rel2 == RelLib.Person.CHILD_ADOPTED: return True return False @@ -1816,6 +1827,36 @@ class HasSourceOf(Rule): return False return person.has_source_reference( self.source_handle) +#------------------------------------------------------------------------- +# "People having notes" +#------------------------------------------------------------------------- +class HasNote(Rule): + """People having notes""" + + name = _('People having notes') + description = _("Matches people that have a note") + category = _('General filters') + + def apply(self,db,person): + return bool(person.get_note()) + +#------------------------------------------------------------------------- +# "People having notes that contain a substring" +#------------------------------------------------------------------------- +class HasNoteMatchingSubstringOf(Rule): + """People having notes containing """ + + labels = [ _('Substring:')] + name = _('People having notes containing ') + description = _("Matches people whose notes contain text matching a substring") + category = _('General filters') + + def apply(self,db,person): + n = person.get_note() + if n: + return n.find(self.list[0]) != -1 + return False + #------------------------------------------------------------------------- # # GenericFilter @@ -1892,6 +1933,7 @@ class GenericFilter: person.unserialize(data[1]) if self.invert ^ task(db,person): final_list.append(data[0]) + data = cursor.next() else: for handle in id_list: person = db.get_person_from_handle(handle) @@ -1903,7 +1945,33 @@ class GenericFilter: return self.check_func(db,id_list,self.or_test) def check_and(self,db,id_list): - return self.check_func(db,id_list,self.and_test) + final_list = [] + flist = self.flist + invert = self.invert + if id_list == None: + cursor = db.get_person_cursor() + data = cursor.next() + p = RelLib.Person + while data: + person = p(data[1]) + val = True + for rule in flist: + if not rule.apply(db,person): + val = False + break + if invert ^ val: + final_list.append(data[0]) + data = cursor.next() + else: + for handle in id_list: + person = db.get_person_from_handle(handle) + val = True + for rule in flist: + if not rule.apply(db,person): + val = False + if invert ^ val: + final_list.append(handle) + return final_list def check_one(self,db,id_list): return self.check_func(db,id_list,self.one_test) @@ -1917,12 +1985,6 @@ class GenericFilter: test = test ^ rule.apply(db,handle) return test - def and_test(self,db,person): - for rule in self.flist: - if not rule.apply(db,person): - return False - return True - def one_test(self,db,person): count = 0 for rule in self.flist: @@ -1932,7 +1994,7 @@ class GenericFilter: count += 1 return count != 1 - def and_or(self,db,person): + def or_test(self,db,person): for rule in self.flist: if rule.apply(db,person): return True @@ -1946,7 +2008,7 @@ class GenericFilter: return m def check(self,db,handle): - return self.get_check_func()(db,handle) + return self.get_check_func()(db,[handle]) def apply(self,db,id_list=None): m = self.get_check_func() @@ -1957,7 +2019,6 @@ class GenericFilter: rule.reset() return res - #------------------------------------------------------------------------- # # Name to class mappings @@ -2068,6 +2129,8 @@ editor_rule_list = [ IsSiblingOfFilterMatch, RelationshipPathBetween, HasTextMatchingSubstringOf, + HasNote, + HasNoteMatchingSubstringOf ] #------------------------------------------------------------------------- @@ -2222,7 +2285,7 @@ class ParamFilter(GenericFilter): def set_parameter(self,param): self.param_list = [param] - def apply(self,db,id_list): + def apply(self,db,id_list=None): for rule in self.flist: rule.set_list(self.param_list) for rule in self.flist: @@ -2278,14 +2341,14 @@ class GrampsFilterComboBox(gtk.ComboBox): cnt += 1 for filt in SystemFilters.get_filters(): - self.store.append(row=[_(filt.get_name())]) + self.store.append(row=[filt.get_name()]) self.map[filt.get_name()] = filt if default != "" and default == filt.get_name(): active = cnt cnt += 1 for filt in CustomFilters.get_filters(): - self.store.append(row=[_(filt.get_name())]) + self.store.append(row=[filt.get_name()]) self.map[filt.get_name()] = filt if default != "" and default == filt.get_name(): active = cnt @@ -2306,7 +2369,7 @@ class GrampsFilterComboBox(gtk.ComboBox): active = self.get_active() if active < 0: return None - key = self.store[active][0] + key = unicode(self.store[active][0]) return self.map[key] diff --git a/gramps2/src/GrampsBSDDB.py b/gramps2/src/GrampsBSDDB.py index 7c553db24..512b8762d 100644 --- a/gramps2/src/GrampsBSDDB.py +++ b/gramps2/src/GrampsBSDDB.py @@ -43,7 +43,7 @@ from bsddb import dbshelve, db from RelLib import * from GrampsDbBase import * -_DBVERSION = 7 +_DBVERSION = 8 def find_surname(key,data): return str(data[3].get_surname()) @@ -516,12 +516,14 @@ class GrampsBSDDB(GrampsDbBase): self.upgrade_5() if version < 6: self.upgrade_6() - self.metadata['version'] = _DBVERSION if version < 7: + self.upgrade_7() + if version < 8: #self.upgrade_7() raise Exception("Currently there is no database upgrade available") else: print 'Successfully finished all upgrades' + self.metadata['version'] = _DBVERSION def upgrade_2(self,child_rel_notrans): print "Upgrading to DB version 2" @@ -851,6 +853,19 @@ class GrampsBSDDB(GrampsDbBase): def upgrade_7(self): print "Upgrading to DB version 7" + + self.genderStats = GenderStats() + cursor = self.get_person_cursor() + data = cursor.first() + while data: + handle,val = data + p = Person(val) + self.genderStats.count_person(p,self) + data = cursor.next() + cursor.close() + + def upgrade_8(self): + print "Upgrading to DB version 8" # First, make sure the stored default person handle is str, not unicode try: handle = self.metadata['default'] diff --git a/gramps2/src/GrampsDbBase.py b/gramps2/src/GrampsDbBase.py index 51e9c50b5..2b730fad7 100644 --- a/gramps2/src/GrampsDbBase.py +++ b/gramps2/src/GrampsDbBase.py @@ -311,7 +311,17 @@ class GrampsDbBase(GrampsDBCallback.GrampsDBCallback): update_list.append((handle,obj.serialize())) else: add_list.append((handle,obj.serialize())) - + + # committing person, do gender stats here + if old_data and key == PERSON_KEY: + old_person = Person(old_data) + if (old_data[2] != person.gender or + old_data[3].first_name != obj.primary_name.first_name): + self.genderStats.uncount_person(old_person) + self.genderStats.count_person(obj,self) + else: + self.genderStats.count_person(obj,self) + def commit_person(self,person,transaction,change_time=None): """ Commits the specified Person to the database, storing the changes @@ -632,27 +642,25 @@ class GrampsDbBase(GrampsDBCallback.GrampsDBCallback): """ assert False, "Needs to be overridden in the derived class" - def add_person(self,person,transaction): - """ - Adds a Person to the database, assigning internal IDs if they have - not already been defined. - """ - if not person.gramps_id: - person.gramps_id = self.find_next_person_gramps_id() - if not person.handle: - person.handle = self.create_id() - self.commit_person(person,transaction) - self.genderStats.count_person (person, self) - return person.handle - def _add_object(self,obj,transaction,find_next_func,commit_func): if not obj.gramps_id: obj.gramps_id = find_next_func() if not obj.handle: obj.handle = self.create_id() commit_func(obj,transaction) + if obj.__class__.__name__ == 'Person': + self.genderStats.count_person (person, self) return obj.handle + def add_person(self,person,transaction): + """ + Adds a Person to the database, assigning internal IDs if they have + not already been defined. + """ + return self._add_object(person,transaction, + self.find_next_person_gramps_id, + self.commit_person) + def add_family(self,family,transaction): """ Adds a Family to the database, assigning internal IDs if they have diff --git a/gramps2/src/ImageSelect.py b/gramps2/src/ImageSelect.py index e602e96f2..977b244fd 100644 --- a/gramps2/src/ImageSelect.py +++ b/gramps2/src/ImageSelect.py @@ -1170,6 +1170,8 @@ class GlobalMediaProperties: text = unicode(t.get_text(t.get_start_iter(),t.get_end_iter(),False)) desc = unicode(self.descr_window.get_text()) note = self.obj.get_note() + path = self.change_dialog.get_widget('path').get_text() + self.obj.set_path(path) if not self.date_object.is_equal(self.obj.get_date_object()): self.obj.set_date_object(self.date_object) diff --git a/gramps2/src/Marriage.py b/gramps2/src/Marriage.py index b02aa7bf6..fedb5401f 100644 --- a/gramps2/src/Marriage.py +++ b/gramps2/src/Marriage.py @@ -80,10 +80,16 @@ class Marriage: def __init__(self,parent,family,db): """Initializes the Marriage class, and displays the window""" + family_handle = family.get_handle() + # UGLY HACK to refresh faimly object from handle if that exists + # done to ensure that the family object is not stale, as it could + # have been changed by something external (merge, tool, etc). + if family_handle: + family = db.get_family_from_handle(family_handle) self.family = family self.parent = parent - if self.parent.child_windows.has_key(family.get_handle()): - self.parent.child_windows[family.get_handle()].present(None) + if self.parent.child_windows.has_key(family_handle): + self.parent.child_windows[family_handle].present(None) return self.child_windows = {} self.db = db diff --git a/gramps2/src/PedView.py b/gramps2/src/PedView.py index 9da5c0c9d..76b6c9a62 100644 --- a/gramps2/src/PedView.py +++ b/gramps2/src/PedView.py @@ -361,7 +361,6 @@ class PedigreeView: return True return 0 - def on_show_child_menu(self,obj): """User clicked button to move to child of active person""" diff --git a/gramps2/src/PeopleModel.py b/gramps2/src/PeopleModel.py index 92f908454..1ecae22d4 100644 --- a/gramps2/src/PeopleModel.py +++ b/gramps2/src/PeopleModel.py @@ -105,11 +105,12 @@ class PeopleModel(gtk.GenericTreeModel): return if data_filter: - handle_list = self.db.get_person_handles(sort_handles=False) - keys = data_filter.apply(self.db,handle_list) + keys = data_filter.apply(self.db) if self.invert_result: + handle_list = self.db.get_person_handles(sort_handles=False) + #TODO: Could be optimized by using a cursor keys = [k for k in handle_list if k not in keys] - del handle_list + del handle_list else: keys = self.db.get_person_handles(sort_handles=False) diff --git a/gramps2/src/PeopleView.py b/gramps2/src/PeopleView.py index 8e2727d35..802bf129e 100644 --- a/gramps2/src/PeopleView.py +++ b/gramps2/src/PeopleView.py @@ -211,7 +211,12 @@ class PeopleView: """Remove the selected person from the list. A person object is expected, not an ID""" path = self.person_model.on_get_path(person.get_handle()) - self.person_model.row_deleted(path) + #self.person_model.row_deleted(path) + (col,row) = path + if row > 0: + self.person_selection.select_path((col,row-1)) + elif row == 0 and self.person_model.on_get_iter(path): + self.person_selection.select_path(path) def remove_from_history(self,person_handle,old_id=None): """Removes a person from the history list""" @@ -289,7 +294,7 @@ class PeopleView: entries = [ (gtk.STOCK_GO_BACK,self.parent.back_clicked,back_sensitivity), (gtk.STOCK_GO_FORWARD,self.parent.fwd_clicked,fwd_sensitivity), - (gtk.STOCK_HOME,self.parent.on_home_clicked,1), + (_("Home"),self.parent.on_home_clicked,1), (_("Add Bookmark"),self.parent.on_add_bookmark_activate,sel_sensitivity), (None,None,0), (gtk.STOCK_ADD, self.parent.add_button_clicked,1), diff --git a/gramps2/src/PlaceView.py b/gramps2/src/PlaceView.py index 5b36b68fa..4822aec61 100644 --- a/gramps2/src/PlaceView.py +++ b/gramps2/src/PlaceView.py @@ -98,18 +98,19 @@ class PlaceView: order = gtk.SORT_DESCENDING self.sort_col = data handle = self.first_selected() + colmap = self.parent.db.get_place_column_order() + self.model = DisplayModels.PlaceModel(self.parent.db, - self.sort_col,order) + self.scol_map[self.sort_col],order) self.list.set_model(self.model) - colmap = self.parent.db.get_place_column_order() if handle: path = self.model.on_get_path(handle) self.selection.select_path(path) self.list.scroll_to_cell(path,None,1,0.5,0) for i in range(0,len(self.columns)): - self.columns[i].set_sort_indicator(i==colmap[data][1]-1) + self.columns[i].set_sort_indicator(i==self.sort_col) self.columns[self.sort_col].set_sort_order(order) def build_columns(self): @@ -122,12 +123,14 @@ class PlaceView: column.connect('clicked',self.column_clicked,0) column.set_clickable(True) self.list.append_column(column) + self.scol_map = [0] self.columns = [column] index = 1 for pair in self.parent.db.get_place_column_order(): if not pair[0]: continue + self.scol_map.append(pair[1]) name = column_names[pair[1]] column = gtk.TreeViewColumn(name, self.renderer, text=pair[1]) column.set_resizable(True) diff --git a/gramps2/src/ReadGedcom.py b/gramps2/src/ReadGedcom.py index e0ab7ec3e..a9cc77683 100644 --- a/gramps2/src/ReadGedcom.py +++ b/gramps2/src/ReadGedcom.py @@ -32,6 +32,7 @@ import re import string import const import time +import sets from gettext import gettext as _ #------------------------------------------------------------------------- @@ -279,6 +280,15 @@ class GedcomParser: self.lid2id = {} self.fid2id = {} + self.place_names = sets.Set() + cursor = dbase.get_place_cursor() + data = cursor.next() + while data: + (handle,val) = data + self.place_names.add(val[2]) + data = cursor.next() + cursor.close() + self.f = open(filename,"rU") self.filename = filename self.index = 0 @@ -742,18 +752,37 @@ class GedcomParser: self.sid2id[gramps_id] = intid return source - def find_or_create_place(self,gramps_id): + def find_or_create_place(self,title): place = RelLib.Place() - intid = self.lid2id.get(gramps_id) + + # check to see if we've encountered this name before + # if we haven't we need to get a new GRAMPS ID + intid = self.lid2id.get(title) + if intid == None: + new_id = self.db.find_next_place_gramps_id() + else: + new_id = None + + # check to see if the name already existed in the database + # if it does, create a new name by appending the GRAMPS ID. + # generate a GRAMPS ID if needed + + if title in self.place_names: + if not new_id: + new_id = self.db.find_next_place_gramps_id() + pname = "%s [%s]" % (title,new_id) + else: + pname = title + if self.db.place_map.has_key(intid): place.unserialize(self.db.place_map.get(intid)) else: intid = create_id() place.set_handle(intid) - place.set_title(gramps_id) - place.set_gramps_id(self.db.find_next_place_gramps_id()) + place.set_title(pname) + place.set_gramps_id(new_id) self.db.add_place(place,self.trans) - self.lid2id[gramps_id] = intid + self.lid2id[title] = intid return place def parse_cause(self,event,level): diff --git a/gramps2/src/ReadXML.py b/gramps2/src/ReadXML.py index 517e4b108..a82c9bb08 100644 --- a/gramps2/src/ReadXML.py +++ b/gramps2/src/ReadXML.py @@ -26,6 +26,7 @@ # #------------------------------------------------------------------------- import os +import sets import gtk import shutil from xml.parsers.expat import ExpatError, ParserCreate @@ -184,87 +185,6 @@ def importData(database, filename, callback=None,cl=0,use_trans=True): database.commit_media_object(mobject,None,change) except (IOError,OSError),msg: ErrorDialog(_('Could not copy file'),str(msg)) - - -#------------------------------------------------------------------------- -# def remove_clicked(): -# # File is lost => remove all references and the object itself -# mobj = database.find_object_from_handle(NewMediaID) -# for fid in database.get_family_handles(): -# p = database.get_family_from_handle(fid) -# nl = p.get_media_list() -# for o in nl: -# if o.get_reference() == mobj: -# nl.remove(o) -# p.set_media_list(nl) -# for key in database.get_person_handles(sort_handles=False): -# p = database.find_person_from_handle(key) -# nl = p.get_media_list() -# for o in nl: -# if o.get_reference_handle() == mobj.get_handle(): -# nl.remove(o) -# p.set_media_list(nl) -# for key in database.get_source_handles(): -# p = database.find_source_from_handle(key) -# nl = p.get_media_list() -# for o in nl: -# if o.get_reference_handle() == mobj.get_handle(): -# nl.remove(o) -# p.set_media_list(nl) -# for key in database.get_place_handles(): -# p = database.find_place_from_handle(key) -# nl = p.get_media_list() -# for o in nl: -# if o.get_reference() == mobj: -# nl.remove(o) -# p.set_media_list(nl) -# database.remove_object(NewMediaID) - - -# def leave_clicked(): -# # File is lost => do nothing, leave as is -# pass - -# def select_clicked(): -# # File is lost => select a file to replace the lost one -# def fs_close_window(obj): -# pass - -# def fs_ok_clicked(obj): -# name = fs_top.get_filename() -# if os.path.isfile(name): -# shutil.copyfile(name,newfile) -# try: -# shutil.copystat(name,newfile) -# except: -# pass - -# choose = gtk.FileChooserDialog('Select file', -# None, -# gtk.FILE_CHOOSER_ACTION_OPEN, -# (gtk.STOCK_CANCEL, -# gtk.RESPONSE_CANCEL, -# gtk.STOCK_OPEN, -# gtk.RESPONSE_OK)) - -# filter = gtk.FileFilter() -# filter.set_name(_('All files')) -# filter.add_pattern('*') -# choose.add_filter(filter) - -# response = choose.run() -# if response == gtk.RESPONSE_OK: -# name = fs_top.get_filename() -# if os.path.isfile(name): -# shutil.copyfile(name,newfile) -# try: -# shutil.copystat(name,newfile) -# except: -# pass -# choose.destroy() - -# del parser -# return 1 #------------------------------------------------------------------------- # @@ -299,7 +219,6 @@ class GrampsParser: self.gid2sid = {} self.change = change self.dp = DateHandler.parser - self.child_relmap = { "None" : RelLib.Person.CHILD_NONE, "Birth" : RelLib.Person.CHILD_BIRTH, @@ -309,6 +228,14 @@ class GrampsParser: "Foster" : RelLib.Person.CHILD_FOSTER, "Unknown" : RelLib.Person.CHILD_UNKNOWN, } + self.place_names = sets.Set() + cursor = database.get_place_cursor() + data = cursor.next() + while data: + (handle,val) = data + self.place_names.add(val[2]) + data = cursor.next() + cursor.close() self.ord = None self.objref = None @@ -686,6 +613,7 @@ class GrampsParser: title = attrs['title'] if title == "": title = attrs['id'] + self.placeobj.set_title(title) self.locations = 0 if self.callback != None and self.count % self.increment == 0: @@ -1242,6 +1170,11 @@ class GrampsParser: if self.placeobj.get_title() == "": loc = self.placeobj.get_main_location() self.placeobj.set_title(build_place_title(loc)) + + title = self.placeobj.get_title() + if title in self.place_names: + self.placeobj.set_title(title + " [%s]" % self.placeobj.get_gramps_id()) + self.db.commit_place(self.placeobj,self.trans,self.change) self.placeobj = None diff --git a/gramps2/src/RelLib.py b/gramps2/src/RelLib.py index 5fe80c72e..f3c6b525a 100644 --- a/gramps2/src/RelLib.py +++ b/gramps2/src/RelLib.py @@ -524,7 +524,7 @@ class SourceNote(BaseObject,NoteBase): for ix_replace in xrange(n_replace): ix = refs_list.index(old_handle) self.source_list[ix].ref = new_handle - refs_list.pop(ix) + refs_list[ix] = new_handle for item in self.get_sourcref_child_list(): item.replace_source_references(old_handle,new_handle) @@ -624,7 +624,7 @@ class MediaBase: for ix_replace in xrange(n_replace): ix = refs_list.index(old_handle) self.media_list[ix].ref = new_handle - refs_list.pop(ix) + refs_list[ix] = new_handle class DateBase: """ @@ -903,36 +903,38 @@ class Person(PrimaryObject,PrivateSourceNote,MediaBase,AttributeBase): CHILD_UNKNOWN = 6 CHILD_CUSTOM = 7 - def __init__(self): + def __init__(self,data=None): """ Creates a new Person instance. After initialization, most data items have empty or null values, including the database handle. """ - PrimaryObject.__init__(self) - PrivateSourceNote.__init__(self) - MediaBase.__init__(self) - AttributeBase.__init__(self) - self.primary_name = Name() - self.event_ref_list = [] - self.family_list = [] - self.parent_family_list = [] - self.nickname = "" - self.alternate_names = [] - self.gender = Person.UNKNOWN - self.death_ref = None - self.birth_ref = None - self.address_list = [] - self.urls = [] - self.lds_bapt = None - self.lds_endow = None - self.lds_seal = None - self.complete = False + if data: + self.unserialize(data) + else: + PrimaryObject.__init__(self) + PrivateSourceNote.__init__(self) + MediaBase.__init__(self) + AttributeBase.__init__(self) + self.primary_name = Name() + self.event_ref_list = [] + self.family_list = [] + self.parent_family_list = [] + self.nickname = "" + self.alternate_names = [] + self.gender = Person.UNKNOWN + self.death_ref = None + self.birth_ref = None + self.address_list = [] + self.urls = [] + self.lds_bapt = None + self.lds_endow = None + self.lds_seal = None + self.complete = False # We hold a reference to the GrampsDB so that we can maintain # its genderStats. It doesn't get set here, but from # GenderStats.count_person. - self.db = None def serialize(self): """ @@ -1128,12 +1130,7 @@ class Person(PrimaryObject,PrivateSourceNote,MediaBase,AttributeBase): @param name: L{Name} to be assigned to the person @type name: L{Name} """ - db = self.db - if db: - db.genderStats.uncount_person (self) self.primary_name = name - if db: - db.genderStats.count_person (self, db) def get_primary_name(self): """ @@ -1227,13 +1224,7 @@ class Person(PrimaryObject,PrivateSourceNote,MediaBase,AttributeBase): Person.UNKNOWN @type gender: int """ - # if the db object has been assigned, update the - # genderStats of the database - if self.db: - self.db.genderStats.uncount_person (self) self.gender = gender - if self.db: - self.db.genderStats.count_person (self, self.db) def get_gender(self) : """ @@ -1922,7 +1913,7 @@ class Family(PrimaryObject,SourceNote,MediaBase,AttributeBase): @return: Returns the list of objects refereincing primary objects. @rtype: list """ - return get_sourcref_child_list() + self.source_list + return self.get_sourcref_child_list() + self.source_list def set_complete_flag(self,val): """ @@ -4352,7 +4343,6 @@ class GenderStats: if not person: return # Let the Person do their own counting later - person.db = db name = self._get_key (person) if not name: diff --git a/gramps2/src/Relationship.py b/gramps2/src/Relationship.py index 6386d0f12..779568a35 100644 --- a/gramps2/src/Relationship.py +++ b/gramps2/src/Relationship.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2003-2004 Donald N. Allingham +# Copyright (C) 2003-2005 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,6 +29,7 @@ import RelLib import types from gettext import gettext as _ +from Utils import strip_context as __ #------------------------------------------------------------------------- # @@ -43,7 +44,7 @@ _level_name = [ "", "first", "second", "third", "fourth", "fifth", "sixth", _removed_level = [ "", " once removed", " twice removed", " three times removed", " four times removed", " five times removed", " six times removed", - " sevent times removed", " eight times removed", " nine times removed", + " sevent times removed", " eight times removed", " nine times removed", " ten times removed", " eleven times removed", " twelve times removed", " thirteen times removed", " fourteen times removed", " fifteen times removed", " sixteen times removed", " seventeen times removed", " eighteen times removed", @@ -240,12 +241,59 @@ class RelationshipCalculator: def is_spouse(self,orig,other): for f in orig.get_family_handle_list(): family = self.db.get_family_from_handle(f) - if family: - if other.get_handle() == family.get_father_handle() or other.get_handle() == family.get_mother_handle(): - return 1 + if family and other.get_handle() in [family.get_father_handle(), + family.get_mother_handle()]: + family_rel = family.get_relationship() + # Determine person's gender + if other.get_gender() == RelLib.Person.MALE: + gender = RelLib.Person.MALE + elif other.get_gender() == RelLib.Person.FEMALE: + gender = RelLib.Person.FEMALE + # Person's gender is unknown, try guessing from spouse's + elif orig.get_gender() == RelLib.Person.MALE: + if family_rel == RelLib.Family.CIVIL_UNION: + gender = RelLib.Person.MALE + else: + gender = RelLib.Person.FEMALE + elif orig.get_gender() == RelLib.Person.FEMALE: + if family_rel == RelLib.Family.CIVIL_UNION: + gender = RelLib.Person.FEMALE + else: + gender = RelLib.Person.MALE + else: + gender = RelLib.Person.UNKNOWN + + if family_rel == RelLib.Family.MARRIED: + if gender == RelLib.Person.MALE: + return _("husband") + elif gender == RelLib.Person.FEMALE: + return _("wife") + else: + return __("gender unknown|spouse") + elif family_rel == RelLib.Family.UNMARRIED: + if gender == RelLib.Person.MALE: + return __("unmarried|husband") + elif gender == RelLib.Person.FEMALE: + return __("unmarried|wife") + else: + return __("gender unknown,unmarried|spouse") + elif family_rel == RelLib.Family.CIVIL_UNION: + if gender == RelLib.Person.MALE: + return __("male,civil union|partner") + elif gender == RelLib.Person.FEMALE: + return __("female,civil union|partner") + else: + return __("gender unknown,civil union|partner") + else: + if gender == RelLib.Person.MALE: + return __("male,unknown relation|partner") + elif gender == RelLib.Person.FEMALE: + return __("female,unknown relation|partner") + else: + return __("gender unknown,unknown relation|partner") else: - return 0 - return 0 + return None + return None def get_relationship_distance(self,orig_person,other_person): """ @@ -304,8 +352,9 @@ class RelationshipCalculator: if orig_person.get_handle() == other_person.get_handle(): return ('', []) - if self.is_spouse(orig_person,other_person): - return ("spouse",[]) + is_spouse = self.is_spouse(orig_person,other_person) + if is_spouse: + return (is_spouse,[]) (firstRel,secondRel,common) = self.get_relationship_distance(orig_person,other_person) diff --git a/gramps2/src/Report.py b/gramps2/src/Report.py index 088c9e6e4..a49f538e2 100644 --- a/gramps2/src/Report.py +++ b/gramps2/src/Report.py @@ -1677,7 +1677,7 @@ class CommandLineReport: for paper in PaperMenu.paper_sizes: if paper.get_name() == self.options_dict['papers']: self.paper = paper - self.option_class.handler.set_paper(self.paper) + self.option_class.handler.set_paper(self.paper) self.options_help['papers'].append( [ paper.get_name() for paper in PaperMenu.paper_sizes if paper.get_name() != 'Custom Size' ] ) diff --git a/gramps2/src/ReportUtils.py b/gramps2/src/ReportUtils.py index 723d30ac1..965421a8c 100644 --- a/gramps2/src/ReportUtils.py +++ b/gramps2/src/ReportUtils.py @@ -401,6 +401,7 @@ def place_name(db,place_handle): place = db.get_place_from_handle(place_handle).get_title() else: place = "" + return place #------------------------------------------------------------------------- # diff --git a/gramps2/src/SelectChild.py b/gramps2/src/SelectChild.py index 22fd96517..318fe46ea 100644 --- a/gramps2/src/SelectChild.py +++ b/gramps2/src/SelectChild.py @@ -35,6 +35,7 @@ from gettext import gettext as _ #------------------------------------------------------------------------- import gtk.glade import gnome +import gobject #------------------------------------------------------------------------- # @@ -48,6 +49,8 @@ import PeopleModel import NameDisplay import AutoComp from QuestionDialog import ErrorDialog +import GenericFilter +import Date #------------------------------------------------------------------------- # @@ -116,10 +119,12 @@ class SelectChild: else: self.frel.set_sensitive(False) - self.refmodel = PeopleModel.PeopleModel(self.db) + self.likely_filter = GenericFilter.GenericFilter() + self.likely_filter.add_rule(LikelyFilter([self.person.handle])) + self.active_filter = self.likely_filter - self.add_child.set_model(self.refmodel) - self.redraw_child_list(2) + self.top.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH)) + gobject.idle_add(self.redraw_child_list) self.add_itself_to_menu() self.add_columns(self.add_child) self.top.show() @@ -176,110 +181,10 @@ class SelectChild: """Display the relevant portion of GRAMPS manual""" gnome.help_display('gramps-manual','gramps-edit-quick') - def redraw_child_list(self,filter): - return - - birth = self.db.get_event_from_handle(self.person.get_birth_handle()) - death = self.db.get_event_from_handle(self.person.get_death_handle()) - if birth: - bday = birth.get_date_object() - else: - bday = None - if death: - dday = death.get_date_object() - else: - dday = None - - slist = {} - for f in self.person.get_parent_family_handle_list(): - if f: - family = self.db.get_family_from_handle(f[0]) - if family.get_father_handle(): - slist[family.get_father_handle()] = 1 - elif family.get_mother_handle(): - slist[family.get_mother_handle()] = 1 - for c in family.get_child_handle_list(): - slist[c] = 1 - - person_list = [] - for key in self.db.get_person_handles(sort_handles=True): - person = self.db.get_person_from_handle(key) - if filter: - if slist.has_key(key) or person.get_main_parents_family_handle(): - continue - - birth_event = self.db.get_event_from_handle(person.get_birth_handle()) - if birth_event: - pbday = birth_event.get_date_object() - else: - pbday = None - - death_event = self.db.get_event_from_handle(person.get_death_handle()) - if death_event: - pdday = death_event.get_date_object() - else: - pdday = None - - if bday and bday.getYearValid(): - if pbday and pbday.getYearValid(): - # reject if child birthdate < parents birthdate + 10 - if pbday.getLowYear() < bday.getHighYear()+10: - continue - - # reject if child birthdate > parents birthdate + 90 - if pbday.getLowYear() > bday.getHighYear()+90: - continue - - if pdday and pdday.getYearValid(): - # reject if child deathdate < parents birthdate+ 10 - if pdday.getLowYear() < bday.getHighYear()+10: - continue - - if dday and dday.getYearValid(): - if pbday and pbday.getYearValid(): - # reject if childs birth date > parents deathday + 3 - if pbday.getLowYear() > dday.getHighYear()+3: - continue - - if pdday and pdday.getYearValid(): - # reject if childs death date > parents deathday + 150 - if pdday.getLowYear() > dday.getHighYear() + 150: - continue - - person_list.append(person.get_handle()) - - node = None - for idval in person_list: - person = self.db.get_person_from_handle(idval) - name = NameDisplay.displayer.display(person) - if person.gender == RelLib.Person.MALE: - gender = _("male") - elif person.gender == RelLib.Person.FEMALE: - gender = _("female") - else: - gender = _("unknown") - - bh = person.get_birth_handle() - dh = person.get_death_handle() - if bh: - bdate = self.db.get_event_from_handle(bh).get_date() - else: - bdate = "" - if dh: - ddate = self.db.get_event_from_handle(bh).get_date() - else: - ddate = "" - - rdata = [name,person.get_gramps_id(),gender,bdate,ddate] - node = self.refmodel.add(rdata) - - self.refmodel.connect_model() - - if node: - self.refmodel.selection.select_iter(node) - path = self.refmodel.model.get_path(node) - col = self.add_child.get_column(0) - self.add_child.scroll_to_cell(path,col,1,0.5,0.0) + def redraw_child_list(self): + self.refmodel = PeopleModel.PeopleModel(self.db,self.active_filter) + self.add_child.set_model(self.refmodel) + self.top.window.set_cursor(None) def select_function(self,store,path,node,id_list): id_list.append(self.refmodel.get_value(node,PeopleModel.COLUMN_INT_ID)) @@ -349,7 +254,14 @@ class SelectChild: self.callback() def on_show_toggled(self,obj): - self.redraw_child_list(not obj.get_active()) + if obj.get_active(): + self.active_filter = None + else: + self.active_filter = self.likely_filter + self.top.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH)) + while(gtk.events_pending()): + gtk.main_iteration() + self.redraw_child_list() def north_american(self,val): if self.person.get_gender() == RelLib.Person.MALE: @@ -397,3 +309,35 @@ class SelectChild: return ("","%sdttir" % fname) else: return ("","") + +#------------------------------------------------------------------------- +# +# Likely Filters +# +#------------------------------------------------------------------------- +class LikelyFilter(GenericFilter.Rule): + + category = _('General filters') + + def prepare(self,db): + person = db.get_person_from_handle(self.list[0]) + if person.birth_handle: + birth = db.get_event_from_handle(person.birth_handle) + dateobj = Date.Date(birth.date) + year = dateobj.get_year() + dateobj.set_year(year+10) + self.lower = dateobj.sortval + dateobj.set_year(year+70) + self.upper = dateobj.sortval + else: + self.lower = None + self.upper = None + + def apply(self,db,person): + if not person.birth_handle or (self.upper == None and + self.lower == None): + return True + event = db.get_event_from_handle(person.birth_handle) + return (event.date == None or event.date.sortval == 0 or + self.lower < event.date.sortval < self.upper) + diff --git a/gramps2/src/SourceView.py b/gramps2/src/SourceView.py index 9622757d1..88c61feec 100644 --- a/gramps2/src/SourceView.py +++ b/gramps2/src/SourceView.py @@ -59,7 +59,7 @@ column_names = [ _HANDLE_COL = len(column_names) #------------------------------------------------------------------------- -# + # # SouceView # #------------------------------------------------------------------------- @@ -97,7 +97,7 @@ class SourceView: self.sort_col = data handle = self.first_selected() self.model = DisplayModels.SourceModel(self.parent.db, - self.sort_col,order) + self.scol_map[self.sort_col],order) self.list.set_model(self.model) colmap = self.parent.db.get_place_column_order() @@ -106,7 +106,7 @@ class SourceView: self.selection.select_path(path) self.list.scroll_to_cell(path,None,1,0.5,0) for i in range(0,len(self.columns)): - self.columns[i].set_sort_indicator(i==colmap[data][1]-1) + self.columns[i].set_sort_indicator(i==self.sort_col) self.columns[self.sort_col].set_sort_order(order) def build_columns(self): @@ -119,12 +119,14 @@ class SourceView: column.set_clickable(True) column.connect('clicked',self.column_clicked,0) self.list.append_column(column) + self.scol_map = [0] self.columns = [column] index = 1 for pair in self.parent.db.get_source_column_order(): if not pair[0]: continue + self.scol_map.append(pair[1]) name = column_names[pair[1]] column = gtk.TreeViewColumn(name, self.renderer, text=pair[1]) column.connect('clicked',self.column_clicked,index) diff --git a/gramps2/src/TarFile.py b/gramps2/src/TarFile.py index 431c1339d..c890abb31 100644 --- a/gramps2/src/TarFile.py +++ b/gramps2/src/TarFile.py @@ -111,7 +111,7 @@ class ReadTarFile: if filename == None: return data self.f.read(24) # modes - l = self.f.read(12)(chr(0),' ') + l = self.f.read(12).replace(chr(0),' ') length = int(l,8) self.f.read(12) self.f.read(6) diff --git a/gramps2/src/Utils.py b/gramps2/src/Utils.py index 2a990cd94..ea6ae352d 100644 --- a/gramps2/src/Utils.py +++ b/gramps2/src/Utils.py @@ -643,7 +643,7 @@ def search_for(name): #------------------------------------------------------------------------- # -# Change label apperance +# Change label appearance # #------------------------------------------------------------------------- def bold_label(label,widget=None): @@ -1028,3 +1028,26 @@ def get_type_converter_by_name(val_str): elif val_str in ('str','unicode'): return unicode return unicode + +def strip_context(msgid,sep='|'): + """ + Strip the context used for resolving translation ambiguities. + + The translation of msgid is returned unless the translation is + not available and the msgid contains the separator. In that case, + the returned value is the portion of msgid following the last + separator. Default separator is '|'. + + @param msgid: The string to translated. + @type msgid: unicode + @param sep: The separator marking the context. + @type sep: unicode + @return: Translation or the original with context stripped. + @rtype: unicode + + """ + msgval = _(msgid) + sep_idx = msgid.rfind(sep) + if msgval == msgid and sep_idx != -1: + msgval = msgid[sep_idx+1:] + return msgval diff --git a/gramps2/src/WriteGedcom.py b/gramps2/src/WriteGedcom.py index 278abd0f4..ba900cc18 100644 --- a/gramps2/src/WriteGedcom.py +++ b/gramps2/src/WriteGedcom.py @@ -120,8 +120,8 @@ def add_familys_sources(db,family_handle,slist,private): continue for source_ref in attr.get_source_references(): sbase = source_ref.get_base_handle() - if sbase != None and not slist.has_key(sbase.get_handle()): - slist[sbase.get_handle()] = 1 + if sbase != None and not slist.has_key(sbase): + slist[sbase] = 1 #------------------------------------------------------------------------- # @@ -329,20 +329,28 @@ class GedcomWriterOptionBox: all.set_name(_("Entire Database")) all.add_rule(GenericFilter.Everyone([])) - des = GenericFilter.GenericFilter() - des.set_name(_("Descendants of %s") % NameDisplay.displayer.display(self.person)) - des.add_rule(GenericFilter.IsDescendantOf([self.person.get_handle(),1])) + if self.person: + des = GenericFilter.GenericFilter() + des.set_name(_("Descendants of %s") % + NameDisplay.displayer.display(self.person)) + des.add_rule(GenericFilter.IsDescendantOf( + [self.person.get_gramps_id(),1])) - ans = GenericFilter.GenericFilter() - ans.set_name(_("Ancestors of %s") % NameDisplay.displayer.display(self.person)) - ans.add_rule(GenericFilter.IsAncestorOf([self.person.get_handle(),1])) + ans = GenericFilter.GenericFilter() + ans.set_name(_("Ancestors of %s") + % NameDisplay.displayer.display(self.person)) + ans.add_rule(GenericFilter.IsAncestorOf( + [self.person.get_gramps_id(),1])) - com = GenericFilter.GenericFilter() - com.set_name(_("People with common ancestor with %s") % - NameDisplay.displayer.display(self.person)) - com.add_rule(GenericFilter.HasCommonAncestorWith([self.person.get_handle()])) + com = GenericFilter.GenericFilter() + com.set_name(_("People with common ancestor with %s") % + NameDisplay.displayer.display(self.person)) + com.add_rule(GenericFilter.HasCommonAncestorWith( + [self.person.get_gramps_id()])) - self.filter_menu = GenericFilter.build_filter_menu([all,des,ans,com]) + self.filter_menu = GenericFilter.build_filter_menu([all,des,ans,com]) + else: + self.filter_menu = GenericFilter.build_filter_menu([all]) filter_obj.set_menu(self.filter_menu) gedmap = GedcomInfo.GedcomInfoDB() @@ -734,16 +742,19 @@ class GedcomWriter: self.writeln('2 _STAT %s' % f[2]) break + for srcref in family.get_source_references(): + self.write_source_ref(1,srcref) + self.write_change(1,family.get_change_time()) def write_sources(self): index = 0.0 sorted = [] - for key in self.slist.keys(): - source = self.db.get_source_from_handle(key) + for handle in self.slist.keys(): + source = self.db.get_source_from_handle(handle) if not source: continue - data = (self.sid (source.get_gramps_id ()), source) + data = (self.sid(handle), source) sorted.append (data) sorted.sort () for (source_id, source) in sorted: @@ -896,12 +907,19 @@ class GedcomWriter: val = Utils.personalConstantAttributes[name] else: val = "" - if val : - self.writeln("1 %s" % val) + value = self.cnvtxt(attr.get_value()).replace('\r',' ') + if val: + if value: + self.writeln("1 %s %s" % (val, value)) + else: + self.writeln("1 %s" % val) else: self.writeln("1 EVEN") - self.writeln("2 TYPE %s" % self.cnvtxt(name)) - self.writeln("2 PLAC %s" % self.cnvtxt(attr.get_value()).replace('\r',' ')) + if value: + self.writeln("2 TYPE %s %s" % (self.cnvtxt(name), value +)) + else: + self.writeln("2 TYPE %s" % self.cnvtxt(name)) if attr.get_note(): self.write_long_text("NOTE",2,self.cnvtxt(attr.get_note())) for srcref in attr.get_source_references(): @@ -944,6 +962,8 @@ class GedcomWriter: photos = [] for photo in photos: + if self.private and photo.get_privacy(): + continue photo_obj_id = photo.get_reference_handle() photo_obj = self.db.get_object_from_handle(photo_obj_id) if photo_obj and photo_obj.get_mime_type() == "image/jpeg": @@ -975,14 +995,19 @@ class GedcomWriter: if self.adopt == GedcomInfo.ADOPT_PEDI: if family[1] == RelLib.Person.CHILD_ADOPTED: self.writeln("2 PEDI Adopted") - + for family_handle in person.get_family_handle_list(): if family_handle != None and self.flist.has_key(family_handle): self.writeln("1 FAMS @%s@" % self.fid(family_handle)) + for srcref in person.get_source_references(): + self.write_source_ref(1,srcref) + if not restricted: if self.obje: for url in person.get_url_list(): + if self.private and url.get_privacy(): + continue self.writeln('1 OBJE') self.writeln('2 FORM URL') if url.get_description(): @@ -1105,10 +1130,7 @@ class GedcomWriter: def print_date(self,prefix,date): start = date.get_start_date() - val = date.get_text() - if val: - self.writeln("%s %s" % (prefix,self.cnvtxt(val))) - elif not date.is_empty (): + if start != Date.EMPTY: cal = date.get_calendar() mod = date.get_modifier() if date.get_modifier() == Date.MOD_SPAN: @@ -1120,6 +1142,8 @@ class GedcomWriter: else: val = make_date(start,cal,mod) self.writeln("%s %s" % (prefix,val)) + elif date.get_text(): + self.writeln("%s %s" % (prefix,self.cnvtxt(date.get_text()))) def write_person_name(self,name,nick): firstName = self.cnvtxt(name.get_first_name()) @@ -1220,14 +1244,9 @@ class GedcomWriter: if match: self.writeln('1 REFN %d' % int(match.groups()[0])) - def sid(self,id): - if self.sidmap.has_key(id): - return self.sidmap[id] - else: - val = "S%05d" % self.sidval - self.sidval = self.sidval + 1 - self.sidmap[id] = val - return val + def sid(self,handle): + source = self.db.get_source_from_handle(handle) + return source.get_gramps_id() #------------------------------------------------------------------------- # diff --git a/gramps2/src/const.py.in b/gramps2/src/const.py.in index 865944f77..3e9ca5950 100644 --- a/gramps2/src/const.py.in +++ b/gramps2/src/const.py.in @@ -211,6 +211,61 @@ longopts = [ shortopts = "O:i:o:f:a:p:?" +#------------------------------------------------------------------------- +# +# Constants +# +#------------------------------------------------------------------------- + +child_rel_list = [ + _("None"), _("Birth"), _("Adopted"), _("Stepchild"), + _("Sponsored"), _("Foster"), _("Unknown"), _("Other"), ] + +child_rel_notrans = [ + "None", "Birth", "Adopted", "Stepchild", + "Sponsored", "Foster", "Unknown", "Other", ] + +child_relations = TransTable( { + _("Birth") : "Birth", + _("Adopted") : "Adopted", + _("Stepchild") : "Stepchild", + _("Sponsored") : "Sponsored", + _("Foster") : "Foster", + _("None") : "None", + _("Unknown") : "Unknown", + _("Other") : "Other", + }) + +#------------------------------------------------------------------------- +# +# Confidence +# +#------------------------------------------------------------------------- +confidence = [ + _("Very Low"), + _("Low"), + _("Normal"), + _("High"), + _("Very High"), + ] + +#------------------------------------------------------------------------- +# +# Family event string mappings +# +#------------------------------------------------------------------------- +familyConstantEvents = { + "Annulment" : "ANUL", + "Divorce Filing" : "DIVF", + "Divorce" : "DIV", + "Engagement" : "ENGA", + "Marriage Banns" : "MARB", + "Marriage Contract" : "MARC", + "Marriage License" : "MARL", + "Marriage Settlement" : "MARS", + "Marriage" : "MARR" + } + #------------------------------------------------------------------------- # # diff --git a/gramps2/src/docgen/AbiWord2Doc.py b/gramps2/src/docgen/AbiWord2Doc.py index e2002237b..4cdb4ef3c 100644 --- a/gramps2/src/docgen/AbiWord2Doc.py +++ b/gramps2/src/docgen/AbiWord2Doc.py @@ -1,7 +1,7 @@ # # Gramps - a GTK+/GNOME based genealogy program # -# Copyright (C) 2000-2004 Donald N. Allingham +# Copyright (C) 2000-2005 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -30,7 +30,6 @@ Provides a BaseDoc based interface to the AbiWord document format. # #------------------------------------------------------------------------- import base64 -import string import os import BaseDoc @@ -59,8 +58,7 @@ class AbiWordDoc(BaseDoc.BaseDoc): self.level = 0 self.new_page = 0 self.in_table = 0 - self.icount = 0; - self.imap = {} + self.in_paragraph = 0 def open(self,filename): """Opens the document, writing the necessary header information. @@ -161,15 +159,16 @@ class AbiWordDoc(BaseDoc.BaseDoc): def close(self): """Write the trailing information and closes the file""" self.f.write('\n') - if len(self.media_list) > 0: + if self.media_list: self.f.write('\n') - for file_tuple in self.media_list: - tag = self.imap[file_tuple[0]] - - img = ImgManip.ImgManip(file_tuple[0]) + for tag_number in range(len(self.media_list)): + name = self.media_list[tag_number] + img = ImgManip.ImgManip(name) buf = img.png_data() - self.f.write('\n' % tag) + self.f.write( + '\n' + % tag_number) self.f.write(base64.encodestring(buf)) self.f.write('\n') self.f.write('\n') @@ -206,14 +205,21 @@ class AbiWordDoc(BaseDoc.BaseDoc): act_height = y_cm act_width = x_cm*aspect_ratio - self.media_list.append((name,act_width,act_height)) + if name in self.media_list: + tag_number = self.media_list.index(name) + else: + tag_number = len(self.media_list) + self.media_list.append(name) - tag = "image%d" % self.icount + if self.in_paragraph: # We cannot insert photo + start_p = end_p = '' # outside text paragraph. + else: # So if not in paragraph, insert one. + start_p = '

' + end_p = '

' - self.f.write('' % y_cm) - self.imap[name] = tag - self.icount += 1 + self.f.write('%s%s ' + % (start_p,tag_number,act_height,act_width,end_p)) def start_superscript(self): self.text = self.text + '' @@ -222,6 +228,7 @@ class AbiWordDoc(BaseDoc.BaseDoc): self.text = self.text + '' def start_paragraph(self,style_name,leader=None): + self.in_paragraph = 1 style = self.style_list[style_name] self.current_style = style self.f.write('

' % style_name) @@ -236,6 +243,7 @@ class AbiWordDoc(BaseDoc.BaseDoc): self.new_page = 1 def end_paragraph(self): + self.in_paragraph = 0 self.f.write('

\n') def write_note(self,text,format,style_name): @@ -249,7 +257,7 @@ class AbiWordDoc(BaseDoc.BaseDoc): for line in text.split('\n\n'): self.start_paragraph(style_name) line = line.replace('\n',' ') - line = string.join(string.split(line)) + line = ' '.join(line.split()) self.write_text(line) self.end_paragraph() diff --git a/gramps2/src/get_strings b/gramps2/src/get_strings index 93289cf2c..d21a5e747 100755 --- a/gramps2/src/get_strings +++ b/gramps2/src/get_strings @@ -139,7 +139,7 @@ except ImportError: def _(s): return s __version__ = '1.4' -default_keywords = ['_'] +default_keywords = ['_','__'] EMPTYSTRING = '' diff --git a/gramps2/src/gramps.glade b/gramps2/src/gramps.glade index 8c160f40b..2165df801 100644 --- a/gramps2/src/gramps.glade +++ b/gramps2/src/gramps.glade @@ -4891,7 +4891,7 @@ tories</b> 0 - + 12 True 10 @@ -15821,7 +15821,7 @@ tories</b> True - C_ounty: + Co_unty: True False GTK_JUSTIFY_CENTER @@ -15853,7 +15853,7 @@ tories</b> True - Co_untry: + Count_ry: True False GTK_JUSTIFY_CENTER @@ -16229,7 +16229,7 @@ tories</b> True - P_hone: + Phon_e: True False GTK_JUSTIFY_LEFT @@ -25317,40 +25317,12 @@ Very High 12 True - 3 + 2 2 False 6 12 - - - True - Path: - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - True @@ -25400,8 +25372,8 @@ Very High 0 1 - 2 - 3 + 1 + 2 fill @@ -25435,7 +25407,7 @@ Very High - + True False @@ -25461,34 +25433,6 @@ Very High - - - - True - - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 2 - 3 - fill - - - 0 @@ -25525,8 +25469,8 @@ Very High 12 True - 2 - 3 + 3 + 2 False 6 6 @@ -25551,8 +25495,8 @@ Very High 0 - 1 - 2 + 0 + 1 0 1 fill @@ -25573,8 +25517,8 @@ Very High False - 2 - 3 + 1 + 2 0 1 @@ -25600,10 +25544,10 @@ Very High 0 - 1 - 2 - 1 - 2 + 0 + 1 + 2 + 3 fill @@ -25660,12 +25604,61 @@ Very High - 2 - 3 + 1 + 2 + 2 + 3 + fill + fill + + + + + + True + Path: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 1 2 fill - fill + + + + + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 1 + 2 + diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py index edd5725b4..11c4adefa 100755 --- a/gramps2/src/gramps_main.py +++ b/gramps2/src/gramps_main.py @@ -1086,6 +1086,16 @@ class Gramps(GrampsDBCallback.GrampsDBCallback): all.add_rule(GenericFilter.HasTextMatchingRegexpOf([])) filter_list.append(all) + all = GenericFilter.GenericFilter() + all.set_name(_("People with notes")) + all.add_rule(GenericFilter.HasNote([])) + filter_list.append(all) + + all = GenericFilter.ParamFilter() + all.set_name(_("People with notes containing...")) + all.add_rule(GenericFilter.HasNoteMatchingSubstringOf([])) + filter_list.append(all) + self.filter_model = GenericFilter.FilterStore(filter_list) self.filter_list.set_model(self.filter_model) self.filter_list.set_active(self.filter_model.default_index()) @@ -1118,7 +1128,14 @@ class Gramps(GrampsDBCallback.GrampsDBCallback): import MergePeople p1 = self.db.get_person_from_handle(mlist[0]) p2 = self.db.get_person_from_handle(mlist[1]) - merger = MergePeople.MergePeopleUI(self.db,p1,p2,self.merge_update) + if p1 and p2: + merger = MergePeople.MergePeopleUI(self.db,p1,p2,self.merge_update) + else: + msg = _("Cannot merge people.") + msg2 = _("Exactly two people must be selected to perform a merge. " + "A second person can be selected by holding down the " + "control key while clicking on the desired person.") + ErrorDialog(msg,msg2) elif page == PLACE_VIEW: self.place_view.merge() elif page == SOURCE_VIEW: @@ -1141,7 +1158,14 @@ class Gramps(GrampsDBCallback.GrampsDBCallback): import MergePeople p1 = self.db.get_person_from_handle(mlist[0]) p2 = self.db.get_person_from_handle(mlist[1]) - merger = MergePeople.Compare(self.db,p1,p2,self.merge_update) + if p1 and p2: + merger = MergePeople.Compare(self.db,p1,p2,self.merge_update) + else: + msg = _("Cannot merge people.") + msg2 = _("Exactly two people must be selected to perform a merge. " + "A second person can be selected by holding down the " + "control key while clicking on the desired person.") + ErrorDialog(msg,msg2) elif page == PLACE_VIEW: self.place_view.merge() elif page == SOURCE_VIEW: diff --git a/gramps2/src/plugins/Check.py b/gramps2/src/plugins/Check.py index 4f3248592..1ed2cdd5c 100644 --- a/gramps2/src/plugins/Check.py +++ b/gramps2/src/plugins/Check.py @@ -82,6 +82,7 @@ def runTool(database,active_person,callback,parent=None): checker.check_events() checker.check_place_references() + checker.check_source_references() database.transaction_commit(trans, _("Check Integrity")) database.enable_signals() database.request_rebuild() @@ -115,6 +116,7 @@ class CheckIntegrity: self.invalid_birth_events = [] self.invalid_death_events = [] self.invalid_place_references = [] + self.invalid_source_references = [] def family_errors(self): return len(self.broken_parent_links) + len(self.broken_links) + len(self.empty_family) @@ -429,6 +431,123 @@ class CheckIntegrity: self.db.commit_event(event,self.trans) self.invalid_place_references.append(key) + def check_source_references(self): + known_handles = self.db.get_source_handles() + + cursor = self.db.get_person_cursor() + data = cursor.first() + while data: + handle,info = data + person = RelLib.Person() + person.unserialize(info) + handle_list = person.get_referenced_handles_recursively() + bad_handles = [ item[1] for item in handle_list + if item[0] == 'Source' and + item[1] not in known_handles ] + if bad_handles: + person.remove_source_references(bad_handles) + self.db.commit_person(person,self.trans) + new_bad_handles = [handle for handle in bad_handles if handle + not in self.invalid_source_references] + self.invalid_source_references += new_bad_handles + data = cursor.next() + cursor.close() + + cursor = self.db.get_family_cursor() + data = cursor.first() + while data: + handle,info = data + family = RelLib.Family() + family.unserialize(info) + handle_list = family.get_referenced_handles_recursively() + bad_handles = [ item[1] for item in handle_list + if item[0] == 'Source' and + item[1] not in known_handles ] + if bad_handles: + family.remove_source_references(bad_handles) + self.db.commit_family(family,self.trans) + new_bad_handles = [handle for handle in bad_handles if handle + not in self.invalid_source_references] + self.invalid_source_references += new_bad_handles + data = cursor.next() + cursor.close() + + cursor = self.db.get_place_cursor() + data = cursor.first() + while data: + handle,info = data + place = RelLib.Place() + place.unserialize(info) + handle_list = place.get_referenced_handles_recursively() + bad_handles = [ item[1] for item in handle_list + if item[0] == 'Source' and + item[1] not in known_handles ] + if bad_handles: + place.remove_source_references(bad_handles) + self.db.commit_family(place,self.trans) + new_bad_handles = [handle for handle in bad_handles if handle + not in self.invalid_source_references] + self.invalid_source_references += new_bad_handles + data = cursor.next() + cursor.close() + + cursor = self.db.get_source_cursor() + data = cursor.first() + while data: + handle,info = data + source = RelLib.Source() + source.unserialize(info) + handle_list = source.get_referenced_handles_recursively() + bad_handles = [ item[1] for item in handle_list + if item[0] == 'Source' and + item[1] not in known_handles ] + if bad_handles: + source.remove_source_references(bad_handles) + self.db.commit_source(source,self.trans) + new_bad_handles = [handle for handle in bad_handles if handle + not in self.invalid_source_references] + self.invalid_source_references += new_bad_handles + data = cursor.next() + cursor.close() + + cursor = self.db.get_media_cursor() + data = cursor.first() + while data: + handle,info = data + obj = RelLib.MediaObject() + obj.unserialize(info) + handle_list = obj.get_referenced_handles_recursively() + bad_handles = [ item[1] for item in handle_list + if item[0] == 'Source' and + item[1] not in known_handles ] + if bad_handles: + obj.remove_source_references(bad_handles) + self.db.commit_object(obj,self.trans) + new_bad_handles = [handle for handle in bad_handles if handle + not in self.invalid_source_references] + self.invalid_source_references += new_bad_handles + data = cursor.next() + cursor.close() + + cursor = self.db.get_event_cursor() + data = cursor.first() + while data: + handle,info = data + event = RelLib.Event() + event.unserialize(info) + handle_list = event.get_referenced_handles_recursively() + bad_handles = [ item[1] for item in handle_list + if item[0] == 'Source' and + item[1] not in known_handles ] + if bad_handles: + event.remove_source_references(bad_handles) + self.db.commit_event(event,self.trans) + new_bad_handles = [handle for handle in bad_handles if handle + not in self.invalid_source_references] + self.invalid_source_references += new_bad_handles + data = cursor.next() + cursor.close() + def build_report(self,cl=0): bad_photos = len(self.bad_photo) replaced_photos = len(self.replaced_photo) @@ -443,8 +562,10 @@ class CheckIntegrity: death_invalid = len(self.invalid_death_events) person = birth_invalid + death_invalid place_references = len(self.invalid_place_references) + source_references = len(self.invalid_source_references) - errors = blink + efam + photos + rel + person + event_invalid + place_references + errors = blink + efam + photos + rel + person \ + + event_invalid + place_references + source_references if errors == 0: if cl: @@ -534,6 +655,10 @@ class CheckIntegrity: self.text.write(_("1 place was referenced but not found\n")) elif place_references > 1: self.text.write(_("%d places were referenced, but not found\n") % place_references) + if source_references == 1: + self.text.write(_("1 source was referenced but not found\n")) + elif source_references > 1: + self.text.write(_("%d sources were referenced, but not found\n") % source_references) return errors diff --git a/gramps2/src/plugins/DumpGenderStats.py b/gramps2/src/plugins/DumpGenderStats.py new file mode 100644 index 000000000..06b13a37e --- /dev/null +++ b/gramps2/src/plugins/DumpGenderStats.py @@ -0,0 +1,65 @@ +# +# Gramps - a GTK+/GNOME based genealogy program +# +# Copyright (C) 2000-2005 Martin Hawlisch, Donald N. Allingham +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# + +# $Id$ + +"Dump gender stats" + +import gtk +import ListModel +_GENDER = [ _(u'female'), _(u'male'), _(u'unknown') ] + +#------------------------------------------------------------------------- +# +# +# +#------------------------------------------------------------------------- +def DumpGenderStatsPlugin(database,active_person,callback,parent=None): + stats_list = [] + for name in database.genderStats.stats.keys(): + stats_list.append((name,)+database.genderStats.stats[name]+(_GENDER[database.genderStats.guess_gender(name)],)) + + titles = [(_('Name'),1,100), (_('Male'),2,70), + (_('Female'),3,70), ('Unknown',4,70), (_('Guess'),5,70) ] + treeview = gtk.TreeView() + model = ListModel.ListModel(treeview,titles) + for entry in stats_list: + model.add(entry,entry[0]) + w = gtk.Window() + w.set_position(gtk.WIN_POS_MOUSE) + w.set_default_size(400,300) + s=gtk.ScrolledWindow() + s.add(treeview) + w.add(s) + w.show_all() + +#------------------------------------------------------------------------- +# +# +# +#------------------------------------------------------------------------- +from PluginMgr import register_tool + +register_tool( + DumpGenderStatsPlugin, + _("Dumps gender statistics"), + category=_("Debug"), + description=_("Will dump the statistics for the gender guessing from the first name.") + ) diff --git a/gramps2/src/plugins/ExportVCalendar.py b/gramps2/src/plugins/ExportVCalendar.py index d9a18157c..036e7cc0d 100644 --- a/gramps2/src/plugins/ExportVCalendar.py +++ b/gramps2/src/plugins/ExportVCalendar.py @@ -2,6 +2,7 @@ # Gramps - a GTK+/GNOME based genealogy program # # Copyright (C) 2004 Martin Hawlisch +# Copyright (C) 2005 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -81,20 +82,29 @@ class CalendarWriterOptionBox: all.set_name(_("Entire Database")) all.add_rule(GenericFilter.Everyone([])) - des = GenericFilter.GenericFilter() - des.set_name(_("Descendants of %s") % self.person.get_primary_name().get_name()) - des.add_rule(GenericFilter.IsDescendantOf([self.person.get_handle(),1])) - - ans = GenericFilter.GenericFilter() - ans.set_name(_("Ancestors of %s") % self.person.get_primary_name().get_name()) - ans.add_rule(GenericFilter.IsAncestorOf([self.person.get_handle(),1])) - - com = GenericFilter.GenericFilter() - com.set_name(_("People with common ancestor with %s") % + if person: + des = GenericFilter.GenericFilter() + des.set_name(_("Descendants of %s") % self.person.get_primary_name().get_name()) - com.add_rule(GenericFilter.HasCommonAncestorWith([self.person.get_handle()])) + des.add_rule(GenericFilter.IsDescendantOf( + [self.person.get_gramps_id(),1])) - self.filter_menu = GenericFilter.build_filter_menu([all,des,ans,com]) + ans = GenericFilter.GenericFilter() + ans.set_name(_("Ancestors of %s") % + self.person.get_primary_name().get_name()) + ans.add_rule(GenericFilter.IsAncestorOf( + [self.person.get_gramps_id(),1])) + + com = GenericFilter.GenericFilter() + com.set_name(_("People with common ancestor with %s") % + self.person.get_primary_name().get_name()) + com.add_rule(GenericFilter.HasCommonAncestorWith( + [self.person.get_gramps_id()])) + + self.filter_menu = GenericFilter.build_filter_menu( + [all,des,ans,com]) + else: + self.filter_menu = GenericFilter.build_filter_menu([all]) filter_obj.set_menu(self.filter_menu) the_box = self.topDialog.get_widget('vbox1') diff --git a/gramps2/src/plugins/ExportVCard.py b/gramps2/src/plugins/ExportVCard.py index b9085fca6..75e831c46 100644 --- a/gramps2/src/plugins/ExportVCard.py +++ b/gramps2/src/plugins/ExportVCard.py @@ -2,6 +2,7 @@ # Gramps - a GTK+/GNOME based genealogy program # # Copyright (C) 2004 Martin Hawlisch +# Copyright (C) 2005 Donald N. Allingham # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -27,7 +28,6 @@ # #------------------------------------------------------------------------- import os -import string import time import re @@ -84,20 +84,29 @@ class CardWriterOptionBox: all.set_name(_("Entire Database")) all.add_rule(GenericFilter.Everyone([])) - des = GenericFilter.GenericFilter() - des.set_name(_("Descendants of %s") % self.person.get_primary_name().get_name()) - des.add_rule(GenericFilter.IsDescendantOf([self.person.get_handle(),1])) - - ans = GenericFilter.GenericFilter() - ans.set_name(_("Ancestors of %s") % self.person.get_primary_name().get_name()) - ans.add_rule(GenericFilter.IsAncestorOf([self.person.get_handle(),1])) - - com = GenericFilter.GenericFilter() - com.set_name(_("People with common ancestor with %s") % + if self.person: + des = GenericFilter.GenericFilter() + des.set_name(_("Descendants of %s") % self.person.get_primary_name().get_name()) - com.add_rule(GenericFilter.HasCommonAncestorWith([self.person.get_handle()])) + des.add_rule(GenericFilter.IsDescendantOf( + [self.person.get_gramps_id(),1])) - self.filter_menu = GenericFilter.build_filter_menu([all,des,ans,com]) + ans = GenericFilter.GenericFilter() + ans.set_name(_("Ancestors of %s") % + self.person.get_primary_name().get_name()) + ans.add_rule(GenericFilter.IsAncestorOf( + [self.person.get_gramps_id(),1])) + + com = GenericFilter.GenericFilter() + com.set_name(_("People with common ancestor with %s") % + self.person.get_primary_name().get_name()) + com.add_rule(GenericFilter.HasCommonAncestorWith( + [self.person.get_gramps_id()])) + + self.filter_menu = GenericFilter.build_filter_menu( + [all,des,ans,com]) + else: + self.filter_menu = GenericFilter.build_filter_menu([all]) filter_obj.set_menu(self.filter_menu) the_box = self.topDialog.get_widget('vbox1') diff --git a/gramps2/src/plugins/GraphViz.py b/gramps2/src/plugins/GraphViz.py index ad9a7aaf1..3383eaa8a 100644 --- a/gramps2/src/plugins/GraphViz.py +++ b/gramps2/src/plugins/GraphViz.py @@ -48,6 +48,7 @@ import Report import ReportOptions import GenericFilter import const +import RelLib from BaseDoc import PAPER_LANDSCAPE from latin_utf8 import utf8_to_latin from QuestionDialog import ErrorDialog @@ -233,8 +234,8 @@ class GraphViz: family = self.database.get_family_from_handle(family_handle) father_handle = family.get_father_handle() mother_handle = family.get_mother_handle() - fadopted = frel != _("Birth") - madopted = mrel != _("Birth") + fadopted = frel != RelLib.Person.CHILD_REL_BIRTH + madopted = mrel != RelLib.Person.CHILD_REL_BIRTH famid = family.get_gramps_id().replace('-','_') if (self.show_families and (father_handle and person_dict.has_key(father_handle) or @@ -504,10 +505,10 @@ class GraphVizOptions(ReportOptions.ReportOptions): """Set up the list of possible content filters.""" if person: name = person.get_primary_name().get_name() - handle = person.get_handle() + gramps_id = person.get_gramps_id() else: name = 'PERSON' - handle = '' + gramps_id = '' all = GenericFilter.GenericFilter() all.set_name(_("Entire Database")) @@ -515,15 +516,15 @@ class GraphVizOptions(ReportOptions.ReportOptions): des = GenericFilter.GenericFilter() des.set_name(_("Descendants of %s") % name) - des.add_rule(GenericFilter.IsDescendantOf([handle,1])) + des.add_rule(GenericFilter.IsDescendantOf([gramps_id,1])) ans = GenericFilter.GenericFilter() ans.set_name(_("Ancestors of %s") % name) - ans.add_rule(GenericFilter.IsAncestorOf([handle,1])) + ans.add_rule(GenericFilter.IsAncestorOf([gramps_id,1])) com = GenericFilter.GenericFilter() com.set_name(_("People with common ancestor with %s") % name) - com.add_rule(GenericFilter.HasCommonAncestorWith([handle])) + com.add_rule(GenericFilter.HasCommonAncestorWith([gramps_id])) return [all,des,ans,com] diff --git a/gramps2/src/plugins/IndivComplete.py b/gramps2/src/plugins/IndivComplete.py index 0f385ffa3..4b8028fe2 100644 --- a/gramps2/src/plugins/IndivComplete.py +++ b/gramps2/src/plugins/IndivComplete.py @@ -497,14 +497,14 @@ class IndivCompleteOptions(ReportOptions.ReportOptions): """Set up the list of possible content filters.""" if person: name = person.get_primary_name().get_name() - handle = person.get_handle() + gramps_id = person.get_gramps_id() else: name = 'PERSON' - handle = '' + gramps_id = '' filt_id = GenericFilter.GenericFilter() filt_id.set_name(name) - filt_id.add_rule(GenericFilter.HasIdOf([handle])) + filt_id.add_rule(GenericFilter.HasIdOf([gramps_id])) all = GenericFilter.GenericFilter() all.set_name(_("Entire Database")) @@ -512,15 +512,15 @@ class IndivCompleteOptions(ReportOptions.ReportOptions): des = GenericFilter.GenericFilter() des.set_name(_("Descendants of %s") % name) - des.add_rule(GenericFilter.IsDescendantOf([handle,1])) + des.add_rule(GenericFilter.IsDescendantOf([gramps_id,1])) ans = GenericFilter.GenericFilter() ans.set_name(_("Ancestors of %s") % name) - ans.add_rule(GenericFilter.IsAncestorOf([handle,1])) + ans.add_rule(GenericFilter.IsAncestorOf([gramps_id,1])) com = GenericFilter.GenericFilter() com.set_name(_("People with common ancestor with %s") % name) - com.add_rule(GenericFilter.HasCommonAncestorWith([handle])) + com.add_rule(GenericFilter.HasCommonAncestorWith([gramps_id])) return [filt_id,all,des,ans,com] diff --git a/gramps2/src/plugins/Makefile.am b/gramps2/src/plugins/Makefile.am index 3a7405973..a684bc281 100644 --- a/gramps2/src/plugins/Makefile.am +++ b/gramps2/src/plugins/Makefile.am @@ -21,6 +21,8 @@ pkgdata_PYTHON = \ DetAncestralReport.py\ DetDescendantReport.py\ EventCmp.py\ + ExportVCalendar.py\ + ExportVCard.py\ FamilyGroup.py\ FanChart.py\ FtmStyleAncestors.py\ @@ -29,6 +31,7 @@ pkgdata_PYTHON = \ GraphViz.py\ IndivComplete.py\ IndivSummary.py\ + ImportvCard.py\ Merge.py\ PatchNames.py\ ReadPkg.py\ @@ -81,7 +84,9 @@ GLADEFILES = \ book.glade\ writeftree.glade\ genewebexport.glade\ - scratchpad.glade + scratchpad.glade\ + vcardexport.glade\ + vcalendarexport.glade GRAPHICS = \ stock_link.png diff --git a/gramps2/src/plugins/NavWebPage.py b/gramps2/src/plugins/NavWebPage.py index 8e14cb246..e8de2d3d4 100644 --- a/gramps2/src/plugins/NavWebPage.py +++ b/gramps2/src/plugins/NavWebPage.py @@ -135,7 +135,7 @@ class BasePage: of.write('
\n') of.write('
\n') of.write('
\n') - of.write('
Generated by ') + of.write('
%s ' % _('Generated by')) of.write('GRAMPS ') of.write('on 13 December 2004.') of.write('
\n') @@ -159,14 +159,14 @@ class BasePage: of.write('

%s

\n' % self.title_str) of.write('
\n') of.write('
\n') - of.write(' Home  \n') - of.write(' Introduction  \n') - of.write(' Surnames  \n') - of.write(' Individuals  \n') - of.write(' Sources  \n') - of.write(' Places  \n') - of.write(' Download  \n') - of.write(' Contact  \n') + of.write(' %s  \n' % _('Home')) + of.write(' %s  \n' % _('Introduction')) + of.write(' %s  \n' % _('Surnames')) + of.write(' %s  \n' % _('Individuals')) + of.write(' %s  \n' % _('Sources')) + of.write(' %s  \n' % _('Places')) + of.write(' %s  \n' % _('Download')) + of.write(' %s  \n' % _('Contact')) of.write('
\n') of.write('
\n') @@ -255,9 +255,9 @@ class PlaceListPage(BasePage): for handle in handle_list: place = db.get_place_from_handle(handle) - n = place.title + n = ReportUtils.place_name(db,handle) - if len(n) == 0: + if not n or len(n) == 0: continue if n[0] != last_letter: @@ -274,7 +274,7 @@ class PlaceListPage(BasePage): of.write(' ') of.write('') of.write(n) - of.write(' ' % place.gramps_id) + of.write(' ' % place.gramps_id) of.write('[%s]' % place.gramps_id) of.write('') @@ -282,6 +282,58 @@ class PlaceListPage(BasePage): self.display_footer(of) of.close() +#------------------------------------------------------------------------ +# +# +# +#------------------------------------------------------------------------ +class PlacePage(BasePage): + + def __init__(self, db, title, place_handle, html_dir, src_list): + place = db.get_place_from_handle( place_handle) + BasePage.__init__(self,title) + page_name = os.path.join(html_dir,place.get_gramps_id()+".html") + of = open(page_name, "w") + place_name = ReportUtils.place_name(db,place_handle) + self.display_header(of,place_name, + db.get_researcher().get_name()) + of.write('

%s

\n' % place_name) + + photolist = place.get_media_list() + if photolist: + photo_handle = photolist[0].get_reference_handle() + photo = db.get_object_from_handle(photo_handle) + + try: + newpath = photo.gramps_id + os.path.splitext(photo.get_path())[1] + shutil.copyfile(photo.get_path(),os.path.join(html_dir,newpath)) + of.write('
\n') + of.write('' % newpath) + of.write('') + of.write('
\n') + except (IOError,OSError),msg: + ErrorDialog(str(msg)) + + # TODO: Add more information + + of.write('

%s

\n' % _('Narrative')) + of.write('
\n') + + noteobj = place.get_note_object() + if noteobj: + format = noteobj.get_format() + text = noteobj.get() + + if format: + text = "
" + "
".join(text.split("\n"))
+            else:
+                text = "
".join(text.split("\n"))
+            of.write('
%s
\n' % text)
+
+        self.display_footer(of)
+        of.close()
+
 #------------------------------------------------------------------------
 #
 # 
@@ -403,13 +455,16 @@ class HomePage(BasePage):
             else:
                 mime_type = obj.get_mime_type()
                 if mime_type and mime_type.startswith("image"):
-                    newpath = obj.gramps_id + os.path.splitext(obj.get_path())[1]
-                    shutil.copyfile(obj.get_path(),
-                                    os.path.join(html_dir,newpath))
-                    of.write('
\n')
-                    of.write('' % newpath)
-                    of.write('
\n')
+                    try:
+                        newpath = obj.gramps_id + os.path.splitext(obj.get_path())[1]
+                        shutil.copyfile(obj.get_path(),
+                                        os.path.join(html_dir,newpath))
+                        of.write('
\n')
+                        of.write('' % newpath)
+                        of.write('
\n')
+                    except (IOError,OSError),msg:
+                        ErrorDialog(str(msg))
     
                 note_obj = obj.get_note_object()
                 if note_obj:
@@ -447,9 +502,12 @@ class SourcesPage(BasePage):
 
         index = 1
         for handle in handle_list:
+            source = db.get_source_from_handle(handle)
             of.write('%d.\n' % index)
             of.write('')
+            of.write(source.get_title())
             of.write('\n')
+            index += 1
             
         of.write('\n
\n')
 
@@ -615,13 +673,16 @@ class IndividualPage(BasePage):
             photo_handle = photolist[0].get_reference_handle()
             photo = self.db.get_object_from_handle(photo_handle)
             
-            newpath = self.person.gramps_id + os.path.splitext(photo.get_path())[1]
-            shutil.copyfile(photo.get_path(),os.path.join(self.dirpath,newpath))
-            of.write('
\n')
-            of.write('' % newpath)
-            of.write('')
-            of.write('
\n')
+            try:
+                newpath = self.person.gramps_id + os.path.splitext(photo.get_path())[1]
+                shutil.copyfile(photo.get_path(),os.path.join(self.dirpath,newpath))
+                of.write('
\n')
+                of.write('' % newpath)
+                of.write('')
+                of.write('
\n')
+            except (IOError,OSError),msg:
+                ErrorDialog(str(msg))
 
         of.write('
\n')
         of.write('
%s
\n' % self.sort_name)
@@ -819,6 +880,8 @@ class IndividualPage(BasePage):
                 of.write('
\n')
 
     def format_event(self,event):
+        for sref in event.get_source_references():
+            self.src_list.add(sref.get_base_handle())
         descr = event.get_description()
         place_handle = event.get_place_handle()
         if place_handle:
@@ -994,6 +1057,11 @@ class WebReport(Report.Report):
 
         PlaceListPage(self.database, self.title, place_list,
                       dir_name, source_list)
+        
+        for place in place_list:
+            print place
+            PlacePage(self.database, self.title, place, dir_name, source_list)
+            
         SourcesPage(self.database,self.title, source_list, dir_name)
         self.progress_bar_done()
 
@@ -1031,7 +1099,7 @@ class WebReportOptions(ReportOptions.ReportOptions):
             'HTMLsplita'        : 0, 
             'HTMLshorttree'     : 1,
             'HTMLimagedir'      : 'images', 
-            'HTMLtitle'         : 'My Family Tree', 
+            'HTMLtitle'         : _('My Family Tree'), 
             'HTMLincid'         : 0,
             'HTMLidurl'         : '',
             'HTMLlinktidx'      : 1,
@@ -1058,10 +1126,10 @@ class WebReportOptions(ReportOptions.ReportOptions):
         """Set up the list of possible content filters."""
         if person:
             name = person.get_primary_name().get_name()
-            handle = person.get_handle()
+            gramps_id = person.get_gramps_id()
         else:
             name = 'PERSON'
-            handle = ''
+            gramps_is = ''
 
         all = GenericFilter.GenericFilter()
         all.set_name(_("Entire Database"))
@@ -1069,19 +1137,19 @@ class WebReportOptions(ReportOptions.ReportOptions):
 
         des = GenericFilter.GenericFilter()
         des.set_name(_("Descendants of %s") % name)
-        des.add_rule(GenericFilter.IsDescendantOf([handle,1]))
+        des.add_rule(GenericFilter.IsDescendantOf([gramps_id,1]))
 
         df = GenericFilter.GenericFilter()
         df.set_name(_("Descendant Families of %s") % name)
-        df.add_rule(GenericFilter.IsDescendantFamilyOf([handle]))
+        df.add_rule(GenericFilter.IsDescendantFamilyOf([gramps_id]))
 
         ans = GenericFilter.GenericFilter()
         ans.set_name(_("Ancestors of %s") % name)
-        ans.add_rule(GenericFilter.IsAncestorOf([handle,1]))
+        ans.add_rule(GenericFilter.IsAncestorOf([gramps_id,1]))
 
         com = GenericFilter.GenericFilter()
         com.set_name(_("People with common ancestor with %s") % name)
-        com.add_rule(GenericFilter.HasCommonAncestorWith([handle]))
+        com.add_rule(GenericFilter.HasCommonAncestorWith([gramps_id]))
 
         return [all,des,df,ans,com]
 
diff --git a/gramps2/src/plugins/StatisticsChart.py b/gramps2/src/plugins/StatisticsChart.py
index 92bab7079..7e67bf475 100755
--- a/gramps2/src/plugins/StatisticsChart.py
+++ b/gramps2/src/plugins/StatisticsChart.py
@@ -818,10 +818,10 @@ class StatisticsChartOptions(ReportOptions.ReportOptions):
     
         if person:
             name = person.get_primary_name().get_name()
-            handle = person.get_handle()
+            gramps_id = person.get_gramps_id()
         else:
             name = 'PERSON'
-            handle = ''
+            gramps_id = ''
     
         all = GenericFilter.GenericFilter()
         all.set_name(_("Entire Database"))
@@ -829,15 +829,15 @@ class StatisticsChartOptions(ReportOptions.ReportOptions):
 
         des = GenericFilter.GenericFilter()
         des.set_name(_("Descendants of %s") % name)
-        des.add_rule(GenericFilter.IsDescendantOf([handle, 1]))
+        des.add_rule(GenericFilter.IsDescendantOf([gramps_id, 1]))
 
         ans = GenericFilter.GenericFilter()
         ans.set_name(_("Ancestors of %s") % name)
-        ans.add_rule(GenericFilter.IsAncestorOf([handle, 1]))
+        ans.add_rule(GenericFilter.IsAncestorOf([gramps_id, 1]))
 
         com = GenericFilter.GenericFilter()
         com.set_name(_("People with common ancestor with %s") % name)
-        com.add_rule(GenericFilter.HasCommonAncestorWith([handle]))
+        com.add_rule(GenericFilter.HasCommonAncestorWith([gramps_id]))
 
         return [all, des, ans, com]
 
@@ -865,10 +865,14 @@ class StatisticsChartOptions(ReportOptions.ReportOptions):
         self.reverse.show()
 
         # year range
-        self.from_box = gtk.Entry(4)
-        self.from_box.set_text(str(self.options_dict['year_from']))
-        self.to_box = gtk.Entry(4)
-        self.to_box.set_text(str(self.options_dict['year_to']))
+	from_adj = gtk.Adjustment(value=self.options_dict['year_from'],
+				  lower=1, upper=time.localtime()[0],
+				  step_incr=1, page_incr=100)
+        self.from_box = gtk.SpinButton(adjustment=from_adj, digits=0)
+	to_adj = gtk.Adjustment(value=self.options_dict['year_to'],
+				lower=1, upper=time.localtime()[0],
+				step_incr=1, page_incr=100)
+        self.to_box = gtk.SpinButton(adjustment=to_adj, digits=0)
 
         box = gtk.HBox()
         box.add(self.from_box)
@@ -897,8 +901,9 @@ class StatisticsChartOptions(ReportOptions.ReportOptions):
 
         # max. pie item selection
         tip = _("With fewer items pie chart and legend will be used instead of a bar chart.")
-        self.bar_items = gtk.Entry(2)
-        self.bar_items.set_text(str(self.options_dict['bar_items']))
+	pie_adj = gtk.Adjustment(value=self.options_dict['bar_items'],
+				 lower=0, upper=20, step_incr=1)
+        self.bar_items = gtk.SpinButton(adjustment=pie_adj, digits=0)
         dialog.add_option(_("Max. items for a pie"), self.bar_items, tip)
 
         # -------------------------------------------------
@@ -933,11 +938,11 @@ class StatisticsChartOptions(ReportOptions.ReportOptions):
         """
         self.options_dict['sortby'] = _options.sorts[self.sort_menu.get_active()][0]
         self.options_dict['reverse'] = int(self.reverse.get_active())
-        self.options_dict['year_to'] = int(self.to_box.get_text())
-        self.options_dict['year_from'] = int(self.from_box.get_text())
+        self.options_dict['year_to'] = int(self.to_box.get_value_as_int())
+        self.options_dict['year_from'] = int(self.from_box.get_value_as_int())
         self.options_dict['no_years'] = int(self.no_years.get_active())
         self.options_dict['gender'] = _options.genders[self.gender_menu.get_active()][0]
-        self.options_dict['bar_items'] = int(self.bar_items.get_text())
+        self.options_dict['bar_items'] = int(self.bar_items.get_value_as_int())
         for key in _Extract.extractors:
             self.options_dict[key] = int(self.charts[key].get_active())
 
diff --git a/gramps2/src/plugins/TimeLine.py b/gramps2/src/plugins/TimeLine.py
index 24b75766e..4f271db64 100644
--- a/gramps2/src/plugins/TimeLine.py
+++ b/gramps2/src/plugins/TimeLine.py
@@ -402,10 +402,10 @@ class TimeLineOptions(ReportOptions.ReportOptions):
         """Set up the list of possible content filters."""
         if person:
             name = person.get_primary_name().get_name()
-            handle = person.get_handle()
+            gramps_id = person.get_gramps_id()
         else:
             name = 'PERSON'
-            handle = ''
+            gramps_id = ''
 
         all = GenericFilter.GenericFilter()
         all.set_name(_("Entire Database"))
@@ -413,15 +413,15 @@ class TimeLineOptions(ReportOptions.ReportOptions):
 
         des = GenericFilter.GenericFilter()
         des.set_name(_("Descendants of %s") % name)
-        des.add_rule(GenericFilter.IsDescendantOf([handle,1]))
+        des.add_rule(GenericFilter.IsDescendantOf([gramps_id,1]))
 
         ans = GenericFilter.GenericFilter()
         ans.set_name(_("Ancestors of %s") % name)
-        ans.add_rule(GenericFilter.IsAncestorOf([handle,1]))
+        ans.add_rule(GenericFilter.IsAncestorOf([gramps_id,1]))
 
         com = GenericFilter.GenericFilter()
         com.set_name(_("People with common ancestor with %s") % name)
-        com.add_rule(GenericFilter.HasCommonAncestorWith([handle]))
+        com.add_rule(GenericFilter.HasCommonAncestorWith([gramps_id]))
 
         return [all,des,ans,com]
 
diff --git a/gramps2/src/plugins/WebPage.py b/gramps2/src/plugins/WebPage.py
index 25f89cb01..8500b6d46 100644
--- a/gramps2/src/plugins/WebPage.py
+++ b/gramps2/src/plugins/WebPage.py
@@ -715,12 +715,24 @@ class IndividualPage:
             self.doc.write_text(_("Siblings"))
             self.doc.end_paragraph()
     
-            self.doc.start_table("three","IndTable")
-        
+            self.doc.start_table("four","IndTable")
+            self.doc.start_row()
+            self.doc.start_cell("NormalCell")
+            self.doc.start_paragraph("Label")
+            self.doc.write_text(_("Siblings"))
+            self.doc.end_paragraph()
+            self.doc.end_cell()
+
+            self.doc.start_cell("NormalCell")
+            first = True
             for child_handle in all_sisters:
                 child = self.db.get_person_from_handle(child_handle)
-                self.doc.start_paragraph("Data")
                 name = child.get_primary_name().get_regular_name()
+                if first:
+                    self.doc.start_paragraph("Data")
+                    first = False
+                else:
+                    self.doc.write_text('\n')
                 if self.person.get_handle() == child_handle:
                     self.doc.write_text(name)
                 elif self.list.has_key(child_handle):
@@ -729,8 +741,12 @@ class IndividualPage:
                     self.doc.end_link()
                 else:
                     self.doc.write_text(name)
+            if not first:
                 self.doc.end_paragraph()
-                
+
+            self.doc.end_cell()
+            self.doc.end_row()
+            self.doc.end_table()    
 
 #------------------------------------------------------------------------
 #
@@ -1093,7 +1109,7 @@ class WebReport(Report.Report):
         
     def write_report(self):
         dir_name = self.target_path
-        if dir_name == None:
+        if not dir_name:
             dir_name = os.getcwd()
         elif not os.path.isdir(dir_name):
             parent_dir = os.path.dirname(dir_name)
@@ -1256,10 +1272,10 @@ class WebReportOptions(ReportOptions.ReportOptions):
         """Set up the list of possible content filters."""
         if person:
             name = person.get_primary_name().get_name()
-            handle = person.get_handle()
+            gramps_id = person.get_gramps_id()
         else:
             name = 'PERSON'
-            handle = ''
+            gramps_id = ''
 
         all = GenericFilter.GenericFilter()
         all.set_name(_("Entire Database"))
@@ -1267,19 +1283,19 @@ class WebReportOptions(ReportOptions.ReportOptions):
 
         des = GenericFilter.GenericFilter()
         des.set_name(_("Descendants of %s") % name)
-        des.add_rule(GenericFilter.IsDescendantOf([handle,1]))
+        des.add_rule(GenericFilter.IsDescendantOf([gramps_id,1]))
 
         df = GenericFilter.GenericFilter()
         df.set_name(_("Descendant Families of %s") % name)
-        df.add_rule(GenericFilter.IsDescendantFamilyOf([handle]))
+        df.add_rule(GenericFilter.IsDescendantFamilyOf([gramps_id]))
 
         ans = GenericFilter.GenericFilter()
         ans.set_name(_("Ancestors of %s") % name)
-        ans.add_rule(GenericFilter.IsAncestorOf([handle,1]))
+        ans.add_rule(GenericFilter.IsAncestorOf([gramps_id,1]))
 
         com = GenericFilter.GenericFilter()
         com.set_name(_("People with common ancestor with %s") % name)
-        com.add_rule(GenericFilter.HasCommonAncestorWith([handle]))
+        com.add_rule(GenericFilter.HasCommonAncestorWith([gramps_id]))
 
         return [all,des,df,ans,com]
 
diff --git a/gramps2/src/plugins/WriteFtree.py b/gramps2/src/plugins/WriteFtree.py
index 3ed8b56e4..1b7ae948e 100644
--- a/gramps2/src/plugins/WriteFtree.py
+++ b/gramps2/src/plugins/WriteFtree.py
@@ -86,20 +86,28 @@ class FtreeWriterOptionBox:
         all.set_name(_("Entire Database"))
         all.add_rule(GenericFilter.Everyone([]))
         
-        des = GenericFilter.GenericFilter()
-        des.set_name(_("Descendants of %s") % self.person.get_primary_name().get_name())
-        des.add_rule(GenericFilter.IsDescendantOf([self.person.get_handle(),1]))
+        if self.person:
+            des = GenericFilter.GenericFilter()
+            des.set_name(_("Descendants of %s") %
+                         self.person.get_primary_name().get_name())
+            des.add_rule(GenericFilter.IsDescendantOf(
+                [self.person.get_gramps_id(),1]))
         
-        ans = GenericFilter.GenericFilter()
-        ans.set_name(_("Ancestors of %s") % self.person.get_primary_name().get_name())
-        ans.add_rule(GenericFilter.IsAncestorOf([self.person.get_handle(),1]))
+            ans = GenericFilter.GenericFilter()
+            ans.set_name(_("Ancestors of %s")
+                         % self.person.get_primary_name().get_name())
+            ans.add_rule(GenericFilter.IsAncestorOf(
+                [self.person.get_gramps_id(),1]))
         
-        com = GenericFilter.GenericFilter()
-        com.set_name(_("People with common ancestor with %s") %
-                     self.person.get_primary_name().get_name())
-        com.add_rule(GenericFilter.HasCommonAncestorWith([self.person.get_handle()]))
+            com = GenericFilter.GenericFilter()
+            com.set_name(_("People with common ancestor with %s") %
+                         self.person.get_primary_name().get_name())
+            com.add_rule(GenericFilter.HasCommonAncestorWith(
+                [self.person.get_gramps_id()]))
         
-        self.filter_menu = GenericFilter.build_filter_menu([all,des,ans,com])
+            self.filter_menu = GenericFilter.build_filter_menu([all,des,ans,com])
+        else:
+            self.filter_menu = GenericFilter.build_filter_menu([all])
         filter_obj.set_menu(self.filter_menu)
 
         the_box = self.top.get_widget("vbox1")
diff --git a/gramps2/src/plugins/WriteGeneWeb.py b/gramps2/src/plugins/WriteGeneWeb.py
index ab7d1a728..705a3b889 100644
--- a/gramps2/src/plugins/WriteGeneWeb.py
+++ b/gramps2/src/plugins/WriteGeneWeb.py
@@ -87,20 +87,29 @@ class GeneWebWriterOptionBox:
         all.set_name(_("Entire Database"))
         all.add_rule(GenericFilter.Everyone([]))
 
-        des = GenericFilter.GenericFilter()
-        des.set_name(_("Descendants of %s") % self.person.get_primary_name().get_name())
-        des.add_rule(GenericFilter.IsDescendantOf([self.person.get_handle(),1]))
-
-        ans = GenericFilter.GenericFilter()
-        ans.set_name(_("Ancestors of %s") % self.person.get_primary_name().get_name())
-        ans.add_rule(GenericFilter.IsAncestorOf([self.person.get_handle(),1]))
-
-        com = GenericFilter.GenericFilter()
-        com.set_name(_("People with common ancestor with %s") %
+        if self.person:
+            des = GenericFilter.GenericFilter()
+            des.set_name(_("Descendants of %s") %
                          self.person.get_primary_name().get_name())
-        com.add_rule(GenericFilter.HasCommonAncestorWith([self.person.get_handle()]))
+            des.add_rule(GenericFilter.IsDescendantOf(
+                [self.person.get_gramps_id(),1]))
 
-        self.filter_menu = GenericFilter.build_filter_menu([all,des,ans,com])
+            ans = GenericFilter.GenericFilter()
+            ans.set_name(_("Ancestors of %s") %
+                         self.person.get_primary_name().get_name())
+            ans.add_rule(GenericFilter.IsAncestorOf(
+                [self.person.get_gramps_id(),1]))
+
+            com = GenericFilter.GenericFilter()
+            com.set_name(_("People with common ancestor with %s") %
+                         self.person.get_primary_name().get_name())
+            com.add_rule(GenericFilter.HasCommonAncestorWith(
+                [self.person.get_gramps_id()]))
+
+            self.filter_menu = GenericFilter.build_filter_menu(
+                [all,des,ans,com])
+        else:
+            self.filter_menu = GenericFilter.build_filter_menu([all])
         filter_obj.set_menu(self.filter_menu)
 
         the_box = self.topDialog.get_widget('vbox1')
diff --git a/gramps2/src/plugins/rel_da.py b/gramps2/src/plugins/rel_da.py
index 511be5e15..84d8d45f7 100644
--- a/gramps2/src/plugins/rel_da.py
+++ b/gramps2/src/plugins/rel_da.py
@@ -2,7 +2,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2003-2004  Donald N. Allingham
+# Copyright (C) 2003-2005  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -147,11 +147,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
         if orig_person.get_handle() == other_person.get_handle():
             return ('', [])
 
-        if self.is_spouse(orig_person,other_person):
-            if other_person.get_gender() == RelLib.Person.MALE:
-                return ("ægtefælle",[])
-            else:
-                return ("hustru",[])
+        is_spouse = self.is_spouse(orig_person,other_person)
+        if is_spouse:
+            return (is_spouse,[])
 
         (firstRel,secondRel,common) = self.get_relationship_distance(orig_person,other_person)
 
diff --git a/gramps2/src/plugins/rel_de.py b/gramps2/src/plugins/rel_de.py
index 2436547e4..5ac7cf874 100644
--- a/gramps2/src/plugins/rel_de.py
+++ b/gramps2/src/plugins/rel_de.py
@@ -2,7 +2,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2003-2004  Donald N. Allingham
+# Copyright (C) 2003-2005  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -338,8 +338,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
         if orig_person.get_handle() == other_person.get_handle():
             return ('', [])
 
-        if self.is_spouse(orig_person,other_person):
-            return ("spouse",[])
+        is_spouse = self.is_spouse(orig_person,other_person)
+        if is_spouse:
+            return (is_spouse,[])
 
         (firstRel,secondRel,common) = self.get_relationship_distance(orig_person,other_person)
         
diff --git a/gramps2/src/plugins/rel_es.py b/gramps2/src/plugins/rel_es.py
index 93eee3062..d18ac6117 100644
--- a/gramps2/src/plugins/rel_es.py
+++ b/gramps2/src/plugins/rel_es.py
@@ -2,7 +2,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2003-2004  Donald N. Allingham
+# Copyright (C) 2003-2005  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -254,11 +254,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
         if orig_person.get_handle() == other_person.get_handle():
             return ('', [])
 
-        if self.is_spouse(orig_person,other_person):
-            if other_person.get_gender() == RelLib.Person.MALE:
-                return ("marido",[])
-            else:
-                return ("mujer",[])
+        is_spouse = self.is_spouse(orig_person,other_person)
+        if is_spouse:
+            return (is_spouse,[])
 
         (firstRel,secondRel,common) = self.get_relationship_distance(orig_person,other_person)
 
diff --git a/gramps2/src/plugins/rel_fi.py b/gramps2/src/plugins/rel_fi.py
index a3d2bc2f9..e057c9abd 100644
--- a/gramps2/src/plugins/rel_fi.py
+++ b/gramps2/src/plugins/rel_fi.py
@@ -2,7 +2,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2003-2004  Donald N. Allingham
+# Copyright (C) 2003-2005  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -182,8 +182,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
         if orig_person.get_handle() == other_person.get_handle():
             return ('', [])
 
-        if self.is_spouse(orig_person,other_person):
-            return ("puoliso",[])
+        is_spouse = self.is_spouse(orig_person,other_person)
+        if is_spouse:
+            return (is_spouse,[])
 
         (firstRel,secondRel,common) = self.get_relationship_distance(orig_person,other_person)
 
diff --git a/gramps2/src/plugins/rel_fr.py b/gramps2/src/plugins/rel_fr.py
index 0a36c5810..a184c57d3 100644
--- a/gramps2/src/plugins/rel_fr.py
+++ b/gramps2/src/plugins/rel_fr.py
@@ -2,7 +2,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2003-2004  Donald N. Allingham
+# Copyright (C) 2003-2005  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -39,28 +39,30 @@ from gettext import gettext as _
 #-------------------------------------------------------------------------
 
 _level_name = [ "", "premier", "deuxième", "troisième", "quatrième", "cinquième", "sixième",
-                "septième", "huitième", "neuvième", "dicième", "onzième", "douzième",
+                "septième", "huitième", "neuvième", "dixième", "onzième", "douzième",
                 "treizième", "quatorzième", "quinzième", "seizième",
-                "dix-septième", "dix-huitième", "dix_neuvième", "vingtième", ]
+                "dix-septième", "dix-huitième", "dix-neuvième", "vingtième", "vingt-et-unième", "vingt-deuxième",
+                "vingt-deuxième", "vingt-troisième","vingt-quatrième","vingt-sixième","vingt-septième",
+                "vingt-huitième","vingt-neuvième","trentième" ]
 
-_parents_level = [ "", "les parents", "les grand-parents", "les arrières grand-parents",
+_parents_level = [ "", "les parents", "les grand-parents", "les arrière-grand-parents",
                    "les trisaïeux", ]
 
-_father_level = [ "", "le père", "le grand-père", "l'arrière grand-père", "le trisaïeul", ]
+_father_level = [ "", "le père", "le grand-père paternel", "l'arrière-grand-père paternel", "le trisaïeul paternel", ]
 
-_mother_level = [ "", "la mère", "la grand-mère", "l'arrière grand-mère", "la trisaïeule", ]
+_mother_level = [ "", "la mère", "la grand-mère maternelle", "l'arrière-grand-mère maternelle", "la trisaïeule maternelle", ]
 
-_son_level = [ "", "le fils", "le petits-fils", "l'arrière petit-fils", ]
+_son_level = [ "", "le fils", "le petit-fils", "l'arrière-petit-fils", ]
 
-_daughter_level = [ "", "la fille", "la petite-fille", "l'arrière petite-fille", ]
+_daughter_level = [ "", "la fille", "la petite-fille", "l'arrière-petite-fille", ]
 
-_sister_level = [ "", "la soeur", "la tante", "la grande-tante", "l'arrière grande-tante", ]
+_sister_level = [ "", "la soeur", "la tante", "la grand-tante", "l'arrière-grand-tante", ]
 
-_brother_level = [ "", "le frère", "l'oncle", "le grand-oncle", "l'arrière grand-oncle", ]
+_brother_level = [ "", "le frère", "l'oncle", "le grand-oncle", "l'arrière-grand-oncle", ]
 
-_nephew_level = [ "", "le neveu", "le petit-neveu", "l'arrière petit-neveu", ]
+_nephew_level = [ "", "le neveu", "le petit-neveu", "l'arrière-petit-neveu", ]
 
-_niece_level = [ "", "la nièce", "la petite-nièce", "l'arrière petite-nièce", ]
+_niece_level = [ "", "la nièce", "la petite-nièce", "l'arrière-petite-nièce", ]
 
 #-------------------------------------------------------------------------
 #
@@ -73,10 +75,16 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
         Relationship.RelationshipCalculator.__init__(self,db)
 
     def get_male_cousin(self,level):
-        return "le cousin au %s degré" % (_level_name[level])
+        if level>len(_level_name)-1:
+            return "le parent lointain"
+        else:
+            return "le cousin au %s degré" % (_level_name[level])
 
     def get_female_cousin(self,level):
-        return "la cousine au %s degré" % (_level_name[level])
+        if level>len(_level_name)-1:
+            return "la parente lointaine"
+        else:
+            return "la cousine au %s degré" % (_level_name[level])
 
     def get_parents(self,level):
         if level>len(_parents_level)-1:
@@ -146,11 +154,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
         if orig_person.get_handle() == other_person.get_handle():
             return ('', [])
 
-        if self.is_spouse(orig_person,other_person):
-            if other_person.get_gender() == RelLib.Person.MALE:
-                return ("le mari",[])
-            else:
-                return ("la femme",[])
+        is_spouse = self.is_spouse(orig_person,other_person)
+        if is_spouse:
+            return (is_spouse,[])
 
         (firstRel,secondRel,common) = self.get_relationship_distance(orig_person,other_person)
 
diff --git a/gramps2/src/plugins/rel_hu.py b/gramps2/src/plugins/rel_hu.py
index cb9229cf3..17bf4d59c 100644
--- a/gramps2/src/plugins/rel_hu.py
+++ b/gramps2/src/plugins/rel_hu.py
@@ -2,7 +2,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2003-2004  Donald N. Allingham
+# Copyright (C) 2003-2005  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -268,13 +268,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
         if orig_person.get_handle() == other_person.get_handle():
             return ('', [])
 
-        if self.is_spouse(orig_person,other_person):
-            if other_person.get_gender() == RelLib.Person.MALE:
-                #FIXME: husband
-                return ("spouse",[])
-            else:
-                #FIXME: wife
-                return ("spouse",[])
+        is_spouse = self.is_spouse(orig_person,other_person)
+        if is_spouse:
+            return (is_spouse,[])
 
         if self.is_fathermother_in_law(other_person,orig_person):
             if other_person.getGender() == RelLib.Person.MALE:
diff --git a/gramps2/src/plugins/rel_it.py b/gramps2/src/plugins/rel_it.py
index 92dae1fe7..fc8db6c6d 100644
--- a/gramps2/src/plugins/rel_it.py
+++ b/gramps2/src/plugins/rel_it.py
@@ -2,7 +2,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2003-2004  Donald N. Allingham
+# Copyright (C) 2003-2005  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -151,8 +151,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
         if orig_person.get_handle() == other_person.get_handle():
             return ('', [])
 
-        if self.is_spouse(orig_person,other_person):
-            return ("coniuge",[])
+        is_spouse = self.is_spouse(orig_person,other_person)
+        if is_spouse:
+            return (is_spouse,[])
 
         (firstRel,secondRel,common) = self.get_relationship_distance(orig_person,other_person)
 
diff --git a/gramps2/src/plugins/rel_no.py b/gramps2/src/plugins/rel_no.py
index 07ac52d12..61aa4d6d7 100644
--- a/gramps2/src/plugins/rel_no.py
+++ b/gramps2/src/plugins/rel_no.py
@@ -2,7 +2,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2003-2004  Donald N. Allingham
+# Copyright (C) 2003-2005  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -232,15 +232,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
         if orig_person.get_handle() == other_person.get_handle():
             return ('', [])
 
-        if self.is_spouse(orig_person,other_person):
-            return ('spouse', [])
-#    FIXME: need Norwegian term for spouse. If gender-specific, use the code below.
-#    UPDATE by Frode: unsure about how it's included in the finished code, so I need 
-#    to see this running to know if it is the right words to use.
-#            if other_person.get_gender() == RelLib.Person.MALE:
-#                return ("ektemann",[])
-#            else:
-#                return ("hustru",[])
+        is_spouse = self.is_spouse(orig_person,other_person)
+        if is_spouse:
+            return (is_spouse,[])
 
         (firstRel,secondRel,common) = self.get_relationship_distance(orig_person,other_person)
 
diff --git a/gramps2/src/plugins/rel_ru.py b/gramps2/src/plugins/rel_ru.py
index 2e745fbd0..409412823 100644
--- a/gramps2/src/plugins/rel_ru.py
+++ b/gramps2/src/plugins/rel_ru.py
@@ -2,7 +2,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2003-2004  Donald N. Allingham
+# Copyright (C) 2003-2005  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -206,8 +206,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
         if orig_person.get_handle() == other_person.get_handle():
             return ('', [])
 
-        if self.is_spouse(orig_person,other_person):
-            return ("spouse",[])
+        is_spouse = self.is_spouse(orig_person,other_person)
+        if is_spouse:
+            return (is_spouse,[])
 
         (firstRel,secondRel,common) = self.get_relationship_distance(orig_person,other_person)
         
diff --git a/gramps2/src/plugins/rel_sv.py b/gramps2/src/plugins/rel_sv.py
index 219706ad8..ac323e5d3 100644
--- a/gramps2/src/plugins/rel_sv.py
+++ b/gramps2/src/plugins/rel_sv.py
@@ -2,7 +2,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2003-2004  Donald N. Allingham
+# Copyright (C) 2003-2005  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -187,11 +187,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
         if orig_person.get_handle() == other_person.get_handle():
             return ('', [])
 
-        if self.is_spouse(orig_person,other_person):
-            if other_person.get_gender() == RelLib.Person.MALE:
-                return ("make",[])
-            else:
-                return ("maka",[])
+        is_spouse = self.is_spouse(orig_person,other_person)
+        if is_spouse:
+            return (is_spouse,[])
 
         (firstRel,secondRel,common) = self.get_relationship_distance(orig_person,other_person)
 
diff --git a/gramps2/src/po/de.po b/gramps2/src/po/de.po
index b19aca2a7..e30f8e54e 100644
--- a/gramps2/src/po/de.po
+++ b/gramps2/src/po/de.po
@@ -8,10 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: German Translation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: Wed Jun  1 09:58:59 2005\n"
-"PO-Revision-Date: 2005-06-01 18:19+0200\n"
+"POT-Creation-Date: Thu Jun 23 14:11:42 2005\n"
+"PO-Revision-Date: 2005-06-24 22:46+0200\n"
 "Last-Translator: Anton Huber \n"
-"Language-Team: German\n"
+"Language-Team: German \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit"
@@ -32,17 +32,17 @@ msgstr "Der eingegebene Dateiname konnte nicht gefunden werden"
 msgid "Add Media Object"
 msgstr "Multimedia-Objekt hinzufügen"
 
-#: AddSpouse.py:115
+#: AddSpouse.py:114
 msgid "Choose Spouse/Partner of %s"
 msgstr "(Ehe-)Partner von %s auswählen"
 
-#: AddSpouse.py:120
+#: AddSpouse.py:119
 msgid "Choose Spouse/Partner"
 msgstr "(Ehe-)Partner auswählen"
 
-#: AddSpouse.py:161 ChooseParents.py:230 EditPerson.py:338 EditSource.py:305
-#: FamilyView.py:74 ImageSelect.py:1102 PeopleView.py:58 PeopleView.py:148
-#: SelectChild.py:124 SelectPerson.py:78 plugins/BookReport.py:631
+#: AddSpouse.py:142 ChooseParents.py:252 EditPerson.py:338 EditSource.py:312
+#: FamilyView.py:74 ImageSelect.py:1104 PeopleView.py:58 PeopleView.py:134
+#: SelectChild.py:129 SelectPerson.py:78 plugins/BookReport.py:631
 #: plugins/FilterEditor.py:459 plugins/IndivComplete.py:405
 #: plugins/IndivSummary.py:226 plugins/PatchNames.py:191 plugins/RelCalc.py:95
 #: plugins/ScratchPad.py:154 plugins/ScratchPad.py:195
@@ -54,31 +54,31 @@ msgstr "(Ehe-)Partner auswählen"
 msgid "Name"
 msgstr "Name"
 
-#: AddSpouse.py:166 ChooseParents.py:236 EditSource.py:305 FamilyView.py:73
-#: ImageSelect.py:1102 MediaView.py:58 MergePeople.py:107 PeopleView.py:59
-#: PlaceView.py:50 SelectChild.py:129 SelectObject.py:85 SelectPerson.py:84
+#: AddSpouse.py:146 ChooseParents.py:261 EditSource.py:312 FamilyView.py:73
+#: ImageSelect.py:1104 MediaView.py:58 MergePeople.py:107 PeopleView.py:59
+#: PlaceView.py:50 SelectChild.py:134 SelectObject.py:85 SelectPerson.py:84
 #: SourceView.py:52 Sources.py:108 Sources.py:242 Witness.py:64
 #: plugins/PatchNames.py:182 plugins/RelCalc.py:95
 msgid "ID"
 msgstr "ID"
 
-#: AddSpouse.py:171 ChooseParents.py:242 SelectChild.py:134 SelectPerson.py:90
+#: AddSpouse.py:150 ChooseParents.py:271 SelectChild.py:139 SelectPerson.py:90
 msgid "Birth date"
 msgstr "Geburtsdatum"
 
-#: AddSpouse.py:254 AddSpouse.py:279
+#: AddSpouse.py:232 AddSpouse.py:257
 msgid "Error adding a spouse"
 msgstr "Fehler beim Hinzufügen des (Ehe-)Partners"
 
-#: AddSpouse.py:255
+#: AddSpouse.py:233
 msgid "A person cannot be linked as his/her spouse"
 msgstr "Eine Person kann nicht als sein/ihr (Ehe-)Partner verknüpft werden"
 
-#: AddSpouse.py:263
+#: AddSpouse.py:241
 msgid "Spouse is a parent"
 msgstr "Eltern des (Ehe-)Partners"
 
-#: AddSpouse.py:264
+#: AddSpouse.py:242
 msgid ""
 "The person selected as a spouse is a parent of the active person. Usually, "
 "this is a mistake. You may choose either to proceed with adding a spouse, or "
@@ -89,23 +89,23 @@ msgstr ""
 "fortfahren oder zum Person bearbeiten-Dialog zurückkehren um das Problem zu "
 "lösen."
 
-#: AddSpouse.py:268 AddSpouse.py:289
+#: AddSpouse.py:246 AddSpouse.py:267
 msgid "Proceed with adding"
 msgstr "Ohne speichern schließen"
 
-#: AddSpouse.py:268 AddSpouse.py:289
+#: AddSpouse.py:246 AddSpouse.py:267
 msgid "Return to dialog"
 msgstr "Zum Fenster zurückkehren"
 
-#: AddSpouse.py:280
+#: AddSpouse.py:258
 msgid "The spouse is already present in this family"
 msgstr "Den (Ehe-)Partner gibt es bereits in dieser Familie"
 
-#: AddSpouse.py:284
+#: AddSpouse.py:262
 msgid "Spouse is a child"
 msgstr "Der Ehepartner/ die Ehepartnerin ist ein Kind der Person"
 
-#: AddSpouse.py:285
+#: AddSpouse.py:263
 msgid ""
 "The person selected as a spouse is a child of the active person. Usually, "
 "this is a mistake. You may choose either to proceed with adding a spouse, or "
@@ -116,10 +116,21 @@ msgstr ""
 "fortfahren oder zum Person bearbeiten-Dialogzurückkehren um das Problem zu "
 "lösen."
 
-#: AddSpouse.py:315 FamilyView.py:725
+#: AddSpouse.py:293 FamilyView.py:725
 msgid "Add Spouse"
 msgstr "(Ehe-)Partner hinzufügen"
 
+#: AddSpouse.py:392 ChooseParents.py:811 GenericFilter.py:132
+#: GenericFilter.py:147 GenericFilter.py:263 GenericFilter.py:277
+#: GenericFilter.py:300 GenericFilter.py:323 GenericFilter.py:338
+#: GenericFilter.py:353 GenericFilter.py:979 GenericFilter.py:1223
+#: GenericFilter.py:1247 GenericFilter.py:1276 GenericFilter.py:1308
+#: GenericFilter.py:1325 GenericFilter.py:1346 GenericFilter.py:1429
+#: GenericFilter.py:1483 GenericFilter.py:1545 GenericFilter.py:1564
+#: GenericFilter.py:1634 GenericFilter.py:1801 SelectChild.py:305
+msgid "General filters"
+msgstr "Allgemeine Filter"
+
 #: AddrEdit.py:106 AddrEdit.py:174
 msgid "Address Editor"
 msgstr "Adresseditor"
@@ -180,7 +191,7 @@ msgstr "Attributeditor für %s"
 msgid "New Attribute"
 msgstr "Neues Attribut"
 
-#: AttrEdit.py:175 EditPerson.py:326 ImageSelect.py:682 ImageSelect.py:952
+#: AttrEdit.py:175 EditPerson.py:326 ImageSelect.py:682 ImageSelect.py:954
 #: Marriage.py:214 plugins/ScratchPad.py:273 plugins/ScratchPad.py:281
 msgid "Attribute"
 msgstr "Attribut"
@@ -201,71 +212,81 @@ msgstr ""
 msgid "Edit Bookmarks"
 msgstr "Lesezeichen bearbeiten"
 
-#: ChooseParents.py:121
+#: ChooseParents.py:129 ChooseParents.py:130
+msgid "Loading..."
+msgstr "Lade ..."
+
+#: ChooseParents.py:133
 msgid "Choose the Parents of %s"
 msgstr "Eltern von %s auswählen"
 
-#: ChooseParents.py:123 ChooseParents.py:268 ChooseParents.py:510
-#: ChooseParents.py:593
+#: ChooseParents.py:135 ChooseParents.py:300 ChooseParents.py:572
+#: ChooseParents.py:659
 msgid "Choose Parents"
 msgstr "Eltern auswählen"
 
-#: ChooseParents.py:304 ChooseParents.py:648
+#: ChooseParents.py:366 ChooseParents.py:714
 msgid "Par_ent"
 msgstr "Elt_ernteil"
 
-#: ChooseParents.py:306
+#: ChooseParents.py:368
 msgid "Fath_er"
 msgstr "Vat_er"
 
-#: ChooseParents.py:314 ChooseParents.py:647
+#: ChooseParents.py:376 ChooseParents.py:713
 msgid "Pa_rent"
 msgstr "Elte_rnteil"
 
-#: ChooseParents.py:316
+#: ChooseParents.py:378
 msgid "Mothe_r"
 msgstr "Mutte_r"
 
-#: ChooseParents.py:502 SelectChild.py:287 SelectChild.py:306
+#: ChooseParents.py:564 SelectChild.py:192 SelectChild.py:211
 msgid "Error selecting a child"
 msgstr "Fehler beim Auswählen des Kindes"
 
-#: ChooseParents.py:503
+#: ChooseParents.py:565
 msgid "A person cannot be linked as his/her own parent"
 msgstr "Eine Person kann nicht sein/ihr eigener Vater/Mutter sein."
 
-#: ChooseParents.py:532 ChooseParents.py:545
-msgid "Added person is not visible"
-msgstr "Die hinzugefügte Person ist nicht sichtbar"
-
-#: ChooseParents.py:533 ChooseParents.py:546
-msgid ""
-"The person you added is currently not visible due to the chosen filter. This "
-"may occur if you did not specify a birth date."
-msgstr "Die von Ihnen hinzugefügte Person ist gegenwärtig wegen dem gewählten Filter nicht sichtbar. Dies tritt auf, wenn Sie kein Geburtsdatum angegeben haben."
-
-#: ChooseParents.py:623
+#: ChooseParents.py:689
 msgid "Modify the Parents of %s"
 msgstr "Eltern von %s ändern"
 
-#: ChooseParents.py:624 ChooseParents.py:736
+#: ChooseParents.py:690 ChooseParents.py:802
 msgid "Modify Parents"
 msgstr "Eltern ändern"
 
-#: ChooseParents.py:650 FamilyView.py:1100 MergePeople.py:136
+#: ChooseParents.py:716 FamilyView.py:1112 MergePeople.py:136
 #: plugins/FamilyGroup.py:261 plugins/IndivComplete.py:215
 #: plugins/IndivComplete.py:217 plugins/IndivComplete.py:450
 #: plugins/IndivSummary.py:290 plugins/WebPage.py:340 plugins/WebPage.py:343
 msgid "Mother"
 msgstr "Mutter"
 
-#: ChooseParents.py:651 FamilyView.py:1098 MergePeople.py:134
+#: ChooseParents.py:717 FamilyView.py:1110 MergePeople.py:134
 #: plugins/FamilyGroup.py:248 plugins/IndivComplete.py:206
 #: plugins/IndivComplete.py:208 plugins/IndivComplete.py:445
 #: plugins/IndivSummary.py:276 plugins/WebPage.py:339 plugins/WebPage.py:342
 msgid "Father"
 msgstr "Vater"
 
+#: ChooseParents.py:834
+msgid "Likely Father"
+msgstr "Möglicher Vater"
+
+#: ChooseParents.py:835
+msgid "Matches likely fathers"
+msgstr "Filtert mögliche Väter"
+
+#: ChooseParents.py:844
+msgid "Likely Mother"
+msgstr "Mögliche Mutter"
+
+#: ChooseParents.py:845
+msgid "Matches likely mothers"
+msgstr "Filtert mögliche Mütter"
+
 #: ColumnOrder.py:40
 msgid "Select Columns"
 msgstr "Spalten auswählen"
@@ -342,7 +363,7 @@ msgstr "Berechnet"
 msgid "Date selection"
 msgstr "Datumsauswahl"
 
-#: DateEdit.py:264 gramps_main.py:1154 gramps_main.py:1161
+#: DateEdit.py:264 gramps_main.py:1168 gramps_main.py:1175
 msgid "Could not open help"
 msgstr "Die Hilfe konnte nicht geöffnet werden"
 
@@ -394,7 +415,7 @@ msgstr "Automatisch erkannt"
 msgid "Select file _type:"
 msgstr "Datei_typ auswählen:"
 
-#: DbPrompter.py:611 gramps_main.py:1374
+#: DbPrompter.py:611 gramps_main.py:1388
 msgid "All files"
 msgstr "Alle Dateien"
 
@@ -415,7 +436,7 @@ msgid "GEDCOM files"
 msgstr "GEDCOM-Dateien"
 
 #: DisplayModels.py:47 GrampsMime.py:46 GrampsMime.py:53 MergePeople.py:50
-#: PeopleModel.py:381 SelectChild.py:245 Utils.py:123 const.py:169
+#: PeopleModel.py:387 Utils.py:118 const.py:169
 #: plugins/DetAncestralReport.py:308 plugins/DetAncestralReport.py:315
 #: plugins/DetDescendantReport.py:330 plugins/DetDescendantReport.py:337
 #: plugins/FamilyGroup.py:458 plugins/IndivComplete.py:281
@@ -423,19 +444,19 @@ msgstr "GEDCOM-Dateien"
 msgid "unknown"
 msgstr "unbekannt"
 
-#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:381 SelectChild.py:241
-#: const.py:167 plugins/RelCalc.py:111
+#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:387 const.py:167
+#: plugins/RelCalc.py:111
 msgid "male"
 msgstr "Männlich"
 
-#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:381 SelectChild.py:243
-#: const.py:168 plugins/RelCalc.py:113
+#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:387 const.py:168
+#: plugins/RelCalc.py:113
 msgid "female"
 msgstr "Weiblich"
 
-#: DisplayModels.py:468 ImageSelect.py:981 MediaView.py:243 NoteEdit.py:104
-#: Utils.py:160 gramps.glade:5208 gramps.glade:15342 gramps.glade:25747
-#: gramps.glade:26749 gramps.glade:28117 gramps.glade:29548
+#: DisplayModels.py:468 ImageSelect.py:983 MediaView.py:243 NoteEdit.py:104
+#: Utils.py:155 gramps.glade:5501 gramps.glade:16531 gramps.glade:27709
+#: gramps.glade:28757 gramps.glade:30210 gramps.glade:31740
 msgid "Note"
 msgstr "Notiz"
 
@@ -457,7 +478,7 @@ msgstr ""
 msgid "Internal Error"
 msgstr "Interner Fehler"
 
-#: EditPerson.py:132 EditPerson.py:634
+#: EditPerson.py:132 EditPerson.py:635
 msgid "Edit Person"
 msgstr "Person bearbeiten"
 
@@ -465,12 +486,12 @@ msgstr "Person bearbeiten"
 msgid "Patronymic:"
 msgstr "Patronymikon:"
 
-#: EditPerson.py:306 EditSource.py:325 EventEdit.py:278 ImageSelect.py:1123
+#: EditPerson.py:306 EditSource.py:332 EventEdit.py:278 ImageSelect.py:1125
 #: Marriage.py:213 plugins/ScratchPad.py:166 plugins/ScratchPad.py:180
 msgid "Event"
 msgstr "Ereignis"
 
-#: EditPerson.py:307 EditPerson.py:344 EditPlace.py:130 const.py:435
+#: EditPerson.py:307 EditPerson.py:344 EditPlace.py:131 const.py:435
 #: plugins/ScratchPad.py:185 plugins/ScratchPad.py:227
 #: plugins/ScratchPad.py:262
 msgid "Description"
@@ -482,21 +503,21 @@ msgstr "Beschreibung"
 msgid "Date"
 msgstr "Datum"
 
-#: EditPerson.py:309 EditPlace.py:271 EditSource.py:331 ImageSelect.py:1129
-#: Marriage.py:213 gramps.glade:12208 plugins/ScratchPad.py:183
+#: EditPerson.py:309 EditPlace.py:289 EditSource.py:338 ImageSelect.py:1131
+#: Marriage.py:213 gramps.glade:13109 plugins/ScratchPad.py:183
 #: plugins/ScratchPad.py:225
 msgid "Place"
 msgstr "Ort"
 
-#: EditPerson.py:326 EditSource.py:156 ImageSelect.py:682 ImageSelect.py:952
-#: Marriage.py:214 gramps.glade:12727 plugins/FilterEditor.py:459
+#: EditPerson.py:326 EditSource.py:160 ImageSelect.py:682 ImageSelect.py:954
+#: Marriage.py:214 gramps.glade:13691 plugins/FilterEditor.py:459
 #: plugins/PatchNames.py:188 plugins/ScratchPad.py:284
 #: plugins/ScratchPad.py:317 plugins/ScratchPad.py:543
 #: plugins/ScratchPad.py:549
 msgid "Value"
 msgstr "Wert"
 
-#: EditPerson.py:338 EditSource.py:305 ImageSelect.py:1102 MediaView.py:59
+#: EditPerson.py:338 EditSource.py:312 ImageSelect.py:1104 MediaView.py:59
 #: MergePeople.py:152 SelectObject.py:86 plugins/BookReport.py:631
 #: plugins/BookReport.py:632 plugins/PatchNames.py:185
 #: plugins/ScratchPad.py:181 plugins/ScratchPad.py:223
@@ -506,59 +527,59 @@ msgstr "Wert"
 msgid "Type"
 msgstr "Typ"
 
-#: EditPerson.py:344 EditPlace.py:129 MediaView.py:60
+#: EditPerson.py:344 EditPlace.py:130 MediaView.py:60
 #: plugins/ScratchPad.py:260
 msgid "Path"
 msgstr "Pfad"
 
-#: EditPerson.py:566 ImageSelect.py:610 ImageSelect.py:1037 MediaView.py:275
+#: EditPerson.py:567 ImageSelect.py:610 ImageSelect.py:1041 MediaView.py:275
 #: plugins/ScratchPad.py:424 plugins/ScratchPad.py:432
 msgid "Media Object"
 msgstr "Multimedia-Objekt"
 
-#: EditPerson.py:572 ImageSelect.py:616 docgen/AbiWord2Doc.py:327
+#: EditPerson.py:573 ImageSelect.py:616 docgen/AbiWord2Doc.py:335
 #: docgen/AsciiDoc.py:371 docgen/HtmlDoc.py:486 docgen/KwordDoc.py:494
 #: docgen/PdfDoc.py:631 docgen/RTFDoc.py:427
 msgid "Open in %s"
 msgstr "Öffne in %s"
 
-#: EditPerson.py:575 ImageSelect.py:619 MediaView.py:288
+#: EditPerson.py:576 ImageSelect.py:619 MediaView.py:288
 msgid "Edit with the GIMP"
 msgstr "Mit GIMP bearbeiten"
 
-#: EditPerson.py:577 ImageSelect.py:621
+#: EditPerson.py:578 ImageSelect.py:621
 msgid "Edit Object Properties"
 msgstr "Objekteigenschaften bearbeiten"
 
-#: EditPerson.py:628
+#: EditPerson.py:629
 msgid "New Person"
 msgstr "Neue Person"
 
-#: EditPerson.py:753 GrampsCfg.py:63 const.py:233 const.py:246
+#: EditPerson.py:754 GrampsCfg.py:63 const.py:233 const.py:246
 msgid "None"
 msgstr "Ohne"
 
-#: EditPerson.py:1290
+#: EditPerson.py:1291
 msgid "Save changes to %s?"
 msgstr "Änderungen in %s speichern?"
 
-#: EditPerson.py:1291 EditPerson.py:1307 Marriage.py:622 Marriage.py:635
+#: EditPerson.py:1292 EditPerson.py:1308 Marriage.py:622 Marriage.py:635
 msgid "If you close without saving, the changes you have made will be lost"
 msgstr "Wenn Sie ohne zu speichern schließen, gehen Ihre Änderungen verloren"
 
-#: EditPerson.py:1306
+#: EditPerson.py:1307
 msgid "Save Changes to %s?"
 msgstr "Änderungen in %s speichern?"
 
-#: EditPerson.py:1652
+#: EditPerson.py:1653
 msgid "Make the selected name the preferred name"
 msgstr "Den gewählten Namen als bevorzugten Namen verwenden"
 
-#: EditPerson.py:1696
+#: EditPerson.py:1697
 msgid "Unknown gender specified"
 msgstr "Unbekanntes Geschlecht angegeben"
 
-#: EditPerson.py:1697
+#: EditPerson.py:1698
 msgid ""
 "The gender of the person is currently unknown. Usually, this is a mistake. "
 "You may choose to either continue saving, or returning to the Edit Person "
@@ -568,19 +589,19 @@ msgstr ""
 "Fehler. Sie können mit dem Speichern fortfahren oder zum Person bearbeiten-"
 "Dialogzurückkehren um das Problem zu lösen."
 
-#: EditPerson.py:1701
+#: EditPerson.py:1702
 msgid "Continue saving"
 msgstr "Mit Speichern fortfahren"
 
-#: EditPerson.py:1701
+#: EditPerson.py:1702
 msgid "Return to window"
 msgstr "Zum Fenster zurückkehren"
 
-#: EditPerson.py:1729 Marriage.py:654
+#: EditPerson.py:1730 Marriage.py:654
 msgid "GRAMPS ID value was not changed."
 msgstr "GRAMPS-ID Wert wurde nicht verändert."
 
-#: EditPerson.py:1730
+#: EditPerson.py:1731
 msgid ""
 "You have attempted to change the GRAMPS ID to a value of %(grampsid)s. This "
 "value is already used by %(person)s."
@@ -588,11 +609,11 @@ msgstr ""
 "Sie haben versucht, die GRAMPS-ID auf %(grampsid)s zu ändern. Dieser Wert "
 "wird schon für %(person)s genutzt."
 
-#: EditPerson.py:1842
+#: EditPerson.py:1843
 msgid "Problem changing the gender"
 msgstr "Problem beim Ändern des Geschlechts"
 
-#: EditPerson.py:1843
+#: EditPerson.py:1844
 msgid ""
 "Changing the gender caused problems with marriage information.\n"
 "Please check the person's marriages."
@@ -600,96 +621,108 @@ msgstr ""
 "Änderung des Geschlechts verursachte Probleme bei den Eheinformationen.\n"
 "Bitte überprüfen Sie die Ehen der Person."
 
-#: EditPerson.py:1886
+#: EditPerson.py:1887
 msgid "Edit Person (%s)"
 msgstr "Person bearbeiten (%s)"
 
-#: EditPerson.py:1902 ImageSelect.py:1162
+#: EditPerson.py:1903 ImageSelect.py:1165
 msgid "Add Place (%s)"
 msgstr "Ort hinzufügen (%s)"
 
-#: EditPlace.py:90 EditPlace.py:277
+#: EditPlace.py:91 EditPlace.py:295
 msgid "Place Editor"
 msgstr "Orte-Editor"
 
-#: EditPlace.py:149 PlaceView.py:53
+#: EditPlace.py:150 PlaceView.py:53
 msgid "City"
 msgstr "Ort"
 
-#: EditPlace.py:149 PlaceView.py:54
+#: EditPlace.py:150 PlaceView.py:54
 msgid "County"
 msgstr "Kreis"
 
-#: EditPlace.py:150 PlaceView.py:55
+#: EditPlace.py:151 PlaceView.py:55
 msgid "State"
 msgstr "Bundesland"
 
-#: EditPlace.py:150 PlaceView.py:56
+#: EditPlace.py:151 PlaceView.py:56
 msgid "Country"
 msgstr "Land"
 
-#: EditPlace.py:266 EditPlace.py:270
+#: EditPlace.py:284 EditPlace.py:288
 msgid "New Place"
 msgstr "Neuer Ort"
 
-#: EditPlace.py:400
+#: EditPlace.py:391
+msgid "Place title is already in use"
+msgstr "Der Name des Ortes wird bereits verwendet"
+
+#: EditPlace.py:392
+msgid ""
+"Each place must have a unique title, and title you have selected is already "
+"used by another place"
+msgstr ""
+"Alle Orte müssen eindeutige Titel besitzen. Der ausgewählte Titel wird "
+"bereits von einem anderen Ort verwendet."
+
+#: EditPlace.py:427
 msgid "Edit Place (%s)"
 msgstr "Ort bearbeiten (%s)"
 
-#: EditPlace.py:518
+#: EditPlace.py:546
 msgid "People"
 msgstr "Personen"
 
-#: EditPlace.py:520 EditPlace.py:529
+#: EditPlace.py:548 EditPlace.py:557
 msgid "%s [%s]: event %s\n"
 msgstr "%s [%s]: Ereignis %s\n"
 
-#: EditPlace.py:527
+#: EditPlace.py:555
 msgid "Families"
 msgstr "Familien"
 
-#: EditPlace.py:535 Utils.py:115
+#: EditPlace.py:563 Utils.py:110
 msgid "%(father)s and %(mother)s"
 msgstr "%(father)s und %(mother)s"
 
-#: EditPlace.py:605 PlaceView.py:221
+#: EditPlace.py:633 PlaceView.py:224
 msgid "Delete Place (%s)"
 msgstr "Ort löschen (%s)"
 
-#: EditSource.py:86 EditSource.py:242
+#: EditSource.py:90 EditSource.py:249
 msgid "Source Editor"
 msgstr "Quelleneditor"
 
-#: EditSource.py:156
+#: EditSource.py:160
 msgid "Key"
 msgstr "Schlüssel"
 
-#: EditSource.py:231 EditSource.py:235 Sources.py:451 Sources.py:453
+#: EditSource.py:238 EditSource.py:242 Sources.py:451 Sources.py:453
 msgid "New Source"
 msgstr "Neue Quelle"
 
-#: EditSource.py:236 EditSource.py:337 ImageSelect.py:1135 Utils.py:165
-#: Utils.py:167
+#: EditSource.py:243 EditSource.py:344 ImageSelect.py:1137 Utils.py:160
+#: Utils.py:162
 msgid "Source"
 msgstr "Quelle"
 
-#: EditSource.py:313 ImageSelect.py:1111 plugins/EventCmp.py:408
+#: EditSource.py:320 ImageSelect.py:1113 plugins/EventCmp.py:408
 msgid "Person"
 msgstr "Person"
 
-#: EditSource.py:319 ImageSelect.py:1117
+#: EditSource.py:326 ImageSelect.py:1119
 msgid "Family"
 msgstr "Familie"
 
-#: EditSource.py:343
+#: EditSource.py:350
 msgid "Media"
 msgstr "Multimedia"
 
-#: EditSource.py:397
+#: EditSource.py:404
 msgid "Edit Source (%s)"
 msgstr "Quellen bearbeiten (%s)"
 
-#: EditSource.py:463
+#: EditSource.py:471
 msgid "Delete Source (%s)"
 msgstr "Quelle löschen (%s)"
 
@@ -816,7 +849,7 @@ msgstr ""
 "Die Kopie von Ihren Daten wurde erfolgreich gespeichert. Sie können nun auf "
 "den Knopf Anwenden klicken um fortzufahren.\n"
 "\n"
-"Anmerkung: Die Datenbank, die gerade in Ihrem GRAMPS-Fenser geöffnet ist, "
+"Anmerkung: Die Datenbank, die gerade in Ihrem GRAMPS-Fenster geöffnet ist, "
 "ist NICHT die Datei, die Sie gerade gespeichert haben. Zukünftige Änderungen "
 "werden die gerade erstellte Kopie nicht verändern."
 
@@ -907,22 +940,22 @@ msgstr "Sterbeort"
 
 #: FamilyView.py:395 FamilyView.py:405 FamilyView.py:426 FamilyView.py:433
 #: FamilyView.py:465 FamilyView.py:530 FamilyView.py:536 FamilyView.py:606
-#: FamilyView.py:612 FamilyView.py:1173 FamilyView.py:1179 FamilyView.py:1212
-#: FamilyView.py:1218 PedView.py:561 PedView.py:570 PeopleView.py:308
-#: gramps.glade:821 gramps_main.py:659
+#: FamilyView.py:612 FamilyView.py:1176 FamilyView.py:1182 FamilyView.py:1215
+#: FamilyView.py:1221 PedView.py:564 PedView.py:573 PeopleView.py:301
+#: gramps.glade:822 gramps_main.py:659
 msgid "Home"
 msgstr "Anfang"
 
-#: FamilyView.py:396 PeopleView.py:291
+#: FamilyView.py:396 PeopleView.py:284
 msgid "Add Bookmark"
 msgstr "Lesezeichen hinzufügen"
 
 #: FamilyView.py:399 FamilyView.py:429 FamilyView.py:458 FamilyView.py:489
-#: PedView.py:584 PedView.py:595 PeopleView.py:304
+#: PedView.py:587 PedView.py:598 PeopleView.py:297
 msgid "People Menu"
 msgstr "Personenmenü"
 
-#: FamilyView.py:454 FamilyView.py:486 FamilyView.py:1192 FamilyView.py:1231
+#: FamilyView.py:454 FamilyView.py:486 FamilyView.py:1195 FamilyView.py:1234
 msgid "Add parents"
 msgstr "Eltern hinzufügen"
 
@@ -934,7 +967,7 @@ msgstr "Kindmenü"
 msgid "Make the selected child an active person"
 msgstr "Das gewählte Kind als aktive Person verwenden"
 
-#: FamilyView.py:548 FamilyView.py:1191 FamilyView.py:1230
+#: FamilyView.py:548 FamilyView.py:1194 FamilyView.py:1233
 msgid "Edit the child/parent relationships"
 msgstr "Eltern/Kind-Beziehung bearbeiten"
 
@@ -978,19 +1011,19 @@ msgstr "Bevorzugten (Ehe-)Partner setzen (%s)"
 msgid "Modify family"
 msgstr "Familien verändern"
 
-#: FamilyView.py:800 FamilyView.py:1445 SelectChild.py:85 SelectChild.py:148
+#: FamilyView.py:800 FamilyView.py:1448 SelectChild.py:88 SelectChild.py:153
 msgid "Add Child to Family"
 msgstr "Kind zur Familie hinzufügen"
 
-#: FamilyView.py:839
+#: FamilyView.py:854
 msgid "Remove Child (%s)"
 msgstr "Kind entfernen (%s)"
 
-#: FamilyView.py:845
+#: FamilyView.py:862
 msgid "Remove %s as a spouse of %s?"
 msgstr "Wollen Sie %s als (Ehe-)Partner von %s entfernen?"
 
-#: FamilyView.py:846
+#: FamilyView.py:863
 msgid ""
 "Removing a spouse removes the relationship between the spouse and the active "
 "person. It does not remove the spouse from the database"
@@ -998,27 +1031,27 @@ msgstr ""
 "Wenn der (Ehe-)Partner gelöscht wird, wird nur das Verhältnis zur aktiven "
 "Person gelöscht. Der (Ehe-)Partner wird nicht aus der Datenbank gelöscht"
 
-#: FamilyView.py:849
+#: FamilyView.py:866
 msgid "_Remove Spouse"
 msgstr "(Ehe-)Partner _entfernen"
 
-#: FamilyView.py:893
+#: FamilyView.py:905
 msgid "Remove Spouse (%s)"
 msgstr "(Ehe-)Partner entfernen (%s)"
 
-#: FamilyView.py:934
+#: FamilyView.py:946
 msgid "Select Parents (%s)"
 msgstr "Eltern auswählen (%s)"
 
-#: FamilyView.py:1049
+#: FamilyView.py:1061
 msgid ""
 msgstr ""
 
-#: FamilyView.py:1066
+#: FamilyView.py:1078
 msgid "Database corruption detected"
 msgstr "Datenbankfehler entdeckt"
 
-#: FamilyView.py:1067
+#: FamilyView.py:1079
 msgid ""
 "A problem was detected with the database. Please run the Check and Repair "
 "Database tool to fix the problem."
@@ -1026,7 +1059,7 @@ msgstr ""
 "Es wurde ein Problem mit der Datenbank entdeckt. Bitte führen Sie das "
 "Werkzeug Datenbank überprüfen und reparieren aus um das Problem zu beheben."
 
-#: FamilyView.py:1118
+#: FamilyView.py:1130
 msgid ""
 "%s: %s [%s]\n"
 "\tRelationship: %s"
@@ -1034,31 +1067,31 @@ msgstr ""
 "%s: %s [%s]\n"
 "\tBeziehung: %s"
 
-#: FamilyView.py:1120
+#: FamilyView.py:1132
 msgid "%s: unknown"
 msgstr "%s: unbekannt"
 
-#: FamilyView.py:1164
+#: FamilyView.py:1167
 msgid "Parents Menu"
 msgstr "Eltern Menü"
 
-#: FamilyView.py:1190 FamilyView.py:1229
+#: FamilyView.py:1193 FamilyView.py:1232
 msgid "Make the selected parents the active family"
 msgstr "Die ausgewählten Eltern als aktive Familie verwenden"
 
-#: FamilyView.py:1193 FamilyView.py:1232
+#: FamilyView.py:1196 FamilyView.py:1235
 msgid "Remove parents"
 msgstr "Eltern entfernen"
 
-#: FamilyView.py:1203
+#: FamilyView.py:1206
 msgid "Spouse Parents Menu"
 msgstr "Schwiegereltern Menü"
 
-#: FamilyView.py:1295 FamilyView.py:1310
+#: FamilyView.py:1298 FamilyView.py:1313
 msgid "Remove Parents of %s"
 msgstr "Eltern von %s entfernen"
 
-#: FamilyView.py:1296 FamilyView.py:1311
+#: FamilyView.py:1299 FamilyView.py:1314
 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 "
@@ -1068,61 +1101,51 @@ msgstr ""
 "der Eltern entfernt. Weder die Eltern noch das Verhältnis zwischen den "
 "Eltern wird gelöscht."
 
-#: FamilyView.py:1300 FamilyView.py:1315
+#: FamilyView.py:1303 FamilyView.py:1318
 msgid "_Remove Parents"
 msgstr "_Eltern entfernen"
 
-#: FamilyView.py:1408
+#: FamilyView.py:1411
 msgid "Remove Parents (%s)"
 msgstr "Eltern entfernen (%s)"
 
-#: FamilyView.py:1480
+#: FamilyView.py:1483
 msgid "Attempt to Reorder Children Failed"
 msgstr "Versuch zur Neuordnung der Kinder fehlgeschlagen"
 
-#: FamilyView.py:1481
+#: FamilyView.py:1484
 msgid "Children must be ordered by their birth dates."
 msgstr "Kinder müssen nach Geburtsdatum sortiert sein."
 
-#: FamilyView.py:1486
+#: FamilyView.py:1489
 msgid "Reorder children"
 msgstr "Kinder neu ordnen"
 
-#: FamilyView.py:1520
+#: FamilyView.py:1523
 msgid "Reorder spouses"
 msgstr "(Ehe-)Partner neu ordnen"
 
-#: GenericFilter.py:90
+#: GenericFilter.py:91
 msgid "Miscellaneous filters"
 msgstr "Verschiedene Filter"
 
-#: GenericFilter.py:91 rule.glade:1165
+#: GenericFilter.py:92 rule.glade:1165
 msgid "No description"
 msgstr "Keine Beschreibung"
 
-#: GenericFilter.py:130
+#: GenericFilter.py:131
 msgid "Everyone"
 msgstr "Alle"
 
-#: GenericFilter.py:131 GenericFilter.py:146 GenericFilter.py:263
-#: GenericFilter.py:277 GenericFilter.py:295 GenericFilter.py:312
-#: GenericFilter.py:327 GenericFilter.py:342 GenericFilter.py:969
-#: GenericFilter.py:1218 GenericFilter.py:1243 GenericFilter.py:1273
-#: GenericFilter.py:1306 GenericFilter.py:1324 GenericFilter.py:1346
-#: GenericFilter.py:1431 GenericFilter.py:1489 GenericFilter.py:1554
-#: GenericFilter.py:1574 GenericFilter.py:1645 GenericFilter.py:1810
-msgid "General filters"
-msgstr "Allgemeine Filter"
-
-#: GenericFilter.py:132
+#: GenericFilter.py:133
 msgid "Matches everyone in the database"
 msgstr "Entspricht jedem in der Datenbank"
 
-#: GenericFilter.py:145
+#: GenericFilter.py:146
 msgid "Disconnected people"
 msgstr "Einzelstehende Personen"
 
-#: GenericFilter.py:147
+#: GenericFilter.py:148
 msgid ""
 "Matches people that have no family relationships to any other person in the "
 "database"
@@ -1130,11 +1153,11 @@ msgstr ""
 "Entspricht Personen, die gemeinsame Vorfahren mit Jemandem haben, der "
 "imFilter ebenfalls vorhanden ist"
 
-#: GenericFilter.py:164 GenericFilter.py:260 GenericFilter.py:357
-#: GenericFilter.py:448 GenericFilter.py:492 GenericFilter.py:614
-#: GenericFilter.py:661 GenericFilter.py:759 GenericFilter.py:811
-#: GenericFilter.py:898 gramps.glade:3363 gramps.glade:19187
-#: gramps.glade:21375 gramps.glade:22772 plugins/FilterEditor.py:680
+#: GenericFilter.py:164 GenericFilter.py:260 GenericFilter.py:368
+#: GenericFilter.py:459 GenericFilter.py:502 GenericFilter.py:623
+#: GenericFilter.py:670 GenericFilter.py:768 GenericFilter.py:820
+#: GenericFilter.py:907 gramps.glade:3521 gramps.glade:20666
+#: gramps.glade:23027 gramps.glade:24539 plugins/FilterEditor.py:680
 msgid "ID:"
 msgstr "ID:"
 
@@ -1171,83 +1194,83 @@ msgstr "Anfangsperson"
 msgid "Matches the default person"
 msgstr "Entspricht der Vorgabeperson"
 
-#: GenericFilter.py:294
+#: GenericFilter.py:299
 msgid "Bookmarked people"
 msgstr "Personen zu einem Lesezeichen hinzufügen"
 
-#: GenericFilter.py:296
+#: GenericFilter.py:301
 msgid "Matches the people on the bookmark list"
 msgstr "Entspricht den Personen auf der Lesezeichenliste"
 
-#: GenericFilter.py:311
+#: GenericFilter.py:322
 msgid "People with complete records"
 msgstr "Personen mit vollständigen Namen"
 
-#: GenericFilter.py:313
+#: GenericFilter.py:324
 msgid "Matches all people whose records are complete"
 msgstr "Entspricht allen Personen, deren Daten vollständig sind"
 
-#: GenericFilter.py:326 gramps_main.py:957 plugins/Summary.py:113
+#: GenericFilter.py:337 gramps_main.py:957 plugins/Summary.py:113
 msgid "Females"
 msgstr "Frauen"
 
-#: GenericFilter.py:328
+#: GenericFilter.py:339
 msgid "Matches all females"
 msgstr "Entspricht allen Frauen"
 
-#: GenericFilter.py:341 gramps_main.py:967
+#: GenericFilter.py:352 gramps_main.py:967
 msgid "People with unknown gender"
 msgstr "Personen ohne Ehen"
 
-#: GenericFilter.py:343
+#: GenericFilter.py:354
 msgid "Matches all people with unknown gender"
 msgstr "Entspricht allen Personen, deren Geschlecht unbekannt ist"
 
-#: GenericFilter.py:357 GenericFilter.py:406 GenericFilter.py:661
-#: GenericFilter.py:716 plugins/FilterEditor.py:692
+#: GenericFilter.py:368 GenericFilter.py:416 GenericFilter.py:670
+#: GenericFilter.py:724 plugins/FilterEditor.py:692
 msgid "Inclusive:"
 msgstr "Einschließlich:"
 
-#: GenericFilter.py:358
+#: GenericFilter.py:369
 msgid "Descendants of "
 msgstr "Nachkommen von "
 
-#: GenericFilter.py:359 GenericFilter.py:408 GenericFilter.py:450
-#: GenericFilter.py:494 GenericFilter.py:616
+#: GenericFilter.py:370 GenericFilter.py:418 GenericFilter.py:461
+#: GenericFilter.py:504 GenericFilter.py:625
 msgid "Descendant filters"
 msgstr "Nachkommenfilter"
 
-#: GenericFilter.py:360
+#: GenericFilter.py:371
 msgid "Matches all descendants for the specified person"
 msgstr "Entspricht allen Nachkommen der festgelegten Person"
 
-#: GenericFilter.py:406 GenericFilter.py:535 GenericFilter.py:573
-#: GenericFilter.py:716 GenericFilter.py:861 GenericFilter.py:941
+#: GenericFilter.py:416 GenericFilter.py:544 GenericFilter.py:582
+#: GenericFilter.py:724 GenericFilter.py:870 GenericFilter.py:951
 #: GenericFilter.py:1343 GenericFilter.py:1386 plugins/FilterEditor.py:684
 msgid "Filter name:"
 msgstr "Filtername:"
 
-#: GenericFilter.py:407
+#: GenericFilter.py:417
 msgid "Descendants of  match"
 msgstr "Ist ein Nachkommen eines treffers"
 
-#: GenericFilter.py:409
+#: GenericFilter.py:419
 msgid "Matches people that are descendants of anybody matched by a filter"
 msgstr ""
 "Entspricht Personen, die Nachkommen von Jemandem sind der dem Filter "
 "entspricht"
 
-#: GenericFilter.py:448 GenericFilter.py:492 GenericFilter.py:759
-#: GenericFilter.py:811 plugins/FilterEditor.py:678
+#: GenericFilter.py:459 GenericFilter.py:502 GenericFilter.py:768
+#: GenericFilter.py:820 plugins/FilterEditor.py:678
 msgid "Number of generations:"
 msgstr "Anzahl der Generationen:"
 
-#: GenericFilter.py:449
+#: GenericFilter.py:460
 msgid "Descendants of  not more than  generations away"
 msgstr ""
 "Ist ein Nachkomme von  und weniger als  Generationen entfernt"
 
-#: GenericFilter.py:451
+#: GenericFilter.py:462
 msgid ""
 "Matches people that are descendants of a specified person not more than N "
 "generations away"
@@ -1255,11 +1278,11 @@ msgstr ""
 "Entspricht Personen, die Nachkommen einer festgelegten Person sind, aber "
 "höchstens N Generationen entfernt"
 
-#: GenericFilter.py:493
+#: GenericFilter.py:503
 msgid "Descendants of  at least  generations away"
 msgstr "Ist ein Nachkomme von  wenigstens N Generationen entfernt"
 
-#: GenericFilter.py:495
+#: GenericFilter.py:505
 msgid ""
 "Matches people that are descendants of a specified person at least N "
 "generations away"
@@ -1267,35 +1290,35 @@ msgstr ""
 "Entspricht Personen, die Nachkommen einer festgelegten Person sind, aber "
 "wenigstens N Generationen entfernt"
 
-#: GenericFilter.py:536
+#: GenericFilter.py:545
 msgid "Children of  match"
 msgstr "Ist ein Kind von einen treffer"
 
-#: GenericFilter.py:537 GenericFilter.py:575 GenericFilter.py:863
-#: GenericFilter.py:1088 GenericFilter.py:1389 GenericFilter.py:1413
-#: GenericFilter.py:1445 GenericFilter.py:1461 GenericFilter.py:1475
+#: GenericFilter.py:546 GenericFilter.py:584 GenericFilter.py:872
+#: GenericFilter.py:1096 GenericFilter.py:1389 GenericFilter.py:1412
+#: GenericFilter.py:1442 GenericFilter.py:1457 GenericFilter.py:1470
 msgid "Family filters"
 msgstr "Familienfilter"
 
-#: GenericFilter.py:538
+#: GenericFilter.py:547
 msgid "Matches children of anybody matched by a filter"
 msgstr "Entspricht den Kindern von jemanden, der im Filter enthalten ist"
 
-#: GenericFilter.py:574
+#: GenericFilter.py:583
 msgid "Siblings of  match"
 msgstr "Ist Bruder oder Schwester eines treffers"
 
-#: GenericFilter.py:576
+#: GenericFilter.py:585
 msgid "Matches siblings of anybody matched by a filter"
 msgstr ""
 "Entspricht den Personen, die Bruder oder Schwester sind von jemanden, dieim "
 "Filter enthalten sind"
 
-#: GenericFilter.py:615
+#: GenericFilter.py:624
 msgid "Descendant family members of "
 msgstr "Ist ein Familienmitglied eines Nachkommens von "
 
-#: GenericFilter.py:617
+#: GenericFilter.py:626
 msgid ""
 "Matches people that are descendants or the spouse of a descendant of a "
 "specified person"
@@ -1303,34 +1326,34 @@ msgstr ""
 "Entspricht Personen, die Nachkommen oder (Ehe-)Partner von Nachkommen einer "
 "festgelegten Person sind"
 
-#: GenericFilter.py:662
+#: GenericFilter.py:671
 msgid "Ancestors of "
 msgstr "Vorfahren von "
 
-#: GenericFilter.py:663 GenericFilter.py:718 GenericFilter.py:761
-#: GenericFilter.py:813 GenericFilter.py:900 GenericFilter.py:945
+#: GenericFilter.py:672 GenericFilter.py:726 GenericFilter.py:770
+#: GenericFilter.py:822 GenericFilter.py:909 GenericFilter.py:955
 msgid "Ancestral filters"
 msgstr "Ahnenfilter"
 
-#: GenericFilter.py:664
+#: GenericFilter.py:673
 msgid "Matches people that are ancestors of a specified person"
 msgstr "Entspricht Personen, die Vorfahren von einer festgelegten Person sind"
 
-#: GenericFilter.py:717
+#: GenericFilter.py:725
 msgid "Ancestors of  match"
 msgstr "Ist ein Vorfahre eines treffers"
 
-#: GenericFilter.py:719
+#: GenericFilter.py:727
 msgid "Matches people that are ancestors of anybody matched by a filter"
 msgstr ""
 "Entspricht Personen, die Vorfahren von jemandem sind, der/die "
 "im·Filter·enthalten·ist/sind"
 
-#: GenericFilter.py:760
+#: GenericFilter.py:769
 msgid "Ancestors of  not more than  generations away"
 msgstr "Ist ein Vorfahre einer  weniger als  Generationen entfernt"
 
-#: GenericFilter.py:762
+#: GenericFilter.py:771
 msgid ""
 "Matches people that are ancestors of a specified person not more than N "
 "generations away"
@@ -1338,12 +1361,12 @@ msgstr ""
 "Entspricht Personen, die Vorfahren einer festgelegten Person sind, aber "
 "höchstens N Generationen entfernt"
 
-#: GenericFilter.py:812
+#: GenericFilter.py:821
 msgid "Ancestors of  at least  generations away"
 msgstr ""
 "Ist ein Vorfahre einer  und wenigstens  Generationen entfernt"
 
-#: GenericFilter.py:814
+#: GenericFilter.py:823
 msgid ""
 "Matches people that are ancestors of a specified person at least N "
 "generations away"
@@ -1351,197 +1374,197 @@ msgstr ""
 "Entspricht Personen, die Vorfahren einer festgelegten Person sind, aber "
 "wenigstens N Generationen entfernt"
 
-#: GenericFilter.py:862
+#: GenericFilter.py:871
 msgid "Parents of  match"
 msgstr "Ist Vater oder Mutter eines treffers"
 
-#: GenericFilter.py:864
+#: GenericFilter.py:873
 msgid "Matches parents of anybody matched by a filter"
 msgstr ""
 "Entspricht Personen, die Vorfahren von jemandem sind, der/die·im Filter "
 "enthalten ist/sind"
 
-#: GenericFilter.py:899
+#: GenericFilter.py:908
 msgid "People with a common ancestor with "
 msgstr "Personen mit gleichem Vorfahren wie "
 
-#: GenericFilter.py:901
+#: GenericFilter.py:910
 msgid "Matches people that have a common ancestor with a specified person"
 msgstr ""
 "Entspricht Personen, die gemeinsame Vorfahren mit einer festgelegten "
 "Personen haben"
 
-#: GenericFilter.py:942
+#: GenericFilter.py:952
 msgid "People with a common ancestor with  match"
 msgstr "Hat gemeinsame Vorfahren mit einem treffer"
 
-#: GenericFilter.py:943
+#: GenericFilter.py:953
 msgid ""
 "Matches people that have a common ancestor with anybody matched by a filter"
 msgstr ""
 "Entspricht Personen, die gemeinsame Vorfahren mit jemandem haben, der/die·im "
 "Filter enthalten ist/sind"
 
-#: GenericFilter.py:968 gramps_main.py:962 plugins/Summary.py:112
+#: GenericFilter.py:978 gramps_main.py:962 plugins/Summary.py:112
 msgid "Males"
 msgstr "Männer"
 
-#: GenericFilter.py:970
+#: GenericFilter.py:980
 msgid "Matches all males"
 msgstr "Entspricht allen Männern"
 
-#: GenericFilter.py:983 GenericFilter.py:1586 plugins/FilterEditor.py:58
+#: GenericFilter.py:993 GenericFilter.py:1575 plugins/FilterEditor.py:58
 msgid "Personal event:"
 msgstr "Persönliches Ereignis:"
 
-#: GenericFilter.py:984 GenericFilter.py:1034 GenericFilter.py:1135
-#: GenericFilter.py:1175 gramps.glade:8536 gramps.glade:9462
-#: gramps.glade:12160 gramps.glade:13667
+#: GenericFilter.py:994 GenericFilter.py:1043 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:9101 gramps.glade:10129
+#: gramps.glade:13053 gramps.glade:14701
 msgid "Date:"
 msgstr "Datum:"
 
-#: GenericFilter.py:985 GenericFilter.py:1035 GenericFilter.py:1135
-#: GenericFilter.py:1175 gramps.glade:8488 gramps.glade:13715
+#: GenericFilter.py:995 GenericFilter.py:1044 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:9045 gramps.glade:14757
 #: plugins/FilterEditor.py:676
 msgid "Place:"
 msgstr "Ort:"
 
-#: GenericFilter.py:986 GenericFilter.py:1036 GenericFilter.py:1135
-#: GenericFilter.py:1175 gramps.glade:8440 gramps.glade:10680
-#: gramps.glade:12256 gramps.glade:15790
+#: GenericFilter.py:996 GenericFilter.py:1045 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:8989 gramps.glade:11453
+#: gramps.glade:13165 gramps.glade:16998
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: GenericFilter.py:987
+#: GenericFilter.py:997
 msgid "People with the personal "
 msgstr "Hat das persönliche "
 
-#: GenericFilter.py:988
+#: GenericFilter.py:998
 msgid "Matches people with a personal event of a particular value"
 msgstr "Entspricht der Person mit einem bestimmten persönlichen Ereignis"
 
-#: GenericFilter.py:989 GenericFilter.py:1039 GenericFilter.py:1138
-#: GenericFilter.py:1178 GenericFilter.py:1509 GenericFilter.py:1530
-#: GenericFilter.py:1589
+#: GenericFilter.py:999 GenericFilter.py:1048 GenericFilter.py:1145
+#: GenericFilter.py:1184 GenericFilter.py:1502 GenericFilter.py:1522
+#: GenericFilter.py:1578
 msgid "Event filters"
 msgstr "Ereignisfilter"
 
-#: GenericFilter.py:1033 GenericFilter.py:1586 plugins/FilterEditor.py:59
+#: GenericFilter.py:1042 GenericFilter.py:1575 plugins/FilterEditor.py:59
 msgid "Family event:"
 msgstr "Familiäres Ereignis:"
 
-#: GenericFilter.py:1037
+#: GenericFilter.py:1046
 msgid "People with the family "
 msgstr "Hat das familiäre "
 
-#: GenericFilter.py:1038
+#: GenericFilter.py:1047
 msgid "Matches people with a family event of a particular value"
 msgstr "Entspricht der Person mit einem bestimmten familiären Ereignis"
 
-#: GenericFilter.py:1083
+#: GenericFilter.py:1091
 msgid "Number of relationships:"
 msgstr "Anzahl an Beziehungen:"
 
-#: GenericFilter.py:1084 plugins/FilterEditor.py:65
+#: GenericFilter.py:1092 plugins/FilterEditor.py:65
 msgid "Relationship type:"
 msgstr "Beziehungstyp:"
 
-#: GenericFilter.py:1085
+#: GenericFilter.py:1093
 msgid "Number of children:"
 msgstr "Kinderzahl:"
 
-#: GenericFilter.py:1086
+#: GenericFilter.py:1094
 msgid "People with the "
 msgstr "Personen mit der "
 
-#: GenericFilter.py:1087
+#: GenericFilter.py:1095
 msgid "Matches people with a particular relationship"
 msgstr "Entspricht der Person mit der bestimmten Beziehung"
 
-#: GenericFilter.py:1136
+#: GenericFilter.py:1143
 msgid "People with the "
 msgstr "Personen ohne "
 
-#: GenericFilter.py:1137
+#: GenericFilter.py:1144
 msgid "Matches people with birth data of a particular value"
 msgstr "Entspricht der Person mit einem bestimmten Geburtsdatum"
 
-#: GenericFilter.py:1176
+#: GenericFilter.py:1182
 msgid "People with the "
 msgstr "Personen ohne "
 
-#: GenericFilter.py:1177
+#: GenericFilter.py:1183
 msgid "Matches people with death data of a particular value"
 msgstr "Entspricht den Personen mit einem bestimmten Todestag"
 
-#: GenericFilter.py:1215 GenericFilter.py:1240 gramps.glade:9050
-#: gramps.glade:22103 gramps.glade:23110
+#: GenericFilter.py:1220 GenericFilter.py:1244 gramps.glade:9674
+#: gramps.glade:23827 gramps.glade:24909
 msgid "Value:"
 msgstr "Wert:"
 
-#: GenericFilter.py:1215 plugins/FilterEditor.py:60
+#: GenericFilter.py:1220 plugins/FilterEditor.py:60
 msgid "Personal attribute:"
 msgstr "Attribut einer Person:"
 
-#: GenericFilter.py:1216
+#: GenericFilter.py:1221
 msgid "People with the personal "
 msgstr "Hat das persönliche "
 
-#: GenericFilter.py:1217
+#: GenericFilter.py:1222
 msgid "Matches people with the personal attribute of a particular value"
 msgstr "Entspricht Personen mit einem bestimmten persönlichen Ereignis"
 
-#: GenericFilter.py:1240 plugins/FilterEditor.py:61
+#: GenericFilter.py:1244 plugins/FilterEditor.py:61
 msgid "Family attribute:"
 msgstr "Attribut einer Familie:"
 
-#: GenericFilter.py:1241
+#: GenericFilter.py:1245
 msgid "People with the family "
 msgstr "Personen mit dem familiären "
 
-#: GenericFilter.py:1242
+#: GenericFilter.py:1246
 msgid "Matches people with the family attribute of a particular value"
 msgstr "Entspricht  Personen mit einem bestimmten familiären Ereignis"
 
-#: GenericFilter.py:1267 gramps.glade:7894
+#: GenericFilter.py:1270 gramps.glade:8380
 msgid "Given name:"
 msgstr "Vorname:"
 
-#: GenericFilter.py:1268 gramps.glade:7870
+#: GenericFilter.py:1271 gramps.glade:8352
 msgid "Family name:"
 msgstr "Familienname:"
 
-#: GenericFilter.py:1269 gramps.glade:7846
+#: GenericFilter.py:1272 gramps.glade:8324
 msgid "Suffix:"
 msgstr "Suffix:"
 
-#: GenericFilter.py:1270 gramps.glade:3457 gramps.glade:7918
-#: gramps.glade:19281 gramps.glade:21520 gramps.glade:30990
+#: GenericFilter.py:1273 gramps.glade:3631 gramps.glade:8408
+#: gramps.glade:20776 gramps.glade:23196 gramps.glade:33293
 #: mergedata.glade:874 mergedata.glade:896
 msgid "Title:"
 msgstr "Titel:"
 
-#: GenericFilter.py:1271
+#: GenericFilter.py:1274
 msgid "People with the "
 msgstr "Personen mit dem "
 
-#: GenericFilter.py:1272 GenericFilter.py:1305
+#: GenericFilter.py:1275 GenericFilter.py:1307
 msgid "Matches people with a specified (partial) name"
 msgstr "Entspricht Personen mit einem bestimmten Namen oder Namensteil"
 
-#: GenericFilter.py:1303 GenericFilter.py:1640
+#: GenericFilter.py:1305 GenericFilter.py:1629
 msgid "Substring:"
 msgstr "Teilzeichenfolge:"
 
-#: GenericFilter.py:1304
+#: GenericFilter.py:1306
 msgid "People matching the "
 msgstr "Personen mit dem "
 
-#: GenericFilter.py:1322 gramps_main.py:992
+#: GenericFilter.py:1323 gramps_main.py:992
 msgid "People with incomplete names"
 msgstr "Personen mit unvollständigen Namen"
 
-#: GenericFilter.py:1323
+#: GenericFilter.py:1324
 msgid "Matches people with firstname or lastname missing"
 msgstr "Entspricht den Personen, bei den der Vor- oder Nachname fehlt"
 
@@ -1564,128 +1587,128 @@ msgstr ""
 "Entspricht Personen, die mit jemandem verheiratet ist, die·im Filter "
 "enthalten sind"
 
-#: GenericFilter.py:1411 gramps_main.py:982
+#: GenericFilter.py:1410 gramps_main.py:982
 msgid "Adopted people"
 msgstr "Adoptierte Personen"
 
-#: GenericFilter.py:1412
+#: GenericFilter.py:1411
 msgid "Matches people who were adopted"
 msgstr "Enthält Personen, die adoptiert wurden"
 
-#: GenericFilter.py:1429 gramps_main.py:987
+#: GenericFilter.py:1427 gramps_main.py:987
 msgid "People with images"
 msgstr "Personen mit Bildern"
 
-#: GenericFilter.py:1430
+#: GenericFilter.py:1428
 msgid "Matches people with images in the gallery"
 msgstr "Entspricht den Personen, von den Bilder in Galerie enthalten sind"
 
-#: GenericFilter.py:1443 gramps_main.py:997
+#: GenericFilter.py:1440 gramps_main.py:997
 msgid "People with children"
 msgstr "Personen mit Kindern"
 
-#: GenericFilter.py:1444
+#: GenericFilter.py:1441
 msgid "Matches people who have children"
 msgstr "Enthält Personen, die Kinder haben"
 
-#: GenericFilter.py:1459 gramps_main.py:1002
+#: GenericFilter.py:1455 gramps_main.py:1002
 msgid "People with no marriage records"
 msgstr "Personen ohne Ehen"
 
-#: GenericFilter.py:1460
+#: GenericFilter.py:1456
 msgid "Matches people who have no spouse"
 msgstr "Enthält Personen, die keinen (Ehe-)Partner haben"
 
-#: GenericFilter.py:1473 gramps_main.py:1007
+#: GenericFilter.py:1468 gramps_main.py:1007
 msgid "People with multiple marriage records"
 msgstr "Personen mit mehreren Ehen"
 
-#: GenericFilter.py:1474
+#: GenericFilter.py:1469
 msgid "Matches people who have more than one spouse"
 msgstr "Enthält Personen, die mehr als einen (Ehe-)Partner haben"
 
-#: GenericFilter.py:1487 gramps_main.py:1012
+#: GenericFilter.py:1481 gramps_main.py:1012
 msgid "People without a known birth date"
 msgstr "Personen ohne einem bekannten Geburtsdatum"
 
-#: GenericFilter.py:1488
+#: GenericFilter.py:1482
 msgid "Matches people without a known birthdate"
 msgstr "Enthält Personen ohne Geburtsdatum"
 
-#: GenericFilter.py:1507 gramps_main.py:1017
+#: GenericFilter.py:1500 gramps_main.py:1017
 msgid "People with incomplete events"
 msgstr "Personen mit unvollständigen Ereignissen"
 
-#: GenericFilter.py:1508
+#: GenericFilter.py:1501
 msgid "Matches people with missing date or place in an event"
 msgstr "Enthält Personen mit fehlendem Ereignisdatum oder Ereignisort"
 
-#: GenericFilter.py:1528 gramps_main.py:1022
+#: GenericFilter.py:1520 gramps_main.py:1022
 msgid "Families with incomplete events"
 msgstr "Familien mit unvollständigen Ereignissen"
 
-#: GenericFilter.py:1529
+#: GenericFilter.py:1521
 msgid "Matches people with missing date or place in an event of the family"
 msgstr ""
 "Enthält Personen mit fehlendem Datum oder Ort in einem Ereignis der Familie"
 
-#: GenericFilter.py:1551
+#: GenericFilter.py:1542
 msgid "On year:"
 msgstr "Im Jahr:"
 
-#: GenericFilter.py:1552 gramps_main.py:1027
+#: GenericFilter.py:1543 gramps_main.py:1027
 msgid "People probably alive"
 msgstr "Personen, die wahrscheinlich leben"
 
-#: GenericFilter.py:1553
+#: GenericFilter.py:1544
 msgid "Matches people without indications of death that are not too old"
 msgstr "Enthält Personen ohne Todeseintrag, die nicht zu alt sind"
 
-#: GenericFilter.py:1572 gramps_main.py:1032
+#: GenericFilter.py:1562 gramps_main.py:1032
 msgid "People marked private"
 msgstr "Personen, die als privat markiert sind"
 
-#: GenericFilter.py:1573
+#: GenericFilter.py:1563
 msgid "Matches people that are indicated as private"
 msgstr "Enthält Personen, die als privat markiert sind"
 
-#: GenericFilter.py:1587 gramps.glade:25926 gramps_main.py:1037
+#: GenericFilter.py:1576 gramps.glade:27895 gramps_main.py:1037
 msgid "Witnesses"
 msgstr "Zeugen"
 
-#: GenericFilter.py:1588
+#: GenericFilter.py:1577
 msgid "Matches people who are witnesses in any event"
 msgstr "Enthält Personen, die bei einem Ereignis Zeuge sind"
 
-#: GenericFilter.py:1641 plugins/FilterEditor.py:694
+#: GenericFilter.py:1630 plugins/FilterEditor.py:694
 msgid "Case sensitive:"
 msgstr "Großschreibung:"
 
-#: GenericFilter.py:1642 plugins/FilterEditor.py:696
+#: GenericFilter.py:1631 plugins/FilterEditor.py:696
 msgid "Regular-Expression matching:"
 msgstr "Regulärer Ausdruck:"
 
-#: GenericFilter.py:1643
+#: GenericFilter.py:1632
 msgid "People with records containing "
 msgstr ""
 "Enthält Personen, dern Aufzeichnungen Text, entsprechend einer Zeichenfolge, "
 "enthalten"
 
-#: GenericFilter.py:1644
+#: GenericFilter.py:1633
 msgid "Matches people whose records contain text matching a substring"
 msgstr ""
 "Enthält Personen, dern Aufzeichnungen Text, entsprechend einer Zeichenfolge, "
 "enthalten"
 
-#: GenericFilter.py:1808 plugins/FilterEditor.py:682
+#: GenericFilter.py:1799 plugins/FilterEditor.py:682
 msgid "Source ID:"
 msgstr "Quell-ID:"
 
-#: GenericFilter.py:1809
+#: GenericFilter.py:1800
 msgid "People with the "
 msgstr "Personen mit der "
 
-#: GenericFilter.py:1811
+#: GenericFilter.py:1802
 msgid "Matches people who have a particular source"
 msgstr "Entspricht den Personen, die eine bestimmte Quelle haben"
 
@@ -1701,7 +1724,7 @@ msgstr "Kombination aus den Nachnamen der Mutter und des Vaters"
 msgid "Icelandic style"
 msgstr "Isländischer Stil"
 
-#: GrampsCfg.py:70 GrampsCfg.py:74 gramps.glade:7733 gramps.glade:21835
+#: GrampsCfg.py:70 GrampsCfg.py:74 gramps.glade:8195 gramps.glade:23539
 msgid "General"
 msgstr "Allgemeines"
 
@@ -1753,19 +1776,19 @@ msgstr "Multimedia-Referenz"
 msgid "Reference Editor"
 msgstr "Referenz-Editor"
 
-#: ImageSelect.py:828 ImageSelect.py:1191 MediaView.py:345
+#: ImageSelect.py:828 ImageSelect.py:1194 MediaView.py:345
 msgid "Edit Media Object"
 msgstr "Multimedia-Objekt bearbeiten"
 
-#: ImageSelect.py:910
+#: ImageSelect.py:912
 msgid "Media Properties Editor"
 msgstr "Multimedia-Eigenschaften-Editor"
 
-#: ImageSelect.py:1043
+#: ImageSelect.py:1047
 msgid "Properties Editor"
 msgstr "Eigenschaften-Editor"
 
-#: ImageSelect.py:1288
+#: ImageSelect.py:1291
 msgid "Remove Media Object"
 msgstr "Multimedia-Objekt entfernen"
 
@@ -1777,7 +1800,7 @@ msgstr "Ortsnamen-Editor"
 msgid "Marriage/Relationship Editor"
 msgstr "Ehe-/Beziehungseditor"
 
-#: Marriage.py:146 Marriage.py:805 Marriage.py:828 Utils.py:135
+#: Marriage.py:146 Marriage.py:805 Marriage.py:828 Utils.py:130
 msgid "%s and %s"
 msgstr "%s und %s"
 
@@ -1869,11 +1892,11 @@ msgstr "Personen vergleichen"
 msgid "Alternate Names"
 msgstr "Alternative Namen"
 
-#: MergePeople.py:122 gramps.glade:8961 gramps.glade:12692
+#: MergePeople.py:122 gramps.glade:9573 gramps.glade:13652
 msgid "Events"
 msgstr "Ereignisse"
 
-#: MergePeople.py:129 PedView.py:693
+#: MergePeople.py:129 PedView.py:696
 msgid "Parents"
 msgstr "Eltern"
 
@@ -1885,7 +1908,7 @@ msgstr "Familie-ID"
 msgid "No parents found"
 msgstr "Keine Eltern gefunden"
 
-#: MergePeople.py:140 PedView.py:598
+#: MergePeople.py:140 PedView.py:601
 msgid "Spouses"
 msgstr "(Ehe-)Partner"
 
@@ -1898,7 +1921,7 @@ msgstr "Ehepartner"
 msgid "Marriage"
 msgstr "Hochzeit"
 
-#: MergePeople.py:159 const.py:902
+#: MergePeople.py:159 const.py:909
 msgid "Child"
 msgstr "Kind"
 
@@ -1906,7 +1929,7 @@ msgstr "Kind"
 msgid "No spouses or children found"
 msgstr "Keine (Ehe-)Partner oder Kinder gefunden"
 
-#: MergePeople.py:165 gramps.glade:10111
+#: MergePeople.py:165 gramps.glade:10857
 msgid "Addresses"
 msgstr "Adressen"
 
@@ -1982,27 +2005,27 @@ msgstr "beg."
 msgid "crem."
 msgstr "ein."
 
-#: PedView.py:379
+#: PedView.py:382
 msgid "Anchor"
 msgstr "Anker"
 
-#: PedView.py:496
+#: PedView.py:499
 msgid "Double clicking will make %s the active person"
 msgstr "Ein Doppelklick macht %s zur aktiven Person"
 
-#: PedView.py:563
+#: PedView.py:566
 msgid "Set anchor"
 msgstr "Anker setzen"
 
-#: PedView.py:564
+#: PedView.py:567
 msgid "Remove anchor"
 msgstr "Anker entfernen"
 
-#: PedView.py:629 plugins/WebPage.py:715
+#: PedView.py:632 plugins/WebPage.py:715
 msgid "Siblings"
 msgstr "Geschwister"
 
-#: PedView.py:659 plugins/FamilyGroup.py:400 plugins/IndivComplete.py:295
+#: PedView.py:662 plugins/FamilyGroup.py:400 plugins/IndivComplete.py:295
 #: plugins/IndivSummary.py:179 plugins/WebPage.py:674
 msgid "Children"
 msgstr "Kinder"
@@ -2016,7 +2039,7 @@ msgid "Cause of Death"
 msgstr "Todesursache"
 
 #: PeopleView.py:83 WriteGedcom.py:329 gramps_main.py:952
-#: plugins/EventCmp.py:158 plugins/ExportVCalendar.py:81
+#: plugins/EventCmp.py:158 plugins/ExportVCalendar.py:82
 #: plugins/ExportVCard.py:84 plugins/GraphViz.py:513
 #: plugins/IndivComplete.py:510 plugins/StatisticsChart.py:827
 #: plugins/TimeLine.py:411 plugins/WebPage.py:1265 plugins/WriteFtree.py:86
@@ -2024,16 +2047,16 @@ msgstr "Todesursache"
 msgid "Entire Database"
 msgstr "Gesamte Datenbank"
 
-#: PeopleView.py:267 gramps_main.py:1658
+#: PeopleView.py:260 gramps_main.py:1672
 msgid "Updating display..."
 msgstr "Anzeige wird aufgebaut..."
 
-#: PeopleView.py:295 PlaceView.py:200 SourceView.py:189 gramps.glade:955
+#: PeopleView.py:288 PlaceView.py:203 SourceView.py:191 gramps.glade:956
 #: plugins/BookReport.py:832
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: PlaceView.py:49 PlaceView.py:119
+#: PlaceView.py:49 PlaceView.py:120
 msgid "Place Name"
 msgstr "Ortsname"
 
@@ -2053,15 +2076,15 @@ msgstr "Längengrad"
 msgid "Latitude"
 msgstr "Breitengrad"
 
-#: PlaceView.py:204
+#: PlaceView.py:207
 msgid "Place Menu"
 msgstr "Ort-Menü"
 
-#: PlaceView.py:251 SourceView.py:225 gramps_main.py:1454
+#: PlaceView.py:254 SourceView.py:227 gramps_main.py:1468
 msgid "Delete %s?"
 msgstr "%s löschen?"
 
-#: PlaceView.py:252
+#: PlaceView.py:255
 msgid ""
 "This place is currently being used by at least one record in the database. "
 "Deleting it will remove it from the database and remove it from all records "
@@ -2071,15 +2094,15 @@ msgstr ""
 "Löschen wird er aus der Datenbank und allen referenzierenden Datensätzen "
 "entfernt."
 
-#: PlaceView.py:256
+#: PlaceView.py:259
 msgid "_Delete Place"
 msgstr "Ort _löschen"
 
-#: PlaceView.py:287
+#: PlaceView.py:290
 msgid "Cannot merge places."
 msgstr "Orte können nicht zusammengefasst werden."
 
-#: PlaceView.py:288
+#: PlaceView.py:291
 msgid ""
 "Exactly two places must be selected to perform a merge. A second place can "
 "be selected by holding down the control key while clicking on the desired "
@@ -2099,13 +2122,13 @@ msgstr "Nicht kategorisiert"
 
 #: PluginMgr.py:162 PluginMgr.py:163 PluginMgr.py:164 PluginMgr.py:189
 #: PluginMgr.py:191 PluginMgr.py:192 PluginMgr.py:223 PluginMgr.py:224
-#: PluginMgr.py:225 ReportUtils.py:1756 Witness.py:83 Witness.py:166
-#: const.py:234 const.py:247 const.py:493 const.py:506 gramps_main.py:1736
+#: PluginMgr.py:225 ReportUtils.py:1757 Witness.py:83 Witness.py:166
+#: const.py:234 const.py:247 const.py:493 gramps_main.py:1750
 #: plugins/Check.py:474 plugins/ScratchPad.py:78 plugins/WebPage.py:334
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: Plugins.py:125 gramps.glade:1396
+#: Plugins.py:125 gramps.glade:1427
 msgid "_Apply"
 msgstr "_Anwenden"
 
@@ -2265,12 +2288,15 @@ msgid ""
 "The database version is not supported by this version of GRAMPS.\n"
 "Please upgrade to the corresponding version or use XML for porting data "
 "between different database versions."
-msgstr "Die·Version·der·Datenbank·wird·nicht·von·dieser·GRAMPS·Version·unterstützt.\n"
-"Bitte updaten Sie die entsprechende Version oder verwenden Sie XML um die Daten zwischen verschiedenen Datenbankversionen zu portieren."
+msgstr ""
+"Die·Version·der·Datenbank·wird·nicht·von·dieser·GRAMPS·Version·unterstützt.\n"
+"Bitte updaten Sie die entsprechende Version oder verwenden Sie XML um die "
+"Daten zwischen verschiedenen Datenbankversionen zu portieren."
 
 #: ReadGrdb.py:69
 msgid "The Database version is not supported by this version of GRAMPS."
-msgstr "Die Version der Datenbank wird nicht von dieser GRAMPS Version unterstützt."
+msgstr ""
+"Die Version der Datenbank wird nicht von dieser GRAMPS Version unterstützt."
 
 #: ReadGrdb.py:107 ReadGrdb.py:171
 msgid "Import database"
@@ -2308,7 +2334,55 @@ msgstr ""
 "GRAMPS kann das Bild nicht anzeigen. Dies kann durch eine korrupte Datei "
 "verursacht werden."
 
+#: Relationship.py:268
+msgid "husband"
+msgstr "Ehemann"
+
+#: Relationship.py:270
+msgid "wife"
+msgstr "Ehefrau"
+
+#: Relationship.py:272
+msgid "gender unknown|spouse"
+msgstr "Partner"
+
+#: Relationship.py:275
+msgid "unmarried|husband"
+msgstr "Lebensgefährte"
+
 #: Relationship.py:277
+msgid "unmarried|wife"
+msgstr "Lebensgefährtin"
+
+#: Relationship.py:279
+msgid "gender unknown,unmarried|spouse"
+msgstr "Partner"
+
+#: Relationship.py:282
+msgid "male,civil union|partner"
+msgstr "Lebenspartner"
+
+#: Relationship.py:284
+msgid "female,civil union|partner"
+msgstr "Lebenspartnerin"
+
+#: Relationship.py:286
+msgid "gender unknown,civil union|partner"
+msgstr "Lebenspartner"
+
+#: Relationship.py:289
+msgid "male,unknown relation|partner"
+msgstr "Partner"
+
+#: Relationship.py:291
+msgid "female,unknown relation|partner"
+msgstr "Partnerin"
+
+#: Relationship.py:293
+msgid "gender unknown,unknown relation|partner"
+msgstr "Partner"
+
+#: Relationship.py:325
 msgid "Relationship loop detected"
 msgstr "Verwandtschaftsschleife entdeckt"
 
@@ -2320,7 +2394,7 @@ msgstr "Standardvorlage"
 msgid "User Defined Template"
 msgstr "Selbstdefinierte Vorlage"
 
-#: Report.py:152 Report.py:172 Utils.py:279
+#: Report.py:152 Report.py:172 Utils.py:274
 msgid "default"
 msgstr "Standardwert"
 
@@ -2528,8 +2602,8 @@ msgstr "Größe"
 msgid "Height"
 msgstr "Höhe"
 
-#: Report.py:1199 Report.py:1215 gramps.glade:20322 gramps.glade:20346
-#: gramps.glade:20370 gramps.glade:20802
+#: Report.py:1199 Report.py:1215 gramps.glade:21900 gramps.glade:21928
+#: gramps.glade:21956 gramps.glade:22416
 msgid "cm"
 msgstr "cm"
 
@@ -2592,25 +2666,25 @@ msgstr "_Überschreiben"
 msgid "_Change filename"
 msgstr "_Dateinamen ändern"
 
-#: ReportUtils.py:297 ReportUtils.py:298 Utils.py:170 Utils.py:172
+#: ReportUtils.py:297 ReportUtils.py:298 Utils.py:165 Utils.py:167
 msgid "Private"
 msgstr "Privat"
 
-#: ReportUtils.py:503 ReportUtils.py:1057 ReportUtils.py:1155
-#: ReportUtils.py:1446 ReportUtils.py:1539 plugins/DetAncestralReport.py:192
+#: ReportUtils.py:504 ReportUtils.py:1058 ReportUtils.py:1156
+#: ReportUtils.py:1447 ReportUtils.py:1540 plugins/DetAncestralReport.py:192
 #: plugins/DetAncestralReport.py:350 plugins/DetDescendantReport.py:216
 #: plugins/DetDescendantReport.py:371
 msgid "He"
 msgstr "Er"
 
-#: ReportUtils.py:505 ReportUtils.py:1059 ReportUtils.py:1157
-#: ReportUtils.py:1448 ReportUtils.py:1541 plugins/DetAncestralReport.py:194
+#: ReportUtils.py:506 ReportUtils.py:1060 ReportUtils.py:1158
+#: ReportUtils.py:1449 ReportUtils.py:1542 plugins/DetAncestralReport.py:194
 #: plugins/DetAncestralReport.py:348 plugins/DetDescendantReport.py:218
 #: plugins/DetDescendantReport.py:369
 msgid "She"
 msgstr "Sie"
 
-#: ReportUtils.py:518
+#: ReportUtils.py:519
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died %(death_date)s in %(death_place)s%"
@@ -2620,7 +2694,7 @@ msgstr ""
 "(birth_endnotes)s, und starb %(death_date)s in %(death_place)s%"
 "(death_endnotes)s."
 
-#: ReportUtils.py:527
+#: ReportUtils.py:528
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
@@ -2628,7 +2702,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s wurde geboren %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, und starb %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:536
+#: ReportUtils.py:537
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
@@ -2636,7 +2710,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s wurde geboren %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, und starb in %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:544
+#: ReportUtils.py:545
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s."
@@ -2644,7 +2718,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s wurde geboren %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s."
 
-#: ReportUtils.py:552
+#: ReportUtils.py:553
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died %(death_date)s in %(death_place)s%(death_endnotes)s."
@@ -2652,7 +2726,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s wurde geboren %(birth_date)s%(birth_endnotes)s, "
 "und starb %(death_date)s in %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:561
+#: ReportUtils.py:562
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died %(death_date)s%(death_endnotes)s."
@@ -2660,7 +2734,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s wurde geboren %(birth_date)s%(birth_endnotes)s, "
 "und starb %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:570
+#: ReportUtils.py:571
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died in %(death_place)s%(death_endnotes)s."
@@ -2668,12 +2742,12 @@ msgstr ""
 "%(male_name)s%(endnotes)s wurde geboren %(birth_date)s%(birth_endnotes)s, "
 "und starb in %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:578
+#: ReportUtils.py:579
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s."
 msgstr ""
 "%(male_name)s%(endnotes)s wurde geboren %(birth_date)s%(birth_endnotes)s."
 
-#: ReportUtils.py:586
+#: ReportUtils.py:587
 msgid ""
 "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and "
 "died %(death_date)s in %(death_place)s%(death_endnotes)s."
@@ -2681,7 +2755,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s wurde geboren in %(birth_place)s%(birth_endnotes)"
 "s, und starb %(death_date)s in %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:595
+#: ReportUtils.py:596
 msgid ""
 "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and "
 "died %(death_date)s%(death_endnotes)s."
@@ -2689,7 +2763,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s wurde geboren in %(birth_place)s%(birth_endnotes)"
 "s, und starb %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:604
+#: ReportUtils.py:605
 msgid ""
 "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and "
 "died in %(death_place)s%(death_endnotes)s."
@@ -2697,13 +2771,13 @@ msgstr ""
 "%(male_name)s%(endnotes)s wurde geboren in %(birth_place)s%(birth_endnotes)"
 "s, und starb in %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:612
+#: ReportUtils.py:613
 msgid ""
 "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s."
 msgstr ""
 "%(male_name)s%(endnotes)s wurde geboren in %(birth_place)s%(birth_endnotes)s."
 
-#: ReportUtils.py:620
+#: ReportUtils.py:621
 msgid ""
 "%(male_name)s%(endnotes)s died %(death_date)s in %(death_place)s%"
 "(death_endnotes)s."
@@ -2711,19 +2785,19 @@ msgstr ""
 "%(male_name)s%(endnotes)s starb %(death_date)s in %(death_place)s%"
 "(death_endnotes)s."
 
-#: ReportUtils.py:626
+#: ReportUtils.py:627
 msgid "%(male_name)s%(endnotes)s died %(death_date)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s starb %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:633
+#: ReportUtils.py:634
 msgid "%(male_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s starb in %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:639
+#: ReportUtils.py:640
 msgid "%(male_name)s%(endnotes)s."
 msgstr "%(male_name)s%(endnotes)s."
 
-#: ReportUtils.py:646
+#: ReportUtils.py:647
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died %(death_date)s in %(death_place)s%"
@@ -2733,7 +2807,7 @@ msgstr ""
 "(birth_endnotes)s, und starb %(death_date)s in %(death_place)s%"
 "(death_endnotes)s."
 
-#: ReportUtils.py:655
+#: ReportUtils.py:656
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
@@ -2741,7 +2815,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s wurde geboren %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, und starb %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:664
+#: ReportUtils.py:665
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
@@ -2749,7 +2823,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s wurde geboren %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, und starb in %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:672
+#: ReportUtils.py:673
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s."
@@ -2757,7 +2831,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s wurde geboren %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s."
 
-#: ReportUtils.py:680
+#: ReportUtils.py:681
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died %(death_date)s in %(death_place)s%(death_endnotes)s."
@@ -2765,7 +2839,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s wurde geboren %(birth_date)s%(birth_endnotes)s, "
 "und starb %(death_date)s in %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:689
+#: ReportUtils.py:690
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died %(death_date)s%(death_endnotes)s."
@@ -2773,7 +2847,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s wurde geboren %(birth_date)s%(birth_endnotes)s, "
 "und starb %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:698
+#: ReportUtils.py:699
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died in %(death_place)s%(death_endnotes)s."
@@ -2781,12 +2855,12 @@ msgstr ""
 "%(female_name)s%(endnotes)s wurde geboren %(birth_date)s%(birth_endnotes)s, "
 "und starb in %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:706
+#: ReportUtils.py:707
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s."
 msgstr ""
 "%(female_name)s%(endnotes)s wurde geboren %(birth_date)s%(birth_endnotes)s."
 
-#: ReportUtils.py:714
+#: ReportUtils.py:715
 msgid ""
 "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
 "and died %(death_date)s in %(death_place)s%(death_endnotes)s."
@@ -2794,7 +2868,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s wurde geboren in %(birth_place)s%(birth_endnotes)"
 "s, und starb %(death_date)s in %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:723
+#: ReportUtils.py:724
 msgid ""
 "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
 "and died %(death_date)s%(death_endnotes)s."
@@ -2802,7 +2876,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s wurde geboren in %(birth_place)s%(birth_endnotes)"
 "s, und starb %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:732
+#: ReportUtils.py:733
 msgid ""
 "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
 "and died in %(death_place)s%(death_endnotes)s."
@@ -2810,14 +2884,14 @@ msgstr ""
 "%(female_name)s%(endnotes)s wurde geboren in %(birth_place)s%(birth_endnotes)"
 "s, und starb in %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:740
+#: ReportUtils.py:741
 msgid ""
 "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s."
 msgstr ""
 "%(female_name)s%(endnotes)s wurde geboren in %(birth_place)s%(birth_endnotes)"
 "s."
 
-#: ReportUtils.py:748
+#: ReportUtils.py:749
 msgid ""
 "%(female_name)s%(endnotes)s died %(death_date)s in %(death_place)s%"
 "(death_endnotes)s."
@@ -2825,200 +2899,200 @@ msgstr ""
 "%(female_name)s%(endnotes)s starb %(death_date)s in %(death_place)s%"
 "(death_endnotes)s."
 
-#: ReportUtils.py:754
+#: ReportUtils.py:755
 msgid "%(female_name)s%(endnotes)s died %(death_date)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s starb %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:761
+#: ReportUtils.py:762
 msgid "%(female_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s."
 msgstr ""
 "%(female_name)s%(endnotes)s starb in %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:767
+#: ReportUtils.py:768
 msgid "%(female_name)s%(endnotes)s."
 msgstr "%(female_name)s%(endnotes)s."
 
-#: ReportUtils.py:821
+#: ReportUtils.py:822
 msgid "He married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Er heiratete %(spouse)s %(date)s in %(place)s%(endnotes)s."
 
-#: ReportUtils.py:827
+#: ReportUtils.py:828
 msgid "She married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Sie heiratete %(spouse)s %(date)s in %(place)s%(endnotes)s."
 
-#: ReportUtils.py:834
+#: ReportUtils.py:835
 msgid "He married %(spouse)s %(date)s%(endnotes)s."
 msgstr "Er heiratete %(spouse)s %(date)s%(endnotes)s."
 
-#: ReportUtils.py:839 ReportUtils.py:850
+#: ReportUtils.py:840 ReportUtils.py:851
 msgid "She married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Sie heiratete %(spouse)s in %(place)s%(endnotes)s."
 
-#: ReportUtils.py:845
+#: ReportUtils.py:846
 msgid "He married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Er heiratete %(spouse)s in %(place)s%(endnotes)s."
 
-#: ReportUtils.py:856
+#: ReportUtils.py:857
 msgid "He married %(spouse)s%(endnotes)s."
 msgstr "Sie heiratete %(spouse)s%(endnotes)s."
 
-#: ReportUtils.py:860
+#: ReportUtils.py:861
 msgid "She married %(spouse)s%(endnotes)s."
 msgstr "Sie heiratete %(spouse)s%(endnotes)s."
 
-#: ReportUtils.py:866
+#: ReportUtils.py:867
 msgid "He also married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Er heiratete auch %(spouse)s %(date)s in %(place)s%(endnotes)s."
 
-#: ReportUtils.py:872
+#: ReportUtils.py:873
 msgid "She also married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Sie heiratete auch %(spouse)s %(date)s in %(place)s%(endnotes)s."
 
-#: ReportUtils.py:879
+#: ReportUtils.py:880
 msgid "He also married %(spouse)s %(date)s%(endnotes)s."
 msgstr "Er heiratete auch %(spouse)s %(date)s%(endnotes)s."
 
-#: ReportUtils.py:884 ReportUtils.py:895
+#: ReportUtils.py:885 ReportUtils.py:896
 msgid "She also married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Sie heiratete auch %(spouse)s in %(place)s%(endnotes)s."
 
-#: ReportUtils.py:890
+#: ReportUtils.py:891
 msgid "He also married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Er heiratete auch %(spouse)s in %(place)s%(endnotes)s."
 
-#: ReportUtils.py:901
+#: ReportUtils.py:902
 msgid "He also married %(spouse)s%(endnotes)s."
 msgstr "Sie heiratete auch %(spouse)s%(endnotes)s."
 
-#: ReportUtils.py:905
+#: ReportUtils.py:906
 msgid "She also married %(spouse)s%(endnotes)s."
 msgstr "Sie heiratete auch %(spouse)s%(endnotes)s."
 
-#: ReportUtils.py:926
+#: ReportUtils.py:927
 msgid "He married %(spouse)s."
 msgstr "Er heiratete %(spouse)s."
 
-#: ReportUtils.py:928
+#: ReportUtils.py:929
 msgid "She married %(spouse)s."
 msgstr "Sie heiratete %(spouse)s."
 
-#: ReportUtils.py:931
+#: ReportUtils.py:932
 msgid "He had relationship with %(spouse)s."
 msgstr "Er hatte eine Beziehung mit %(spouse)s."
 
-#: ReportUtils.py:934
+#: ReportUtils.py:935
 msgid "She had relationship with %(spouse)s."
 msgstr "Sie hatte eine Beziehung mit %(spouse)s"
 
-#: ReportUtils.py:939
+#: ReportUtils.py:940
 msgid "He also married %(spouse)s."
 msgstr "Er heiratete auch %(spouse)s"
 
-#: ReportUtils.py:941
+#: ReportUtils.py:942
 msgid "She also married %(spouse)s."
 msgstr "Sie heiratete auch %(spouse)s"
 
-#: ReportUtils.py:944
+#: ReportUtils.py:945
 msgid "He also had relationship with %(spouse)s."
 msgstr "Er hatte auch eine Beziehung mit %(spouse)s"
 
-#: ReportUtils.py:947
+#: ReportUtils.py:948
 msgid "She also had relationship with %(spouse)s."
 msgstr "Sie hatte auch eine Beziehung mit %(spouse)s"
 
-#: ReportUtils.py:978
+#: ReportUtils.py:979
 msgid "He was the son of %(father)s and %(mother)s."
 msgstr "Er ist der Sohn von %(father)s und %(mother)s."
 
-#: ReportUtils.py:982
+#: ReportUtils.py:983
 msgid "He is the son of %(father)s and %(mother)s."
 msgstr "Er ist der Sohn von %(father)s und %(mother)s."
 
-#: ReportUtils.py:987
+#: ReportUtils.py:988
 msgid "He was the son of %(mother)s."
 msgstr "Er  ist der Sohn von %(mother)s."
 
-#: ReportUtils.py:990
+#: ReportUtils.py:991
 msgid "He is the son of %(mother)s."
 msgstr "Er ist der Sohn von %(mother)s."
 
-#: ReportUtils.py:994
+#: ReportUtils.py:995
 msgid "He was the son of %(father)s."
 msgstr "Er ist der Sohn von %(father)s."
 
-#: ReportUtils.py:997
+#: ReportUtils.py:998
 msgid "He is the son of %(father)s."
 msgstr "Er ist der Sohn von %(father)s."
 
-#: ReportUtils.py:1002
+#: ReportUtils.py:1003
 msgid "She was the daughter of %(father)s and %(mother)s."
 msgstr "Sie ist die Tochter von %(father)s und %(mother)s."
 
-#: ReportUtils.py:1006
+#: ReportUtils.py:1007
 msgid "She is the daughter of %(father)s and %(mother)s."
 msgstr "Sie ist die Tochter von %(father)s und %(mother)s."
 
-#: ReportUtils.py:1011
+#: ReportUtils.py:1012
 msgid "She was the daughter of %(mother)s."
 msgstr "Sie ist die Tochter von %(mother)s."
 
-#: ReportUtils.py:1014
+#: ReportUtils.py:1015
 msgid "She is the daughter of %(mother)s."
 msgstr "Sie ist die Tochter von %(mother)s."
 
-#: ReportUtils.py:1018
+#: ReportUtils.py:1019
 msgid "She was the daughter of %(father)s."
 msgstr "Sie ist die Tochter von %(father)s."
 
-#: ReportUtils.py:1021
+#: ReportUtils.py:1022
 msgid "She is the daughter of %(father)s."
 msgstr "Sie ist die Tochter von %(father)s."
 
-#: ReportUtils.py:1069
+#: ReportUtils.py:1070
 msgid "%(male_name)s was born on %(birth_date)s in %(birth_place)s."
 msgstr "%(male_name)s wurde am %(birth_date)s in %(birth_place)s geboren."
 
-#: ReportUtils.py:1074
+#: ReportUtils.py:1075
 msgid "%(male_name)s was born on %(birth_date)s."
 msgstr "%(male_name)s wurde am %(birth_date)s geboren."
 
-#: ReportUtils.py:1078
+#: ReportUtils.py:1079
 msgid "%(male_name)s was born in %(month_year)s in %(birth_place)s."
 msgstr "%(male_name)s wurde geboren im %(month_year)s in %(birth_place)s."
 
-#: ReportUtils.py:1083
+#: ReportUtils.py:1084
 msgid "%(male_name)s was born in %(month_year)s."
 msgstr "%(male_name)s wurde geboren im %(month_year)s."
 
-#: ReportUtils.py:1087
+#: ReportUtils.py:1088
 msgid "%(male_name)s was born in %(birth_place)s."
 msgstr "%(male_name)s wurde geboren in %(birth_place)s."
 
-#: ReportUtils.py:1094
+#: ReportUtils.py:1095
 msgid "%(female_name)s was born on %(birth_date)s in %(birth_place)s."
 msgstr "%(female_name)s wurde geboren am %(birth_date)s in %(birth_place)s."
 
-#: ReportUtils.py:1099
+#: ReportUtils.py:1100
 msgid "%(female_name)s was born on %(birth_date)s."
 msgstr "%(female_name)s wurde geboren am %(birth_date)s."
 
-#: ReportUtils.py:1103
+#: ReportUtils.py:1104
 msgid "%(female_name)s was born in %(month_year)s in %(birth_place)s."
 msgstr "%(female_name)s wurde geboren im %(month_year)s in %(birth_place)s."
 
-#: ReportUtils.py:1108
+#: ReportUtils.py:1109
 msgid "%(female_name)s was born in %(month_year)s."
 msgstr "%(female_name)s wurde geboren im %(month_year)s."
 
-#: ReportUtils.py:1112
+#: ReportUtils.py:1113
 msgid "%(female_name)s was born in %(birth_place)s."
 msgstr "%(female_name)s wurde geboren in %(birth_place)s."
 
-#: ReportUtils.py:1168
+#: ReportUtils.py:1169
 msgid "%(male_name)s died on %(death_date)s in %(death_place)s."
 msgstr "%(male_name)s starb am %(death_date)s in %(death_place)s."
 
-#: ReportUtils.py:1173
+#: ReportUtils.py:1174
 msgid ""
 "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)"
 "d years."
@@ -3026,7 +3100,7 @@ msgstr ""
 "%(male_name)s starb am %(death_date)s in %(death_place)s im Alter von %(age)"
 "d Jahren."
 
-#: ReportUtils.py:1180
+#: ReportUtils.py:1181
 msgid ""
 "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)"
 "d months."
@@ -3034,7 +3108,7 @@ msgstr ""
 "%(male_name)s starb am %(death_date)s in %(death_place)s% im Alter von %(age)"
 "d Monaten."
 
-#: ReportUtils.py:1187
+#: ReportUtils.py:1188
 msgid ""
 "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)"
 "d days."
@@ -3042,27 +3116,27 @@ msgstr ""
 "%(male_name)s starb am %(death_date)s in %(death_place)s im Alter von %(age)"
 "d Tagen."
 
-#: ReportUtils.py:1195
+#: ReportUtils.py:1196
 msgid "%(male_name)s died on %(death_date)s."
 msgstr "%(male_name)s starb am %(death_date)s."
 
-#: ReportUtils.py:1198
+#: ReportUtils.py:1199
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d years."
 msgstr "%(male_name)s starb am %(death_date)s im Alter von %(age)d Jahren."
 
-#: ReportUtils.py:1203
+#: ReportUtils.py:1204
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d months."
 msgstr "%(male_name)s starb am %(death_date)s im Altern von %(age)d Monaten."
 
-#: ReportUtils.py:1208
+#: ReportUtils.py:1209
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d days."
 msgstr "%(male_name)s starb am %(death_date)s im Alter von %(age)d Tagen."
 
-#: ReportUtils.py:1215
+#: ReportUtils.py:1216
 msgid "%(male_name)s died in %(month_year)s in %(death_place)s."
 msgstr "%(male_name)s starb im %(month_year)s in %(death_place)s."
 
-#: ReportUtils.py:1220
+#: ReportUtils.py:1221
 msgid ""
 "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)"
 "d years."
@@ -3070,7 +3144,7 @@ msgstr ""
 "%(male_name)s starb im %(month_year)s in %(death_place)s im Alter von %(age)"
 "d Jahren."
 
-#: ReportUtils.py:1227
+#: ReportUtils.py:1228
 msgid ""
 "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)"
 "d months."
@@ -3078,7 +3152,7 @@ msgstr ""
 "%(male_name)s starb im %(month_year)s in %(death_place)s im Alter von %(age)"
 "d Monaten."
 
-#: ReportUtils.py:1234
+#: ReportUtils.py:1235
 msgid ""
 "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)"
 "d days."
@@ -3086,55 +3160,55 @@ msgstr ""
 "%(male_name)s starb im %(month_year)s in %(death_place)s im Alter von %(age)"
 "d Tagen."
 
-#: ReportUtils.py:1242
+#: ReportUtils.py:1243
 msgid "%(male_name)s died in %(month_year)s."
 msgstr "%(male_name)s starb im %(month_year)s."
 
-#: ReportUtils.py:1245
+#: ReportUtils.py:1246
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d years."
 msgstr "%(male_name)s starb im %(month_year)s im Alter von %(age)d Jahren."
 
-#: ReportUtils.py:1250
+#: ReportUtils.py:1251
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d months."
 msgstr "%(male_name)s starb im %(month_year)s im Alter von %(age)d Monaten."
 
-#: ReportUtils.py:1255
+#: ReportUtils.py:1256
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d days."
 msgstr "%(male_name)s starb im %(month_year)s im Alter von %(age)d Tagen."
 
-#: ReportUtils.py:1262
+#: ReportUtils.py:1263
 msgid "%(male_name)s died in %(death_place)s."
 msgstr "%(male_name)s starb in %(death_place)s."
 
-#: ReportUtils.py:1265
+#: ReportUtils.py:1266
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d years."
 msgstr "%(male_name)s starb in %(death_place)s im Alter von %(age)d Jahren."
 
-#: ReportUtils.py:1270
+#: ReportUtils.py:1271
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d months."
 msgstr "%(male_name)s starb in %(death_place)s im Alter von %(age)d Monaten."
 
-#: ReportUtils.py:1275
+#: ReportUtils.py:1276
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d days."
 msgstr "%(male_name)s starb in %(death_place)s im Alter von %(age)d Tagen."
 
-#: ReportUtils.py:1284
+#: ReportUtils.py:1285
 msgid "%(male_name)s died at the age of %(age)d years."
 msgstr "%(male_name)s starb im Alter von %(age)d Jahren."
 
-#: ReportUtils.py:1288
+#: ReportUtils.py:1289
 msgid "%(male_name)s died at the age of %(age)d months."
 msgstr "%(male_name)s starb im Alter von %(age)d Monaten."
 
-#: ReportUtils.py:1292
+#: ReportUtils.py:1293
 msgid "%(male_name)s died at the age of %(age)d days."
 msgstr "%(male_name)s starb im Alter von %(age)d Tagen."
 
-#: ReportUtils.py:1299
+#: ReportUtils.py:1300
 msgid "%(female_name)s died on %(death_date)s in %(death_place)s."
 msgstr "%(female_name)s starb am %(death_date)s in %(death_place)s."
 
-#: ReportUtils.py:1304
+#: ReportUtils.py:1305
 msgid ""
 "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %"
 "(age)d years."
@@ -3142,7 +3216,7 @@ msgstr ""
 "%(female_name)s starb am %(death_date)s in %(death_place)s im Alter von %"
 "(age)d Jahren."
 
-#: ReportUtils.py:1311
+#: ReportUtils.py:1312
 msgid ""
 "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %"
 "(age)d months."
@@ -3150,7 +3224,7 @@ msgstr ""
 "%(female_name)s starb am %(death_date)s in %(death_place)s im Alter von %"
 "(age)d Monaten."
 
-#: ReportUtils.py:1318
+#: ReportUtils.py:1319
 msgid ""
 "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %"
 "(age)d days."
@@ -3158,27 +3232,27 @@ msgstr ""
 "%(female_name)s starb am %(death_date)s in %(death_place)s im Alter von %"
 "(age)d Tagen."
 
-#: ReportUtils.py:1326
+#: ReportUtils.py:1327
 msgid "%(female_name)s died on %(death_date)s."
 msgstr "%(female_name)s starb am %(death_date)s."
 
-#: ReportUtils.py:1329
+#: ReportUtils.py:1330
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d years."
 msgstr "%(female_name)s starb am %(death_date)s im Alter von %(age)d Jahren."
 
-#: ReportUtils.py:1334
+#: ReportUtils.py:1335
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d months."
 msgstr "%(female_name)s starb am %(death_date)s im Alter von %(age)d Monaten."
 
-#: ReportUtils.py:1339
+#: ReportUtils.py:1340
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d days."
 msgstr "%(female_name)s starb am %(death_date)s im Alter von %(age)d Tagen."
 
-#: ReportUtils.py:1346
+#: ReportUtils.py:1347
 msgid "%(female_name)s died in %(month_year)s in %(death_place)s."
 msgstr "%(female_name)s starb im %(month_year)s in %(death_place)s."
 
-#: ReportUtils.py:1351
+#: ReportUtils.py:1352
 msgid ""
 "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %"
 "(age)d years."
@@ -3186,7 +3260,7 @@ msgstr ""
 "%(female_name)s starb im %(month_year)s in %(death_place)s im Alter von %"
 "(age)d Jahren."
 
-#: ReportUtils.py:1358
+#: ReportUtils.py:1359
 msgid ""
 "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %"
 "(age)d months."
@@ -3194,7 +3268,7 @@ msgstr ""
 "%(female_name)s starb im %(month_year)s in %(death_place)s im Alter von %"
 "(age)d Monaten."
 
-#: ReportUtils.py:1365
+#: ReportUtils.py:1366
 msgid ""
 "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %"
 "(age)d days."
@@ -3202,99 +3276,99 @@ msgstr ""
 "%(female_name)s starb im %(month_year)s in %(death_place)s im Alter von %"
 "(age)d Tagen."
 
-#: ReportUtils.py:1373
+#: ReportUtils.py:1374
 msgid "%(female_name)s died in %(month_year)s."
 msgstr "%(female_name)s starb im %(month_year)s."
 
-#: ReportUtils.py:1376
+#: ReportUtils.py:1377
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d years."
 msgstr "%(female_name)s starb im %(month_year)s im Alter von %(age)d Jahren."
 
-#: ReportUtils.py:1381
+#: ReportUtils.py:1382
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d months."
 msgstr "%(female_name)s starb im %(month_year)s im Alter von %(age)d Monaten."
 
-#: ReportUtils.py:1386
+#: ReportUtils.py:1387
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d days."
 msgstr "%(female_name)s starb im %(month_year)s im Alter von %(age)d Tagen."
 
-#: ReportUtils.py:1393
+#: ReportUtils.py:1394
 msgid "%(female_name)s died in %(death_place)s."
 msgstr "%(female_name)s starb in %(death_place)s."
 
-#: ReportUtils.py:1396
+#: ReportUtils.py:1397
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d years."
 msgstr "%(female_name)s starb in %(death_place)s im Alter von %(age)d Jahren."
 
-#: ReportUtils.py:1401
+#: ReportUtils.py:1402
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d months."
 msgstr "%(female_name)s starb in %(death_place)s im Alter von %(age)d Monaten."
 
-#: ReportUtils.py:1406
+#: ReportUtils.py:1407
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d days."
 msgstr "%(female_name)s starb in %(death_place)s im Alter von %(age)d Tagen."
 
-#: ReportUtils.py:1415
+#: ReportUtils.py:1416
 msgid "%(female_name)s died at the age of %(age)d years."
 msgstr "%(female_name)s starb im Alter von %(age)d Jahren."
 
-#: ReportUtils.py:1419
+#: ReportUtils.py:1420
 msgid "%(female_name)s died at the age of %(age)d months."
 msgstr "%(female_name)s starb im Alter von %(age)d Monaten."
 
-#: ReportUtils.py:1423
+#: ReportUtils.py:1424
 msgid "%(female_name)s died at the age of %(age)d days."
 msgstr "%(female_name)s starb im Alter von %(age)d Tagen."
 
-#: ReportUtils.py:1476
+#: ReportUtils.py:1477
 msgid "%(male_name)s was buried on %(burial_date)s in %(burial_place)s."
 msgstr "%(male_name)s wurde begraben am %(burial_date)s in %(burial_place)s."
 
-#: ReportUtils.py:1481
+#: ReportUtils.py:1482
 msgid "%(male_name)s was buried on %(burial_date)s."
 msgstr "%(male_name)s wurde begraben am %(burial_date)s."
 
-#: ReportUtils.py:1485
+#: ReportUtils.py:1486
 msgid "%(male_name)s was buried in %(month_year)s in %(burial_place)s."
 msgstr "%(male_name)s wurde begraben im %(month_year)s in %(burial_place)s."
 
-#: ReportUtils.py:1490
+#: ReportUtils.py:1491
 msgid "%(male_name)s was buried in %(month_year)s."
 msgstr "%(male_name)s wurde begraben im %(month_year)s."
 
-#: ReportUtils.py:1494
+#: ReportUtils.py:1495
 msgid "%(male_name)s was buried in %(burial_place)s."
 msgstr "%(male_name)s wurde begraben in %(burial_place)s."
 
-#: ReportUtils.py:1497
+#: ReportUtils.py:1498
 msgid "%(male_name)s was buried."
 msgstr "%(male_name)s wurde begraben."
 
-#: ReportUtils.py:1502
+#: ReportUtils.py:1503
 msgid "%(female_name)s was buried on %(burial_date)s in %(burial_place)s."
 msgstr "%(female_name)s wurde begraben am %(burial_date)s in %(burial_place)s."
 
-#: ReportUtils.py:1507
+#: ReportUtils.py:1508
 msgid "%(female_name)s was buried on %(burial_date)s."
 msgstr "%(female_name)s wurde begraben am %(burial_date)s."
 
-#: ReportUtils.py:1511
+#: ReportUtils.py:1512
 msgid "%(female_name)s was buried in %(month_year)s in %(burial_place)s."
 msgstr "%(female_name)s wurde begraben im %(month_year)s in %(burial_place)s."
 
-#: ReportUtils.py:1516
+#: ReportUtils.py:1517
 msgid "%(female_name)s was buried in %(month_year)s."
 msgstr "%(female_name)s wurde begraben im %(month_year)s."
 
-#: ReportUtils.py:1520
+#: ReportUtils.py:1521
 msgid "%(female_name)s was buried in %(burial_place)s."
 msgstr "%(female_name)s wurde begraben in %(burial_place)s."
 
-#: ReportUtils.py:1523
+#: ReportUtils.py:1524
 msgid "%(female_name)s was buried."
 msgstr "%(female_name)s wurde begraben."
 
-#: ReportUtils.py:1553
+#: ReportUtils.py:1554
 msgid ""
 "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s %"
 "(death_place)s."
@@ -3302,79 +3376,79 @@ msgstr ""
 "%(male_name)s Geboren: %(birth_date)s %(birth_place)s Gestorben: %"
 "(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1560
+#: ReportUtils.py:1561
 msgid ""
 "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s."
 msgstr ""
 "%(male_name)s Geboren: %(birth_date)s %(birth_place)s Gestorben: %"
 "(death_date)s."
 
-#: ReportUtils.py:1568
+#: ReportUtils.py:1569
 msgid ""
 "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_place)s."
 msgstr ""
 "%(male_name)s Geboren: %(birth_date)s %(birth_place)s Gestorben: %"
 "(death_place)s."
 
-#: ReportUtils.py:1575
+#: ReportUtils.py:1576
 msgid "%(male_name)s Born: %(birth_date)s %(birth_place)s."
 msgstr "%(male_name)s Geboren: %(birth_date)s %(birth_place)s."
 
-#: ReportUtils.py:1582
+#: ReportUtils.py:1583
 msgid ""
 "%(male_name)s Born: %(birth_date)s Died: %(death_date)s %(death_place)s."
 msgstr ""
 "%(male_name)s Geboren: %(birth_date)s Gestorben: %(death_date)s %"
 "(death_place)s."
 
-#: ReportUtils.py:1587
+#: ReportUtils.py:1588
 msgid "%(male_name)s Born: %(birth_date)s Died: %(death_date)s."
 msgstr "%(male_name)s Geboren: %(birth_date)s Gestorben: %(death_date)s."
 
-#: ReportUtils.py:1593
+#: ReportUtils.py:1594
 msgid "%(male_name)s Born: %(birth_date)s Died: %(death_place)s."
 msgstr "%(male_name)s Geboren: %(birth_date)s Gestorben: %(death_place)s."
 
-#: ReportUtils.py:1598
+#: ReportUtils.py:1599
 msgid "%(male_name)s Born: %(birth_date)s."
 msgstr "%(male_name)s Geboren: %(birth_date)s."
 
-#: ReportUtils.py:1604
+#: ReportUtils.py:1605
 msgid ""
 "%(male_name)s Born: %(birth_place)s Died: %(death_date)s %(death_place)s."
 msgstr ""
 "%(male_name)s Geboren: %(birth_place)s Gestorben: %(death_date)s %"
 "(death_place)s."
 
-#: ReportUtils.py:1611
+#: ReportUtils.py:1612
 msgid "%(male_name)s Born: %(birth_place)s Died: %(death_date)s."
 msgstr "%(male_name)s Geboren: %(birth_place)s Gestorben: %(death_date)s."
 
-#: ReportUtils.py:1619
+#: ReportUtils.py:1620
 msgid "%(male_name)s Born: %(birth_place)s Died: %(death_place)s."
 msgstr "%(male_name)s Geboren: %(birth_place)s Gestorben: %(death_place)s."
 
-#: ReportUtils.py:1626
+#: ReportUtils.py:1627
 msgid "%(male_name)s Born: %(birth_place)s."
 msgstr "%(male_name)s Geboren: %(birth_place)s."
 
-#: ReportUtils.py:1632
+#: ReportUtils.py:1633
 msgid "%(male_name)s Died: %(death_date)s %(death_place)s."
 msgstr "%(male_name)s Gestorben: %(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1637
+#: ReportUtils.py:1638
 msgid "%(male_name)s Died: %(death_date)s."
 msgstr "%(male_name)s Gestorben: %(death_date)s."
 
-#: ReportUtils.py:1642
+#: ReportUtils.py:1643
 msgid "%(male_name)s Died: %(death_place)s."
 msgstr "%(male_name)s Gestorben: %(death_place)s."
 
-#: ReportUtils.py:1645
+#: ReportUtils.py:1646
 msgid "%(male_name)s."
 msgstr "%(male_name)s."
 
-#: ReportUtils.py:1652
+#: ReportUtils.py:1653
 msgid ""
 "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s %"
 "(death_place)s."
@@ -3382,101 +3456,101 @@ msgstr ""
 "%(female_name)s Geboren: %(birth_date)s %(birth_place)s Gestorben: %"
 "(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1659
+#: ReportUtils.py:1660
 msgid ""
 "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s."
 msgstr ""
 "%(female_name)s Geboren: %(birth_date)s %(birth_place)s Gestorben: %"
 "(death_date)s."
 
-#: ReportUtils.py:1667
+#: ReportUtils.py:1668
 msgid ""
 "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_place)s."
 msgstr ""
 "%(female_name)s Geboren: %(birth_date)s %(birth_place)s Gestorben: %"
 "(death_place)s."
 
-#: ReportUtils.py:1674
+#: ReportUtils.py:1675
 msgid "%(female_name)s Born: %(birth_date)s %(birth_place)s."
 msgstr "%(female_name)s Geboren: %(birth_date)s %(birth_place)s."
 
-#: ReportUtils.py:1681
+#: ReportUtils.py:1682
 msgid ""
 "%(female_name)s Born: %(birth_date)s Died: %(death_date)s %(death_place)s."
 msgstr ""
 "%(female_name)s Geboren: %(birth_date)s Gestorben: %(death_date)s %"
 "(death_place)s."
 
-#: ReportUtils.py:1686
+#: ReportUtils.py:1687
 msgid "%(female_name)s Born: %(birth_date)s Died: %(death_date)s."
 msgstr "%(female_name)s Geboren: %(birth_date)s Gestorben: %(death_date)s."
 
-#: ReportUtils.py:1692
+#: ReportUtils.py:1693
 msgid "%(female_name)s Born: %(birth_date)s Died: %(death_place)s."
 msgstr "%(female_name)s Geboren: %(birth_date)s Gestorben: %(death_place)s."
 
-#: ReportUtils.py:1697
+#: ReportUtils.py:1698
 msgid "%(female_name)s Born: %(birth_date)s."
 msgstr "%(female_name)s Geboren: %(birth_date)s."
 
-#: ReportUtils.py:1703
+#: ReportUtils.py:1704
 msgid ""
 "%(female_name)s Born: %(birth_place)s Died: %(death_date)s %(death_place)s."
 msgstr ""
 "%(female_name)s Geboren: %(birth_place)s Gestorben: %(death_date)s %"
 "(death_place)s."
 
-#: ReportUtils.py:1710
+#: ReportUtils.py:1711
 msgid "%(female_name)s Born: %(birth_place)s Died: %(death_date)s."
 msgstr "%(female_name)s Geboren: %(birth_place)s Gestorben: %(death_date)s."
 
-#: ReportUtils.py:1718
+#: ReportUtils.py:1719
 msgid "%(female_name)s Born: %(birth_place)s Died: %(death_place)s."
 msgstr "%(female_name)s Geboren: %(birth_place)s Gestorben: %(death_place)s."
 
-#: ReportUtils.py:1725
+#: ReportUtils.py:1726
 msgid "%(female_name)s Born: %(birth_place)s."
 msgstr "%(female_name)s Geboren: %(birth_place)s."
 
-#: ReportUtils.py:1731
+#: ReportUtils.py:1732
 msgid "%(female_name)s Died: %(death_date)s %(death_place)s."
 msgstr "%(female_name)s Gestorben: %(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1736
+#: ReportUtils.py:1737
 msgid "%(female_name)s Died: %(death_date)s."
 msgstr "%(female_name)s Gestorben: %(death_date)s."
 
-#: ReportUtils.py:1741
+#: ReportUtils.py:1742
 msgid "%(female_name)s Died: %(death_place)s."
 msgstr "%(female_name)s Gestorben: %(death_place)s."
 
-#: ReportUtils.py:1744
+#: ReportUtils.py:1745
 msgid "%(female_name)s."
 msgstr "%(female_name)s."
 
-#: ReportUtils.py:1753 const.py:490 gramps.glade:4344
+#: ReportUtils.py:1754 const.py:490 gramps.glade:4582
 #: plugins/FamilyGroup.py:376 plugins/FamilyGroup.py:378
 msgid "Married"
 msgstr "Verheiratet"
 
-#: ReportUtils.py:1754 const.py:491
+#: ReportUtils.py:1755 const.py:491
 msgid "Unmarried"
 msgstr "Unverheiratet"
 
-#: ReportUtils.py:1755 const.py:492
+#: ReportUtils.py:1756 const.py:492
 msgid "Civil Union"
 msgstr "Gesetzliche Partnerschaft"
 
-#: ReportUtils.py:1757 const.py:234 const.py:248 const.py:494
+#: ReportUtils.py:1758 const.py:234 const.py:248 const.py:494
 #: mergedata.glade:242
 msgid "Other"
 msgstr "Andere"
 
-#: SelectChild.py:288 SelectChild.py:307
+#: SelectChild.py:193 SelectChild.py:212
 msgid "A person cannot be linked as his/her own child"
 msgstr "Eine Person kann nicht ihr eigenes Kind sein."
 
-#: SelectChild.py:332
+#: SelectChild.py:237
 msgid "Add Child to Family (%s)"
 msgstr "Kind zur Familie hinzufügen (%s)"
 
@@ -3492,11 +3566,11 @@ msgstr "Abkürzung"
 msgid "Publication Information"
 msgstr "Publikationsinformation"
 
-#: SourceView.py:193
+#: SourceView.py:195
 msgid "Source Menu"
 msgstr "Quellenmenü"
 
-#: SourceView.py:218
+#: SourceView.py:220
 msgid ""
 "This source is currently being used. Deleting it will remove it from the "
 "database and from all records that reference it."
@@ -3504,19 +3578,19 @@ msgstr ""
 "Diese Quelle wird derzeit verwendet. Beim Löschen wird sie aus der Datenbank "
 "und allen referenzierenden Datensätzen entfernt."
 
-#: SourceView.py:222
+#: SourceView.py:224
 msgid "Deleting source will remove it from the database."
 msgstr "Das Löschen einer Quelle entfernt sie aus der Datenbank."
 
-#: SourceView.py:226
+#: SourceView.py:228
 msgid "_Delete Source"
 msgstr "Quelle _löschen"
 
-#: SourceView.py:267
+#: SourceView.py:269
 msgid "Cannot merge sources."
 msgstr "Die Quellen können nicht zusammengefasst werden."
 
-#: SourceView.py:268
+#: SourceView.py:270
 msgid ""
 "Exactly two sources must be selected to perform a merge. A second source can "
 "be selected by holding down the control key while clicking on the desired "
@@ -3626,33 +3700,33 @@ msgstr ""
 "eingegeben werden. Falls Sie nicht vorhaben GEDCOM-Dateien zu generieren, "
 "können Sie die Felder leer lassen."
 
-#: StartupDialog.py:243 gramps.glade:5910 gramps.glade:5981 gramps.glade:7774
-#: gramps.glade:8584 gramps.glade:9098 gramps.glade:9534 gramps.glade:12280
-#: gramps.glade:12775 plugins/soundex.glade:110
+#: StartupDialog.py:243 gramps.glade:6235 gramps.glade:6318 gramps.glade:8240
+#: gramps.glade:9157 gramps.glade:9730 gramps.glade:10213 gramps.glade:13193
+#: gramps.glade:13747 plugins/soundex.glade:110
 msgid "Name:"
 msgstr "Name:"
 
-#: StartupDialog.py:244 gramps.glade:9486 plugins/Ancestors.py:505
+#: StartupDialog.py:244 gramps.glade:10157 plugins/Ancestors.py:505
 msgid "Address:"
 msgstr "Adresse:"
 
-#: StartupDialog.py:245 gramps.glade:14682
+#: StartupDialog.py:245 gramps.glade:15804
 msgid "City:"
 msgstr "Ort:"
 
-#: StartupDialog.py:246 gramps.glade:9606
+#: StartupDialog.py:246 gramps.glade:10297
 msgid "State/Province:"
 msgstr "Bundesland/Provinz:"
 
-#: StartupDialog.py:247 gramps.glade:9510 gramps.glade:14730
+#: StartupDialog.py:247 gramps.glade:10185 gramps.glade:15860
 msgid "Country:"
 msgstr "Land:"
 
-#: StartupDialog.py:248 gramps.glade:9582
+#: StartupDialog.py:248 gramps.glade:10269
 msgid "ZIP/Postal code:"
 msgstr "Postleitzahl:"
 
-#: StartupDialog.py:249 gramps.glade:9868 gramps.glade:14977
+#: StartupDialog.py:249 gramps.glade:10603 gramps.glade:16147
 msgid "Phone:"
 msgstr "Telefon:"
 
@@ -3731,7 +3805,7 @@ msgstr "Internetadressen-Editor"
 msgid "Internet Address Editor for %s"
 msgstr "Internetadressen-Editor für %s"
 
-#: Utils.py:72
+#: Utils.py:67
 msgid ""
 "The data can only be recovered by Undo operation or by quitting with "
 "abandoning changes."
@@ -3763,32 +3837,33 @@ msgstr ""
 "\n"
 "Bitte versuchen Sie es nochmal. Der Zeuge wurde nicht geändert."
 
-#: WriteGedcom.py:333 plugins/DescendReport.py:116
-#: plugins/ExportVCalendar.py:85 plugins/ExportVCard.py:88
+#: WriteGedcom.py:334 plugins/DescendReport.py:116
+#: plugins/ExportVCalendar.py:87 plugins/ExportVCard.py:89
 #: plugins/FtmStyleDescendants.py:121 plugins/GraphViz.py:517
 #: plugins/IndivComplete.py:514 plugins/StatisticsChart.py:831
-#: plugins/TimeLine.py:415 plugins/WebPage.py:1269 plugins/WriteFtree.py:90
-#: plugins/WriteGeneWeb.py:91
+#: plugins/TimeLine.py:415 plugins/WebPage.py:1269 plugins/WriteFtree.py:91
+#: plugins/WriteGeneWeb.py:92
 msgid "Descendants of %s"
 msgstr "Nachkommen von %s"
 
-#: WriteGedcom.py:337 plugins/Ancestors.py:141 plugins/ExportVCalendar.py:89
-#: plugins/ExportVCard.py:92 plugins/FtmStyleAncestors.py:96
+#: WriteGedcom.py:340 plugins/Ancestors.py:141 plugins/ExportVCalendar.py:93
+#: plugins/ExportVCard.py:95 plugins/FtmStyleAncestors.py:96
 #: plugins/GraphViz.py:521 plugins/IndivComplete.py:518
 #: plugins/StatisticsChart.py:835 plugins/TimeLine.py:419
-#: plugins/WebPage.py:1277 plugins/WriteFtree.py:94 plugins/WriteGeneWeb.py:95
+#: plugins/WebPage.py:1277 plugins/WriteFtree.py:97 plugins/WriteGeneWeb.py:98
 msgid "Ancestors of %s"
 msgstr "Vorfahren von %s"
 
-#: WriteGedcom.py:341 plugins/ExportVCalendar.py:93 plugins/ExportVCard.py:96
+#: WriteGedcom.py:346 plugins/ExportVCalendar.py:99 plugins/ExportVCard.py:101
 #: plugins/GraphViz.py:525 plugins/IndivComplete.py:522
 #: plugins/StatisticsChart.py:839 plugins/TimeLine.py:423
-#: plugins/WebPage.py:1281 plugins/WriteFtree.py:98 plugins/WriteGeneWeb.py:99
+#: plugins/WebPage.py:1281 plugins/WriteFtree.py:103
+#: plugins/WriteGeneWeb.py:104
 msgid "People with common ancestor with %s"
 msgstr "Personen mit gleichem Vorfahren wie %s"
 
-#: WriteGedcom.py:557 WriteGedcom.py:562 docgen/AbiWord2Doc.py:77
-#: docgen/AbiWord2Doc.py:80 docgen/AsciiDoc.py:113 docgen/AsciiDoc.py:116
+#: WriteGedcom.py:565 WriteGedcom.py:570 docgen/AbiWord2Doc.py:75
+#: docgen/AbiWord2Doc.py:78 docgen/AsciiDoc.py:113 docgen/AsciiDoc.py:116
 #: docgen/HtmlDoc.py:225 docgen/HtmlDoc.py:228 docgen/HtmlDoc.py:353
 #: docgen/HtmlDoc.py:356 docgen/LaTeXDoc.py:87 docgen/LaTeXDoc.py:90
 #: docgen/OpenSpreadSheet.py:76 docgen/OpenSpreadSheet.py:78
@@ -3797,18 +3872,18 @@ msgstr "Personen mit gleichem Vorfahren wie %s"
 #: docgen/OpenSpreadSheet.py:436 docgen/OpenSpreadSheet.py:440
 #: docgen/PSDrawDoc.py:95 docgen/PSDrawDoc.py:98 docgen/PdfDoc.py:180
 #: docgen/RTFDoc.py:80 docgen/RTFDoc.py:83 docgen/SvgDrawDoc.py:75
-#: docgen/SvgDrawDoc.py:77 plugins/ExportVCalendar.py:168
-#: plugins/ExportVCalendar.py:172 plugins/ExportVCard.py:153
-#: plugins/ExportVCard.py:157 plugins/WriteGeneWeb.py:210
-#: plugins/WriteGeneWeb.py:214
+#: docgen/SvgDrawDoc.py:77 plugins/ExportVCalendar.py:178
+#: plugins/ExportVCalendar.py:182 plugins/ExportVCard.py:162
+#: plugins/ExportVCard.py:166 plugins/WriteGeneWeb.py:219
+#: plugins/WriteGeneWeb.py:223
 msgid "Could not create %s"
 msgstr "Datei %s konnte nicht erstellt werden"
 
-#: WriteGedcom.py:1252
+#: WriteGedcom.py:1272
 msgid "GE_DCOM"
 msgstr "GE_DCOM"
 
-#: WriteGedcom.py:1253
+#: WriteGedcom.py:1273
 msgid ""
 "GEDCOM is used to transfer data between genealogy programs. Most genealogy "
 "software will accept a GEDCOM file as input. "
@@ -3817,7 +3892,7 @@ msgstr ""
 "transferieren. Die meiste Software zur Ahnenforschung akzeptiert eine GEDCOM-"
 "Datei als Eingabe."
 
-#: WriteGedcom.py:1255
+#: WriteGedcom.py:1275
 msgid "GEDCOM export options"
 msgstr "GEDCOM-Export-Optionen"
 
@@ -4121,113 +4196,113 @@ msgstr "Unbekannte Beziehung zwischen einem Mann und einer Frau"
 msgid "An unspecified relationship between a man and woman"
 msgstr "Eine unbestimmte Beziehung zwischen einem Mann und einer Frau"
 
-#: const.py:515
+#: const.py:522
 msgid "Also Known As"
 msgstr "Auch bekannt als"
 
-#: const.py:516
+#: const.py:523
 msgid "Birth Name"
 msgstr "Geburtsname"
 
-#: const.py:517
+#: const.py:524
 msgid "Married Name"
 msgstr "Name nach der Hochzeit"
 
-#: const.py:518
+#: const.py:525
 msgid "Other Name"
 msgstr "Anderer Name"
 
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid ""
 msgstr ""
 
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid "Cleared"
 msgstr "Freigegeben"
 
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: const.py:903
+#: const.py:910
 msgid "Infant"
 msgstr "Kleinkind"
 
-#: const.py:903 const.py:909
+#: const.py:910 const.py:916
 msgid "Stillborn"
 msgstr "Totgeboren"
 
-#: const.py:903 const.py:909 const.py:915
+#: const.py:910 const.py:916 const.py:922
 msgid "Pre-1970"
 msgstr "Vor 1970"
 
-#: const.py:903 const.py:909 const.py:915
+#: const.py:910 const.py:916 const.py:922
 msgid "Qualified"
 msgstr "Oualifiziert"
 
-#: const.py:904 const.py:910 const.py:916
+#: const.py:911 const.py:917 const.py:923
 msgid "Submitted"
 msgstr "Eingereicht"
 
-#: const.py:904 const.py:910 const.py:916
+#: const.py:911 const.py:917 const.py:923
 msgid "Uncleared"
 msgstr "Nicht freigegeben"
 
-#: const.py:908
+#: const.py:915
 msgid "BIC"
 msgstr "IBG"
 
-#: const.py:909 const.py:915
+#: const.py:916 const.py:922
 msgid "DNS"
 msgstr "kSieg"
 
-#: const.py:914
+#: const.py:921
 msgid "Canceled"
 msgstr "Annulliert"
 
-#: const.py:915
+#: const.py:922
 msgid "DNS/CAN"
 msgstr "kSieg/Annul"
 
-#: const.py:921
+#: const.py:928
 msgid "Flowed"
 msgstr "Fließend"
 
-#: const.py:922
+#: const.py:929
 msgid "Preformatted"
 msgstr "Formatiert"
 
-#: const.py:934
+#: const.py:941
 msgid "Text Reports"
 msgstr "Schriftliche Berichte"
 
-#: const.py:935
+#: const.py:942
 msgid "Graphical Reports"
 msgstr "Graphische Berichte"
 
-#: const.py:936
+#: const.py:943
 msgid "Code Generators"
 msgstr "Code-Generatoren"
 
-#: const.py:937 plugins/WebPage.py:1719
+#: const.py:944 plugins/WebPage.py:1719
 msgid "Web Page"
 msgstr "Webseite"
 
-#: const.py:938
+#: const.py:945
 msgid "View"
 msgstr "Ansichten"
 
-#: const.py:939
+#: const.py:946
 msgid "Books"
 msgstr "Bücher"
 
-#: const.py:943 plugins/ScratchPad.py:356 plugins/ScratchPad.py:405
+#: const.py:950 plugins/ScratchPad.py:356 plugins/ScratchPad.py:405
 #: plugins/ScratchPad.py:413 plugins/SimpleBookTitle.py:169
 #: plugins/SimpleBookTitle.py:170 plugins/SimpleBookTitle.py:171
 msgid "Text"
 msgstr "Text"
 
-#: const.py:944
+#: const.py:951
 msgid "Graphics"
 msgstr "Grafiken"
 
@@ -4256,8 +4331,8 @@ msgid ""
 "An image can be added to any gallery or the Media View by dragging and "
 "dropping it from a file manager or a web browser."
 msgstr ""
-"Ein Bild kann zu jeder Gallerie oder zu Mulitmedia durch das Ziehen von "
-"einem Dateimanager zu einem Webbrowser hinzugefügt werden."
+"Ein Bild kann zu jeder Galerie oder zu Multimedia durch das Ziehen von einem "
+"Dateimanager zu einem Webbrowser hinzugefügt werden."
 
 #: data/tips.xml:24
 msgid ""
@@ -4342,7 +4417,7 @@ msgid ""
 "listed only once. By clicking on the arrow to the left of a name, the list "
 "will expand to show all individuals with that last name."
 msgstr ""
-"Personen lokalisieren: Als Standard werdne nur die Familiennamen in "
+"Personen lokalisieren: Als Standard werden nur die Familiennamen in "
 "der Personenansicht zuerst gelistet. Durch das Klicken auf das Dreieck neben "
 "dem Familiennamen werden alle Personen mit diesem Namen angezeigt."
 
@@ -4351,7 +4426,7 @@ msgid ""
 "The Family View: The Family View is used to display a typical family "
 "unit---the parents, spouses and children of an individual."
 msgstr ""
-"Die Familienansicht: Die Familienanischt wird verwendet, um eine "
+"Die Familienansicht: Die Familienansicht wird verwendet, um eine "
 "Familie anzuzeigen -- die Eltern, Ehepartner und Kinder von einer Person."
 
 #: data/tips.xml:89
@@ -4380,7 +4455,7 @@ msgid ""
 msgstr ""
 "Wer wurde wann geboren: Das Werkzeug \"Einzelne Ereignisse vergleichen"
 "\" erlaubt Ihnen die Daten von allen (oder einigen) Personen aus Ihrer "
-"Datenbank zu vergleihcen. Das ist nützlich, wenn Sie wünchen, dass die "
+"Datenbank zu vergleichen. Das ist nützlich, wenn Sie wünchen, dass die "
 "Geburtsdaten von jedem aus Ihrer Datenbank angezeigt werden sollen."
 
 #: data/tips.xml:104
@@ -4464,7 +4539,7 @@ msgstr ""
 "Einen Stammbaum anlegen: Ein guter Weg anzufangen ist alle Mitglieder "
 "der Familie in die Datenbank einzugeben (verwenden Sie Bearbeiten > "
 "Hinzufügen oder klicken Sie auf den Hinzufügeknopf in der Menüleiste). "
-"Dann gehen Sie gehen Sie in die Familienanischt und legen Beziehungen "
+"Dann gehen Sie gehen Sie in die Familienansicht und legen Beziehungen "
 "zwischen Personen an. Danach gehen Sie in der Familienansicht und können die "
 "Verwandtschaft nach verfolgen."
 
@@ -4509,7 +4584,7 @@ msgid ""
 "one. This is very useful for combining two databases with overlapping "
 "people, or combining erroneously entered differing names for one individual."
 msgstr ""
-"Die Funktion \"Zusammenfassen\" erlaubt es seperat gelistete Personen zu "
+"Die Funktion \"Zusammenfassen\" erlaubt es separat gelistete Personen zu "
 "einer zu vereinigen. Dies ist sehr nützlich, wenn man zwei Datenbanken mit "
 "sich überlappenden Personen oder irrtümlicherweise sich unterscheidende "
 "Namen angelegt hat und zu einer Person vereinigen will."
@@ -4569,9 +4644,9 @@ msgstr ""
 "Kind hinzufügen: Um Kinder in GRAMPS hinzuzufügen, wählen Sie einen "
 "Elternteil und wechseln Sie in die Familienansicht. Wenn das Kind bereits in "
 "der Datenbank vorhanden ist, klicken Sie auf den dritten Button  oben rechts "
-"in der Kinderliste. Wenn die Person nicht nicht in der Datenbank vorhanden "
-"ist, klicken Sie dort auf den zweiten Button. Nachdem die Informationen über "
-"das Kind eingegeben worden sind, wird es automatisch als Kind der aktiven "
+"in der Kinderliste. Wenn die Person nicht in der Datenbank vorhanden ist, "
+"klicken Sie dort auf den zweiten Button. Nachdem die Informationen über das "
+"Kind eingegeben worden sind, wird es automatisch als Kind der aktiven "
 "Personen erscheinen."
 
 #: data/tips.xml:212
@@ -4624,7 +4699,7 @@ msgid ""
 msgstr ""
 "GRAMPS verbessern: Benutzer sind dazu angeregt, Weiterentwicklungen "
 "an GRAMPS vorzuschlagen. Vorschläge zur Weiterentwicklung  können  zu den "
-"gramps-users ode gramps-devel Mailinglisten gesendet werden, oder am Besten "
+"gramps-users oder gramps-devel Mailinglisten gesendet werden, oder am besten "
 "erstellen Sie eine \"Request for Enhancement\" (RFE) auf ·http://sourceforge."
 "net/tracker/?group_id=25770&atid=385140."
 
@@ -4824,7 +4899,7 @@ msgid ""
 "Make your data portable --- your family tree data and media can be exported "
 "directly to the GNOME file manager (Nautilus), for burning onto a CD."
 msgstr ""
-"Machen SIe Ihre Daten tragbar ---- Sie können Ihre Stammbaumdaten und "
+"Machen Sie Ihre Daten tragbar -- Sie können Ihre Stammbaumdaten und "
 "Multimediaobjekte direkt in den GNOME Dateimanager (Nautilus) exportieren, "
 "um Sie dort auf eine CD zu brennen."
 
@@ -4894,10 +4969,10 @@ msgid ""
 "appears to be an error in a source."
 msgstr ""
 "Seien Sie genau beim Aufschreiben von genealogischen Informationen. Stellen "
-"Sie nicht eine Hypothese auf, während Sie erste Informatioen haben, "
+"Sie nicht eine Hypothese auf, während Sie erste Informationen haben, "
 "schreiben Sie genau auf, wie Sie es sehen. Verwenden Sie eingeklammerte "
 "Kommentare um Anfügungen, Löschungen und Kommentare anzugeben. Es ist zu "
-"empfehlen das Lateinische \"sic\" zu verwenden um die genaue Niederschirft "
+"empfehlen das Lateinische \"sic\" zu verwenden um die genaue Niederschrift "
 "bestätigen, was zu einem Fehler in der Quelle führen kann."
 
 #: data/tips.xml:411
@@ -4952,7 +5027,7 @@ msgid ""
 "listinfo/gramps-announce"
 msgstr ""
 "Sind Sie daran interessiert informiert zu werden, wenn eine neue Version von "
-"GRAMPS erscheint? Tretten Sie der offenen gramps Mailingliste auf ·http://"
+"GRAMPS erscheint? Treten Sie der offenen gramps Mailingliste auf ·http://"
 "lists.sourceforge.net/lists/listinfo/gramps-announce bei"
 
 #: data/tips.xml:446
@@ -5063,7 +5138,7 @@ msgid ""
 "computer system where these programs have been ported."
 msgstr ""
 "GRAMPS wird in einer Computersprache, genannt Python, geschrieben, die die "
-"GTK und GNOME Bibliotheken für die grafische Oberfläche verwendet.GRAMPS "
+"GTK und GNOME Bibliotheken für die grafische Oberfläche verwendet. GRAMPS "
 "wird von jedem Computersystem unterstützt, wohin diese Programme portiert "
 "sind."
 
@@ -5112,7 +5187,7 @@ msgstr ""
 "archivieren. Es existieren Filter, die es einfach machen, GEDCOM Dateien zu "
 "importieren und exportieren."
 
-#: docgen/AbiWord2Doc.py:332
+#: docgen/AbiWord2Doc.py:340
 msgid "AbiWord document"
 msgstr "AbiWord-Dokument"
 
@@ -5194,7 +5269,7 @@ msgstr "SVG (Scalable Vector Graphics)"
 msgid "Encoding"
 msgstr "Kodierung"
 
-#: gedcomexport.glade:127 gramps.glade:20090 gramps.glade:28994
+#: gedcomexport.glade:127 gramps.glade:21644 gramps.glade:31156
 #: plugins/genewebexport.glade:103 plugins/merge.glade:385
 #: plugins/vcalendarexport.glade:103 plugins/vcardexport.glade:103
 #: plugins/writeftree.glade:124
@@ -5296,7 +5371,7 @@ msgstr "Erstellt von:"
 msgid "Status"
 msgstr "Status"
 
-#: gedcomimport.glade:216 gramps.glade:3482 gramps.glade:19306
+#: gedcomimport.glade:216 gramps.glade:3660 gramps.glade:20805
 msgid "Information"
 msgstr "Information"
 
@@ -5350,346 +5425,346 @@ msgstr ""
 "ASCII\n"
 "UNICODE"
 
-#: gramps.glade:10 gramps.glade:31082
+#: gramps.glade:10 gramps.glade:33389
 msgid "GRAMPS"
 msgstr "GRAMPS"
 
-#: gramps.glade:44
+#: gramps.glade:45
 msgid "_File"
 msgstr "_Datei"
 
-#: gramps.glade:53
+#: gramps.glade:54
 msgid "_New"
 msgstr "_Neu"
 
-#: gramps.glade:75
+#: gramps.glade:76
 msgid "_Open..."
 msgstr "_Öffnen..."
 
-#: gramps.glade:97
+#: gramps.glade:98
 msgid "Open _Recent"
 msgstr "_Zuletzt geöffnet"
 
-#: gramps.glade:112
+#: gramps.glade:113
 msgid "_Import..."
 msgstr "_Importieren..."
 
-#: gramps.glade:134
+#: gramps.glade:135
 msgid "Save _As..."
 msgstr "Speichern _unter..."
 
-#: gramps.glade:156
+#: gramps.glade:157
 msgid "E_xport..."
 msgstr "E_xportieren..."
 
-#: gramps.glade:184
+#: gramps.glade:185
 msgid "A_bandon changes and quit"
 msgstr "Änderungen verwerfen und _beenden"
 
-#: gramps.glade:193
+#: gramps.glade:194
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: gramps.glade:219
+#: gramps.glade:220
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: gramps.glade:228 gramps_main.py:536
+#: gramps.glade:229 gramps_main.py:536
 msgid "_Undo"
 msgstr "_Rückgängig"
 
-#: gramps.glade:256 gramps.glade:918
+#: gramps.glade:257 gramps.glade:919
 msgid "Add a new item"
 msgstr "Punkt hinzufügen"
 
-#: gramps.glade:257 rule.glade:135 rule.glade:722
+#: gramps.glade:258 rule.glade:135 rule.glade:722
 msgid "_Add..."
 msgstr "_Hinzufügen..."
 
-#: gramps.glade:279 gramps.glade:936
+#: gramps.glade:280 gramps.glade:937
 msgid "Remove the currently selected item"
 msgstr "Gewählten Punkt entfernen"
 
-#: gramps.glade:280
+#: gramps.glade:281
 msgid "R_emove"
 msgstr "_Entfernen"
 
-#: gramps.glade:302 gramps.glade:954
+#: gramps.glade:303 gramps.glade:955
 msgid "Edit the selected item"
 msgstr "Gewählten Punkt bearbeiten"
 
-#: gramps.glade:303
+#: gramps.glade:304
 msgid "E_dit..."
 msgstr "Bearbe_iten..."
 
-#: gramps.glade:318
+#: gramps.glade:319
 msgid "Compare and _Merge..."
 msgstr "Vergleichen und zusa_mmenfassen.."
 
-#: gramps.glade:340
+#: gramps.glade:341
 msgid "Fast Mer_ge"
 msgstr "Schnell _zusammenfassen"
 
-#: gramps.glade:355
+#: gramps.glade:356
 msgid "Prefere_nces..."
 msgstr "Ei_nstellungen..."
 
-#: gramps.glade:376
+#: gramps.glade:377
 msgid "_Column Editor..."
 msgstr "_Spalteneditor..."
 
-#: gramps.glade:397
+#: gramps.glade:398
 msgid "Set _Home person..."
 msgstr "_Anfangsperson setzen..."
 
-#: gramps.glade:422
+#: gramps.glade:423
 msgid "_View"
 msgstr "_Ansicht"
 
-#: gramps.glade:431
+#: gramps.glade:432
 msgid "_Filter"
 msgstr "_Filter"
 
-#: gramps.glade:441
+#: gramps.glade:442
 msgid "_Sidebar"
 msgstr "_Seitenleiste"
 
-#: gramps.glade:451
+#: gramps.glade:452
 msgid "_Toolbar"
 msgstr "_Werkzeugleiste"
 
-#: gramps.glade:465
+#: gramps.glade:466
 msgid "_Go"
 msgstr "_Gehe zu"
 
-#: gramps.glade:473
+#: gramps.glade:474
 msgid "_Bookmarks"
 msgstr "_Lesezeichen"
 
-#: gramps.glade:482
+#: gramps.glade:483
 msgid "_Add bookmark"
 msgstr "_Lesezeichen hinzufügen"
 
-#: gramps.glade:504
+#: gramps.glade:505
 msgid "_Edit bookmarks..."
 msgstr "L_esezeichen bearbeiten..."
 
-#: gramps.glade:532
+#: gramps.glade:533
 msgid "_Go to bookmark"
 msgstr "_Gehe zu Lesezeichen"
 
-#: gramps.glade:544
+#: gramps.glade:545
 msgid "_Reports"
 msgstr "Be_richte"
 
-#: gramps.glade:552
+#: gramps.glade:553
 msgid "_Tools"
 msgstr "_Werkzeuge"
 
-#: gramps.glade:560
+#: gramps.glade:561
 msgid "_Windows"
 msgstr "_Fenster"
 
-#: gramps.glade:568
+#: gramps.glade:569
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: gramps.glade:577
+#: gramps.glade:578
 msgid "_User manual"
 msgstr "Benutzer_handbuch"
 
-#: gramps.glade:599
+#: gramps.glade:600
 msgid "_FAQ"
 msgstr "Häufig gestellte _Fragen"
 
-#: gramps.glade:626
+#: gramps.glade:627
 msgid "GRAMPS _home page"
 msgstr "_GRAMPS-Homepage"
 
-#: gramps.glade:647
+#: gramps.glade:648
 msgid "GRAMPS _mailing lists"
 msgstr "GRAMPS-_Mailinglisten"
 
-#: gramps.glade:668
+#: gramps.glade:669
 msgid "_Report a bug"
 msgstr "_Programmfehler melden"
 
-#: gramps.glade:683
+#: gramps.glade:684
 msgid "_Show plugin status..."
 msgstr "Plugin-Statu_s zeigen..."
 
-#: gramps.glade:692
+#: gramps.glade:693
 msgid "_Open example database"
 msgstr "_Beispieldatenbank öffnen"
 
-#: gramps.glade:701
+#: gramps.glade:702
 msgid "_About"
 msgstr "_Info"
 
-#: gramps.glade:751
+#: gramps.glade:752
 msgid "Open database"
 msgstr "Datenbank öffnen"
 
-#: gramps.glade:752
+#: gramps.glade:753
 msgid "Open"
 msgstr "Öffnen"
 
-#: gramps.glade:782
+#: gramps.glade:783
 msgid "Go back in history"
 msgstr "Im Verlauf zurückgehen"
 
-#: gramps.glade:783
+#: gramps.glade:784
 msgid "Back"
 msgstr "Zurück"
 
-#: gramps.glade:801
+#: gramps.glade:802
 msgid "Go forward in history"
 msgstr "Im Verlauf vorwärtsgehen"
 
-#: gramps.glade:802
+#: gramps.glade:803
 msgid "Forward"
 msgstr "Vor"
 
-#: gramps.glade:820
+#: gramps.glade:821
 msgid "Make the Home Person the active person"
 msgstr "Die Hauptperson als aktive Person verwenden"
 
-#: gramps.glade:851
+#: gramps.glade:852
 msgid "Open Scratch Pad"
 msgstr "Entwurfsblock öffnen"
 
-#: gramps.glade:852
+#: gramps.glade:853
 msgid "ScratchPad"
 msgstr "Entwurfsblock"
 
-#: gramps.glade:869
+#: gramps.glade:870
 msgid "Generate reports"
 msgstr "Berichte generieren"
 
-#: gramps.glade:870
+#: gramps.glade:871
 msgid "Reports"
 msgstr "Berichte"
 
-#: gramps.glade:887
+#: gramps.glade:888
 msgid "Run tools"
 msgstr "Werkzeuge ausführen"
 
-#: gramps.glade:888
+#: gramps.glade:889
 msgid "Tools"
 msgstr "Werkzeuge"
 
-#: gramps.glade:919
+#: gramps.glade:920
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: gramps.glade:937
+#: gramps.glade:938
 msgid "Remove"
 msgstr "Entfernen"
 
-#: gramps.glade:1028 gramps.glade:1452
+#: gramps.glade:1029 gramps.glade:1486
 msgid "People"
 msgstr "Personen"
 
-#: gramps.glade:1076 gramps.glade:2237 gramps.glade:2992
+#: gramps.glade:1081 gramps.glade:2310 gramps.glade:3104
 msgid "Family"
 msgstr "Familie"
 
-#: gramps.glade:1124 gramps.glade:3039
+#: gramps.glade:1133 gramps.glade:3155
 msgid "Pedigree"
 msgstr "Ahnentafel"
 
-#: gramps.glade:1172 gramps.glade:3097
+#: gramps.glade:1185 gramps.glade:3220
 msgid "Sources"
 msgstr "Quellen"
 
-#: gramps.glade:1220 gramps.glade:3155
+#: gramps.glade:1237 gramps.glade:3285
 msgid "Places"
 msgstr "Orte"
 
-#: gramps.glade:1268 gramps.glade:3554
+#: gramps.glade:1289 gramps.glade:3739
 msgid "Media"
 msgstr "Multimedia"
 
-#: gramps.glade:1376
+#: gramps.glade:1407
 msgid "Invert"
 msgstr "Invertieren"
 
-#: gramps.glade:1394
+#: gramps.glade:1425
 msgid "Apply filter using the selected controls"
 msgstr "Filter mit den gewählten Werten anwenden"
 
-#: gramps.glade:1481 gramps.glade:2956
+#: gramps.glade:1519 gramps.glade:3068
 msgid "Exchange the current spouse with the active person"
 msgstr "Den (Ehe-)Partner mit der aktive Person tauschen"
 
-#: gramps.glade:1547 gramps.glade:2718
+#: gramps.glade:1585 gramps.glade:2822
 msgid "Adds a new person to the database and to a new relationship"
 msgstr "Eine neue Person zur Datenbank und zur Beziehung hinzufügen"
 
-#: gramps.glade:1574 gramps.glade:2745
+#: gramps.glade:1612 gramps.glade:2849
 msgid ""
 "Selects an existing person from the database and adds to a new relationship"
 msgstr ""
 "Wählt eine existierende Person aus der Datenbank aus und fügt sie zur "
 "Beziehung hinzu"
 
-#: gramps.glade:1601 gramps.glade:2772
+#: gramps.glade:1639 gramps.glade:2876
 msgid "Removes the currently selected spouse"
 msgstr "Entfernt den gewählten (Ehe-)Partner"
 
-#: gramps.glade:1644 gramps.glade:2865
+#: gramps.glade:1682 gramps.glade:2977
 msgid "Make the active person's parents the active family"
 msgstr "Die Eltern der aktiven Person als aktive Familie verwenden"
 
-#: gramps.glade:1671 gramps.glade:2892
+#: gramps.glade:1709 gramps.glade:3004
 msgid "Adds a new set of parents to the active person"
 msgstr "Fügt neue Eltern zur aktiven Person hinzu"
 
-#: gramps.glade:1698 gramps.glade:2919
+#: gramps.glade:1736 gramps.glade:3031
 msgid "Deletes the selected parents from the active person"
 msgstr "Löscht die gewählten Eltern der aktiven Person"
 
-#: gramps.glade:1744 gramps.glade:2026 gramps.glade:2360 gramps.glade:2390
+#: gramps.glade:1782 gramps.glade:2090 gramps.glade:2447 gramps.glade:2480
 msgid "Double-click to edit the relationship to the selected parents"
 msgstr "Doppelklick um die Beziehung zu den ausgewählten Eltern zu bearbeiten"
 
-#: gramps.glade:1771 gramps.glade:2596
+#: gramps.glade:1812 gramps.glade:2696
 msgid "Make the selected spouse's parents the active family"
 msgstr "Die Eltern des gewählten (Ehe-)Partners als aktive Familie verwenden"
 
-#: gramps.glade:1798 gramps.glade:2623
+#: gramps.glade:1839 gramps.glade:2723
 msgid "Adds a new set of parents to the selected spouse"
 msgstr "Fügt neue Eltern zum gewählten (Ehe-)Partner hinzu"
 
-#: gramps.glade:1825 gramps.glade:2650
+#: gramps.glade:1866 gramps.glade:2750
 msgid "Deletes the selected parents from the selected spouse"
 msgstr "Löscht die gewählten Eltern vom gewählten (Ehe-)Partner"
 
-#: gramps.glade:1862 gramps.glade:2296
+#: gramps.glade:1903 gramps.glade:2376
 msgid "_Children"
 msgstr "_Kinder"
 
-#: gramps.glade:1887 gramps.glade:2809
+#: gramps.glade:1932 gramps.glade:2913
 msgid "_Active person"
 msgstr "_Aktive Person"
 
-#: gramps.glade:1912 gramps.glade:2834
+#: gramps.glade:1961 gramps.glade:2942
 msgid "Active person's _parents"
 msgstr "Eltern der aktiven _Person"
 
-#: gramps.glade:1937 gramps.glade:2687
+#: gramps.glade:1990 gramps.glade:2787
 msgid "Relati_onship"
 msgstr "Bezie_hung"
 
-#: gramps.glade:1962 gramps.glade:2565
+#: gramps.glade:2019 gramps.glade:2661
 msgid "Spo_use's parents"
 msgstr "E_ltern des (Ehe-)Partners"
 
-#: gramps.glade:2056 gramps.glade:2420
+#: gramps.glade:2123 gramps.glade:2513
 msgid "Double-click to edit the active person"
 msgstr "Doppelklick um die aktive Person zu bearbeiten"
 
-#: gramps.glade:2086 gramps.glade:2275
+#: gramps.glade:2156 gramps.glade:2352
 msgid ""
 "Double-click to edit the relationship information, Shift-click to edit the "
 "person"
@@ -5697,15 +5772,15 @@ msgstr ""
 "Doppelklick um die Beziehung zu bearbeiten, Shift-Klick um die Person zu "
 "bearbeiten"
 
-#: gramps.glade:2113 gramps.glade:2447
+#: gramps.glade:2186 gramps.glade:2543
 msgid "Make the selected child the active person"
 msgstr "Verwende das gewählte Kind als aktive Person"
 
-#: gramps.glade:2140 gramps.glade:2474
+#: gramps.glade:2213 gramps.glade:2570
 msgid "Adds a new child to the database and to the current family"
 msgstr "Fügt eine neues Kind zu Datenbank und der aktiven Familie hinzu"
 
-#: gramps.glade:2167 gramps.glade:2501
+#: gramps.glade:2240 gramps.glade:2597
 msgid ""
 "Selects an existing person from the database and adds as a child to the "
 "current family"
@@ -5713,30 +5788,30 @@ msgstr ""
 "Wählt eine existierende Person und fügt sie als Kind zur aktiven Familie "
 "hinzu."
 
-#: gramps.glade:2194 gramps.glade:2528
+#: gramps.glade:2267 gramps.glade:2624
 msgid "Deletes the selected child from the selected family"
 msgstr "Löscht das gewählte Kind von der gewählten Familie"
 
-#: gramps.glade:3206 gramps.glade:19030 gramps.glade:21050 gramps.glade:21315
-#: gramps.glade:22712
+#: gramps.glade:3340 gramps.glade:20485 gramps.glade:22681 gramps.glade:22959
+#: gramps.glade:24471
 msgid "Preview"
 msgstr "Vorschau"
 
-#: gramps.glade:3242 gramps.glade:19066
+#: gramps.glade:3380 gramps.glade:20525
 msgid "Details:"
 msgstr "Details:"
 
-#: gramps.glade:3313 gramps.glade:19137 gramps.glade:21351 gramps.glade:22748
+#: gramps.glade:3463 gramps.glade:20608 gramps.glade:22999 gramps.glade:24511
 msgid "Path:"
 msgstr "Pfad:"
 
-#: gramps.glade:3338 gramps.glade:7942 gramps.glade:8512 gramps.glade:9026
-#: gramps.glade:12184 gramps.glade:12799 gramps.glade:19162 gramps.glade:22079
-#: gramps.glade:23157
+#: gramps.glade:3492 gramps.glade:8436 gramps.glade:9073 gramps.glade:9646
+#: gramps.glade:13081 gramps.glade:13775 gramps.glade:20637 gramps.glade:23799
+#: gramps.glade:24964
 msgid "Type:"
 msgstr "Typ:"
 
-#: gramps.glade:3778
+#: gramps.glade:3975
 msgid ""
 "Check to show all people in the list.  Uncheck to get the list filtered by "
 "birth and death dates."
@@ -5744,15 +5819,15 @@ msgstr ""
 "Wählen um alle Personen in der Liste zu zeigen. Abwählen um eine Listen nach "
 "Geburts- und Todesdaten zu bekommen."
 
-#: gramps.glade:3780 gramps.glade:4156 gramps.glade:4574
+#: gramps.glade:3977 gramps.glade:4380 gramps.glade:4826
 msgid "_Show all"
 msgstr "_Alle anzeigen"
 
-#: gramps.glade:3827 gramps.glade:11954
+#: gramps.glade:4024 gramps.glade:12825
 msgid "_Relationship type:"
 msgstr "_Beziehungstyp:"
 
-#: gramps.glade:3855
+#: gramps.glade:4056
 msgid ""
 "Married\n"
 "Unmarried\n"
@@ -5766,83 +5841,83 @@ msgstr ""
 "Unbekannt\n"
 "Anderer"
 
-#: gramps.glade:4025
+#: gramps.glade:4233
 msgid "_Father's relationship to child:"
 msgstr "Verwandtschaftsverhältnis des _Vaters zum Kind:"
 
-#: gramps.glade:4049
+#: gramps.glade:4261
 msgid "_Mother's relationship to child:"
 msgstr "Verwandtschaftsverhältnis der _Mutter zum Kind:"
 
-#: gramps.glade:4073
+#: gramps.glade:4289
 msgid "_Parents' relationship to each other:"
 msgstr "Verwandtschaftsverhältnis der _Eltern zueinander:"
 
-#: gramps.glade:4097
+#: gramps.glade:4317
 msgid "Fat_her"
 msgstr "Vat_er"
 
-#: gramps.glade:4192
+#: gramps.glade:4416
 msgid "Moth_er"
 msgstr "M_utter"
 
-#: gramps.glade:4217
+#: gramps.glade:4445
 msgid "Relationships"
 msgstr "Verwandtschaftsverhältnisse"
 
-#: gramps.glade:4311
+#: gramps.glade:4549
 msgid "Show _all"
 msgstr "_Alle anzeigen"
 
-#: gramps.glade:4643
+#: gramps.glade:4895
 msgid "Relationship to father:"
 msgstr "Verwandtschaftsverhältnis zum Vater:"
 
-#: gramps.glade:4667
+#: gramps.glade:4923
 msgid "Relationship to mother:"
 msgstr "Verwandtschaftsverhältnis zur Mutter:"
 
-#: gramps.glade:4758 gramps.glade:6549 gramps.glade:11846 gramps.glade:28451
+#: gramps.glade:5023 gramps.glade:6932 gramps.glade:12713 gramps.glade:30562
 msgid "Abandon changes and close window"
 msgstr "Änderungen verwerfen und Fenster schließen"
 
-#: gramps.glade:4773 gramps.glade:6564 gramps.glade:11861 gramps.glade:25038
-#: gramps.glade:27302 gramps.glade:28196 gramps.glade:28466
+#: gramps.glade:5038 gramps.glade:6947 gramps.glade:12728 gramps.glade:26958
+#: gramps.glade:29348 gramps.glade:30294 gramps.glade:30577
 msgid "Accept changes and close window"
 msgstr "Änderungen akzeptieren und Fenster schließen"
 
-#: gramps.glade:4860 gramps.glade:6759 gramps.glade:14059 gramps.glade:18137
-#: gramps.glade:21096 gramps.glade:22932 gramps.glade:28635
+#: gramps.glade:5129 gramps.glade:7162 gramps.glade:15121 gramps.glade:19547
+#: gramps.glade:22731 gramps.glade:24719 gramps.glade:30762
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: gramps.glade:4885
+#: gramps.glade:5158
 msgid "_Author:"
 msgstr "_Autor:"
 
-#: gramps.glade:4956
+#: gramps.glade:5233
 msgid "_Publication information:"
 msgstr "_Publikationsinformation:"
 
-#: gramps.glade:5023
+#: gramps.glade:5304
 msgid "A_bbreviation:"
 msgstr "A_bkürzung:"
 
-#: gramps.glade:5054 gramps.glade:12125 gramps.glade:14453 gramps.glade:14623
-#: gramps.glade:23075 gramps.glade:25412 gramps.glade:26416 gramps.glade:27784
-#: gramps.glade:29213 plugins/verify.glade:530
+#: gramps.glade:5339 gramps.glade:13014 gramps.glade:15547 gramps.glade:15737
+#: gramps.glade:24870 gramps.glade:27359 gramps.glade:28409 gramps.glade:29862
+#: gramps.glade:31390 plugins/verify.glade:530
 msgid "General"
 msgstr "Allgemeines"
 
-#: gramps.glade:5124 gramps.glade:10183 gramps.glade:13187 gramps.glade:15258
-#: gramps.glade:21905 gramps.glade:23465 gramps.glade:25663 gramps.glade:26665
-#: gramps.glade:28033 gramps.glade:29464
+#: gramps.glade:5413 gramps.glade:10933 gramps.glade:14198 gramps.glade:16443
+#: gramps.glade:23613 gramps.glade:25291 gramps.glade:27621 gramps.glade:28669
+#: gramps.glade:30122 gramps.glade:31652
 msgid "Format"
 msgstr "Format"
 
-#: gramps.glade:5148 gramps.glade:10208 gramps.glade:13211 gramps.glade:15282
-#: gramps.glade:21929 gramps.glade:23489 gramps.glade:25687 gramps.glade:26689
-#: gramps.glade:28057 gramps.glade:29488
+#: gramps.glade:5441 gramps.glade:10962 gramps.glade:14226 gramps.glade:16471
+#: gramps.glade:23641 gramps.glade:25319 gramps.glade:27649 gramps.glade:28697
+#: gramps.glade:30150 gramps.glade:31680
 msgid ""
 "Multiple spaces, tabs, and single line breaks are replaced with single "
 "spaces. Two consecutive line breaks mark a new paragraph."
@@ -5851,15 +5926,15 @@ msgstr ""
 "einfache Leerzeichen. Zwei aufeinander folgende Zeilenumbrüche markieren "
 "einen neuen Absatz."
 
-#: gramps.glade:5150 gramps.glade:10210 gramps.glade:13213 gramps.glade:15284
-#: gramps.glade:21931 gramps.glade:23491 gramps.glade:25689 gramps.glade:26691
-#: gramps.glade:28059 gramps.glade:29490
+#: gramps.glade:5443 gramps.glade:10964 gramps.glade:14228 gramps.glade:16473
+#: gramps.glade:23643 gramps.glade:25321 gramps.glade:27651 gramps.glade:28699
+#: gramps.glade:30152 gramps.glade:31682
 msgid "_Flowed"
 msgstr "_Fließend"
 
-#: gramps.glade:5171 gramps.glade:10231 gramps.glade:13234 gramps.glade:15305
-#: gramps.glade:21952 gramps.glade:23512 gramps.glade:25710 gramps.glade:26712
-#: gramps.glade:28080 gramps.glade:29511
+#: gramps.glade:5464 gramps.glade:10985 gramps.glade:14249 gramps.glade:16494
+#: gramps.glade:23664 gramps.glade:25342 gramps.glade:27672 gramps.glade:28720
+#: gramps.glade:30173 gramps.glade:31703
 msgid ""
 "Formatting is preserved, except for the leading whitespace. Multiple spaces, "
 "tabs, and all line breaks are respected."
@@ -5867,29 +5942,29 @@ msgstr ""
 "Die Formatierung wird beibehalten, außer bei führenden Leerzeichen oder "
 "Tabs. Mehrfache Leerzeichen, Tabs und alle Zeilenumbrüche werden respektiert."
 
-#: gramps.glade:5173 gramps.glade:10233 gramps.glade:13236 gramps.glade:15307
-#: gramps.glade:21954 gramps.glade:23514 gramps.glade:25712 gramps.glade:26714
-#: gramps.glade:28082 gramps.glade:29513
+#: gramps.glade:5466 gramps.glade:10987 gramps.glade:14251 gramps.glade:16496
+#: gramps.glade:23666 gramps.glade:25344 gramps.glade:27674 gramps.glade:28722
+#: gramps.glade:30175 gramps.glade:31705
 msgid "_Preformatted"
 msgstr "F_ormatiert"
 
-#: gramps.glade:5268 gramps.glade:5405 gramps.glade:10490 gramps.glade:13484
-#: gramps.glade:15587 gramps.glade:25993
+#: gramps.glade:5568 gramps.glade:5709 gramps.glade:11255 gramps.glade:14510
+#: gramps.glade:16787 gramps.glade:27966
 msgid "Add a new media object to the database and place it in this gallery"
 msgstr ""
 "Fügt eine neues Multimedia-Objekt der Datenbank und dieser Galerie hinzu"
 
-#: gramps.glade:5296 gramps.glade:5489 gramps.glade:13567 gramps.glade:15670
-#: gramps.glade:26076
+#: gramps.glade:5596 gramps.glade:5793 gramps.glade:14593 gramps.glade:16870
+#: gramps.glade:28049
 msgid "Remove selected object from this gallery only"
 msgstr "Gewähltes Objekt nur aus dieser Galerie entfernen"
 
-#: gramps.glade:5337
+#: gramps.glade:5637
 msgid "Data"
 msgstr "Daten"
 
-#: gramps.glade:5433 gramps.glade:10518 gramps.glade:13512 gramps.glade:15615
-#: gramps.glade:26021
+#: gramps.glade:5737 gramps.glade:11283 gramps.glade:14538 gramps.glade:16815
+#: gramps.glade:27994
 msgid ""
 "Select an existing media object from the database and place it in this "
 "gallery"
@@ -5897,48 +5972,48 @@ msgstr ""
 "Wählt ein existierendes Multimedia-Objekt aus der Datenbank und fügt es "
 "dieser Datenbank hinzu"
 
-#: gramps.glade:5461 gramps.glade:10546 gramps.glade:15643 gramps.glade:26049
+#: gramps.glade:5765 gramps.glade:11311 gramps.glade:16843 gramps.glade:28022
 msgid "Edit the properties of the selected object"
 msgstr "Ändert die Eigenschaften des gewählten Objekts"
 
-#: gramps.glade:5550 gramps.glade:10621 gramps.glade:13608 gramps.glade:15731
-#: gramps.glade:26137 plugins/WebPage.py:432
+#: gramps.glade:5854 gramps.glade:11386 gramps.glade:14634 gramps.glade:16931
+#: gramps.glade:28110 plugins/WebPage.py:432
 msgid "Gallery"
 msgstr "Galerie"
 
-#: gramps.glade:5595 gramps.glade:16128 gramps.glade:23593
+#: gramps.glade:5906 gramps.glade:17359 gramps.glade:25430
 msgid "References"
 msgstr "Referenzen"
 
-#: gramps.glade:5742
+#: gramps.glade:6062
 msgid "Open an _existing database"
 msgstr "Eine _existierende Datenbank öffnen"
 
-#: gramps.glade:5762
+#: gramps.glade:6082
 msgid "Create a _new database"
 msgstr "Eine _neue Datenbank erstellen"
 
-#: gramps.glade:5957
+#: gramps.glade:6290
 msgid "_Relationship:"
 msgstr "_Verwandtschaftsverhältnis:"
 
-#: gramps.glade:6005
+#: gramps.glade:6346
 msgid "Relation_ship:"
 msgstr "Verwandtschaftsverhältni_s:"
 
-#: gramps.glade:6056
+#: gramps.glade:6405
 msgid "Father"
 msgstr "Vater"
 
-#: gramps.glade:6080
+#: gramps.glade:6433
 msgid "Mother"
 msgstr "Mutter"
 
-#: gramps.glade:6103
+#: gramps.glade:6460
 msgid "Preference"
 msgstr "Bevorzugung"
 
-#: gramps.glade:6126
+#: gramps.glade:6487
 msgid ""
 "Indicates that the parents should be used as the preferred parents for "
 "reporting and display purposes"
@@ -5946,83 +6021,83 @@ msgstr ""
 "Zeigt an, dass die Eltern als bevorzugte Eltern für Berichte und Übersichten "
 "verwenden werden sollen"
 
-#: gramps.glade:6128
+#: gramps.glade:6489
 msgid "Use as preferred parents"
 msgstr "Als bevorzugte Eltern benutzen"
 
-#: gramps.glade:6328
+#: gramps.glade:6698
 msgid "_Text:"
 msgstr "_Text:"
 
-#: gramps.glade:6487
+#: gramps.glade:6865
 msgid "Select columns"
 msgstr "Spalten auswählen"
 
-#: gramps.glade:6659 gramps.glade:28552
+#: gramps.glade:7046 gramps.glade:30667
 msgid "_Given name:"
 msgstr "_Vorname:"
 
-#: gramps.glade:6684 gramps.glade:28826
+#: gramps.glade:7075 gramps.glade:30965
 msgid "_Family name:"
 msgstr "_Familienname:"
 
-#: gramps.glade:6709
+#: gramps.glade:7104
 msgid "Famil_y prefix:"
 msgstr "Familienpr_äfix:"
 
-#: gramps.glade:6734
+#: gramps.glade:7133
 msgid "S_uffix:"
 msgstr "S_uffix:"
 
-#: gramps.glade:6784
+#: gramps.glade:7191
 msgid "Nic_kname:"
 msgstr "_Spitzname:"
 
-#: gramps.glade:6809 gramps.glade:28608
+#: gramps.glade:7220 gramps.glade:30731
 msgid "T_ype:"
 msgstr "T_yp:"
 
-#: gramps.glade:6833
+#: gramps.glade:7248
 msgid "An optional suffix to the name, such as \"Jr.\" or \"III\""
 msgstr "Ein optionaler Suffix eines Namens, z.B. \"Jr.\" oder \"III\""
 
-#: gramps.glade:6855
+#: gramps.glade:7270
 msgid "A title used to refer to the person, such as \"Dr.\" or \"Rev.\""
 msgstr "Ein Titel, der zur Anrede der Person verwendet wird, wie \"Dr.\""
 
-#: gramps.glade:6877
+#: gramps.glade:7292
 msgid "A name that the person was more commonly known by"
 msgstr "Ein Name, unter dem die Person bekannt war"
 
-#: gramps.glade:6899
+#: gramps.glade:7314
 msgid "Preferred name"
 msgstr "Bevorzugter Name"
 
-#: gramps.glade:6930
+#: gramps.glade:7349
 msgid "_male"
 msgstr "_Männlich"
 
-#: gramps.glade:6950
+#: gramps.glade:7369
 msgid "fema_le"
 msgstr "Weib_lich"
 
-#: gramps.glade:6971
+#: gramps.glade:7390
 msgid "u_nknown"
 msgstr "u_nbekannt"
 
-#: gramps.glade:7001
+#: gramps.glade:7420
 msgid "Birth"
 msgstr "Geburt"
 
-#: gramps.glade:7025
+#: gramps.glade:7448
 msgid "GRAMPS _ID:"
 msgstr "GRAMPS-_ID:"
 
-#: gramps.glade:7071
+#: gramps.glade:7498
 msgid "Death"
 msgstr "Tod"
 
-#: gramps.glade:7109
+#: gramps.glade:7543
 msgid ""
 "An optional prefix for the family name that is not used in sorting, such as "
 "\"de\" or \"van\""
@@ -6030,377 +6105,377 @@ msgstr ""
 "Ein optionaler Präfix des Nachnamens, wie \"de\" oder \"von\", der beim "
 "Sortieren nicht verwendet wird."
 
-#: gramps.glade:7131
+#: gramps.glade:7565
 msgid "The person's given name"
 msgstr "Vorname der Person"
 
-#: gramps.glade:7176
+#: gramps.glade:7610
 msgid "Edit the preferred name"
 msgstr "Den bevorzugten Namen bearbeiten"
 
-#: gramps.glade:7206
+#: gramps.glade:7640
 msgid "Gender"
 msgstr "Geschlecht"
 
-#: gramps.glade:7229
+#: gramps.glade:7667
 msgid "Identification"
 msgstr "Identifikation"
 
-#: gramps.glade:7277
+#: gramps.glade:7719
 msgid "Image"
 msgstr "Bild"
 
-#: gramps.glade:7308 gramps.glade:12091
+#: gramps.glade:7754 gramps.glade:12980
 msgid "Information i_s complete"
 msgstr "Informationen _sind vollständig"
 
-#: gramps.glade:7330
+#: gramps.glade:7776
 msgid "Information is pri_vate"
 msgstr "Informationen sind pri_vat"
 
-#: gramps.glade:7360 gramps.glade:11012 gramps.glade:18007 gramps.glade:22978
-#: gramps.glade:25147 gramps.glade:27388
+#: gramps.glade:7806 gramps.glade:11812 gramps.glade:19397 gramps.glade:24769
+#: gramps.glade:27075 gramps.glade:29438
 msgid "_Date:"
 msgstr "_Datum:"
 
-#: gramps.glade:7384 gramps.glade:11084 gramps.glade:25203
+#: gramps.glade:7834 gramps.glade:11892 gramps.glade:27139
 msgid "_Place:"
 msgstr "_Ort:"
 
-#: gramps.glade:7431
+#: gramps.glade:7885
 msgid "Invoke birth event editor"
 msgstr "Ereigniseditor zur Geburt öffnen"
 
-#: gramps.glade:7486 gramps.glade:7589 gramps.glade:11628 gramps.glade:11688
-#: gramps.glade:11748 gramps.glade:13846 gramps.glade:18436 gramps.glade:23027
-#: gramps.glade:29116
+#: gramps.glade:7940 gramps.glade:8047 gramps.glade:12490 gramps.glade:12550
+#: gramps.glade:12610 gramps.glade:14899 gramps.glade:19866 gramps.glade:24822
+#: gramps.glade:31293
 msgid "Invoke date editor"
 msgstr "Datumseditor aufrufen"
 
-#: gramps.glade:7539 gramps.glade:11177
+#: gramps.glade:7993 gramps.glade:11993
 msgid "D_ate:"
 msgstr "D_atum:"
 
-#: gramps.glade:7625
+#: gramps.glade:8083
 msgid "Invoke death event editor"
 msgstr "Ereigniseditor zum Tod öffnen"
 
-#: gramps.glade:7655
+#: gramps.glade:8113
 msgid "Plac_e:"
 msgstr "_Ort:"
 
-#: gramps.glade:7798 gramps.glade:8608 gramps.glade:9122 gramps.glade:9558
-#: gramps.glade:12304 gramps.glade:12751
+#: gramps.glade:8268 gramps.glade:9185 gramps.glade:9758 gramps.glade:10241
+#: gramps.glade:13221 gramps.glade:13719
 msgid "Confidence:"
 msgstr "Verlässlichkeit:"
 
-#: gramps.glade:7822
+#: gramps.glade:8296
 msgid "Family prefix:"
 msgstr "Familienpräfix:"
 
-#: gramps.glade:7966
+#: gramps.glade:8464
 msgid "Alternate name"
 msgstr "Alternativer Name"
 
-#: gramps.glade:7990 gramps.glade:8560 gramps.glade:9074 gramps.glade:9654
-#: gramps.glade:12375 gramps.glade:12823
+#: gramps.glade:8492 gramps.glade:9129 gramps.glade:9702 gramps.glade:10353
+#: gramps.glade:13304 gramps.glade:13803
 msgid "Primary source"
 msgstr "Hauptquelle"
 
-#: gramps.glade:8266
+#: gramps.glade:8807
 msgid "Create an alternate name for this person"
 msgstr "Alternativen Namen für diese Person erstellen"
 
-#: gramps.glade:8295
+#: gramps.glade:8836
 msgid "Edit the selected name"
 msgstr "Gewählten Namen bearbeiten"
 
-#: gramps.glade:8323
+#: gramps.glade:8864
 msgid "Delete the selected name"
 msgstr "Den ausgewählten Namen löschen"
 
-#: gramps.glade:8375
+#: gramps.glade:8916
 msgid "Names"
 msgstr "Namen"
 
-#: gramps.glade:8416
+#: gramps.glade:8961
 msgid "Event"
 msgstr "Ereignis"
 
-#: gramps.glade:8464 gramps.glade:12232
+#: gramps.glade:9017 gramps.glade:13137
 msgid "Cause:"
 msgstr "Ursache:"
 
-#: gramps.glade:8845
+#: gramps.glade:9457
 msgid "Create a new event"
 msgstr "Neues Ereignis erstellen"
 
-#: gramps.glade:8874
+#: gramps.glade:9486
 msgid "Edit the selected event"
 msgstr "Gewähltes Ereignis bearbeiten"
 
-#: gramps.glade:8902
+#: gramps.glade:9514
 msgid "Delete the selected event"
 msgstr "Gewähltes Ereignis löschen"
 
-#: gramps.glade:9002 gramps.glade:12847 gramps.glade:22174 gramps.glade:23205
+#: gramps.glade:9618 gramps.glade:13831 gramps.glade:23910 gramps.glade:25020
 msgid "Attributes"
 msgstr "Attribute"
 
-#: gramps.glade:9287
+#: gramps.glade:9946
 msgid "Create a new attribute"
 msgstr "Neues Attribut erstellen"
 
-#: gramps.glade:9316
+#: gramps.glade:9975
 msgid "Edit the selected attribute"
 msgstr "Gewähltes Attribut bearbeiten"
 
-#: gramps.glade:9344 gramps.glade:13065 gramps.glade:22299 gramps.glade:23329
+#: gramps.glade:10003 gramps.glade:14072 gramps.glade:24042 gramps.glade:25151
 msgid "Delete the selected attribute"
 msgstr "Gewähltes Attribute löschen"
 
-#: gramps.glade:9403 gramps.glade:13117 gramps.glade:22364 gramps.glade:23395
+#: gramps.glade:10062 gramps.glade:14124 gramps.glade:24107 gramps.glade:25217
 msgid "Attributes"
 msgstr "Attribute"
 
-#: gramps.glade:9438
+#: gramps.glade:10101
 msgid "City/County:"
 msgstr "Ort/Kreis:"
 
-#: gramps.glade:9630
+#: gramps.glade:10325
 msgid "Addresses"
 msgstr "Adressen"
 
-#: gramps.glade:9995
+#: gramps.glade:10741
 msgid "Create a new address"
 msgstr "Neue Adresse erstellen"
 
-#: gramps.glade:10024
+#: gramps.glade:10770
 msgid "Edit the selected address"
 msgstr "Gewählte Adresse bearbeiten"
 
-#: gramps.glade:10052
+#: gramps.glade:10798
 msgid "Delete the selected address"
 msgstr "Gewählte Adresse löschen"
 
-#: gramps.glade:10145
+#: gramps.glade:10895
 msgid "Enter miscellaneous relevant data and documentation"
 msgstr "Eingabe verschiedener Daten und Notizen"
 
-#: gramps.glade:10268 gramps.glade:13271 gramps.glade:21989 gramps.glade:23549
+#: gramps.glade:11022 gramps.glade:14286 gramps.glade:23701 gramps.glade:25379
 #: plugins/IndivComplete.py:166 plugins/WebPage.py:567
 msgid "Notes"
 msgstr "Notizen"
 
-#: gramps.glade:10326
+#: gramps.glade:11087
 msgid "Add a source"
 msgstr "Eine Quelle hinzufügen"
 
-#: gramps.glade:10353
+#: gramps.glade:11114
 msgid "Edit the selected source"
 msgstr "Die ausgewählte Quelle bearbeiten"
 
-#: gramps.glade:10379
+#: gramps.glade:11140
 msgid "Remove the selected source"
 msgstr "Die ausgewählte Quelle entfernen"
 
-#: gramps.glade:10423 gramps.glade:13423 gramps.glade:15520 gramps.glade:22542
-#: gramps.glade:23771 gramps.glade:25590 gramps.glade:26594 gramps.glade:27962
-#: gramps.glade:29392 plugins/Ancestors.py:159 plugins/IndivComplete.py:324
+#: gramps.glade:11184 gramps.glade:14445 gramps.glade:16716 gramps.glade:24292
+#: gramps.glade:25615 gramps.glade:27544 gramps.glade:28594 gramps.glade:30047
+#: gramps.glade:31576 plugins/Ancestors.py:159 plugins/IndivComplete.py:324
 #: plugins/ScratchPad.py:153 plugins/ScratchPad.py:293
 #: plugins/ScratchPad.py:326 plugins/WebPage.py:224
 msgid "Sources"
 msgstr "Quellen"
 
-#: gramps.glade:10573
+#: gramps.glade:11338
 msgid "Remove the selected object from this gallery only"
 msgstr "Das ausgewählte Objekt nur aus dieser Galerie entfernen"
 
-#: gramps.glade:10656 gramps.glade:15766
+#: gramps.glade:11425 gramps.glade:16970
 msgid "Web address:"
 msgstr "Web-Adresse:"
 
-#: gramps.glade:10751 gramps.glade:15861
+#: gramps.glade:11536 gramps.glade:17081
 msgid "Internet addresses"
 msgstr "Internetadressen"
 
-#: gramps.glade:10822
+#: gramps.glade:11614
 msgid "Add an internet reference about this person"
 msgstr "Internetadresse zu dieser Person hinzufügen"
 
-#: gramps.glade:10851
+#: gramps.glade:11643
 msgid "Edit the selected internet address"
 msgstr "Die ausgewählte Internetadresse bearbeiten"
 
-#: gramps.glade:10878
+#: gramps.glade:11670
 msgid "Go to this web page"
 msgstr "Webseite aufrufen"
 
-#: gramps.glade:10907
+#: gramps.glade:11699
 msgid "Delete selected reference"
 msgstr "Gewählte Referenz löschen"
 
-#: gramps.glade:10959 gramps.glade:16075
+#: gramps.glade:11751 gramps.glade:17302
 msgid "Internet"
 msgstr "Internet"
 
-#: gramps.glade:10988
+#: gramps.glade:11784
 msgid "LDS baptism"
 msgstr "HLT-Taufe"
 
-#: gramps.glade:11037
+#: gramps.glade:11841
 msgid "LDS _temple:"
 msgstr "HLT-_Tempel:"
 
-#: gramps.glade:11065 gramps.glade:11279 gramps.glade:11368 gramps.glade:13740
+#: gramps.glade:11873 gramps.glade:12107 gramps.glade:12204 gramps.glade:14786
 msgid "Sources..."
 msgstr "Quellen..."
 
-#: gramps.glade:11134 gramps.glade:11299 gramps.glade:11437 gramps.glade:13760
+#: gramps.glade:11946 gramps.glade:12127 gramps.glade:12277 gramps.glade:14806
 msgid "Note..."
 msgstr "Notiz..."
 
-#: gramps.glade:11153
+#: gramps.glade:11965
 msgid "Endowment"
 msgstr "Begabung"
 
-#: gramps.glade:11205
+#: gramps.glade:12025
 msgid "LDS te_mple:"
 msgstr "HLT-Te_mpel:"
 
-#: gramps.glade:11229 gramps.glade:17568
+#: gramps.glade:12053 gramps.glade:18925
 msgid "P_lace:"
 msgstr "_Ort:"
 
-#: gramps.glade:11318 gramps.glade:29067
+#: gramps.glade:12146 gramps.glade:31240
 msgid "Dat_e:"
 msgstr "_Datum:"
 
-#: gramps.glade:11343
+#: gramps.glade:12175
 msgid "LD_S temple:"
 msgstr "H_LT-Tempel:"
 
-#: gramps.glade:11387
+#: gramps.glade:12223
 msgid "Pla_ce:"
 msgstr "_Ort"
 
-#: gramps.glade:11456
+#: gramps.glade:12296
 msgid "Pa_rents:"
 msgstr "Elte_rn:"
 
-#: gramps.glade:11481
+#: gramps.glade:12325
 msgid "Sealed to parents"
 msgstr "Siegelung zu Eltern"
 
-#: gramps.glade:11788 gramps.glade:13894
+#: gramps.glade:12650 gramps.glade:14947
 msgid "LDS"
 msgstr "HLT"
 
-#: gramps.glade:11978
+#: gramps.glade:12853
 msgid "_GRAMPS ID:"
 msgstr "_GRAMPS-ID:"
 
-#: gramps.glade:12042 gramps.glade:14569
+#: gramps.glade:12923 gramps.glade:15675
 msgid "Last Changed:"
 msgstr "Letzte Änderung:"
 
-#: gramps.glade:12351
+#: gramps.glade:13276
 msgid "Events"
 msgstr "Ereignisse"
 
-#: gramps.glade:12586
+#: gramps.glade:13546
 msgid "Add new event for this marriage"
 msgstr "Neues Ereignis zu dieser Hochzeit hinzufügen"
 
-#: gramps.glade:12640
+#: gramps.glade:13600
 msgid "Delete selected event"
 msgstr "Gewähltes Ereignis löschen"
 
-#: gramps.glade:13011
+#: gramps.glade:14018
 msgid "Create a new attribute for this marriage"
 msgstr "Neues Attribut für diese Beziehung erstellen"
 
-#: gramps.glade:13540
+#: gramps.glade:14566
 msgid "Edit the properties of the selected objects"
 msgstr "Bearbeitet die Eigenschaften der ausgewählten Objekte"
 
-#: gramps.glade:13643
+#: gramps.glade:14673
 msgid "Sealed to spouse"
 msgstr "Siegelung zu Partner"
 
-#: gramps.glade:13691
+#: gramps.glade:14729
 msgid "Temple:"
 msgstr "Tempel:"
 
-#: gramps.glade:14087
+#: gramps.glade:15153
 msgid "C_ity:"
 msgstr "_Ort:"
 
-#: gramps.glade:14115 gramps.glade:26987
+#: gramps.glade:15185 gramps.glade:29016
 msgid "_State:"
 msgstr "Bunde_sland:"
 
-#: gramps.glade:14143 gramps.glade:26930
-msgid "C_ounty:"
+#: gramps.glade:15217
+msgid "Co_unty:"
 msgstr "_Kreis:"
 
-#: gramps.glade:14171
-msgid "Co_untry:"
+#: gramps.glade:15249
+msgid "Count_ry:"
 msgstr "_Land:"
 
-#: gramps.glade:14199
+#: gramps.glade:15281
 msgid "_Longitude:"
 msgstr "_Längengrad:"
 
-#: gramps.glade:14227
+#: gramps.glade:15313
 msgid "L_atitude:"
 msgstr "_Breitengrad:"
 
-#: gramps.glade:14255 gramps.glade:27016
+#: gramps.glade:15345 gramps.glade:29049
 msgid "Church _parish:"
 msgstr "_Kirchengemeinde:"
 
-#: gramps.glade:14477 gramps.glade:17203 gramps.glade:27528
+#: gramps.glade:15575 gramps.glade:18532 gramps.glade:29598
 msgid "_ZIP/Postal code:"
 msgstr "Postleit_zahl:"
 
-#: gramps.glade:14523 gramps.glade:27150 gramps.glade:27705
-msgid "P_hone:"
-msgstr "Tele_fon:"
+#: gramps.glade:15625
+msgid "Phon_e:"
+msgstr "T_elefon:"
 
-#: gramps.glade:14658
+#: gramps.glade:15776
 msgid "County:"
 msgstr "Kreis:"
 
-#: gramps.glade:14706
+#: gramps.glade:15832
 msgid "State:"
 msgstr "Bundesland:"
 
-#: gramps.glade:14754
+#: gramps.glade:15888
 msgid "Church parish:"
 msgstr "Kirchengemeinde:"
 
-#: gramps.glade:14855
+#: gramps.glade:16005
 msgid "Zip/Postal code:"
 msgstr "Postleitzahl:"
 
-#: gramps.glade:14927
+#: gramps.glade:16089
 msgid "Other names"
 msgstr "Andere Namen"
 
-#: gramps.glade:15188
+#: gramps.glade:16369
 msgid "Other names"
 msgstr "Andere Namen"
 
-#: gramps.glade:16162
+#: gramps.glade:17397
 msgid "GRAMPS Preferences"
 msgstr "GRAMPS-Einstellungen"
 
-#: gramps.glade:16234
+#: gramps.glade:17470
 msgid "Categories:"
 msgstr "Kategorien:"
 
-#: gramps.glade:16349
+#: gramps.glade:17592
 msgid ""
 "To change your preferences, select one of the subcategories in the menu on "
 "the left hand side of the window."
@@ -6408,35 +6483,35 @@ msgstr ""
 "Um die Einstellungen zu ändern, eine der Kategorien im Menü auf der linken "
 "Seite auswählen."
 
-#: gramps.glade:16413
+#: gramps.glade:17664
 msgid "Database"
 msgstr "Datenbank"
 
-#: gramps.glade:16438
+#: gramps.glade:17693
 msgid "_Automatically load last database"
 msgstr "Letzte Datenbank _automatisch laden"
 
-#: gramps.glade:16459
+#: gramps.glade:17714
 msgid "Family name guessing"
 msgstr "Raten des Familiennamens"
 
-#: gramps.glade:16546
+#: gramps.glade:17811
 msgid "Toolbar"
 msgstr "Werkzeugleiste"
 
-#: gramps.glade:16571
+#: gramps.glade:17840
 msgid "Active person's _relationship to Home Person"
 msgstr "Beziehung de_r aktiven Person zur Hauptperson"
 
-#: gramps.glade:16594
+#: gramps.glade:17863
 msgid "Active person's name and _GRAMPS ID"
 msgstr "Name und _GRAMPS-ID der aktiven Person"
 
-#: gramps.glade:16616
+#: gramps.glade:17885
 msgid "Statusbar"
 msgstr "Statuszeile"
 
-#: gramps.glade:16644
+#: gramps.glade:17917
 msgid ""
 "GNOME settings\n"
 "Icons Only\n"
@@ -6450,169 +6525,169 @@ msgstr ""
 "Text unter Symbolen\n"
 "Text neben Symbolen"
 
-#: gramps.glade:16709
+#: gramps.glade:17988
 msgid "_Always display the LDS ordinance tabs"
 msgstr "K_arteireiter für die Heilige Handlungen der HLT immer anzeigen"
 
-#: gramps.glade:16731
+#: gramps.glade:18010
 msgid "Display"
 msgstr "Anzeige"
 
-#: gramps.glade:16755
+#: gramps.glade:18038
 msgid "Default view"
 msgstr "Standardansicht"
 
-#: gramps.glade:16780
+#: gramps.glade:18067
 msgid "_Person view"
 msgstr "_Personenansicht"
 
-#: gramps.glade:16803
+#: gramps.glade:18090
 msgid "_Family view"
 msgstr "_Familienansicht"
 
-#: gramps.glade:16825
+#: gramps.glade:18112
 msgid "Family view style"
 msgstr "Familienansichts-Stil"
 
-#: gramps.glade:16850
+#: gramps.glade:18141
 msgid "Left to right"
 msgstr "Von links nach rechts"
 
-#: gramps.glade:16873
+#: gramps.glade:18164
 msgid "Top to bottom"
 msgstr "Von oben nach unten"
 
-#: gramps.glade:16898
+#: gramps.glade:18189
 msgid "_Display Tip of the Day"
 msgstr "Tipp _des Tages anzeigen"
 
-#: gramps.glade:16967
+#: gramps.glade:18262
 msgid "_Date format:"
 msgstr "_Datumsformat:"
 
-#: gramps.glade:16992
+#: gramps.glade:18291
 msgid "Display formats"
 msgstr "Anzeigeformate"
 
-#: gramps.glade:17078 rule.glade:397
+#: gramps.glade:18387 rule.glade:397
 msgid "_Name:"
 msgstr "_Name:"
 
-#: gramps.glade:17103
+#: gramps.glade:18416
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: gramps.glade:17128 gramps.glade:26902
+#: gramps.glade:18445 gramps.glade:28919
 msgid "_City:"
 msgstr "_Ort:"
 
-#: gramps.glade:17153 gramps.glade:27472
+#: gramps.glade:18474 gramps.glade:29534
 msgid "_State/Province:"
 msgstr "Bunde_sland/Provinz:"
 
-#: gramps.glade:17178
+#: gramps.glade:18503
 msgid "_Country:"
 msgstr "_Land:"
 
-#: gramps.glade:17228
+#: gramps.glade:18561
 msgid "_Phone:"
 msgstr "Tele_fon:"
 
-#: gramps.glade:17253
+#: gramps.glade:18590
 msgid "_Email:"
 msgstr "_E-Mail:"
 
-#: gramps.glade:17446
+#: gramps.glade:18787
 msgid "Researcher information"
 msgstr "Informationen zum Forscher"
 
-#: gramps.glade:17518 gramps.glade:29700
+#: gramps.glade:18867 gramps.glade:31901
 msgid "_Person:"
 msgstr "_Person:"
 
-#: gramps.glade:17543
+#: gramps.glade:18896
 msgid "_Family:"
 msgstr "_Familie:"
 
-#: gramps.glade:17593
+#: gramps.glade:18954
 msgid "_Source:"
 msgstr "_Quelle:"
 
-#: gramps.glade:17618
+#: gramps.glade:18983
 msgid "_Media object:"
 msgstr "_Multimedia-Objekt:"
 
-#: gramps.glade:17647
+#: gramps.glade:19016
 msgid "I"
 msgstr "I"
 
-#: gramps.glade:17668
+#: gramps.glade:19037
 msgid "F"
 msgstr "F"
 
-#: gramps.glade:17689
+#: gramps.glade:19058
 msgid "P"
 msgstr "P"
 
-#: gramps.glade:17710
+#: gramps.glade:19079
 msgid "S"
 msgstr "S"
 
-#: gramps.glade:17731
+#: gramps.glade:19100
 msgid "O"
 msgstr "O"
 
-#: gramps.glade:17748
+#: gramps.glade:19117
 msgid "GRAMPS ID prefixes"
 msgstr "GRAMPS-ID-Präfixe"
 
-#: gramps.glade:17957
+#: gramps.glade:19339
 msgid "_Confidence:"
 msgstr "_Verlässlichkeit:"
 
-#: gramps.glade:17982
+#: gramps.glade:19368
 msgid "_Volume/Film/Page:"
 msgstr "_Band/Film/Seite:"
 
-#: gramps.glade:18035
+#: gramps.glade:19429
 msgid "Te_xt:"
 msgstr "Te_xt:"
 
-#: gramps.glade:18062
+#: gramps.glade:19460
 msgid "Co_mments:"
 msgstr "Ko_mmentare:"
 
-#: gramps.glade:18089
+#: gramps.glade:19491
 msgid "Publication information:"
 msgstr "Publikationsinformation:"
 
-#: gramps.glade:18113 mergedata.glade:919 mergedata.glade:941
+#: gramps.glade:19519 mergedata.glade:919 mergedata.glade:941
 #: plugins.glade:362
 msgid "Author:"
 msgstr "Autor:"
 
-#: gramps.glade:18209
+#: gramps.glade:19631
 msgid "Source selection"
 msgstr "Auswahl einer Quelle"
 
-#: gramps.glade:18233
+#: gramps.glade:19659
 msgid "Source details"
 msgstr "Details einer Quelle"
 
-#: gramps.glade:18372
+#: gramps.glade:19802
 msgid "Creates a new source"
 msgstr "Neue Quelle erstellen"
 
-#: gramps.glade:18374
+#: gramps.glade:19804
 msgid "_New..."
 msgstr "_Neu..."
 
-#: gramps.glade:18394 gramps.glade:21784 gramps.glade:25344 gramps.glade:26354
-#: gramps.glade:27557 gramps.glade:28334 gramps.glade:29869
+#: gramps.glade:19824 gramps.glade:23484 gramps.glade:27288 gramps.glade:28344
+#: gramps.glade:29631 gramps.glade:30444 gramps.glade:32078
 msgid "_Private record"
 msgstr "_Privater Eintrag"
 
-#: gramps.glade:18469
+#: gramps.glade:19899
 msgid ""
 "Very Low\n"
 "Low\n"
@@ -6626,211 +6701,211 @@ msgstr ""
 "Hoch\n"
 "Sehr hoch"
 
-#: gramps.glade:18644
+#: gramps.glade:20083
 msgid "Double click will edit the selected source"
 msgstr "Zum Editieren der gewählten Person doppelt klicken"
 
-#: gramps.glade:19700
+#: gramps.glade:21219
 msgid "Style _name:"
 msgstr "Stil_name:"
 
-#: gramps.glade:19858 rule.glade:1144
+#: gramps.glade:21392 rule.glade:1144
 msgid "Description"
 msgstr "Beschreibung"
 
-#: gramps.glade:19887
+#: gramps.glade:21425
 msgid "pt"
 msgstr "pt"
 
-#: gramps.glade:19914 gramps.glade:20222
+#: gramps.glade:21456 gramps.glade:21788
 msgid "Pick a color"
 msgstr "Farbe auswählen"
 
-#: gramps.glade:19953
+#: gramps.glade:21495
 msgid "_Bold"
 msgstr "_Fett"
 
-#: gramps.glade:19975
+#: gramps.glade:21517
 msgid "_Italic"
 msgstr "Kurs_iv"
 
-#: gramps.glade:19997
+#: gramps.glade:21539
 msgid "_Underline"
 msgstr "_Unterstrichen"
 
-#: gramps.glade:20018
+#: gramps.glade:21560
 msgid "Type face"
 msgstr "Schriftart"
 
-#: gramps.glade:20042
+#: gramps.glade:21588
 msgid "Size"
 msgstr "Größe"
 
-#: gramps.glade:20066
+#: gramps.glade:21616
 msgid "Color"
 msgstr "Farbe"
 
-#: gramps.glade:20140
+#: gramps.glade:21702
 msgid "_Roman (Times, serif)"
 msgstr "_Roman (Times, serif)"
 
-#: gramps.glade:20162
+#: gramps.glade:21724
 msgid "_Swiss (Arial, Helvetica, sans-serif)"
 msgstr "_Swiss (Arial, Helvetica, sans-serif)"
 
-#: gramps.glade:20190
+#: gramps.glade:21752
 msgid "Font options"
 msgstr "Schriftoptionen"
 
-#: gramps.glade:20238
+#: gramps.glade:21804
 msgid "R_ight:"
 msgstr "R_echts:"
 
-#: gramps.glade:20266
+#: gramps.glade:21836
 msgid "L_eft:"
 msgstr "L_inks:"
 
-#: gramps.glade:20294
+#: gramps.glade:21868
 msgid "_Padding:"
 msgstr "_Abstand:"
 
-#: gramps.glade:20458
+#: gramps.glade:22048
 msgid "_Left"
 msgstr "_Links"
 
-#: gramps.glade:20480
+#: gramps.glade:22070
 msgid "_Right"
 msgstr "_Rechts"
 
-#: gramps.glade:20503
+#: gramps.glade:22093
 msgid "_Justify"
 msgstr "_Blocksatz"
 
-#: gramps.glade:20526
+#: gramps.glade:22116
 msgid "_Center"
 msgstr "_Zentriert"
 
-#: gramps.glade:20548
+#: gramps.glade:22138
 msgid "Background"
 msgstr "Hintergrund"
 
-#: gramps.glade:20572
+#: gramps.glade:22166
 msgid "Margins"
 msgstr "Ränder"
 
-#: gramps.glade:20621
+#: gramps.glade:22223
 msgid "Alignment"
 msgstr "Ausrichtung"
 
-#: gramps.glade:20645
+#: gramps.glade:22251
 msgid "Borders"
 msgstr "Rahmen"
 
-#: gramps.glade:20670
+#: gramps.glade:22280
 msgid "Le_ft"
 msgstr "Li_nks"
 
-#: gramps.glade:20692
+#: gramps.glade:22302
 msgid "Ri_ght"
 msgstr "Re_chts"
 
-#: gramps.glade:20714
+#: gramps.glade:22324
 msgid "_Top"
 msgstr "_Oben"
 
-#: gramps.glade:20736
+#: gramps.glade:22346
 msgid "_Bottom"
 msgstr "_Unten"
 
-#: gramps.glade:20757
+#: gramps.glade:22367
 msgid "First line"
 msgstr "Erste Zeile"
 
-#: gramps.glade:20826
+#: gramps.glade:22444
 msgid "I_ndent:"
 msgstr "Ei_nzug:"
 
-#: gramps.glade:20857
+#: gramps.glade:22479
 msgid "Paragraph options"
 msgstr "Absatzoptionen"
 
-#: gramps.glade:21143
+#: gramps.glade:22782
 msgid "Internal note"
 msgstr "Interne Notiz"
 
-#: gramps.glade:21399 gramps.glade:22796
+#: gramps.glade:23055 gramps.glade:24567
 msgid "Object type:"
 msgstr "Objekttyp:"
 
-#: gramps.glade:21579
+#: gramps.glade:23259
 msgid "Lower X:"
 msgstr "Unteres X:"
 
-#: gramps.glade:21603
+#: gramps.glade:23287
 msgid "Upper X:"
 msgstr "Oberes X:"
 
-#: gramps.glade:21627
+#: gramps.glade:23315
 msgid "Upper Y:"
 msgstr "Oberes Y:"
 
-#: gramps.glade:21651
+#: gramps.glade:23343
 msgid "Lower Y:"
 msgstr "Unteres Y:"
 
-#: gramps.glade:21759
+#: gramps.glade:23455
 msgid "Subsection"
 msgstr "Ausschnitt"
 
-#: gramps.glade:21805
+#: gramps.glade:23505
 msgid "Privacy"
 msgstr "Privatsphäre"
 
-#: gramps.glade:22044
+#: gramps.glade:23760
 msgid "Global Notes"
 msgstr "Globale Notizen"
 
-#: gramps.glade:22245
+#: gramps.glade:23988
 msgid "Creates a new object attribute from the above data"
 msgstr "Neues Attribut für das Objekt anhand obiger Information erstellen"
 
-#: gramps.glade:23275
+#: gramps.glade:25097
 msgid "Creates a new attribute from the above data"
 msgstr "Neues Attribut anhand obiger Information erstellen"
 
-#: gramps.glade:23969
+#: gramps.glade:25827
 msgid "Close _without saving"
 msgstr "_Ohne speichern schließen"
 
-#: gramps.glade:24095
+#: gramps.glade:25961
 msgid "Do not ask again"
 msgstr "Nicht wieder fragen"
 
-#: gramps.glade:24713
+#: gramps.glade:26616
 msgid "Remove object and all references to it from the database"
 msgstr "Das Objekt und alle Referenzen aus der Datenbank entfernen"
 
-#: gramps.glade:24758
+#: gramps.glade:26661
 msgid "_Remove Object"
 msgstr "Objekt _entfernen"
 
-#: gramps.glade:24785
+#: gramps.glade:26692
 msgid "Keep reference to the missing file"
 msgstr "Referenz zur fehlenden Datei behalten"
 
-#: gramps.glade:24788
+#: gramps.glade:26695
 msgid "_Keep Reference"
 msgstr "Referenz _behalten"
 
-#: gramps.glade:24799
+#: gramps.glade:26706
 msgid "Select replacement for the missing file"
 msgstr "Ersatz für die fehlende Datei auswählen"
 
-#: gramps.glade:24846
+#: gramps.glade:26753
 msgid "_Select File"
 msgstr "Datei _wählen"
 
-#: gramps.glade:24959
+#: gramps.glade:26878
 msgid ""
 "If you check this button, all the missing media files will be automatically "
 "treated according to the currently selected option. No further dialogs will "
@@ -6840,91 +6915,99 @@ msgstr ""
 "genauso behandelt. Es werden keine weiteren Dialoge für fehlende Multimedia-"
 "Dateien angezeigt."
 
-#: gramps.glade:24961
+#: gramps.glade:26880
 msgid "_Use this selection for all missing media files"
 msgstr "Diese Auswahl für alle fehlenden Multimedia-Dateien ben_utzen"
 
-#: gramps.glade:25022
+#: gramps.glade:26942
 msgid "Close window without changes"
 msgstr "Fenster ohne zu sichern schließen"
 
-#: gramps.glade:25123
+#: gramps.glade:27047
 msgid "_Event type:"
 msgstr "_Ereignistyp:"
 
-#: gramps.glade:25175
+#: gramps.glade:27107
 msgid "De_scription:"
 msgstr "Be_schreibung:"
 
-#: gramps.glade:25231
+#: gramps.glade:27171
 msgid "_Cause:"
 msgstr "Ursa_che:"
 
-#: gramps.glade:26301
+#: gramps.glade:28283
 msgid "_Attribute:"
 msgstr "_Attribute:"
 
-#: gramps.glade:26325
+#: gramps.glade:28311
 msgid "_Value:"
 msgstr "_Wert:"
 
-#: gramps.glade:26958 gramps.glade:27500
+#: gramps.glade:28951
+msgid "C_ounty:"
+msgstr "_Kreis:"
+
+#: gramps.glade:28983 gramps.glade:29566
 msgid "Cou_ntry:"
 msgstr "La_nd:"
 
-#: gramps.glade:27196
+#: gramps.glade:29187 gramps.glade:29779
+msgid "P_hone:"
+msgstr "Tele_fon:"
+
+#: gramps.glade:29237
 msgid "_Zip/Postal code:"
 msgstr "Postleit_zahl:"
 
-#: gramps.glade:27416
+#: gramps.glade:29470
 msgid "Add_ress:"
 msgstr "Ad_resse:"
 
-#: gramps.glade:27444
+#: gramps.glade:29502
 msgid "_City/County:"
 msgstr "_Ort/Kreis:"
 
-#: gramps.glade:28271
+#: gramps.glade:30373
 msgid "_Web address:"
 msgstr "_Web-Adresse:"
 
-#: gramps.glade:28299
+#: gramps.glade:30405
 msgid "_Description:"
 msgstr "_Beschreibung:"
 
-#: gramps.glade:28580
+#: gramps.glade:30699
 msgid "Suffi_x:"
 msgstr "Suffi_x:"
 
-#: gramps.glade:28664
+#: gramps.glade:30795
 msgid "P_rivate record"
 msgstr "P_rivater Eintrag"
 
-#: gramps.glade:28685
+#: gramps.glade:30816
 msgid "Family _prefix:"
 msgstr "Familien_präfix:"
 
-#: gramps.glade:28798
+#: gramps.glade:30933
 msgid "P_atronymic:"
 msgstr "P_atronymikon:"
 
-#: gramps.glade:28891
+#: gramps.glade:31037
 msgid "G_roup as:"
 msgstr "G_ruppieren als:"
 
-#: gramps.glade:28916
+#: gramps.glade:31066
 msgid "_Sort as:"
 msgstr "_Sortieren als:"
 
-#: gramps.glade:28943
+#: gramps.glade:31097
 msgid "_Display as:"
 msgstr "_Anzeigen als:"
 
-#: gramps.glade:28970
+#: gramps.glade:31128
 msgid "Name Information"
 msgstr "Namensinformation"
 
-#: gramps.glade:29034
+#: gramps.glade:31203
 msgid ""
 "Default (based on locale)\n"
 "Family name, Given name\n"
@@ -6934,7 +7017,7 @@ msgstr ""
 "Nachname, Vorname\n"
 "Vorname, Nachname"
 
-#: gramps.glade:29052
+#: gramps.glade:31223
 msgid ""
 "Default (based on locale)\n"
 "Given name Family name\n"
@@ -6944,95 +7027,95 @@ msgstr ""
 "Vorname Nachname\n"
 "Nachname Vorname\n"
 
-#: gramps.glade:29178
+#: gramps.glade:31355
 msgid "_Override"
 msgstr "_Übergehen"
 
-#: gramps.glade:29728
+#: gramps.glade:31933
 msgid "_Comment:"
 msgstr "_Kommentar:"
 
-#: gramps.glade:29780
+#: gramps.glade:31989
 msgid "Person is in the _database"
 msgstr "Person ist in der Datenbank"
 
-#: gramps.glade:29848
+#: gramps.glade:32057
 msgid "Choose a person from the database"
 msgstr "Eine Person aus der Datenbank wählen"
 
-#: gramps.glade:29850
+#: gramps.glade:32059
 msgid "_Select"
 msgstr "_Wählen"
 
-#: gramps.glade:29979
+#: gramps.glade:32189
 msgid "_Next"
 msgstr "_Nächstes"
 
-#: gramps.glade:30038
+#: gramps.glade:32252
 msgid "_Display on startup"
 msgstr "_Beim Starten anzeigen"
 
-#: gramps.glade:30101
+#: gramps.glade:32319
 msgid "Gramps' Tip of the Day"
 msgstr "Gramps' Tipp des Tages"
 
-#: gramps.glade:30134
+#: gramps.glade:32356
 msgid "GRAMPS - Loading Database"
 msgstr "GRAMPS - Datenbank wird geladen"
 
-#: gramps.glade:30159
+#: gramps.glade:32382
 msgid "Loading database"
 msgstr "Datenbank wird geladen"
 
-#: gramps.glade:30183
+#: gramps.glade:32410
 msgid "GRAMPS is loading the database you selected. Please wait."
 msgstr "GRAMPS lädt die ausgewählte Datenbank. Bitte warten."
 
-#: gramps.glade:30366
+#: gramps.glade:32606
 msgid "Calenda_r:"
 msgstr "Kalende_r:"
 
-#: gramps.glade:30416
+#: gramps.glade:32662
 msgid "Q_uality"
 msgstr "Q_ualität"
 
-#: gramps.glade:30458
+#: gramps.glade:32710
 msgid "_Type"
 msgstr "_Typ"
 
-#: gramps.glade:30500
+#: gramps.glade:32758
 msgid "Date"
 msgstr "Datum"
 
-#: gramps.glade:30524
+#: gramps.glade:32786
 msgid "_Day"
 msgstr "_Tag"
 
-#: gramps.glade:30549
+#: gramps.glade:32815
 msgid "_Month"
 msgstr "_Monat"
 
-#: gramps.glade:30574
+#: gramps.glade:32844
 msgid "_Year"
 msgstr "_Jahr"
 
-#: gramps.glade:30658
+#: gramps.glade:32934
 msgid "Second date"
 msgstr "Zweites Datum"
 
-#: gramps.glade:30682
+#: gramps.glade:32962
 msgid "D_ay"
 msgstr "T_ag"
 
-#: gramps.glade:30707
+#: gramps.glade:32991
 msgid "Mo_nth"
 msgstr "Mo_nat"
 
-#: gramps.glade:30732
+#: gramps.glade:33020
 msgid "Y_ear"
 msgstr "J_ahr"
 
-#: gramps.glade:30829
+#: gramps.glade:33123
 msgid "Te_xt comment:"
 msgstr "Text-_Kommentar:"
 
@@ -7088,9 +7171,10 @@ msgstr ""
 "Programm zu benutzen\"\n"
 "\n"
 "1. Diese Version arbeitet mit dem Berkeley Datenbank backend.\n"
-"   Deswegen können Änderung direkt auf die Festplatte geschrieben werden \n"
-"   .Es gibt KEINE Funktion zum Speichern mehr! 2. Die Multimediaobjekte "
-"werden icht von GRAMPS verwaltet.\n"
+"   Deswegen können Änderung(en) direkt auf die Festplatte geschrieben "
+"werden.\n"
+"   Es gibt KEINE Funktion zum Speichern mehr! 2. Die Multimediaobjekte "
+"werden nicht von GRAMPS verwaltet.\n"
 "   Es gibt kein Konzept von lokalen Objekten, alle Objekte werden außerhalb "
 "verwaltet.\n"
 "   Sie sollten auf Ihre Dateien aufpassen. Wenn Sie\n"
@@ -7105,7 +7189,7 @@ msgstr ""
 "wenn Sie GRAMPS beenden.\n"
 "   Im Fall von GEDCOM Dateien kann dies zu einem Datenverlust führen, da "
 "einige GEDCOM Dateien Daten enthalten,\n"
-"   die nicht dem GEDCOM Standard enstprechen und nicht von GRAMPS analysiert "
+"   die nicht dem GEDCOM Standard entsprechen und nicht von GRAMPS analysiert "
 "werden.\n"
 "   Wenn Sie sich unsicher sind, legen Sie eine leere grdb Datenbank an (das "
 "neue GRAMPS Format) und\n"
@@ -7153,11 +7237,13 @@ msgstr ""
 "Schriftliche Aufzeichnung von Personen entsprechend eines regulären "
 "Ausdrucks..."
 
-#: gramps_main.py:1074 gramps_main.py:1097
+#: gramps_main.py:1074 gramps_main.py:1086 gramps_main.py:1104
+#: gramps_main.py:1116
 msgid "Cannot merge people."
 msgstr "Personen können nicht zusammengeführt werden."
 
-#: gramps_main.py:1075 gramps_main.py:1098
+#: gramps_main.py:1075 gramps_main.py:1087 gramps_main.py:1105
+#: gramps_main.py:1117
 msgid ""
 "Exactly two people must be selected to perform a merge. A second person can "
 "be selected by holding down the control key while clicking on the desired "
@@ -7167,20 +7253,20 @@ msgstr ""
 "durchzuführen. Eine zweite Person kann durch Anklicken bei gehaltener Strg-"
 "Taste gewählt werden."
 
-#: gramps_main.py:1221
+#: gramps_main.py:1235
 msgid "Cannot unpak archive"
 msgstr "Kann Archiv nicht entpacken"
 
-#: gramps_main.py:1222 plugins/ReadPkg.py:67
+#: gramps_main.py:1236 plugins/ReadPkg.py:67
 msgid "Temporary directory %s is not writable"
 msgstr "Das temporäre Verzeichnis %s ist nicht beschreibbar"
 
-#: gramps_main.py:1264 gramps_main.py:1270 gramps_main.py:1291
-#: gramps_main.py:1295 gramps_main.py:1298
+#: gramps_main.py:1278 gramps_main.py:1284 gramps_main.py:1305
+#: gramps_main.py:1309 gramps_main.py:1312
 msgid "Cannot open database"
 msgstr "Die Datenbank kann nicht geöffnet werden"
 
-#: gramps_main.py:1265
+#: gramps_main.py:1279
 msgid ""
 "The selected file is a directory, not a file.\n"
 "A GRAMPS database must be a file."
@@ -7188,40 +7274,40 @@ msgstr ""
 "Die ausgewählte Datei ist ein Verzeichnis und keine Datei.\n"
 "Eine GRAMPS-Datenbank muss eine Datei sein."
 
-#: gramps_main.py:1271
+#: gramps_main.py:1285
 msgid "You do not have read access to the selected file."
 msgstr "Sie haben keinen Lesezugriff aus die ausgewählte Datei."
 
-#: gramps_main.py:1276
+#: gramps_main.py:1290
 msgid "Read only database"
 msgstr "Datenbank nur lesen"
 
-#: gramps_main.py:1277
+#: gramps_main.py:1291
 msgid "You do not have write access to the selected file."
 msgstr "Sie haben keinen Schreibzugriff auf die ausgewählte Datei."
 
-#: gramps_main.py:1286
+#: gramps_main.py:1300
 msgid "Read Only"
 msgstr "Nur lesen"
 
-#: gramps_main.py:1292
+#: gramps_main.py:1306
 msgid "The database file specified could not be opened."
 msgstr "Die angegebene Datenbank konnte nicht geöffnet werden."
 
-#: gramps_main.py:1299
+#: gramps_main.py:1313
 msgid "%s could not be opened."
 msgstr "%s konnte nicht geöffnet werden."
 
-#: gramps_main.py:1358
+#: gramps_main.py:1372
 msgid "Save Media Object"
 msgstr "Multimedia-Objekt speichern"
 
-#: gramps_main.py:1404 plugins/Check.py:284 plugins/WriteCD.py:255
+#: gramps_main.py:1418 plugins/Check.py:284 plugins/WriteCD.py:255
 #: plugins/WritePkg.py:171
 msgid "Media object could not be found"
 msgstr "Multimedia-Objekt konnte nicht gefunden werden"
 
-#: gramps_main.py:1405 plugins/WriteCD.py:256 plugins/WritePkg.py:172
+#: gramps_main.py:1419 plugins/WriteCD.py:256 plugins/WritePkg.py:172
 msgid ""
 "%(file_name)s is referenced in the database, but no longer exists. The file "
 "may have been deleted or moved to a different location. You may choose to "
@@ -7233,74 +7319,74 @@ msgstr ""
 "Sie können entweder die Verknüpfung aus der Datenbank entfernen, die "
 "Verknüpfung zur fehlenden Datei behalten, oder eine neue Datei auswählen."
 
-#: gramps_main.py:1451
+#: gramps_main.py:1465
 msgid "Deleting the person will remove the person from the database."
 msgstr "Das Löschen einer Person entfernt die Person aus der Datenbank."
 
-#: gramps_main.py:1455
+#: gramps_main.py:1469
 msgid "_Delete Person"
 msgstr "_Person löschen"
 
-#: gramps_main.py:1519
+#: gramps_main.py:1533
 msgid "Delete Person (%s)"
 msgstr "Person löschen (%s)"
 
-#: gramps_main.py:1603
+#: gramps_main.py:1617
 msgid "%(relationship)s of %(person)s"
 msgstr "%(relationship)s von %(person)s"
 
-#: gramps_main.py:1765
+#: gramps_main.py:1779
 msgid "Upgrading database..."
 msgstr "Aktualisiere Datenbank..."
 
-#: gramps_main.py:1778
+#: gramps_main.py:1792
 msgid "Setup complete"
 msgstr "Einrichtung vollständig"
 
-#: gramps_main.py:1795
+#: gramps_main.py:1809
 msgid "Loading %s..."
 msgstr "Lade %s..."
 
-#: gramps_main.py:1798
+#: gramps_main.py:1812
 msgid "Opening database..."
 msgstr "Datenbank wird geöffnet"
 
-#: gramps_main.py:1829
+#: gramps_main.py:1843
 msgid "No Home Person has been set."
 msgstr "Keine Hauptperson gesetzt."
 
-#: gramps_main.py:1830
+#: gramps_main.py:1844
 msgid "The Home Person may be set from the Edit menu."
 msgstr "Die Anfangsperson kann im Menü Bearbeiten gesetzt werden."
 
-#: gramps_main.py:1836
+#: gramps_main.py:1850
 msgid "%s has been bookmarked"
 msgstr "Lesezeichen für %s gesetzt"
 
-#: gramps_main.py:1839
+#: gramps_main.py:1853
 msgid "Could Not Set a Bookmark"
 msgstr "Das Lesezeichen konnte nicht gesetzt werden"
 
-#: gramps_main.py:1840
+#: gramps_main.py:1854
 msgid "A bookmark could not be set because no one was selected."
 msgstr ""
 "Das Lesezeichen konnte nicht gesetzt werden, da niemand ausgewählt war."
 
-#: gramps_main.py:1854
+#: gramps_main.py:1868
 msgid "Could not go to a Person"
 msgstr "Es konnte nicht zu einer Person gesprungen werden"
 
-#: gramps_main.py:1855
+#: gramps_main.py:1869
 msgid "Either stale bookmark or broken history caused by IDs reorder."
 msgstr ""
 "Entweder veraltetes Lesezeichen oder ungültiger Verlauf, verursacht durch "
 "Neuordnung der IDs."
 
-#: gramps_main.py:1865
+#: gramps_main.py:1879
 msgid "Set %s as the Home Person"
 msgstr "%s als Hauptperson setzen"
 
-#: gramps_main.py:1866
+#: gramps_main.py:1880
 msgid ""
 "Once a Home Person is defined, pressing the Home button on the toolbar will "
 "make the home person the active person."
@@ -7308,15 +7394,15 @@ msgstr ""
 "Ist die Hauptperson gesetzt, kann sie durch Drücken des Hauptperson-Knopfes "
 "zur aktiven Person gemacht werden."
 
-#: gramps_main.py:1869
+#: gramps_main.py:1883
 msgid "_Set Home Person"
 msgstr "Hauptperson _setzen"
 
-#: gramps_main.py:1880
+#: gramps_main.py:1894
 msgid "A person must be selected to export"
 msgstr "Zum Exportieren muss eine Person ausgewählt sein"
 
-#: gramps_main.py:1881
+#: gramps_main.py:1895
 msgid ""
 "Exporting requires that an active person be selected. Please select a person "
 "and try again."
@@ -7324,12 +7410,12 @@ msgstr ""
 "Exportieren erfordert, dass eine aktive Person ausgewählt ist. Bitte wählen "
 "Sie eine Person aus und versuchen es noch."
 
-#: gramps_main.py:1912 gramps_main.py:1916 gramps_main.py:1920
-#: gramps_main.py:1934 gramps_main.py:1936
+#: gramps_main.py:1926 gramps_main.py:1930 gramps_main.py:1934
+#: gramps_main.py:1948 gramps_main.py:1950
 msgid "Could not create example database"
 msgstr "Es konnte keine Beispieldatenbank erstellt werden"
 
-#: gramps_main.py:1913 gramps_main.py:1917 gramps_main.py:1921
+#: gramps_main.py:1927 gramps_main.py:1931 gramps_main.py:1935
 msgid "The directory ~/.gramps/example could not be created."
 msgstr "Das Verzeichnis ~/.gramps/example konnte nicht erzeugt werden."
 
@@ -7398,7 +7484,7 @@ msgstr "E-Mail-Adresse des Autors:"
 #: plugins/AncestorChart.py:245 plugins/AncestorChart2.py:499
 #: plugins/AncestorReport.py:290 plugins/Ancestors.py:909
 #: plugins/Ancestors.py:925 plugins/Ancestors.py:931 plugins/DesGraph.py:333
-#: plugins/DetAncestralReport.py:520 plugins/FamilyGroup.py:514
+#: plugins/DetAncestralReport.py:520 plugins/FamilyGroup.py:515
 #: plugins/FanChart.py:299 plugins/FtmStyleAncestors.py:390
 #: plugins/FtmStyleAncestors.py:395 plugins/FtmStyleAncestors.py:400
 #: plugins/FtmStyleAncestors.py:405 plugins/FtmStyleDescendants.py:536
@@ -7426,7 +7512,7 @@ msgstr "Ahnentafel"
 #: plugins/AncestorReport.py:306 plugins/Ancestors.py:968
 #: plugins/BookReport.py:1117 plugins/CountAncestors.py:122
 #: plugins/DescendReport.py:198 plugins/DetAncestralReport.py:618
-#: plugins/DetDescendantReport.py:639 plugins/FamilyGroup.py:548
+#: plugins/DetDescendantReport.py:639 plugins/FamilyGroup.py:549
 #: plugins/FtmStyleAncestors.py:422 plugins/FtmStyleDescendants.py:572
 #: plugins/GraphViz.py:971 plugins/GraphViz.py:985
 #: plugins/IndivComplete.py:595 plugins/IndivSummary.py:391
@@ -7532,7 +7618,7 @@ msgstr " und wurde in %s begraben."
 
 #: plugins/AncestorReport.py:276 plugins/Ancestors.py:894
 #: plugins/DescendReport.py:174 plugins/DetAncestralReport.py:484
-#: plugins/DetDescendantReport.py:505 plugins/FamilyGroup.py:505
+#: plugins/DetDescendantReport.py:505 plugins/FamilyGroup.py:506
 #: plugins/FtmStyleAncestors.py:375 plugins/FtmStyleDescendants.py:521
 #: plugins/IndivComplete.py:552 plugins/IndivSummary.py:348
 #: plugins/SimpleBookTitle.py:265 plugins/StatisticsChart.py:812
@@ -8059,7 +8145,7 @@ msgid "Descendant Graph"
 msgstr "Stammbaum"
 
 #: plugins/DesGraph.py:349 plugins/FanChart.py:325
-#: plugins/StatisticsChart.py:958
+#: plugins/StatisticsChart.py:963
 msgid "Alpha"
 msgstr "Alpha"
 
@@ -8253,35 +8339,35 @@ msgstr ""
 "entwickeln und auf die Datenbank anzuwenden, um ähnliche Ereignisse zu "
 "finden."
 
-#: plugins/ExportVCalendar.py:54
+#: plugins/ExportVCalendar.py:55
 msgid "Export to vCalendar"
 msgstr "Nach vCalender exportieren"
 
-#: plugins/ExportVCalendar.py:199
+#: plugins/ExportVCalendar.py:209
 msgid "Marriage of %s"
 msgstr "Hochzeit von %s"
 
-#: plugins/ExportVCalendar.py:217 plugins/ExportVCalendar.py:219
+#: plugins/ExportVCalendar.py:227 plugins/ExportVCalendar.py:229
 msgid "Birth of %s"
 msgstr "Geburt von %s"
 
-#: plugins/ExportVCalendar.py:228 plugins/ExportVCalendar.py:230
+#: plugins/ExportVCalendar.py:238 plugins/ExportVCalendar.py:240
 msgid "Death of %s"
 msgstr "Tod von %s"
 
-#: plugins/ExportVCalendar.py:283
+#: plugins/ExportVCalendar.py:293
 msgid "Anniversary: %s"
 msgstr "Jahrestag: %s"
 
-#: plugins/ExportVCalendar.py:310
+#: plugins/ExportVCalendar.py:320
 msgid "vCalendar"
 msgstr "vCalender"
 
-#: plugins/ExportVCalendar.py:311
+#: plugins/ExportVCalendar.py:321
 msgid "vCalendar is used in many calendaring and pim applications."
 msgstr "vCalender wird von vielen Kalender- und PIM-Anwendungen verwendet."
 
-#: plugins/ExportVCalendar.py:312
+#: plugins/ExportVCalendar.py:322
 msgid "vCalendar export options"
 msgstr "vCalender-Export-Optionen"
 
@@ -8289,15 +8375,15 @@ msgstr "vCalender-Export-Optionen"
 msgid "Export to vCard"
 msgstr "Nach vCard exportieren"
 
-#: plugins/ExportVCard.py:234
+#: plugins/ExportVCard.py:243
 msgid "vCard"
 msgstr "vCard"
 
-#: plugins/ExportVCard.py:235
+#: plugins/ExportVCard.py:244
 msgid "vCard is used in many addressbook and pim applications."
 msgstr "vCard wird von vielen Adressbuch- und PIM-Anwendungen verwendet."
 
-#: plugins/ExportVCard.py:236
+#: plugins/ExportVCard.py:245
 msgid "vCard export options"
 msgstr "vCard-Export-Optionen"
 
@@ -8309,19 +8395,19 @@ msgstr "Ehemann"
 msgid "Wife"
 msgstr "Ehefrau"
 
-#: plugins/FamilyGroup.py:383 plugins/FamilyGroup.py:547
+#: plugins/FamilyGroup.py:383 plugins/FamilyGroup.py:548
 msgid "Family Group Report"
 msgstr "Familienbericht"
 
-#: plugins/FamilyGroup.py:523
+#: plugins/FamilyGroup.py:524
 msgid "The style used for the text related to the children."
 msgstr "Der Stil, der für den Text zu den Kindern verwendet wird."
 
-#: plugins/FamilyGroup.py:532
+#: plugins/FamilyGroup.py:533
 msgid "The style used for the parent's name"
 msgstr "Der Stil, der für den Namen der Eltern verwendet wird"
 
-#: plugins/FamilyGroup.py:551
+#: plugins/FamilyGroup.py:552
 msgid ""
 "Creates a family group report, showing information on a set of parents and "
 "their children."
@@ -9348,7 +9434,7 @@ msgstr "Markieren Sie um die Sortierung umzukehren."
 msgid "Sort in reverse order"
 msgstr "In umgekehrter Reihenfolge sortieren"
 
-#: plugins/StatisticsChart.py:877
+#: plugins/StatisticsChart.py:881
 msgid ""
 "Select year range within which people need to be born to be selected for "
 "statistics."
@@ -9356,11 +9442,11 @@ msgstr ""
 "Wählen den Zeitraum aus, in dem Person geboren sein müssen um in die "
 "Statistik aufgenommen zu werden."
 
-#: plugins/StatisticsChart.py:878
+#: plugins/StatisticsChart.py:882
 msgid "People born between"
 msgstr "Personen geboren zwischen"
 
-#: plugins/StatisticsChart.py:882
+#: plugins/StatisticsChart.py:886
 msgid ""
 "Check this if you want people who have no known birth date or year to be "
 "accounted also in the statistics."
@@ -9368,52 +9454,52 @@ msgstr ""
 "Markieren Sie, wenn Personen, die kein Geburtsdatum oder -jahr haben, auch "
 "in der Statistik berücksichtigt werden sollen."
 
-#: plugins/StatisticsChart.py:883
+#: plugins/StatisticsChart.py:887
 msgid "Include people without known birth years"
 msgstr "Personen ohne Geburtsjahr einbeziehen"
 
-#: plugins/StatisticsChart.py:895
+#: plugins/StatisticsChart.py:899
 msgid "Select which genders are included into statistics."
 msgstr ""
 "Wählen Sie aus, welche Geschlechter in die Statistik aufgenommen werden "
 "sollen."
 
-#: plugins/StatisticsChart.py:896
+#: plugins/StatisticsChart.py:900
 msgid "Genders included"
 msgstr "Geschlechter aufnehmen"
 
-#: plugins/StatisticsChart.py:899
+#: plugins/StatisticsChart.py:903
 msgid ""
 "With fewer items pie chart and legend will be used instead of a bar chart."
 msgstr ""
 "Mit weniger Einträgen wird ein Tortendiagramm mit Legende verwendet anstatt "
 "eines Balkendiagramms."
 
-#: plugins/StatisticsChart.py:902
+#: plugins/StatisticsChart.py:907
 msgid "Max. items for a pie"
 msgstr "Max.röße für ein Tortendiagramm"
 
-#: plugins/StatisticsChart.py:921
+#: plugins/StatisticsChart.py:926
 msgid "Mark checkboxes to add charts with indicated data"
 msgstr ""
 "Markieren Sie die Felder um Diagramme mit den entsprechenden Daten "
 "hinzuzufügen"
 
-#: plugins/StatisticsChart.py:922 plugins/StatisticsChart.py:927
+#: plugins/StatisticsChart.py:927 plugins/StatisticsChart.py:932
 msgid "Chart Selection"
 msgstr "Auswahl eines Berichtes"
 
-#: plugins/StatisticsChart.py:926
+#: plugins/StatisticsChart.py:931
 msgid "Note that both biological and adopted children are taken into account."
 msgstr ""
 "Beachten Sie, dass sowohl biologische als auch adoptierte Kinder "
 "berücksichtigt werden."
 
-#: plugins/StatisticsChart.py:957
+#: plugins/StatisticsChart.py:962
 msgid "Statistics Chart"
 msgstr "Statistik-Diagramm"
 
-#: plugins/StatisticsChart.py:961
+#: plugins/StatisticsChart.py:966
 msgid "Generates statistical bar and pie charts of the people in the database."
 msgstr ""
 "Generiert einen Statistikbalken und Tortendiagramm für die Personen in der "
@@ -10200,31 +10286,31 @@ msgstr ""
 "brennen, und diese Kopie wird vollständig portabel über verschiedene "
 "Computer und Rechnerarchitekturen sein."
 
-#: plugins/WriteFtree.py:273
+#: plugins/WriteFtree.py:281
 msgid "_Web Family Tree"
 msgstr "_Web Family Tree"
 
-#: plugins/WriteFtree.py:274
+#: plugins/WriteFtree.py:282
 msgid "Web Family Tree format."
 msgstr "Web Family Tree-Format."
 
-#: plugins/WriteFtree.py:275
+#: plugins/WriteFtree.py:283
 msgid "Web Family Tree export options"
 msgstr "Web Family Tree-Export-Optionen"
 
-#: plugins/WriteGeneWeb.py:218
+#: plugins/WriteGeneWeb.py:227
 msgid "No families matched by selected filter"
 msgstr "Keine Familien entsprechen dem ausgewählten Filter."
 
-#: plugins/WriteGeneWeb.py:577
+#: plugins/WriteGeneWeb.py:586
 msgid "G_eneWeb"
 msgstr "G_eneWeb"
 
-#: plugins/WriteGeneWeb.py:578
+#: plugins/WriteGeneWeb.py:587
 msgid "GeneWeb is a web based genealogy program."
 msgstr "GeneWeb ist ein webbasierendes Ahnenforschungs-Programm"
 
-#: plugins/WriteGeneWeb.py:579
+#: plugins/WriteGeneWeb.py:588
 msgid "GeneWeb export options"
 msgstr "GeneWeb-Export-Optionen"
 
@@ -10590,11 +10676,35 @@ msgstr "Gewählte Regel"
 msgid "Values"
 msgstr "Werte"
 
-#~ msgid "Numerical"
-#~ msgstr "Numerisch"
+#, fuzzy
+#~ msgid "Checkpointing database..."
+#~ msgstr "Datenbank wird geöffnet"
 
-#~ msgid "Day Month Year"
-#~ msgstr "Tag-Monat-Jahr"
+#, fuzzy
+#~ msgid "Checkpoint failed"
+#~ msgstr "Bilderimport gescheitert"
+
+#, fuzzy
+#~ msgid "Checkpoint the database"
+#~ msgstr "Datenbankprüfung"
+
+#~ msgid "Revision control"
+#~ msgstr "Versionsverwaltung"
+
+#~ msgid "Generated by"
+#~ msgstr "Erzeugt von"
+
+#~ msgid "Introduction"
+#~ msgstr "Einleitung"
+
+#~ msgid "Places"
+#~ msgstr "Orte"
+
+#~ msgid "Download"
+#~ msgstr "Download"
+
+#~ msgid "Contact"
+#~ msgstr "Kontakt"
 
 #~ msgid "Index of individuals, sorted by last name."
 #~ msgstr "Personenverzeichnis, sortiert nach dem Nachnamen"
@@ -10602,15 +10712,15 @@ msgstr "Werte"
 #~ msgid "Surname"
 #~ msgstr "Nachname"
 
-#~ msgid "Places"
-#~ msgstr "Orte"
-
 #~ msgid "Index of all the places in the project."
 #~ msgstr "Verzeichnis aller Orte in dem Projekt."
 
 #~ msgid "Letter"
 #~ msgstr "Letter"
 
+#~ msgid "Narrative"
+#~ msgstr "Ausführlich"
+
 #~ msgid ""
 #~ "Index of all the surnames in the project. The links lead to a list of "
 #~ "individuals in the database with this same surname."
@@ -10618,24 +10728,12 @@ msgstr "Werte"
 #~ "Verzeichnis aller Nacnamen in dem Projekt. Die Links führen zu einer "
 #~ "Liste der Personen in der Datenbank mit diesem Nachnamen."
 
-#~ msgid "Introduction"
-#~ msgstr "Einleitung"
-
 #~ msgid "All sources cited in the project."
 #~ msgstr "Alle Quellen, die in diesem Projekt zitiert werden."
 
-#~ msgid "Download"
-#~ msgstr "Download"
-
-#~ msgid "Contact"
-#~ msgstr "Kontakt"
-
 #~ msgid "Pedigree"
 #~ msgstr "Ahnentafel"
 
-#~ msgid "Narrative"
-#~ msgstr "Ausführlich"
-
 #~ msgid "Relationships"
 #~ msgstr "Beziehungen"
 
@@ -10655,6 +10753,9 @@ msgstr "Werte"
 #~ msgid "%(date)s    at    %(place)s"
 #~ msgstr "%(date)s    in    %(place)s"
 
+#~ msgid "My Family Tree"
+#~ msgstr "Mein Stammbaum"
+
 #~ msgid "Web site title"
 #~ msgstr "Webseitentitel"
 
@@ -10667,5 +10768,22 @@ msgstr "Werte"
 #~ msgid "Narrative Web Site"
 #~ msgstr "Ausführliche Webseite"
 
+#~ msgid "Added person is not visible"
+#~ msgstr "Die hinzugefügte Person ist nicht sichtbar"
+
+#~ msgid ""
+#~ "The person you added is currently not visible due to the chosen filter. "
+#~ "This may occur if you did not specify a birth date."
+#~ msgstr ""
+#~ "Die von Ihnen hinzugefügte Person ist gegenwärtig wegen dem gewählten "
+#~ "Filter nicht sichtbar. Dies tritt auf, wenn Sie kein Geburtsdatum "
+#~ "angegeben haben."
+
+#~ msgid "Numerical"
+#~ msgstr "Numerisch"
+
+#~ msgid "Day Month Year"
+#~ msgstr "Tag-Monat-Jahr"
+
 #~ msgid "Min. bar char items"
 #~ msgstr "Sortiere Diagramm-Einträge nach"
diff --git a/gramps2/src/po/es.po b/gramps2/src/po/es.po
index 0cfc3914b..c15b2aeb4 100644
--- a/gramps2/src/po/es.po
+++ b/gramps2/src/po/es.po
@@ -4,11 +4,16 @@
 # #
 # #	$Id$
 # #	$Log$
-# #	Revision 1.11  2005/06/05 05:11:32  jsanchez
-# #	* src/po/es.po: version merge fix
+# #	Revision 1.12  2005/07/08 20:24:41  rshura
+# #	Merge changes made between 2.0.3 and 2.0.5
 # #
-# #	Revision 1.10  2005/06/05 04:01:23  rshura
-# #	Merge changes between 2.0.1 and 2.0.2 with the main trunk
+# #	Revision 1.5.2.7  2005/06/27 14:29:44  jsanchez
+# #	* src/po/es.po: Translation fixes
+# #	
+# #	Revision 1.5.2.6  2005/06/23 16:27:47  jsanchez
+# #	* src/WriteGedcom.py: Fix family source references, fix spurious
+# #	PLAC subrecords, respect more privacy settings
+# #	* src/po/es.po: Translation fixes
 # #	
 # #	Revision 1.5.2.5  2005/06/03 21:07:17  jsanchez
 # #	* src/po/es.po: Translation update for version 2.0.2.
@@ -79,8 +84,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GRAMPS 0.9.0\n"
-"POT-Creation-Date: Wed Jun  1 09:58:59 2005\n"
-"PO-Revision-Date: 2005-06-03 20:07+0200\n"
+"POT-Creation-Date: Thu Jun 23 14:11:42 2005\n"
+"PO-Revision-Date: 2005-06-26 23:42+0200\n"
 "Last-Translator: Julio Snchez \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
@@ -102,17 +107,17 @@ msgstr "No se pudo cargar el nombre de archivo elegido."
 msgid "Add Media Object"
 msgstr "Agregar Objeto Audiovisual"
 
-#: AddSpouse.py:115
+#: AddSpouse.py:114
 msgid "Choose Spouse/Partner of %s"
 msgstr "Escoger Cnyuge/Compaero(a) de %s"
 
-#: AddSpouse.py:120
+#: AddSpouse.py:119
 msgid "Choose Spouse/Partner"
 msgstr "Escoger Cnyuge/Compaero(a)"
 
-#: AddSpouse.py:161 ChooseParents.py:230 EditPerson.py:338 EditSource.py:305
-#: FamilyView.py:74 ImageSelect.py:1102 PeopleView.py:58 PeopleView.py:148
-#: SelectChild.py:124 SelectPerson.py:78 plugins/BookReport.py:631
+#: AddSpouse.py:142 ChooseParents.py:252 EditPerson.py:338 EditSource.py:312
+#: FamilyView.py:74 ImageSelect.py:1104 PeopleView.py:58 PeopleView.py:134
+#: SelectChild.py:129 SelectPerson.py:78 plugins/BookReport.py:631
 #: plugins/FilterEditor.py:459 plugins/IndivComplete.py:405
 #: plugins/IndivSummary.py:226 plugins/PatchNames.py:191 plugins/RelCalc.py:95
 #: plugins/ScratchPad.py:154 plugins/ScratchPad.py:195
@@ -124,31 +129,31 @@ msgstr "Escoger C
 msgid "Name"
 msgstr "Nombre"
 
-#: AddSpouse.py:166 ChooseParents.py:236 EditSource.py:305 FamilyView.py:73
-#: ImageSelect.py:1102 MediaView.py:58 MergePeople.py:107 PeopleView.py:59
-#: PlaceView.py:50 SelectChild.py:129 SelectObject.py:85 SelectPerson.py:84
+#: AddSpouse.py:146 ChooseParents.py:261 EditSource.py:312 FamilyView.py:73
+#: ImageSelect.py:1104 MediaView.py:58 MergePeople.py:107 PeopleView.py:59
+#: PlaceView.py:50 SelectChild.py:134 SelectObject.py:85 SelectPerson.py:84
 #: SourceView.py:52 Sources.py:108 Sources.py:242 Witness.py:64
 #: plugins/PatchNames.py:182 plugins/RelCalc.py:95
 msgid "ID"
 msgstr "ID"
 
-#: AddSpouse.py:171 ChooseParents.py:242 SelectChild.py:134 SelectPerson.py:90
+#: AddSpouse.py:150 ChooseParents.py:271 SelectChild.py:139 SelectPerson.py:90
 msgid "Birth date"
 msgstr "Fecha de nacimiento"
 
-#: AddSpouse.py:254 AddSpouse.py:279
+#: AddSpouse.py:232 AddSpouse.py:257
 msgid "Error adding a spouse"
 msgstr "Error al aadir un cnyuge"
 
-#: AddSpouse.py:255
+#: AddSpouse.py:233
 msgid "A person cannot be linked as his/her spouse"
 msgstr "No se permite que una persona sea su propio cnyuge"
 
-#: AddSpouse.py:263
+#: AddSpouse.py:241
 msgid "Spouse is a parent"
 msgstr "El cnyuge es uno de los progenitores"
 
-#: AddSpouse.py:264
+#: AddSpouse.py:242
 msgid ""
 "The person selected as a spouse is a parent of the active person. Usually, "
 "this is a mistake. You may choose either to proceed with adding a spouse, or "
@@ -159,23 +164,23 @@ msgstr ""
 "agregando el cnyuge o volver al dilogo Escoger Cnyuge para arreglar el "
 "problema."
 
-#: AddSpouse.py:268 AddSpouse.py:289
+#: AddSpouse.py:246 AddSpouse.py:267
 msgid "Proceed with adding"
 msgstr "Continuar agregando"
 
-#: AddSpouse.py:268 AddSpouse.py:289
+#: AddSpouse.py:246 AddSpouse.py:267
 msgid "Return to dialog"
 msgstr "Regresar al Escoger"
 
-#: AddSpouse.py:280
+#: AddSpouse.py:258
 msgid "The spouse is already present in this family"
 msgstr "El cnyuge ya est presente en esta familia"
 
-#: AddSpouse.py:284
+#: AddSpouse.py:262
 msgid "Spouse is a child"
 msgstr "El cnyuge es un hijo o hija"
 
-#: AddSpouse.py:285
+#: AddSpouse.py:263
 msgid ""
 "The person selected as a spouse is a child of the active person. Usually, "
 "this is a mistake. You may choose either to proceed with adding a spouse, or "
@@ -185,10 +190,21 @@ msgstr ""
 "Por lo general, esto es un error. Puede elegir continuar agregando el "
 "cnyuge o volver al dilogo Escoger Cnyuge para arreglar el problema."
 
-#: AddSpouse.py:315 FamilyView.py:725
+#: AddSpouse.py:293 FamilyView.py:725
 msgid "Add Spouse"
 msgstr "Agregar Cnyuge"
 
+#: AddSpouse.py:392 ChooseParents.py:811 GenericFilter.py:132
+#: GenericFilter.py:147 GenericFilter.py:263 GenericFilter.py:277
+#: GenericFilter.py:300 GenericFilter.py:323 GenericFilter.py:338
+#: GenericFilter.py:353 GenericFilter.py:979 GenericFilter.py:1223
+#: GenericFilter.py:1247 GenericFilter.py:1276 GenericFilter.py:1308
+#: GenericFilter.py:1325 GenericFilter.py:1346 GenericFilter.py:1429
+#: GenericFilter.py:1483 GenericFilter.py:1545 GenericFilter.py:1564
+#: GenericFilter.py:1634 GenericFilter.py:1801 SelectChild.py:305
+msgid "General filters"
+msgstr "Filtros generales"
+
 #: AddrEdit.py:106 AddrEdit.py:174
 msgid "Address Editor"
 msgstr "Editor de Direcciones"
@@ -250,7 +266,7 @@ msgstr "Editor de Atributos para %s"
 msgid "New Attribute"
 msgstr "Nuevo Atributo"
 
-#: AttrEdit.py:175 EditPerson.py:326 ImageSelect.py:682 ImageSelect.py:952
+#: AttrEdit.py:175 EditPerson.py:326 ImageSelect.py:682 ImageSelect.py:954
 #: Marriage.py:214 plugins/ScratchPad.py:273 plugins/ScratchPad.py:281
 msgid "Attribute"
 msgstr "Atributo"
@@ -272,73 +288,81 @@ msgstr ""
 msgid "Edit Bookmarks"
 msgstr "Editar Marcadores"
 
-#: ChooseParents.py:121
+#: ChooseParents.py:129 ChooseParents.py:130
+msgid "Loading..."
+msgstr "Cargando..."
+
+#: ChooseParents.py:133
 msgid "Choose the Parents of %s"
 msgstr "Escoger los Padres de %s"
 
-#: ChooseParents.py:123 ChooseParents.py:268 ChooseParents.py:510
-#: ChooseParents.py:593
+#: ChooseParents.py:135 ChooseParents.py:300 ChooseParents.py:572
+#: ChooseParents.py:659
 msgid "Choose Parents"
 msgstr "Escoger Padres"
 
-#: ChooseParents.py:304 ChooseParents.py:648
+#: ChooseParents.py:366 ChooseParents.py:714
 msgid "Par_ent"
 msgstr "Padre"
 
-#: ChooseParents.py:306
+#: ChooseParents.py:368
 msgid "Fath_er"
 msgstr "Padre"
 
-#: ChooseParents.py:314 ChooseParents.py:647
+#: ChooseParents.py:376 ChooseParents.py:713
 msgid "Pa_rent"
 msgstr "Padre"
 
-#: ChooseParents.py:316
+#: ChooseParents.py:378
 msgid "Mothe_r"
 msgstr "Madre"
 
-#: ChooseParents.py:502 SelectChild.py:287 SelectChild.py:306
+#: ChooseParents.py:564 SelectChild.py:192 SelectChild.py:211
 msgid "Error selecting a child"
 msgstr "Error al selecionar un hijo"
 
-#: ChooseParents.py:503
+#: ChooseParents.py:565
 msgid "A person cannot be linked as his/her own parent"
 msgstr "No se permite que una persona sea su propio padre o madre"
 
-#: ChooseParents.py:532 ChooseParents.py:545
-msgid "Added person is not visible"
-msgstr "La person agregada no es visible"
-
-#: ChooseParents.py:533 ChooseParents.py:546
-msgid ""
-"The person you added is currently not visible due to the chosen filter. This "
-"may occur if you did not specify a birth date."
-msgstr ""
-"La persona que ha agregado no es visible a causa del filtro elegido.  Esto "
-"puede ocurrir si no especific fecha de nacimiento."
-
-#: ChooseParents.py:623
+#: ChooseParents.py:689
 msgid "Modify the Parents of %s"
 msgstr "Modificar los Padres de %s"
 
-#: ChooseParents.py:624 ChooseParents.py:736
+#: ChooseParents.py:690 ChooseParents.py:802
 msgid "Modify Parents"
 msgstr "Modificar Padres"
 
-#: ChooseParents.py:650 FamilyView.py:1100 MergePeople.py:136
+#: ChooseParents.py:716 FamilyView.py:1112 MergePeople.py:136
 #: plugins/FamilyGroup.py:261 plugins/IndivComplete.py:215
 #: plugins/IndivComplete.py:217 plugins/IndivComplete.py:450
 #: plugins/IndivSummary.py:290 plugins/WebPage.py:340 plugins/WebPage.py:343
 msgid "Mother"
 msgstr "Madre"
 
-#: ChooseParents.py:651 FamilyView.py:1098 MergePeople.py:134
+#: ChooseParents.py:717 FamilyView.py:1110 MergePeople.py:134
 #: plugins/FamilyGroup.py:248 plugins/IndivComplete.py:206
 #: plugins/IndivComplete.py:208 plugins/IndivComplete.py:445
 #: plugins/IndivSummary.py:276 plugins/WebPage.py:339 plugins/WebPage.py:342
 msgid "Father"
 msgstr "Padre"
 
+#: ChooseParents.py:834
+msgid "Likely Father"
+msgstr "Padre posible"
+
+#: ChooseParents.py:835
+msgid "Matches likely fathers"
+msgstr "Coincide con los padres posibles"
+
+#: ChooseParents.py:844
+msgid "Likely Mother"
+msgstr "Madre posible"
+
+#: ChooseParents.py:845
+msgid "Matches likely mothers"
+msgstr "Coincide con las madres posibles"
+
 #: ColumnOrder.py:40
 msgid "Select Columns"
 msgstr "Seleccionar Columnas"
@@ -353,7 +377,7 @@ msgstr "Nombre de la Columna"
 
 #: Date.py:105
 msgid "Gregorian"
-msgstr "Gragoriano"
+msgstr "Gregoriano"
 
 #: Date.py:106
 msgid "Julian"
@@ -415,7 +439,7 @@ msgstr "Calculado"
 msgid "Date selection"
 msgstr "Seleccin de fecha"
 
-#: DateEdit.py:264 gramps_main.py:1154 gramps_main.py:1161
+#: DateEdit.py:264 gramps_main.py:1168 gramps_main.py:1175
 msgid "Could not open help"
 msgstr "No se pudo abrir la ayuda"
 
@@ -467,7 +491,7 @@ msgstr "Detectado autom
 msgid "Select file _type:"
 msgstr "Seleccionar _tipo de archivo:"
 
-#: DbPrompter.py:611 gramps_main.py:1374
+#: DbPrompter.py:611 gramps_main.py:1388
 msgid "All files"
 msgstr "Todos los archivos"
 
@@ -488,7 +512,7 @@ msgid "GEDCOM files"
 msgstr "Archivos GEDCOM"
 
 #: DisplayModels.py:47 GrampsMime.py:46 GrampsMime.py:53 MergePeople.py:50
-#: PeopleModel.py:381 SelectChild.py:245 Utils.py:123 const.py:169
+#: PeopleModel.py:387 Utils.py:118 const.py:169
 #: plugins/DetAncestralReport.py:308 plugins/DetAncestralReport.py:315
 #: plugins/DetDescendantReport.py:330 plugins/DetDescendantReport.py:337
 #: plugins/FamilyGroup.py:458 plugins/IndivComplete.py:281
@@ -496,19 +520,19 @@ msgstr "Archivos GEDCOM"
 msgid "unknown"
 msgstr "desconocido"
 
-#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:381 SelectChild.py:241
-#: const.py:167 plugins/RelCalc.py:111
+#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:387 const.py:167
+#: plugins/RelCalc.py:111
 msgid "male"
 msgstr "masculino"
 
-#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:381 SelectChild.py:243
-#: const.py:168 plugins/RelCalc.py:113
+#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:387 const.py:168
+#: plugins/RelCalc.py:113
 msgid "female"
 msgstr "femenino"
 
-#: DisplayModels.py:468 ImageSelect.py:981 MediaView.py:243 NoteEdit.py:104
-#: Utils.py:160 gramps.glade:5208 gramps.glade:15342 gramps.glade:25747
-#: gramps.glade:26749 gramps.glade:28117 gramps.glade:29548
+#: DisplayModels.py:468 ImageSelect.py:983 MediaView.py:243 NoteEdit.py:104
+#: Utils.py:155 gramps.glade:5501 gramps.glade:16531 gramps.glade:27709
+#: gramps.glade:28757 gramps.glade:30210 gramps.glade:31740
 msgid "Note"
 msgstr "Nota"
 
@@ -530,7 +554,7 @@ msgstr ""
 msgid "Internal Error"
 msgstr "Error Interno"
 
-#: EditPerson.py:132 EditPerson.py:634
+#: EditPerson.py:132 EditPerson.py:635
 msgid "Edit Person"
 msgstr "Editar/Ver Persona"
 
@@ -538,12 +562,12 @@ msgstr "Editar/Ver Persona"
 msgid "Patronymic:"
 msgstr "Patronmico:"
 
-#: EditPerson.py:306 EditSource.py:325 EventEdit.py:278 ImageSelect.py:1123
+#: EditPerson.py:306 EditSource.py:332 EventEdit.py:278 ImageSelect.py:1125
 #: Marriage.py:213 plugins/ScratchPad.py:166 plugins/ScratchPad.py:180
 msgid "Event"
 msgstr "Evento"
 
-#: EditPerson.py:307 EditPerson.py:344 EditPlace.py:130 const.py:435
+#: EditPerson.py:307 EditPerson.py:344 EditPlace.py:131 const.py:435
 #: plugins/ScratchPad.py:185 plugins/ScratchPad.py:227
 #: plugins/ScratchPad.py:262
 msgid "Description"
@@ -555,21 +579,21 @@ msgstr "Descripci
 msgid "Date"
 msgstr "Fecha"
 
-#: EditPerson.py:309 EditPlace.py:271 EditSource.py:331 ImageSelect.py:1129
-#: Marriage.py:213 gramps.glade:12208 plugins/ScratchPad.py:183
+#: EditPerson.py:309 EditPlace.py:289 EditSource.py:338 ImageSelect.py:1131
+#: Marriage.py:213 gramps.glade:13109 plugins/ScratchPad.py:183
 #: plugins/ScratchPad.py:225
 msgid "Place"
 msgstr "Lugar"
 
-#: EditPerson.py:326 EditSource.py:156 ImageSelect.py:682 ImageSelect.py:952
-#: Marriage.py:214 gramps.glade:12727 plugins/FilterEditor.py:459
+#: EditPerson.py:326 EditSource.py:160 ImageSelect.py:682 ImageSelect.py:954
+#: Marriage.py:214 gramps.glade:13691 plugins/FilterEditor.py:459
 #: plugins/PatchNames.py:188 plugins/ScratchPad.py:284
 #: plugins/ScratchPad.py:317 plugins/ScratchPad.py:543
 #: plugins/ScratchPad.py:549
 msgid "Value"
 msgstr "Valor"
 
-#: EditPerson.py:338 EditSource.py:305 ImageSelect.py:1102 MediaView.py:59
+#: EditPerson.py:338 EditSource.py:312 ImageSelect.py:1104 MediaView.py:59
 #: MergePeople.py:152 SelectObject.py:86 plugins/BookReport.py:631
 #: plugins/BookReport.py:632 plugins/PatchNames.py:185
 #: plugins/ScratchPad.py:181 plugins/ScratchPad.py:223
@@ -579,59 +603,59 @@ msgstr "Valor"
 msgid "Type"
 msgstr "Tipo"
 
-#: EditPerson.py:344 EditPlace.py:129 MediaView.py:60
+#: EditPerson.py:344 EditPlace.py:130 MediaView.py:60
 #: plugins/ScratchPad.py:260
 msgid "Path"
 msgstr "Camino"
 
-#: EditPerson.py:566 ImageSelect.py:610 ImageSelect.py:1037 MediaView.py:275
+#: EditPerson.py:567 ImageSelect.py:610 ImageSelect.py:1041 MediaView.py:275
 #: plugins/ScratchPad.py:424 plugins/ScratchPad.py:432
 msgid "Media Object"
 msgstr "Objeto Audiovisual"
 
-#: EditPerson.py:572 ImageSelect.py:616 docgen/AbiWord2Doc.py:327
+#: EditPerson.py:573 ImageSelect.py:616 docgen/AbiWord2Doc.py:335
 #: docgen/AsciiDoc.py:371 docgen/HtmlDoc.py:486 docgen/KwordDoc.py:494
 #: docgen/PdfDoc.py:631 docgen/RTFDoc.py:427
 msgid "Open in %s"
 msgstr "Abrir en %s"
 
-#: EditPerson.py:575 ImageSelect.py:619 MediaView.py:288
+#: EditPerson.py:576 ImageSelect.py:619 MediaView.py:288
 msgid "Edit with the GIMP"
 msgstr "Editar con GIMP"
 
-#: EditPerson.py:577 ImageSelect.py:621
+#: EditPerson.py:578 ImageSelect.py:621
 msgid "Edit Object Properties"
 msgstr "Editar Propiedades del Objeto"
 
-#: EditPerson.py:628
+#: EditPerson.py:629
 msgid "New Person"
 msgstr "Nueva Persona"
 
-#: EditPerson.py:753 GrampsCfg.py:63 const.py:233 const.py:246
+#: EditPerson.py:754 GrampsCfg.py:63 const.py:233 const.py:246
 msgid "None"
 msgstr "Ninguno"
 
-#: EditPerson.py:1290
+#: EditPerson.py:1291
 msgid "Save changes to %s?"
 msgstr "Salvar los cambios a %s?"
 
-#: EditPerson.py:1291 EditPerson.py:1307 Marriage.py:622 Marriage.py:635
+#: EditPerson.py:1292 EditPerson.py:1308 Marriage.py:622 Marriage.py:635
 msgid "If you close without saving, the changes you have made will be lost"
 msgstr "Si cierra sin salvar, los cambios hechos se perdern"
 
-#: EditPerson.py:1306
+#: EditPerson.py:1307
 msgid "Save Changes to %s?"
 msgstr "Salvar los cambios a %s?"
 
-#: EditPerson.py:1652
+#: EditPerson.py:1653
 msgid "Make the selected name the preferred name"
 msgstr "Transforma al nombre seleccionado en el nombre preferido"
 
-#: EditPerson.py:1696
+#: EditPerson.py:1697
 msgid "Unknown gender specified"
 msgstr "Se indic sexo desconocido"
 
-#: EditPerson.py:1697
+#: EditPerson.py:1698
 msgid ""
 "The gender of the person is currently unknown. Usually, this is a mistake. "
 "You may choose to either continue saving, or returning to the Edit Person "
@@ -641,19 +665,19 @@ msgstr ""
 "Puede elegir continuar salvando o volver al dilogo Editar Persona para "
 "arreglar el problema."
 
-#: EditPerson.py:1701
+#: EditPerson.py:1702
 msgid "Continue saving"
 msgstr "Continuar el salvado"
 
-#: EditPerson.py:1701
+#: EditPerson.py:1702
 msgid "Return to window"
 msgstr "Regresar a la ventana"
 
-#: EditPerson.py:1729 Marriage.py:654
+#: EditPerson.py:1730 Marriage.py:654
 msgid "GRAMPS ID value was not changed."
 msgstr "El nmero de identificacin GRAMPS no fue cambiado."
 
-#: EditPerson.py:1730
+#: EditPerson.py:1731
 msgid ""
 "You have attempted to change the GRAMPS ID to a value of %(grampsid)s. This "
 "value is already used by %(person)s."
@@ -661,11 +685,11 @@ msgstr ""
 "Ha intentado cambiar el nmero de identificacin GRAMPS a %(grampsid)s. Este "
 "valor ya lo utiliza %(person)s."
 
-#: EditPerson.py:1842
+#: EditPerson.py:1843
 msgid "Problem changing the gender"
 msgstr "Problema al cambiar el sexo"
 
-#: EditPerson.py:1843
+#: EditPerson.py:1844
 msgid ""
 "Changing the gender caused problems with marriage information.\n"
 "Please check the person's marriages."
@@ -673,96 +697,106 @@ msgstr ""
 "Cambiar el sexo cre problemas con la informacin matrimonial.\n"
 "Por favor revise los matrimonios de la persona."
 
-#: EditPerson.py:1886
+#: EditPerson.py:1887
 msgid "Edit Person (%s)"
 msgstr "Editar/Ver Persona (%s)"
 
-#: EditPerson.py:1902 ImageSelect.py:1162
+#: EditPerson.py:1903 ImageSelect.py:1165
 msgid "Add Place (%s)"
 msgstr "Agregar Lugar (%s)"
 
-#: EditPlace.py:90 EditPlace.py:277
+#: EditPlace.py:91 EditPlace.py:295
 msgid "Place Editor"
 msgstr "Editor de Lugares"
 
-#: EditPlace.py:149 PlaceView.py:53
+#: EditPlace.py:150 PlaceView.py:53
 msgid "City"
 msgstr "Ciudad"
 
-#: EditPlace.py:149 PlaceView.py:54
+#: EditPlace.py:150 PlaceView.py:54
 msgid "County"
 msgstr "Condado"
 
-#: EditPlace.py:150 PlaceView.py:55
+#: EditPlace.py:151 PlaceView.py:55
 msgid "State"
 msgstr "Estado/Provincia"
 
-#: EditPlace.py:150 PlaceView.py:56
+#: EditPlace.py:151 PlaceView.py:56
 msgid "Country"
 msgstr "Pas"
 
-#: EditPlace.py:266 EditPlace.py:270
+#: EditPlace.py:284 EditPlace.py:288
 msgid "New Place"
 msgstr "Nuevo Lugar"
 
-#: EditPlace.py:400
+#: EditPlace.py:391
+msgid "Place title is already in use"
+msgstr "El ttulo del lugar ya est usado"
+
+#: EditPlace.py:392
+msgid ""
+"Each place must have a unique title, and title you have selected is already "
+"used by another place"
+msgstr "Cada lugar debe tener un ttulo distinto y el ttulo que seleccion ya lo usa otro lugar"
+
+#: EditPlace.py:427
 msgid "Edit Place (%s)"
 msgstr "Editar/Ver Lugar (%s)"
 
-#: EditPlace.py:518
+#: EditPlace.py:546
 msgid "People"
 msgstr "Personas"
 
-#: EditPlace.py:520 EditPlace.py:529
+#: EditPlace.py:548 EditPlace.py:557
 msgid "%s [%s]: event %s\n"
 msgstr "%s [%s]: evento %s\n"
 
-#: EditPlace.py:527
+#: EditPlace.py:555
 msgid "Families"
 msgstr "Familias"
 
-#: EditPlace.py:535 Utils.py:115
+#: EditPlace.py:563 Utils.py:110
 msgid "%(father)s and %(mother)s"
 msgstr "%(father)s y %(mother)s"
 
-#: EditPlace.py:605 PlaceView.py:221
+#: EditPlace.py:633 PlaceView.py:224
 msgid "Delete Place (%s)"
 msgstr "Borrar Lugar (%s)"
 
-#: EditSource.py:86 EditSource.py:242
+#: EditSource.py:90 EditSource.py:249
 msgid "Source Editor"
 msgstr "Editor de Fuentes"
 
-#: EditSource.py:156
+#: EditSource.py:160
 msgid "Key"
 msgstr "Clave"
 
-#: EditSource.py:231 EditSource.py:235 Sources.py:451 Sources.py:453
+#: EditSource.py:238 EditSource.py:242 Sources.py:451 Sources.py:453
 msgid "New Source"
 msgstr "Nueva Fuente"
 
-#: EditSource.py:236 EditSource.py:337 ImageSelect.py:1135 Utils.py:165
-#: Utils.py:167
+#: EditSource.py:243 EditSource.py:344 ImageSelect.py:1137 Utils.py:160
+#: Utils.py:162
 msgid "Source"
 msgstr "Fuente"
 
-#: EditSource.py:313 ImageSelect.py:1111 plugins/EventCmp.py:408
+#: EditSource.py:320 ImageSelect.py:1113 plugins/EventCmp.py:408
 msgid "Person"
 msgstr "Persona"
 
-#: EditSource.py:319 ImageSelect.py:1117
+#: EditSource.py:326 ImageSelect.py:1119
 msgid "Family"
 msgstr "Familia"
 
-#: EditSource.py:343
+#: EditSource.py:350
 msgid "Media"
 msgstr "Objetos"
 
-#: EditSource.py:397
+#: EditSource.py:404
 msgid "Edit Source (%s)"
 msgstr "Editar Fuente (%s)"
 
-#: EditSource.py:463
+#: EditSource.py:471
 msgid "Delete Source (%s)"
 msgstr "Borrar Fuente (%s)"
 
@@ -952,7 +986,7 @@ msgstr "f."
 
 #: FamilyView.py:72
 msgid "#"
-msgstr "#"
+msgstr "N"
 
 #: FamilyView.py:75 MergePeople.py:108 PeopleView.py:60
 #: plugins/IndivComplete.py:418 plugins/IndivSummary.py:240
@@ -979,22 +1013,22 @@ msgstr "Lugar de Fallecimiento"
 
 #: FamilyView.py:395 FamilyView.py:405 FamilyView.py:426 FamilyView.py:433
 #: FamilyView.py:465 FamilyView.py:530 FamilyView.py:536 FamilyView.py:606
-#: FamilyView.py:612 FamilyView.py:1173 FamilyView.py:1179 FamilyView.py:1212
-#: FamilyView.py:1218 PedView.py:561 PedView.py:570 PeopleView.py:308
-#: gramps.glade:821 gramps_main.py:659
+#: FamilyView.py:612 FamilyView.py:1176 FamilyView.py:1182 FamilyView.py:1215
+#: FamilyView.py:1221 PedView.py:564 PedView.py:573 PeopleView.py:301
+#: gramps.glade:822 gramps_main.py:659
 msgid "Home"
 msgstr "Inicio"
 
-#: FamilyView.py:396 PeopleView.py:291
+#: FamilyView.py:396 PeopleView.py:284
 msgid "Add Bookmark"
 msgstr "Agregar Marcador"
 
 #: FamilyView.py:399 FamilyView.py:429 FamilyView.py:458 FamilyView.py:489
-#: PedView.py:584 PedView.py:595 PeopleView.py:304
+#: PedView.py:587 PedView.py:598 PeopleView.py:297
 msgid "People Menu"
 msgstr "Men de Personas"
 
-#: FamilyView.py:454 FamilyView.py:486 FamilyView.py:1192 FamilyView.py:1231
+#: FamilyView.py:454 FamilyView.py:486 FamilyView.py:1195 FamilyView.py:1234
 msgid "Add parents"
 msgstr "Agregar Padres"
 
@@ -1006,7 +1040,7 @@ msgstr "Men
 msgid "Make the selected child an active person"
 msgstr "Hace que el hijo seleccionado sea la nueva persona activa"
 
-#: FamilyView.py:548 FamilyView.py:1191 FamilyView.py:1230
+#: FamilyView.py:548 FamilyView.py:1194 FamilyView.py:1233
 msgid "Edit the child/parent relationships"
 msgstr "Editar las relaciones de paternidad"
 
@@ -1050,19 +1084,19 @@ msgstr "Fijar el c
 msgid "Modify family"
 msgstr "Modificar familia"
 
-#: FamilyView.py:800 FamilyView.py:1445 SelectChild.py:85 SelectChild.py:148
+#: FamilyView.py:800 FamilyView.py:1448 SelectChild.py:88 SelectChild.py:153
 msgid "Add Child to Family"
 msgstr "Agregar Hijo a Familia"
 
-#: FamilyView.py:839
+#: FamilyView.py:854
 msgid "Remove Child (%s)"
 msgstr "Borrar Hijo (%s)"
 
-#: FamilyView.py:845
+#: FamilyView.py:862
 msgid "Remove %s as a spouse of %s?"
 msgstr "Quiere borrar a %s como cnyuge de %s?"
 
-#: FamilyView.py:846
+#: FamilyView.py:863
 msgid ""
 "Removing a spouse removes the relationship between the spouse and the active "
 "person. It does not remove the spouse from the database"
@@ -1070,27 +1104,27 @@ msgstr ""
 "Borrar un cnyuge elimina la relacin entre el cnyuge y la persona activa. "
 "No borra el cnyuge de la base de datos"
 
-#: FamilyView.py:849
+#: FamilyView.py:866
 msgid "_Remove Spouse"
 msgstr "_Borrar cnyuge actual"
 
-#: FamilyView.py:893
+#: FamilyView.py:905
 msgid "Remove Spouse (%s)"
 msgstr "Borrar cnyuge (%s)"
 
-#: FamilyView.py:934
+#: FamilyView.py:946
 msgid "Select Parents (%s)"
 msgstr "Borrar los Padres (%s)"
 
-#: FamilyView.py:1049
+#: FamilyView.py:1061
 msgid ""
 msgstr ""
 
-#: FamilyView.py:1066
+#: FamilyView.py:1078
 msgid "Database corruption detected"
 msgstr "Detectada corrupcin de la base de datos"
 
-#: FamilyView.py:1067
+#: FamilyView.py:1079
 msgid ""
 "A problem was detected with the database. Please run the Check and Repair "
 "Database tool to fix the problem."
@@ -1098,7 +1132,7 @@ msgstr ""
 "Se detect un problema con la base de datos. Por favor, utilice la "
 "herramienta de Revisar y Reparar la base de datos para areglar el problema."
 
-#: FamilyView.py:1118
+#: FamilyView.py:1130
 msgid ""
 "%s: %s [%s]\n"
 "\tRelationship: %s"
@@ -1106,31 +1140,31 @@ msgstr ""
 "%s: %s [%s]\n"
 "\tRelacin: %s"
 
-#: FamilyView.py:1120
+#: FamilyView.py:1132
 msgid "%s: unknown"
 msgstr "%s: desconocido"
 
-#: FamilyView.py:1164
+#: FamilyView.py:1167
 msgid "Parents Menu"
 msgstr "Men de Padres"
 
-#: FamilyView.py:1190 FamilyView.py:1229
+#: FamilyView.py:1193 FamilyView.py:1232
 msgid "Make the selected parents the active family"
 msgstr "Hace que los padres seleccionados sean la nueva familia activa"
 
-#: FamilyView.py:1193 FamilyView.py:1232
+#: FamilyView.py:1196 FamilyView.py:1235
 msgid "Remove parents"
 msgstr "Borrar padres"
 
-#: FamilyView.py:1203
+#: FamilyView.py:1206
 msgid "Spouse Parents Menu"
 msgstr "Men de Padres del Cnyuge"
 
-#: FamilyView.py:1295 FamilyView.py:1310
+#: FamilyView.py:1298 FamilyView.py:1313
 msgid "Remove Parents of %s"
 msgstr "Borrar los Padres de %s"
 
-#: FamilyView.py:1296 FamilyView.py:1311
+#: FamilyView.py:1299 FamilyView.py:1314
 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 "
@@ -1140,61 +1174,51 @@ msgstr ""
 "padres. Los padres no se borran de la base de datos y la relacin entre "
 "ambos no se borra."
 
-#: FamilyView.py:1300 FamilyView.py:1315
+#: FamilyView.py:1303 FamilyView.py:1318
 msgid "_Remove Parents"
 msgstr "Borrar los Padres"
 
-#: FamilyView.py:1408
+#: FamilyView.py:1411
 msgid "Remove Parents (%s)"
 msgstr "Borrar los Padres (%s)"
 
-#: FamilyView.py:1480
+#: FamilyView.py:1483
 msgid "Attempt to Reorder Children Failed"
 msgstr "Fall el intento de reordenar los hijos"
 
-#: FamilyView.py:1481
+#: FamilyView.py:1484
 msgid "Children must be ordered by their birth dates."
 msgstr "Los hijos deben estar ordenados por fecha de nacimiento."
 
-#: FamilyView.py:1486
+#: FamilyView.py:1489
 msgid "Reorder children"
 msgstr "Reordenar hijos"
 
-#: FamilyView.py:1520
+#: FamilyView.py:1523
 msgid "Reorder spouses"
 msgstr "Reordenar cnyuges"
 
-#: GenericFilter.py:90
+#: GenericFilter.py:91
 msgid "Miscellaneous filters"
 msgstr "Filtros varios"
 
-#: GenericFilter.py:91 rule.glade:1165
+#: GenericFilter.py:92 rule.glade:1165
 msgid "No description"
 msgstr "Sin descripcin"
 
-#: GenericFilter.py:130
+#: GenericFilter.py:131
 msgid "Everyone"
 msgstr "Todos"
 
-#: GenericFilter.py:131 GenericFilter.py:146 GenericFilter.py:263
-#: GenericFilter.py:277 GenericFilter.py:295 GenericFilter.py:312
-#: GenericFilter.py:327 GenericFilter.py:342 GenericFilter.py:969
-#: GenericFilter.py:1218 GenericFilter.py:1243 GenericFilter.py:1273
-#: GenericFilter.py:1306 GenericFilter.py:1324 GenericFilter.py:1346
-#: GenericFilter.py:1431 GenericFilter.py:1489 GenericFilter.py:1554
-#: GenericFilter.py:1574 GenericFilter.py:1645 GenericFilter.py:1810
-msgid "General filters"
-msgstr "Filtros generales"
-
-#: GenericFilter.py:132
+#: GenericFilter.py:133
 msgid "Matches everyone in the database"
 msgstr "Concide con todos las personas de la base de datos"
 
-#: GenericFilter.py:145
+#: GenericFilter.py:146
 msgid "Disconnected people"
 msgstr "Personas desconectadas"
 
-#: GenericFilter.py:147
+#: GenericFilter.py:148
 msgid ""
 "Matches people that have no family relationships to any other person in the "
 "database"
@@ -1202,11 +1226,11 @@ msgstr ""
 "Coincide con las personas que no tienen relaciones familiares con ninguna "
 "otra persona de la base de datos"
 
-#: GenericFilter.py:164 GenericFilter.py:260 GenericFilter.py:357
-#: GenericFilter.py:448 GenericFilter.py:492 GenericFilter.py:614
-#: GenericFilter.py:661 GenericFilter.py:759 GenericFilter.py:811
-#: GenericFilter.py:898 gramps.glade:3363 gramps.glade:19187
-#: gramps.glade:21375 gramps.glade:22772 plugins/FilterEditor.py:680
+#: GenericFilter.py:164 GenericFilter.py:260 GenericFilter.py:368
+#: GenericFilter.py:459 GenericFilter.py:502 GenericFilter.py:623
+#: GenericFilter.py:670 GenericFilter.py:768 GenericFilter.py:820
+#: GenericFilter.py:907 gramps.glade:3521 gramps.glade:20666
+#: gramps.glade:23027 gramps.glade:24539 plugins/FilterEditor.py:680
 msgid "ID:"
 msgstr "ID:"
 
@@ -1242,81 +1266,81 @@ msgstr "Persona inicial"
 msgid "Matches the default person"
 msgstr "Coincide con la personal inicial"
 
-#: GenericFilter.py:294
+#: GenericFilter.py:299
 msgid "Bookmarked people"
 msgstr "Personas en Favoritos"
 
-#: GenericFilter.py:296
+#: GenericFilter.py:301
 msgid "Matches the people on the bookmark list"
 msgstr "Concide con las personas de la lista de marcadores"
 
-#: GenericFilter.py:311
+#: GenericFilter.py:322
 msgid "People with complete records"
 msgstr "Personas con registros completos"
 
-#: GenericFilter.py:313
+#: GenericFilter.py:324
 msgid "Matches all people whose records are complete"
 msgstr "Coincide con todas las personas con registros completos"
 
-#: GenericFilter.py:326 gramps_main.py:957 plugins/Summary.py:113
+#: GenericFilter.py:337 gramps_main.py:957 plugins/Summary.py:113
 msgid "Females"
 msgstr "Mujeres"
 
-#: GenericFilter.py:328
+#: GenericFilter.py:339
 msgid "Matches all females"
 msgstr "Mujeres"
 
-#: GenericFilter.py:341 gramps_main.py:967
+#: GenericFilter.py:352 gramps_main.py:967
 msgid "People with unknown gender"
 msgstr "Personas de sexo desconocido"
 
-#: GenericFilter.py:343
+#: GenericFilter.py:354
 msgid "Matches all people with unknown gender"
 msgstr "Coincide con todas las personas de sexo desconocido"
 
-#: GenericFilter.py:357 GenericFilter.py:406 GenericFilter.py:661
-#: GenericFilter.py:716 plugins/FilterEditor.py:692
+#: GenericFilter.py:368 GenericFilter.py:416 GenericFilter.py:670
+#: GenericFilter.py:724 plugins/FilterEditor.py:692
 msgid "Inclusive:"
 msgstr "Inclusive:"
 
-#: GenericFilter.py:358
+#: GenericFilter.py:369
 msgid "Descendants of "
 msgstr "Descendientes de "
 
-#: GenericFilter.py:359 GenericFilter.py:408 GenericFilter.py:450
-#: GenericFilter.py:494 GenericFilter.py:616
+#: GenericFilter.py:370 GenericFilter.py:418 GenericFilter.py:461
+#: GenericFilter.py:504 GenericFilter.py:625
 msgid "Descendant filters"
 msgstr "Filtros de descendientes"
 
-#: GenericFilter.py:360
+#: GenericFilter.py:371
 msgid "Matches all descendants for the specified person"
 msgstr "Todos los descendientes de la persona especificada"
 
-#: GenericFilter.py:406 GenericFilter.py:535 GenericFilter.py:573
-#: GenericFilter.py:716 GenericFilter.py:861 GenericFilter.py:941
+#: GenericFilter.py:416 GenericFilter.py:544 GenericFilter.py:582
+#: GenericFilter.py:724 GenericFilter.py:870 GenericFilter.py:951
 #: GenericFilter.py:1343 GenericFilter.py:1386 plugins/FilterEditor.py:684
 msgid "Filter name:"
 msgstr "Nombre del filtro:"
 
-#: GenericFilter.py:407
+#: GenericFilter.py:417
 msgid "Descendants of  match"
 msgstr "Descendientes de las personas que coinciden con "
 
-#: GenericFilter.py:409
+#: GenericFilter.py:419
 msgid "Matches people that are descendants of anybody matched by a filter"
 msgstr "Coincide con los descendientes de alguien que coincide con un filtro"
 
-#: GenericFilter.py:448 GenericFilter.py:492 GenericFilter.py:759
-#: GenericFilter.py:811 plugins/FilterEditor.py:678
+#: GenericFilter.py:459 GenericFilter.py:502 GenericFilter.py:768
+#: GenericFilter.py:820 plugins/FilterEditor.py:678
 msgid "Number of generations:"
 msgstr "Nmero de generaciones:"
 
-#: GenericFilter.py:449
+#: GenericFilter.py:460
 msgid "Descendants of  not more than  generations away"
 msgstr ""
 "Es descendiente de una  a no ms de  generaciones de distancia"
 
-#: GenericFilter.py:451
+#: GenericFilter.py:462
 msgid ""
 "Matches people that are descendants of a specified person not more than N "
 "generations away"
@@ -1324,12 +1348,12 @@ msgstr ""
 "Coincide con los descendientes de una persona especficada a no ms de N "
 "generaciones de distancia"
 
-#: GenericFilter.py:493
+#: GenericFilter.py:503
 msgid "Descendants of  at least  generations away"
 msgstr ""
 "Descendientes de una  al menos a  generaciones de distancia"
 
-#: GenericFilter.py:495
+#: GenericFilter.py:505
 msgid ""
 "Matches people that are descendants of a specified person at least N "
 "generations away"
@@ -1337,34 +1361,34 @@ msgstr ""
 "Coincide con los descendientes de una persona especficada al menos a N "
 "generaciones de distancia"
 
-#: GenericFilter.py:536
+#: GenericFilter.py:545
 msgid "Children of  match"
 msgstr "Hijos de las personas que coinciden con "
 
-#: GenericFilter.py:537 GenericFilter.py:575 GenericFilter.py:863
-#: GenericFilter.py:1088 GenericFilter.py:1389 GenericFilter.py:1413
-#: GenericFilter.py:1445 GenericFilter.py:1461 GenericFilter.py:1475
+#: GenericFilter.py:546 GenericFilter.py:584 GenericFilter.py:872
+#: GenericFilter.py:1096 GenericFilter.py:1389 GenericFilter.py:1412
+#: GenericFilter.py:1442 GenericFilter.py:1457 GenericFilter.py:1470
 msgid "Family filters"
 msgstr "Filtros de familia"
 
-#: GenericFilter.py:538
+#: GenericFilter.py:547
 msgid "Matches children of anybody matched by a filter"
 msgstr "Coincide con los hijos o hijas de alguien que coincide con un filtro"
 
-#: GenericFilter.py:574
+#: GenericFilter.py:583
 msgid "Siblings of  match"
 msgstr "Hermanos y hermanas de alguien que coincide con "
 
-#: GenericFilter.py:576
+#: GenericFilter.py:585
 msgid "Matches siblings of anybody matched by a filter"
 msgstr ""
 "Coincide con los hermanos o hermanas de alguien que coincide con un filtro"
 
-#: GenericFilter.py:615
+#: GenericFilter.py:624
 msgid "Descendant family members of "
 msgstr "Miembros de las familias descendientes de una "
 
-#: GenericFilter.py:617
+#: GenericFilter.py:626
 msgid ""
 "Matches people that are descendants or the spouse of a descendant of a "
 "specified person"
@@ -1372,33 +1396,33 @@ msgstr ""
 "Coincide con los descendientes o cnyuges de los descendientes de una "
 "persona especificada"
 
-#: GenericFilter.py:662
+#: GenericFilter.py:671
 msgid "Ancestors of "
-msgstr "Ascendientes de una "
+msgstr "Ascendientes de una "
 
-#: GenericFilter.py:663 GenericFilter.py:718 GenericFilter.py:761
-#: GenericFilter.py:813 GenericFilter.py:900 GenericFilter.py:945
+#: GenericFilter.py:672 GenericFilter.py:726 GenericFilter.py:770
+#: GenericFilter.py:822 GenericFilter.py:909 GenericFilter.py:955
 msgid "Ancestral filters"
 msgstr "Filtros por ascendencia"
 
-#: GenericFilter.py:664
+#: GenericFilter.py:673
 msgid "Matches people that are ancestors of a specified person"
 msgstr "Ascendientes de la persona especificada"
 
-#: GenericFilter.py:717
+#: GenericFilter.py:725
 msgid "Ancestors of  match"
 msgstr "Ascendientes de alguien que coincide con "
 
-#: GenericFilter.py:719
+#: GenericFilter.py:727
 msgid "Matches people that are ancestors of anybody matched by a filter"
 msgstr "Coincide con los ascendientes de alguien que coincide con un filtro"
 
-#: GenericFilter.py:760
+#: GenericFilter.py:769
 msgid "Ancestors of  not more than  generations away"
 msgstr ""
 "Ascendientes de una  a no ms de  generaciones de distancia"
 
-#: GenericFilter.py:762
+#: GenericFilter.py:771
 msgid ""
 "Matches people that are ancestors of a specified person not more than N "
 "generations away"
@@ -1406,11 +1430,11 @@ msgstr ""
 "Coincide con los ascendientes de una persona especficada a no ms de N "
 "generaciones de distancia"
 
-#: GenericFilter.py:812
+#: GenericFilter.py:821
 msgid "Ancestors of  at least  generations away"
 msgstr "Ascendientes de una  al menos a  generaciones de distancia"
 
-#: GenericFilter.py:814
+#: GenericFilter.py:823
 msgid ""
 "Matches people that are ancestors of a specified person at least N "
 "generations away"
@@ -1418,205 +1442,205 @@ msgstr ""
 "Coincide con los ascendientes de una persona especficada al menos a N "
 "generaciones de distancia"
 
-#: GenericFilter.py:862
+#: GenericFilter.py:871
 msgid "Parents of  match"
 msgstr "Padres y madres de los que coinciden con "
 
-#: GenericFilter.py:864
+#: GenericFilter.py:873
 msgid "Matches parents of anybody matched by a filter"
 msgstr "Coincide con los progenitores de los que coinciden con un filtro"
 
-#: GenericFilter.py:899
+#: GenericFilter.py:908
 msgid "People with a common ancestor with "
 msgstr "Personas con un ascendiente comn con una "
 
-#: GenericFilter.py:901
+#: GenericFilter.py:910
 msgid "Matches people that have a common ancestor with a specified person"
 msgstr ""
 "Coincide con las personas con un ascendiente comn con la persona "
 "especificada"
 
-#: GenericFilter.py:942
+#: GenericFilter.py:952
 msgid "People with a common ancestor with  match"
 msgstr "Personas con un ascendiente comn con los que coinciden con "
 
-#: GenericFilter.py:943
+#: GenericFilter.py:953
 msgid ""
 "Matches people that have a common ancestor with anybody matched by a filter"
 msgstr ""
 "Coincide con las personas qie tienen un ascendiente comn con alguien que "
 "coincide con un filtro"
 
-#: GenericFilter.py:968 gramps_main.py:962 plugins/Summary.py:112
+#: GenericFilter.py:978 gramps_main.py:962 plugins/Summary.py:112
 msgid "Males"
 msgstr "Hombres"
 
-#: GenericFilter.py:970
+#: GenericFilter.py:980
 msgid "Matches all males"
 msgstr "Hombres"
 
-#: GenericFilter.py:983 GenericFilter.py:1586 plugins/FilterEditor.py:58
+#: GenericFilter.py:993 GenericFilter.py:1575 plugins/FilterEditor.py:58
 msgid "Personal event:"
 msgstr "Evento personal:"
 
-#: GenericFilter.py:984 GenericFilter.py:1034 GenericFilter.py:1135
-#: GenericFilter.py:1175 gramps.glade:8536 gramps.glade:9462
-#: gramps.glade:12160 gramps.glade:13667
+#: GenericFilter.py:994 GenericFilter.py:1043 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:9101 gramps.glade:10129
+#: gramps.glade:13053 gramps.glade:14701
 msgid "Date:"
 msgstr "Fecha:"
 
-#: GenericFilter.py:985 GenericFilter.py:1035 GenericFilter.py:1135
-#: GenericFilter.py:1175 gramps.glade:8488 gramps.glade:13715
+#: GenericFilter.py:995 GenericFilter.py:1044 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:9045 gramps.glade:14757
 #: plugins/FilterEditor.py:676
 msgid "Place:"
 msgstr "Lugar:"
 
-#: GenericFilter.py:986 GenericFilter.py:1036 GenericFilter.py:1135
-#: GenericFilter.py:1175 gramps.glade:8440 gramps.glade:10680
-#: gramps.glade:12256 gramps.glade:15790
+#: GenericFilter.py:996 GenericFilter.py:1045 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:8989 gramps.glade:11453
+#: gramps.glade:13165 gramps.glade:16998
 msgid "Description:"
 msgstr "Descripcin:"
 
-#: GenericFilter.py:987
+#: GenericFilter.py:997
 msgid "People with the personal "
 msgstr "Personas con el  personal"
 
-#: GenericFilter.py:988
+#: GenericFilter.py:998
 msgid "Matches people with a personal event of a particular value"
 msgstr ""
 "Coincide con las personas con un evento personal de un valor particular"
 
-#: GenericFilter.py:989 GenericFilter.py:1039 GenericFilter.py:1138
-#: GenericFilter.py:1178 GenericFilter.py:1509 GenericFilter.py:1530
-#: GenericFilter.py:1589
+#: GenericFilter.py:999 GenericFilter.py:1048 GenericFilter.py:1145
+#: GenericFilter.py:1184 GenericFilter.py:1502 GenericFilter.py:1522
+#: GenericFilter.py:1578
 msgid "Event filters"
 msgstr "Filtros por eventos"
 
-#: GenericFilter.py:1033 GenericFilter.py:1586 plugins/FilterEditor.py:59
+#: GenericFilter.py:1042 GenericFilter.py:1575 plugins/FilterEditor.py:59
 msgid "Family event:"
 msgstr "Evento familiar:"
 
-#: GenericFilter.py:1037
+#: GenericFilter.py:1046
 msgid "People with the family "
 msgstr "Personas con el  familiar"
 
-#: GenericFilter.py:1038
+#: GenericFilter.py:1047
 msgid "Matches people with a family event of a particular value"
 msgstr ""
 "Coincide con las personas con un evento familiar de un valor particular"
 
-#: GenericFilter.py:1083
+#: GenericFilter.py:1091
 msgid "Number of relationships:"
 msgstr "Nmero de relaciones:"
 
-#: GenericFilter.py:1084 plugins/FilterEditor.py:65
+#: GenericFilter.py:1092 plugins/FilterEditor.py:65
 msgid "Relationship type:"
 msgstr "Tipo de relacin:"
 
-#: GenericFilter.py:1085
+#: GenericFilter.py:1093
 msgid "Number of children:"
 msgstr "Nmero de hijos:"
 
-#: GenericFilter.py:1086
+#: GenericFilter.py:1094
 msgid "People with the "
 msgstr "Personas con las "
 
-#: GenericFilter.py:1087
+#: GenericFilter.py:1095
 msgid "Matches people with a particular relationship"
 msgstr "Concide con las personas que tienen ciertas relaciones"
 
-#: GenericFilter.py:1136
+#: GenericFilter.py:1143
 msgid "People with the "
 msgstr "Personas nacidas en "
 
-#: GenericFilter.py:1137
+#: GenericFilter.py:1144
 msgid "Matches people with birth data of a particular value"
 msgstr ""
 "Coincide con las personas cuyos datos de nacimiento tienen un valor "
 "particular"
 
-#: GenericFilter.py:1176
+#: GenericFilter.py:1182
 msgid "People with the "
 msgstr "Personas fallecidas en "
 
-#: GenericFilter.py:1177
+#: GenericFilter.py:1183
 msgid "Matches people with death data of a particular value"
 msgstr ""
 "Coincide con las personas cuyos datos de fallecimiento tienen un valor "
 "particular"
 
-#: GenericFilter.py:1215 GenericFilter.py:1240 gramps.glade:9050
-#: gramps.glade:22103 gramps.glade:23110
+#: GenericFilter.py:1220 GenericFilter.py:1244 gramps.glade:9674
+#: gramps.glade:23827 gramps.glade:24909
 msgid "Value:"
 msgstr "Valor:"
 
-#: GenericFilter.py:1215 plugins/FilterEditor.py:60
+#: GenericFilter.py:1220 plugins/FilterEditor.py:60
 msgid "Personal attribute:"
 msgstr "Atributo personal:"
 
-#: GenericFilter.py:1216
+#: GenericFilter.py:1221
 msgid "People with the personal "
 msgstr "Personas con el  personal"
 
-#: GenericFilter.py:1217
+#: GenericFilter.py:1222
 msgid "Matches people with the personal attribute of a particular value"
 msgstr ""
 "Coincide con las personas con un atributo personal de un valor particular"
 
-#: GenericFilter.py:1240 plugins/FilterEditor.py:61
+#: GenericFilter.py:1244 plugins/FilterEditor.py:61
 msgid "Family attribute:"
 msgstr "Atributo familiar:"
 
-#: GenericFilter.py:1241
+#: GenericFilter.py:1245
 msgid "People with the family "
 msgstr "Personas con el  familiar"
 
-#: GenericFilter.py:1242
+#: GenericFilter.py:1246
 msgid "Matches people with the family attribute of a particular value"
 msgstr ""
 "Coincide con las personas con un atributo familiar de un valor particular"
 
-#: GenericFilter.py:1267 gramps.glade:7894
+#: GenericFilter.py:1270 gramps.glade:8380
 msgid "Given name:"
 msgstr "Nombre:"
 
-#: GenericFilter.py:1268 gramps.glade:7870
+#: GenericFilter.py:1271 gramps.glade:8352
 msgid "Family name:"
 msgstr "Apellidos:"
 
-#: GenericFilter.py:1269 gramps.glade:7846
+#: GenericFilter.py:1272 gramps.glade:8324
 msgid "Suffix:"
 msgstr "Sufijo:"
 
-#: GenericFilter.py:1270 gramps.glade:3457 gramps.glade:7918
-#: gramps.glade:19281 gramps.glade:21520 gramps.glade:30990
+#: GenericFilter.py:1273 gramps.glade:3631 gramps.glade:8408
+#: gramps.glade:20776 gramps.glade:23196 gramps.glade:33293
 #: mergedata.glade:874 mergedata.glade:896
 msgid "Title:"
 msgstr "Ttulo:"
 
-#: GenericFilter.py:1271
+#: GenericFilter.py:1274
 msgid "People with the "
 msgstr "Personas de "
 
-#: GenericFilter.py:1272 GenericFilter.py:1305
+#: GenericFilter.py:1275 GenericFilter.py:1307
 msgid "Matches people with a specified (partial) name"
 msgstr ""
 "Coincide con las personas cuyo nombre tiene partes que coinciden con las "
 "especificadas"
 
-#: GenericFilter.py:1303 GenericFilter.py:1640
+#: GenericFilter.py:1305 GenericFilter.py:1629
 msgid "Substring:"
 msgstr "Subcadena:"
 
-#: GenericFilter.py:1304
+#: GenericFilter.py:1306
 msgid "People matching the "
 msgstr "Personas cuyo nombre contiene "
 
-#: GenericFilter.py:1322 gramps_main.py:992
+#: GenericFilter.py:1323 gramps_main.py:992
 msgid "People with incomplete names"
 msgstr "Personas con nombres incompletos"
 
-#: GenericFilter.py:1323
+#: GenericFilter.py:1324
 msgid "Matches people with firstname or lastname missing"
 msgstr "Coincide con las personas sin nombre o sin apellidos"
 
@@ -1637,131 +1661,131 @@ msgid "Matches people married to anybody matching a filter"
 msgstr ""
 "Coincide con las personas casadas con alguien que coincide con un filtro"
 
-#: GenericFilter.py:1411 gramps_main.py:982
+#: GenericFilter.py:1410 gramps_main.py:982
 msgid "Adopted people"
 msgstr "Adoptados"
 
-#: GenericFilter.py:1412
+#: GenericFilter.py:1411
 msgid "Matches people who were adopted"
 msgstr "Coincide con las personas que fueron adoptadas"
 
-#: GenericFilter.py:1429 gramps_main.py:987
+#: GenericFilter.py:1427 gramps_main.py:987
 msgid "People with images"
 msgstr "Personas que tienen imgenes"
 
-#: GenericFilter.py:1430
+#: GenericFilter.py:1428
 msgid "Matches people with images in the gallery"
 msgstr "Coincide con las personas que tienen imgenes en la galera"
 
-#: GenericFilter.py:1443 gramps_main.py:997
+#: GenericFilter.py:1440 gramps_main.py:997
 msgid "People with children"
 msgstr "Personas con hijos"
 
-#: GenericFilter.py:1444
+#: GenericFilter.py:1441
 msgid "Matches people who have children"
 msgstr "Personas con hijos"
 
-#: GenericFilter.py:1459 gramps_main.py:1002
+#: GenericFilter.py:1455 gramps_main.py:1002
 msgid "People with no marriage records"
 msgstr "Personas sin matrimonios"
 
-#: GenericFilter.py:1460
+#: GenericFilter.py:1456
 msgid "Matches people who have no spouse"
 msgstr "Personas sin cnyuges"
 
-#: GenericFilter.py:1473 gramps_main.py:1007
+#: GenericFilter.py:1468 gramps_main.py:1007
 msgid "People with multiple marriage records"
 msgstr "Personas con varios matrimonios"
 
-#: GenericFilter.py:1474
+#: GenericFilter.py:1469
 msgid "Matches people who have more than one spouse"
 msgstr "Personas con ms de un cnyuge"
 
-#: GenericFilter.py:1487 gramps_main.py:1012
+#: GenericFilter.py:1481 gramps_main.py:1012
 msgid "People without a known birth date"
 msgstr "Personas sin fecha de nacimiento conocida"
 
-#: GenericFilter.py:1488
+#: GenericFilter.py:1482
 msgid "Matches people without a known birthdate"
 msgstr "Coincide con las personas sin fecha de nacimiento conocida"
 
-#: GenericFilter.py:1507 gramps_main.py:1017
+#: GenericFilter.py:1500 gramps_main.py:1017
 msgid "People with incomplete events"
 msgstr "Personas con eventos incompletos"
 
-#: GenericFilter.py:1508
+#: GenericFilter.py:1501
 msgid "Matches people with missing date or place in an event"
 msgstr ""
 "Coincide con las personas que tienen eventos en los que no consta fecha o "
 "lugar"
 
-#: GenericFilter.py:1528 gramps_main.py:1022
+#: GenericFilter.py:1520 gramps_main.py:1022
 msgid "Families with incomplete events"
 msgstr "Familias con eventos incompletos"
 
-#: GenericFilter.py:1529
+#: GenericFilter.py:1521
 msgid "Matches people with missing date or place in an event of the family"
 msgstr ""
 "Coincide con las personas que tienen eventos en su familia en los que no "
 "consta fecha o lugar"
 
-#: GenericFilter.py:1551
+#: GenericFilter.py:1542
 msgid "On year:"
 msgstr "El ao:"
 
-#: GenericFilter.py:1552 gramps_main.py:1027
+#: GenericFilter.py:1543 gramps_main.py:1027
 msgid "People probably alive"
 msgstr "Personas probablemente vivas"
 
-#: GenericFilter.py:1553
+#: GenericFilter.py:1544
 msgid "Matches people without indications of death that are not too old"
 msgstr ""
 "Coincide con las personas sin datos de fallecimiento y que no son demasiado "
 "viejas"
 
-#: GenericFilter.py:1572 gramps_main.py:1032
+#: GenericFilter.py:1562 gramps_main.py:1032
 msgid "People marked private"
 msgstr "Personas marcadas como privadas"
 
-#: GenericFilter.py:1573
+#: GenericFilter.py:1563
 msgid "Matches people that are indicated as private"
 msgstr "Coincide con las personas marcadas como privadas"
 
-#: GenericFilter.py:1587 gramps.glade:25926 gramps_main.py:1037
+#: GenericFilter.py:1576 gramps.glade:27895 gramps_main.py:1037
 msgid "Witnesses"
 msgstr "Testigos"
 
-#: GenericFilter.py:1588
+#: GenericFilter.py:1577
 msgid "Matches people who are witnesses in any event"
 msgstr "Coincide con las personas testigos de algn evento"
 
-#: GenericFilter.py:1641 plugins/FilterEditor.py:694
+#: GenericFilter.py:1630 plugins/FilterEditor.py:694
 msgid "Case sensitive:"
 msgstr "Distincin maysculas/minsculas:"
 
-#: GenericFilter.py:1642 plugins/FilterEditor.py:696
+#: GenericFilter.py:1631 plugins/FilterEditor.py:696
 msgid "Regular-Expression matching:"
 msgstr "Tratar como expresin regular:"
 
-#: GenericFilter.py:1643
+#: GenericFilter.py:1632
 msgid "People with records containing "
 msgstr "Personas cuyos registros contienen una "
 
-#: GenericFilter.py:1644
+#: GenericFilter.py:1633
 msgid "Matches people whose records contain text matching a substring"
 msgstr "Personas que tienen algn registro cuyo texto contiene una cadena"
 
-#: GenericFilter.py:1808 plugins/FilterEditor.py:682
+#: GenericFilter.py:1799 plugins/FilterEditor.py:682
 msgid "Source ID:"
 msgstr "ID de la fuente:"
 
-#: GenericFilter.py:1809
+#: GenericFilter.py:1800
 msgid "People with the "
-msgstr "Personas que tienen la "
 
-#: GenericFilter.py:1811
+#: GenericFilter.py:1802
 msgid "Matches people who have a particular source"
-msgstr "Cncide con las personas que citan una cierta fuente"
+msgstr "Coincide con las personas que citan una cierta fuente"
 
 #: GrampsCfg.py:62
 msgid "Father's surname"
@@ -1775,7 +1799,7 @@ msgstr "Combinaci
 msgid "Icelandic style"
 msgstr "Estilo islndico"
 
-#: GrampsCfg.py:70 GrampsCfg.py:74 gramps.glade:7733 gramps.glade:21835
+#: GrampsCfg.py:70 GrampsCfg.py:74 gramps.glade:8195 gramps.glade:23539
 msgid "General"
 msgstr "General"
 
@@ -1827,19 +1851,19 @@ msgstr "Referencia a Objeto"
 msgid "Reference Editor"
 msgstr "Editor de Referencias"
 
-#: ImageSelect.py:828 ImageSelect.py:1191 MediaView.py:345
+#: ImageSelect.py:828 ImageSelect.py:1194 MediaView.py:345
 msgid "Edit Media Object"
 msgstr "Editar Objeto Audiovisual"
 
-#: ImageSelect.py:910
+#: ImageSelect.py:912
 msgid "Media Properties Editor"
 msgstr "Editor de Propiedades de Objeto"
 
-#: ImageSelect.py:1043
+#: ImageSelect.py:1047
 msgid "Properties Editor"
 msgstr "Editor de Propiedades"
 
-#: ImageSelect.py:1288
+#: ImageSelect.py:1291
 msgid "Remove Media Object"
 msgstr "Borrar Objeto Audiovisual"
 
@@ -1851,7 +1875,7 @@ msgstr "Editor de Lugares"
 msgid "Marriage/Relationship Editor"
 msgstr "Editor de Matrimonio/Relacin"
 
-#: Marriage.py:146 Marriage.py:805 Marriage.py:828 Utils.py:135
+#: Marriage.py:146 Marriage.py:805 Marriage.py:828 Utils.py:130
 msgid "%s and %s"
 msgstr "%s y %s"
 
@@ -1941,11 +1965,11 @@ msgstr "Comparar Personas"
 msgid "Alternate Names"
 msgstr "Nombres Alternativos"
 
-#: MergePeople.py:122 gramps.glade:8961 gramps.glade:12692
+#: MergePeople.py:122 gramps.glade:9573 gramps.glade:13652
 msgid "Events"
 msgstr "Eventos"
 
-#: MergePeople.py:129 PedView.py:693
+#: MergePeople.py:129 PedView.py:696
 msgid "Parents"
 msgstr "Padres"
 
@@ -1957,7 +1981,7 @@ msgstr "ID de la familia"
 msgid "No parents found"
 msgstr "No se encontraron los padres"
 
-#: MergePeople.py:140 PedView.py:598
+#: MergePeople.py:140 PedView.py:601
 msgid "Spouses"
 msgstr "Cnyuges"
 
@@ -1970,7 +1994,7 @@ msgstr "C
 msgid "Marriage"
 msgstr "Matrimonio"
 
-#: MergePeople.py:159 const.py:902
+#: MergePeople.py:159 const.py:909
 msgid "Child"
 msgstr "Hijo"
 
@@ -1978,7 +2002,7 @@ msgstr "Hijo"
 msgid "No spouses or children found"
 msgstr "No se encontraron cnyuges o hijos"
 
-#: MergePeople.py:165 gramps.glade:10111
+#: MergePeople.py:165 gramps.glade:10857
 msgid "Addresses"
 msgstr "Direcciones"
 
@@ -2054,27 +2078,27 @@ msgstr "sep."
 msgid "crem."
 msgstr "incin."
 
-#: PedView.py:379
+#: PedView.py:382
 msgid "Anchor"
 msgstr "Punto de anclaje"
 
-#: PedView.py:496
+#: PedView.py:499
 msgid "Double clicking will make %s the active person"
 msgstr "El pulsar dos veces har a %s la persona activada"
 
-#: PedView.py:563
+#: PedView.py:566
 msgid "Set anchor"
 msgstr "Anclar"
 
-#: PedView.py:564
+#: PedView.py:567
 msgid "Remove anchor"
 msgstr "Desanclar"
 
-#: PedView.py:629 plugins/WebPage.py:715
+#: PedView.py:632 plugins/WebPage.py:715
 msgid "Siblings"
 msgstr "Hermanos"
 
-#: PedView.py:659 plugins/FamilyGroup.py:400 plugins/IndivComplete.py:295
+#: PedView.py:662 plugins/FamilyGroup.py:400 plugins/IndivComplete.py:295
 #: plugins/IndivSummary.py:179 plugins/WebPage.py:674
 msgid "Children"
 msgstr "Hijos"
@@ -2088,7 +2112,7 @@ msgid "Cause of Death"
 msgstr "Causa de Muerte"
 
 #: PeopleView.py:83 WriteGedcom.py:329 gramps_main.py:952
-#: plugins/EventCmp.py:158 plugins/ExportVCalendar.py:81
+#: plugins/EventCmp.py:158 plugins/ExportVCalendar.py:82
 #: plugins/ExportVCard.py:84 plugins/GraphViz.py:513
 #: plugins/IndivComplete.py:510 plugins/StatisticsChart.py:827
 #: plugins/TimeLine.py:411 plugins/WebPage.py:1265 plugins/WriteFtree.py:86
@@ -2096,16 +2120,16 @@ msgstr "Causa de Muerte"
 msgid "Entire Database"
 msgstr "Toda la Base de Datos"
 
-#: PeopleView.py:267 gramps_main.py:1658
+#: PeopleView.py:260 gramps_main.py:1672
 msgid "Updating display..."
 msgstr "Actualizando la presentacin..."
 
-#: PeopleView.py:295 PlaceView.py:200 SourceView.py:189 gramps.glade:955
+#: PeopleView.py:288 PlaceView.py:203 SourceView.py:191 gramps.glade:956
 #: plugins/BookReport.py:832
 msgid "Edit"
 msgstr "Editar"
 
-#: PlaceView.py:49 PlaceView.py:119
+#: PlaceView.py:49 PlaceView.py:120
 msgid "Place Name"
 msgstr "Editor de Nombres"
 
@@ -2125,15 +2149,15 @@ msgstr "Longitud"
 msgid "Latitude"
 msgstr "Latitud"
 
-#: PlaceView.py:204
+#: PlaceView.py:207
 msgid "Place Menu"
 msgstr "Men de Lugares"
 
-#: PlaceView.py:251 SourceView.py:225 gramps_main.py:1454
+#: PlaceView.py:254 SourceView.py:227 gramps_main.py:1468
 msgid "Delete %s?"
 msgstr "Borrar %s?"
 
-#: PlaceView.py:252
+#: PlaceView.py:255
 msgid ""
 "This place is currently being used by at least one record in the database. "
 "Deleting it will remove it from the database and remove it from all records "
@@ -2142,15 +2166,15 @@ msgstr ""
 "Este lugar lo usa al menos un registro de la base de datos. Borrarlo lo "
 "eliminar de la base de datos y de todos los registros que lo referencian."
 
-#: PlaceView.py:256
+#: PlaceView.py:259
 msgid "_Delete Place"
 msgstr "_Borrar Lugar"
 
-#: PlaceView.py:287
+#: PlaceView.py:290
 msgid "Cannot merge places."
 msgstr "No se pudieron mezclar los lugares."
 
-#: PlaceView.py:288
+#: PlaceView.py:291
 msgid ""
 "Exactly two places must be selected to perform a merge. A second place can "
 "be selected by holding down the control key while clicking on the desired "
@@ -2170,13 +2194,13 @@ msgstr "Sin categorizar"
 
 #: PluginMgr.py:162 PluginMgr.py:163 PluginMgr.py:164 PluginMgr.py:189
 #: PluginMgr.py:191 PluginMgr.py:192 PluginMgr.py:223 PluginMgr.py:224
-#: PluginMgr.py:225 ReportUtils.py:1756 Witness.py:83 Witness.py:166
-#: const.py:234 const.py:247 const.py:493 const.py:506 gramps_main.py:1736
+#: PluginMgr.py:225 ReportUtils.py:1757 Witness.py:83 Witness.py:166
+#: const.py:234 const.py:247 const.py:493 gramps_main.py:1750
 #: plugins/Check.py:474 plugins/ScratchPad.py:78 plugins/WebPage.py:334
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: Plugins.py:125 gramps.glade:1396
+#: Plugins.py:125 gramps.glade:1427
 msgid "_Apply"
 msgstr "A_plicar"
 
@@ -2385,7 +2409,55 @@ msgstr ""
 "GRAMPS no ha podido mostrar el archivo de imagen.  Esto puede haber sido "
 "causado por un archivo corrupto."
 
+#: Relationship.py:268
+msgid "husband"
+msgstr "esposo"
+
+#: Relationship.py:270
+msgid "wife"
+msgstr "esposa"
+
+#: Relationship.py:272
+msgid "gender unknown|spouse"
+msgstr "cnyuge"
+
+#: Relationship.py:275
+msgid "unmarried|husband"
+msgstr "compaero"
+
 #: Relationship.py:277
+msgid "unmarried|wife"
+msgstr "compaera"
+
+#: Relationship.py:279
+msgid "gender unknown,unmarried|spouse"
+msgstr "pareja"
+
+#: Relationship.py:282
+msgid "male,civil union|partner"
+msgstr "compaero"
+
+#: Relationship.py:284
+msgid "female,civil union|partner"
+msgstr "compaera"
+
+#: Relationship.py:286
+msgid "gender unknown,civil union|partner"
+msgstr "pareja"
+
+#: Relationship.py:289
+msgid "male,unknown relation|partner"
+msgstr "compaero"
+
+#: Relationship.py:291
+msgid "female,unknown relation|partner"
+msgstr "compaera"
+
+#: Relationship.py:293
+msgid "gender unknown,unknown relation|partner"
+msgstr "pareja"
+
+#: Relationship.py:325
 msgid "Relationship loop detected"
 msgstr "Detectado un bucle en las relaciones"
 
@@ -2397,7 +2469,7 @@ msgstr "Plantilla por Defecto"
 msgid "User Defined Template"
 msgstr "Plantilla Definida por Usuario"
 
-#: Report.py:152 Report.py:172 Utils.py:279
+#: Report.py:152 Report.py:172 Utils.py:274
 msgid "default"
 msgstr "predefinido"
 
@@ -2605,8 +2677,8 @@ msgstr "Tama
 msgid "Height"
 msgstr "Alto"
 
-#: Report.py:1199 Report.py:1215 gramps.glade:20322 gramps.glade:20346
-#: gramps.glade:20370 gramps.glade:20802
+#: Report.py:1199 Report.py:1215 gramps.glade:21900 gramps.glade:21928
+#: gramps.glade:21956 gramps.glade:22416
 msgid "cm"
 msgstr "cm"
 
@@ -2669,25 +2741,25 @@ msgstr "_Sobreescribir"
 msgid "_Change filename"
 msgstr "_Modificar el nombre del archivo"
 
-#: ReportUtils.py:297 ReportUtils.py:298 Utils.py:170 Utils.py:172
+#: ReportUtils.py:297 ReportUtils.py:298 Utils.py:165 Utils.py:167
 msgid "Private"
 msgstr "Privado"
 
-#: ReportUtils.py:503 ReportUtils.py:1057 ReportUtils.py:1155
-#: ReportUtils.py:1446 ReportUtils.py:1539 plugins/DetAncestralReport.py:192
+#: ReportUtils.py:504 ReportUtils.py:1058 ReportUtils.py:1156
+#: ReportUtils.py:1447 ReportUtils.py:1540 plugins/DetAncestralReport.py:192
 #: plugins/DetAncestralReport.py:350 plugins/DetDescendantReport.py:216
 #: plugins/DetDescendantReport.py:371
 msgid "He"
 msgstr "l"
 
-#: ReportUtils.py:505 ReportUtils.py:1059 ReportUtils.py:1157
-#: ReportUtils.py:1448 ReportUtils.py:1541 plugins/DetAncestralReport.py:194
+#: ReportUtils.py:506 ReportUtils.py:1060 ReportUtils.py:1158
+#: ReportUtils.py:1449 ReportUtils.py:1542 plugins/DetAncestralReport.py:194
 #: plugins/DetAncestralReport.py:348 plugins/DetDescendantReport.py:218
 #: plugins/DetDescendantReport.py:369
 msgid "She"
 msgstr "Ella"
 
-#: ReportUtils.py:518
+#: ReportUtils.py:519
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died %(death_date)s in %(death_place)s%"
@@ -2697,7 +2769,7 @@ msgstr ""
 "(birth_endnotes)s y falleci el %(death_date)s en %(death_place)s%"
 "(death_endnotes)s."
 
-#: ReportUtils.py:527
+#: ReportUtils.py:528
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
@@ -2705,7 +2777,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s naci el %(birth_date)s en %(birth_place)s%"
 "(birth_endnotes)s y falleci el %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:536
+#: ReportUtils.py:537
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
@@ -2713,7 +2785,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s naci el %(birth_date)s en %(birth_place)s%"
 "(birth_endnotes)s y falleci en %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:544
+#: ReportUtils.py:545
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s."
@@ -2721,7 +2793,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s naci el %(birth_date)s en %(birth_place)s%"
 "(birth_endnotes)s."
 
-#: ReportUtils.py:552
+#: ReportUtils.py:553
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died %(death_date)s in %(death_place)s%(death_endnotes)s."
@@ -2729,7 +2801,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s naci el %(birth_date)s%(birth_endnotes)s y "
 "falleci el %(death_date)s en %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:561
+#: ReportUtils.py:562
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died %(death_date)s%(death_endnotes)s."
@@ -2737,7 +2809,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s naci el %(birth_date)s%(birth_endnotes)s y "
 "falleci el %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:570
+#: ReportUtils.py:571
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died in %(death_place)s%(death_endnotes)s."
@@ -2745,19 +2817,19 @@ msgstr ""
 "%(male_name)s%(endnotes)s naci el %(birth_date)s%(birth_endnotes)s y "
 "falleci en %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:578
+#: ReportUtils.py:579
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s naci el %(birth_date)s%(birth_endnotes)s."
 
-#: ReportUtils.py:586
+#: ReportUtils.py:587
 msgid ""
 "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and "
 "died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr ""
 "%(male_name)s%(endnotes)s naci en %(birth_place)s%(birth_endnotes)s y "
-"fallecin el %(death_date)s en %(death_place)s%(death_endnotes)s."
+"falleci el %(death_date)s en %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:595
+#: ReportUtils.py:596
 msgid ""
 "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and "
 "died %(death_date)s%(death_endnotes)s."
@@ -2765,7 +2837,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s naci en %(birth_place)s%(birth_endnotes)s y "
 "falleci el %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:604
+#: ReportUtils.py:605
 msgid ""
 "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and "
 "died in %(death_place)s%(death_endnotes)s."
@@ -2773,12 +2845,12 @@ msgstr ""
 "%(male_name)s%(endnotes)s naci en %(birth_place)s%(birth_endnotes)s y "
 "falleci en %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:612
+#: ReportUtils.py:613
 msgid ""
 "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s naci en %(birth_place)s%(birth_endnotes)s."
 
-#: ReportUtils.py:620
+#: ReportUtils.py:621
 msgid ""
 "%(male_name)s%(endnotes)s died %(death_date)s in %(death_place)s%"
 "(death_endnotes)s."
@@ -2786,21 +2858,21 @@ msgstr ""
 "%(male_name)s%(endnotes)s falleci el %(death_date)s en %(death_place)s%"
 "(death_endnotes)s."
 
-#: ReportUtils.py:626
+#: ReportUtils.py:627
 msgid "%(male_name)s%(endnotes)s died %(death_date)s%(death_endnotes)s."
 msgstr ""
 "%(male_name)s%(endnotes)s falleci el %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:633
+#: ReportUtils.py:634
 msgid "%(male_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s."
 msgstr ""
 "%(male_name)s%(endnotes)s falleci en %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:639
+#: ReportUtils.py:640
 msgid "%(male_name)s%(endnotes)s."
 msgstr "%(male_name)s%(endnotes)s."
 
-#: ReportUtils.py:646
+#: ReportUtils.py:647
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died %(death_date)s in %(death_place)s%"
@@ -2810,7 +2882,7 @@ msgstr ""
 "(birth_endnotes)s y falleci el %(death_date)s en %(death_place)s%"
 "(death_endnotes)s."
 
-#: ReportUtils.py:655
+#: ReportUtils.py:656
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
@@ -2818,7 +2890,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s naci el %(birth_date)s en %(birth_place)s%"
 "(birth_endnotes)s y falleci el %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:664
+#: ReportUtils.py:665
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
@@ -2826,7 +2898,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s naci el %(birth_date)s en %(birth_place)s%"
 "(birth_endnotes)s y falleci en %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:672
+#: ReportUtils.py:673
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s."
@@ -2834,7 +2906,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s naci el %(birth_date)s en %(birth_place)s%"
 "(birth_endnotes)s."
 
-#: ReportUtils.py:680
+#: ReportUtils.py:681
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died %(death_date)s in %(death_place)s%(death_endnotes)s."
@@ -2842,7 +2914,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s naci el %(birth_date)s%(birth_endnotes)s y "
 "falleci el %(death_date)s en %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:689
+#: ReportUtils.py:690
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died %(death_date)s%(death_endnotes)s."
@@ -2850,7 +2922,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s naci el %(birth_date)s%(birth_endnotes)s y "
 "falleci el %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:698
+#: ReportUtils.py:699
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died in %(death_place)s%(death_endnotes)s."
@@ -2858,11 +2930,11 @@ msgstr ""
 "%(female_name)s%(endnotes)s naci el %(birth_date)s%(birth_endnotes)s y "
 "falleci en %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:706
+#: ReportUtils.py:707
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s naci el %(birth_date)s%(birth_endnotes)s."
 
-#: ReportUtils.py:714
+#: ReportUtils.py:715
 msgid ""
 "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
 "and died %(death_date)s in %(death_place)s%(death_endnotes)s."
@@ -2870,7 +2942,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s naci en %(birth_place)s%(birth_endnotes)s y "
 "falleci el %(death_date)s en %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:723
+#: ReportUtils.py:724
 msgid ""
 "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
 "and died %(death_date)s%(death_endnotes)s."
@@ -2878,7 +2950,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s naci en %(birth_place)s%(birth_endnotes)s y "
 "falleci el %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:732
+#: ReportUtils.py:733
 msgid ""
 "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
 "and died in %(death_place)s%(death_endnotes)s."
@@ -2886,13 +2958,13 @@ msgstr ""
 "%(female_name)s%(endnotes)s naci en %(birth_place)s%(birth_endnotes)s y "
 "falleci en %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:740
+#: ReportUtils.py:741
 msgid ""
 "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s."
 msgstr ""
 "%(female_name)s%(endnotes)s naci en %(birth_place)s%(birth_endnotes)s."
 
-#: ReportUtils.py:748
+#: ReportUtils.py:749
 msgid ""
 "%(female_name)s%(endnotes)s died %(death_date)s in %(death_place)s%"
 "(death_endnotes)s."
@@ -2900,208 +2972,208 @@ msgstr ""
 "%(female_name)s%(endnotes)s falleci el %(death_date)s en %(death_place)s%"
 "(death_endnotes)s."
 
-#: ReportUtils.py:754
+#: ReportUtils.py:755
 msgid "%(female_name)s%(endnotes)s died %(death_date)s%(death_endnotes)s."
 msgstr ""
 "%(female_name)s%(endnotes)s falleci el %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:761
+#: ReportUtils.py:762
 msgid "%(female_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s."
 msgstr ""
 "%(female_name)s%(endnotes)s falleci en %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:767
+#: ReportUtils.py:768
 msgid "%(female_name)s%(endnotes)s."
 msgstr "%(female_name)s%(endnotes)s."
 
-#: ReportUtils.py:821
+#: ReportUtils.py:822
 msgid "He married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Se cas con %(spouse)s el %(date)s en %(place)s%(endnotes)s."
 
-#: ReportUtils.py:827
+#: ReportUtils.py:828
 msgid "She married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Se cas con %(spouse)s el %(date)s en %(place)s%(endnotes)s."
 
-#: ReportUtils.py:834
+#: ReportUtils.py:835
 msgid "He married %(spouse)s %(date)s%(endnotes)s."
 msgstr "Se cas con %(spouse)s el %(date)s%(endnotes)s."
 
-#: ReportUtils.py:839 ReportUtils.py:850
+#: ReportUtils.py:840 ReportUtils.py:851
 msgid "She married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Se cas con %(spouse)s en %(place)s%(endnotes)s."
 
-#: ReportUtils.py:845
+#: ReportUtils.py:846
 msgid "He married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Se cas con %(spouse)s en %(place)s%(endnotes)s."
 
-#: ReportUtils.py:856
+#: ReportUtils.py:857
 msgid "He married %(spouse)s%(endnotes)s."
 msgstr "Se cas con %(spouse)s%(endnotes)s."
 
-#: ReportUtils.py:860
+#: ReportUtils.py:861
 msgid "She married %(spouse)s%(endnotes)s."
 msgstr "Se cas con %(spouse)s%(endnotes)s."
 
-#: ReportUtils.py:866
+#: ReportUtils.py:867
 msgid "He also married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Tambin se cas con %(spouse)s el %(date)s en %(place)s%(endnotes)s."
 
-#: ReportUtils.py:872
+#: ReportUtils.py:873
 msgid "She also married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Tambin se cas con %(spouse)s el %(date)s en %(place)s%(endnotes)s."
 
-#: ReportUtils.py:879
+#: ReportUtils.py:880
 msgid "He also married %(spouse)s %(date)s%(endnotes)s."
 msgstr "Tambin se cas con %(spouse)s el %(date)s%(endnotes)s."
 
-#: ReportUtils.py:884 ReportUtils.py:895
+#: ReportUtils.py:885 ReportUtils.py:896
 msgid "She also married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Tambin se cas con %(spouse)s en %(place)s%(endnotes)s."
 
-#: ReportUtils.py:890
+#: ReportUtils.py:891
 msgid "He also married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Tambin se cas con %(spouse)s en %(place)s%(endnotes)s."
 
-#: ReportUtils.py:901
+#: ReportUtils.py:902
 msgid "He also married %(spouse)s%(endnotes)s."
 msgstr "Tambin se cas con %(spouse)s%(endnotes)s."
 
-#: ReportUtils.py:905
+#: ReportUtils.py:906
 msgid "She also married %(spouse)s%(endnotes)s."
 msgstr "Tambin se cas con %(spouse)s%(endnotes)s."
 
-#: ReportUtils.py:926
+#: ReportUtils.py:927
 msgid "He married %(spouse)s."
 msgstr "Se cas con %(spouse)s."
 
-#: ReportUtils.py:928
+#: ReportUtils.py:929
 msgid "She married %(spouse)s."
 msgstr "Se cas con %(spouse)s."
 
-#: ReportUtils.py:931
+#: ReportUtils.py:932
 msgid "He had relationship with %(spouse)s."
 msgstr "Tuvo una relacin con %(spouse)s."
 
-#: ReportUtils.py:934
+#: ReportUtils.py:935
 msgid "She had relationship with %(spouse)s."
 msgstr "Tuvo una relacin con %(spouse)s."
 
-#: ReportUtils.py:939
+#: ReportUtils.py:940
 msgid "He also married %(spouse)s."
 msgstr "Tambin se cas con %(spouse)s."
 
-#: ReportUtils.py:941
+#: ReportUtils.py:942
 msgid "She also married %(spouse)s."
 msgstr "Tambin se cas con %(spouse)s."
 
-#: ReportUtils.py:944
+#: ReportUtils.py:945
 msgid "He also had relationship with %(spouse)s."
 msgstr "Tambin tuvo una relacin con %(spouse)s."
 
-#: ReportUtils.py:947
+#: ReportUtils.py:948
 msgid "She also had relationship with %(spouse)s."
 msgstr "Tambin tuvo una relacin con %(spouse)s."
 
-#: ReportUtils.py:978
+#: ReportUtils.py:979
 msgid "He was the son of %(father)s and %(mother)s."
 msgstr "Era hijo de %(father)s y de %(mother)s."
 
-#: ReportUtils.py:982
+#: ReportUtils.py:983
 msgid "He is the son of %(father)s and %(mother)s."
 msgstr "Es hijo de %(father)s y de %(mother)s."
 
-#: ReportUtils.py:987
+#: ReportUtils.py:988
 msgid "He was the son of %(mother)s."
 msgstr "Era hijo de %(mother)s."
 
-#: ReportUtils.py:990
+#: ReportUtils.py:991
 msgid "He is the son of %(mother)s."
 msgstr "Es hijo de %(mother)s."
 
-#: ReportUtils.py:994
+#: ReportUtils.py:995
 msgid "He was the son of %(father)s."
 msgstr "Era hijo de %(father)s."
 
-#: ReportUtils.py:997
+#: ReportUtils.py:998
 msgid "He is the son of %(father)s."
 msgstr "Es hijo de %(father)s."
 
-#: ReportUtils.py:1002
+#: ReportUtils.py:1003
 msgid "She was the daughter of %(father)s and %(mother)s."
 msgstr "Era hija de %(father)s y de %(mother)s."
 
-#: ReportUtils.py:1006
+#: ReportUtils.py:1007
 msgid "She is the daughter of %(father)s and %(mother)s."
 msgstr "Es hija de %(father)s y de %(mother)s."
 
-#: ReportUtils.py:1011
+#: ReportUtils.py:1012
 msgid "She was the daughter of %(mother)s."
 msgstr "Era hija de %(mother)s."
 
-#: ReportUtils.py:1014
+#: ReportUtils.py:1015
 msgid "She is the daughter of %(mother)s."
 msgstr "Es hija de %(mother)s."
 
-#: ReportUtils.py:1018
+#: ReportUtils.py:1019
 msgid "She was the daughter of %(father)s."
 msgstr "Era hija de %(father)s."
 
-#: ReportUtils.py:1021
+#: ReportUtils.py:1022
 msgid "She is the daughter of %(father)s."
 msgstr "Es hija de %(father)s."
 
-#: ReportUtils.py:1069
+#: ReportUtils.py:1070
 msgid "%(male_name)s was born on %(birth_date)s in %(birth_place)s."
 msgstr "%(male_name)s naci el %(birth_date)s en %(birth_place)s."
 
-#: ReportUtils.py:1074
+#: ReportUtils.py:1075
 msgid "%(male_name)s was born on %(birth_date)s."
 msgstr "%(male_name)s naci el %(birth_date)s."
 
-#: ReportUtils.py:1078
+#: ReportUtils.py:1079
 msgid "%(male_name)s was born in %(month_year)s in %(birth_place)s."
 msgstr "%(male_name)s naci en %(month_year)s en %(birth_place)s."
 
-#: ReportUtils.py:1083
+#: ReportUtils.py:1084
 msgid "%(male_name)s was born in %(month_year)s."
 msgstr "%(male_name)s naci en %(month_year)s."
 
-#: ReportUtils.py:1087
+#: ReportUtils.py:1088
 msgid "%(male_name)s was born in %(birth_place)s."
 msgstr "%(male_name)s naci en %(birth_place)s."
 
-#: ReportUtils.py:1094
+#: ReportUtils.py:1095
 msgid "%(female_name)s was born on %(birth_date)s in %(birth_place)s."
 msgstr "%(female_name)s naci el %(birth_date)s en %(birth_place)s."
 
-#: ReportUtils.py:1099
+#: ReportUtils.py:1100
 msgid "%(female_name)s was born on %(birth_date)s."
 msgstr "%(female_name)s naci el %(birth_date)s."
 
-#: ReportUtils.py:1103
+#: ReportUtils.py:1104
 msgid "%(female_name)s was born in %(month_year)s in %(birth_place)s."
 msgstr "%(female_name)s naci en %(month_year)s en %(birth_place)s."
 
-#: ReportUtils.py:1108
+#: ReportUtils.py:1109
 msgid "%(female_name)s was born in %(month_year)s."
 msgstr "%(female_name)s naci en %(month_year)s."
 
-#: ReportUtils.py:1112
+#: ReportUtils.py:1113
 msgid "%(female_name)s was born in %(birth_place)s."
 msgstr "%(female_name)s naci en %(birth_place)s."
 
-#: ReportUtils.py:1168
+#: ReportUtils.py:1169
 msgid "%(male_name)s died on %(death_date)s in %(death_place)s."
 msgstr "%(male_name)s falleci el %(death_date)s en %(death_place)s."
 
-#: ReportUtils.py:1173
+#: ReportUtils.py:1174
 msgid ""
 "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)"
 "d years."
 msgstr ""
 "%(male_name)s falleci el %(death_date)s en %(death_place)s con %(age)d aos."
 
-#: ReportUtils.py:1180
+#: ReportUtils.py:1181
 msgid ""
 "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)"
 "d months."
@@ -3109,7 +3181,7 @@ msgstr ""
 "%(male_name)s falleci el %(death_date)s en %(death_place)s con %(age)d "
 "meses de edad."
 
-#: ReportUtils.py:1187
+#: ReportUtils.py:1188
 msgid ""
 "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)"
 "d days."
@@ -3117,27 +3189,27 @@ msgstr ""
 "%(male_name)s falleci el %(death_date)s en %(death_place)s con %(age)d das "
 "de edad."
 
-#: ReportUtils.py:1195
+#: ReportUtils.py:1196
 msgid "%(male_name)s died on %(death_date)s."
 msgstr "%(male_name)s falleci el %(death_date)s."
 
-#: ReportUtils.py:1198
+#: ReportUtils.py:1199
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d years."
 msgstr "%(male_name)s falleci el %(death_date)s a la edad de %(age)d aos."
 
-#: ReportUtils.py:1203
+#: ReportUtils.py:1204
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d months."
 msgstr "%(male_name)s falleci el %(death_date)s a la edad de %(age)d meses."
 
-#: ReportUtils.py:1208
+#: ReportUtils.py:1209
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d days."
 msgstr "%(male_name)s falleci el %(death_date)s a la edad de %(age)d das."
 
-#: ReportUtils.py:1215
+#: ReportUtils.py:1216
 msgid "%(male_name)s died in %(month_year)s in %(death_place)s."
 msgstr "%(male_name)s falleci en %(month_year)s en %(death_place)s."
 
-#: ReportUtils.py:1220
+#: ReportUtils.py:1221
 msgid ""
 "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)"
 "d years."
@@ -3145,7 +3217,7 @@ msgstr ""
 "%(male_name)s falleci en %(month_year)s en %(death_place)s a la edad de %"
 "(age)d aos."
 
-#: ReportUtils.py:1227
+#: ReportUtils.py:1228
 msgid ""
 "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)"
 "d months."
@@ -3153,7 +3225,7 @@ msgstr ""
 "%(male_name)s falleci en %(month_year)s en %(death_place)s a la edad de %"
 "(age)d meses."
 
-#: ReportUtils.py:1234
+#: ReportUtils.py:1235
 msgid ""
 "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)"
 "d days."
@@ -3161,55 +3233,55 @@ msgstr ""
 "%(male_name)s falleci en %(month_year)s en %(death_place)s a la edad de %"
 "(age)d das."
 
-#: ReportUtils.py:1242
+#: ReportUtils.py:1243
 msgid "%(male_name)s died in %(month_year)s."
 msgstr "%(male_name)s falleci en %(month_year)s."
 
-#: ReportUtils.py:1245
+#: ReportUtils.py:1246
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d years."
 msgstr "%(male_name)s falleci en %(month_year)s a la edad de %(age)d aos."
 
-#: ReportUtils.py:1250
+#: ReportUtils.py:1251
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d months."
 msgstr "%(male_name)s falleci en %(month_year)s a la edad de %(age)d meses."
 
-#: ReportUtils.py:1255
+#: ReportUtils.py:1256
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d days."
 msgstr "%(male_name)s falleci en %(month_year)s a la edad de %(age)d das."
 
-#: ReportUtils.py:1262
+#: ReportUtils.py:1263
 msgid "%(male_name)s died in %(death_place)s."
 msgstr "%(male_name)s falleci en %(death_place)s."
 
-#: ReportUtils.py:1265
+#: ReportUtils.py:1266
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d years."
 msgstr "%(male_name)s falleci en %(death_place)s a la edad de %(age)d aos."
 
-#: ReportUtils.py:1270
+#: ReportUtils.py:1271
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d months."
 msgstr "%(male_name)s falleci en %(death_place)s a la edad de %(age)d meses."
 
-#: ReportUtils.py:1275
+#: ReportUtils.py:1276
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d days."
 msgstr "%(male_name)s falleci en %(death_place)s a la edad de %(age)d das."
 
-#: ReportUtils.py:1284
+#: ReportUtils.py:1285
 msgid "%(male_name)s died at the age of %(age)d years."
 msgstr "%(male_name)s falleci a la edad de %(age)d aos."
 
-#: ReportUtils.py:1288
+#: ReportUtils.py:1289
 msgid "%(male_name)s died at the age of %(age)d months."
 msgstr "%(male_name)s falleci a la edad de %(age)d meses."
 
-#: ReportUtils.py:1292
+#: ReportUtils.py:1293
 msgid "%(male_name)s died at the age of %(age)d days."
 msgstr "%(male_name)s falleci a la edad de %(age)d das."
 
-#: ReportUtils.py:1299
+#: ReportUtils.py:1300
 msgid "%(female_name)s died on %(death_date)s in %(death_place)s."
 msgstr "%(female_name)s falleci el %(death_date)s en %(death_place)s."
 
-#: ReportUtils.py:1304
+#: ReportUtils.py:1305
 msgid ""
 "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %"
 "(age)d years."
@@ -3217,7 +3289,7 @@ msgstr ""
 "%(female_name)s falleci el %(death_date)s en %(death_place)s a la edad de %"
 "(age)d aos."
 
-#: ReportUtils.py:1311
+#: ReportUtils.py:1312
 msgid ""
 "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %"
 "(age)d months."
@@ -3225,7 +3297,7 @@ msgstr ""
 "%(female_name)s falleci el %(death_date)s en %(death_place)s a la edad de %"
 "(age)d meses."
 
-#: ReportUtils.py:1318
+#: ReportUtils.py:1319
 msgid ""
 "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %"
 "(age)d days."
@@ -3233,27 +3305,27 @@ msgstr ""
 "%(female_name)s falleci el %(death_date)s en %(death_place)s a la edad de %"
 "(age)d das."
 
-#: ReportUtils.py:1326
+#: ReportUtils.py:1327
 msgid "%(female_name)s died on %(death_date)s."
 msgstr "%(female_name)s falleci el %(death_date)s."
 
-#: ReportUtils.py:1329
+#: ReportUtils.py:1330
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d years."
 msgstr "%(female_name)s falleci el %(death_date)s a la edad de %(age)d aos."
 
-#: ReportUtils.py:1334
+#: ReportUtils.py:1335
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d months."
 msgstr "%(female_name)s falleci el %(death_date)s a la edad de %(age)d meses."
 
-#: ReportUtils.py:1339
+#: ReportUtils.py:1340
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d days."
 msgstr "%(female_name)s falleci el %(death_date)s a la edad de %(age)d das."
 
-#: ReportUtils.py:1346
+#: ReportUtils.py:1347
 msgid "%(female_name)s died in %(month_year)s in %(death_place)s."
 msgstr "%(female_name)s falleci en %(month_year)s en %(death_place)s."
 
-#: ReportUtils.py:1351
+#: ReportUtils.py:1352
 msgid ""
 "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %"
 "(age)d years."
@@ -3261,7 +3333,7 @@ msgstr ""
 "%(female_name)s falleci en %(month_year)s en %(death_place)s con %(age)d "
 "aos."
 
-#: ReportUtils.py:1358
+#: ReportUtils.py:1359
 msgid ""
 "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %"
 "(age)d months."
@@ -3269,7 +3341,7 @@ msgstr ""
 "%(female_name)s falleci en %(month_year)s en %(death_place)s con %(age)d "
 "meses de edad."
 
-#: ReportUtils.py:1365
+#: ReportUtils.py:1366
 msgid ""
 "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %"
 "(age)d days."
@@ -3277,102 +3349,102 @@ msgstr ""
 "%(female_name)s falleci en %(month_year)s en %(death_place)s con %(age)d "
 "das de edad."
 
-#: ReportUtils.py:1373
+#: ReportUtils.py:1374
 msgid "%(female_name)s died in %(month_year)s."
 msgstr "%(female_name)s falleci en %(month_year)s."
 
-#: ReportUtils.py:1376
+#: ReportUtils.py:1377
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d years."
 msgstr "%(female_name)s falleci en %(month_year)s con %(age)d aos."
 
-#: ReportUtils.py:1381
+#: ReportUtils.py:1382
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d months."
 msgstr "%(female_name)s falleci en %(month_year)s con %(age)d meses de edad."
 
-#: ReportUtils.py:1386
+#: ReportUtils.py:1387
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d days."
 msgstr "%(female_name)s falleci en %(month_year)s con %(age)d das de edad."
 
-#: ReportUtils.py:1393
+#: ReportUtils.py:1394
 msgid "%(female_name)s died in %(death_place)s."
 msgstr "%(female_name)s falleci en %(death_place)s."
 
-#: ReportUtils.py:1396
+#: ReportUtils.py:1397
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d years."
 msgstr "%(female_name)s falleci en %(death_place)s con %(age)d aos."
 
-#: ReportUtils.py:1401
+#: ReportUtils.py:1402
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d months."
 msgstr "%(female_name)s falleci en %(death_place)s con %(age)d meses de edad."
 
-#: ReportUtils.py:1406
+#: ReportUtils.py:1407
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d days."
 msgstr "%(female_name)s falleci en %(death_place)s con %(age)d das de edad."
 
-#: ReportUtils.py:1415
+#: ReportUtils.py:1416
 msgid "%(female_name)s died at the age of %(age)d years."
 msgstr "%(female_name)s falleci a los %(age)d aos."
 
-#: ReportUtils.py:1419
+#: ReportUtils.py:1420
 msgid "%(female_name)s died at the age of %(age)d months."
 msgstr "%(female_name)s falleci con %(age)d meses de edad."
 
-#: ReportUtils.py:1423
+#: ReportUtils.py:1424
 msgid "%(female_name)s died at the age of %(age)d days."
 msgstr "%(female_name)s falleci con %(age)d das de edad."
 
-#: ReportUtils.py:1476
+#: ReportUtils.py:1477
 msgid "%(male_name)s was buried on %(burial_date)s in %(burial_place)s."
 msgstr ""
 "%(male_name)s recibi sepultura el %(burial_date)s en %(burial_place)s."
 
-#: ReportUtils.py:1481
+#: ReportUtils.py:1482
 msgid "%(male_name)s was buried on %(burial_date)s."
 msgstr "%(male_name)s recibi sepultura el %(burial_date)s."
 
-#: ReportUtils.py:1485
+#: ReportUtils.py:1486
 msgid "%(male_name)s was buried in %(month_year)s in %(burial_place)s."
 msgstr "%(male_name)s recibi sepultura en %(month_year)s en %(burial_place)s."
 
-#: ReportUtils.py:1490
+#: ReportUtils.py:1491
 msgid "%(male_name)s was buried in %(month_year)s."
 msgstr "%(male_name)s recibi sepultura en %(month_year)s."
 
-#: ReportUtils.py:1494
+#: ReportUtils.py:1495
 msgid "%(male_name)s was buried in %(burial_place)s."
 msgstr "%(male_name)s recibi sepultura en %(burial_place)s."
 
-#: ReportUtils.py:1497
+#: ReportUtils.py:1498
 msgid "%(male_name)s was buried."
 msgstr "%(male_name)s recibi sepultura."
 
-#: ReportUtils.py:1502
+#: ReportUtils.py:1503
 msgid "%(female_name)s was buried on %(burial_date)s in %(burial_place)s."
 msgstr ""
 "%(female_name)s recibi sepultura el %(burial_date)s en %(burial_place)s."
 
-#: ReportUtils.py:1507
+#: ReportUtils.py:1508
 msgid "%(female_name)s was buried on %(burial_date)s."
 msgstr "%(female_name)s recibi sepultura el %(burial_date)s."
 
-#: ReportUtils.py:1511
+#: ReportUtils.py:1512
 msgid "%(female_name)s was buried in %(month_year)s in %(burial_place)s."
 msgstr ""
 "%(female_name)s recibi sepultura en %(month_year)s en %(burial_place)s."
 
-#: ReportUtils.py:1516
+#: ReportUtils.py:1517
 msgid "%(female_name)s was buried in %(month_year)s."
 msgstr "%(female_name)s recibi sepultura en %(month_year)s."
 
-#: ReportUtils.py:1520
+#: ReportUtils.py:1521
 msgid "%(female_name)s was buried in %(burial_place)s."
 msgstr "%(female_name)s recibi sepultura en %(burial_place)s."
 
-#: ReportUtils.py:1523
+#: ReportUtils.py:1524
 msgid "%(female_name)s was buried."
 msgstr "%(female_name)s recibi sepultura."
 
-#: ReportUtils.py:1553
+#: ReportUtils.py:1554
 msgid ""
 "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s %"
 "(death_place)s."
@@ -3380,77 +3452,77 @@ msgstr ""
 "%(male_name)s Naci: %(birth_date)s %(birth_place)s Falleci: %(death_date)s "
 "%(death_place)s."
 
-#: ReportUtils.py:1560
+#: ReportUtils.py:1561
 msgid ""
 "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s."
 msgstr ""
 "%(male_name)s Naci: %(birth_date)s %(birth_place)s Falleci: %(death_date)s."
 
-#: ReportUtils.py:1568
+#: ReportUtils.py:1569
 msgid ""
 "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_place)s."
 msgstr ""
 "%(male_name)s Naci: %(birth_date)s %(birth_place)s Falleci: %(death_place)"
 "s."
 
-#: ReportUtils.py:1575
+#: ReportUtils.py:1576
 msgid "%(male_name)s Born: %(birth_date)s %(birth_place)s."
 msgstr "%(male_name)s Naci: %(birth_date)s %(birth_place)s."
 
-#: ReportUtils.py:1582
+#: ReportUtils.py:1583
 msgid ""
 "%(male_name)s Born: %(birth_date)s Died: %(death_date)s %(death_place)s."
 msgstr ""
 "%(male_name)s Naci: %(birth_date)s Falleci: %(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1587
+#: ReportUtils.py:1588
 msgid "%(male_name)s Born: %(birth_date)s Died: %(death_date)s."
 msgstr "%(male_name)s Naci: %(birth_date)s Falleci: %(death_date)s."
 
-#: ReportUtils.py:1593
+#: ReportUtils.py:1594
 msgid "%(male_name)s Born: %(birth_date)s Died: %(death_place)s."
 msgstr "%(male_name)s Naci: %(birth_date)s Falleci: %(death_place)s."
 
-#: ReportUtils.py:1598
+#: ReportUtils.py:1599
 msgid "%(male_name)s Born: %(birth_date)s."
 msgstr "%(male_name)s Naci: %(birth_date)s."
 
-#: ReportUtils.py:1604
+#: ReportUtils.py:1605
 msgid ""
 "%(male_name)s Born: %(birth_place)s Died: %(death_date)s %(death_place)s."
 msgstr ""
 "%(male_name)s Naci: %(birth_place)s Falleci: %(death_date)s %(death_place)"
 "s."
 
-#: ReportUtils.py:1611
+#: ReportUtils.py:1612
 msgid "%(male_name)s Born: %(birth_place)s Died: %(death_date)s."
 msgstr "%(male_name)s Naci: %(birth_place)s Falleci: %(death_date)s."
 
-#: ReportUtils.py:1619
+#: ReportUtils.py:1620
 msgid "%(male_name)s Born: %(birth_place)s Died: %(death_place)s."
 msgstr "%(male_name)s Naci: %(birth_place)s Falleci: %(death_place)s."
 
-#: ReportUtils.py:1626
+#: ReportUtils.py:1627
 msgid "%(male_name)s Born: %(birth_place)s."
 msgstr "%(male_name)s Naci: %(birth_place)s."
 
-#: ReportUtils.py:1632
+#: ReportUtils.py:1633
 msgid "%(male_name)s Died: %(death_date)s %(death_place)s."
 msgstr "%(male_name)s Falleci: %(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1637
+#: ReportUtils.py:1638
 msgid "%(male_name)s Died: %(death_date)s."
 msgstr "%(male_name)s Falleci: %(death_date)s."
 
-#: ReportUtils.py:1642
+#: ReportUtils.py:1643
 msgid "%(male_name)s Died: %(death_place)s."
 msgstr "%(male_name)s Falleci: %(death_place)s."
 
-#: ReportUtils.py:1645
+#: ReportUtils.py:1646
 msgid "%(male_name)s."
 msgstr "%(male_name)s."
 
-#: ReportUtils.py:1652
+#: ReportUtils.py:1653
 msgid ""
 "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s %"
 "(death_place)s."
@@ -3458,101 +3530,101 @@ msgstr ""
 "%(female_name)s Naci: %(birth_date)s %(birth_place)s Falleci: %(death_date)"
 "s %(death_place)s."
 
-#: ReportUtils.py:1659
+#: ReportUtils.py:1660
 msgid ""
 "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s."
 msgstr ""
 "%(female_name)s Naci: %(birth_date)s %(birth_place)s Falleci: %(death_date)"
 "s."
 
-#: ReportUtils.py:1667
+#: ReportUtils.py:1668
 msgid ""
 "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_place)s."
 msgstr ""
 "%(female_name)s Naci: %(birth_date)s %(birth_place)s Falleci: %"
 "(death_place)s."
 
-#: ReportUtils.py:1674
+#: ReportUtils.py:1675
 msgid "%(female_name)s Born: %(birth_date)s %(birth_place)s."
 msgstr "%(female_name)s Naci: %(birth_date)s %(birth_place)s."
 
-#: ReportUtils.py:1681
+#: ReportUtils.py:1682
 msgid ""
 "%(female_name)s Born: %(birth_date)s Died: %(death_date)s %(death_place)s."
 msgstr ""
 "%(female_name)s Naci: %(birth_date)s Falleci: %(death_date)s %(death_place)"
 "s."
 
-#: ReportUtils.py:1686
+#: ReportUtils.py:1687
 msgid "%(female_name)s Born: %(birth_date)s Died: %(death_date)s."
 msgstr "%(female_name)s Naci: %(birth_date)s Falleci: %(death_date)s."
 
-#: ReportUtils.py:1692
+#: ReportUtils.py:1693
 msgid "%(female_name)s Born: %(birth_date)s Died: %(death_place)s."
 msgstr "%(female_name)s Naci: %(birth_date)s Falleci: %(death_place)s."
 
-#: ReportUtils.py:1697
+#: ReportUtils.py:1698
 msgid "%(female_name)s Born: %(birth_date)s."
 msgstr "%(female_name)s Naci: %(birth_date)s."
 
-#: ReportUtils.py:1703
+#: ReportUtils.py:1704
 msgid ""
 "%(female_name)s Born: %(birth_place)s Died: %(death_date)s %(death_place)s."
 msgstr ""
 "%(female_name)s Naci: %(birth_place)s Falleci: %(death_date)s %"
 "(death_place)s."
 
-#: ReportUtils.py:1710
+#: ReportUtils.py:1711
 msgid "%(female_name)s Born: %(birth_place)s Died: %(death_date)s."
 msgstr "%(female_name)s Naci: %(birth_place)s Falleci: %(death_date)s."
 
-#: ReportUtils.py:1718
+#: ReportUtils.py:1719
 msgid "%(female_name)s Born: %(birth_place)s Died: %(death_place)s."
 msgstr "%(female_name)s Naci: %(birth_place)s Falleci: %(death_place)s."
 
-#: ReportUtils.py:1725
+#: ReportUtils.py:1726
 msgid "%(female_name)s Born: %(birth_place)s."
 msgstr "%(female_name)s Naci: %(birth_place)s."
 
-#: ReportUtils.py:1731
+#: ReportUtils.py:1732
 msgid "%(female_name)s Died: %(death_date)s %(death_place)s."
 msgstr "%(female_name)s Falleci: %(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1736
+#: ReportUtils.py:1737
 msgid "%(female_name)s Died: %(death_date)s."
 msgstr "%(female_name)s Falleci: %(death_date)s."
 
-#: ReportUtils.py:1741
+#: ReportUtils.py:1742
 msgid "%(female_name)s Died: %(death_place)s."
 msgstr "%(female_name)s Falleci: %(death_place)s."
 
-#: ReportUtils.py:1744
+#: ReportUtils.py:1745
 msgid "%(female_name)s."
 msgstr "%(female_name)s."
 
-#: ReportUtils.py:1753 const.py:490 gramps.glade:4344
+#: ReportUtils.py:1754 const.py:490 gramps.glade:4582
 #: plugins/FamilyGroup.py:376 plugins/FamilyGroup.py:378
 msgid "Married"
 msgstr "Casados"
 
-#: ReportUtils.py:1754 const.py:491
+#: ReportUtils.py:1755 const.py:491
 msgid "Unmarried"
 msgstr "No casados"
 
-#: ReportUtils.py:1755 const.py:492
+#: ReportUtils.py:1756 const.py:492
 msgid "Civil Union"
 msgstr "Unin civil"
 
-#: ReportUtils.py:1757 const.py:234 const.py:248 const.py:494
+#: ReportUtils.py:1758 const.py:234 const.py:248 const.py:494
 #: mergedata.glade:242
 msgid "Other"
 msgstr "Otro"
 
-#: SelectChild.py:288 SelectChild.py:307
+#: SelectChild.py:193 SelectChild.py:212
 msgid "A person cannot be linked as his/her own child"
 msgstr "Una persona no puede ser su propio hijo o hija"
 
-#: SelectChild.py:332
+#: SelectChild.py:237
 msgid "Add Child to Family (%s)"
 msgstr "Agregar Hijo a Familia (%s)"
 
@@ -3568,11 +3640,11 @@ msgstr "Abreviatura"
 msgid "Publication Information"
 msgstr "Informacin de la Publicacin"
 
-#: SourceView.py:193
+#: SourceView.py:195
 msgid "Source Menu"
 msgstr "Men de Fuente"
 
-#: SourceView.py:218
+#: SourceView.py:220
 msgid ""
 "This source is currently being used. Deleting it will remove it from the "
 "database and from all records that reference it."
@@ -3580,19 +3652,19 @@ msgstr ""
 "Esta fuente est en uso actualmente. Si la borra, se eliminar de la base de "
 "datos y de todos los registros que la referencian."
 
-#: SourceView.py:222
+#: SourceView.py:224
 msgid "Deleting source will remove it from the database."
 msgstr "Borrar la fuente la eliminar de la base de datos."
 
-#: SourceView.py:226
+#: SourceView.py:228
 msgid "_Delete Source"
 msgstr "_Borrar Fuente"
 
-#: SourceView.py:267
+#: SourceView.py:269
 msgid "Cannot merge sources."
 msgstr "No se pudieron mezclar las fuentes."
 
-#: SourceView.py:268
+#: SourceView.py:270
 msgid ""
 "Exactly two sources must be selected to perform a merge. A second source can "
 "be selected by holding down the control key while clicking on the desired "
@@ -3705,33 +3777,33 @@ msgstr ""
 "siguiente informacin.  Si no tiene pensado generar archivos GEDCOM, puede "
 "dejarlo en blanco."
 
-#: StartupDialog.py:243 gramps.glade:5910 gramps.glade:5981 gramps.glade:7774
-#: gramps.glade:8584 gramps.glade:9098 gramps.glade:9534 gramps.glade:12280
-#: gramps.glade:12775 plugins/soundex.glade:110
+#: StartupDialog.py:243 gramps.glade:6235 gramps.glade:6318 gramps.glade:8240
+#: gramps.glade:9157 gramps.glade:9730 gramps.glade:10213 gramps.glade:13193
+#: gramps.glade:13747 plugins/soundex.glade:110
 msgid "Name:"
 msgstr "Nombre:"
 
-#: StartupDialog.py:244 gramps.glade:9486 plugins/Ancestors.py:505
+#: StartupDialog.py:244 gramps.glade:10157 plugins/Ancestors.py:505
 msgid "Address:"
 msgstr "Direccin:"
 
-#: StartupDialog.py:245 gramps.glade:14682
+#: StartupDialog.py:245 gramps.glade:15804
 msgid "City:"
 msgstr "Ciudad:"
 
-#: StartupDialog.py:246 gramps.glade:9606
+#: StartupDialog.py:246 gramps.glade:10297
 msgid "State/Province:"
 msgstr "Estado/Provincia:"
 
-#: StartupDialog.py:247 gramps.glade:9510 gramps.glade:14730
+#: StartupDialog.py:247 gramps.glade:10185 gramps.glade:15860
 msgid "Country:"
 msgstr "Pas:"
 
-#: StartupDialog.py:248 gramps.glade:9582
+#: StartupDialog.py:248 gramps.glade:10269
 msgid "ZIP/Postal code:"
 msgstr "Cdigo postal:"
 
-#: StartupDialog.py:249 gramps.glade:9868 gramps.glade:14977
+#: StartupDialog.py:249 gramps.glade:10603 gramps.glade:16147
 msgid "Phone:"
 msgstr "Telfono:"
 
@@ -3810,7 +3882,7 @@ msgstr "Editor de Direcciones Internet"
 msgid "Internet Address Editor for %s"
 msgstr "Editor de Direcciones Internet para %s"
 
-#: Utils.py:72
+#: Utils.py:67
 msgid ""
 "The data can only be recovered by Undo operation or by quitting with "
 "abandoning changes."
@@ -3843,32 +3915,33 @@ msgstr ""
 "\n"
 "Intntelo de nuevo. El testigo no se ha modificado."
 
-#: WriteGedcom.py:333 plugins/DescendReport.py:116
-#: plugins/ExportVCalendar.py:85 plugins/ExportVCard.py:88
+#: WriteGedcom.py:334 plugins/DescendReport.py:116
+#: plugins/ExportVCalendar.py:87 plugins/ExportVCard.py:89
 #: plugins/FtmStyleDescendants.py:121 plugins/GraphViz.py:517
 #: plugins/IndivComplete.py:514 plugins/StatisticsChart.py:831
-#: plugins/TimeLine.py:415 plugins/WebPage.py:1269 plugins/WriteFtree.py:90
-#: plugins/WriteGeneWeb.py:91
+#: plugins/TimeLine.py:415 plugins/WebPage.py:1269 plugins/WriteFtree.py:91
+#: plugins/WriteGeneWeb.py:92
 msgid "Descendants of %s"
 msgstr "Descendientes de %s"
 
-#: WriteGedcom.py:337 plugins/Ancestors.py:141 plugins/ExportVCalendar.py:89
-#: plugins/ExportVCard.py:92 plugins/FtmStyleAncestors.py:96
+#: WriteGedcom.py:340 plugins/Ancestors.py:141 plugins/ExportVCalendar.py:93
+#: plugins/ExportVCard.py:95 plugins/FtmStyleAncestors.py:96
 #: plugins/GraphViz.py:521 plugins/IndivComplete.py:518
 #: plugins/StatisticsChart.py:835 plugins/TimeLine.py:419
-#: plugins/WebPage.py:1277 plugins/WriteFtree.py:94 plugins/WriteGeneWeb.py:95
+#: plugins/WebPage.py:1277 plugins/WriteFtree.py:97 plugins/WriteGeneWeb.py:98
 msgid "Ancestors of %s"
 msgstr "Ascendientes de %s"
 
-#: WriteGedcom.py:341 plugins/ExportVCalendar.py:93 plugins/ExportVCard.py:96
+#: WriteGedcom.py:346 plugins/ExportVCalendar.py:99 plugins/ExportVCard.py:101
 #: plugins/GraphViz.py:525 plugins/IndivComplete.py:522
 #: plugins/StatisticsChart.py:839 plugins/TimeLine.py:423
-#: plugins/WebPage.py:1281 plugins/WriteFtree.py:98 plugins/WriteGeneWeb.py:99
+#: plugins/WebPage.py:1281 plugins/WriteFtree.py:103
+#: plugins/WriteGeneWeb.py:104
 msgid "People with common ancestor with %s"
 msgstr "Personas con un ascendiente comn con %s"
 
-#: WriteGedcom.py:557 WriteGedcom.py:562 docgen/AbiWord2Doc.py:77
-#: docgen/AbiWord2Doc.py:80 docgen/AsciiDoc.py:113 docgen/AsciiDoc.py:116
+#: WriteGedcom.py:565 WriteGedcom.py:570 docgen/AbiWord2Doc.py:75
+#: docgen/AbiWord2Doc.py:78 docgen/AsciiDoc.py:113 docgen/AsciiDoc.py:116
 #: docgen/HtmlDoc.py:225 docgen/HtmlDoc.py:228 docgen/HtmlDoc.py:353
 #: docgen/HtmlDoc.py:356 docgen/LaTeXDoc.py:87 docgen/LaTeXDoc.py:90
 #: docgen/OpenSpreadSheet.py:76 docgen/OpenSpreadSheet.py:78
@@ -3877,18 +3950,18 @@ msgstr "Personas con un ascendiente com
 #: docgen/OpenSpreadSheet.py:436 docgen/OpenSpreadSheet.py:440
 #: docgen/PSDrawDoc.py:95 docgen/PSDrawDoc.py:98 docgen/PdfDoc.py:180
 #: docgen/RTFDoc.py:80 docgen/RTFDoc.py:83 docgen/SvgDrawDoc.py:75
-#: docgen/SvgDrawDoc.py:77 plugins/ExportVCalendar.py:168
-#: plugins/ExportVCalendar.py:172 plugins/ExportVCard.py:153
-#: plugins/ExportVCard.py:157 plugins/WriteGeneWeb.py:210
-#: plugins/WriteGeneWeb.py:214
+#: docgen/SvgDrawDoc.py:77 plugins/ExportVCalendar.py:178
+#: plugins/ExportVCalendar.py:182 plugins/ExportVCard.py:162
+#: plugins/ExportVCard.py:166 plugins/WriteGeneWeb.py:219
+#: plugins/WriteGeneWeb.py:223
 msgid "Could not create %s"
 msgstr "No se pudo crear %s"
 
-#: WriteGedcom.py:1252
+#: WriteGedcom.py:1272
 msgid "GE_DCOM"
 msgstr "GE_DCOM"
 
-#: WriteGedcom.py:1253
+#: WriteGedcom.py:1273
 msgid ""
 "GEDCOM is used to transfer data between genealogy programs. Most genealogy "
 "software will accept a GEDCOM file as input. "
@@ -3896,7 +3969,7 @@ msgstr ""
 "Se utiliza GEDCOM para transferir datos entre programas de genealoga. La "
 "mayora de los programas de genealoga pueden leer archivos GEDCOM. "
 
-#: WriteGedcom.py:1255
+#: WriteGedcom.py:1275
 msgid "GEDCOM export options"
 msgstr "Opciones de exportacin a GEDCOM"
 
@@ -4196,113 +4269,113 @@ msgstr "Relaci
 msgid "An unspecified relationship between a man and woman"
 msgstr "Una relacin no especificada ente un hombre y una mujer"
 
-#: const.py:515
+#: const.py:522
 msgid "Also Known As"
 msgstr "Tambin Conocido Como"
 
-#: const.py:516
+#: const.py:523
 msgid "Birth Name"
 msgstr "Nombre al Nacer"
 
-#: const.py:517
+#: const.py:524
 msgid "Married Name"
 msgstr "Nombre de Casada"
 
-#: const.py:518
+#: const.py:525
 msgid "Other Name"
 msgstr "Otro Nombre"
 
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid ""
 msgstr ""
 
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid "Cleared"
 msgstr "Aprobado/a"
 
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid "Completed"
 msgstr "Completado/a"
 
-#: const.py:903
+#: const.py:910
 msgid "Infant"
 msgstr "Infante"
 
-#: const.py:903 const.py:909
+#: const.py:910 const.py:916
 msgid "Stillborn"
 msgstr "Nacido/a muerto"
 
-#: const.py:903 const.py:909 const.py:915
+#: const.py:910 const.py:916 const.py:922
 msgid "Pre-1970"
 msgstr "Antes de 1970"
 
-#: const.py:903 const.py:909 const.py:915
+#: const.py:910 const.py:916 const.py:922
 msgid "Qualified"
 msgstr ""
 
-#: const.py:904 const.py:910 const.py:916
+#: const.py:911 const.py:917 const.py:923
 msgid "Submitted"
 msgstr "Enviado/a"
 
-#: const.py:904 const.py:910 const.py:916
+#: const.py:911 const.py:917 const.py:923
 msgid "Uncleared"
 msgstr "No aprobado/a"
 
-#: const.py:908
+#: const.py:915
 msgid "BIC"
 msgstr "Nacido/a en el Convenio"
 
-#: const.py:909 const.py:915
+#: const.py:916 const.py:922
 msgid "DNS"
 msgstr "No enviado/a"
 
-#: const.py:914
+#: const.py:921
 msgid "Canceled"
 msgstr "Cancelado/a"
 
-#: const.py:915
+#: const.py:922
 msgid "DNS/CAN"
 msgstr "Grfico Estadistico<"
 
-#: const.py:921
+#: const.py:928
 msgid "Flowed"
 msgstr "Automtico"
 
-#: const.py:922
+#: const.py:929
 msgid "Preformatted"
 msgstr "Preformateado"
 
-#: const.py:934
+#: const.py:941
 msgid "Text Reports"
 msgstr "Reportes en Texto"
 
-#: const.py:935
+#: const.py:942
 msgid "Graphical Reports"
 msgstr "Reportes Grficos"
 
-#: const.py:936
+#: const.py:943
 msgid "Code Generators"
 msgstr "Generadores de Cdigo"
 
-#: const.py:937 plugins/WebPage.py:1719
+#: const.py:944 plugins/WebPage.py:1719
 msgid "Web Page"
 msgstr "Pgina Web"
 
-#: const.py:938
+#: const.py:945
 msgid "View"
 msgstr "Ver"
 
-#: const.py:939
+#: const.py:946
 msgid "Books"
 msgstr "Libros"
 
-#: const.py:943 plugins/ScratchPad.py:356 plugins/ScratchPad.py:405
+#: const.py:950 plugins/ScratchPad.py:356 plugins/ScratchPad.py:405
 #: plugins/ScratchPad.py:413 plugins/SimpleBookTitle.py:169
 #: plugins/SimpleBookTitle.py:170 plugins/SimpleBookTitle.py:171
 msgid "Text"
 msgstr "Texto"
 
-#: const.py:944
+#: const.py:951
 msgid "Graphics"
 msgstr "Grficos"
 
@@ -4416,13 +4489,13 @@ msgid ""
 "Locating People: By default, each surname in the People View is "
 "listed only once. By clicking on the arrow to the left of a name, the list "
 "will expand to show all individuals with that last name."
-msgstr ""
+msgstr "Encontrar Personas: De forma predeterminada, cada combinacin de apellidos en la Vista de Personas se lista una sola vez. Si pincha en la flecha que aparece a la izquierda de una combinacin, se mostrarn todas las personas que tengan esa combinacin."
 
 #: data/tips.xml:79
 msgid ""
 "The Family View: The Family View is used to display a typical family "
 "unit---the parents, spouses and children of an individual."
-msgstr ""
+msgstr "La Vista Familiar: La Vista Familiar se utiliza para mostrar una unidad familiar tpica: los padres, cnyuges e hijos de una persona."
 
 #: data/tips.xml:89
 msgid ""
@@ -4440,7 +4513,7 @@ msgid ""
 "compare data of all (or some of) the individuals in your database. This is "
 "useful, say, if you wish to list the birth dates of everyone in your "
 "database."
-msgstr ""
+msgstr "Quin Naci Cundo: La herramienta 'Comparar eventos individuales' permite comparar los datos de todas (o algunas) personas de su base de datos. Esto es til si, por ejemplo, desea listar las fechas de nacimiento de todas las personas de su base de datos."
 
 #: data/tips.xml:104
 msgid ""
@@ -4449,7 +4522,7 @@ msgid ""
 "research and analysis tools such as event comparison, finding duplicate "
 "people, interactive descendant browser, and others. All tools can be "
 "accessed through the Tools menu."
-msgstr ""
+msgstr "GRAMPS le proporciona un rico juego de herramientas.  stas le permiten realizar operaciones como buscar errores o problemas de consistencia en la base de datos, as como herramientas de investigacin o anlisis como comparacin de eventos, bsqueda de personas duplicadas, navegador interactivo de descendientes y otras.  Se puede acceder a todas estas herramientas mediante el men Herramientas."
 
 #: data/tips.xml:111
 msgid ""
@@ -4497,7 +4570,7 @@ msgstr ""
 msgid ""
 "Unsure what a button does? Simply hold the mouse over a button and a tooltip "
 "will appear."
-msgstr ""
+msgstr "No est seguro de efecto de un botn?  Lleve el ratn hasta ese botn sin pulsar y aparecer un breve texto tras unos segundos."
 
 #: data/tips.xml:156
 msgid ""
@@ -4846,7 +4919,7 @@ msgid ""
 "GRAMPS has been designed so that new translations can easily be added with "
 "little development effort. If you are interested in participating please "
 "email gramps-devel@lists.sf.net"
-msgstr ""
+msgstr "GRAMPS se ha diseado de mode que se puedan aadir fcilmente nuevas traducciones con poco esfuerzo de desarrollo.  Si est interesado en participar, enve un mensaje de correo electrnico a gramps-devel@lists.sf.net"
 
 #: data/tips.xml:476
 msgid "Relationship calculators in GRAMPS are available in ten languages."
@@ -4908,16 +4981,16 @@ msgstr ""
 msgid ""
 "To run GRAMPS, you need to have GNOME installed. But you do not need to be "
 "running the GNOME desktop."
-msgstr ""
+msgstr "Para utilizar GRAMPS, es necesario que tenga instalado GNOME.  Pero no es necesario que utilice el escritorio de GNOME."
 
 #: data/tips.xml:531
 msgid ""
 "GRAMPS makes every effort to maintain compatibility with GEDCOM, the general "
 "standard of recording genealogical information. Filters exist that make "
 "importing and exporting GEDCOM files trivial."
-msgstr ""
+msgstr "GRAMPS se esfuerza en mantener compatibilidad con GEDCOM, el estndar general para la anotacin de informacin genealgica.  Existen filtros que hacen trivial la importacin y exportacin de archivos GEDCOM."
 
-#: docgen/AbiWord2Doc.py:332
+#: docgen/AbiWord2Doc.py:340
 msgid "AbiWord document"
 msgstr "Documento AbiWord"
 
@@ -4999,7 +5072,7 @@ msgstr "SVG (Scalable Vector Graphics)"
 msgid "Encoding"
 msgstr "Codificacin"
 
-#: gedcomexport.glade:127 gramps.glade:20090 gramps.glade:28994
+#: gedcomexport.glade:127 gramps.glade:21644 gramps.glade:31156
 #: plugins/genewebexport.glade:103 plugins/merge.glade:385
 #: plugins/vcalendarexport.glade:103 plugins/vcardexport.glade:103
 #: plugins/writeftree.glade:124
@@ -5101,7 +5174,7 @@ msgstr "Creado por:"
 msgid "Status"
 msgstr "Estado"
 
-#: gedcomimport.glade:216 gramps.glade:3482 gramps.glade:19306
+#: gedcomimport.glade:216 gramps.glade:3660 gramps.glade:20805
 msgid "Information"
 msgstr "Informacin"
 
@@ -5155,348 +5228,348 @@ msgstr ""
 "ASCII\n"
 "UNICODE"
 
-#: gramps.glade:10 gramps.glade:31082
+#: gramps.glade:10 gramps.glade:33389
 msgid "GRAMPS"
 msgstr "GRAMPS"
 
-#: gramps.glade:44
+#: gramps.glade:45
 msgid "_File"
 msgstr "_Archivo"
 
-#: gramps.glade:53
+#: gramps.glade:54
 msgid "_New"
 msgstr "_Nuevo"
 
-#: gramps.glade:75
+#: gramps.glade:76
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: gramps.glade:97
+#: gramps.glade:98
 msgid "Open _Recent"
 msgstr "Abrir _reciente"
 
-#: gramps.glade:112
+#: gramps.glade:113
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: gramps.glade:134
+#: gramps.glade:135
 msgid "Save _As..."
 msgstr "Guardar _como..."
 
-#: gramps.glade:156
+#: gramps.glade:157
 msgid "E_xport..."
 msgstr "E_xportar..."
 
-#: gramps.glade:184
+#: gramps.glade:185
 msgid "A_bandon changes and quit"
 msgstr "A_bandonar los cambios y salir"
 
-#: gramps.glade:193
+#: gramps.glade:194
 msgid "_Quit"
 msgstr "_Salir"
 
-#: gramps.glade:219
+#: gramps.glade:220
 msgid "_Edit"
 msgstr "_Editar"
 
-#: gramps.glade:228 gramps_main.py:536
+#: gramps.glade:229 gramps_main.py:536
 msgid "_Undo"
 msgstr "_Deshacer"
 
-#: gramps.glade:256 gramps.glade:918
+#: gramps.glade:257 gramps.glade:919
 msgid "Add a new item"
 msgstr "Agregar otro elemento"
 
-#: gramps.glade:257 rule.glade:135 rule.glade:722
+#: gramps.glade:258 rule.glade:135 rule.glade:722
 msgid "_Add..."
 msgstr "A_gregar..."
 
-#: gramps.glade:279 gramps.glade:936
+#: gramps.glade:280 gramps.glade:937
 msgid "Remove the currently selected item"
 msgstr "Borrar el elemento seleccionado"
 
-#: gramps.glade:280
+#: gramps.glade:281
 msgid "R_emove"
 msgstr "_Borrar"
 
-#: gramps.glade:302 gramps.glade:954
+#: gramps.glade:303 gramps.glade:955
 msgid "Edit the selected item"
 msgstr "Modificar el elemento seleccionado"
 
-#: gramps.glade:303
+#: gramps.glade:304
 msgid "E_dit..."
 msgstr "E_ditar..."
 
-#: gramps.glade:318
+#: gramps.glade:319
 msgid "Compare and _Merge..."
 msgstr "Comparar y _mezclar..."
 
-#: gramps.glade:340
+#: gramps.glade:341
 msgid "Fast Mer_ge"
 msgstr "Me_zcla rpida"
 
-#: gramps.glade:355
+#: gramps.glade:356
 msgid "Prefere_nces..."
 msgstr "Pr_eferencias..."
 
-#: gramps.glade:376
+#: gramps.glade:377
 msgid "_Column Editor..."
 msgstr "Editor de columnas..."
 
-#: gramps.glade:397
+#: gramps.glade:398
 msgid "Set _Home person..."
 msgstr "Establecer persona _Inicial..."
 
-#: gramps.glade:422
+#: gramps.glade:423
 msgid "_View"
 msgstr "_Ver"
 
-#: gramps.glade:431
+#: gramps.glade:432
 msgid "_Filter"
 msgstr "_Filtro"
 
-#: gramps.glade:441
+#: gramps.glade:442
 msgid "_Sidebar"
 msgstr "_Barra lateral"
 
-#: gramps.glade:451
+#: gramps.glade:452
 msgid "_Toolbar"
 msgstr "Barra de _Herramientas"
 
-#: gramps.glade:465
+#: gramps.glade:466
 msgid "_Go"
 msgstr "_Ir"
 
-#: gramps.glade:473
+#: gramps.glade:474
 msgid "_Bookmarks"
 msgstr "_Marcadores"
 
-#: gramps.glade:482
+#: gramps.glade:483
 msgid "_Add bookmark"
 msgstr "_Agregar marcador"
 
-#: gramps.glade:504
+#: gramps.glade:505
 msgid "_Edit bookmarks..."
 msgstr "_Editar marcadores..."
 
-#: gramps.glade:532
+#: gramps.glade:533
 msgid "_Go to bookmark"
 msgstr "_Ir al marcador"
 
-#: gramps.glade:544
+#: gramps.glade:545
 msgid "_Reports"
 msgstr "_Reportes"
 
-#: gramps.glade:552
+#: gramps.glade:553
 msgid "_Tools"
 msgstr "_Herramientas"
 
-#: gramps.glade:560
+#: gramps.glade:561
 msgid "_Windows"
 msgstr "_Ventanas"
 
-#: gramps.glade:568
+#: gramps.glade:569
 msgid "_Help"
 msgstr "A_yuda"
 
-#: gramps.glade:577
+#: gramps.glade:578
 msgid "_User manual"
 msgstr "_Manual de usuario"
 
-#: gramps.glade:599
+#: gramps.glade:600
 msgid "_FAQ"
 msgstr "Preguntas _frecuentes"
 
-#: gramps.glade:626
+#: gramps.glade:627
 msgid "GRAMPS _home page"
 msgstr "GRAMPS _pgina de inicio"
 
-#: gramps.glade:647
+#: gramps.glade:648
 msgid "GRAMPS _mailing lists"
 msgstr "Listas de _correo de GRAMPS"
 
-#: gramps.glade:668
+#: gramps.glade:669
 msgid "_Report a bug"
 msgstr "_Reportar un error"
 
-#: gramps.glade:683
+#: gramps.glade:684
 msgid "_Show plugin status..."
 msgstr "Mo_strar el estado de los mdulos..."
 
-#: gramps.glade:692
+#: gramps.glade:693
 msgid "_Open example database"
 msgstr "_Abrir la base de datos de ejemplo"
 
-#: gramps.glade:701
+#: gramps.glade:702
 msgid "_About"
 msgstr "A_cerca de"
 
-#: gramps.glade:751
+#: gramps.glade:752
 msgid "Open database"
 msgstr "Abrir una base de datos"
 
-#: gramps.glade:752
+#: gramps.glade:753
 msgid "Open"
 msgstr "Abrir"
 
-#: gramps.glade:782
+#: gramps.glade:783
 msgid "Go back in history"
 msgstr "Retroceder en el histrico"
 
-#: gramps.glade:783
+#: gramps.glade:784
 msgid "Back"
 msgstr "Atrs"
 
-#: gramps.glade:801
+#: gramps.glade:802
 msgid "Go forward in history"
 msgstr "Avanzar en el histrico"
 
-#: gramps.glade:802
+#: gramps.glade:803
 msgid "Forward"
 msgstr "Adelante"
 
-#: gramps.glade:820
+#: gramps.glade:821
 msgid "Make the Home Person the active person"
 msgstr "Transforma a la persona inicial en la persona activa"
 
-#: gramps.glade:851
+#: gramps.glade:852
 msgid "Open Scratch Pad"
 msgstr "Abrir el bloc de apuntes"
 
-#: gramps.glade:852
+#: gramps.glade:853
 msgid "ScratchPad"
 msgstr "Bloc de apuntes"
 
-#: gramps.glade:869
+#: gramps.glade:870
 msgid "Generate reports"
 msgstr "Generar reportes"
 
-#: gramps.glade:870
+#: gramps.glade:871
 msgid "Reports"
 msgstr "Reportes"
 
-#: gramps.glade:887
+#: gramps.glade:888
 msgid "Run tools"
 msgstr "Ejecutar una herramienta"
 
-#: gramps.glade:888
+#: gramps.glade:889
 msgid "Tools"
 msgstr "Herramientas"
 
-#: gramps.glade:919
+#: gramps.glade:920
 msgid "Add"
 msgstr "Agregar"
 
-#: gramps.glade:937
+#: gramps.glade:938
 msgid "Remove"
 msgstr "Borrar"
 
-#: gramps.glade:1028 gramps.glade:1452
+#: gramps.glade:1029 gramps.glade:1486
 msgid "People"
 msgstr "Personas"
 
-#: gramps.glade:1076 gramps.glade:2237 gramps.glade:2992
+#: gramps.glade:1081 gramps.glade:2310 gramps.glade:3104
 msgid "Family"
 msgstr "Familia"
 
-#: gramps.glade:1124 gramps.glade:3039
+#: gramps.glade:1133 gramps.glade:3155
 msgid "Pedigree"
 msgstr "rbol"
 
-#: gramps.glade:1172 gramps.glade:3097
+#: gramps.glade:1185 gramps.glade:3220
 msgid "Sources"
 msgstr "Fuentes"
 
-#: gramps.glade:1220 gramps.glade:3155
+#: gramps.glade:1237 gramps.glade:3285
 msgid "Places"
 msgstr "Lugares"
 
-#: gramps.glade:1268 gramps.glade:3554
+#: gramps.glade:1289 gramps.glade:3739
 msgid "Media"
 msgstr "Objetos"
 
-#: gramps.glade:1376
+#: gramps.glade:1407
 msgid "Invert"
 msgstr "Invertir"
 
-#: gramps.glade:1394
+#: gramps.glade:1425
 msgid "Apply filter using the selected controls"
 msgstr "Aplicar el firltro utilizando los controles seleccionados"
 
-#: gramps.glade:1481 gramps.glade:2956
+#: gramps.glade:1519 gramps.glade:3068
 msgid "Exchange the current spouse with the active person"
 msgstr "Intercambiar el cnyuge actual con la persona activa"
 
-#: gramps.glade:1547 gramps.glade:2718
+#: gramps.glade:1585 gramps.glade:2822
 msgid "Adds a new person to the database and to a new relationship"
 msgstr "Agrega una nueva persona a la base de datos y a una nueva relacin"
 
-#: gramps.glade:1574 gramps.glade:2745
+#: gramps.glade:1612 gramps.glade:2849
 msgid ""
 "Selects an existing person from the database and adds to a new relationship"
 msgstr ""
 "Seleciona una persona ya existente en la base de datos y la agrega a una "
 "nueva relacin"
 
-#: gramps.glade:1601 gramps.glade:2772
+#: gramps.glade:1639 gramps.glade:2876
 msgid "Removes the currently selected spouse"
 msgstr "Borrar el cnyuge actual"
 
-#: gramps.glade:1644 gramps.glade:2865
+#: gramps.glade:1682 gramps.glade:2977
 msgid "Make the active person's parents the active family"
 msgstr "Hacer que los padres de la persona activa sean la nueva familia activa"
 
-#: gramps.glade:1671 gramps.glade:2892
+#: gramps.glade:1709 gramps.glade:3004
 msgid "Adds a new set of parents to the active person"
 msgstr "Agregar una nueva pareja de padres a la persona activa"
 
-#: gramps.glade:1698 gramps.glade:2919
+#: gramps.glade:1736 gramps.glade:3031
 msgid "Deletes the selected parents from the active person"
 msgstr "Borrar los padres seleccionados de la persona activa"
 
-#: gramps.glade:1744 gramps.glade:2026 gramps.glade:2360 gramps.glade:2390
+#: gramps.glade:1782 gramps.glade:2090 gramps.glade:2447 gramps.glade:2480
 msgid "Double-click to edit the relationship to the selected parents"
 msgstr ""
 "Pulse dos veces para modificar la relacin con los padres seleccionados"
 
-#: gramps.glade:1771 gramps.glade:2596
+#: gramps.glade:1812 gramps.glade:2696
 msgid "Make the selected spouse's parents the active family"
 msgstr ""
 "Hacer que los padres del cnyuge seleccionado sean la nueva familia activa"
 
-#: gramps.glade:1798 gramps.glade:2623
+#: gramps.glade:1839 gramps.glade:2723
 msgid "Adds a new set of parents to the selected spouse"
 msgstr "Agregar una nueva pareja de padres al cnyuge seleccionado"
 
-#: gramps.glade:1825 gramps.glade:2650
+#: gramps.glade:1866 gramps.glade:2750
 msgid "Deletes the selected parents from the selected spouse"
 msgstr "Borrar los padres seleccionados del cnyuge seleccionado"
 
-#: gramps.glade:1862 gramps.glade:2296
+#: gramps.glade:1903 gramps.glade:2376
 msgid "_Children"
 msgstr "Hijos"
 
-#: gramps.glade:1887 gramps.glade:2809
+#: gramps.glade:1932 gramps.glade:2913
 msgid "_Active person"
 msgstr "Persona _activa"
 
-#: gramps.glade:1912 gramps.glade:2834
+#: gramps.glade:1961 gramps.glade:2942
 msgid "Active person's _parents"
 msgstr "_Padres de la persona activa"
 
-#: gramps.glade:1937 gramps.glade:2687
+#: gramps.glade:1990 gramps.glade:2787
 msgid "Relati_onship"
 msgstr "Re_lacin"
 
-#: gramps.glade:1962 gramps.glade:2565
+#: gramps.glade:2019 gramps.glade:2661
 msgid "Spo_use's parents"
 msgstr "Padres del cny_uge"
 
-#: gramps.glade:2056 gramps.glade:2420
+#: gramps.glade:2123 gramps.glade:2513
 msgid "Double-click to edit the active person"
 msgstr "Pulse dos veces para modificar la persona activa"
 
-#: gramps.glade:2086 gramps.glade:2275
+#: gramps.glade:2156 gramps.glade:2352
 msgid ""
 "Double-click to edit the relationship information, Shift-click to edit the "
 "person"
@@ -5504,15 +5577,15 @@ msgstr ""
 "Pulse dos veces para editar, apriete 'Maysculas' y pulse para modificar la "
 "persona"
 
-#: gramps.glade:2113 gramps.glade:2447
+#: gramps.glade:2186 gramps.glade:2543
 msgid "Make the selected child the active person"
 msgstr "Hacer que el hijo seleccionado sea la nueva persona activa"
 
-#: gramps.glade:2140 gramps.glade:2474
+#: gramps.glade:2213 gramps.glade:2570
 msgid "Adds a new child to the database and to the current family"
 msgstr "Agrega un nuevo hijo a la base de datos y a la familia actual"
 
-#: gramps.glade:2167 gramps.glade:2501
+#: gramps.glade:2240 gramps.glade:2597
 msgid ""
 "Selects an existing person from the database and adds as a child to the "
 "current family"
@@ -5520,30 +5593,30 @@ msgstr ""
 "Selecciona una persona ya existente de la base de datos y la agrega como "
 "hija de la familia actual"
 
-#: gramps.glade:2194 gramps.glade:2528
+#: gramps.glade:2267 gramps.glade:2624
 msgid "Deletes the selected child from the selected family"
 msgstr "Borrar el hijo seleccionado de la familia seleccionada"
 
-#: gramps.glade:3206 gramps.glade:19030 gramps.glade:21050 gramps.glade:21315
-#: gramps.glade:22712
+#: gramps.glade:3340 gramps.glade:20485 gramps.glade:22681 gramps.glade:22959
+#: gramps.glade:24471
 msgid "Preview"
 msgstr "Previsualizacin"
 
-#: gramps.glade:3242 gramps.glade:19066
+#: gramps.glade:3380 gramps.glade:20525
 msgid "Details:"
 msgstr "Detalles:"
 
-#: gramps.glade:3313 gramps.glade:19137 gramps.glade:21351 gramps.glade:22748
+#: gramps.glade:3463 gramps.glade:20608 gramps.glade:22999 gramps.glade:24511
 msgid "Path:"
 msgstr "Camino:"
 
-#: gramps.glade:3338 gramps.glade:7942 gramps.glade:8512 gramps.glade:9026
-#: gramps.glade:12184 gramps.glade:12799 gramps.glade:19162 gramps.glade:22079
-#: gramps.glade:23157
+#: gramps.glade:3492 gramps.glade:8436 gramps.glade:9073 gramps.glade:9646
+#: gramps.glade:13081 gramps.glade:13775 gramps.glade:20637 gramps.glade:23799
+#: gramps.glade:24964
 msgid "Type:"
 msgstr "Tipo:"
 
-#: gramps.glade:3778
+#: gramps.glade:3975
 msgid ""
 "Check to show all people in the list.  Uncheck to get the list filtered by "
 "birth and death dates."
@@ -5552,15 +5625,15 @@ msgstr ""
 "marcar para que se filtre la lista en funcin de las fechas de nacimiento y "
 "defuncin."
 
-#: gramps.glade:3780 gramps.glade:4156 gramps.glade:4574
+#: gramps.glade:3977 gramps.glade:4380 gramps.glade:4826
 msgid "_Show all"
 msgstr "_Mostrar todos"
 
-#: gramps.glade:3827 gramps.glade:11954
+#: gramps.glade:4024 gramps.glade:12825
 msgid "_Relationship type:"
 msgstr "Tipo de _relacin:"
 
-#: gramps.glade:3855
+#: gramps.glade:4056
 msgid ""
 "Married\n"
 "Unmarried\n"
@@ -5574,83 +5647,83 @@ msgstr ""
 "Desconocido\n"
 "Otro"
 
-#: gramps.glade:4025
+#: gramps.glade:4233
 msgid "_Father's relationship to child:"
 msgstr "Relacin del _padre con el hijo:"
 
-#: gramps.glade:4049
+#: gramps.glade:4261
 msgid "_Mother's relationship to child:"
 msgstr "Relacin de la _madre con el hijo:"
 
-#: gramps.glade:4073
+#: gramps.glade:4289
 msgid "_Parents' relationship to each other:"
 msgstr "Relacin de los padres entre _s:"
 
-#: gramps.glade:4097
+#: gramps.glade:4317
 msgid "Fat_her"
 msgstr "_Padre"
 
-#: gramps.glade:4192
+#: gramps.glade:4416
 msgid "Moth_er"
 msgstr "_Madre"
 
-#: gramps.glade:4217
+#: gramps.glade:4445
 msgid "Relationships"
 msgstr "Relaciones"
 
-#: gramps.glade:4311
+#: gramps.glade:4549
 msgid "Show _all"
 msgstr "Mostrar _todos"
 
-#: gramps.glade:4643
+#: gramps.glade:4895
 msgid "Relationship to father:"
 msgstr "Relacin con el padre:"
 
-#: gramps.glade:4667
+#: gramps.glade:4923
 msgid "Relationship to mother:"
 msgstr "Relacin con la madre:"
 
-#: gramps.glade:4758 gramps.glade:6549 gramps.glade:11846 gramps.glade:28451
+#: gramps.glade:5023 gramps.glade:6932 gramps.glade:12713 gramps.glade:30562
 msgid "Abandon changes and close window"
 msgstr "Abandonar los cambios y cerrar la ventana"
 
-#: gramps.glade:4773 gramps.glade:6564 gramps.glade:11861 gramps.glade:25038
-#: gramps.glade:27302 gramps.glade:28196 gramps.glade:28466
+#: gramps.glade:5038 gramps.glade:6947 gramps.glade:12728 gramps.glade:26958
+#: gramps.glade:29348 gramps.glade:30294 gramps.glade:30577
 msgid "Accept changes and close window"
 msgstr "Aceptar cambios y cerrar la ventana"
 
-#: gramps.glade:4860 gramps.glade:6759 gramps.glade:14059 gramps.glade:18137
-#: gramps.glade:21096 gramps.glade:22932 gramps.glade:28635
+#: gramps.glade:5129 gramps.glade:7162 gramps.glade:15121 gramps.glade:19547
+#: gramps.glade:22731 gramps.glade:24719 gramps.glade:30762
 msgid "_Title:"
 msgstr "_Ttulo:"
 
-#: gramps.glade:4885
+#: gramps.glade:5158
 msgid "_Author:"
 msgstr "_Autor:"
 
-#: gramps.glade:4956
+#: gramps.glade:5233
 msgid "_Publication information:"
 msgstr "Informacin de la _publicacin:"
 
-#: gramps.glade:5023
+#: gramps.glade:5304
 msgid "A_bbreviation:"
 msgstr "A_breviatura:"
 
-#: gramps.glade:5054 gramps.glade:12125 gramps.glade:14453 gramps.glade:14623
-#: gramps.glade:23075 gramps.glade:25412 gramps.glade:26416 gramps.glade:27784
-#: gramps.glade:29213 plugins/verify.glade:530
+#: gramps.glade:5339 gramps.glade:13014 gramps.glade:15547 gramps.glade:15737
+#: gramps.glade:24870 gramps.glade:27359 gramps.glade:28409 gramps.glade:29862
+#: gramps.glade:31390 plugins/verify.glade:530
 msgid "General"
 msgstr "General"
 
-#: gramps.glade:5124 gramps.glade:10183 gramps.glade:13187 gramps.glade:15258
-#: gramps.glade:21905 gramps.glade:23465 gramps.glade:25663 gramps.glade:26665
-#: gramps.glade:28033 gramps.glade:29464
+#: gramps.glade:5413 gramps.glade:10933 gramps.glade:14198 gramps.glade:16443
+#: gramps.glade:23613 gramps.glade:25291 gramps.glade:27621 gramps.glade:28669
+#: gramps.glade:30122 gramps.glade:31652
 msgid "Format"
 msgstr "Formato"
 
-#: gramps.glade:5148 gramps.glade:10208 gramps.glade:13211 gramps.glade:15282
-#: gramps.glade:21929 gramps.glade:23489 gramps.glade:25687 gramps.glade:26689
-#: gramps.glade:28057 gramps.glade:29488
+#: gramps.glade:5441 gramps.glade:10962 gramps.glade:14226 gramps.glade:16471
+#: gramps.glade:23641 gramps.glade:25319 gramps.glade:27649 gramps.glade:28697
+#: gramps.glade:30150 gramps.glade:31680
 msgid ""
 "Multiple spaces, tabs, and single line breaks are replaced with single "
 "spaces. Two consecutive line breaks mark a new paragraph."
@@ -5659,15 +5732,15 @@ msgstr ""
 "con un nico espacio.  Dos saltos de lnea consecutivos marcarn un nuevo "
 "prrafo."
 
-#: gramps.glade:5150 gramps.glade:10210 gramps.glade:13213 gramps.glade:15284
-#: gramps.glade:21931 gramps.glade:23491 gramps.glade:25689 gramps.glade:26691
-#: gramps.glade:28059 gramps.glade:29490
+#: gramps.glade:5443 gramps.glade:10964 gramps.glade:14228 gramps.glade:16473
+#: gramps.glade:23643 gramps.glade:25321 gramps.glade:27651 gramps.glade:28699
+#: gramps.glade:30152 gramps.glade:31682
 msgid "_Flowed"
 msgstr "Aut_omtico"
 
-#: gramps.glade:5171 gramps.glade:10231 gramps.glade:13234 gramps.glade:15305
-#: gramps.glade:21952 gramps.glade:23512 gramps.glade:25710 gramps.glade:26712
-#: gramps.glade:28080 gramps.glade:29511
+#: gramps.glade:5464 gramps.glade:10985 gramps.glade:14249 gramps.glade:16494
+#: gramps.glade:23664 gramps.glade:25342 gramps.glade:27672 gramps.glade:28720
+#: gramps.glade:30173 gramps.glade:31703
 msgid ""
 "Formatting is preserved, except for the leading whitespace. Multiple spaces, "
 "tabs, and all line breaks are respected."
@@ -5676,79 +5749,79 @@ msgstr ""
 "respetan los espacios mltiples, las tabulaciones y todos los saltos de "
 "lnea."
 
-#: gramps.glade:5173 gramps.glade:10233 gramps.glade:13236 gramps.glade:15307
-#: gramps.glade:21954 gramps.glade:23514 gramps.glade:25712 gramps.glade:26714
-#: gramps.glade:28082 gramps.glade:29513
+#: gramps.glade:5466 gramps.glade:10987 gramps.glade:14251 gramps.glade:16496
+#: gramps.glade:23666 gramps.glade:25344 gramps.glade:27674 gramps.glade:28722
+#: gramps.glade:30175 gramps.glade:31705
 msgid "_Preformatted"
 msgstr "_Preformateado"
 
-#: gramps.glade:5268 gramps.glade:5405 gramps.glade:10490 gramps.glade:13484
-#: gramps.glade:15587 gramps.glade:25993
+#: gramps.glade:5568 gramps.glade:5709 gramps.glade:11255 gramps.glade:14510
+#: gramps.glade:16787 gramps.glade:27966
 msgid "Add a new media object to the database and place it in this gallery"
 msgstr ""
 "Agregar un nuevo objeto audiovisual a la base de datos y colocarlo en esta "
 "galera"
 
-#: gramps.glade:5296 gramps.glade:5489 gramps.glade:13567 gramps.glade:15670
-#: gramps.glade:26076
+#: gramps.glade:5596 gramps.glade:5793 gramps.glade:14593 gramps.glade:16870
+#: gramps.glade:28049
 msgid "Remove selected object from this gallery only"
 msgstr "Borrar el objeto seleccionado de esta galera unicamente"
 
-#: gramps.glade:5337
+#: gramps.glade:5637
 msgid "Data"
 msgstr "Datos"
 
-#: gramps.glade:5433 gramps.glade:10518 gramps.glade:13512 gramps.glade:15615
-#: gramps.glade:26021
+#: gramps.glade:5737 gramps.glade:11283 gramps.glade:14538 gramps.glade:16815
+#: gramps.glade:27994
 msgid ""
 "Select an existing media object from the database and place it in this "
 "gallery"
 msgstr ""
-"Seleccionar un objeto audiovisual de la bsee de datos y colocarla en esta "
+"Seleccionar un objeto audiovisual de la base de datos y colocarla en esta "
 "galera"
 
-#: gramps.glade:5461 gramps.glade:10546 gramps.glade:15643 gramps.glade:26049
+#: gramps.glade:5765 gramps.glade:11311 gramps.glade:16843 gramps.glade:28022
 msgid "Edit the properties of the selected object"
 msgstr "Modificar las propiedades del objeto seleccionado"
 
-#: gramps.glade:5550 gramps.glade:10621 gramps.glade:13608 gramps.glade:15731
-#: gramps.glade:26137 plugins/WebPage.py:432
+#: gramps.glade:5854 gramps.glade:11386 gramps.glade:14634 gramps.glade:16931
+#: gramps.glade:28110 plugins/WebPage.py:432
 msgid "Gallery"
 msgstr "Galera"
 
-#: gramps.glade:5595 gramps.glade:16128 gramps.glade:23593
+#: gramps.glade:5906 gramps.glade:17359 gramps.glade:25430
 msgid "References"
 msgstr "Referencias"
 
-#: gramps.glade:5742
+#: gramps.glade:6062
 msgid "Open an _existing database"
 msgstr "Abrir una base de datos _existente"
 
-#: gramps.glade:5762
+#: gramps.glade:6082
 msgid "Create a _new database"
 msgstr "Crear una _nueva base de datos"
 
-#: gramps.glade:5957
+#: gramps.glade:6290
 msgid "_Relationship:"
 msgstr "_Relacin:"
 
-#: gramps.glade:6005
+#: gramps.glade:6346
 msgid "Relation_ship:"
 msgstr "_Relacin:"
 
-#: gramps.glade:6056
+#: gramps.glade:6405
 msgid "Father"
 msgstr "Padre"
 
-#: gramps.glade:6080
+#: gramps.glade:6433
 msgid "Mother"
 msgstr "Madre"
 
-#: gramps.glade:6103
+#: gramps.glade:6460
 msgid "Preference"
 msgstr "Preferencia"
 
-#: gramps.glade:6126
+#: gramps.glade:6487
 msgid ""
 "Indicates that the parents should be used as the preferred parents for "
 "reporting and display purposes"
@@ -5756,85 +5829,85 @@ msgstr ""
 "Indica que estos padres deben utilizarse como padres preferidos a efectos de "
 "reportes y presentacin"
 
-#: gramps.glade:6128
+#: gramps.glade:6489
 msgid "Use as preferred parents"
 msgstr "Usar como padres preferidos"
 
-#: gramps.glade:6328
+#: gramps.glade:6698
 msgid "_Text:"
 msgstr "_Texto:"
 
-#: gramps.glade:6487
+#: gramps.glade:6865
 msgid "Select columns"
 msgstr "Seleccionar columnas"
 
-#: gramps.glade:6659 gramps.glade:28552
+#: gramps.glade:7046 gramps.glade:30667
 msgid "_Given name:"
 msgstr "_Nombre:"
 
-#: gramps.glade:6684 gramps.glade:28826
+#: gramps.glade:7075 gramps.glade:30965
 msgid "_Family name:"
 msgstr "A_pellidos:"
 
-#: gramps.glade:6709
+#: gramps.glade:7104
 msgid "Famil_y prefix:"
 msgstr "Prefi_jo de apellidos:"
 
-#: gramps.glade:6734
+#: gramps.glade:7133
 msgid "S_uffix:"
 msgstr "S_ufijo:"
 
-#: gramps.glade:6784
+#: gramps.glade:7191
 msgid "Nic_kname:"
 msgstr "Ap_odo:"
 
-#: gramps.glade:6809 gramps.glade:28608
+#: gramps.glade:7220 gramps.glade:30731
 msgid "T_ype:"
 msgstr "T_ipo:"
 
-#: gramps.glade:6833
+#: gramps.glade:7248
 msgid "An optional suffix to the name, such as \"Jr.\" or \"III\""
 msgstr "Un sufijo opcional del nombre, tal como \"Jr.\" o \"III\""
 
-#: gramps.glade:6855
+#: gramps.glade:7270
 msgid "A title used to refer to the person, such as \"Dr.\" or \"Rev.\""
 msgstr ""
 "Un ttulo o tratamiento utilizado para referirse a la persona, tal como \"Dr,"
 "\" o \"Rev.\""
 
-#: gramps.glade:6877
+#: gramps.glade:7292
 msgid "A name that the person was more commonly known by"
 msgstr "Un nombre por el que la persona era conocido ms habitualmente"
 
-#: gramps.glade:6899
+#: gramps.glade:7314
 msgid "Preferred name"
 msgstr "Nombre preferido"
 
-#: gramps.glade:6930
+#: gramps.glade:7349
 msgid "_male"
 msgstr "_masculino"
 
-#: gramps.glade:6950
+#: gramps.glade:7369
 msgid "fema_le"
 msgstr "_femenino"
 
-#: gramps.glade:6971
+#: gramps.glade:7390
 msgid "u_nknown"
 msgstr "_desconocido"
 
-#: gramps.glade:7001
+#: gramps.glade:7420
 msgid "Birth"
 msgstr "Nacimiento"
 
-#: gramps.glade:7025
+#: gramps.glade:7448
 msgid "GRAMPS _ID:"
 msgstr "_ID GRAMPS:"
 
-#: gramps.glade:7071
+#: gramps.glade:7498
 msgid "Death"
 msgstr "Defuncin"
 
-#: gramps.glade:7109
+#: gramps.glade:7543
 msgid ""
 "An optional prefix for the family name that is not used in sorting, such as "
 "\"de\" or \"van\""
@@ -5842,377 +5915,377 @@ msgstr ""
 "Un prefijo opcional de los apellidos que no se utiliza al clasificar, como "
 "\"de\" o \"van\""
 
-#: gramps.glade:7131
+#: gramps.glade:7565
 msgid "The person's given name"
 msgstr "El nombre de pila de la persona"
 
-#: gramps.glade:7176
+#: gramps.glade:7610
 msgid "Edit the preferred name"
 msgstr "Modificar el nombre preferido"
 
-#: gramps.glade:7206
+#: gramps.glade:7640
 msgid "Gender"
 msgstr "Sexo"
 
-#: gramps.glade:7229
+#: gramps.glade:7667
 msgid "Identification"
 msgstr "Identificacin"
 
-#: gramps.glade:7277
+#: gramps.glade:7719
 msgid "Image"
 msgstr "Imagen"
 
-#: gramps.glade:7308 gramps.glade:12091
+#: gramps.glade:7754 gramps.glade:12980
 msgid "Information i_s complete"
 msgstr "La informacin e_st completa"
 
-#: gramps.glade:7330
+#: gramps.glade:7776
 msgid "Information is pri_vate"
 msgstr "La informacin es pri_vada"
 
-#: gramps.glade:7360 gramps.glade:11012 gramps.glade:18007 gramps.glade:22978
-#: gramps.glade:25147 gramps.glade:27388
+#: gramps.glade:7806 gramps.glade:11812 gramps.glade:19397 gramps.glade:24769
+#: gramps.glade:27075 gramps.glade:29438
 msgid "_Date:"
 msgstr "F_echa:"
 
-#: gramps.glade:7384 gramps.glade:11084 gramps.glade:25203
+#: gramps.glade:7834 gramps.glade:11892 gramps.glade:27139
 msgid "_Place:"
 msgstr "_Lugar:"
 
-#: gramps.glade:7431
+#: gramps.glade:7885
 msgid "Invoke birth event editor"
 msgstr "Invocar el editor de eventos del nacimiento"
 
-#: gramps.glade:7486 gramps.glade:7589 gramps.glade:11628 gramps.glade:11688
-#: gramps.glade:11748 gramps.glade:13846 gramps.glade:18436 gramps.glade:23027
-#: gramps.glade:29116
+#: gramps.glade:7940 gramps.glade:8047 gramps.glade:12490 gramps.glade:12550
+#: gramps.glade:12610 gramps.glade:14899 gramps.glade:19866 gramps.glade:24822
+#: gramps.glade:31293
 msgid "Invoke date editor"
 msgstr "Invocar el editor de fechas"
 
-#: gramps.glade:7539 gramps.glade:11177
+#: gramps.glade:7993 gramps.glade:11993
 msgid "D_ate:"
 msgstr "Fec_ha:"
 
-#: gramps.glade:7625
+#: gramps.glade:8083
 msgid "Invoke death event editor"
 msgstr "Evocar el editor de eventos de defuncin"
 
-#: gramps.glade:7655
+#: gramps.glade:8113
 msgid "Plac_e:"
 msgstr "Luga_r:"
 
-#: gramps.glade:7798 gramps.glade:8608 gramps.glade:9122 gramps.glade:9558
-#: gramps.glade:12304 gramps.glade:12751
+#: gramps.glade:8268 gramps.glade:9185 gramps.glade:9758 gramps.glade:10241
+#: gramps.glade:13221 gramps.glade:13719
 msgid "Confidence:"
 msgstr "Confianza:"
 
-#: gramps.glade:7822
+#: gramps.glade:8296
 msgid "Family prefix:"
 msgstr "Prefijo:"
 
-#: gramps.glade:7966
+#: gramps.glade:8464
 msgid "Alternate name"
 msgstr "Nombre Alternativo"
 
-#: gramps.glade:7990 gramps.glade:8560 gramps.glade:9074 gramps.glade:9654
-#: gramps.glade:12375 gramps.glade:12823
+#: gramps.glade:8492 gramps.glade:9129 gramps.glade:9702 gramps.glade:10353
+#: gramps.glade:13304 gramps.glade:13803
 msgid "Primary source"
 msgstr "Fuente primaria"
 
-#: gramps.glade:8266
+#: gramps.glade:8807
 msgid "Create an alternate name for this person"
 msgstr "Crear un nombre alternativo para esta persona"
 
-#: gramps.glade:8295
+#: gramps.glade:8836
 msgid "Edit the selected name"
 msgstr "Modificar el nombre seleccionado"
 
-#: gramps.glade:8323
+#: gramps.glade:8864
 msgid "Delete the selected name"
 msgstr "Borrar el nombre seleccionado"
 
-#: gramps.glade:8375
+#: gramps.glade:8916
 msgid "Names"
 msgstr "Nombres"
 
-#: gramps.glade:8416
+#: gramps.glade:8961
 msgid "Event"
 msgstr "Evento"
 
-#: gramps.glade:8464 gramps.glade:12232
+#: gramps.glade:9017 gramps.glade:13137
 msgid "Cause:"
 msgstr "Causa:"
 
-#: gramps.glade:8845
+#: gramps.glade:9457
 msgid "Create a new event"
 msgstr "Crear una nuevo evento"
 
-#: gramps.glade:8874
+#: gramps.glade:9486
 msgid "Edit the selected event"
 msgstr "Modificar el evento seleccionado"
 
-#: gramps.glade:8902
+#: gramps.glade:9514
 msgid "Delete the selected event"
 msgstr "Borrar el evento seleccionado"
 
-#: gramps.glade:9002 gramps.glade:12847 gramps.glade:22174 gramps.glade:23205
+#: gramps.glade:9618 gramps.glade:13831 gramps.glade:23910 gramps.glade:25020
 msgid "Attributes"
 msgstr "Atributos"
 
-#: gramps.glade:9287
+#: gramps.glade:9946
 msgid "Create a new attribute"
 msgstr "Crear un nuevo atributo"
 
-#: gramps.glade:9316
+#: gramps.glade:9975
 msgid "Edit the selected attribute"
 msgstr "Modificar el atributo seleccionado"
 
-#: gramps.glade:9344 gramps.glade:13065 gramps.glade:22299 gramps.glade:23329
+#: gramps.glade:10003 gramps.glade:14072 gramps.glade:24042 gramps.glade:25151
 msgid "Delete the selected attribute"
 msgstr "Borrar el atributo seleccionado"
 
-#: gramps.glade:9403 gramps.glade:13117 gramps.glade:22364 gramps.glade:23395
+#: gramps.glade:10062 gramps.glade:14124 gramps.glade:24107 gramps.glade:25217
 msgid "Attributes"
 msgstr "Atributos"
 
-#: gramps.glade:9438
+#: gramps.glade:10101
 msgid "City/County:"
 msgstr "Ciudad/Condado:"
 
-#: gramps.glade:9630
+#: gramps.glade:10325
 msgid "Addresses"
 msgstr "Direcciones"
 
-#: gramps.glade:9995
+#: gramps.glade:10741
 msgid "Create a new address"
 msgstr "Crear una nueva direccin"
 
-#: gramps.glade:10024
+#: gramps.glade:10770
 msgid "Edit the selected address"
 msgstr "Modificar la direccin seleccionada"
 
-#: gramps.glade:10052
+#: gramps.glade:10798
 msgid "Delete the selected address"
 msgstr "Borrar la direccin seleccionada"
 
-#: gramps.glade:10145
+#: gramps.glade:10895
 msgid "Enter miscellaneous relevant data and documentation"
 msgstr "Agregue varios tipos de datos y documentos reelevantes"
 
-#: gramps.glade:10268 gramps.glade:13271 gramps.glade:21989 gramps.glade:23549
+#: gramps.glade:11022 gramps.glade:14286 gramps.glade:23701 gramps.glade:25379
 #: plugins/IndivComplete.py:166 plugins/WebPage.py:567
 msgid "Notes"
 msgstr "Notas"
 
-#: gramps.glade:10326
+#: gramps.glade:11087
 msgid "Add a source"
 msgstr "Agregar una fuente"
 
-#: gramps.glade:10353
+#: gramps.glade:11114
 msgid "Edit the selected source"
 msgstr "Modificar la fuente seleccionada"
 
-#: gramps.glade:10379
+#: gramps.glade:11140
 msgid "Remove the selected source"
 msgstr "Borrar la fuente seleccionada"
 
-#: gramps.glade:10423 gramps.glade:13423 gramps.glade:15520 gramps.glade:22542
-#: gramps.glade:23771 gramps.glade:25590 gramps.glade:26594 gramps.glade:27962
-#: gramps.glade:29392 plugins/Ancestors.py:159 plugins/IndivComplete.py:324
+#: gramps.glade:11184 gramps.glade:14445 gramps.glade:16716 gramps.glade:24292
+#: gramps.glade:25615 gramps.glade:27544 gramps.glade:28594 gramps.glade:30047
+#: gramps.glade:31576 plugins/Ancestors.py:159 plugins/IndivComplete.py:324
 #: plugins/ScratchPad.py:153 plugins/ScratchPad.py:293
 #: plugins/ScratchPad.py:326 plugins/WebPage.py:224
 msgid "Sources"
 msgstr "Fuentes"
 
-#: gramps.glade:10573
+#: gramps.glade:11338
 msgid "Remove the selected object from this gallery only"
 msgstr "Borrar el objeto seleccionado de esta galera nicamente"
 
-#: gramps.glade:10656 gramps.glade:15766
+#: gramps.glade:11425 gramps.glade:16970
 msgid "Web address:"
 msgstr "Direccin web:"
 
-#: gramps.glade:10751 gramps.glade:15861
+#: gramps.glade:11536 gramps.glade:17081
 msgid "Internet addresses"
 msgstr "Direcciones de Internet"
 
-#: gramps.glade:10822
+#: gramps.glade:11614
 msgid "Add an internet reference about this person"
 msgstr "Agregar una referencia en internet sobre esta persona"
 
-#: gramps.glade:10851
+#: gramps.glade:11643
 msgid "Edit the selected internet address"
 msgstr "Modificar la direccin internet seleccionada"
 
-#: gramps.glade:10878
+#: gramps.glade:11670
 msgid "Go to this web page"
 msgstr "Ir a esta pgina web"
 
-#: gramps.glade:10907
+#: gramps.glade:11699
 msgid "Delete selected reference"
 msgstr "Borrar la referencia seleccionada"
 
-#: gramps.glade:10959 gramps.glade:16075
+#: gramps.glade:11751 gramps.glade:17302
 msgid "Internet"
 msgstr "Internet"
 
-#: gramps.glade:10988
+#: gramps.glade:11784
 msgid "LDS baptism"
 msgstr "Bautismo SUD"
 
-#: gramps.glade:11037
+#: gramps.glade:11841
 msgid "LDS _temple:"
 msgstr "_Templo SUD:"
 
-#: gramps.glade:11065 gramps.glade:11279 gramps.glade:11368 gramps.glade:13740
+#: gramps.glade:11873 gramps.glade:12107 gramps.glade:12204 gramps.glade:14786
 msgid "Sources..."
 msgstr "Fuentes..."
 
-#: gramps.glade:11134 gramps.glade:11299 gramps.glade:11437 gramps.glade:13760
+#: gramps.glade:11946 gramps.glade:12127 gramps.glade:12277 gramps.glade:14806
 msgid "Note..."
 msgstr "Nota..."
 
-#: gramps.glade:11153
+#: gramps.glade:11965
 msgid "Endowment"
 msgstr "Investidura"
 
-#: gramps.glade:11205
+#: gramps.glade:12025
 msgid "LDS te_mple:"
 msgstr "Te_mplo LDS:"
 
-#: gramps.glade:11229 gramps.glade:17568
+#: gramps.glade:12053 gramps.glade:18925
 msgid "P_lace:"
 msgstr "L_ugar:"
 
-#: gramps.glade:11318 gramps.glade:29067
+#: gramps.glade:12146 gramps.glade:31240
 msgid "Dat_e:"
 msgstr "F_echa:"
 
-#: gramps.glade:11343
+#: gramps.glade:12175
 msgid "LD_S temple:"
 msgstr "Templo _SUD:"
 
-#: gramps.glade:11387
+#: gramps.glade:12223
 msgid "Pla_ce:"
 msgstr "Lu_gar:"
 
-#: gramps.glade:11456
+#: gramps.glade:12296
 msgid "Pa_rents:"
 msgstr "Pad_res:"
 
-#: gramps.glade:11481
+#: gramps.glade:12325
 msgid "Sealed to parents"
 msgstr "Sellado a los padres"
 
-#: gramps.glade:11788 gramps.glade:13894
+#: gramps.glade:12650 gramps.glade:14947
 msgid "LDS"
 msgstr "SUD"
 
-#: gramps.glade:11978
+#: gramps.glade:12853
 msgid "_GRAMPS ID:"
 msgstr "ID _GRAMPS:"
 
-#: gramps.glade:12042 gramps.glade:14569
+#: gramps.glade:12923 gramps.glade:15675
 msgid "Last Changed:"
 msgstr "ltimo cambio:"
 
-#: gramps.glade:12351
+#: gramps.glade:13276
 msgid "Events"
 msgstr "Eventos"
 
-#: gramps.glade:12586
+#: gramps.glade:13546
 msgid "Add new event for this marriage"
 msgstr "Agregar un nuevo evento para este matrimonio"
 
-#: gramps.glade:12640
+#: gramps.glade:13600
 msgid "Delete selected event"
 msgstr "Borrar el evento seleccionado"
 
-#: gramps.glade:13011
+#: gramps.glade:14018
 msgid "Create a new attribute for this marriage"
 msgstr "Crear un nuevo atributo para este matrimonio"
 
-#: gramps.glade:13540
+#: gramps.glade:14566
 msgid "Edit the properties of the selected objects"
 msgstr "Editar las propiedades de los objetos seleccionados"
 
-#: gramps.glade:13643
+#: gramps.glade:14673
 msgid "Sealed to spouse"
 msgstr "Sellado al cnyuge"
 
-#: gramps.glade:13691
+#: gramps.glade:14729
 msgid "Temple:"
 msgstr "Templo:"
 
-#: gramps.glade:14087
+#: gramps.glade:15153
 msgid "C_ity:"
 msgstr "C_iudad:"
 
-#: gramps.glade:14115 gramps.glade:26987
+#: gramps.glade:15185 gramps.glade:29016
 msgid "_State:"
 msgstr "E_stado:"
 
-#: gramps.glade:14143 gramps.glade:26930
-msgid "C_ounty:"
-msgstr "C_ondado:"
+#: gramps.glade:15217
+msgid "Co_unty:"
+msgstr "Con_dado:"
 
-#: gramps.glade:14171
-msgid "Co_untry:"
+#: gramps.glade:15249
+msgid "Count_ry:"
 msgstr "_Pas:"
 
-#: gramps.glade:14199
+#: gramps.glade:15281
 msgid "_Longitude:"
 msgstr "_Longitud:"
 
-#: gramps.glade:14227
+#: gramps.glade:15313
 msgid "L_atitude:"
 msgstr "L_atitud:"
 
-#: gramps.glade:14255 gramps.glade:27016
+#: gramps.glade:15345 gramps.glade:29049
 msgid "Church _parish:"
 msgstr "_Parroquia:"
 
-#: gramps.glade:14477 gramps.glade:17203 gramps.glade:27528
+#: gramps.glade:15575 gramps.glade:18532 gramps.glade:29598
 msgid "_ZIP/Postal code:"
 msgstr "Cdigo postal:"
 
-#: gramps.glade:14523 gramps.glade:27150 gramps.glade:27705
-msgid "P_hone:"
-msgstr "_Telfono:"
+#: gramps.glade:15625
+msgid "Phon_e:"
+msgstr "T_elfono:"
 
-#: gramps.glade:14658
+#: gramps.glade:15776
 msgid "County:"
 msgstr "Condado:"
 
-#: gramps.glade:14706
+#: gramps.glade:15832
 msgid "State:"
 msgstr "Estado/Provincia:"
 
-#: gramps.glade:14754
+#: gramps.glade:15888
 msgid "Church parish:"
 msgstr "Iglesia parroquia:"
 
-#: gramps.glade:14855
+#: gramps.glade:16005
 msgid "Zip/Postal code:"
 msgstr "Cdigo postal:"
 
-#: gramps.glade:14927
+#: gramps.glade:16089
 msgid "Other names"
 msgstr "Otros nombres"
 
-#: gramps.glade:15188
+#: gramps.glade:16369
 msgid "Other names"
 msgstr "Otros nombres"
 
-#: gramps.glade:16162
+#: gramps.glade:17397
 msgid "GRAMPS Preferences"
 msgstr "Preferencias de GRAMPS"
 
-#: gramps.glade:16234
+#: gramps.glade:17470
 msgid "Categories:"
 msgstr "Categoras:"
 
-#: gramps.glade:16349
+#: gramps.glade:17592
 msgid ""
 "To change your preferences, select one of the subcategories in the menu on "
 "the left hand side of the window."
@@ -6220,35 +6293,35 @@ msgstr ""
 "Para cambiar sus preferencias, seleccione una de las subcategorias en el\n"
 "men del lado izquierdo de la ventana."
 
-#: gramps.glade:16413
+#: gramps.glade:17664
 msgid "Database"
 msgstr "Base de Datos"
 
-#: gramps.glade:16438
+#: gramps.glade:17693
 msgid "_Automatically load last database"
 msgstr "Cargar _automticamente la ltima base de datos"
 
-#: gramps.glade:16459
+#: gramps.glade:17714
 msgid "Family name guessing"
 msgstr "Adivinacin de apellidos"
 
-#: gramps.glade:16546
+#: gramps.glade:17811
 msgid "Toolbar"
 msgstr "Barra de herramientas"
 
-#: gramps.glade:16571
+#: gramps.glade:17840
 msgid "Active person's _relationship to Home Person"
 msgstr "Parentesco de la persona activa con la persona de inicio"
 
-#: gramps.glade:16594
+#: gramps.glade:17863
 msgid "Active person's name and _GRAMPS ID"
 msgstr "Nombre y nmero de identificacin _GRAMPS de la persona activa"
 
-#: gramps.glade:16616
+#: gramps.glade:17885
 msgid "Statusbar"
 msgstr "Barra de Estado"
 
-#: gramps.glade:16644
+#: gramps.glade:17917
 msgid ""
 "GNOME settings\n"
 "Icons Only\n"
@@ -6262,169 +6335,169 @@ msgstr ""
 "Texto debajo de los iconos\n"
 "Texto junto a los iconos"
 
-#: gramps.glade:16709
+#: gramps.glade:17988
 msgid "_Always display the LDS ordinance tabs"
 msgstr "Mostrar _siempre las pestaas para las ordenanzas SUD"
 
-#: gramps.glade:16731
+#: gramps.glade:18010
 msgid "Display"
 msgstr "Mostrar"
 
-#: gramps.glade:16755
+#: gramps.glade:18038
 msgid "Default view"
 msgstr "Vista por defecto"
 
-#: gramps.glade:16780
+#: gramps.glade:18067
 msgid "_Person view"
 msgstr "Vista de _persona"
 
-#: gramps.glade:16803
+#: gramps.glade:18090
 msgid "_Family view"
 msgstr "Vista de _familia"
 
-#: gramps.glade:16825
+#: gramps.glade:18112
 msgid "Family view style"
 msgstr "Estilo de vista de familia"
 
-#: gramps.glade:16850
+#: gramps.glade:18141
 msgid "Left to right"
 msgstr "Izquierda a derecha"
 
-#: gramps.glade:16873
+#: gramps.glade:18164
 msgid "Top to bottom"
 msgstr "Arriba a abajo"
 
-#: gramps.glade:16898
+#: gramps.glade:18189
 msgid "_Display Tip of the Day"
 msgstr "Mostrar consejo del _da"
 
-#: gramps.glade:16967
+#: gramps.glade:18262
 msgid "_Date format:"
 msgstr "Formato de la _fecha:"
 
-#: gramps.glade:16992
+#: gramps.glade:18291
 msgid "Display formats"
 msgstr "Formatos de presentacin"
 
-#: gramps.glade:17078 rule.glade:397
+#: gramps.glade:18387 rule.glade:397
 msgid "_Name:"
 msgstr "_Nombre:"
 
-#: gramps.glade:17103
+#: gramps.glade:18416
 msgid "_Address:"
 msgstr "_Direccin:"
 
-#: gramps.glade:17128 gramps.glade:26902
+#: gramps.glade:18445 gramps.glade:28919
 msgid "_City:"
 msgstr "_Ciudad:"
 
-#: gramps.glade:17153 gramps.glade:27472
+#: gramps.glade:18474 gramps.glade:29534
 msgid "_State/Province:"
 msgstr "_Estado/Provincia:"
 
-#: gramps.glade:17178
+#: gramps.glade:18503
 msgid "_Country:"
 msgstr "_Pas:"
 
-#: gramps.glade:17228
+#: gramps.glade:18561
 msgid "_Phone:"
 msgstr "Tel_fono:"
 
-#: gramps.glade:17253
+#: gramps.glade:18590
 msgid "_Email:"
 msgstr "Correo _electrnico:"
 
-#: gramps.glade:17446
+#: gramps.glade:18787
 msgid "Researcher information"
 msgstr "Informacin del investigador"
 
-#: gramps.glade:17518 gramps.glade:29700
+#: gramps.glade:18867 gramps.glade:31901
 msgid "_Person:"
 msgstr "_Persona:"
 
-#: gramps.glade:17543
+#: gramps.glade:18896
 msgid "_Family:"
 msgstr "_Familia:"
 
-#: gramps.glade:17593
+#: gramps.glade:18954
 msgid "_Source:"
 msgstr "_Fuente:"
 
-#: gramps.glade:17618
+#: gramps.glade:18983
 msgid "_Media object:"
 msgstr "Objeto a_udiovisual:"
 
-#: gramps.glade:17647
+#: gramps.glade:19016
 msgid "I"
 msgstr "I"
 
-#: gramps.glade:17668
+#: gramps.glade:19037
 msgid "F"
 msgstr "F"
 
-#: gramps.glade:17689
+#: gramps.glade:19058
 msgid "P"
 msgstr "P"
 
-#: gramps.glade:17710
+#: gramps.glade:19079
 msgid "S"
 msgstr "S"
 
-#: gramps.glade:17731
+#: gramps.glade:19100
 msgid "O"
 msgstr "O"
 
-#: gramps.glade:17748
+#: gramps.glade:19117
 msgid "GRAMPS ID prefixes"
 msgstr "Prefijos de los nmeros de identificacin GRAMPS"
 
-#: gramps.glade:17957
+#: gramps.glade:19339
 msgid "_Confidence:"
 msgstr "_Confianza:"
 
-#: gramps.glade:17982
+#: gramps.glade:19368
 msgid "_Volume/Film/Page:"
 msgstr "_Volumen/Rollo/Pgina:"
 
-#: gramps.glade:18035
+#: gramps.glade:19429
 msgid "Te_xt:"
 msgstr "Te_xto:"
 
-#: gramps.glade:18062
+#: gramps.glade:19460
 msgid "Co_mments:"
 msgstr "Co_mentarios:"
 
-#: gramps.glade:18089
+#: gramps.glade:19491
 msgid "Publication information:"
 msgstr "Informacin de la publicacin:"
 
-#: gramps.glade:18113 mergedata.glade:919 mergedata.glade:941
+#: gramps.glade:19519 mergedata.glade:919 mergedata.glade:941
 #: plugins.glade:362
 msgid "Author:"
 msgstr "Autor:"
 
-#: gramps.glade:18209
+#: gramps.glade:19631
 msgid "Source selection"
 msgstr "Seleccin de fuente"
 
-#: gramps.glade:18233
+#: gramps.glade:19659
 msgid "Source details"
 msgstr "Detalles de la fuente"
 
-#: gramps.glade:18372
+#: gramps.glade:19802
 msgid "Creates a new source"
 msgstr "Crea una nueva fuente"
 
-#: gramps.glade:18374
+#: gramps.glade:19804
 msgid "_New..."
 msgstr "_Nuevo..."
 
-#: gramps.glade:18394 gramps.glade:21784 gramps.glade:25344 gramps.glade:26354
-#: gramps.glade:27557 gramps.glade:28334 gramps.glade:29869
+#: gramps.glade:19824 gramps.glade:23484 gramps.glade:27288 gramps.glade:28344
+#: gramps.glade:29631 gramps.glade:30444 gramps.glade:32078
 msgid "_Private record"
 msgstr "Registro _privado"
 
-#: gramps.glade:18469
+#: gramps.glade:19899
 msgid ""
 "Very Low\n"
 "Low\n"
@@ -6438,213 +6511,213 @@ msgstr ""
 "Alto\n"
 "Muy alto"
 
-#: gramps.glade:18644
+#: gramps.glade:20083
 msgid "Double click will edit the selected source"
 msgstr "Pulse dos veces para editar la fuente seleccionada"
 
-#: gramps.glade:19700
+#: gramps.glade:21219
 msgid "Style _name:"
 msgstr "_Nombre del estilo:"
 
-#: gramps.glade:19858 rule.glade:1144
+#: gramps.glade:21392 rule.glade:1144
 msgid "Description"
 msgstr "Descripcin"
 
-#: gramps.glade:19887
+#: gramps.glade:21425
 msgid "pt"
 msgstr "pt"
 
-#: gramps.glade:19914 gramps.glade:20222
+#: gramps.glade:21456 gramps.glade:21788
 msgid "Pick a color"
 msgstr "Escoge un color"
 
-#: gramps.glade:19953
+#: gramps.glade:21495
 msgid "_Bold"
 msgstr "_Negrillas"
 
-#: gramps.glade:19975
+#: gramps.glade:21517
 msgid "_Italic"
 msgstr "_Cursiva"
 
-#: gramps.glade:19997
+#: gramps.glade:21539
 msgid "_Underline"
 msgstr "_Subrayado"
 
-#: gramps.glade:20018
+#: gramps.glade:21560
 msgid "Type face"
 msgstr "Tipo de fuente"
 
-#: gramps.glade:20042
+#: gramps.glade:21588
 msgid "Size"
 msgstr "Tamao"
 
-#: gramps.glade:20066
+#: gramps.glade:21616
 msgid "Color"
 msgstr "Color"
 
-#: gramps.glade:20140
+#: gramps.glade:21702
 #, fuzzy
 msgid "_Roman (Times, serif)"
 msgstr "roman (Times)"
 
-#: gramps.glade:20162
+#: gramps.glade:21724
 #, fuzzy
 msgid "_Swiss (Arial, Helvetica, sans-serif)"
 msgstr "swiss (Arial, Helvetica)"
 
-#: gramps.glade:20190
+#: gramps.glade:21752
 msgid "Font options"
 msgstr "Opciones de la fuente"
 
-#: gramps.glade:20238
+#: gramps.glade:21804
 msgid "R_ight:"
 msgstr "_Derecha:"
 
-#: gramps.glade:20266
+#: gramps.glade:21836
 msgid "L_eft:"
 msgstr "_Izquierda:"
 
-#: gramps.glade:20294
+#: gramps.glade:21868
 msgid "_Padding:"
 msgstr "Es_pacio:"
 
-#: gramps.glade:20458
+#: gramps.glade:22048
 msgid "_Left"
 msgstr "_Izquierda"
 
-#: gramps.glade:20480
+#: gramps.glade:22070
 msgid "_Right"
 msgstr "_Derecha"
 
-#: gramps.glade:20503
+#: gramps.glade:22093
 msgid "_Justify"
 msgstr "_Ajustar"
 
-#: gramps.glade:20526
+#: gramps.glade:22116
 msgid "_Center"
 msgstr "_Centrar"
 
-#: gramps.glade:20548
+#: gramps.glade:22138
 msgid "Background"
 msgstr "Fondo"
 
-#: gramps.glade:20572
+#: gramps.glade:22166
 msgid "Margins"
 msgstr "Mrgenes"
 
-#: gramps.glade:20621
+#: gramps.glade:22223
 msgid "Alignment"
 msgstr "Alineacion"
 
-#: gramps.glade:20645
+#: gramps.glade:22251
 msgid "Borders"
 msgstr "Bordes"
 
-#: gramps.glade:20670
+#: gramps.glade:22280
 msgid "Le_ft"
 msgstr "_Izquierda"
 
-#: gramps.glade:20692
+#: gramps.glade:22302
 msgid "Ri_ght"
 msgstr "_Derecha"
 
-#: gramps.glade:20714
+#: gramps.glade:22324
 msgid "_Top"
 msgstr "_Arriba"
 
-#: gramps.glade:20736
+#: gramps.glade:22346
 msgid "_Bottom"
 msgstr "A_bajo"
 
-#: gramps.glade:20757
+#: gramps.glade:22367
 msgid "First line"
 msgstr "Primera lnea"
 
-#: gramps.glade:20826
+#: gramps.glade:22444
 msgid "I_ndent:"
 msgstr "Sa_ngrar:"
 
-#: gramps.glade:20857
+#: gramps.glade:22479
 msgid "Paragraph options"
 msgstr "Opciones de prrafo"
 
-#: gramps.glade:21143
+#: gramps.glade:22782
 msgid "Internal note"
 msgstr "Nota interno"
 
-#: gramps.glade:21399 gramps.glade:22796
+#: gramps.glade:23055 gramps.glade:24567
 msgid "Object type:"
 msgstr "Tipo de Objeto:"
 
-#: gramps.glade:21579
+#: gramps.glade:23259
 msgid "Lower X:"
 msgstr "X inferior:"
 
-#: gramps.glade:21603
+#: gramps.glade:23287
 msgid "Upper X:"
 msgstr "X superior:"
 
-#: gramps.glade:21627
+#: gramps.glade:23315
 msgid "Upper Y:"
 msgstr "Y superior:"
 
-#: gramps.glade:21651
+#: gramps.glade:23343
 msgid "Lower Y:"
 msgstr "Y inferior:"
 
-#: gramps.glade:21759
+#: gramps.glade:23455
 msgid "Subsection"
 msgstr "Subseccin"
 
-#: gramps.glade:21805
+#: gramps.glade:23505
 msgid "Privacy"
 msgstr "Intimidad"
 
-#: gramps.glade:22044
+#: gramps.glade:23760
 msgid "Global Notes"
 msgstr "Notas globales"
 
-#: gramps.glade:22245
+#: gramps.glade:23988
 msgid "Creates a new object attribute from the above data"
 msgstr "Crea un nuevo atributo objeto usando los datos anteriores"
 
-#: gramps.glade:23275
+#: gramps.glade:25097
 msgid "Creates a new attribute from the above data"
 msgstr "Crea un nuevo evento usando los datos anteriores"
 
-#: gramps.glade:23969
+#: gramps.glade:25827
 msgid "Close _without saving"
 msgstr "Cerrar si_n salvar"
 
-#: gramps.glade:24095
+#: gramps.glade:25961
 msgid "Do not ask again"
 msgstr "No preguntar ms veces"
 
-#: gramps.glade:24713
+#: gramps.glade:26616
 msgid "Remove object and all references to it from the database"
 msgstr "Borrar el objeto y todas las referencias al mismo de la base de datos"
 
-#: gramps.glade:24758
+#: gramps.glade:26661
 msgid "_Remove Object"
 msgstr "_Borrar Objeto"
 
-#: gramps.glade:24785
+#: gramps.glade:26692
 msgid "Keep reference to the missing file"
 msgstr "Mantener la referencia al archivo que falta"
 
-#: gramps.glade:24788
+#: gramps.glade:26695
 msgid "_Keep Reference"
 msgstr "_Mantener Referencia"
 
-#: gramps.glade:24799
+#: gramps.glade:26706
 msgid "Select replacement for the missing file"
 msgstr "Escoja un archivo con el que reemplazar al que falta"
 
-#: gramps.glade:24846
+#: gramps.glade:26753
 msgid "_Select File"
 msgstr "_Seleccionar Archivo"
 
-#: gramps.glade:24959
+#: gramps.glade:26878
 msgid ""
 "If you check this button, all the missing media files will be automatically "
 "treated according to the currently selected option. No further dialogs will "
@@ -6654,91 +6727,99 @@ msgstr ""
 "tratar automticamente de acuerdo con la opcin seleccionada actualmente.  "
 "No se presentarn nuevos dilogos para ningn archivo audiovisual que falte."
 
-#: gramps.glade:24961
+#: gramps.glade:26880
 msgid "_Use this selection for all missing media files"
 msgstr "_Usar esta seleccin para todos los archivos audiovisuales que falten"
 
-#: gramps.glade:25022
+#: gramps.glade:26942
 msgid "Close window without changes"
 msgstr "Cerrar la ventana sin guardar los cambios"
 
-#: gramps.glade:25123
+#: gramps.glade:27047
 msgid "_Event type:"
 msgstr "_Tipo de evento:"
 
-#: gramps.glade:25175
+#: gramps.glade:27107
 msgid "De_scription:"
 msgstr "De_scripcin:"
 
-#: gramps.glade:25231
+#: gramps.glade:27171
 msgid "_Cause:"
 msgstr "_Causa:"
 
-#: gramps.glade:26301
+#: gramps.glade:28283
 msgid "_Attribute:"
 msgstr "_Atributo:"
 
-#: gramps.glade:26325
+#: gramps.glade:28311
 msgid "_Value:"
 msgstr "_Valor:"
 
-#: gramps.glade:26958 gramps.glade:27500
+#: gramps.glade:28951
+msgid "C_ounty:"
+msgstr "C_ondado:"
+
+#: gramps.glade:28983 gramps.glade:29566
 msgid "Cou_ntry:"
 msgstr "_Pas:"
 
-#: gramps.glade:27196
+#: gramps.glade:29187 gramps.glade:29779
+msgid "P_hone:"
+msgstr "_Telfono:"
+
+#: gramps.glade:29237
 msgid "_Zip/Postal code:"
 msgstr "Cdigo Postal:"
 
-#: gramps.glade:27416
+#: gramps.glade:29470
 msgid "Add_ress:"
 msgstr "Di_reccin:"
 
-#: gramps.glade:27444
+#: gramps.glade:29502
 msgid "_City/County:"
 msgstr "_Ciudad/Condado:"
 
-#: gramps.glade:28271
+#: gramps.glade:30373
 msgid "_Web address:"
 msgstr "Direccin _web:"
 
-#: gramps.glade:28299
+#: gramps.glade:30405
 msgid "_Description:"
 msgstr "_Descripcin:"
 
-#: gramps.glade:28580
+#: gramps.glade:30699
 msgid "Suffi_x:"
 msgstr "S_ufijo:"
 
-#: gramps.glade:28664
+#: gramps.glade:30795
 msgid "P_rivate record"
 msgstr "Registro P_rivado"
 
-#: gramps.glade:28685
+#: gramps.glade:30816
 msgid "Family _prefix:"
 msgstr "Prefi_jo:"
 
-#: gramps.glade:28798
+#: gramps.glade:30933
 msgid "P_atronymic:"
 msgstr "P_atronmico:"
 
-#: gramps.glade:28891
+#: gramps.glade:31037
 msgid "G_roup as:"
 msgstr "Ag_rupar como:"
 
-#: gramps.glade:28916
+#: gramps.glade:31066
 msgid "_Sort as:"
 msgstr "Cla_sificar como:"
 
-#: gramps.glade:28943
+#: gramps.glade:31097
 msgid "_Display as:"
 msgstr "_Mostrar como:"
 
-#: gramps.glade:28970
+#: gramps.glade:31128
 msgid "Name Information"
 msgstr "Informacin del nombre"
 
-#: gramps.glade:29034
+#: gramps.glade:31203
 msgid ""
 "Default (based on locale)\n"
 "Family name, Given name\n"
@@ -6748,7 +6829,7 @@ msgstr ""
 "Apellidos, Nombre\n"
 "Nombre, Apellidos"
 
-#: gramps.glade:29052
+#: gramps.glade:31223
 msgid ""
 "Default (based on locale)\n"
 "Given name Family name\n"
@@ -6758,96 +6839,96 @@ msgstr ""
 "Nombre Apellidos\n"
 "Apellidos Nombre\n"
 
-#: gramps.glade:29178
+#: gramps.glade:31355
 msgid "_Override"
 msgstr "Manual"
 
-#: gramps.glade:29728
+#: gramps.glade:31933
 msgid "_Comment:"
 msgstr "_Comentarios:"
 
-#: gramps.glade:29780
+#: gramps.glade:31989
 msgid "Person is in the _database"
 msgstr "La persona est en la base de datos"
 
-#: gramps.glade:29848
+#: gramps.glade:32057
 msgid "Choose a person from the database"
 msgstr "Elegir una persona de la base de datos"
 
-#: gramps.glade:29850
+#: gramps.glade:32059
 msgid "_Select"
 msgstr "_Seleccionar"
 
-#: gramps.glade:29979
+#: gramps.glade:32189
 msgid "_Next"
 msgstr "Siguie_nte"
 
-#: gramps.glade:30038
+#: gramps.glade:32252
 msgid "_Display on startup"
 msgstr "_Mostrar al arrancar"
 
-#: gramps.glade:30101
+#: gramps.glade:32319
 msgid "Gramps' Tip of the Day"
 msgstr "Consejo del da de Gramps"
 
-#: gramps.glade:30134
+#: gramps.glade:32356
 msgid "GRAMPS - Loading Database"
 msgstr "GRAMPS - Cargando Base de Datos"
 
-#: gramps.glade:30159
+#: gramps.glade:32382
 msgid "Loading database"
 msgstr "Cargando base de datos"
 
-#: gramps.glade:30183
+#: gramps.glade:32410
 msgid "GRAMPS is loading the database you selected. Please wait."
 msgstr ""
 "GRAMPS est cargando la base de datos que seleccion. Por favor, espere."
 
-#: gramps.glade:30366
+#: gramps.glade:32606
 msgid "Calenda_r:"
 msgstr "Calenda_rio:"
 
-#: gramps.glade:30416
+#: gramps.glade:32662
 msgid "Q_uality"
 msgstr "_Calidad"
 
-#: gramps.glade:30458
+#: gramps.glade:32710
 msgid "_Type"
 msgstr "_Tipo"
 
-#: gramps.glade:30500
+#: gramps.glade:32758
 msgid "Date"
 msgstr "Fecha"
 
-#: gramps.glade:30524
+#: gramps.glade:32786
 msgid "_Day"
 msgstr "_Da"
 
-#: gramps.glade:30549
+#: gramps.glade:32815
 msgid "_Month"
 msgstr "_Mes"
 
-#: gramps.glade:30574
+#: gramps.glade:32844
 msgid "_Year"
 msgstr "A_o"
 
-#: gramps.glade:30658
+#: gramps.glade:32934
 msgid "Second date"
 msgstr "Segunda fecha"
 
-#: gramps.glade:30682
+#: gramps.glade:32962
 msgid "D_ay"
 msgstr "D_a"
 
-#: gramps.glade:30707
+#: gramps.glade:32991
 msgid "Mo_nth"
 msgstr "M_es"
 
-#: gramps.glade:30732
+#: gramps.glade:33020
 msgid "Y_ear"
 msgstr "A_o"
 
-#: gramps.glade:30829
+#: gramps.glade:33123
 msgid "Te_xt comment:"
 msgstr "Comentario en te_xto:"
 
@@ -6962,11 +7043,13 @@ msgstr "Personas cuyos registros contienen..."
 msgid "People with records matching regular expression..."
 msgstr "Personas con registros que se ajustan a la expresin regular..."
 
-#: gramps_main.py:1074 gramps_main.py:1097
+#: gramps_main.py:1074 gramps_main.py:1086 gramps_main.py:1104
+#: gramps_main.py:1116
 msgid "Cannot merge people."
 msgstr "No se pudo mezclar las personas."
 
-#: gramps_main.py:1075 gramps_main.py:1098
+#: gramps_main.py:1075 gramps_main.py:1087 gramps_main.py:1105
+#: gramps_main.py:1117
 msgid ""
 "Exactly two people must be selected to perform a merge. A second person can "
 "be selected by holding down the control key while clicking on the desired "
@@ -6976,20 +7059,20 @@ msgstr ""
 "posible seleccionar una segunda persona manteniendo pulsada la tecla control "
 "mientras se pulsa en la persona deseada."
 
-#: gramps_main.py:1221
+#: gramps_main.py:1235
 msgid "Cannot unpak archive"
 msgstr "No se puede desempaquetar el archivo"
 
-#: gramps_main.py:1222 plugins/ReadPkg.py:67
+#: gramps_main.py:1236 plugins/ReadPkg.py:67
 msgid "Temporary directory %s is not writable"
 msgstr "No se puede escribir en El directorio temporal %s"
 
-#: gramps_main.py:1264 gramps_main.py:1270 gramps_main.py:1291
-#: gramps_main.py:1295 gramps_main.py:1298
+#: gramps_main.py:1278 gramps_main.py:1284 gramps_main.py:1305
+#: gramps_main.py:1309 gramps_main.py:1312
 msgid "Cannot open database"
 msgstr "No se pudo abrir la base de datos"
 
-#: gramps_main.py:1265
+#: gramps_main.py:1279
 msgid ""
 "The selected file is a directory, not a file.\n"
 "A GRAMPS database must be a file."
@@ -6997,40 +7080,40 @@ msgstr ""
 "El archivo seleccionado es un directorio en vez de un archivo.\n"
 "Una base de datos GRAMPS debe ser un archivo."
 
-#: gramps_main.py:1271
+#: gramps_main.py:1285
 msgid "You do not have read access to the selected file."
 msgstr "No tiene permiso de lectura para el archivo seleccionado."
 
-#: gramps_main.py:1276
+#: gramps_main.py:1290
 msgid "Read only database"
 msgstr "Base de datos de slo lectura"
 
-#: gramps_main.py:1277
+#: gramps_main.py:1291
 msgid "You do not have write access to the selected file."
 msgstr "No tiene acceso en escritura al archivo seleccionado."
 
-#: gramps_main.py:1286
+#: gramps_main.py:1300
 msgid "Read Only"
 msgstr "Slo lectura"
 
-#: gramps_main.py:1292
+#: gramps_main.py:1306
 msgid "The database file specified could not be opened."
 msgstr "No se pudo abrir el archivo de base de datos especificado."
 
-#: gramps_main.py:1299
+#: gramps_main.py:1313
 msgid "%s could not be opened."
 msgstr "no se pudo abrir %s."
 
-#: gramps_main.py:1358
+#: gramps_main.py:1372
 msgid "Save Media Object"
 msgstr "Salvar Objeto Audiovisual"
 
-#: gramps_main.py:1404 plugins/Check.py:284 plugins/WriteCD.py:255
+#: gramps_main.py:1418 plugins/Check.py:284 plugins/WriteCD.py:255
 #: plugins/WritePkg.py:171
 msgid "Media object could not be found"
 msgstr "No se pudo encontrar el objeto audiovisual"
 
-#: gramps_main.py:1405 plugins/WriteCD.py:256 plugins/WritePkg.py:172
+#: gramps_main.py:1419 plugins/WriteCD.py:256 plugins/WritePkg.py:172
 msgid ""
 "%(file_name)s is referenced in the database, but no longer exists. The file "
 "may have been deleted or moved to a different location. You may choose to "
@@ -7042,73 +7125,73 @@ msgstr ""
 "borrar la referencia de la base de datos, mantener la referencia al archivo "
 "inexistente o seleccionar otro archivo."
 
-#: gramps_main.py:1451
+#: gramps_main.py:1465
 msgid "Deleting the person will remove the person from the database."
 msgstr "Borrar una persona la eliminar de la base de datos."
 
-#: gramps_main.py:1455
+#: gramps_main.py:1469
 msgid "_Delete Person"
 msgstr "_Borrar Persona"
 
-#: gramps_main.py:1519
+#: gramps_main.py:1533
 msgid "Delete Person (%s)"
 msgstr "Borrar Persona (%s)"
 
-#: gramps_main.py:1603
+#: gramps_main.py:1617
 msgid "%(relationship)s of %(person)s"
 msgstr "%(relationship)s de %(person)s"
 
-#: gramps_main.py:1765
+#: gramps_main.py:1779
 msgid "Upgrading database..."
 msgstr "Actualizando el formato de la base de datos..."
 
-#: gramps_main.py:1778
+#: gramps_main.py:1792
 msgid "Setup complete"
 msgstr "Preparacin finalizada"
 
-#: gramps_main.py:1795
+#: gramps_main.py:1809
 msgid "Loading %s..."
 msgstr "Cargando %s..."
 
-#: gramps_main.py:1798
+#: gramps_main.py:1812
 msgid "Opening database..."
 msgstr "Abriendo la base de datos..."
 
-#: gramps_main.py:1829
+#: gramps_main.py:1843
 msgid "No Home Person has been set."
 msgstr "No se ha establecido una persona inicial."
 
-#: gramps_main.py:1830
+#: gramps_main.py:1844
 msgid "The Home Person may be set from the Edit menu."
 msgstr "Se puede establecer la persona inicial en el men Editar."
 
-#: gramps_main.py:1836
+#: gramps_main.py:1850
 msgid "%s has been bookmarked"
 msgstr "%s ha sido marcado"
 
-#: gramps_main.py:1839
+#: gramps_main.py:1853
 msgid "Could Not Set a Bookmark"
 msgstr "No se pudo establecer un Marcador"
 
-#: gramps_main.py:1840
+#: gramps_main.py:1854
 msgid "A bookmark could not be set because no one was selected."
 msgstr "No se pudo establecer el marcador porque no haba nadie seleccionado."
 
-#: gramps_main.py:1854
+#: gramps_main.py:1868
 msgid "Could not go to a Person"
 msgstr "No se pudo ir a una persona"
 
-#: gramps_main.py:1855
+#: gramps_main.py:1869
 msgid "Either stale bookmark or broken history caused by IDs reorder."
 msgstr ""
 "O bien el marcador apunta a un registro borrado o la historia ha quedado "
 "daada por haber reordenado los IDs."
 
-#: gramps_main.py:1865
+#: gramps_main.py:1879
 msgid "Set %s as the Home Person"
 msgstr "Establecer %s como Persona Inicial"
 
-#: gramps_main.py:1866
+#: gramps_main.py:1880
 msgid ""
 "Once a Home Person is defined, pressing the Home button on the toolbar will "
 "make the home person the active person."
@@ -7116,15 +7199,15 @@ msgstr ""
 "Una vez se ha definido una Persona Inicial, pulsar el botn Inicio de la "
 "barra de herramientas har que la persona inicial sea la persona activa."
 
-#: gramps_main.py:1869
+#: gramps_main.py:1883
 msgid "_Set Home Person"
 msgstr "_Establecer Persona Inicial"
 
-#: gramps_main.py:1880
+#: gramps_main.py:1894
 msgid "A person must be selected to export"
 msgstr "Debe seleccionares una persona para exportar"
 
-#: gramps_main.py:1881
+#: gramps_main.py:1895
 msgid ""
 "Exporting requires that an active person be selected. Please select a person "
 "and try again."
@@ -7132,12 +7215,12 @@ msgstr ""
 "La exportacin requiere que haya una persona activa seleccionada.  Por "
 "favor, seleccione una persona e intente de nuevo."
 
-#: gramps_main.py:1912 gramps_main.py:1916 gramps_main.py:1920
-#: gramps_main.py:1934 gramps_main.py:1936
+#: gramps_main.py:1926 gramps_main.py:1930 gramps_main.py:1934
+#: gramps_main.py:1948 gramps_main.py:1950
 msgid "Could not create example database"
 msgstr "No se pudo crear la base de datos de ejemplo"
 
-#: gramps_main.py:1913 gramps_main.py:1917 gramps_main.py:1921
+#: gramps_main.py:1927 gramps_main.py:1931 gramps_main.py:1935
 msgid "The directory ~/.gramps/example could not be created."
 msgstr "No se pudo crear el directorio ~/.gramps/example"
 
@@ -7208,7 +7291,7 @@ msgstr "Correo electr
 #: plugins/AncestorChart.py:245 plugins/AncestorChart2.py:499
 #: plugins/AncestorReport.py:290 plugins/Ancestors.py:909
 #: plugins/Ancestors.py:925 plugins/Ancestors.py:931 plugins/DesGraph.py:333
-#: plugins/DetAncestralReport.py:520 plugins/FamilyGroup.py:514
+#: plugins/DetAncestralReport.py:520 plugins/FamilyGroup.py:515
 #: plugins/FanChart.py:299 plugins/FtmStyleAncestors.py:390
 #: plugins/FtmStyleAncestors.py:395 plugins/FtmStyleAncestors.py:400
 #: plugins/FtmStyleAncestors.py:405 plugins/FtmStyleDescendants.py:536
@@ -7236,7 +7319,7 @@ msgstr "Carta de Ascendientes"
 #: plugins/AncestorReport.py:306 plugins/Ancestors.py:968
 #: plugins/BookReport.py:1117 plugins/CountAncestors.py:122
 #: plugins/DescendReport.py:198 plugins/DetAncestralReport.py:618
-#: plugins/DetDescendantReport.py:639 plugins/FamilyGroup.py:548
+#: plugins/DetDescendantReport.py:639 plugins/FamilyGroup.py:549
 #: plugins/FtmStyleAncestors.py:422 plugins/FtmStyleDescendants.py:572
 #: plugins/GraphViz.py:971 plugins/GraphViz.py:985
 #: plugins/IndivComplete.py:595 plugins/IndivSummary.py:391
@@ -7342,7 +7425,7 @@ msgstr " y fue enterrado en %s."
 
 #: plugins/AncestorReport.py:276 plugins/Ancestors.py:894
 #: plugins/DescendReport.py:174 plugins/DetAncestralReport.py:484
-#: plugins/DetDescendantReport.py:505 plugins/FamilyGroup.py:505
+#: plugins/DetDescendantReport.py:505 plugins/FamilyGroup.py:506
 #: plugins/FtmStyleAncestors.py:375 plugins/FtmStyleDescendants.py:521
 #: plugins/IndivComplete.py:552 plugins/IndivSummary.py:348
 #: plugins/SimpleBookTitle.py:265 plugins/StatisticsChart.py:812
@@ -7414,11 +7497,11 @@ msgstr " f. %(death_date)s"
 
 #: plugins/Ancestors.py:547
 msgid "born"
-msgstr "nacido"
+msgstr "naci"
 
 #: plugins/Ancestors.py:559
 msgid "died"
-msgstr "fallecido"
+msgstr "falleci"
 
 #: plugins/Ancestors.py:605
 msgid "Mrs."
@@ -7726,7 +7809,7 @@ msgstr "Se encontr
 
 #: plugins/Check.py:500
 msgid "%d empty families were found\n"
-msgstr "se econtraron %d familias vacas\n"
+msgstr "se encontraron %d familias vacas\n"
 
 #: plugins/Check.py:502
 msgid "1 corrupted family relationship fixed\n"
@@ -7873,7 +7956,7 @@ msgid "Descendant Graph"
 msgstr "Grfico de Descendientes"
 
 #: plugins/DesGraph.py:349 plugins/FanChart.py:325
-#: plugins/StatisticsChart.py:958
+#: plugins/StatisticsChart.py:963
 msgid "Alpha"
 msgstr "Alfa"
 
@@ -8067,37 +8150,37 @@ msgstr ""
 "personalizados que pueden ser aplicados a la base de datos para encontrar "
 "eventos similares"
 
-#: plugins/ExportVCalendar.py:54
+#: plugins/ExportVCalendar.py:55
 msgid "Export to vCalendar"
 msgstr "Exportar a vCalendar"
 
-#: plugins/ExportVCalendar.py:199
+#: plugins/ExportVCalendar.py:209
 msgid "Marriage of %s"
 msgstr "Matrimonio de %s"
 
-#: plugins/ExportVCalendar.py:217 plugins/ExportVCalendar.py:219
+#: plugins/ExportVCalendar.py:227 plugins/ExportVCalendar.py:229
 msgid "Birth of %s"
 msgstr "Nacimiento de %s"
 
-#: plugins/ExportVCalendar.py:228 plugins/ExportVCalendar.py:230
+#: plugins/ExportVCalendar.py:238 plugins/ExportVCalendar.py:240
 msgid "Death of %s"
 msgstr "Defuncin de %s"
 
-#: plugins/ExportVCalendar.py:283
+#: plugins/ExportVCalendar.py:293
 msgid "Anniversary: %s"
 msgstr "Aniversario: %s"
 
-#: plugins/ExportVCalendar.py:310
+#: plugins/ExportVCalendar.py:320
 msgid "vCalendar"
 msgstr "vCalendar"
 
-#: plugins/ExportVCalendar.py:311
+#: plugins/ExportVCalendar.py:321
 msgid "vCalendar is used in many calendaring and pim applications."
 msgstr ""
 "El formato vCalendar lo utilizan muchas aplicaciones de calendario o agenda "
 "electrnica."
 
-#: plugins/ExportVCalendar.py:312
+#: plugins/ExportVCalendar.py:322
 msgid "vCalendar export options"
 msgstr "Opciones de exportacin de vCalendar"
 
@@ -8105,17 +8188,17 @@ msgstr "Opciones de exportaci
 msgid "Export to vCard"
 msgstr "Exportar a vCard"
 
-#: plugins/ExportVCard.py:234
+#: plugins/ExportVCard.py:243
 msgid "vCard"
 msgstr "vCard"
 
-#: plugins/ExportVCard.py:235
+#: plugins/ExportVCard.py:244
 msgid "vCard is used in many addressbook and pim applications."
 msgstr ""
 "El formato vCard lo utilizan muchas aplicaciones de libreta de direcciones o "
 "agenda."
 
-#: plugins/ExportVCard.py:236
+#: plugins/ExportVCard.py:245
 msgid "vCard export options"
 msgstr "Opciones de exportacin de vCard"
 
@@ -8127,19 +8210,19 @@ msgstr "Esposo"
 msgid "Wife"
 msgstr "Esposa"
 
-#: plugins/FamilyGroup.py:383 plugins/FamilyGroup.py:547
+#: plugins/FamilyGroup.py:383 plugins/FamilyGroup.py:548
 msgid "Family Group Report"
 msgstr "Reporte del Grupo Familiar"
 
-#: plugins/FamilyGroup.py:523
+#: plugins/FamilyGroup.py:524
 msgid "The style used for the text related to the children."
 msgstr "Estilo utilizado para el texto relativo a los hijos."
 
-#: plugins/FamilyGroup.py:532
+#: plugins/FamilyGroup.py:533
 msgid "The style used for the parent's name"
 msgstr "Estilo utilizado para el nombre del padre o de la madre."
 
-#: plugins/FamilyGroup.py:551
+#: plugins/FamilyGroup.py:552
 msgid ""
 "Creates a family group report, showing information on a set of parents and "
 "their children."
@@ -9168,7 +9251,7 @@ msgstr "Marque para invert
 msgid "Sort in reverse order"
 msgstr "Orden inverso"
 
-#: plugins/StatisticsChart.py:877
+#: plugins/StatisticsChart.py:881
 msgid ""
 "Select year range within which people need to be born to be selected for "
 "statistics."
@@ -9176,11 +9259,11 @@ msgstr ""
 "Seleccione el rango de aos para el nacimiento de las personas seleccionadas "
 "para la estadstica."
 
-#: plugins/StatisticsChart.py:878
+#: plugins/StatisticsChart.py:882
 msgid "People born between"
 msgstr "Personas nacidas entre"
 
-#: plugins/StatisticsChart.py:882
+#: plugins/StatisticsChart.py:886
 msgid ""
 "Check this if you want people who have no known birth date or year to be "
 "accounted also in the statistics."
@@ -9188,48 +9271,48 @@ msgstr ""
 "Marque aqu si desea que se incluyan en la estadstica las personas sin "
 "fecha o ao de nacimiento."
 
-#: plugins/StatisticsChart.py:883
+#: plugins/StatisticsChart.py:887
 msgid "Include people without known birth years"
 msgstr "Incluir personas sin ao de nacimiento conocido"
 
-#: plugins/StatisticsChart.py:895
+#: plugins/StatisticsChart.py:899
 msgid "Select which genders are included into statistics."
 msgstr "Seleccione qu sexos se incluirn en la estadstica."
 
-#: plugins/StatisticsChart.py:896
+#: plugins/StatisticsChart.py:900
 msgid "Genders included"
 msgstr "Sexos incluidos"
 
-#: plugins/StatisticsChart.py:899
+#: plugins/StatisticsChart.py:903
 msgid ""
 "With fewer items pie chart and legend will be used instead of a bar chart."
 msgstr ""
 "Con menos elementos, se utilizar un diagrama de tarta en vez de un diagrama "
 "de barras."
 
-#: plugins/StatisticsChart.py:902
+#: plugins/StatisticsChart.py:907
 msgid "Max. items for a pie"
 msgstr "Nmero mximo de datos para un diagrama de tarta"
 
-#: plugins/StatisticsChart.py:921
+#: plugins/StatisticsChart.py:926
 msgid "Mark checkboxes to add charts with indicated data"
 msgstr "Marque las casillas para agregar diagramas con los datos respectivos"
 
-#: plugins/StatisticsChart.py:922 plugins/StatisticsChart.py:927
+#: plugins/StatisticsChart.py:927 plugins/StatisticsChart.py:932
 msgid "Chart Selection"
 msgstr "Seleccin del grfico"
 
-#: plugins/StatisticsChart.py:926
+#: plugins/StatisticsChart.py:931
 msgid "Note that both biological and adopted children are taken into account."
 msgstr ""
 "Dese cuenta de que se tienen en cuenta tanto los hijos biolgicos como los "
 "adoptados."
 
-#: plugins/StatisticsChart.py:957
+#: plugins/StatisticsChart.py:962
 msgid "Statistics Chart"
 msgstr "Grfico Estadistico"
 
-#: plugins/StatisticsChart.py:961
+#: plugins/StatisticsChart.py:966
 msgid "Generates statistical bar and pie charts of the people in the database."
 msgstr ""
 "Genera grficos estadsticos de barras y de tarta de las personas de la base "
@@ -10015,31 +10098,31 @@ msgstr ""
 "CDs. A continuacin puede grabar un CD con estos datos y la copia resultante "
 "ser transportable a otros equipos, aunque utilicen un procesador diferente."
 
-#: plugins/WriteFtree.py:273
+#: plugins/WriteFtree.py:281
 msgid "_Web Family Tree"
 msgstr "_Web Family Tree"
 
-#: plugins/WriteFtree.py:274
+#: plugins/WriteFtree.py:282
 msgid "Web Family Tree format."
 msgstr "Formato Web Family Tree."
 
-#: plugins/WriteFtree.py:275
+#: plugins/WriteFtree.py:283
 msgid "Web Family Tree export options"
 msgstr "Opciones de exportacin a Web Family Tree"
 
-#: plugins/WriteGeneWeb.py:218
+#: plugins/WriteGeneWeb.py:227
 msgid "No families matched by selected filter"
 msgstr "Ninguna familia se ajust al filtro seleccionado"
 
-#: plugins/WriteGeneWeb.py:577
+#: plugins/WriteGeneWeb.py:586
 msgid "G_eneWeb"
 msgstr "G_eneWeb"
 
-#: plugins/WriteGeneWeb.py:578
+#: plugins/WriteGeneWeb.py:587
 msgid "GeneWeb is a web based genealogy program."
 msgstr "GeneWeb es un programa de genealoga basado en Web."
 
-#: plugins/WriteGeneWeb.py:579
+#: plugins/WriteGeneWeb.py:588
 msgid "GeneWeb export options"
 msgstr "Opciones de exportacin a GeneWeb"
 
@@ -10406,322 +10489,15 @@ msgstr "Regla Seleccionada"
 msgid "Values"
 msgstr "Valores"
 
-#: GenericFilter.py:205
-msgid ""
-"Matches the ancestors of two people back to a common ancestor, producing the "
-"relationship path between two people."
-msgstr ""
-"Compara los ascendientes de dos personas hasta encontrar un ascendiente "
-"comn, produciendo un camino de parentesto entre dos personas."
-
-#: GenericFilter.py:291
-msgid "Matches the person with a specified GRAMPS ID"
-msgstr "Coincide con la persona que tiene el ID GRAMPS especificado"
-
-#: GenericFilter.py:467
-msgid "Matches people that are descendants of someone matched by a filter"
-msgstr ""
-"Coincide con las personas que son descendientes de alguien que coincide con "
-"un filtro"
-
-#: GenericFilter.py:592
-msgid "Matches the person that is a child of someone matched by a filter"
-msgstr ""
-"Coincide con las personas que son hijas de alguien que coincide con un filtro"
-
-#: GenericFilter.py:637
-msgid "Matches the person that is a sibling of someone matched by a filter"
-msgstr ""
-"Coincide con las personas que son hermanos o hermanas de alguien que "
-"coincide con un filtro"
-
-#: GenericFilter.py:802
-msgid "Matches people that are ancestors of someone matched by a filter"
-msgstr ""
-"Coincide con las personas que son ancendientes de alguien que coincide con "
-"un filtro"
-
-#: GenericFilter.py:1026
-msgid ""
-"Matches people that have a common ancestor with someone matched by a filter"
-msgstr ""
-"Coincide con las personas con un ascendiente comn con alguien que coincide "
-"con un filtro"
-
-#: GenericFilter.py:1088
-msgid "Matches the person with a personal event of a particular value"
-msgstr ""
-"Coincide con las personas con un evento personal de un valor particular"
-
-#: GenericFilter.py:1141
-msgid "Matches the person with a family event of a particular value"
-msgstr ""
-"Coincide con las personas con un evento familiar de un valor particular"
-
-#: GenericFilter.py:1189
-msgid "Matches the person who has a particular relationship"
-msgstr "Personas con una cierta relacin"
-
-#: GenericFilter.py:1252
-msgid "Matches the person with a birth of a particular value"
-msgstr "Coincide con las personas con un nacimiento de un valor particular"
-
-#: GenericFilter.py:1298
-msgid "Matches the person with a death of a particular value"
-msgstr "Coincide con las personas con un fallecimiento de un valor particular"
-
-#: GenericFilter.py:1389 GenericFilter.py:1428
-msgid "Matches the person with a specified (partial) name"
-msgstr "Coincide con las personas con un nombre (parcial) especificado"
-
-#: GenericFilter.py:1524
-msgid "Matches the person married to someone matching a filter"
-msgstr ""
-"Coincide con las personas casadas con alguien que coincide con un filtro"
-
-#: GenericFilter.py:1557
-msgid "Matches person who were adopted"
-msgstr "Coincide con la personas que fueron adoptadas"
-
-#: GenericFilter.py:1585
-msgid "Matches person who have images in the gallery"
-msgstr "Coincide con las personas que tienen imgenes en la galera"
-
-#: GenericFilter.py:1609
-msgid "Matches persons who have children"
-msgstr "Personas con hijos"
-
-#: GenericFilter.py:1635
-msgid "Matches persons who have have no spouse"
-msgstr "Personas sin cnyuges"
-
-#: GenericFilter.py:1659
-msgid "Matches persons who have more than one spouse"
-msgstr "Personas con ms de un cnyuge"
-
-#: GenericFilter.py:1683
-msgid "Matches persons without a birthdate"
-msgstr "Personas sin fecha de nacimiento"
-
-#: GenericFilter.py:1713
-msgid "Matches persons with missing date or place in an event"
-msgstr "Personas con eventos sin fecha o lugar"
-
-#: GenericFilter.py:1744
-msgid "Matches persons with missing date or place in an event of the family"
-msgstr "Personas con eventos familiares sin fecha o lugar"
-
-#: GenericFilter.py:1784
-msgid "Matches persons without indications of death that are not too old"
-msgstr ""
-"Coincide con las personas sin datos de fallecimiento o demasiado viejas"
-
-#: GenericFilter.py:1808
-msgid "Matches persons that are indicated as private"
-msgstr "Personas marcadas como privadas"
-
-#: GenericFilter.py:1840
-msgid "Matches persons who are witnesses in an event"
-msgstr "Personas testigos de un evento"
-
-#: GenericFilter.py:1923
-msgid "Matches persons whose records contain text matching a substring"
-msgstr "Personas cuyos registros contienen texto que coincide con una cadena"
-
-#: GenericFilter.py:2196
-msgid "Is default person"
-msgstr "Es la persona inicial"
-
-#: GenericFilter.py:2200
-msgid "Has the relationships"
-msgstr "Tiene las relaciones"
-
-#: GenericFilter.py:2204
-msgid "Is a descendant family member of"
-msgstr "Es un miembro de la familia descendiente de"
-
-#: GenericFilter.py:2205
-msgid "Is a descendant of filter match"
-msgstr "Descendiente de alguien seleccionado en otro filtro"
-
-#: GenericFilter.py:2206
-msgid "Is a descendant of person not more than N generations away"
-msgstr "Es descendiente de una persona a no ms de N generaciones de distancia"
-
-#: GenericFilter.py:2208
-msgid "Is a descendant of person at least N generations away"
-msgstr "Es descendiente de una persona al menos a N generaciones de distancia"
-
-#: GenericFilter.py:2210
-msgid "Is a child of filter match"
-msgstr "Es hijo de una coincidencia de un filtro"
-
-#: GenericFilter.py:2212
-msgid "Is an ancestor of filter match"
-msgstr "Es un ascendiente de alguien seleccionado en otro filtro"
-
-#: GenericFilter.py:2213
-msgid "Is an ancestor of person not more than N generations away"
-msgstr "Es ascendiente de una persona a no ms de N generaciones de distancia"
-
-#: GenericFilter.py:2215
-msgid "Is an ancestor of person at least N generations away"
-msgstr "Es ascendiente de una persona al menos a N generaciones de distancia"
-
-#: GenericFilter.py:2217
-msgid "Is a parent of filter match"
-msgstr "Es padre o madre de una coincidencia de un filtro"
-
-#: GenericFilter.py:2219
-msgid "Has a common ancestor with filter match"
-msgstr "Tiene un ascendiente comn con alguien seleccionado en otro filtro"
-
-#: GenericFilter.py:2224
-msgid "Has the personal event"
-msgstr "Tiene el evento personal"
-
-#: GenericFilter.py:2225
-msgid "Has the family event"
-msgstr "Tiene el evento familiar"
-
-#: GenericFilter.py:2226
-msgid "Has the personal attribute"
-msgstr "Tiene el atributo personal"
-
-#: GenericFilter.py:2227
-msgid "Has the family attribute"
-msgstr "Tiene el atributos familiar"
-
-#: GenericFilter.py:2230
-msgid "Is spouse of filter match"
-msgstr "Es cnyuge de una coincidencia de un filtro"
-
-#: GenericFilter.py:2231
-msgid "Is a sibling of filter match"
-msgstr "Es hermano o hermana de una coincidencia de un filtro"
-
-#: GenericFilter.py:2232
-msgid "Relationship path between two people"
-msgstr "Parentesco entre dos personas"
-
-#: GenericFilter.py:2235 gramps_main.py:980
-msgid "People who have images"
-msgstr "Personas que tienen imgenes"
-
-#: GenericFilter.py:2240 gramps_main.py:1005
-msgid "People without a birth date"
-msgstr "Personas sin una fecha de nacimiento"
-
-#: gramps_main.py:1035
-msgid "Any textual record contains..."
-msgstr "El texto de cualquier registro contiene..."
-
-#: gramps_main.py:1040
-msgid "Any textual record matches regular expression..."
-msgstr "Cualquier registro de texto se ajusta a la expresin regular..."
-
-#: plugins/StatisticsChart.py:882
-msgid ""
-"Check this if you want people who have no birth date or year to be accounted "
-"also in the statistics."
-msgstr ""
-"Marque aqu si desea que se incluyan las personas sin fecha de nacimiento en "
-"la estadstica."
-
-#: plugins/StatisticsChart.py:883
-msgid "Include people without birth years"
-msgstr "Incluir personas sin fecha de nacimiento"
-
-#: ReportUtils.py:1188
-msgid "%(male_name)s died on %(death_date)sat the age of %(age)d years."
-msgstr "%(male_name)s falleci el %(death_date)s a la edad de %(age)d aos."
-
-#: ReportUtils.py:1466
-msgid "%(male_name)s was buried on %(birth_date)s in %(birth_place)s."
-msgstr "%(male_name)s recibi sepultura el %(birth_date)s en %(birth_place)s."
-
-#: ReportUtils.py:1471
-msgid "%(male_name)s was buried on %(birth_date)s."
-msgstr "%(male_name)s recibi sepultura el %(birth_date)s."
-
-#: ReportUtils.py:1475
-msgid "%(male_name)s was buried in %(month_year)s in %(birth_place)s."
-msgstr "%(male_name)s recibi sepultura en %(month_year)s en %(birth_place)s."
-
-#: ReportUtils.py:1484
-msgid "%(male_name)s was buried in %(birth_place)s."
-msgstr "%(male_name)s recibi sepultura en %(birth_place)s."
-
-#: ReportUtils.py:1492
-msgid "%(female_name)s was buried on %(birth_date)s in %(birth_place)s."
-msgstr ""
-"%(female_name)s recibi sepultura el %(birth_date)s en %(birth_place)s."
-
-#: ReportUtils.py:1497
-msgid "%(female_name)s was buried on %(birth_date)s."
-msgstr "%(female_name)s recibi sepultura el %(birth_date)s."
-
-#: ReportUtils.py:1501
-msgid "%(female_name)s was buried in %(month_year)s in %(birth_place)s."
-msgstr ""
-"%(female_name)s recibi sepultura en %(month_year)s en %(birth_place)s."
-
-#: ReportUtils.py:1510
-msgid "%(female_name)s was buried in %(birth_place)s."
-msgstr "%(female_name)s recibi sepultura en %(birth_place)s."
-
-#: ReportUtils.py:1588
-msgid "%(male_name)s Born: %(birth_date)s "
-msgstr "%(male_name)s Naci: %(birth_date)s."
-
-#: ReportUtils.py:1687
-msgid "%(female_name)s Born: %(birth_date)s "
-msgstr "%(female_name)s Naci: %(birth_date)s."
-
-#: gramps.glade:250 gramps_main.py:502
-msgid "_Redo"
-msgstr "_Rehacer"
-
-#: gramps_main.py:151
-msgid "Use at your own risk"
-msgstr ""
-
-#: gramps_main.py:152
-msgid ""
-"This is an unstable development version of GRAMPS. It is intended as a "
-"technology preview. Do not trust your family database to this development "
-"version. This version may contain bugs which could corrupt your database."
-msgstr ""
-
-#: gramps_main.py:1753
-msgid "The Home Person may be set from the Settings menu."
-msgstr "Se puede establecer la persona inicial en el men de Preferencias."
-
-#: mergedata.glade:611
-msgid "Merge Sources"
-msgstr "Mezclar fuentes"
-
-#: plugins/DetAncestralReport.py:551 plugins/DetDescendantReport.py:572
-msgid "Replace Place with ______"
-msgstr "Sustituir Lugar con ______"
-
-#: plugins/DetAncestralReport.py:555 plugins/DetDescendantReport.py:576
-msgid "Replace Dates with ______"
-msgstr "Sustituir Fechas con ______"
-
-#: plugins/ReorderIds.py:49
-msgid "Tool currently unavailable"
-msgstr "La herramienta no est disponible actualmente"
-
-#: plugins/ReorderIds.py:50
-msgid ""
-"This tool has not yet been brought up to date after transition to the "
-"database, sorry."
-msgstr ""
-
-#: plugins/rel_ru.py:120
-msgid "remote ancestors"
-msgstr "ancestros"
+#~ msgid "Added person is not visible"
+#~ msgstr "La person agregada no es visible"
+
+#~ msgid ""
+#~ "The person you added is currently not visible due to the chosen filter. "
+#~ "This may occur if you did not specify a birth date."
+#~ msgstr ""
+#~ "La persona que ha agregado no es visible a causa del filtro elegido.  "
+#~ "Esto puede ocurrir si no especific fecha de nacimiento."
 
 #~ msgid "Month Day, Year"
 #~ msgstr "Mes Da, Ao"
diff --git a/gramps2/src/po/fi.po b/gramps2/src/po/fi.po
index 171927877..97ebe64d8 100644
--- a/gramps2/src/po/fi.po
+++ b/gramps2/src/po/fi.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fi\n"
-"POT-Creation-Date: Wed Jun  1 09:58:59 2005\n"
-"PO-Revision-Date: 2005-06-04 00:52+0300\n"
+"POT-Creation-Date: Thu Jun 23 14:11:42 2005\n"
+"PO-Revision-Date: 2005-07-03 00:20+0300\n"
 "Last-Translator: Eero Tamminen \n"
 "Language-Team: Suomi\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: AddMedia.py:91 ImageSelect.py:120
 msgid "Select a media object"
-msgstr "Valitse media-objekti"
+msgstr "Valitse mediatiedosto"
 
 #: AddMedia.py:124 ImageSelect.py:174
 msgid "Cannot import %s"
@@ -32,19 +32,19 @@ msgstr "Annettu tiedosto ei löytynyt."
 
 #: AddMedia.py:143 MediaView.py:410 MediaView.py:434
 msgid "Add Media Object"
-msgstr "Lisää media-objekti"
+msgstr "Lisää mediatiedosto"
 
-#: AddSpouse.py:115
+#: AddSpouse.py:114
 msgid "Choose Spouse/Partner of %s"
 msgstr "Valitse %s:n puoliso/kumppani"
 
-#: AddSpouse.py:120
+#: AddSpouse.py:119
 msgid "Choose Spouse/Partner"
 msgstr "Valitse puoliso/kumppani"
 
-#: AddSpouse.py:161 ChooseParents.py:230 EditPerson.py:338 EditSource.py:305
-#: FamilyView.py:74 ImageSelect.py:1102 PeopleView.py:58 PeopleView.py:148
-#: SelectChild.py:124 SelectPerson.py:78 plugins/BookReport.py:631
+#: AddSpouse.py:142 ChooseParents.py:252 EditPerson.py:338 EditSource.py:312
+#: FamilyView.py:74 ImageSelect.py:1104 PeopleView.py:58 PeopleView.py:134
+#: SelectChild.py:129 SelectPerson.py:78 plugins/BookReport.py:631
 #: plugins/FilterEditor.py:459 plugins/IndivComplete.py:405
 #: plugins/IndivSummary.py:226 plugins/PatchNames.py:191 plugins/RelCalc.py:95
 #: plugins/ScratchPad.py:154 plugins/ScratchPad.py:195
@@ -56,58 +56,69 @@ msgstr "Valitse puoliso/kumppani"
 msgid "Name"
 msgstr "Nimi"
 
-#: AddSpouse.py:166 ChooseParents.py:236 EditSource.py:305 FamilyView.py:73
-#: ImageSelect.py:1102 MediaView.py:58 MergePeople.py:107 PeopleView.py:59
-#: PlaceView.py:50 SelectChild.py:129 SelectObject.py:85 SelectPerson.py:84
+#: AddSpouse.py:146 ChooseParents.py:261 EditSource.py:312 FamilyView.py:73
+#: ImageSelect.py:1104 MediaView.py:58 MergePeople.py:107 PeopleView.py:59
+#: PlaceView.py:50 SelectChild.py:134 SelectObject.py:85 SelectPerson.py:84
 #: SourceView.py:52 Sources.py:108 Sources.py:242 Witness.py:64
 #: plugins/PatchNames.py:182 plugins/RelCalc.py:95
 msgid "ID"
 msgstr "Tunnus"
 
-#: AddSpouse.py:171 ChooseParents.py:242 SelectChild.py:134 SelectPerson.py:90
+#: AddSpouse.py:150 ChooseParents.py:271 SelectChild.py:139 SelectPerson.py:90
 msgid "Birth date"
 msgstr "Syntymäaika"
 
-#: AddSpouse.py:254 AddSpouse.py:279
+#: AddSpouse.py:232 AddSpouse.py:257
 msgid "Error adding a spouse"
 msgstr "Puolison lisäys epäonnistui"
 
-#: AddSpouse.py:255
+#: AddSpouse.py:233
 msgid "A person cannot be linked as his/her spouse"
 msgstr "Henkilöstä ei voi tehdä itsensä puolisoa"
 
-#: AddSpouse.py:263
+#: AddSpouse.py:241
 msgid "Spouse is a parent"
 msgstr "Puoliso on aktiivisen henkilön vanhempi"
 
-#: AddSpouse.py:264
+#: AddSpouse.py:242
 msgid "The person selected as a spouse is a parent of the active person. Usually, this is a mistake. You may choose either to proceed with adding a spouse, or to return to the Choose Spouse dialog to fix the problem."
 msgstr "Valitsemasi henkilö on aktiivisen henkilön puoliso. Yleensä tämä on virhe. Voit joko jatkaa lisäämällä puolison, tai palata Puolison valintadialogiin korjataksesi ongelman."
 
-#: AddSpouse.py:268 AddSpouse.py:289
+#: AddSpouse.py:246 AddSpouse.py:267
 msgid "Proceed with adding"
 msgstr "Jatka lisäämällä"
 
-#: AddSpouse.py:268 AddSpouse.py:289
+#: AddSpouse.py:246 AddSpouse.py:267
 msgid "Return to dialog"
 msgstr "Palaa dialogiin"
 
-#: AddSpouse.py:280
+#: AddSpouse.py:258
 msgid "The spouse is already present in this family"
 msgstr "Puoliso kuuluu jo tähän perheeseen"
 
-#: AddSpouse.py:284
+#: AddSpouse.py:262
 msgid "Spouse is a child"
 msgstr "Puoliso on valitun henkilön lapsi"
 
-#: AddSpouse.py:285
+#: AddSpouse.py:263
 msgid "The person selected as a spouse is a child of the active person. Usually, this is a mistake. You may choose either to proceed with adding a spouse, or to return to the Choose Spouse dialog to fix the problem."
 msgstr "Valitsemasi henkilö on aktiivisen henkilön lapsi. Yleensä tämä on virhe. Voit joko jatkaa lisäämällä puolison, tai palata Puolison valintadialogiin korjataksesi ongelman."
 
-#: AddSpouse.py:315 FamilyView.py:725
+#: AddSpouse.py:293 FamilyView.py:725
 msgid "Add Spouse"
 msgstr "Lisää puoliso"
 
+#: AddSpouse.py:392 ChooseParents.py:811 GenericFilter.py:132
+#: GenericFilter.py:147 GenericFilter.py:263 GenericFilter.py:277
+#: GenericFilter.py:300 GenericFilter.py:323 GenericFilter.py:338
+#: GenericFilter.py:353 GenericFilter.py:979 GenericFilter.py:1223
+#: GenericFilter.py:1247 GenericFilter.py:1276 GenericFilter.py:1308
+#: GenericFilter.py:1325 GenericFilter.py:1346 GenericFilter.py:1429
+#: GenericFilter.py:1483 GenericFilter.py:1545 GenericFilter.py:1564
+#: GenericFilter.py:1634 GenericFilter.py:1801 SelectChild.py:305
+msgid "General filters"
+msgstr "Yleiset suotimet"
+
 #: AddrEdit.py:106 AddrEdit.py:174
 msgid "Address Editor"
 msgstr "Osoite-editori"
@@ -160,7 +171,7 @@ msgstr "%s:n ominaisuus-editori"
 msgid "New Attribute"
 msgstr "Uusi ominaisuus"
 
-#: AttrEdit.py:175 EditPerson.py:326 ImageSelect.py:682 ImageSelect.py:952
+#: AttrEdit.py:175 EditPerson.py:326 ImageSelect.py:682 ImageSelect.py:954
 #: Marriage.py:214 plugins/ScratchPad.py:273 plugins/ScratchPad.py:281
 msgid "Attribute"
 msgstr "Ominaisuus"
@@ -175,75 +186,87 @@ msgid ""
 "It will now appear in the attribute menus for this database"
 msgstr ""
 "Ominaisuustyyppi \"%s\" on lisätty tietokantaan.\n"
-"Lisäys näkyy nyt tietokannan menuissa"
+"Lisäys näkyy nyt tietokannan valikoissa"
 
 #: Bookmarks.py:96 Bookmarks.py:101
 msgid "Edit Bookmarks"
 msgstr "Muokkaa kirjanmerkkejä"
 
-#: ChooseParents.py:121
+#: ChooseParents.py:129 ChooseParents.py:130
+msgid "Loading..."
+msgstr "Ladataan..."
+
+#: ChooseParents.py:133
 msgid "Choose the Parents of %s"
 msgstr "Valitse %s:n vanhemmat"
 
-#: ChooseParents.py:123 ChooseParents.py:268 ChooseParents.py:510
-#: ChooseParents.py:593
+#: ChooseParents.py:135 ChooseParents.py:300 ChooseParents.py:572
+#: ChooseParents.py:659
 msgid "Choose Parents"
 msgstr "Valitse vanhemmat"
 
-#: ChooseParents.py:304 ChooseParents.py:648
+#: ChooseParents.py:366 ChooseParents.py:714
 msgid "Par_ent"
 msgstr "_Vanhempi"
 
-#: ChooseParents.py:306
+#: ChooseParents.py:368
 msgid "Fath_er"
 msgstr "_Isä"
 
-#: ChooseParents.py:314 ChooseParents.py:647
+#: ChooseParents.py:376 ChooseParents.py:713
 msgid "Pa_rent"
 msgstr "Van_hempi"
 
-#: ChooseParents.py:316
+#: ChooseParents.py:378
 msgid "Mothe_r"
 msgstr "_Äiti"
 
-#: ChooseParents.py:502 SelectChild.py:287 SelectChild.py:306
+#: ChooseParents.py:564 SelectChild.py:192 SelectChild.py:211
 msgid "Error selecting a child"
 msgstr "Lapsen valinta epäonnistui"
 
-#: ChooseParents.py:503
+#: ChooseParents.py:565
 msgid "A person cannot be linked as his/her own parent"
 msgstr "Henkilöstä ei voi tehdä itsensä vanhempaa"
 
-#: ChooseParents.py:532 ChooseParents.py:545
-msgid "Added person is not visible"
-msgstr "Lisätty henkilö ei ole näkyvissä"
-
-#: ChooseParents.py:533 ChooseParents.py:546
-msgid "The person you added is currently not visible due to the chosen filter. This may occur if you did not specify a birth date."
-msgstr "Lisäämäsi henkilö ei ole juuri nyt näkyvissä valitusta suotimesta johtuen. Tämä saattaa tapahtua, jos et ole antanut syntymäpäivää."
-
-#: ChooseParents.py:623
+#: ChooseParents.py:689
 msgid "Modify the Parents of %s"
 msgstr "Muuta %s:n vanhempia"
 
-#: ChooseParents.py:624 ChooseParents.py:736
+#: ChooseParents.py:690 ChooseParents.py:802
 msgid "Modify Parents"
 msgstr "Muuta vanhempia"
 
-#: ChooseParents.py:650 FamilyView.py:1100 MergePeople.py:136
+#: ChooseParents.py:716 FamilyView.py:1112 MergePeople.py:136
 #: plugins/FamilyGroup.py:261 plugins/IndivComplete.py:215
 #: plugins/IndivComplete.py:217 plugins/IndivComplete.py:450
 #: plugins/IndivSummary.py:290 plugins/WebPage.py:340 plugins/WebPage.py:343
 msgid "Mother"
 msgstr "Äiti"
 
-#: ChooseParents.py:651 FamilyView.py:1098 MergePeople.py:134
+#: ChooseParents.py:717 FamilyView.py:1110 MergePeople.py:134
 #: plugins/FamilyGroup.py:248 plugins/IndivComplete.py:206
 #: plugins/IndivComplete.py:208 plugins/IndivComplete.py:445
 #: plugins/IndivSummary.py:276 plugins/WebPage.py:339 plugins/WebPage.py:342
 msgid "Father"
 msgstr "Isä"
 
+#: ChooseParents.py:834
+msgid "Likely Father"
+msgstr "Todennäköinen isä"
+
+#: ChooseParents.py:835
+msgid "Matches likely fathers"
+msgstr "Poimii todennäköiset isät"
+
+#: ChooseParents.py:844
+msgid "Likely Mother"
+msgstr "Todennäköinen äiti"
+
+#: ChooseParents.py:845
+msgid "Matches likely mothers"
+msgstr "Poimii todennäköiset äidit"
+
 #: ColumnOrder.py:40
 msgid "Select Columns"
 msgstr "Valitse sarakkeet"
@@ -320,7 +343,7 @@ msgstr "Laskettu"
 msgid "Date selection"
 msgstr "Päivämäärän valinta"
 
-#: DateEdit.py:264 gramps_main.py:1154 gramps_main.py:1161
+#: DateEdit.py:264 gramps_main.py:1168 gramps_main.py:1175
 msgid "Could not open help"
 msgstr "Käyttöohjeen avaus epäonnistui"
 
@@ -372,7 +395,7 @@ msgstr "Tunnistetaan automaattisesti"
 msgid "Select file _type:"
 msgstr "Valitse _tiedostotyyppi:"
 
-#: DbPrompter.py:611 gramps_main.py:1374
+#: DbPrompter.py:611 gramps_main.py:1388
 msgid "All files"
 msgstr "Kaikki tiedostot"
 
@@ -393,7 +416,7 @@ msgid "GEDCOM files"
 msgstr "GEDCOM tiedostot"
 
 #: DisplayModels.py:47 GrampsMime.py:46 GrampsMime.py:53 MergePeople.py:50
-#: PeopleModel.py:381 SelectChild.py:245 Utils.py:123 const.py:169
+#: PeopleModel.py:387 Utils.py:118 const.py:169
 #: plugins/DetAncestralReport.py:308 plugins/DetAncestralReport.py:315
 #: plugins/DetDescendantReport.py:330 plugins/DetDescendantReport.py:337
 #: plugins/FamilyGroup.py:458 plugins/IndivComplete.py:281
@@ -401,19 +424,19 @@ msgstr "GEDCOM tiedostot"
 msgid "unknown"
 msgstr "tuntematon"
 
-#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:381 SelectChild.py:241
-#: const.py:167 plugins/RelCalc.py:111
+#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:387 const.py:167
+#: plugins/RelCalc.py:111
 msgid "male"
 msgstr "mies"
 
-#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:381 SelectChild.py:243
-#: const.py:168 plugins/RelCalc.py:113
+#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:387 const.py:168
+#: plugins/RelCalc.py:113
 msgid "female"
 msgstr "nainen"
 
-#: DisplayModels.py:468 ImageSelect.py:981 MediaView.py:243 NoteEdit.py:104
-#: Utils.py:160 gramps.glade:5208 gramps.glade:15342 gramps.glade:25747
-#: gramps.glade:26749 gramps.glade:28117 gramps.glade:29548
+#: DisplayModels.py:468 ImageSelect.py:983 MediaView.py:243 NoteEdit.py:104
+#: Utils.py:155 gramps.glade:5501 gramps.glade:16531 gramps.glade:27709
+#: gramps.glade:28757 gramps.glade:30210 gramps.glade:31740
 msgid "Note"
 msgstr "Huomioita"
 
@@ -435,7 +458,7 @@ msgstr ""
 msgid "Internal Error"
 msgstr "Sisäinen virhe"
 
-#: EditPerson.py:132 EditPerson.py:634
+#: EditPerson.py:132 EditPerson.py:635
 msgid "Edit Person"
 msgstr "Muokkaa henkilöä"
 
@@ -443,12 +466,12 @@ msgstr "Muokkaa henkilöä"
 msgid "Patronymic:"
 msgstr "Patronyymi:"
 
-#: EditPerson.py:306 EditSource.py:325 EventEdit.py:278 ImageSelect.py:1123
+#: EditPerson.py:306 EditSource.py:332 EventEdit.py:278 ImageSelect.py:1125
 #: Marriage.py:213 plugins/ScratchPad.py:166 plugins/ScratchPad.py:180
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: EditPerson.py:307 EditPerson.py:344 EditPlace.py:130 const.py:435
+#: EditPerson.py:307 EditPerson.py:344 EditPlace.py:131 const.py:435
 #: plugins/ScratchPad.py:185 plugins/ScratchPad.py:227
 #: plugins/ScratchPad.py:262
 msgid "Description"
@@ -460,21 +483,21 @@ msgstr "Kuvaus"
 msgid "Date"
 msgstr "Päivämäärä"
 
-#: EditPerson.py:309 EditPlace.py:271 EditSource.py:331 ImageSelect.py:1129
-#: Marriage.py:213 gramps.glade:12208 plugins/ScratchPad.py:183
+#: EditPerson.py:309 EditPlace.py:289 EditSource.py:338 ImageSelect.py:1131
+#: Marriage.py:213 gramps.glade:13109 plugins/ScratchPad.py:183
 #: plugins/ScratchPad.py:225
 msgid "Place"
 msgstr "Paikka"
 
-#: EditPerson.py:326 EditSource.py:156 ImageSelect.py:682 ImageSelect.py:952
-#: Marriage.py:214 gramps.glade:12727 plugins/FilterEditor.py:459
+#: EditPerson.py:326 EditSource.py:160 ImageSelect.py:682 ImageSelect.py:954
+#: Marriage.py:214 gramps.glade:13691 plugins/FilterEditor.py:459
 #: plugins/PatchNames.py:188 plugins/ScratchPad.py:284
 #: plugins/ScratchPad.py:317 plugins/ScratchPad.py:543
 #: plugins/ScratchPad.py:549
 msgid "Value"
 msgstr "Arvo"
 
-#: EditPerson.py:338 EditSource.py:305 ImageSelect.py:1102 MediaView.py:59
+#: EditPerson.py:338 EditSource.py:312 ImageSelect.py:1104 MediaView.py:59
 #: MergePeople.py:152 SelectObject.py:86 plugins/BookReport.py:631
 #: plugins/BookReport.py:632 plugins/PatchNames.py:185
 #: plugins/ScratchPad.py:181 plugins/ScratchPad.py:223
@@ -484,83 +507,83 @@ msgstr "Arvo"
 msgid "Type"
 msgstr "Tyyppi"
 
-#: EditPerson.py:344 EditPlace.py:129 MediaView.py:60
+#: EditPerson.py:344 EditPlace.py:130 MediaView.py:60
 #: plugins/ScratchPad.py:260
 msgid "Path"
 msgstr "Polku"
 
-#: EditPerson.py:566 ImageSelect.py:610 ImageSelect.py:1037 MediaView.py:275
+#: EditPerson.py:567 ImageSelect.py:610 ImageSelect.py:1041 MediaView.py:275
 #: plugins/ScratchPad.py:424 plugins/ScratchPad.py:432
 msgid "Media Object"
-msgstr "Media-objekti"
+msgstr "Mediatiedosto"
 
-#: EditPerson.py:572 ImageSelect.py:616 docgen/AbiWord2Doc.py:327
+#: EditPerson.py:573 ImageSelect.py:616 docgen/AbiWord2Doc.py:335
 #: docgen/AsciiDoc.py:371 docgen/HtmlDoc.py:486 docgen/KwordDoc.py:494
 #: docgen/PdfDoc.py:631 docgen/RTFDoc.py:427
 msgid "Open in %s"
 msgstr "Aukaise %s:ä käyttäen"
 
-#: EditPerson.py:575 ImageSelect.py:619 MediaView.py:288
+#: EditPerson.py:576 ImageSelect.py:619 MediaView.py:288
 msgid "Edit with the GIMP"
 msgstr "Muokkaa GIMP:llä"
 
-#: EditPerson.py:577 ImageSelect.py:621
+#: EditPerson.py:578 ImageSelect.py:621
 msgid "Edit Object Properties"
 msgstr "Muokkaa objektin ominaisuuksia"
 
-#: EditPerson.py:628
+#: EditPerson.py:629
 msgid "New Person"
 msgstr "Uusi henkilö"
 
-#: EditPerson.py:753 GrampsCfg.py:63 const.py:233 const.py:246
+#: EditPerson.py:754 GrampsCfg.py:63 const.py:233 const.py:246
 msgid "None"
 msgstr "Tyhjä"
 
-#: EditPerson.py:1290
+#: EditPerson.py:1291
 msgid "Save changes to %s?"
 msgstr "Tallenna muutokset %s:n?"
 
-#: EditPerson.py:1291 EditPerson.py:1307 Marriage.py:622 Marriage.py:635
+#: EditPerson.py:1292 EditPerson.py:1308 Marriage.py:622 Marriage.py:635
 msgid "If you close without saving, the changes you have made will be lost"
 msgstr "Tallentamatta sulkuminen hävittää tekemäsi muutokset"
 
-#: EditPerson.py:1306
+#: EditPerson.py:1307
 msgid "Save Changes to %s?"
 msgstr "Tallenna muutokset %s:n?"
 
-#: EditPerson.py:1652
+#: EditPerson.py:1653
 msgid "Make the selected name the preferred name"
 msgstr "Tee valitusta nimestä ensisijainen nimi"
 
-#: EditPerson.py:1696
+#: EditPerson.py:1697
 msgid "Unknown gender specified"
 msgstr "Annettu tuntematon sukupuoli"
 
-#: EditPerson.py:1697
+#: EditPerson.py:1698
 msgid "The gender of the person is currently unknown. Usually, this is a mistake. You may choose to either continue saving, or returning to the Edit Person dialog to fix the problem."
 msgstr "Henkilön sukupuoli on tuntematon. Yleensä tämä on virhe. Voit joko jatkaa tallentamista, tai palata Henkilön muokkausdialogiin korjataksesi ongelman."
 
-#: EditPerson.py:1701
+#: EditPerson.py:1702
 msgid "Continue saving"
 msgstr "Jatka tallentamista"
 
-#: EditPerson.py:1701
+#: EditPerson.py:1702
 msgid "Return to window"
 msgstr "Palaa ikkunaan"
 
-#: EditPerson.py:1729 Marriage.py:654
+#: EditPerson.py:1730 Marriage.py:654
 msgid "GRAMPS ID value was not changed."
 msgstr "GRAMPS tunnuksen arvoa ei muutettu."
 
-#: EditPerson.py:1730
+#: EditPerson.py:1731
 msgid "You have attempted to change the GRAMPS ID to a value of %(grampsid)s. This value is already used by %(person)s."
 msgstr "Yritit muuttaa GRAMPS tunnuksen arvoon %(grampsid)s. %(person)s käyttää jo ao. arvoa."
 
-#: EditPerson.py:1842
+#: EditPerson.py:1843
 msgid "Problem changing the gender"
 msgstr "Sukupuolenvaihdosongelma"
 
-#: EditPerson.py:1843
+#: EditPerson.py:1844
 msgid ""
 "Changing the gender caused problems with marriage information.\n"
 "Please check the person's marriages."
@@ -568,96 +591,104 @@ msgstr ""
 "Sukupuolenvaihto aiheuttaa ongelmia avioitumistietojen kanssa.\n"
 "Tarkista henkilön avioliitot."
 
-#: EditPerson.py:1886
+#: EditPerson.py:1887
 msgid "Edit Person (%s)"
 msgstr "Muokkaa henkilöä (%s)"
 
-#: EditPerson.py:1902 ImageSelect.py:1162
+#: EditPerson.py:1903 ImageSelect.py:1165
 msgid "Add Place (%s)"
 msgstr "Lisää paikka (%s)"
 
-#: EditPlace.py:90 EditPlace.py:277
+#: EditPlace.py:91 EditPlace.py:295
 msgid "Place Editor"
 msgstr "Paikka-editori"
 
-#: EditPlace.py:149 PlaceView.py:53
+#: EditPlace.py:150 PlaceView.py:53
 msgid "City"
 msgstr "Kaupunki"
 
-#: EditPlace.py:149 PlaceView.py:54
+#: EditPlace.py:150 PlaceView.py:54
 msgid "County"
 msgstr "Kunta"
 
-#: EditPlace.py:150 PlaceView.py:55
+#: EditPlace.py:151 PlaceView.py:55
 msgid "State"
 msgstr "Osavaltio"
 
-#: EditPlace.py:150 PlaceView.py:56
+#: EditPlace.py:151 PlaceView.py:56
 msgid "Country"
 msgstr "Maa"
 
-#: EditPlace.py:266 EditPlace.py:270
+#: EditPlace.py:284 EditPlace.py:288
 msgid "New Place"
 msgstr "Uusi paikka"
 
-#: EditPlace.py:400
+#: EditPlace.py:391
+msgid "Place title is already in use"
+msgstr "Paikannimi on jo käytössä"
+
+#: EditPlace.py:392
+msgid "Each place must have a unique title, and title you have selected is already used by another place"
+msgstr "Joka paikalla pitää olla ainutkertainen nimi, mutta valitsemasi paikan nimi on jo käytössä"
+
+#: EditPlace.py:427
 msgid "Edit Place (%s)"
 msgstr "Muokkaa paikkaa (%s)"
 
-#: EditPlace.py:518
+#: EditPlace.py:546
 msgid "People"
 msgstr "Henkilöt"
 
-#: EditPlace.py:520 EditPlace.py:529
+#: EditPlace.py:548 EditPlace.py:557
 msgid "%s [%s]: event %s\n"
 msgstr "%s [%s]: tapahtuma %s\n"
 
-#: EditPlace.py:527
+#: EditPlace.py:555
 msgid "Families"
 msgstr "Perheet"
 
-#: EditPlace.py:535 Utils.py:115
+#: EditPlace.py:563 Utils.py:110
 msgid "%(father)s and %(mother)s"
 msgstr "%(father)s ja %(mother)s"
 
-#: EditPlace.py:605 PlaceView.py:221
+#: EditPlace.py:633 PlaceView.py:224
 msgid "Delete Place (%s)"
 msgstr "Poista paikka (%s)"
 
-#: EditSource.py:86 EditSource.py:242
+#: EditSource.py:90 EditSource.py:249
 msgid "Source Editor"
 msgstr "Lähde-editori"
 
-#: EditSource.py:156
+#: EditSource.py:160
 msgid "Key"
 msgstr "Avain"
 
-#: EditSource.py:231 EditSource.py:235 Sources.py:451 Sources.py:453
+#: EditSource.py:238 EditSource.py:242 Sources.py:451 Sources.py:453
 msgid "New Source"
 msgstr "Uusi lähde"
 
-#: EditSource.py:236 EditSource.py:337 ImageSelect.py:1135 Utils.py:165
-#: Utils.py:167
+#: EditSource.py:243 EditSource.py:344 ImageSelect.py:1137 Utils.py:160
+#: Utils.py:162
 msgid "Source"
 msgstr "Lähde"
 
-#: EditSource.py:313 ImageSelect.py:1111 plugins/EventCmp.py:408
+#: EditSource.py:320 ImageSelect.py:1113 plugins/EventCmp.py:408
 msgid "Person"
 msgstr "Henkilö"
 
-#: EditSource.py:319 ImageSelect.py:1117
+#: EditSource.py:326 ImageSelect.py:1119
 msgid "Family"
 msgstr "Perhe"
 
-#: EditSource.py:343
+#: EditSource.py:350
 msgid "Media"
 msgstr "Media"
 
-#: EditSource.py:397
+#: EditSource.py:404
 msgid "Edit Source (%s)"
 msgstr "Muokkaa lähdettä (%s)"
 
-#: EditSource.py:463
+#: EditSource.py:471
 msgid "Delete Source (%s)"
 msgstr "Poista lähde (%s)"
 
@@ -704,7 +735,7 @@ msgid ""
 "It will now appear in the event menus for this database"
 msgstr ""
 "%s tapahtumatyyppi on lisätty tietokantaan.\n"
-"Lisäys näkyy nyt tietokannan menuissa"
+"Lisäys näkyy nyt tietokannan valikoissa"
 
 #: EventEdit.py:356
 msgid "Edit Event"
@@ -847,22 +878,22 @@ msgstr "Kuolinpaikka"
 
 #: FamilyView.py:395 FamilyView.py:405 FamilyView.py:426 FamilyView.py:433
 #: FamilyView.py:465 FamilyView.py:530 FamilyView.py:536 FamilyView.py:606
-#: FamilyView.py:612 FamilyView.py:1173 FamilyView.py:1179 FamilyView.py:1212
-#: FamilyView.py:1218 PedView.py:561 PedView.py:570 PeopleView.py:308
-#: gramps.glade:821 gramps_main.py:659
+#: FamilyView.py:612 FamilyView.py:1176 FamilyView.py:1182 FamilyView.py:1215
+#: FamilyView.py:1221 PedView.py:564 PedView.py:573 PeopleView.py:301
+#: gramps.glade:822 gramps_main.py:659
 msgid "Home"
 msgstr "Koti"
 
-#: FamilyView.py:396 PeopleView.py:291
+#: FamilyView.py:396 PeopleView.py:284
 msgid "Add Bookmark"
 msgstr "Lisää kirjanmerkki"
 
 #: FamilyView.py:399 FamilyView.py:429 FamilyView.py:458 FamilyView.py:489
-#: PedView.py:584 PedView.py:595 PeopleView.py:304
+#: PedView.py:587 PedView.py:598 PeopleView.py:297
 msgid "People Menu"
 msgstr "Henkilöt-valikko"
 
-#: FamilyView.py:454 FamilyView.py:486 FamilyView.py:1192 FamilyView.py:1231
+#: FamilyView.py:454 FamilyView.py:486 FamilyView.py:1195 FamilyView.py:1234
 msgid "Add parents"
 msgstr "Lisää vanhemmat"
 
@@ -874,7 +905,7 @@ msgstr "Lapsi-valikko"
 msgid "Make the selected child an active person"
 msgstr "Tee valitusta lapsesta aktiivinen henkilö"
 
-#: FamilyView.py:548 FamilyView.py:1191 FamilyView.py:1230
+#: FamilyView.py:548 FamilyView.py:1194 FamilyView.py:1233
 msgid "Edit the child/parent relationships"
 msgstr "Muokkaa lapsi/vanhempi-suhteita"
 
@@ -918,47 +949,47 @@ msgstr "Aseta (%s) ensisijaiseksi puolisoksi"
 msgid "Modify family"
 msgstr "Muokkaa perhettä"
 
-#: FamilyView.py:800 FamilyView.py:1445 SelectChild.py:85 SelectChild.py:148
+#: FamilyView.py:800 FamilyView.py:1448 SelectChild.py:88 SelectChild.py:153
 msgid "Add Child to Family"
 msgstr "Lisää perheeseen lapsi"
 
-#: FamilyView.py:839
+#: FamilyView.py:854
 msgid "Remove Child (%s)"
 msgstr "Poista lapsi (%s)"
 
-#: FamilyView.py:845
+#: FamilyView.py:862
 msgid "Remove %s as a spouse of %s?"
 msgstr "Poista %s puoliso %s:ltä?"
 
-#: FamilyView.py:846
+#: FamilyView.py:863
 msgid "Removing a spouse removes the relationship between the spouse and the active person. It does not remove the spouse from the database"
 msgstr "Puolison poisto poistaa sen puolison ja aktiivisen henkilön  suhteesta. Poistettu puoliso säilyy silti tietokannassa"
 
-#: FamilyView.py:849
+#: FamilyView.py:866
 msgid "_Remove Spouse"
 msgstr "_Poista puoliso"
 
-#: FamilyView.py:893
+#: FamilyView.py:905
 msgid "Remove Spouse (%s)"
 msgstr "Poista puoliso (%s)"
 
-#: FamilyView.py:934
+#: FamilyView.py:946
 msgid "Select Parents (%s)"
 msgstr "Valitse vanhemmat (%s)"
 
-#: FamilyView.py:1049
+#: FamilyView.py:1061
 msgid ""
 msgstr ""
 
-#: FamilyView.py:1066
+#: FamilyView.py:1078
 msgid "Database corruption detected"
 msgstr "Tietokannan on havaittu vioittuneen"
 
-#: FamilyView.py:1067
+#: FamilyView.py:1079
 msgid "A problem was detected with the database. Please run the Check and Repair Database tool to fix the problem."
 msgstr "Tietokannassa on havaittu ongelma. Aja \"Tarkista ja korjaa tietokanta\"-työkalu korjataksesi ongelman."
 
-#: FamilyView.py:1118
+#: FamilyView.py:1130
 msgid ""
 "%s: %s [%s]\n"
 "\tRelationship: %s"
@@ -966,97 +997,87 @@ msgstr ""
 "%s: %s [%s]\n"
 "\tSuhde: %s"
 
-#: FamilyView.py:1120
+#: FamilyView.py:1132
 msgid "%s: unknown"
 msgstr "%s: tuntematon"
 
-#: FamilyView.py:1164
+#: FamilyView.py:1167
 msgid "Parents Menu"
 msgstr "Vanhemmat-valikko"
 
-#: FamilyView.py:1190 FamilyView.py:1229
+#: FamilyView.py:1193 FamilyView.py:1232
 msgid "Make the selected parents the active family"
 msgstr "Tee valituista vanhemmista aktiivinen perhe"
 
-#: FamilyView.py:1193 FamilyView.py:1232
+#: FamilyView.py:1196 FamilyView.py:1235
 msgid "Remove parents"
 msgstr "Poista vanhemmat"
 
-#: FamilyView.py:1203
+#: FamilyView.py:1206
 msgid "Spouse Parents Menu"
 msgstr "Puolison vanhemmat-valikko"
 
-#: FamilyView.py:1295 FamilyView.py:1310
+#: FamilyView.py:1298 FamilyView.py:1313
 msgid "Remove Parents of %s"
 msgstr "Poista %s:n vanhemmat"
 
-#: FamilyView.py:1296 FamilyView.py:1311
+#: FamilyView.py:1299 FamilyView.py:1314
 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 "Henkilön vanhempien poiston jälkeen henkilö ei ole enää ao. vanhempien lapsi. Poistetut vanhemmat ja heidän suhteensa säilyy silti tietokannassa."
 
-#: FamilyView.py:1300 FamilyView.py:1315
+#: FamilyView.py:1303 FamilyView.py:1318
 msgid "_Remove Parents"
 msgstr "_Poista vanhemmat"
 
-#: FamilyView.py:1408
+#: FamilyView.py:1411
 msgid "Remove Parents (%s)"
 msgstr "Poista vanhemmat (%s)"
 
-#: FamilyView.py:1480
+#: FamilyView.py:1483
 msgid "Attempt to Reorder Children Failed"
 msgstr "Lasten uudelleenjärjestys epäonnistui"
 
-#: FamilyView.py:1481
+#: FamilyView.py:1484
 msgid "Children must be ordered by their birth dates."
 msgstr "Lasten pitää olla järjestetty heidän syntymäaikojensa mukaan."
 
-#: FamilyView.py:1486
+#: FamilyView.py:1489
 msgid "Reorder children"
 msgstr "Järjestä lapset"
 
-#: FamilyView.py:1520
+#: FamilyView.py:1523
 msgid "Reorder spouses"
 msgstr "Järjestä puolisot"
 
-#: GenericFilter.py:90
+#: GenericFilter.py:91
 msgid "Miscellaneous filters"
 msgstr "Muut suotimet"
 
-#: GenericFilter.py:91 rule.glade:1165
+#: GenericFilter.py:92 rule.glade:1165
 msgid "No description"
 msgstr "Ei kuvausta"
 
-#: GenericFilter.py:130
+#: GenericFilter.py:131
 msgid "Everyone"
 msgstr "Kaikki"
 
-#: GenericFilter.py:131 GenericFilter.py:146 GenericFilter.py:263
-#: GenericFilter.py:277 GenericFilter.py:295 GenericFilter.py:312
-#: GenericFilter.py:327 GenericFilter.py:342 GenericFilter.py:969
-#: GenericFilter.py:1218 GenericFilter.py:1243 GenericFilter.py:1273
-#: GenericFilter.py:1306 GenericFilter.py:1324 GenericFilter.py:1346
-#: GenericFilter.py:1431 GenericFilter.py:1489 GenericFilter.py:1554
-#: GenericFilter.py:1574 GenericFilter.py:1645 GenericFilter.py:1810
-msgid "General filters"
-msgstr "Yleiset suotimet"
-
-#: GenericFilter.py:132
+#: GenericFilter.py:133
 msgid "Matches everyone in the database"
 msgstr "Poimii kaikki tietokannasta"
 
-#: GenericFilter.py:145
+#: GenericFilter.py:146
 msgid "Disconnected people"
 msgstr "Henkilöt ilman suhteita"
 
-#: GenericFilter.py:147
+#: GenericFilter.py:148
 msgid "Matches people that have no family relationships to any other person in the database"
 msgstr "Poimii henkilöt, joilla ei ole perhesuhteita muihin tietokannan henkilöihin"
 
-#: GenericFilter.py:164 GenericFilter.py:260 GenericFilter.py:357
-#: GenericFilter.py:448 GenericFilter.py:492 GenericFilter.py:614
-#: GenericFilter.py:661 GenericFilter.py:759 GenericFilter.py:811
-#: GenericFilter.py:898 gramps.glade:3363 gramps.glade:19187
-#: gramps.glade:21375 gramps.glade:22772 plugins/FilterEditor.py:680
+#: GenericFilter.py:164 GenericFilter.py:260 GenericFilter.py:368
+#: GenericFilter.py:459 GenericFilter.py:502 GenericFilter.py:623
+#: GenericFilter.py:670 GenericFilter.py:768 GenericFilter.py:820
+#: GenericFilter.py:907 gramps.glade:3521 gramps.glade:20666
+#: gramps.glade:23027 gramps.glade:24539 plugins/FilterEditor.py:680
 msgid "ID:"
 msgstr "Tunnus:"
 
@@ -1088,342 +1109,342 @@ msgstr "Oletushenkilö"
 msgid "Matches the default person"
 msgstr "Poimii oletushenkilön"
 
-#: GenericFilter.py:294
+#: GenericFilter.py:299
 msgid "Bookmarked people"
 msgstr "Kirjanmerkityt henkilöt"
 
-#: GenericFilter.py:296
+#: GenericFilter.py:301
 msgid "Matches the people on the bookmark list"
 msgstr "Poimii ihmiset kirjanmerkkilistalta"
 
-#: GenericFilter.py:311
+#: GenericFilter.py:322
 msgid "People with complete records"
 msgstr "Henkilöt täysillä tiedoilla"
 
-#: GenericFilter.py:313
+#: GenericFilter.py:324
 msgid "Matches all people whose records are complete"
 msgstr "Poimii kaikki henkilöt, joiden tiedoissa ei ole puutteita"
 
-#: GenericFilter.py:326 gramps_main.py:957 plugins/Summary.py:113
+#: GenericFilter.py:337 gramps_main.py:957 plugins/Summary.py:113
 msgid "Females"
 msgstr "Naiset"
 
-#: GenericFilter.py:328
+#: GenericFilter.py:339
 msgid "Matches all females"
 msgstr "Poimii kaikki naispuoliset"
 
-#: GenericFilter.py:341 gramps_main.py:967
+#: GenericFilter.py:352 gramps_main.py:967
 msgid "People with unknown gender"
 msgstr "Henkilöt, joiden sukupuoli on tuntematon"
 
-#: GenericFilter.py:343
+#: GenericFilter.py:354
 msgid "Matches all people with unknown gender"
 msgstr "Poimii kaikki henkilöt, joiden sukupuolta ei tiedetä"
 
-#: GenericFilter.py:357 GenericFilter.py:406 GenericFilter.py:661
-#: GenericFilter.py:716 plugins/FilterEditor.py:692
+#: GenericFilter.py:368 GenericFilter.py:416 GenericFilter.py:670
+#: GenericFilter.py:724 plugins/FilterEditor.py:692
 msgid "Inclusive:"
 msgstr "Sisältäen:"
 
-#: GenericFilter.py:358
+#: GenericFilter.py:369
 msgid "Descendants of "
 msgstr " jälkeläiset"
 
-#: GenericFilter.py:359 GenericFilter.py:408 GenericFilter.py:450
-#: GenericFilter.py:494 GenericFilter.py:616
+#: GenericFilter.py:370 GenericFilter.py:418 GenericFilter.py:461
+#: GenericFilter.py:504 GenericFilter.py:625
 msgid "Descendant filters"
-msgstr "Jälkeläissuodin"
+msgstr "Jälkeläissuotimet"
 
-#: GenericFilter.py:360
+#: GenericFilter.py:371
 msgid "Matches all descendants for the specified person"
 msgstr "Poimii kaikki annetun henkilön jälkeläiset"
 
-#: GenericFilter.py:406 GenericFilter.py:535 GenericFilter.py:573
-#: GenericFilter.py:716 GenericFilter.py:861 GenericFilter.py:941
+#: GenericFilter.py:416 GenericFilter.py:544 GenericFilter.py:582
+#: GenericFilter.py:724 GenericFilter.py:870 GenericFilter.py:951
 #: GenericFilter.py:1343 GenericFilter.py:1386 plugins/FilterEditor.py:684
 msgid "Filter name:"
 msgstr "Suotimen nimi:"
 
-#: GenericFilter.py:407
+#: GenericFilter.py:417
 msgid "Descendants of  match"
 msgstr " hyväksymän henkilön jälkeläinen"
 
-#: GenericFilter.py:409
+#: GenericFilter.py:419
 msgid "Matches people that are descendants of anybody matched by a filter"
 msgstr "Poimii suotimen hyväksymien henkilöiden jälkeläiset"
 
-#: GenericFilter.py:448 GenericFilter.py:492 GenericFilter.py:759
-#: GenericFilter.py:811 plugins/FilterEditor.py:678
+#: GenericFilter.py:459 GenericFilter.py:502 GenericFilter.py:768
+#: GenericFilter.py:820 plugins/FilterEditor.py:678
 msgid "Number of generations:"
 msgstr "Sukupolvien lukumäärä:"
 
-#: GenericFilter.py:449
+#: GenericFilter.py:460
 msgid "Descendants of  not more than  generations away"
 msgstr "Jälkeläinen  enintään  sukupolven päässä"
 
-#: GenericFilter.py:451
+#: GenericFilter.py:462
 msgid "Matches people that are descendants of a specified person not more than N generations away"
 msgstr "Poimii henkilöt, jotka ovat valitun henkilön jälkeläisiä enintään N sukupolven päässä"
 
-#: GenericFilter.py:493
+#: GenericFilter.py:503
 msgid "Descendants of  at least  generations away"
 msgstr "Jälkeläinen  vähintään  sukupolven päässä"
 
-#: GenericFilter.py:495
+#: GenericFilter.py:505
 msgid "Matches people that are descendants of a specified person at least N generations away"
 msgstr "Poimii henkilöt, jotka ovat valitun henkilön jälkeläisiä vähintään N sukupolven päässä"
 
-#: GenericFilter.py:536
+#: GenericFilter.py:545
 msgid "Children of  match"
 msgstr " hyväksymän henkilön lapsi"
 
-#: GenericFilter.py:537 GenericFilter.py:575 GenericFilter.py:863
-#: GenericFilter.py:1088 GenericFilter.py:1389 GenericFilter.py:1413
-#: GenericFilter.py:1445 GenericFilter.py:1461 GenericFilter.py:1475
+#: GenericFilter.py:546 GenericFilter.py:584 GenericFilter.py:872
+#: GenericFilter.py:1096 GenericFilter.py:1389 GenericFilter.py:1412
+#: GenericFilter.py:1442 GenericFilter.py:1457 GenericFilter.py:1470
 msgid "Family filters"
 msgstr "Perhesuotimet"
 
-#: GenericFilter.py:538
+#: GenericFilter.py:547
 msgid "Matches children of anybody matched by a filter"
 msgstr "Poimii suotimen hyväksymien henkilöiden lapset"
 
-#: GenericFilter.py:574
+#: GenericFilter.py:583
 msgid "Siblings of  match"
 msgstr " hyväksymän henkilön sisarus"
 
-#: GenericFilter.py:576
+#: GenericFilter.py:585
 msgid "Matches siblings of anybody matched by a filter"
 msgstr "Poimii suotimen hyväksymien henkilöiden sisarukset"
 
-#: GenericFilter.py:615
+#: GenericFilter.py:624
 msgid "Descendant family members of "
 msgstr " jälkeläisen perheenjäsen"
 
-#: GenericFilter.py:617
+#: GenericFilter.py:626
 msgid "Matches people that are descendants or the spouse of a descendant of a specified person"
 msgstr "Poimii henkilöt, jotka ovat valitun henkilön jälkeläisiä tai heidän puolisoitaan"
 
-#: GenericFilter.py:662
+#: GenericFilter.py:671
 msgid "Ancestors of "
 msgstr " esivanhemmat"
 
-#: GenericFilter.py:663 GenericFilter.py:718 GenericFilter.py:761
-#: GenericFilter.py:813 GenericFilter.py:900 GenericFilter.py:945
+#: GenericFilter.py:672 GenericFilter.py:726 GenericFilter.py:770
+#: GenericFilter.py:822 GenericFilter.py:909 GenericFilter.py:955
 msgid "Ancestral filters"
 msgstr "Esivanhemmuussuotimet"
 
-#: GenericFilter.py:664
+#: GenericFilter.py:673
 msgid "Matches people that are ancestors of a specified person"
 msgstr "Poimii valitun henkilön esivanhemmat"
 
-#: GenericFilter.py:717
+#: GenericFilter.py:725
 msgid "Ancestors of  match"
 msgstr " hyväksymien henkilöiden esivanhemmat"
 
-#: GenericFilter.py:719
+#: GenericFilter.py:727
 msgid "Matches people that are ancestors of anybody matched by a filter"
 msgstr "Poimii  suotimen hyväksymien henkilöiden esivanhemmat"
 
-#: GenericFilter.py:760
+#: GenericFilter.py:769
 msgid "Ancestors of  not more than  generations away"
 msgstr "Esivanhempi  enintään  sukupolven päässä"
 
-#: GenericFilter.py:762
+#: GenericFilter.py:771
 msgid "Matches people that are ancestors of a specified person not more than N generations away"
 msgstr "Poimii henkilöt, jotka ovat valitun henkilön esivanhempia enintään N sukupolven päässä"
 
-#: GenericFilter.py:812
+#: GenericFilter.py:821
 msgid "Ancestors of  at least  generations away"
 msgstr "Esivanhempi  vähintään  sukupolven päässä"
 
-#: GenericFilter.py:814
+#: GenericFilter.py:823
 msgid "Matches people that are ancestors of a specified person at least N generations away"
 msgstr "Poimii henkilöt, jotka ovat valitun henkilön jälkeläisiä vähintään N sukupolven päässä"
 
-#: GenericFilter.py:862
+#: GenericFilter.py:871
 msgid "Parents of  match"
 msgstr " hyväksymien henkilöiden vanhemmat"
 
-#: GenericFilter.py:864
+#: GenericFilter.py:873
 msgid "Matches parents of anybody matched by a filter"
 msgstr "Poimii suotimen hyväksymien henkilöiden esivanhemmat"
 
-#: GenericFilter.py:899
+#: GenericFilter.py:908
 msgid "People with a common ancestor with "
 msgstr "Henkilöt, joilla on yhteinen esivanhempi  kanssa"
 
-#: GenericFilter.py:901
+#: GenericFilter.py:910
 msgid "Matches people that have a common ancestor with a specified person"
 msgstr "Poimii henkilöt, joilla on yhteinen esivanhempi valitun henkilön kanssa"
 
-#: GenericFilter.py:942
+#: GenericFilter.py:952
 msgid "People with a common ancestor with  match"
 msgstr "Henkilöt, joilla on yhteinen esivanhempi  hyväksymien henkilöiden kanssa"
 
-#: GenericFilter.py:943
+#: GenericFilter.py:953
 msgid "Matches people that have a common ancestor with anybody matched by a filter"
 msgstr "Poimii henkilöt, joilla on yhteinen esivanhempi suotimen hyväksymien henkilöiden kanssa"
 
-#: GenericFilter.py:968 gramps_main.py:962 plugins/Summary.py:112
+#: GenericFilter.py:978 gramps_main.py:962 plugins/Summary.py:112
 msgid "Males"
 msgstr "Miehet"
 
-#: GenericFilter.py:970
+#: GenericFilter.py:980
 msgid "Matches all males"
 msgstr "Poimii kaikki miespuoliset"
 
-#: GenericFilter.py:983 GenericFilter.py:1586 plugins/FilterEditor.py:58
+#: GenericFilter.py:993 GenericFilter.py:1575 plugins/FilterEditor.py:58
 msgid "Personal event:"
 msgstr "Henkilökohtainen tapahtuma:"
 
-#: GenericFilter.py:984 GenericFilter.py:1034 GenericFilter.py:1135
-#: GenericFilter.py:1175 gramps.glade:8536 gramps.glade:9462
-#: gramps.glade:12160 gramps.glade:13667
+#: GenericFilter.py:994 GenericFilter.py:1043 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:9101 gramps.glade:10129
+#: gramps.glade:13053 gramps.glade:14701
 msgid "Date:"
 msgstr "Päivämäärä:"
 
-#: GenericFilter.py:985 GenericFilter.py:1035 GenericFilter.py:1135
-#: GenericFilter.py:1175 gramps.glade:8488 gramps.glade:13715
+#: GenericFilter.py:995 GenericFilter.py:1044 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:9045 gramps.glade:14757
 #: plugins/FilterEditor.py:676
 msgid "Place:"
 msgstr "Paikka:"
 
-#: GenericFilter.py:986 GenericFilter.py:1036 GenericFilter.py:1135
-#: GenericFilter.py:1175 gramps.glade:8440 gramps.glade:10680
-#: gramps.glade:12256 gramps.glade:15790
+#: GenericFilter.py:996 GenericFilter.py:1045 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:8989 gramps.glade:11453
+#: gramps.glade:13165 gramps.glade:16998
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: GenericFilter.py:987
+#: GenericFilter.py:997
 msgid "People with the personal "
 msgstr "Henkilöt, joilla on henkilökohtainen "
 
-#: GenericFilter.py:988
+#: GenericFilter.py:998
 msgid "Matches people with a personal event of a particular value"
 msgstr "Poimii henkilöt, joiden henkilökohtaisella tapahtumalla on tietty arvo"
 
-#: GenericFilter.py:989 GenericFilter.py:1039 GenericFilter.py:1138
-#: GenericFilter.py:1178 GenericFilter.py:1509 GenericFilter.py:1530
-#: GenericFilter.py:1589
+#: GenericFilter.py:999 GenericFilter.py:1048 GenericFilter.py:1145
+#: GenericFilter.py:1184 GenericFilter.py:1502 GenericFilter.py:1522
+#: GenericFilter.py:1578
 msgid "Event filters"
 msgstr "Tapahtumasuotimet"
 
-#: GenericFilter.py:1033 GenericFilter.py:1586 plugins/FilterEditor.py:59
+#: GenericFilter.py:1042 GenericFilter.py:1575 plugins/FilterEditor.py:59
 msgid "Family event:"
 msgstr "Perhetapahtuma:"
 
-#: GenericFilter.py:1037
+#: GenericFilter.py:1046
 msgid "People with the family "
 msgstr "Henklöt, joilla on "
 
-#: GenericFilter.py:1038
+#: GenericFilter.py:1047
 msgid "Matches people with a family event of a particular value"
 msgstr "Poimii henkilöt, joiden perhetapahtumalla on tietty arvo"
 
-#: GenericFilter.py:1083
+#: GenericFilter.py:1091
 msgid "Number of relationships:"
 msgstr "Suhteiden määrä:"
 
-#: GenericFilter.py:1084 plugins/FilterEditor.py:65
+#: GenericFilter.py:1092 plugins/FilterEditor.py:65
 msgid "Relationship type:"
 msgstr "Suhteen tyyppi:"
 
-#: GenericFilter.py:1085
+#: GenericFilter.py:1093
 msgid "Number of children:"
 msgstr "Lasten lukumäärä:"
 
-#: GenericFilter.py:1086
+#: GenericFilter.py:1094
 msgid "People with the "
 msgstr "Henkilöt, joilla on "
 
-#: GenericFilter.py:1087
+#: GenericFilter.py:1095
 msgid "Matches people with a particular relationship"
 msgstr "Poimii henkilöt, joilla on tietynlainen suhde"
 
-#: GenericFilter.py:1136
+#: GenericFilter.py:1143
 msgid "People with the "
 msgstr "Henkilöt, joilla on "
 
-#: GenericFilter.py:1137
+#: GenericFilter.py:1144
 msgid "Matches people with birth data of a particular value"
 msgstr "Poimii henkilöt, joiden syntymätiedolla on tietty arvo"
 
-#: GenericFilter.py:1176
+#: GenericFilter.py:1182
 msgid "People with the "
 msgstr "Henkilöt, joilla on "
 
-#: GenericFilter.py:1177
+#: GenericFilter.py:1183
 msgid "Matches people with death data of a particular value"
 msgstr "Poimii henkilöt, joiden kuolintiedolla on tietty arvo"
 
-#: GenericFilter.py:1215 GenericFilter.py:1240 gramps.glade:9050
-#: gramps.glade:22103 gramps.glade:23110
+#: GenericFilter.py:1220 GenericFilter.py:1244 gramps.glade:9674
+#: gramps.glade:23827 gramps.glade:24909
 msgid "Value:"
 msgstr "Arvo:"
 
-#: GenericFilter.py:1215 plugins/FilterEditor.py:60
+#: GenericFilter.py:1220 plugins/FilterEditor.py:60
 msgid "Personal attribute:"
 msgstr "Henkilökohtainen ominaisuus:"
 
-#: GenericFilter.py:1216
+#: GenericFilter.py:1221
 msgid "People with the personal "
 msgstr "Henkilöt, joilla on henkilökohtainen "
 
-#: GenericFilter.py:1217
+#: GenericFilter.py:1222
 msgid "Matches people with the personal attribute of a particular value"
 msgstr "Poimii henkilöt, joiden henkilökohtaisella ominaisuudella on tietty arvo"
 
-#: GenericFilter.py:1240 plugins/FilterEditor.py:61
+#: GenericFilter.py:1244 plugins/FilterEditor.py:61
 msgid "Family attribute:"
 msgstr "Perheen ominaisuus:"
 
-#: GenericFilter.py:1241
+#: GenericFilter.py:1245
 msgid "People with the family "
 msgstr "Henkilöt, joilla on "
 
-#: GenericFilter.py:1242
+#: GenericFilter.py:1246
 msgid "Matches people with the family attribute of a particular value"
 msgstr "Poimii henkilöt, joiden perheominaisuudella on tietty arvo"
 
-#: GenericFilter.py:1267 gramps.glade:7894
+#: GenericFilter.py:1270 gramps.glade:8380
 msgid "Given name:"
 msgstr "Etunimi:"
 
-#: GenericFilter.py:1268 gramps.glade:7870
+#: GenericFilter.py:1271 gramps.glade:8352
 msgid "Family name:"
 msgstr "Sukunimi:"
 
-#: GenericFilter.py:1269 gramps.glade:7846
+#: GenericFilter.py:1272 gramps.glade:8324
 msgid "Suffix:"
 msgstr "Pääte:"
 
-#: GenericFilter.py:1270 gramps.glade:3457 gramps.glade:7918
-#: gramps.glade:19281 gramps.glade:21520 gramps.glade:30990
+#: GenericFilter.py:1273 gramps.glade:3631 gramps.glade:8408
+#: gramps.glade:20776 gramps.glade:23196 gramps.glade:33293
 #: mergedata.glade:874 mergedata.glade:896
 msgid "Title:"
 msgstr "Nimike:"
 
-#: GenericFilter.py:1271
+#: GenericFilter.py:1274
 msgid "People with the "
 msgstr "Henkilöt, joilla on "
 
-#: GenericFilter.py:1272 GenericFilter.py:1305
+#: GenericFilter.py:1275 GenericFilter.py:1307
 msgid "Matches people with a specified (partial) name"
 msgstr "Poimii henkilöt, joilla on annettu nimi / nimen osa"
 
-#: GenericFilter.py:1303 GenericFilter.py:1640
+#: GenericFilter.py:1305 GenericFilter.py:1629
 msgid "Substring:"
 msgstr "Merkkijonon osa:"
 
-#: GenericFilter.py:1304
+#: GenericFilter.py:1306
 msgid "People matching the "
 msgstr "Henkilöt, joilla on "
 
-#: GenericFilter.py:1322 gramps_main.py:992
+#: GenericFilter.py:1323 gramps_main.py:992
 msgid "People with incomplete names"
 msgstr "Henkilöt epätäydellisillä nimillä"
 
-#: GenericFilter.py:1323
+#: GenericFilter.py:1324
 msgid "Matches people with firstname or lastname missing"
 msgstr "Poimii henkilöt, joiden etunimi tai sukunimi puuttuu"
 
@@ -1443,123 +1464,123 @@ msgstr " hyväksymien henkilöiden puolisot"
 msgid "Matches people married to anybody matching a filter"
 msgstr "Poimii henkilöt, jotka ovat aviossa suotimen hyväksymän henkilön kanssa"
 
-#: GenericFilter.py:1411 gramps_main.py:982
+#: GenericFilter.py:1410 gramps_main.py:982
 msgid "Adopted people"
 msgstr "Adoptoidut henkilöt"
 
-#: GenericFilter.py:1412
+#: GenericFilter.py:1411
 msgid "Matches people who were adopted"
 msgstr "Poimii henkilöt, jotka ovat adoptoituja"
 
-#: GenericFilter.py:1429 gramps_main.py:987
+#: GenericFilter.py:1427 gramps_main.py:987
 msgid "People with images"
 msgstr "Henkilöt, joista on kuvia"
 
-#: GenericFilter.py:1430
+#: GenericFilter.py:1428
 msgid "Matches people with images in the gallery"
 msgstr "Poimii henkilöt, joilla on kuvia kuvagalleriassa"
 
-#: GenericFilter.py:1443 gramps_main.py:997
+#: GenericFilter.py:1440 gramps_main.py:997
 msgid "People with children"
 msgstr "Henkilöt, joilla on lapsia"
 
-#: GenericFilter.py:1444
+#: GenericFilter.py:1441
 msgid "Matches people who have children"
 msgstr "Poimii henkilöt, joilla on lapsia"
 
-#: GenericFilter.py:1459 gramps_main.py:1002
+#: GenericFilter.py:1455 gramps_main.py:1002
 msgid "People with no marriage records"
 msgstr "Henkilöt, jotka eivät ole koskaan avioituneet"
 
-#: GenericFilter.py:1460
+#: GenericFilter.py:1456
 msgid "Matches people who have no spouse"
 msgstr "Poimii henkilöt, joilla ei ole puolisoa"
 
-#: GenericFilter.py:1473 gramps_main.py:1007
+#: GenericFilter.py:1468 gramps_main.py:1007
 msgid "People with multiple marriage records"
 msgstr "Henkilöt, jotka ovat olleet useasti aviossa"
 
-#: GenericFilter.py:1474
+#: GenericFilter.py:1469
 msgid "Matches people who have more than one spouse"
 msgstr "Poimii henkilöt, joilla on enemmän kuin yksi puoliso"
 
-#: GenericFilter.py:1487 gramps_main.py:1012
+#: GenericFilter.py:1481 gramps_main.py:1012
 msgid "People without a known birth date"
 msgstr "Henkilöt, joiden syntymäaika ei ole tiedossa"
 
-#: GenericFilter.py:1488
+#: GenericFilter.py:1482
 msgid "Matches people without a known birthdate"
 msgstr "Poimii henkilöt, joiden syntymäaika ei ole tiedossa"
 
-#: GenericFilter.py:1507 gramps_main.py:1017
+#: GenericFilter.py:1500 gramps_main.py:1017
 msgid "People with incomplete events"
 msgstr "Henkilöt epätäydellisillä tapahtumilla"
 
-#: GenericFilter.py:1508
+#: GenericFilter.py:1501
 msgid "Matches people with missing date or place in an event"
 msgstr "Poimii henkilöt, joiden tapahtumista puuttuu joko aika tai paikka"
 
-#: GenericFilter.py:1528 gramps_main.py:1022
+#: GenericFilter.py:1520 gramps_main.py:1022
 msgid "Families with incomplete events"
 msgstr "Perheet epätäydellisillä tapahtumilla"
 
-#: GenericFilter.py:1529
+#: GenericFilter.py:1521
 msgid "Matches people with missing date or place in an event of the family"
 msgstr "Poimii henkilöt, joiden perhetapahtumista puuttuu joko aika tai paikka"
 
-#: GenericFilter.py:1551
+#: GenericFilter.py:1542
 msgid "On year:"
 msgstr "Vuonna:"
 
-#: GenericFilter.py:1552 gramps_main.py:1027
+#: GenericFilter.py:1543 gramps_main.py:1027
 msgid "People probably alive"
 msgstr "Henkilöt todennäköisesti elossa"
 
-#: GenericFilter.py:1553
+#: GenericFilter.py:1544
 msgid "Matches people without indications of death that are not too old"
 msgstr "Poimii henkilöt, joilla ei ole kuolemaan liittyviä tapahtumia, ja jotka eivät ole liian vanhoja"
 
-#: GenericFilter.py:1572 gramps_main.py:1032
+#: GenericFilter.py:1562 gramps_main.py:1032
 msgid "People marked private"
 msgstr "Yksityisiksi merkityt henkilöt"
 
-#: GenericFilter.py:1573
+#: GenericFilter.py:1563
 msgid "Matches people that are indicated as private"
 msgstr "Poimii henkilöt, jotka on merkitty yksityisiksi"
 
-#: GenericFilter.py:1587 gramps.glade:25926 gramps_main.py:1037
+#: GenericFilter.py:1576 gramps.glade:27895 gramps_main.py:1037
 msgid "Witnesses"
 msgstr "Todistajat"
 
-#: GenericFilter.py:1588
+#: GenericFilter.py:1577
 msgid "Matches people who are witnesses in any event"
 msgstr "Poimii kaikki henkilöt, jotka ovat jonkin tapahtuman todistajia"
 
-#: GenericFilter.py:1641 plugins/FilterEditor.py:694
+#: GenericFilter.py:1630 plugins/FilterEditor.py:694
 msgid "Case sensitive:"
 msgstr "Sama kirjainkoko:"
 
-#: GenericFilter.py:1642 plugins/FilterEditor.py:696
+#: GenericFilter.py:1631 plugins/FilterEditor.py:696
 msgid "Regular-Expression matching:"
 msgstr "Regular-expression poiminta:"
 
-#: GenericFilter.py:1643
+#: GenericFilter.py:1632
 msgid "People with records containing "
 msgstr "Poimii henkilöt, joiden tiedoista löytyy "
 
-#: GenericFilter.py:1644
+#: GenericFilter.py:1633
 msgid "Matches people whose records contain text matching a substring"
 msgstr "Poimii henkilöt, joiden tiedoista löytyy annettu merkkijonon osa"
 
-#: GenericFilter.py:1808 plugins/FilterEditor.py:682
+#: GenericFilter.py:1799 plugins/FilterEditor.py:682
 msgid "Source ID:"
 msgstr "Lähdetunniste:"
 
-#: GenericFilter.py:1809
+#: GenericFilter.py:1800
 msgid "People with the "
 msgstr "Henkilöt "
 
-#: GenericFilter.py:1811
+#: GenericFilter.py:1802
 msgid "Matches people who have a particular source"
 msgstr "Poimii henkilöt, joilla on tietty lähde"
 
@@ -1575,7 +1596,7 @@ msgstr "Yhdistetty isän ja äidin sukunimi"
 msgid "Icelandic style"
 msgstr "Islantilaisittain"
 
-#: GrampsCfg.py:70 GrampsCfg.py:74 gramps.glade:7733 gramps.glade:21835
+#: GrampsCfg.py:70 GrampsCfg.py:74 gramps.glade:8195 gramps.glade:23539
 msgid "General"
 msgstr "Yleiset"
 
@@ -1605,7 +1626,7 @@ msgstr "_Peru %s"
 
 #: ImageSelect.py:486 ImageSelect.py:507
 msgid "Drag Media Object"
-msgstr "Vedä media-objekti"
+msgstr "Vedä mediatiedosto"
 
 #: ImageSelect.py:497 RelImage.py:51
 msgid "Could not import %s"
@@ -1627,21 +1648,21 @@ msgstr "Mediaviite"
 msgid "Reference Editor"
 msgstr "Viite-editori"
 
-#: ImageSelect.py:828 ImageSelect.py:1191 MediaView.py:345
+#: ImageSelect.py:828 ImageSelect.py:1194 MediaView.py:345
 msgid "Edit Media Object"
-msgstr "Muokkaa media-objektia"
+msgstr "Muokkaa mediatiedostoa"
 
-#: ImageSelect.py:910
+#: ImageSelect.py:912
 msgid "Media Properties Editor"
 msgstr "Mediaominaisuus-editori"
 
-#: ImageSelect.py:1043
+#: ImageSelect.py:1047
 msgid "Properties Editor"
 msgstr "Ominaisuus-editori"
 
-#: ImageSelect.py:1288
+#: ImageSelect.py:1291
 msgid "Remove Media Object"
-msgstr "Poista media-objekti"
+msgstr "Poista mediatiedosto"
 
 #: LocEdit.py:72 LocEdit.py:105
 msgid "Location Editor"
@@ -1651,7 +1672,7 @@ msgstr "Sijainti-editori"
 msgid "Marriage/Relationship Editor"
 msgstr "Avio/suhde-editori"
 
-#: Marriage.py:146 Marriage.py:805 Marriage.py:828 Utils.py:135
+#: Marriage.py:146 Marriage.py:805 Marriage.py:828 Utils.py:130
 msgid "%s and %s"
 msgstr "%s ja %s"
 
@@ -1698,19 +1719,19 @@ msgstr "Muokkaa ominaisuuksia"
 
 #: MediaView.py:357
 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 "Kyseinen media-objekti on käytössä. Jos hävität sen, objekti ja kaikki viitteet siihen poistetaan tietokannasta."
+msgstr "Kyseinen mediatiedosto on käytössä. Jos hävität sen, se ja kaikki viitteet siihen poistetaan tietokannasta."
 
 #: MediaView.py:361
 msgid "Deleting media object will remove it from the database."
-msgstr "Media-objektin poisto hävittää sen tietokannasta."
+msgstr "Mediatiedoston poisto hävittää sen tietokannasta."
 
 #: MediaView.py:364
 msgid "Delete Media Object?"
-msgstr "Poista media-objekti?"
+msgstr "Poista mediatiedosto?"
 
 #: MediaView.py:365
 msgid "_Delete Media Object"
-msgstr "_Poista media-objekti"
+msgstr "_Poista mediatiedosto"
 
 #: MediaView.py:421
 msgid "Image import failed"
@@ -1736,11 +1757,11 @@ msgstr "Vertaa henkilöitä"
 msgid "Alternate Names"
 msgstr "Vaihtoehtoiset nimet"
 
-#: MergePeople.py:122 gramps.glade:8961 gramps.glade:12692
+#: MergePeople.py:122 gramps.glade:9573 gramps.glade:13652
 msgid "Events"
 msgstr "Tapahtumat"
 
-#: MergePeople.py:129 PedView.py:693
+#: MergePeople.py:129 PedView.py:696
 msgid "Parents"
 msgstr "Vanhemmat"
 
@@ -1752,7 +1773,7 @@ msgstr "Perhetunnus"
 msgid "No parents found"
 msgstr "Vanhempia ei löytynyt"
 
-#: MergePeople.py:140 PedView.py:598
+#: MergePeople.py:140 PedView.py:601
 msgid "Spouses"
 msgstr "Puolisot"
 
@@ -1765,7 +1786,7 @@ msgstr "Puoliso"
 msgid "Marriage"
 msgstr "Avioliitto"
 
-#: MergePeople.py:159 const.py:902
+#: MergePeople.py:159 const.py:909
 msgid "Child"
 msgstr "Lapsi"
 
@@ -1773,7 +1794,7 @@ msgstr "Lapsi"
 msgid "No spouses or children found"
 msgstr "Puolisoita tai lapsia ei löytynyt"
 
-#: MergePeople.py:165 gramps.glade:10111
+#: MergePeople.py:165 gramps.glade:10857
 msgid "Addresses"
 msgstr "Osoitteet"
 
@@ -1845,27 +1866,27 @@ msgstr "haud."
 msgid "crem."
 msgstr "krem."
 
-#: PedView.py:379
+#: PedView.py:382
 msgid "Anchor"
 msgstr "Ankkuri"
 
-#: PedView.py:496
+#: PedView.py:499
 msgid "Double clicking will make %s the active person"
 msgstr "Tuplaklikkaus tekee %s:stä aktiivisen henkilön"
 
-#: PedView.py:563
+#: PedView.py:566
 msgid "Set anchor"
 msgstr "Aseta ankkuri"
 
-#: PedView.py:564
+#: PedView.py:567
 msgid "Remove anchor"
 msgstr "Poista ankkuri"
 
-#: PedView.py:629 plugins/WebPage.py:715
+#: PedView.py:632 plugins/WebPage.py:715
 msgid "Siblings"
 msgstr "Sisarukset"
 
-#: PedView.py:659 plugins/FamilyGroup.py:400 plugins/IndivComplete.py:295
+#: PedView.py:662 plugins/FamilyGroup.py:400 plugins/IndivComplete.py:295
 #: plugins/IndivSummary.py:179 plugins/WebPage.py:674
 msgid "Children"
 msgstr "Lapset"
@@ -1879,7 +1900,7 @@ msgid "Cause of Death"
 msgstr "Kuolinsyy"
 
 #: PeopleView.py:83 WriteGedcom.py:329 gramps_main.py:952
-#: plugins/EventCmp.py:158 plugins/ExportVCalendar.py:81
+#: plugins/EventCmp.py:158 plugins/ExportVCalendar.py:82
 #: plugins/ExportVCard.py:84 plugins/GraphViz.py:513
 #: plugins/IndivComplete.py:510 plugins/StatisticsChart.py:827
 #: plugins/TimeLine.py:411 plugins/WebPage.py:1265 plugins/WriteFtree.py:86
@@ -1887,16 +1908,16 @@ msgstr "Kuolinsyy"
 msgid "Entire Database"
 msgstr "Koko tietokanta"
 
-#: PeopleView.py:267 gramps_main.py:1658
+#: PeopleView.py:260 gramps_main.py:1672
 msgid "Updating display..."
 msgstr "Päivitetään näyttöä..."
 
-#: PeopleView.py:295 PlaceView.py:200 SourceView.py:189 gramps.glade:955
+#: PeopleView.py:288 PlaceView.py:203 SourceView.py:191 gramps.glade:956
 #: plugins/BookReport.py:832
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: PlaceView.py:49 PlaceView.py:119
+#: PlaceView.py:49 PlaceView.py:120
 msgid "Place Name"
 msgstr "Paikan nimi"
 
@@ -1916,27 +1937,27 @@ msgstr "Pituusaste"
 msgid "Latitude"
 msgstr "Leveysaste"
 
-#: PlaceView.py:204
+#: PlaceView.py:207
 msgid "Place Menu"
 msgstr "Paikka-valikko"
 
-#: PlaceView.py:251 SourceView.py:225 gramps_main.py:1454
+#: PlaceView.py:254 SourceView.py:227 gramps_main.py:1468
 msgid "Delete %s?"
 msgstr "Poista %s?"
 
-#: PlaceView.py:252
+#: PlaceView.py:255
 msgid "This place is currently being used by at least one record in the database. Deleting it will remove it from the database and remove it from all records that reference it."
 msgstr "Paikkaa käyttää ainakin yksi kannan tietue. Paikan hävitys poistaa sen ja kaikki viitteet siihen tietokannasta."
 
-#: PlaceView.py:256
+#: PlaceView.py:259
 msgid "_Delete Place"
 msgstr "_Poista paikka"
 
-#: PlaceView.py:287
+#: PlaceView.py:290
 msgid "Cannot merge places."
 msgstr "Paikkojen yhdistys ei onnistu."
 
-#: PlaceView.py:288
+#: PlaceView.py:291
 msgid "Exactly two places must be selected to perform a merge. A second place can be selected by holding down the control key while clicking on the desired place."
 msgstr "Tasan kaksi paikkaa pitää olla valittuna yhdistettäväksi. Toinen paikka voidaan valita pitämällä Control-näppäintä alhaalla klikatessa."
 
@@ -1950,13 +1971,13 @@ msgstr "Lajittelemattomat"
 
 #: PluginMgr.py:162 PluginMgr.py:163 PluginMgr.py:164 PluginMgr.py:189
 #: PluginMgr.py:191 PluginMgr.py:192 PluginMgr.py:223 PluginMgr.py:224
-#: PluginMgr.py:225 ReportUtils.py:1756 Witness.py:83 Witness.py:166
-#: const.py:234 const.py:247 const.py:493 const.py:506 gramps_main.py:1736
+#: PluginMgr.py:225 ReportUtils.py:1757 Witness.py:83 Witness.py:166
+#: const.py:234 const.py:247 const.py:493 gramps_main.py:1750
 #: plugins/Check.py:474 plugins/ScratchPad.py:78 plugins/WebPage.py:334
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: Plugins.py:125 gramps.glade:1396
+#: Plugins.py:125 gramps.glade:1427
 msgid "_Apply"
 msgstr "_Käytä"
 
@@ -2145,7 +2166,55 @@ msgstr "%s:n näyttö ei onnistu"
 msgid "GRAMPS is not able to display the image file. This may be caused by a corrupt file."
 msgstr "GRAMPS ei pysty näyttämään kuvaa. Kuvatiedosto voi olla viallinen."
 
+#: Relationship.py:268
+msgid "husband"
+msgstr "aviomies"
+
+#: Relationship.py:270
+msgid "wife"
+msgstr "vaimo"
+
+#: Relationship.py:272
+msgid "gender unknown|spouse"
+msgstr "puoliso"
+
+#: Relationship.py:275
+msgid "unmarried|husband"
+msgstr "avomies"
+
 #: Relationship.py:277
+msgid "unmarried|wife"
+msgstr "avovaimo"
+
+#: Relationship.py:279
+msgid "gender unknown,unmarried|spouse"
+msgstr "avopuoliso"
+
+#: Relationship.py:282
+msgid "male,civil union|partner"
+msgstr "virallinen mieskumppani"
+
+#: Relationship.py:284
+msgid "female,civil union|partner"
+msgstr "virallinen naiskumppani"
+
+#: Relationship.py:286
+msgid "gender unknown,civil union|partner"
+msgstr "virallinen kumppani"
+
+#: Relationship.py:289
+msgid "male,unknown relation|partner"
+msgstr "mieskumppani"
+
+#: Relationship.py:291
+msgid "female,unknown relation|partner"
+msgstr "naiskumppani"
+
+#: Relationship.py:293
+msgid "gender unknown,unknown relation|partner"
+msgstr "kumppani"
+
+#: Relationship.py:325
 msgid "Relationship loop detected"
 msgstr "Rekursiivinen suhdeviite havaittu"
 
@@ -2157,7 +2226,7 @@ msgstr "Oletustyylimalli"
 msgid "User Defined Template"
 msgstr "Käyttäjän tyylimalli"
 
-#: Report.py:152 Report.py:172 Utils.py:279
+#: Report.py:152 Report.py:172 Utils.py:274
 msgid "default"
 msgstr "oletus"
 
@@ -2351,7 +2420,7 @@ msgstr "Tiedostonimi"
 
 #: Report.py:1119
 msgid "Output Format"
-msgstr "Tulostusformaatti"
+msgstr "Tulostusmuoto"
 
 #: Report.py:1175 Report.py:1177
 msgid "Paper Options"
@@ -2365,8 +2434,8 @@ msgstr "Koko"
 msgid "Height"
 msgstr "Korkeus"
 
-#: Report.py:1199 Report.py:1215 gramps.glade:20322 gramps.glade:20346
-#: gramps.glade:20370 gramps.glade:20802
+#: Report.py:1199 Report.py:1215 gramps.glade:21900 gramps.glade:21928
+#: gramps.glade:21956 gramps.glade:22416
 msgid "cm"
 msgstr "cm"
 
@@ -2426,711 +2495,711 @@ msgstr "_Ylikirjoita"
 msgid "_Change filename"
 msgstr "_Vaihda tiedoston nimeä"
 
-#: ReportUtils.py:297 ReportUtils.py:298 Utils.py:170 Utils.py:172
+#: ReportUtils.py:297 ReportUtils.py:298 Utils.py:165 Utils.py:167
 msgid "Private"
 msgstr "Yksityinen"
 
-#: ReportUtils.py:503 ReportUtils.py:1057 ReportUtils.py:1155
-#: ReportUtils.py:1446 ReportUtils.py:1539 plugins/DetAncestralReport.py:192
+#: ReportUtils.py:504 ReportUtils.py:1058 ReportUtils.py:1156
+#: ReportUtils.py:1447 ReportUtils.py:1540 plugins/DetAncestralReport.py:192
 #: plugins/DetAncestralReport.py:350 plugins/DetDescendantReport.py:216
 #: plugins/DetDescendantReport.py:371
 msgid "He"
 msgstr "Hän"
 
-#: ReportUtils.py:505 ReportUtils.py:1059 ReportUtils.py:1157
-#: ReportUtils.py:1448 ReportUtils.py:1541 plugins/DetAncestralReport.py:194
+#: ReportUtils.py:506 ReportUtils.py:1060 ReportUtils.py:1158
+#: ReportUtils.py:1449 ReportUtils.py:1542 plugins/DetAncestralReport.py:194
 #: plugins/DetAncestralReport.py:348 plugins/DetDescendantReport.py:218
 #: plugins/DetDescendantReport.py:369
 msgid "She"
 msgstr "Hän"
 
-#: ReportUtils.py:518
+#: ReportUtils.py:519
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s syntyi %(birth_date)s, syntymäpaikka %(birth_place)s%(birth_endnotes)s, kuoli %(death_date)s, kuolinpaikka %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:527
+#: ReportUtils.py:528
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s syntyi %(birth_date)s, syntymäpaikka %(birth_place)s%(birth_endnotes)s, kuoli %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:536
+#: ReportUtils.py:537
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s syntyi %(birth_date)s, syntymäpaikka %(birth_place)s%(birth_endnotes)s, kuoli %(death_place)s%(death_endnotes)s:ssa."
 
-#: ReportUtils.py:544
+#: ReportUtils.py:545
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s syntyi %(birth_date)s, syntymäpaikka %(birth_place)s%(birth_endnotes)s."
 
-#: ReportUtils.py:552
+#: ReportUtils.py:553
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s syntyi %(birth_date)s%(birth_endnotes)s, kuoli %(death_date)s, kuolinpaikka %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:561
+#: ReportUtils.py:562
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s syntyi %(birth_date)s%(birth_endnotes)s, kuoli %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:570
+#: ReportUtils.py:571
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s syntyi %(birth_date)s%(birth_endnotes)s, kuoli %(death_place)s%(death_endnotes)s:ssa."
 
-#: ReportUtils.py:578
+#: ReportUtils.py:579
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s syntyi %(birth_date)s%(birth_endnotes)s."
 
-#: ReportUtils.py:586
+#: ReportUtils.py:587
 msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s syntyi %(birth_place)s%(birth_endnotes)s:ssa,  kuoli %(death_date)s, kuolinpaikka %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:595
+#: ReportUtils.py:596
 msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s syntyi %(birth_place)s%(birth_endnotes)s:ssa,  kuoli %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:604
+#: ReportUtils.py:605
 msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s syntyi %(birth_place)s%(birth_endnotes)s:ssa,  kuoli %(death_place)s%(death_endnotes)s:ssa."
 
-#: ReportUtils.py:612
+#: ReportUtils.py:613
 msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s syntyi %(birth_place)s%(birth_endnotes)s:ssa."
 
-#: ReportUtils.py:620
+#: ReportUtils.py:621
 msgid "%(male_name)s%(endnotes)s died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s kuoli %(death_date)s, kuolinpaikka %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:626
+#: ReportUtils.py:627
 msgid "%(male_name)s%(endnotes)s died %(death_date)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s kuoli %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:633
+#: ReportUtils.py:634
 msgid "%(male_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s kuoli %(death_place)s%(death_endnotes)s:ssa."
 
-#: ReportUtils.py:639
+#: ReportUtils.py:640
 msgid "%(male_name)s%(endnotes)s."
 msgstr "%(male_name)s%(endnotes)s."
 
-#: ReportUtils.py:646
+#: ReportUtils.py:647
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s syntyi %(birth_date)s, syntymäpaikka %(birth_place)s%(birth_endnotes)s, kuoli %(death_date)s, kuolinpaikka %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:655
+#: ReportUtils.py:656
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s syntyi %(birth_date)s, syntymäpaikka %(birth_place)s%(birth_endnotes)s, kuoli %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:664
+#: ReportUtils.py:665
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s syntyi %(birth_date)s, syntymäpaikka %(birth_place)s%(birth_endnotes)s, kuoli %(death_place)s%(death_endnotes)s:ssa."
 
-#: ReportUtils.py:672
+#: ReportUtils.py:673
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s syntyi %(birth_date)s, syntymäpaikka %(birth_place)s%(birth_endnotes)s."
 
-#: ReportUtils.py:680
+#: ReportUtils.py:681
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s syntyi %(birth_date)s%(birth_endnotes)s, kuoli %(death_date)s, kuolinpaikka %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:689
+#: ReportUtils.py:690
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s syntyi %(birth_date)s%(birth_endnotes)s, kuoli %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:698
+#: ReportUtils.py:699
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s syntyi %(birth_date)s%(birth_endnotes)s, kuoli %(death_place)s%(death_endnotes)s:ssa."
 
-#: ReportUtils.py:706
+#: ReportUtils.py:707
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s syntyi %(birth_date)s%(birth_endnotes)s."
 
-#: ReportUtils.py:714
+#: ReportUtils.py:715
 msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s syntyi %(birth_place)s%(birth_endnotes)s:ssa, kuoli %(death_date)s, kuolinpaikka %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:723
+#: ReportUtils.py:724
 msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s syntyi %(birth_place)s%(birth_endnotes)s:ssa, kuoli %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:732
+#: ReportUtils.py:733
 msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s syntyi %(birth_place)s%(birth_endnotes)s:ssa, kuoli %(death_place)s%(death_endnotes)s:ssa."
 
-#: ReportUtils.py:740
+#: ReportUtils.py:741
 msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s syntyi %(birth_place)s%(birth_endnotes)s:ssa."
 
-#: ReportUtils.py:748
+#: ReportUtils.py:749
 msgid "%(female_name)s%(endnotes)s died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s kuoli %(death_date)s, kuolinpaikka %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:754
+#: ReportUtils.py:755
 msgid "%(female_name)s%(endnotes)s died %(death_date)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s kuoli %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:761
+#: ReportUtils.py:762
 msgid "%(female_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s kuoli %(death_place)s%(death_endnotes)s:ssa."
 
-#: ReportUtils.py:767
+#: ReportUtils.py:768
 msgid "%(female_name)s%(endnotes)s."
 msgstr "%(female_name)s%(endnotes)s."
 
-#: ReportUtils.py:821
+#: ReportUtils.py:822
 msgid "He married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Vihittiin %(spouse)s:n kanssa %(date)s, vihkipaikka %(place)s%(endnotes)s."
 
-#: ReportUtils.py:827
+#: ReportUtils.py:828
 msgid "She married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Vihittiin %(spouse)s:n kanssa %(date)s, vihkipaikka %(place)s%(endnotes)s."
 
-#: ReportUtils.py:834
+#: ReportUtils.py:835
 msgid "He married %(spouse)s %(date)s%(endnotes)s."
 msgstr "Vihittiin %(spouse)s:n kanssa %(date)s%(endnotes)s."
 
-#: ReportUtils.py:839 ReportUtils.py:850
+#: ReportUtils.py:840 ReportUtils.py:851
 msgid "She married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Vihittiin %(spouse)s:n kanssa %(place)s%(endnotes)s:ssa."
 
-#: ReportUtils.py:845
+#: ReportUtils.py:846
 msgid "He married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Vihittiin %(spouse)s:n kanssa %(place)s%(endnotes)s:ssa."
 
-#: ReportUtils.py:856
+#: ReportUtils.py:857
 msgid "He married %(spouse)s%(endnotes)s."
 msgstr "Vihittiin %(spouse)s%(endnotes)s:n kanssa."
 
-#: ReportUtils.py:860
+#: ReportUtils.py:861
 msgid "She married %(spouse)s%(endnotes)s."
 msgstr "Vihittiin %(spouse)s%(endnotes)s:n kanssa."
 
-#: ReportUtils.py:866
+#: ReportUtils.py:867
 msgid "He also married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Avioitui myös %(spouse)s:n kanssa %(date)s, vihkipaikka %(place)s%(endnotes)s."
 
-#: ReportUtils.py:872
+#: ReportUtils.py:873
 msgid "She also married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Avioitui myös %(spouse)s:n kanssa %(date)s, vihkipaikka %(place)s%(endnotes)s."
 
-#: ReportUtils.py:879
+#: ReportUtils.py:880
 msgid "He also married %(spouse)s %(date)s%(endnotes)s."
 msgstr "Avioitui myös %(spouse)s:n kanssa %(date)s%(endnotes)s."
 
-#: ReportUtils.py:884 ReportUtils.py:895
+#: ReportUtils.py:885 ReportUtils.py:896
 msgid "She also married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Avioitui myös %(spouse)s:n kanssa %(place)s%(endnotes)s:ssa."
 
-#: ReportUtils.py:890
+#: ReportUtils.py:891
 msgid "He also married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Avioitui myös %(spouse)s:n kanssa %(place)s%(endnotes)s:ssa."
 
-#: ReportUtils.py:901
+#: ReportUtils.py:902
 msgid "He also married %(spouse)s%(endnotes)s."
 msgstr "Avioitui myös %(spouse)s%(endnotes)s:n kanssa."
 
-#: ReportUtils.py:905
+#: ReportUtils.py:906
 msgid "She also married %(spouse)s%(endnotes)s."
 msgstr "Avioitui myös %(spouse)s%(endnotes)s:n kanssa."
 
-#: ReportUtils.py:926
+#: ReportUtils.py:927
 msgid "He married %(spouse)s."
 msgstr "Vihittiin %(spouse)s:n kanssa."
 
-#: ReportUtils.py:928
+#: ReportUtils.py:929
 msgid "She married %(spouse)s."
 msgstr "Vihittiin %(spouse)s:n kanssa."
 
-#: ReportUtils.py:931
+#: ReportUtils.py:932
 msgid "He had relationship with %(spouse)s."
 msgstr "Hänellä oli suhde %(spouse)s:n kanssa."
 
-#: ReportUtils.py:934
+#: ReportUtils.py:935
 msgid "She had relationship with %(spouse)s."
 msgstr "Hänellä oli suhde %(spouse)s:n kanssa."
 
-#: ReportUtils.py:939
+#: ReportUtils.py:940
 msgid "He also married %(spouse)s."
 msgstr "Hän avioitui myös %(spouse)s:n kanssa."
 
-#: ReportUtils.py:941
+#: ReportUtils.py:942
 msgid "She also married %(spouse)s."
 msgstr "Hän avioitui myös %(spouse)s:n kanssa."
 
-#: ReportUtils.py:944
+#: ReportUtils.py:945
 msgid "He also had relationship with %(spouse)s."
 msgstr "Hänellä oli suhde myös %(spouse)s:n kanssa."
 
-#: ReportUtils.py:947
+#: ReportUtils.py:948
 msgid "She also had relationship with %(spouse)s."
 msgstr "Hänellä oli suhde myös %(spouse)s:n kanssa."
 
-#: ReportUtils.py:978
+#: ReportUtils.py:979
 msgid "He was the son of %(father)s and %(mother)s."
 msgstr "%(father)s ja %(mother)s olivat hänen vanhempiaan."
 
-#: ReportUtils.py:982
+#: ReportUtils.py:983
 msgid "He is the son of %(father)s and %(mother)s."
 msgstr "Hänen isänsä on %(father)s ja äitinsä %(mother)s."
 
-#: ReportUtils.py:987
+#: ReportUtils.py:988
 msgid "He was the son of %(mother)s."
 msgstr "%(mother)s oli hänen äitinsä."
 
-#: ReportUtils.py:990
+#: ReportUtils.py:991
 msgid "He is the son of %(mother)s."
 msgstr "Hänen äitinsä on %(mother)s."
 
-#: ReportUtils.py:994
+#: ReportUtils.py:995
 msgid "He was the son of %(father)s."
 msgstr "%(father)s oli hänen isänsä."
 
-#: ReportUtils.py:997
+#: ReportUtils.py:998
 msgid "He is the son of %(father)s."
 msgstr "Hänen isänsä %(father)s."
 
-#: ReportUtils.py:1002
+#: ReportUtils.py:1003
 msgid "She was the daughter of %(father)s and %(mother)s."
 msgstr "%(father)s %(mother)s olivat hänen vanhempiaan."
 
-#: ReportUtils.py:1006
+#: ReportUtils.py:1007
 msgid "She is the daughter of %(father)s and %(mother)s."
 msgstr "Hänen isänsä on %(father)s ja äitinsä %(mother)s."
 
-#: ReportUtils.py:1011
+#: ReportUtils.py:1012
 msgid "She was the daughter of %(mother)s."
 msgstr "%(mother)s oli hänen äitinsä."
 
-#: ReportUtils.py:1014
+#: ReportUtils.py:1015
 msgid "She is the daughter of %(mother)s."
 msgstr "Hänen äitinsä on %(mother)s."
 
-#: ReportUtils.py:1018
+#: ReportUtils.py:1019
 msgid "She was the daughter of %(father)s."
 msgstr "%(father)s oli hänen isänsä."
 
-#: ReportUtils.py:1021
+#: ReportUtils.py:1022
 msgid "She is the daughter of %(father)s."
 msgstr "Hänen isänsä on %(father)s."
 
-#: ReportUtils.py:1069
+#: ReportUtils.py:1070
 msgid "%(male_name)s was born on %(birth_date)s in %(birth_place)s."
 msgstr "%(male_name)s syntyi %(birth_date)s, syntymäpaikka %(birth_place)s."
 
-#: ReportUtils.py:1074
+#: ReportUtils.py:1075
 msgid "%(male_name)s was born on %(birth_date)s."
 msgstr "%(male_name)s syntyi %(birth_date)s."
 
-#: ReportUtils.py:1078
+#: ReportUtils.py:1079
 msgid "%(male_name)s was born in %(month_year)s in %(birth_place)s."
 msgstr "%(male_name)s syntyi %(month_year)s, syntymäpaikka %(birth_place)s."
 
-#: ReportUtils.py:1083
+#: ReportUtils.py:1084
 msgid "%(male_name)s was born in %(month_year)s."
 msgstr "%(male_name)s syntyi %(month_year)s."
 
-#: ReportUtils.py:1087
+#: ReportUtils.py:1088
 msgid "%(male_name)s was born in %(birth_place)s."
 msgstr "%(male_name)s syntyi %(birth_place)s:ssä."
 
-#: ReportUtils.py:1094
+#: ReportUtils.py:1095
 msgid "%(female_name)s was born on %(birth_date)s in %(birth_place)s."
 msgstr "%(female_name)s syntyi %(birth_date)s, syntymäpaikka %(birth_place)s."
 
-#: ReportUtils.py:1099
+#: ReportUtils.py:1100
 msgid "%(female_name)s was born on %(birth_date)s."
 msgstr "%(female_name)s syntyi %(birth_date)s."
 
-#: ReportUtils.py:1103
+#: ReportUtils.py:1104
 msgid "%(female_name)s was born in %(month_year)s in %(birth_place)s."
 msgstr "%(female_name)s syntyi %(month_year)s, syntymäpaikka %(birth_place)s."
 
-#: ReportUtils.py:1108
+#: ReportUtils.py:1109
 msgid "%(female_name)s was born in %(month_year)s."
 msgstr "%(female_name)s syntyi %(month_year)s."
 
-#: ReportUtils.py:1112
+#: ReportUtils.py:1113
 msgid "%(female_name)s was born in %(birth_place)s."
 msgstr "%(female_name)s syntyi %(birth_place)s:ssä."
 
-#: ReportUtils.py:1168
+#: ReportUtils.py:1169
 msgid "%(male_name)s died on %(death_date)s in %(death_place)s."
 msgstr "%(male_name)s kuoli %(death_date)s, kuolinpaikka %(death_place)s."
 
-#: ReportUtils.py:1173
+#: ReportUtils.py:1174
 msgid "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d years."
 msgstr "%(male_name)s kuoli %(death_date)s %(age)d vuoden ikäisenä, kuolinpaikka %(death_place)s."
 
-#: ReportUtils.py:1180
+#: ReportUtils.py:1181
 msgid "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d months."
 msgstr "%(male_name)s kuoli %(death_date)s %(age)d kuukauden ikäisenä, kuolinpaikka %(death_place)s."
 
-#: ReportUtils.py:1187
+#: ReportUtils.py:1188
 msgid "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d days."
 msgstr "%(male_name)s kuoli %(death_date)s %(age)d päivän ikäisenä, kuolinpaikka %(death_place)s."
 
-#: ReportUtils.py:1195
+#: ReportUtils.py:1196
 msgid "%(male_name)s died on %(death_date)s."
 msgstr "%(male_name)s kuoli %(death_date)s."
 
-#: ReportUtils.py:1198
+#: ReportUtils.py:1199
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d years."
 msgstr "%(male_name)s kuoli %(death_date)s %(age)d vuoden ikäisenä."
 
-#: ReportUtils.py:1203
+#: ReportUtils.py:1204
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d months."
 msgstr "%(male_name)s kuoli %(death_date)s %(age)d kuukauden ikäisenä."
 
-#: ReportUtils.py:1208
+#: ReportUtils.py:1209
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d days."
 msgstr "%(male_name)s kuoli %(death_date)s %(age)d päivän ikäisenä."
 
-#: ReportUtils.py:1215
+#: ReportUtils.py:1216
 msgid "%(male_name)s died in %(month_year)s in %(death_place)s."
 msgstr "%(male_name)s kuoli %(month_year)s, kuolinpaikka %(death_place)s."
 
-#: ReportUtils.py:1220
+#: ReportUtils.py:1221
 msgid "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d years."
 msgstr "%(male_name)s kuoli %(month_year)s %(age)d vuoden ikäisenä, kuolinpaikka %(death_place)s."
 
-#: ReportUtils.py:1227
+#: ReportUtils.py:1228
 msgid "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d months."
 msgstr "%(male_name)s kuoli %(month_year)s %(age)d kuukauden ikäisenä, kuolinpaikka %(death_place)s."
 
-#: ReportUtils.py:1234
+#: ReportUtils.py:1235
 msgid "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d days."
 msgstr "%(male_name)s kuoli %(month_year)s %(age)d päivän ikäisenä, kuolinpaikka %(death_place)s."
 
-#: ReportUtils.py:1242
+#: ReportUtils.py:1243
 msgid "%(male_name)s died in %(month_year)s."
 msgstr "%(male_name)s kuoli %(month_year)s."
 
-#: ReportUtils.py:1245
+#: ReportUtils.py:1246
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d years."
 msgstr "%(male_name)s kuoli %(month_year)s %(age)d vuoden ikäisenä."
 
-#: ReportUtils.py:1250
+#: ReportUtils.py:1251
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d months."
 msgstr "%(male_name)s kuoli %(month_year)s %(age)d kuukauden ikäisenä."
 
-#: ReportUtils.py:1255
+#: ReportUtils.py:1256
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d days."
 msgstr "%(male_name)s kuoli %(month_year)s %(age)d päivän ikäisenä."
 
-#: ReportUtils.py:1262
+#: ReportUtils.py:1263
 msgid "%(male_name)s died in %(death_place)s."
 msgstr "%(male_name)s kuoli %(death_place)s:ssä."
 
-#: ReportUtils.py:1265
+#: ReportUtils.py:1266
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d years."
 msgstr "%(male_name)s kuoli %(age)d vuoden ikäisenä, kuolinpaikka %(death_place)s."
 
-#: ReportUtils.py:1270
+#: ReportUtils.py:1271
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d months."
 msgstr "%(male_name)s kuoli %(age)d kuukauden ikäisenä, kuolinpaikka %(death_place)s."
 
-#: ReportUtils.py:1275
+#: ReportUtils.py:1276
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d days."
 msgstr "%(male_name)s kuoli %(age)d päivän ikäisenä, kuolinpaikka %(death_place)s."
 
-#: ReportUtils.py:1284
+#: ReportUtils.py:1285
 msgid "%(male_name)s died at the age of %(age)d years."
 msgstr "%(male_name)s kuoli %(age)d vuoden ikäisenä."
 
-#: ReportUtils.py:1288
+#: ReportUtils.py:1289
 msgid "%(male_name)s died at the age of %(age)d months."
 msgstr "%(male_name)s kuoli %(age)d kuukauden ikäisenä."
 
-#: ReportUtils.py:1292
+#: ReportUtils.py:1293
 msgid "%(male_name)s died at the age of %(age)d days."
 msgstr "%(male_name)s kuoli %(age)d päivän ikäisenä."
 
-#: ReportUtils.py:1299
+#: ReportUtils.py:1300
 msgid "%(female_name)s died on %(death_date)s in %(death_place)s."
 msgstr "%(female_name)s kuoli %(death_date)s, kuolinpaikka %(death_place)s."
 
-#: ReportUtils.py:1304
+#: ReportUtils.py:1305
 msgid "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d years."
 msgstr "%(female_name)s kuoli %(death_date)s %(age)d vuoden ikäisenä, kuolinpaikka %(death_place)s."
 
-#: ReportUtils.py:1311
+#: ReportUtils.py:1312
 msgid "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d months."
 msgstr "%(female_name)s kuoli %(death_date)s %(age)d kuukauden ikäisenä, kuolinpaikka %(death_place)s."
 
-#: ReportUtils.py:1318
+#: ReportUtils.py:1319
 msgid "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d days."
 msgstr "%(female_name)s kuoli %(death_date)s %(age)d päivän ikäisenä, kuolinpaikka %(death_place)s."
 
-#: ReportUtils.py:1326
+#: ReportUtils.py:1327
 msgid "%(female_name)s died on %(death_date)s."
 msgstr "%(female_name)s kuoli %(death_date)s."
 
-#: ReportUtils.py:1329
+#: ReportUtils.py:1330
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d years."
 msgstr "%(female_name)s kuoli %(death_date)s %(age)d vuoden ikäisenä."
 
-#: ReportUtils.py:1334
+#: ReportUtils.py:1335
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d months."
 msgstr "%(female_name)s kuoli %(death_date)s %(age)d kuukauden ikäisenä."
 
-#: ReportUtils.py:1339
+#: ReportUtils.py:1340
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d days."
 msgstr "%(female_name)s kuoli %(death_date)s %(age)d päivän ikäisenä."
 
-#: ReportUtils.py:1346
+#: ReportUtils.py:1347
 msgid "%(female_name)s died in %(month_year)s in %(death_place)s."
 msgstr "%(female_name)s kuoli %(month_year)s, kuolinpaikka %(death_place)s."
 
-#: ReportUtils.py:1351
+#: ReportUtils.py:1352
 msgid "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d years."
 msgstr "%(female_name)s kuoli %(month_year)s %(age)d vuoden ikäisenä, kuolinpaikka %(death_place)s."
 
-#: ReportUtils.py:1358
+#: ReportUtils.py:1359
 msgid "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d months."
 msgstr "%(female_name)s kuoli %(month_year)s %(age)d kuukauden ikäisenä, kuolinpaikka %(death_place)s."
 
-#: ReportUtils.py:1365
+#: ReportUtils.py:1366
 msgid "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d days."
 msgstr "%(female_name)s kuoli %(month_year)s %(age)d päivän ikäisenä, kuolinpaikka %(death_place)s."
 
-#: ReportUtils.py:1373
+#: ReportUtils.py:1374
 msgid "%(female_name)s died in %(month_year)s."
 msgstr "%(female_name)s kuoli %(month_year)s."
 
-#: ReportUtils.py:1376
+#: ReportUtils.py:1377
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d years."
 msgstr "%(female_name)s kuoli %(month_year)s %(age)d vuoden ikäisenä."
 
-#: ReportUtils.py:1381
+#: ReportUtils.py:1382
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d months."
 msgstr "%(female_name)s kuoli %(month_year)s %(age)d kuukauden ikäisenä."
 
-#: ReportUtils.py:1386
+#: ReportUtils.py:1387
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d days."
 msgstr "%(female_name)s kuoli %(month_year)s %(age)d päivän ikäisenä."
 
-#: ReportUtils.py:1393
+#: ReportUtils.py:1394
 msgid "%(female_name)s died in %(death_place)s."
 msgstr "%(female_name)s kuoli %(death_place)s:ssä."
 
-#: ReportUtils.py:1396
+#: ReportUtils.py:1397
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d years."
 msgstr "%(female_name)s kuoli %(age)d vuoden ikäisenä, kuolinpaikka %(death_place)s."
 
-#: ReportUtils.py:1401
+#: ReportUtils.py:1402
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d months."
 msgstr "%(female_name)s kuoli %(age)d kuukauden ikäisenä, kuolinpaikka %(death_place)s."
 
-#: ReportUtils.py:1406
+#: ReportUtils.py:1407
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d days."
 msgstr "%(female_name)s kuoli %(age)d päivän ikäisenä , kuolinpaikka %(death_place)s."
 
-#: ReportUtils.py:1415
+#: ReportUtils.py:1416
 msgid "%(female_name)s died at the age of %(age)d years."
 msgstr "%(female_name)s kuoli %(age)d vuoden ikäisenä."
 
-#: ReportUtils.py:1419
+#: ReportUtils.py:1420
 msgid "%(female_name)s died at the age of %(age)d months."
 msgstr "%(female_name)s kuoli %(age)d kuukauden ikäisenä."
 
-#: ReportUtils.py:1423
+#: ReportUtils.py:1424
 msgid "%(female_name)s died at the age of %(age)d days."
 msgstr "%(female_name)s kuoli %(age)d päivän ikäisenä."
 
-#: ReportUtils.py:1476
+#: ReportUtils.py:1477
 msgid "%(male_name)s was buried on %(burial_date)s in %(burial_place)s."
 msgstr "%(male_name)s haudattiin %(burial_date)s, hautauspaikka %(burial_place)s."
 
-#: ReportUtils.py:1481
+#: ReportUtils.py:1482
 msgid "%(male_name)s was buried on %(burial_date)s."
 msgstr "%(male_name)s haudattiin %(burial_date)s."
 
-#: ReportUtils.py:1485
+#: ReportUtils.py:1486
 msgid "%(male_name)s was buried in %(month_year)s in %(burial_place)s."
 msgstr "%(male_name)s haudattiin %(month_year)s, hautauspaikka %(burial_place)s."
 
-#: ReportUtils.py:1490
+#: ReportUtils.py:1491
 msgid "%(male_name)s was buried in %(month_year)s."
 msgstr "%(male_name)s haudattiin %(month_year)s."
 
-#: ReportUtils.py:1494
+#: ReportUtils.py:1495
 msgid "%(male_name)s was buried in %(burial_place)s."
 msgstr "%(male_name)s haudattiin %(burial_place)s:n."
 
-#: ReportUtils.py:1497
+#: ReportUtils.py:1498
 msgid "%(male_name)s was buried."
 msgstr "%(male_name)s haudattiin."
 
-#: ReportUtils.py:1502
+#: ReportUtils.py:1503
 msgid "%(female_name)s was buried on %(burial_date)s in %(burial_place)s."
 msgstr "%(female_name)s haudattiin %(burial_date)s, hautauspaikka %(burial_place)s."
 
-#: ReportUtils.py:1507
+#: ReportUtils.py:1508
 msgid "%(female_name)s was buried on %(burial_date)s."
 msgstr "%(female_name)s haudattiin %(burial_date)s."
 
-#: ReportUtils.py:1511
+#: ReportUtils.py:1512
 msgid "%(female_name)s was buried in %(month_year)s in %(burial_place)s."
 msgstr "%(female_name)s haudattiin %(month_year)s, hautauspaikka %(burial_place)s."
 
-#: ReportUtils.py:1516
+#: ReportUtils.py:1517
 msgid "%(female_name)s was buried in %(month_year)s."
 msgstr "%(female_name)s haudattiin %(month_year)s."
 
-#: ReportUtils.py:1520
+#: ReportUtils.py:1521
 msgid "%(female_name)s was buried in %(burial_place)s."
 msgstr "%(female_name)s haudattiin %(burial_place)s:n."
 
-#: ReportUtils.py:1523
+#: ReportUtils.py:1524
 msgid "%(female_name)s was buried."
 msgstr "%(female_name)s haudattiin."
 
-#: ReportUtils.py:1553
+#: ReportUtils.py:1554
 msgid "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s %(death_place)s."
 msgstr "%(male_name)s Syntynyt: %(birth_date)s %(birth_place)s Kuollut: %(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1560
+#: ReportUtils.py:1561
 msgid "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s."
 msgstr "%(male_name)s Syntynyt: %(birth_date)s %(birth_place)s Kuollut: %(death_date)s."
 
-#: ReportUtils.py:1568
+#: ReportUtils.py:1569
 msgid "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_place)s."
 msgstr "%(male_name)s Syntynyt: %(birth_date)s %(birth_place)s Kuollut: %(death_place)s."
 
-#: ReportUtils.py:1575
+#: ReportUtils.py:1576
 msgid "%(male_name)s Born: %(birth_date)s %(birth_place)s."
 msgstr "%(male_name)s Syntynyt: %(birth_date)s %(birth_place)s."
 
-#: ReportUtils.py:1582
+#: ReportUtils.py:1583
 msgid "%(male_name)s Born: %(birth_date)s Died: %(death_date)s %(death_place)s."
 msgstr "%(male_name)s Syntynyt: %(birth_date)s Kuollut: %(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1587
+#: ReportUtils.py:1588
 msgid "%(male_name)s Born: %(birth_date)s Died: %(death_date)s."
 msgstr "%(male_name)s Syntynyt: %(birth_date)s Kuollut: %(death_date)s."
 
-#: ReportUtils.py:1593
+#: ReportUtils.py:1594
 msgid "%(male_name)s Born: %(birth_date)s Died: %(death_place)s."
 msgstr "%(male_name)s Syntynyt: %(birth_date)s Kuollut: %(death_place)s."
 
-#: ReportUtils.py:1598
+#: ReportUtils.py:1599
 msgid "%(male_name)s Born: %(birth_date)s."
 msgstr "%(male_name)s Syntynyt: %(birth_date)s."
 
-#: ReportUtils.py:1604
+#: ReportUtils.py:1605
 msgid "%(male_name)s Born: %(birth_place)s Died: %(death_date)s %(death_place)s."
 msgstr "%(male_name)s Syntynyt: %(birth_place)s Kuollut: %(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1611
+#: ReportUtils.py:1612
 msgid "%(male_name)s Born: %(birth_place)s Died: %(death_date)s."
 msgstr "%(male_name)s Syntynyt: %(birth_place)s Kuollut: %(death_date)s."
 
-#: ReportUtils.py:1619
+#: ReportUtils.py:1620
 msgid "%(male_name)s Born: %(birth_place)s Died: %(death_place)s."
 msgstr "%(male_name)s Syntynyt: %(birth_place)s Kuollut: %(death_place)s."
 
-#: ReportUtils.py:1626
+#: ReportUtils.py:1627
 msgid "%(male_name)s Born: %(birth_place)s."
 msgstr "%(male_name)s Syntynyt: %(birth_place)s."
 
-#: ReportUtils.py:1632
+#: ReportUtils.py:1633
 msgid "%(male_name)s Died: %(death_date)s %(death_place)s."
 msgstr "%(male_name)s Kuollut: %(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1637
+#: ReportUtils.py:1638
 msgid "%(male_name)s Died: %(death_date)s."
 msgstr "%(male_name)s Kuollut: %(death_date)s."
 
-#: ReportUtils.py:1642
+#: ReportUtils.py:1643
 msgid "%(male_name)s Died: %(death_place)s."
 msgstr "%(male_name)s Kuollut: %(death_place)s."
 
-#: ReportUtils.py:1645
+#: ReportUtils.py:1646
 msgid "%(male_name)s."
 msgstr "%(male_name)s."
 
-#: ReportUtils.py:1652
+#: ReportUtils.py:1653
 msgid "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s %(death_place)s."
 msgstr "%(female_name)s Syntynyt: %(birth_date)s %(birth_place)s Kuollut: %(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1659
+#: ReportUtils.py:1660
 msgid "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s."
 msgstr "%(female_name)s Syntynyt: %(birth_date)s %(birth_place)s Kuollut: %(death_date)s."
 
-#: ReportUtils.py:1667
+#: ReportUtils.py:1668
 msgid "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_place)s."
 msgstr "%(female_name)s Syntynyt: %(birth_date)s %(birth_place)s Kuollut: %(death_place)s."
 
-#: ReportUtils.py:1674
+#: ReportUtils.py:1675
 msgid "%(female_name)s Born: %(birth_date)s %(birth_place)s."
 msgstr "%(female_name)s Syntynyt: %(birth_date)s %(birth_place)s."
 
-#: ReportUtils.py:1681
+#: ReportUtils.py:1682
 msgid "%(female_name)s Born: %(birth_date)s Died: %(death_date)s %(death_place)s."
 msgstr "%(female_name)s Syntynyt: %(birth_date)s Kuollut: %(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1686
+#: ReportUtils.py:1687
 msgid "%(female_name)s Born: %(birth_date)s Died: %(death_date)s."
 msgstr "%(female_name)s Syntynyt: %(birth_date)s Kuollut: %(death_date)s."
 
-#: ReportUtils.py:1692
+#: ReportUtils.py:1693
 msgid "%(female_name)s Born: %(birth_date)s Died: %(death_place)s."
 msgstr "%(female_name)s Syntynyt: %(birth_date)s Kuollut: %(death_place)s."
 
-#: ReportUtils.py:1697
+#: ReportUtils.py:1698
 msgid "%(female_name)s Born: %(birth_date)s."
 msgstr "%(female_name)s Syntynyt: %(birth_date)s."
 
-#: ReportUtils.py:1703
+#: ReportUtils.py:1704
 msgid "%(female_name)s Born: %(birth_place)s Died: %(death_date)s %(death_place)s."
 msgstr "%(female_name)s Syntynyt: %(birth_place)s Kuollut: %(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1710
+#: ReportUtils.py:1711
 msgid "%(female_name)s Born: %(birth_place)s Died: %(death_date)s."
 msgstr "%(female_name)s Syntynyt: %(birth_place)s Kuollut: %(death_date)s."
 
-#: ReportUtils.py:1718
+#: ReportUtils.py:1719
 msgid "%(female_name)s Born: %(birth_place)s Died: %(death_place)s."
 msgstr "%(female_name)s Syntynyt: %(birth_place)s Kuollut: %(death_place)s."
 
-#: ReportUtils.py:1725
+#: ReportUtils.py:1726
 msgid "%(female_name)s Born: %(birth_place)s."
 msgstr "%(female_name)s Syntynyt: %(birth_place)s."
 
-#: ReportUtils.py:1731
+#: ReportUtils.py:1732
 msgid "%(female_name)s Died: %(death_date)s %(death_place)s."
 msgstr "%(female_name)s Kuollut: %(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1736
+#: ReportUtils.py:1737
 msgid "%(female_name)s Died: %(death_date)s."
 msgstr "%(female_name)s Kuollut: %(death_date)s."
 
-#: ReportUtils.py:1741
+#: ReportUtils.py:1742
 msgid "%(female_name)s Died: %(death_place)s."
 msgstr "%(female_name)s Kuollut: %(death_place)s."
 
-#: ReportUtils.py:1744
+#: ReportUtils.py:1745
 msgid "%(female_name)s."
 msgstr "%(female_name)s."
 
-#: ReportUtils.py:1753 const.py:490 gramps.glade:4344
+#: ReportUtils.py:1754 const.py:490 gramps.glade:4582
 #: plugins/FamilyGroup.py:376 plugins/FamilyGroup.py:378
 msgid "Married"
 msgstr "Naimisissa"
 
-#: ReportUtils.py:1754 const.py:491
+#: ReportUtils.py:1755 const.py:491
 msgid "Unmarried"
 msgstr "Naimaton"
 
-#: ReportUtils.py:1755 const.py:492
+#: ReportUtils.py:1756 const.py:492
 msgid "Civil Union"
 msgstr "Rekisteröity parisuhde"
 
-#: ReportUtils.py:1757 const.py:234 const.py:248 const.py:494
+#: ReportUtils.py:1758 const.py:234 const.py:248 const.py:494
 #: mergedata.glade:242
 msgid "Other"
 msgstr "Muu"
 
-#: SelectChild.py:288 SelectChild.py:307
+#: SelectChild.py:193 SelectChild.py:212
 msgid "A person cannot be linked as his/her own child"
 msgstr "Henkilöstä ei voi tehdä itsensä lasta"
 
-#: SelectChild.py:332
+#: SelectChild.py:237
 msgid "Add Child to Family (%s)"
 msgstr "Lisää perheeseen (%s) lapsi"
 
@@ -3146,27 +3215,27 @@ msgstr "Lyhennys"
 msgid "Publication Information"
 msgstr "Julkaisutiedot"
 
-#: SourceView.py:193
+#: SourceView.py:195
 msgid "Source Menu"
 msgstr "Lähde-valikko"
 
-#: SourceView.py:218
+#: SourceView.py:220
 msgid "This source is currently being used. Deleting it will remove it from the database and from all records that reference it."
 msgstr "Tämä lähde on käytössä. Se hävittäminen poistaa lähteen ja kaikki sen viitteet tietokannasta."
 
-#: SourceView.py:222
+#: SourceView.py:224
 msgid "Deleting source will remove it from the database."
 msgstr "Lähteen hävittäminen poistaa sen tietokannasta."
 
-#: SourceView.py:226
+#: SourceView.py:228
 msgid "_Delete Source"
 msgstr "_Poista lähde"
 
-#: SourceView.py:267
+#: SourceView.py:269
 msgid "Cannot merge sources."
 msgstr "Lähteiden yhdistys ei onnistu."
 
-#: SourceView.py:268
+#: SourceView.py:270
 msgid "Exactly two sources must be selected to perform a merge. A second source can be selected by holding down the control key while clicking on the desired source."
 msgstr "Tasan kaksi lähdettä pitää olla valittuna yhdistettäväksi. Toinen lähde voidaan valita pitämällä Control-näppäintä alhaalla klikatessa."
 
@@ -3239,33 +3308,33 @@ msgstr ""
 msgid "In order to create valid GEDCOM files, the following information needs to be entered. If you do not plan to generate GEDCOM files, you may leave this empty."
 msgstr "Toimivien GEDCOM tiedoston luontia varten tarvitaan seuraavat tiedot. Jos et aio luoda GEDCOM tiedostoja (esim. käyttääksesi muita sukututkimusohjelmia), voit jättää ne tyhjiksi."
 
-#: StartupDialog.py:243 gramps.glade:5910 gramps.glade:5981 gramps.glade:7774
-#: gramps.glade:8584 gramps.glade:9098 gramps.glade:9534 gramps.glade:12280
-#: gramps.glade:12775 plugins/soundex.glade:110
+#: StartupDialog.py:243 gramps.glade:6235 gramps.glade:6318 gramps.glade:8240
+#: gramps.glade:9157 gramps.glade:9730 gramps.glade:10213 gramps.glade:13193
+#: gramps.glade:13747 plugins/soundex.glade:110
 msgid "Name:"
 msgstr "Nimi:"
 
-#: StartupDialog.py:244 gramps.glade:9486 plugins/Ancestors.py:505
+#: StartupDialog.py:244 gramps.glade:10157 plugins/Ancestors.py:505
 msgid "Address:"
 msgstr "Osoite:"
 
-#: StartupDialog.py:245 gramps.glade:14682
+#: StartupDialog.py:245 gramps.glade:15804
 msgid "City:"
 msgstr "Kaupunki:"
 
-#: StartupDialog.py:246 gramps.glade:9606
+#: StartupDialog.py:246 gramps.glade:10297
 msgid "State/Province:"
 msgstr "Maakunta:"
 
-#: StartupDialog.py:247 gramps.glade:9510 gramps.glade:14730
+#: StartupDialog.py:247 gramps.glade:10185 gramps.glade:15860
 msgid "Country:"
 msgstr "Maa:"
 
-#: StartupDialog.py:248 gramps.glade:9582
+#: StartupDialog.py:248 gramps.glade:10269
 msgid "ZIP/Postal code:"
 msgstr "Postinumero:"
 
-#: StartupDialog.py:249 gramps.glade:9868 gramps.glade:14977
+#: StartupDialog.py:249 gramps.glade:10603 gramps.glade:16147
 msgid "Phone:"
 msgstr "Puhelin:"
 
@@ -3329,7 +3398,7 @@ msgstr "Internetosoite-editori"
 msgid "Internet Address Editor for %s"
 msgstr "Internetosoite-editori %s:lle"
 
-#: Utils.py:72
+#: Utils.py:67
 msgid "The data can only be recovered by Undo operation or by quitting with abandoning changes."
 msgstr "Tiedot voidaan palauttaa Peru-toiminnolla tai lopettamalla ohjelma muutokset hyljäten."
 
@@ -3355,32 +3424,33 @@ msgstr ""
 "\n"
 "Yritä uudelleen. Todistajaa ei ole muutettu."
 
-#: WriteGedcom.py:333 plugins/DescendReport.py:116
-#: plugins/ExportVCalendar.py:85 plugins/ExportVCard.py:88
+#: WriteGedcom.py:334 plugins/DescendReport.py:116
+#: plugins/ExportVCalendar.py:87 plugins/ExportVCard.py:89
 #: plugins/FtmStyleDescendants.py:121 plugins/GraphViz.py:517
 #: plugins/IndivComplete.py:514 plugins/StatisticsChart.py:831
-#: plugins/TimeLine.py:415 plugins/WebPage.py:1269 plugins/WriteFtree.py:90
-#: plugins/WriteGeneWeb.py:91
+#: plugins/TimeLine.py:415 plugins/WebPage.py:1269 plugins/WriteFtree.py:91
+#: plugins/WriteGeneWeb.py:92
 msgid "Descendants of %s"
 msgstr "%s:n jälkeläiset"
 
-#: WriteGedcom.py:337 plugins/Ancestors.py:141 plugins/ExportVCalendar.py:89
-#: plugins/ExportVCard.py:92 plugins/FtmStyleAncestors.py:96
+#: WriteGedcom.py:340 plugins/Ancestors.py:141 plugins/ExportVCalendar.py:93
+#: plugins/ExportVCard.py:95 plugins/FtmStyleAncestors.py:96
 #: plugins/GraphViz.py:521 plugins/IndivComplete.py:518
 #: plugins/StatisticsChart.py:835 plugins/TimeLine.py:419
-#: plugins/WebPage.py:1277 plugins/WriteFtree.py:94 plugins/WriteGeneWeb.py:95
+#: plugins/WebPage.py:1277 plugins/WriteFtree.py:97 plugins/WriteGeneWeb.py:98
 msgid "Ancestors of %s"
 msgstr "%s:n esivanhemmat"
 
-#: WriteGedcom.py:341 plugins/ExportVCalendar.py:93 plugins/ExportVCard.py:96
+#: WriteGedcom.py:346 plugins/ExportVCalendar.py:99 plugins/ExportVCard.py:101
 #: plugins/GraphViz.py:525 plugins/IndivComplete.py:522
 #: plugins/StatisticsChart.py:839 plugins/TimeLine.py:423
-#: plugins/WebPage.py:1281 plugins/WriteFtree.py:98 plugins/WriteGeneWeb.py:99
+#: plugins/WebPage.py:1281 plugins/WriteFtree.py:103
+#: plugins/WriteGeneWeb.py:104
 msgid "People with common ancestor with %s"
 msgstr "Henkilöt, joilla on yhteinen esivanhempi %s:n kanssa"
 
-#: WriteGedcom.py:557 WriteGedcom.py:562 docgen/AbiWord2Doc.py:77
-#: docgen/AbiWord2Doc.py:80 docgen/AsciiDoc.py:113 docgen/AsciiDoc.py:116
+#: WriteGedcom.py:565 WriteGedcom.py:570 docgen/AbiWord2Doc.py:75
+#: docgen/AbiWord2Doc.py:78 docgen/AsciiDoc.py:113 docgen/AsciiDoc.py:116
 #: docgen/HtmlDoc.py:225 docgen/HtmlDoc.py:228 docgen/HtmlDoc.py:353
 #: docgen/HtmlDoc.py:356 docgen/LaTeXDoc.py:87 docgen/LaTeXDoc.py:90
 #: docgen/OpenSpreadSheet.py:76 docgen/OpenSpreadSheet.py:78
@@ -3389,22 +3459,22 @@ msgstr "Henkilöt, joilla on yhteinen esivanhempi %s:n kanssa"
 #: docgen/OpenSpreadSheet.py:436 docgen/OpenSpreadSheet.py:440
 #: docgen/PSDrawDoc.py:95 docgen/PSDrawDoc.py:98 docgen/PdfDoc.py:180
 #: docgen/RTFDoc.py:80 docgen/RTFDoc.py:83 docgen/SvgDrawDoc.py:75
-#: docgen/SvgDrawDoc.py:77 plugins/ExportVCalendar.py:168
-#: plugins/ExportVCalendar.py:172 plugins/ExportVCard.py:153
-#: plugins/ExportVCard.py:157 plugins/WriteGeneWeb.py:210
-#: plugins/WriteGeneWeb.py:214
+#: docgen/SvgDrawDoc.py:77 plugins/ExportVCalendar.py:178
+#: plugins/ExportVCalendar.py:182 plugins/ExportVCard.py:162
+#: plugins/ExportVCard.py:166 plugins/WriteGeneWeb.py:219
+#: plugins/WriteGeneWeb.py:223
 msgid "Could not create %s"
 msgstr "%s:n luonti epäonnistui"
 
-#: WriteGedcom.py:1252
+#: WriteGedcom.py:1272
 msgid "GE_DCOM"
 msgstr "GE_DCOM"
 
-#: WriteGedcom.py:1253
+#: WriteGedcom.py:1273
 msgid "GEDCOM is used to transfer data between genealogy programs. Most genealogy software will accept a GEDCOM file as input. "
 msgstr "GEDCOM tiedostomuotoa käytetään tiedon siirtämiseen eri sukututkimusohjelmien välillä. Useimmat sukututkimusohjelmat pystyvät lukemaan GEDCOM tiedostoja."
 
-#: WriteGedcom.py:1255
+#: WriteGedcom.py:1275
 msgid "GEDCOM export options"
 msgstr "GEDCOM vientiasetukset"
 
@@ -3684,131 +3754,131 @@ msgstr "Tuntematon suhde miehen ja naisen välillä"
 msgid "An unspecified relationship between a man and woman"
 msgstr "Määrittelemätön suhde miehen ja naisen välillä"
 
-#: const.py:515
+#: const.py:522
 msgid "Also Known As"
 msgstr "Tunnetaan myös"
 
-#: const.py:516
+#: const.py:523
 msgid "Birth Name"
 msgstr "Syntymänimi"
 
-#: const.py:517
+#: const.py:524
 msgid "Married Name"
 msgstr "Avioliiton kautta saatu nimi"
 
-#: const.py:518
+#: const.py:525
 msgid "Other Name"
 msgstr "Muu nimi"
 
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid ""
 msgstr ""
 
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid "Cleared"
 msgstr "Tyhjätty"
 
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid "Completed"
 msgstr "Valmis"
 
-#: const.py:903
+#: const.py:910
 msgid "Infant"
 msgstr "Vauva"
 
-#: const.py:903 const.py:909
+#: const.py:910 const.py:916
 msgid "Stillborn"
 msgstr "Kuolleena syntynyt"
 
-#: const.py:903 const.py:909 const.py:915
+#: const.py:910 const.py:916 const.py:922
 msgid "Pre-1970"
 msgstr "Ennen 1970"
 
-#: const.py:903 const.py:909 const.py:915
+#: const.py:910 const.py:916 const.py:922
 msgid "Qualified"
 msgstr "Pätevä"
 
-#: const.py:904 const.py:910 const.py:916
+#: const.py:911 const.py:917 const.py:923
 msgid "Submitted"
 msgstr "Esitetty"
 
-#: const.py:904 const.py:910 const.py:916
+#: const.py:911 const.py:917 const.py:923
 msgid "Uncleared"
 msgstr "Selvittämätön"
 
-#: const.py:908
+#: const.py:915
 msgid "BIC"
 msgstr ""
 
-#: const.py:909 const.py:915
+#: const.py:916 const.py:922
 msgid "DNS"
 msgstr ""
 
-#: const.py:914
+#: const.py:921
 msgid "Canceled"
 msgstr "Peruttu"
 
-#: const.py:915
+#: const.py:922
 msgid "DNS/CAN"
 msgstr ""
 
-#: const.py:921
+#: const.py:928
 msgid "Flowed"
 msgstr "Virtaava/muotoilematon"
 
-#: const.py:922
+#: const.py:929
 msgid "Preformatted"
 msgstr "Muotoiltu"
 
-#: const.py:934
+#: const.py:941
 msgid "Text Reports"
 msgstr "Tekstiraportit"
 
-#: const.py:935
+#: const.py:942
 msgid "Graphical Reports"
 msgstr "Graafiset raportit"
 
-#: const.py:936
+#: const.py:943
 msgid "Code Generators"
 msgstr "Koodigeneraattorit"
 
-#: const.py:937 plugins/WebPage.py:1719
+#: const.py:944 plugins/WebPage.py:1719
 msgid "Web Page"
 msgstr "WWW-sivu"
 
-#: const.py:938
+#: const.py:945
 msgid "View"
 msgstr "Näkymä"
 
-#: const.py:939
+#: const.py:946
 msgid "Books"
 msgstr "Kirjat"
 
-#: const.py:943 plugins/ScratchPad.py:356 plugins/ScratchPad.py:405
+#: const.py:950 plugins/ScratchPad.py:356 plugins/ScratchPad.py:405
 #: plugins/ScratchPad.py:413 plugins/SimpleBookTitle.py:169
 #: plugins/SimpleBookTitle.py:170 plugins/SimpleBookTitle.py:171
 msgid "Text"
 msgstr "Teksti"
 
-#: const.py:944
+#: const.py:951
 msgid "Graphics"
 msgstr "Kaavio"
 
 #: data/tips.xml:9
 msgid "A range of dates can be given by using the format \"between January 4, 2000 and March 20, 2003\""
-msgstr "Päivämääräväli voidaan antaa muodossa \"4.1.2000 - 20.3.2003\""
+msgstr "Päivämääräväli voidaan antaa esim. muodossa \"4.1.2000 - 20.3.2003\""
 
 #: data/tips.xml:16
 msgid "In most cases double clicking on a name, source, place or media entry will bring up a window to allow you to edit the object. Note that the result can be dependent on context. For example, in the Family View clicking on a parent or child will bring up the relationship editor."
-msgstr "Useimmissa tapauksissa nimeen, lähteeseen, paikkaan tai media-objektiin klikkaaminen aukaisee ikkunan, josta voit muokata sen ominasuuksia. Huomaa, että mitä tapahtuu, saattaa riippua kontekstista.  Esimerkiksi Perhenäkymässä vanhempaan tai lapseen klikkaaminen aukaiseen suhde-editorin."
+msgstr "Useimmissa tapauksissa nimeen, lähteeseen, paikkaan tai mediatiedostoon klikkaaminen aukaisee ikkunan, josta voit muokata sen ominaisuuksia. Se mitä tapahtuu, saattaa riippua kontekstista.  Esimerkiksi Perhenäkymässä vanhempaan tai lapseen klikkaaminen aukaiseen suhde-editorin."
 
 #: data/tips.xml:20
 msgid "An image can be added to any gallery or the Media View by dragging and dropping it from a file manager or a web browser."
-msgstr "Kuva voidaan lisätä mihin tahansa galleriaan tai media-näkymään vetämällä ja pudottamalle se sinne tiedostonhallinnasta tai www-selaimesta."
+msgstr "Kuva voidaan lisätä medianäkymään tai mihin tahansa galleriaan vetämällä ja pudottamalle se sinne tiedostonhallinnasta tai www-selaimesta."
 
 #: data/tips.xml:24
 msgid "Birth order of children in a family can be set, even if they do not have birth dates, by using drag and drop."
-msgstr "Vaikka perheen lasten syntymäajat eivät olisi tiedossa, heidän syntymäjärjestystään voidaan muuttaa listassa vetämällä ja pudottamalla."
+msgstr "Vaikka perheen lasten syntymäajat eivät olisi tiedossa, heidän syntymäjärjestystään voidaan muuttaa lapsilistassa hiirellä vetämällä ja pudottamalla."
 
 #: data/tips.xml:34
 msgid "Talk to Relatives Before It Is Too Late: Your oldest relatives can be your most important source of information. They usually know things about the family that haven't been written down. They might tell you nuggets about people that may one day lead to a new avenue of research. At the very least, you will get to hear some great stories. Don't forget to record the conversations!"
@@ -3816,9 +3886,7 @@ msgstr "Haastattele sukulaisiasi ennen kuin se on liian myöhäistä: Van
 
 #: data/tips.xml:42
 msgid "Example of a Family Tree: To see an example of what a family looks like in GRAMPS, check Help > Open example database. You will then be viewing the elaborate Smith family database, which includes 42 individuals and 15 families, with fairly complete data about many of the individuals."
-msgstr ""
-"Sukupuuesimerkki: Nähdäksesi esimerkin, miltä suku GRAMPS:ssä näyttää, avaa Ohjeet > Avaa esimerkkitietokanta."
-"Näet sitten esimerkin Smith-suvun tietokannasta, joka sisältää 42 henkilöä ja 15 perhettä, kohtuullisen täysillä tiedoilla monista suvun jäsenistä."
+msgstr "Sukupuuesimerkki: Nähdäksesi esimerkin, miltä suku GRAMPS:ssä näyttää, avaa Ohjeet > Avaa esimerkkitietokanta. Näet sitten esimerkin Smith-suvun tietokannasta, joka sisältää 42 henkilöä ja 15 perhettä, kohtuullisen täysillä tiedoilla monista suvun jäsenistä."
 
 #: data/tips.xml:51
 msgid "The People View: The People View shows a list of all individuals in the database. The listings can be sorted by simply clicking on a heading such as name, gender, birth date or death date. Clicking the heading a second time will reverse the sort."
@@ -3826,7 +3894,7 @@ msgstr "Henkilönäkymä: Henkilönäkymä näyttää sinulle listan kaik
 
 #: data/tips.xml:61
 msgid "Filtering People: In the People View, you can 'filter' individuals based on many criteria. Go to the Filter (just to the right of the People icon) and choose one of the dozen different presets. For example, all adopted people in the family tree can be located. People without a birth date mentioned can also be filtered. To get the results click Apply. If the filter controls are not visible, enable them by choosing View > Filter."
-msgstr "Henkilöiden suodattaminen: Voit suodattaa henkilönäkymän ihmisiä monin eri perustein. Avaa suodinvalikko (henkilönäkymän yläosassa) ja valitse jokin monista valmiista suotimista. Voit valita esim. kaikki henkilöt, jotka on adoptoitu. Tai henkilöt, joilla ei ole syntymäaikaa. Nähdäksesi heidät, klikkaa \"käytä\". Jos suodinvalikko ei ole näkyvillä, saat sen näkyviin valitsemalla Näytä > Suodin."
+msgstr "Henkilöiden suodattaminen: Voit suodattaa henkilönäkymän ihmisiä monin eri perustein. Avaa suodinvalikko (henkilönäkymän yläosassa) ja valitse jokin monista valmiista suotimista. Voit valita esim. kaikki henkilöt, jotka on adoptoitu. Tai henkilöt, joilla ei ole syntymäaikaa. Nähdäksesi henkilöt suodatettuina, klikkaa \"käytä\". Jos suodinvalikko ei ole näkyvillä, saat sen näkyviin valitsemalla Näytä > Suodin."
 
 #: data/tips.xml:68
 msgid "Inverted Filtering: Filters can easily be reversed by using the 'invert' option. For instance, by inverting the 'People with children' filter you can select all people without children."
@@ -3834,7 +3902,7 @@ msgstr "Käänteinen suodatus: Suotimet on helppo kääntää käyttämä
 
 #: data/tips.xml:74
 msgid "Locating People: By default, each surname in the People View is listed only once. By clicking on the arrow to the left of a name, the list will expand to show all individuals with that last name."
-msgstr "Henkilöiden paikallistaminen: Oletusarvoisesti jokainen sukunimi henkilönäkymässä on listattu vain kerran. Klikkaamalla nimen vieressä olevaa nuolta, lista aukeaa näyttämään kaikki henkilöt, joilla on sen osoittama sukunimi."
+msgstr "Henkilöiden paikallistaminen: Oletusarvoisesti jokainen sukunimi henkilönäkymässä on listattu vain kerran. Klikkaamalla sukunimen vieressä olevaa nuolta, lista aukeaa näyttämään kaikki henkilöt, joilla on vastaava sukunimi."
 
 #: data/tips.xml:79
 msgid "The Family View: The Family View is used to display a typical family unit---the parents, spouses and children of an individual."
@@ -3850,7 +3918,7 @@ msgstr "Kuka syntyi ja milloin: 'Vertaa yksittäisiä tapahtumia...' työ
 
 #: data/tips.xml:104
 msgid "GRAMPS comes with a rich set of tools. These allows you to undertake operations such as checking database for errors and consistency, as well as research and analysis tools such as event comparison, finding duplicate people, interactive descendant browser, and others. All tools can be accessed through the Tools menu."
-msgstr "GRAMPSin mukana tulee runsas joukko työkaluja. Niillä voit tarkistaa tietokantasi virheiden ja epäyhtenäisyyksien varalta, verrata tapahtumia, löytää kahdennettuja tietoja, käyttää interaktiivista jälkeläisselainta jne. Kaikki työkalut löytyvät Työkalut menusta."
+msgstr "GRAMPSin mukana tulee runsas joukko työkaluja. Niillä voit tarkistaa tietokantasi virheiden ja epäyhtenäisyyksien varalta, verrata tapahtumia, löytää kahdennettuja tietoja, käyttää interaktiivista jälkeläisselainta jne. Kaikki työkalut löytyvät Työkalut valikosta."
 
 #: data/tips.xml:111
 msgid "Calculating Relationships: This tool, under Tools > Utilities > Relationship calculator allows you to check if someone else in the family is related (by blood, not marriage) to you. Precise relationships as well as the common ancestors are reported."
@@ -3862,7 +3930,7 @@ msgstr "SoundEx koodeista hyötyä sukututkimuksessa: SoundEx ratkaisee s
 
 #: data/tips.xml:128
 msgid "Setting Your Preferences: Not happy with some default behavior of GRAMPS? Edit > Preferences lets you to modify a number of settings, allowing you to tailor GRAMPS to your needs."
-msgstr "Omat asetukset: Etkö ole tyytyväinen GRAMPSin oletuskäyttäytymiseen? Muokkaa > Asetukset tarjoaa sinulle mahdollisuuden muuttaa useita asetuksia, saadaksesi GRAMPSin toimimaan haluamallasi tavalla."
+msgstr "Omat asetukset: Etkö ole tyytyväinen GRAMPSin oletuskäyttäytymiseen? Muokkaa > Asetukset tarjoaa sinulle mahdollisuuden muuttaa useita asetuksia, jotta GRAMPS toimisi haluamallasi tavalla."
 
 #: data/tips.xml:134
 msgid "GRAMPS Reports: GRAMPS offers a wide variety of reports. The Text Reports are particularly useful if you want to send the results of your family tree to members of the family via email."
@@ -3898,7 +3966,7 @@ msgstr "GRAMPS pitää listaa aikaisemmista aktiivisista henkilöistä. Voit sii
 
 #: data/tips.xml:186
 msgid "Tired of having to take your hand off the keyboard to use the mouse? Many functions in GRAMPS have keyboard shortcuts. If one exists for a function it is displayed on the right side of the menu."
-msgstr "Väsynyt käsien irroittamiseen näppäimistöltä hiirtä käyttääksesi? Monille GRAMPSin toiminnoille on olemassa näppäinyhdistelmät. Jos toiminnolle on sellainen, se näytetään menun oikeassa reunassa."
+msgstr "Väsynyt käsien irroittamiseen näppäimistöltä hiirtä käyttääksesi? Monille GRAMPSin toiminnoille on olemassa näppäinyhdistelmät. Jos toiminnolle on sellainen, se näytetään valikon oikeassa reunassa."
 
 #: data/tips.xml:193
 msgid "Don't forget to read the GRAMPS manual, Help > User Manual. The developers have worked hard to make most operations intuitive but the manual is full of information that will make your time spent on genealogy more productive."
@@ -3906,11 +3974,11 @@ msgstr "Älä unohda lukea GRAMPSin käyttöohjetta Ohjeet > Käyttöohje
 
 #: data/tips.xml:203
 msgid "Adding Children: To add children in GRAMPS make either of the parents the Active Person then switch to the Family View. If the child is already in the database, click on the third button down to the right of the Children list. If the person is not already in the database, click on the second button down to the right of the Children list. After the child's information is entered they will automatically be listed as a child of the Active Person."
-msgstr "Lasten lisääminen: Lisätäksesi lapsia GRAMPsiin tee jommastakummasta vanhemmasta aktiivinen perhenäkymässä. Jos lapsi löytyy jo tietokannasta, klikkaa kolmatta nappulaa lapsilistan oikealla puolella. Jos häntä ei ei ole vielä tietokannassa, klikkaa toisena olevaa nappulaa. Lapsen tietojen lisäämisen jälkeen hänet listataan automaattisesti aktiivisen henkilön lapsena."
+msgstr "Lasten lisääminen: Lisätäksesi lapsia GRAMPsiin tee jommastakummasta vanhemmasta aktiivinen perhenäkymässä. Jos lapsi löytyy jo tietokannasta, klikkaa kolmatta nappulaa lapsilistan oikealla puolella. Jos häntä ei ole vielä tietokannassa, klikkaa toisena olevaa nappulaa. Lapsen tietojen lisäämisen jälkeen hänet listataan automaattisesti aktiivisen henkilön lapsena."
 
 #: data/tips.xml:212
 msgid "Editing The Relationship of a Child: Not all children are the related by birth to their parents. You can edit the relationship of a child to each parent by selecting the child, right-clicking, and choosing \"Edit the child parent relationship\". Relationships can be any of Birth, Adopted, Stepchild, Sponsored, Foster, or Unknown."
-msgstr "Lapsen suhteiden muokkaaminen: Kaikki lapset eivät ole vanhempiensa verisukulaisia. Voit muokata lapsen sukulaisuussuhdetta jokaiseen vanhempaansa valitsemalla lapsen, ja klikkaamalla \"Muokkaa lapsi/vanhempi suhteita\" kohtaa hiiren oikealla näppäimellä saamastasi menusta."
+msgstr "Lapsen suhteiden muokkaaminen: Kaikki lapset eivät ole vanhempiensa verisukulaisia. Voit muokata lapsen sukulaisuussuhdetta jokaiseen vanhempaansa. Klikkaa hiiren oikealla painikkeella valitsemaasi lasta ja valitse valikosta \"Muokkaa lapsi/vanhempi suhteita\"."
 
 #: data/tips.xml:220
 msgid "Show All Checkbutton: When adding a spouse or child, the list of people shown is filtered to display only people who could realistically fit the role (based on dates in the database). In case GRAMPS is wrong in making this choice, you can override that filter by checking the \"Show All\" checkbutton."
@@ -3922,7 +3990,7 @@ msgstr "GRAMPS ohjekirja: GRAMPSin ohjekirja on varsin kattava ja hyvin k
 
 #: data/tips.xml:236
 msgid "Improving GRAMPS: Users are encouraged to request enhancements to GRAMPS. Requesting an enhancement can be done either through the gramps-users or gramps-devel mailing lists, or by creating a Request for Enhancement (RFE) at http://sourceforge.net/tracker/?group_id=25770&atid=385140 Filing an RFE is preferred."
-msgstr "GRAMPSin parantaminen: Käyttäjiä rohkaistaan esittämään prannusehdoituksia GRAMPSiin. Ehdoituksia voi lähettää gramps-users tai gramps-devel sähköpostilistoille tai (mieluummin) luomalla RFE (Request for Enhancement) parannusehdoituksen GRAMPS sivustolle osoitteeseen http://sourceforge.net/tracker/?group_id=25770&atid=385140"
+msgstr "GRAMPSin kehittäminen: Käyttäjiä rohkaistaan esittämään prannusehdoituksia GRAMPSiin. Ehdoituksia voi lähettää gramps-users tai gramps-devel sähköpostilistoille tai (mieluummin) luomalla RFE (Request for Enhancement) parannusehdoitus GRAMPS sivustolle osoitteeseen http://sourceforge.net/tracker/?group_id=25770&atid=385140"
 
 #: data/tips.xml:245
 msgid "GRAMPS Mailing Lists: Want answers to your queries about GRAMPS? Check out the gramps-users list. Many people are on the list, so you're likely to get an answer quickly. If you have questions related to the development of GRAMPS, try gramps-devel. Information on both mailing lists can be found at lists.sf.net."
@@ -3930,7 +3998,7 @@ msgstr "GRAMPS postituslistat: Haluatko vastauksia GRAMPsiä koskeviin ky
 
 #: data/tips.xml:256
 msgid "Contributing to GRAMPS: Want to help with GRAMPS but can't program? Not a problem. A project as large as GRAMPS requires people with a wide variety of skills. Contributions can vary from writing documentation to testing development versions to helping with the web site. Start by subscribing to the gramps developers mailing list, gramps-devel and introducing yourself. Subscription information can be found at lists.sf.net."
-msgstr "GRAMPS kehityksen avustaminen: Haluatko auttaa GRAMPSin kehityksessä, mutta et osaa ohjelmoida? Ei hätää.  GRAMPSin kokoinen projekti vaatii erilaisiä kykyjä omaavia ihmisiä. Avustukset voivat vaihdella dokumentaation kirjoittamisesta, kehitysversioiden testaamisesta www-sivuston kehitykseen. Aloita liittymällä gramps-devel sähköpostilistalle ja esittelemällä itsesi. Liittymistiedot löytyvät lists.sf.net osoitteesta."
+msgstr "GRAMPS kehityksen avustaminen: Haluatko auttaa GRAMPSin kehityksessä, mutta et osaa ohjelmoida? Ei hätää.  GRAMPSin kokoinen projekti vaatii erilaisiä kykyjä omaavia ihmisiä. Avustukset voivat vaihdella dokumentaation kirjoittamisesta ja kehitysversioiden testaamisesta GRAMPS www-sivuston kehitykseen. Aloita liittymällä gramps-devel sähköpostilistalle ja esittelemällä itsesi. Liittymistiedot löytyvät lists.sf.net osoitteesta."
 
 #: data/tips.xml:264
 msgid "GRAMPS is the Genealogical Research and Analysis Management Program System. It is a full-featured genealogy program letting you store, edit, and research genealogical data. Gramps database back end is so robust that some users are managing genealogies containing hundreds of thousands of people."
@@ -3938,63 +4006,63 @@ msgstr "GRAMPS on sukutiedon tutkimisen ja analyysin hallintasysteemi. Se on tä
 
 #: data/tips.xml:271
 msgid "Different Views: There are six different views for navigating your family: People, Family, Pedigree, Sources, Places, Media. Each helps you to achieve one or more specific tasks."
-msgstr "Eri näkymät: GRAMPS tarjoaa sukutiedon käsittelyyn kuusi erilaista näkymää: Henkilö, Perhe, Sukupuu, Lähde, Paikka ja Media-objekti näkymät. Jokaisessa voit suorittaa tietyn tyyppisia asioita."
+msgstr "Eri näkymät: GRAMPS tarjoaa sukutiedon käsittelyyn kuusi erilaista näkymää: Henkilö-, Perhe-, Sukupuu-, Lähde-, Paikka- ja Medianäkymät. Jokaisessa voit tehdä tiedoille tietyn tyyppisia asioita."
 
 #: data/tips.xml:280
 msgid "Bookmarking Individuals: The Bookmark menu at the top of the window is a convenient place to store the names of frequently used individuals. Clicking on a bookmarked individual will make that person the Active Person. To create a bookmark for a person, make them the Active Person, right click on their name and click on 'add bookmark'."
-msgstr ""
+msgstr "Henkilöiden kirjanmerkitseminen: Kirjanmerkit-valikkoon voit kätevästi lisätä usein käytettyjen henkilöiden nimet. Kirjanmerkityn henkilön klikaaminen tekee hänestä aktiivisen henkilön. Saat luotua kirjanmerkin henkilöön tekemällä hänestä aktiivisen henkilön, klikkaamalla hiiren oikealla painikkeella ja valitsemalla 'Lisää kirjanmerkki'."
 
 #: data/tips.xml:288
 msgid "Incorrect Dates: Everyone occasionally enters dates with a nonvalid format. Incorrect date formats will show up with the red button next to the date. Green means okay, and amber signifies acceptable. The Date Selection dialog can be invoked by clicking on the colored button."
-msgstr ""
+msgstr "Virheelliset päivämäärät: Jokainen antaa joskus päivämäärän, jonka muoto on virheellinen. Sopimattomat päivämäärämuodot osoitetaan päivämäärän vieressä olevalla punaisella nappulalla. Nappulan vihreä väri tarkoittaa, että päivämäärä on kunnossa, keltainen, että se on hyväksyttävissä. Värinappulan klikkaaminen aukaiseen päivämäärän valintadialogin."
 
 #: data/tips.xml:298
 msgid "Listing Events: Events in the life of any individual may be added to the database via the Person > Edit Person > Events option. This space can be used to include a wide range of options ranging from adoptions, to baptisms (and other religious ceremonies), burials, causes of death, Census listings, degrees earned, elections, emigration, military service, nobility titles, occupations, ordination, property, religion, retirement, wills, etc."
-msgstr ""
+msgstr "Tapahtumien listaaminen: Henkilön elämään kuuluvat tapahtumat voidaan lisätä tietokantaan kohdasta Henkilö > Muokkaa henkilöä > Tapahtumat. Voit lisätä sinne erilaisia tapahtumia adoptoinnista kasteeseen (ja muita uskonnollisia seremonioita), hautaamiset, kuolinsyyt, väestörekisteriin merkitsemiset, tutkintojen suorittamiset, virkaan valitsemiset, siirtolaisuuden, asepalveluksen, aateloinnin, virat, ominaisuudet, uskonnon, eläkkeelle siirtymisen, testamentit jne."
 
 #: data/tips.xml:308
 msgid "Changing The Preferred Name: It is easy to manage people with several names in GRAMPS. Make the person the Active Person, doubleclick on the record, and select the Names tab. Different types of names can be added. For example, Married Name, Birth Name, etc. Selecting a preferred name is just a matter of right-clicking on the name and choosing the only item in the menu."
-msgstr ""
+msgstr "Oletusnimen vaihtaminen: GRAMPSissä on helppo käsitellä henkilöitä, joilla on useita nimiä. Aktivoi henkilö ja tuplaklikkaa häneen, sitten valitse Nimet välilehti. Voit lisätä eri tyyppisiä nimiä, esimerkiksi syntyessä tai avioliitossa saadun nimen jne. Voit asettaa nimen oletusnimeksi klikkaamalla sitä hiiren oikealla painikkeella ja valitsemalla ao. toiminnon aukeavasta valikosta."
 
 #: data/tips.xml:315
 msgid "The Pedigree View displays a traditional pedigree chart. Hold the mouse over an individual to see more information about them or right click on an individual to view a menu to quickly access their spouses, siblings, children, or parents."
-msgstr ""
+msgstr "Sukupuunäkymä näyttää perinteisen sukupuukaavion. Pidä hiirtä henkilön nimen yllä nähdäksesi hänestä enemmän tietoja. Klikkaamalla henkilöä hiiren oikealla painikkeella saat valikon, josta voit nopeasti siirtyä henkilön puolisoon, sisarukseen, lapseen tai vanhempaan."
 
 #: data/tips.xml:321
 msgid "The Sources View shows a list of all sources in a single window. Double-click on each to edit, add notes, and to see which individuals reference the source."
-msgstr ""
+msgstr "Lähdenäkymä näyttää listan kaikista tietokannassa olevista lähteistä. Tuplaklikkaamalla lähdettä voit muokata sitä, lisätä siihen huomioita ja nähdä ketkä henkilöistä viittaavat siihen."
 
 #: data/tips.xml:327
 msgid "The Places View shows a list of all places in the database. The list can be sorted by a number of different criteria, such as City, County or State."
-msgstr ""
+msgstr "Paikkanäkymä näyttää listan kaikista tietokannassa olevista paikoista. Voit järjestää listan eri perusteiden mukaan, kuten kaupungin tai kunnan mukaan."
 
 #: data/tips.xml:333
 msgid "The Media View shows a list of all media entered in the database. These can be graphic images, videos, sound clips, spreadsheets, documents, and more."
-msgstr ""
+msgstr "Medianäkymä näyttää listan kaikista tietokantaan liitetyistä mediatiedostoista. Tiedostot voivat olla kuvia, videoita, ääniä, taulukoita, dokumentteja jne."
 
 #: data/tips.xml:342
 msgid "Filters allow you to limit the people seen in the People View. In addition to the many preset filters, Custom Filters can be created that allow you to create filters limited only by your imagination. Custom filters can be created from Tools > Utilities > Custom Filter Editor."
-msgstr ""
+msgstr "Suotimilla voit rajoittaa henkilönäkymässä näkyviä henkilöitä. Monien oletussuotimien lisäksi voit luoda myös erikoissuotimia, joiden mahdollisuuksia rajoittaa vain mielikuvituksesi. Erikoissuotimia voit luoda Työkalut > Apuvälineet > Erikoissuodin-editori kautta."
 
 #: data/tips.xml:349
 msgid "GRAMPS allows you to import from, and export to, GEDCOM format. There is extensive support for the industry standard GEDCOM version 5.5, so you can exchange GRAMPS information to and from users of most other genealogy programs."
-msgstr ""
+msgstr "GRAMPS sallii sinun tuoda ja viedä tietoja GEDCOM tiedostomuodosta. Standardille GEDCOM versiolle 5.5 on laaja tuki, joten voit vaihtaa GRAMPSin sisältämiä tietoja useimpien sukututkimusohjelmien kanssa."
 
 #: data/tips.xml:358
 msgid "You can convert your data into a GRAMPS package, which is a compressed file containing your family tree data and includes all other files used by the database, such as images. This file is completely portable so is useful for backups or sharing with other GRAMPS users. This format has advantages over GEDCOM in that no information is ever lost in exporting and importing."
-msgstr ""
+msgstr "Voit muuttaa tietosi GRAMPS-pakettimuotoon.  Se on pakattu tiedosto, joka sisältää sukutietosi, sekä kaikki muut tiedostot, kuten kuvat, joihin tietokannastasi viitataan. Tiedosto on täysin siirrettävissä, joten se käy hyvin varmuuskopioiden tekoon tai tietojen vaihtoon muiden GRAMPSin käyttäjien kanssa. GEDCOM-muotoon verrattuna tällä on se etu, että sitä käytettäessä tietoja ei koskaan häviä niitä ohjelmasta viedessä tai tuodessa."
 
 #: data/tips.xml:363
 msgid "Make your data portable --- your family tree data and media can be exported directly to the GNOME file manager (Nautilus), for burning onto a CD."
-msgstr ""
+msgstr "Tee tiedoistasi siirrettäviä -- Sukutietosi ja niihin liittyvät mediatiedostot voidaan viedä suoraan GNOME työpöydän (Nautilus) tiedostonhallintaohjelmaan, CD:lle polttamista varten."
 
 #: data/tips.xml:369
 msgid "GRAMPS can export data to the Web Family Tree (WFT) format. This format allows a family tree to be displayed online using a single file, instead of many html files."
-msgstr ""
+msgstr "GRAMPS osaa viedä tietosi WWW-Sukupuu (WTF, Web Family Tree) muotoon. Tässä muodossa sukupuusi voidaan näyttää verkossa yhtenä tiedostona useiden html-tiedostojen sijaan."
 
 #: data/tips.xml:375
 msgid "You can easily export your family tree to a web page. Select the entire database, family lines or selected individuals to a collection of web pages ready for upload to the World Wide Web."
-msgstr ""
+msgstr "Voit helposti tuottaa www-sivuston sukupuustasi. Valitse koko tietokanta, sukulinjoja tai valittuja henkilöitä yhdistelmäksi www-sivuja, jotka ovat valmiita internetissä näytettäviksi."
 
 #: data/tips.xml:380
 msgid "The best way to report a bug in GRAMPS is to use the GRAMPS Bug Tracker at Sourceforge, http://sourceforge.net/tracker/?group_id=25770&atid=385137"
@@ -4006,31 +4074,31 @@ msgstr "GRAMPS kotisivu on osoitteessa http://gramps-project.org/"
 
 #: data/tips.xml:392
 msgid "GRAMPS has some unique features, including the ability to input any piece of information directly into GRAMPS. All data in the data base can be rearranged/manipulated to assist the user in doing research, analysis and correlation with the potential of filling relationship gaps."
-msgstr ""
+msgstr "GRAMPSissä on muutamia ainutlaatuisia ominaisuuksia, mukaanlukien mahdollisuus syöttää mitä tahansa tietoa suoraan GRAMPSiin. Kaikkia tietoja voidaan järjestää/muokata auttamaan tutkimisessa, analyysissä ja tietojen korreloinnissa, jotta voit täyttää tiedoissa ja suhteissa olevia puutteita."
 
 #: data/tips.xml:398
 msgid "GRAMPS helps you to keep personal information secure by allowing you to mark information as private. Data marked as private can be excluded from reports and data exports."
-msgstr ""
+msgstr "GRAMPS auttaa pitämään henkilökohtaiset tiedot salassa, jos merkitset ne yksityisiksi. Tiedot, jotka on merkitty yksityisiksi voidaan jättää pois raporteista ja tietojen ulosviennistä GRAMPsistä."
 
 #: data/tips.xml:406
 msgid "Be accurate when recording genealogical information. Don't make assumptions while recording primary information; write it exactly as you see it. Use bracketed comments to indicate your additions, deletions or comments. Use of the Latin 'sic' is recommended to confirm the accurate transcription of what appears to be an error in a source."
-msgstr ""
+msgstr "Ole tarkkana kun talletat sukutietoja. Alä tee oletuksia kun talletat alkuperäistietoja, vaan kirjaa ne näkemässäsi muodossa. Käytä kulmasulkeita merkitessäsi omat lisäyksesi, poistosi tai kommenttisi. Jos lähde vaikuttaa virheelliseltä, on suositeltavaa, että merkitset tallentaneesi sen tarkassa alkkuperäismuodossa."
 
 #: data/tips.xml:411
 msgid "You can link any electronic media (including non-text information) and other file types to your GRAMPS family tree."
-msgstr "Voit liittää mitä tahansa sähköistä mediaa (esim. kuvia) and muita tiedostotyyppejä sukupuuhusi GRAMPSissä."
+msgstr "Voit liittää mitä tahansa sähköistä mediaa (esim. kuvia) ja muita tiedostotyyppejä sukupuuhusi GRAMPSissä."
 
 #: data/tips.xml:420
 msgid "GRAMPS allows you to generate a number of reports (both text and graphical) based on your genealogical information. There is great flexibility in selecting what people are included in the reports as well as the output format (html, pdf, OpenOffice, RTF, AbiWord, KWord, LaTeX and plain text). Experiment with the reports under the Reports menu to get an idea of how powerful GRAMPS is."
-msgstr ""
+msgstr "Voit luoda GRAMPSiin tallettamistasi sukutiedoista useita erilaisia (sekä graafisia, että tekstimuotoisia) raportteja.  Raportteihin sisällytettävien henkilöiden valinta on hyvin joustavaa ja voit tallentaa raportteja monissa eri muodoissa (HTML, PDF, OpenOffice, RTF, AbiWord, KWord, LaTeX ja normaali teksti).  Kokeile erilaisia raportteja Raportit valikon alla saadaksesi kuvan siitä, miten monipuolinen GRAMPS on."
 
 #: data/tips.xml:426
 msgid "Custom reports can be created by advanced users under the \"plugin\" system. More information on custom reports can be found at http://developers.gramps-project.org"
-msgstr ""
+msgstr "Edistyneemmät käyttäjät voivat luoda omia erikoisraporttejaan kirjoittamalla sitä varten GRAMPS \"liitännäisen\". Enemmän tietoja erikoisraporteista löytyy osoitteesta http://developers.gramps-project.org"
 
 #: data/tips.xml:432
 msgid "The Book report, Reports > Books > Book Report, allows users to collect a variety of reports into a single document. This single report is easier to distribute than multiple reports, especially when printed."
-msgstr ""
+msgstr "Kirjaraportin Raportit > Kirjat > Kirjaraportti avulla käyttäjä voi kerätä erilaisiä raportteja yhteen dokumenttiin.  Tälläisen yksittäisen raportin valintoja on helpompi muuttaa. Se on myös helpompi tulostaa ja lähettää asianomaisille henkilöille."
 
 #: data/tips.xml:438
 msgid "Interested in getting notified when a new version of GRAMPS is released? Join the gramps-announce mailing list at http://lists.sourceforge.net/lists/listinfo/gramps-announce"
@@ -4038,15 +4106,15 @@ msgstr "Haluatko tietää milloin uusi GRAMPS versio julkaistaan? Liity gramps-a
 
 #: data/tips.xml:446
 msgid "Good genealogy tip: Information collected about your family is only as good as the source it came from. Take time and trouble to record all the details of where the information came from. Whenever possible get a copy of original documents."
-msgstr ""
+msgstr "Sukututkimusvihje: Sukuasi koskevat tiedot ovat korkeintaan yhtä luotettavia kuin lähde, josta ne sait. Näe vaivaa, jotta tallennat kaikki yksityiskohdat siitä, mistä lähteestä tietosi tulivat. Aina kuin mahdollista, hanki kopio alkuperäisistä dokumenteista."
 
 #: data/tips.xml:453
 msgid "Go from what you know to what you do not. Always record everything that is known before making conjecture. Often the facts at hand suggest plenty of direction for more research. Don't waste time looking through thousands of records hoping for a trail when you have other unexplored leads."
-msgstr ""
+msgstr "Siirry siitä, mitä tiedät, siihen mitä et tiedä. Tallenna aina kaikki mitä asiasta tiedetään, ennen kuin teet johtopäätöksiä. Yleensä tiedossa olevista asioista löytyy hyvin suuntia jatkotutkimukselle. Älä hukkaa aikaasi tuhansien uusien tietojen tutkimiseen vihjeen toivossa kun sinulla on vielä hallussasi käyttämätöntä tietoa."
 
 #: data/tips.xml:460
 msgid "Genealogy isn't only about dates and names. It is about people. Be descriptive. Include the why of how things happened, and how descendants might have been shaped by the events they went through. Narratives go a long way in making your family history come alive."
-msgstr ""
+msgstr "Sukututkimus ei ole vain päivämääriä ja nimiä, vaan ihmisiä. Kuvaile asioita. Sisällytä tietoihisi miksi jotakin tapahtui tietyllä tavalla ja miten jälkeläisiin ovat saattaneet vaikuttaa heille tapahtuneet asiat. Tarinat tekevät perheesi historiasta elävämmän."
 
 #: data/tips.xml:466
 msgid "GRAMPS has been translated to 15 languages. If GRAMPS supports your language and it is not being displayed, set the default language on your machine and restart GRAMPS."
@@ -4054,7 +4122,7 @@ msgstr "GRAMPS on käännetty 15 eri kielelle. Jos GRAMPS tukee kieltäsi, mutta
 
 #: data/tips.xml:472
 msgid "GRAMPS has been designed so that new translations can easily be added with little development effort. If you are interested in participating please email gramps-devel@lists.sf.net"
-msgstr "GRAMPS on suunniteltu siten, että uusia käännöksiä voidaan lisätä helposti.  Jos sinua kiinnostaa auttaa, lähetä sähköpostia osoitteeseen gramps-devel@lists.sf.net"
+msgstr "GRAMPS on suunniteltu siten, että uusia käännöksiä voidaan lisätä helposti.  Jos haluat auttaa, lähetä sähköpostia osoitteeseen gramps-devel@lists.sf.net"
 
 #: data/tips.xml:476
 msgid "Relationship calculators in GRAMPS are available in ten languages."
@@ -4062,7 +4130,7 @@ msgstr "GRAMPS tarjoaa suhdelaskimen kymmenelle eri kielelle."
 
 #: data/tips.xml:481
 msgid "GRAMPS offers full Unicode support. Characters for all languages are properly displayed."
-msgstr ""
+msgstr "GRAMPSissä on täysi Unicode-merkistön tuki. Jos koneellesi on asennettu vaaditut kirjasimet, kaikkien kielten merkit näykyvät oikein."
 
 #: data/tips.xml:487
 msgid "Anyone can be chosen as the 'home person' in GRAMPS. Use Edit -> Set Home Person. The home person is the person who is selected when the database is opened or when the home button is pressed."
@@ -4070,11 +4138,11 @@ msgstr "Voit asettaa kenet tahansa GRAMPSin 'koti'-henkilöksi valitsemalla M
 
 #: data/tips.xml:492
 msgid "Multiple names can be specified for individuals. Examples are birth name, marriage name or aliases."
-msgstr "Henkilöille voidaan antaa useita nimiä. Nimet voivat olla kasteessa tai avioliiton kautta saatuja tai aliaksia."
+msgstr "Henkilöille voidaan antaa useita nimiä. Nimet voivat olla kasteessa tai avioliiton kautta saatuja tai muita vaihtoehtoisia nimiä."
 
 #: data/tips.xml:497
 msgid "An alternate name can be selected as a person's preferred name by selecting the desired name in the person's name list, bringing up the context menu by clicking the right mouse button, and selecting from the menu."
-msgstr "Henkilön vaihtoehtoinen nimi voidaan muuttaa ensisijaiseksi valitsemalla se nimilistasta ja käyttäen konteksti-menua, joka aukeaa oikean hiiren napilla."
+msgstr "Henkilön vaihtoehtoinen nimi voidaan muuttaa ensisijaiseksi valitsemalla se nimilistasta ja käyttäen kontekstivalikkoa, joka aukeaa  hiiren oikealla painikkeella."
 
 #: data/tips.xml:504
 msgid "GRAMPS is written in a computer language called Python using the GTK and GNOME libraries for the graphical interface. GRAMPS is supported on any computer system where these programs have been ported."
@@ -4094,15 +4162,15 @@ msgstr "GRAMPS toimii myös KDE työpöytäympäristössä kunhan vaaditut GNOME
 
 #: data/tips.xml:525
 msgid "To run GRAMPS, you need to have GNOME installed. But you do not need to be running the GNOME desktop."
-msgstr "Ajaaksesi GRAMPS ohjelmaa, sinun pitää asentaa GNOME.  Sinun ei kuitenkaan tarvitse käyttää GNOME työpöytäympäristöä."
+msgstr "Ajaaksesi GRAMPS ohjelmaa, sinun täytyy asentaa GNOME työpöytäympäristö. Sinun ei kuitenkaan tarvitse ajaa itse työpöytäympäristöä, sen olemassaolo on riittävä GRAMPSin ajamiseen."
 
 #: data/tips.xml:531
 msgid "GRAMPS makes every effort to maintain compatibility with GEDCOM, the general standard of recording genealogical information. Filters exist that make importing and exporting GEDCOM files trivial."
 msgstr "GRAMPS tekee kaikkensa ollakseen yhteensopiva GEDCOM tiedostojen kanssa (GEDCOM on yleinen standardi sukutietojen talletukseen). Olemassaolevat suotimet tekevät GEDCOM tiedostojen viennin ja tuonnin helpoksi."
 
-#: docgen/AbiWord2Doc.py:332
+#: docgen/AbiWord2Doc.py:340
 msgid "AbiWord document"
-msgstr "AbiWord dokumentti"
+msgstr "AbiWord-dokumentti"
 
 #: docgen/AsciiDoc.py:377
 msgid "Plain Text"
@@ -4182,7 +4250,7 @@ msgstr "SVG (Scalable Vector Graphics)"
 msgid "Encoding"
 msgstr "Koodaus"
 
-#: gedcomexport.glade:127 gramps.glade:20090 gramps.glade:28994
+#: gedcomexport.glade:127 gramps.glade:21644 gramps.glade:31156
 #: plugins/genewebexport.glade:103 plugins/merge.glade:385
 #: plugins/vcalendarexport.glade:103 plugins/vcardexport.glade:103
 #: plugins/writeftree.glade:124
@@ -4284,7 +4352,7 @@ msgstr "Tekijä:"
 msgid "Status"
 msgstr "Asema/tila"
 
-#: gedcomimport.glade:216 gramps.glade:3482 gramps.glade:19306
+#: gedcomimport.glade:216 gramps.glade:3660 gramps.glade:20805
 msgid "Information"
 msgstr "Tiedot"
 
@@ -4330,394 +4398,394 @@ msgstr ""
 "ASCII\n"
 "UNICODE"
 
-#: gramps.glade:10 gramps.glade:31082
+#: gramps.glade:10 gramps.glade:33389
 msgid "GRAMPS"
 msgstr "GRAMPS"
 
-#: gramps.glade:44
+#: gramps.glade:45
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: gramps.glade:53
+#: gramps.glade:54
 msgid "_New"
 msgstr "_Uusi"
 
-#: gramps.glade:75
+#: gramps.glade:76
 msgid "_Open..."
 msgstr "_Avaa..."
 
-#: gramps.glade:97
+#: gramps.glade:98
 msgid "Open _Recent"
 msgstr "Viimeksi _avattu"
 
-#: gramps.glade:112
+#: gramps.glade:113
 msgid "_Import..."
 msgstr "Tuont_i..."
 
-#: gramps.glade:134
+#: gramps.glade:135
 msgid "Save _As..."
 msgstr "Tallenna _nimellä..."
 
-#: gramps.glade:156
+#: gramps.glade:157
 msgid "E_xport..."
 msgstr "_Vienti..."
 
-#: gramps.glade:184
+#: gramps.glade:185
 msgid "A_bandon changes and quit"
 msgstr "H_ylkää muutokset ja lopeta"
 
-#: gramps.glade:193
+#: gramps.glade:194
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#: gramps.glade:219
+#: gramps.glade:220
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: gramps.glade:228 gramps_main.py:536
+#: gramps.glade:229 gramps_main.py:536
 msgid "_Undo"
 msgstr "_Peru"
 
-#: gramps.glade:256 gramps.glade:918
+#: gramps.glade:257 gramps.glade:919
 msgid "Add a new item"
 msgstr "Lisää uusi"
 
-#: gramps.glade:257 rule.glade:135 rule.glade:722
+#: gramps.glade:258 rule.glade:135 rule.glade:722
 msgid "_Add..."
 msgstr "_Lisää..."
 
-#: gramps.glade:279 gramps.glade:936
+#: gramps.glade:280 gramps.glade:937
 msgid "Remove the currently selected item"
 msgstr "Poista valittu"
 
-#: gramps.glade:280
+#: gramps.glade:281
 msgid "R_emove"
 msgstr "P_oista"
 
-#: gramps.glade:302 gramps.glade:954
+#: gramps.glade:303 gramps.glade:955
 msgid "Edit the selected item"
 msgstr "Muokkaa valittua"
 
-#: gramps.glade:303
+#: gramps.glade:304
 msgid "E_dit..."
 msgstr "_Muokkaa..."
 
-#: gramps.glade:318
+#: gramps.glade:319
 msgid "Compare and _Merge..."
 msgstr "Vertaa ja _liitä..."
 
-#: gramps.glade:340
+#: gramps.glade:341
 msgid "Fast Mer_ge"
 msgstr "Pikaliito_s"
 
-#: gramps.glade:355
+#: gramps.glade:356
 msgid "Prefere_nces..."
 msgstr "_Asetukset..."
 
-#: gramps.glade:376
+#: gramps.glade:377
 msgid "_Column Editor..."
 msgstr "_Sarake-editori..."
 
-#: gramps.glade:397
+#: gramps.glade:398
 msgid "Set _Home person..."
 msgstr "_Aseta \"koti\"-henkilö..."
 
-#: gramps.glade:422
+#: gramps.glade:423
 msgid "_View"
 msgstr "_Näytä"
 
-#: gramps.glade:431
+#: gramps.glade:432
 msgid "_Filter"
 msgstr "_Suodin"
 
-#: gramps.glade:441
+#: gramps.glade:442
 msgid "_Sidebar"
 msgstr "_Sivupalkki"
 
-#: gramps.glade:451
+#: gramps.glade:452
 msgid "_Toolbar"
 msgstr "_Työkalupalkki"
 
-#: gramps.glade:465
+#: gramps.glade:466
 msgid "_Go"
 msgstr "_Siirry"
 
-#: gramps.glade:473
+#: gramps.glade:474
 msgid "_Bookmarks"
 msgstr "_Kirjanmerkit"
 
-#: gramps.glade:482
+#: gramps.glade:483
 msgid "_Add bookmark"
 msgstr "_Lisää kirjanmerkki"
 
-#: gramps.glade:504
+#: gramps.glade:505
 msgid "_Edit bookmarks..."
 msgstr "_Muokkaa kirjanmerkkejä..."
 
-#: gramps.glade:532
+#: gramps.glade:533
 msgid "_Go to bookmark"
 msgstr "M_ene kirjanmerkkiin"
 
-#: gramps.glade:544
+#: gramps.glade:545
 msgid "_Reports"
 msgstr "_Raportit"
 
-#: gramps.glade:552
+#: gramps.glade:553
 msgid "_Tools"
 msgstr "T_yökalut"
 
-#: gramps.glade:560
+#: gramps.glade:561
 msgid "_Windows"
 msgstr "_Ikkunat"
 
-#: gramps.glade:568
+#: gramps.glade:569
 msgid "_Help"
 msgstr "_Ohjeet"
 
-#: gramps.glade:577
+#: gramps.glade:578
 msgid "_User manual"
 msgstr "_Käyttöohje"
 
-#: gramps.glade:599
+#: gramps.glade:600
 msgid "_FAQ"
 msgstr "_FAQ (useasti kysytyt)"
 
-#: gramps.glade:626
+#: gramps.glade:627
 msgid "GRAMPS _home page"
 msgstr "_GRAMPS kotisivu"
 
-#: gramps.glade:647
+#: gramps.glade:648
 msgid "GRAMPS _mailing lists"
 msgstr "GRAMPS _postituslistat"
 
-#: gramps.glade:668
+#: gramps.glade:669
 msgid "_Report a bug"
 msgstr "_Virheen raportointi"
 
-#: gramps.glade:683
+#: gramps.glade:684
 msgid "_Show plugin status..."
 msgstr "_Näytä liitännäisten tila..."
 
-#: gramps.glade:692
+#: gramps.glade:693
 msgid "_Open example database"
 msgstr "_Avaa esimerkkitietokanta"
 
-#: gramps.glade:701
+#: gramps.glade:702
 msgid "_About"
 msgstr "_Tietoja"
 
-#: gramps.glade:751
+#: gramps.glade:752
 msgid "Open database"
 msgstr "Avaa tietokanta"
 
-#: gramps.glade:752
+#: gramps.glade:753
 msgid "Open"
 msgstr "Avaa"
 
-#: gramps.glade:782
+#: gramps.glade:783
 msgid "Go back in history"
 msgstr "Siirry taaksepäin historiassa"
 
-#: gramps.glade:783
+#: gramps.glade:784
 msgid "Back"
 msgstr "Taaksepäin"
 
-#: gramps.glade:801
+#: gramps.glade:802
 msgid "Go forward in history"
 msgstr "Siirry eteenpäin historiassa"
 
-#: gramps.glade:802
+#: gramps.glade:803
 msgid "Forward"
 msgstr "Eteenpäin"
 
-#: gramps.glade:820
+#: gramps.glade:821
 msgid "Make the Home Person the active person"
 msgstr "Aktivoi \"koti\"-henkilö"
 
-#: gramps.glade:851
+#: gramps.glade:852
 msgid "Open Scratch Pad"
 msgstr "Avaa Muistio"
 
-#: gramps.glade:852
+#: gramps.glade:853
 msgid "ScratchPad"
 msgstr "Muistio"
 
-#: gramps.glade:869
+#: gramps.glade:870
 msgid "Generate reports"
 msgstr "Tuota raportteja"
 
-#: gramps.glade:870
+#: gramps.glade:871
 msgid "Reports"
 msgstr "Raportit"
 
-#: gramps.glade:887
+#: gramps.glade:888
 msgid "Run tools"
 msgstr "Avaa työkalut"
 
-#: gramps.glade:888
+#: gramps.glade:889
 msgid "Tools"
 msgstr "Työkalut"
 
-#: gramps.glade:919
+#: gramps.glade:920
 msgid "Add"
 msgstr "Lisää"
 
-#: gramps.glade:937
+#: gramps.glade:938
 msgid "Remove"
 msgstr "Poista"
 
-#: gramps.glade:1028 gramps.glade:1452
+#: gramps.glade:1029 gramps.glade:1486
 msgid "People"
 msgstr "Henkilöt"
 
-#: gramps.glade:1076 gramps.glade:2237 gramps.glade:2992
+#: gramps.glade:1081 gramps.glade:2310 gramps.glade:3104
 msgid "Family"
 msgstr "Perhe"
 
-#: gramps.glade:1124 gramps.glade:3039
+#: gramps.glade:1133 gramps.glade:3155
 msgid "Pedigree"
 msgstr "Sukupuu"
 
-#: gramps.glade:1172 gramps.glade:3097
+#: gramps.glade:1185 gramps.glade:3220
 msgid "Sources"
 msgstr "Lähteet"
 
-#: gramps.glade:1220 gramps.glade:3155
+#: gramps.glade:1237 gramps.glade:3285
 msgid "Places"
 msgstr "Paikat"
 
-#: gramps.glade:1268 gramps.glade:3554
+#: gramps.glade:1289 gramps.glade:3739
 msgid "Media"
 msgstr "Media"
 
-#: gramps.glade:1376
+#: gramps.glade:1407
 msgid "Invert"
 msgstr "Vaihda päinvastaiseksi"
 
-#: gramps.glade:1394
+#: gramps.glade:1425
 msgid "Apply filter using the selected controls"
 msgstr "Käytä suodinta valituille tietueille"
 
-#: gramps.glade:1481 gramps.glade:2956
+#: gramps.glade:1519 gramps.glade:3068
 msgid "Exchange the current spouse with the active person"
 msgstr "Vaihda puoliso ja aktiivinen henkilö keskenään"
 
-#: gramps.glade:1547 gramps.glade:2718
+#: gramps.glade:1585 gramps.glade:2822
 msgid "Adds a new person to the database and to a new relationship"
 msgstr "Lisää uuden henkilön tietokantaan ja suhteeseen"
 
-#: gramps.glade:1574 gramps.glade:2745
+#: gramps.glade:1612 gramps.glade:2849
 msgid "Selects an existing person from the database and adds to a new relationship"
 msgstr "Valitsee henkilön tietokannasta ja lisää sen uuteen suhteeseen"
 
-#: gramps.glade:1601 gramps.glade:2772
+#: gramps.glade:1639 gramps.glade:2876
 msgid "Removes the currently selected spouse"
 msgstr "Poistaa valitun puolison"
 
-#: gramps.glade:1644 gramps.glade:2865
+#: gramps.glade:1682 gramps.glade:2977
 msgid "Make the active person's parents the active family"
 msgstr "Tee valitun henkilön vanhemmista aktiivinen perhe"
 
-#: gramps.glade:1671 gramps.glade:2892
+#: gramps.glade:1709 gramps.glade:3004
 msgid "Adds a new set of parents to the active person"
 msgstr "Lisää uudet vanhemmat aktiiviselle henkilölle"
 
-#: gramps.glade:1698 gramps.glade:2919
+#: gramps.glade:1736 gramps.glade:3031
 msgid "Deletes the selected parents from the active person"
 msgstr "Poistaa valitut vanhemmat aktiiviselta henkilöltä"
 
-#: gramps.glade:1744 gramps.glade:2026 gramps.glade:2360 gramps.glade:2390
+#: gramps.glade:1782 gramps.glade:2090 gramps.glade:2447 gramps.glade:2480
 msgid "Double-click to edit the relationship to the selected parents"
 msgstr "Tuplaklikkaa muokataksesi suhdetta valittuihin vanhempiin"
 
-#: gramps.glade:1771 gramps.glade:2596
+#: gramps.glade:1812 gramps.glade:2696
 msgid "Make the selected spouse's parents the active family"
 msgstr "Tee valitun puolison vanhemmista aktiivinen perhe"
 
-#: gramps.glade:1798 gramps.glade:2623
+#: gramps.glade:1839 gramps.glade:2723
 msgid "Adds a new set of parents to the selected spouse"
 msgstr "Lisää uudet vanhemmat valitulle puolisolle"
 
-#: gramps.glade:1825 gramps.glade:2650
+#: gramps.glade:1866 gramps.glade:2750
 msgid "Deletes the selected parents from the selected spouse"
 msgstr "Poistaa valitut vanhemmat valitulta puolisolta"
 
-#: gramps.glade:1862 gramps.glade:2296
+#: gramps.glade:1903 gramps.glade:2376
 msgid "_Children"
 msgstr "_Lapset"
 
-#: gramps.glade:1887 gramps.glade:2809
+#: gramps.glade:1932 gramps.glade:2913
 msgid "_Active person"
 msgstr "_Aktiivinen henkilö"
 
-#: gramps.glade:1912 gramps.glade:2834
+#: gramps.glade:1961 gramps.glade:2942
 msgid "Active person's _parents"
 msgstr "Aktiivisen henkilön _vahemmat"
 
-#: gramps.glade:1937 gramps.glade:2687
+#: gramps.glade:1990 gramps.glade:2787
 msgid "Relati_onship"
 msgstr "_Suhde"
 
-#: gramps.glade:1962 gramps.glade:2565
+#: gramps.glade:2019 gramps.glade:2661
 msgid "Spo_use's parents"
 msgstr "_Puolison vanhemmat"
 
-#: gramps.glade:2056 gramps.glade:2420
+#: gramps.glade:2123 gramps.glade:2513
 msgid "Double-click to edit the active person"
 msgstr "Tuplaklikkaa muokataksesi aktiivista henkilöä"
 
-#: gramps.glade:2086 gramps.glade:2275
+#: gramps.glade:2156 gramps.glade:2352
 msgid "Double-click to edit the relationship information, Shift-click to edit the person"
 msgstr "Tuplaklikkaa muokataksesi suhdetta, Shift-klikkaa muokataksesi henkilöä"
 
-#: gramps.glade:2113 gramps.glade:2447
+#: gramps.glade:2186 gramps.glade:2543
 msgid "Make the selected child the active person"
 msgstr "Tee valitusta lapsesta aktiivinen henkilö"
 
-#: gramps.glade:2140 gramps.glade:2474
+#: gramps.glade:2213 gramps.glade:2570
 msgid "Adds a new child to the database and to the current family"
 msgstr "Lisää uuden lapsen tietokantaan ja perheeseen"
 
-#: gramps.glade:2167 gramps.glade:2501
+#: gramps.glade:2240 gramps.glade:2597
 msgid "Selects an existing person from the database and adds as a child to the current family"
 msgstr "Valitse henkilö tietokannasta ja lisää hänet lapseksi perheeseen"
 
-#: gramps.glade:2194 gramps.glade:2528
+#: gramps.glade:2267 gramps.glade:2624
 msgid "Deletes the selected child from the selected family"
 msgstr "Poista valittu lapsi valitusta perheestä"
 
-#: gramps.glade:3206 gramps.glade:19030 gramps.glade:21050 gramps.glade:21315
-#: gramps.glade:22712
+#: gramps.glade:3340 gramps.glade:20485 gramps.glade:22681 gramps.glade:22959
+#: gramps.glade:24471
 msgid "Preview"
 msgstr "Esikatselu"
 
-#: gramps.glade:3242 gramps.glade:19066
+#: gramps.glade:3380 gramps.glade:20525
 msgid "Details:"
 msgstr "Yksityiskohdat:"
 
-#: gramps.glade:3313 gramps.glade:19137 gramps.glade:21351 gramps.glade:22748
+#: gramps.glade:3463 gramps.glade:20608 gramps.glade:22999 gramps.glade:24511
 msgid "Path:"
 msgstr "Polku:"
 
-#: gramps.glade:3338 gramps.glade:7942 gramps.glade:8512 gramps.glade:9026
-#: gramps.glade:12184 gramps.glade:12799 gramps.glade:19162 gramps.glade:22079
-#: gramps.glade:23157
+#: gramps.glade:3492 gramps.glade:8436 gramps.glade:9073 gramps.glade:9646
+#: gramps.glade:13081 gramps.glade:13775 gramps.glade:20637 gramps.glade:23799
+#: gramps.glade:24964
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: gramps.glade:3778
+#: gramps.glade:3975
 msgid "Check to show all people in the list.  Uncheck to get the list filtered by birth and death dates."
 msgstr "Valitse nähdäksesi kaikki listan henkilöt.  Ilman valintaa, lista on suodatettu syntymä- ja kuolinaikojen mukaan."
 
-#: gramps.glade:3780 gramps.glade:4156 gramps.glade:4574
+#: gramps.glade:3977 gramps.glade:4380 gramps.glade:4826
 msgid "_Show all"
 msgstr "_Näytä kaikki"
 
-#: gramps.glade:3827 gramps.glade:11954
+#: gramps.glade:4024 gramps.glade:12825
 msgid "_Relationship type:"
 msgstr "_Suhteen tyyppi:"
 
-#: gramps.glade:3855
+#: gramps.glade:4056
 msgid ""
 "Married\n"
 "Unmarried\n"
@@ -4731,651 +4799,651 @@ msgstr ""
 "Tuntematon\n"
 "Muu"
 
-#: gramps.glade:4025
+#: gramps.glade:4233
 msgid "_Father's relationship to child:"
 msgstr "_Isän suhde lapseen:"
 
-#: gramps.glade:4049
+#: gramps.glade:4261
 msgid "_Mother's relationship to child:"
 msgstr "_Äidin suhde lapseen:"
 
-#: gramps.glade:4073
+#: gramps.glade:4289
 msgid "_Parents' relationship to each other:"
 msgstr "_Vanhempien suhde toisiinsa:"
 
-#: gramps.glade:4097
+#: gramps.glade:4317
 msgid "Fat_her"
 msgstr "_Isä"
 
-#: gramps.glade:4192
+#: gramps.glade:4416
 msgid "Moth_er"
 msgstr "_Äiti"
 
-#: gramps.glade:4217
+#: gramps.glade:4445
 msgid "Relationships"
 msgstr "Suhteet"
 
-#: gramps.glade:4311
+#: gramps.glade:4549
 msgid "Show _all"
 msgstr "_Näytä kaikki"
 
-#: gramps.glade:4643
+#: gramps.glade:4895
 msgid "Relationship to father:"
 msgstr "Suhde isään:"
 
-#: gramps.glade:4667
+#: gramps.glade:4923
 msgid "Relationship to mother:"
 msgstr "Suhde äitiin:"
 
-#: gramps.glade:4758 gramps.glade:6549 gramps.glade:11846 gramps.glade:28451
+#: gramps.glade:5023 gramps.glade:6932 gramps.glade:12713 gramps.glade:30562
 msgid "Abandon changes and close window"
 msgstr "Hylkää muutokset ja sulje ikkuna"
 
-#: gramps.glade:4773 gramps.glade:6564 gramps.glade:11861 gramps.glade:25038
-#: gramps.glade:27302 gramps.glade:28196 gramps.glade:28466
+#: gramps.glade:5038 gramps.glade:6947 gramps.glade:12728 gramps.glade:26958
+#: gramps.glade:29348 gramps.glade:30294 gramps.glade:30577
 msgid "Accept changes and close window"
 msgstr "Hyväksy muutokset ja sulje ikkuna"
 
-#: gramps.glade:4860 gramps.glade:6759 gramps.glade:14059 gramps.glade:18137
-#: gramps.glade:21096 gramps.glade:22932 gramps.glade:28635
+#: gramps.glade:5129 gramps.glade:7162 gramps.glade:15121 gramps.glade:19547
+#: gramps.glade:22731 gramps.glade:24719 gramps.glade:30762
 msgid "_Title:"
 msgstr "_Nimike:"
 
-#: gramps.glade:4885
+#: gramps.glade:5158
 msgid "_Author:"
 msgstr "_Tekijä:"
 
-#: gramps.glade:4956
+#: gramps.glade:5233
 msgid "_Publication information:"
 msgstr "_Julkaisutiedot:"
 
-#: gramps.glade:5023
+#: gramps.glade:5304
 msgid "A_bbreviation:"
 msgstr "_Lyhennys:"
 
-#: gramps.glade:5054 gramps.glade:12125 gramps.glade:14453 gramps.glade:14623
-#: gramps.glade:23075 gramps.glade:25412 gramps.glade:26416 gramps.glade:27784
-#: gramps.glade:29213 plugins/verify.glade:530
+#: gramps.glade:5339 gramps.glade:13014 gramps.glade:15547 gramps.glade:15737
+#: gramps.glade:24870 gramps.glade:27359 gramps.glade:28409 gramps.glade:29862
+#: gramps.glade:31390 plugins/verify.glade:530
 msgid "General"
 msgstr "Yleinen"
 
-#: gramps.glade:5124 gramps.glade:10183 gramps.glade:13187 gramps.glade:15258
-#: gramps.glade:21905 gramps.glade:23465 gramps.glade:25663 gramps.glade:26665
-#: gramps.glade:28033 gramps.glade:29464
+#: gramps.glade:5413 gramps.glade:10933 gramps.glade:14198 gramps.glade:16443
+#: gramps.glade:23613 gramps.glade:25291 gramps.glade:27621 gramps.glade:28669
+#: gramps.glade:30122 gramps.glade:31652
 msgid "Format"
 msgstr "Muoto"
 
-#: gramps.glade:5148 gramps.glade:10208 gramps.glade:13211 gramps.glade:15282
-#: gramps.glade:21929 gramps.glade:23489 gramps.glade:25687 gramps.glade:26689
-#: gramps.glade:28057 gramps.glade:29488
+#: gramps.glade:5441 gramps.glade:10962 gramps.glade:14226 gramps.glade:16471
+#: gramps.glade:23641 gramps.glade:25319 gramps.glade:27649 gramps.glade:28697
+#: gramps.glade:30150 gramps.glade:31680
 msgid "Multiple spaces, tabs, and single line breaks are replaced with single spaces. Two consecutive line breaks mark a new paragraph."
 msgstr "Peräkkäiset välilyönnit, tabulaattorit ja yksittäiset rivinvaihdot korvataan yhdellä välilyönnillä. Kaksi perättäistä rivinvaihtoa merkitsee uutta kappaletta."
 
-#: gramps.glade:5150 gramps.glade:10210 gramps.glade:13213 gramps.glade:15284
-#: gramps.glade:21931 gramps.glade:23491 gramps.glade:25689 gramps.glade:26691
-#: gramps.glade:28059 gramps.glade:29490
+#: gramps.glade:5443 gramps.glade:10964 gramps.glade:14228 gramps.glade:16473
+#: gramps.glade:23643 gramps.glade:25321 gramps.glade:27651 gramps.glade:28699
+#: gramps.glade:30152 gramps.glade:31682
 msgid "_Flowed"
 msgstr "_Virtaava/muotoilematon"
 
-#: gramps.glade:5171 gramps.glade:10231 gramps.glade:13234 gramps.glade:15305
-#: gramps.glade:21952 gramps.glade:23512 gramps.glade:25710 gramps.glade:26712
-#: gramps.glade:28080 gramps.glade:29511
+#: gramps.glade:5464 gramps.glade:10985 gramps.glade:14249 gramps.glade:16494
+#: gramps.glade:23664 gramps.glade:25342 gramps.glade:27672 gramps.glade:28720
+#: gramps.glade:30173 gramps.glade:31703
 msgid "Formatting is preserved, except for the leading whitespace. Multiple spaces, tabs, and all line breaks are respected."
 msgstr "Muotoilu säilytetään, edeltävää tyhjää lukuunottamatta. Peräkkäiset välilyönnit, tabulaattorit ja rivinvaihdot säilytetään."
 
-#: gramps.glade:5173 gramps.glade:10233 gramps.glade:13236 gramps.glade:15307
-#: gramps.glade:21954 gramps.glade:23514 gramps.glade:25712 gramps.glade:26714
-#: gramps.glade:28082 gramps.glade:29513
+#: gramps.glade:5466 gramps.glade:10987 gramps.glade:14251 gramps.glade:16496
+#: gramps.glade:23666 gramps.glade:25344 gramps.glade:27674 gramps.glade:28722
+#: gramps.glade:30175 gramps.glade:31705
 msgid "_Preformatted"
 msgstr "_Esimuotoiltu"
 
-#: gramps.glade:5268 gramps.glade:5405 gramps.glade:10490 gramps.glade:13484
-#: gramps.glade:15587 gramps.glade:25993
+#: gramps.glade:5568 gramps.glade:5709 gramps.glade:11255 gramps.glade:14510
+#: gramps.glade:16787 gramps.glade:27966
 msgid "Add a new media object to the database and place it in this gallery"
-msgstr "Lisää uusi media-objekti tietokantaan ja sijoita se galleriaan"
+msgstr "Lisää uusi mediatiedosto tietokantaan ja liitä se tähän galleriaan"
 
-#: gramps.glade:5296 gramps.glade:5489 gramps.glade:13567 gramps.glade:15670
-#: gramps.glade:26076
+#: gramps.glade:5596 gramps.glade:5793 gramps.glade:14593 gramps.glade:16870
+#: gramps.glade:28049
 msgid "Remove selected object from this gallery only"
-msgstr "Poista valittu objekti vain tästä galleriasta"
+msgstr "Poista valittu tiedosto vain tästä galleriasta"
 
-#: gramps.glade:5337
+#: gramps.glade:5637
 msgid "Data"
 msgstr "Tieto"
 
-#: gramps.glade:5433 gramps.glade:10518 gramps.glade:13512 gramps.glade:15615
-#: gramps.glade:26021
+#: gramps.glade:5737 gramps.glade:11283 gramps.glade:14538 gramps.glade:16815
+#: gramps.glade:27994
 msgid "Select an existing media object from the database and place it in this gallery"
-msgstr "Valitse tietokannasta media-objekti ja sijoita se tähän galleriaan"
+msgstr "Valitse tietokannassa jo oleva mediatiedosto ja liitä se tähän galleriaan"
 
-#: gramps.glade:5461 gramps.glade:10546 gramps.glade:15643 gramps.glade:26049
+#: gramps.glade:5765 gramps.glade:11311 gramps.glade:16843 gramps.glade:28022
 msgid "Edit the properties of the selected object"
 msgstr "Muokkaa valitun objektin ominaisuuksia"
 
-#: gramps.glade:5550 gramps.glade:10621 gramps.glade:13608 gramps.glade:15731
-#: gramps.glade:26137 plugins/WebPage.py:432
+#: gramps.glade:5854 gramps.glade:11386 gramps.glade:14634 gramps.glade:16931
+#: gramps.glade:28110 plugins/WebPage.py:432
 msgid "Gallery"
 msgstr "Galleria"
 
-#: gramps.glade:5595 gramps.glade:16128 gramps.glade:23593
+#: gramps.glade:5906 gramps.glade:17359 gramps.glade:25430
 msgid "References"
 msgstr "Viitteet"
 
-#: gramps.glade:5742
+#: gramps.glade:6062
 msgid "Open an _existing database"
 msgstr "Avaa _olemassaoleva tietokanta"
 
-#: gramps.glade:5762
+#: gramps.glade:6082
 msgid "Create a _new database"
 msgstr "Luo _uusi tietokanta"
 
-#: gramps.glade:5957
+#: gramps.glade:6290
 msgid "_Relationship:"
 msgstr "_Suhde:"
 
-#: gramps.glade:6005
+#: gramps.glade:6346
 msgid "Relation_ship:"
 msgstr "_suhde:"
 
-#: gramps.glade:6056
+#: gramps.glade:6405
 msgid "Father"
 msgstr "Isä"
 
-#: gramps.glade:6080
+#: gramps.glade:6433
 msgid "Mother"
 msgstr "Äiti"
 
-#: gramps.glade:6103
+#: gramps.glade:6460
 msgid "Preference"
 msgstr "Asetus"
 
-#: gramps.glade:6126
+#: gramps.glade:6487
 msgid "Indicates that the parents should be used as the preferred parents for reporting and display purposes"
 msgstr "Osoittaa, että vanhempia pitäisi käyttää ensisijaisina vanhempina raportoinnissa ja tietojen näytössä"
 
-#: gramps.glade:6128
+#: gramps.glade:6489
 msgid "Use as preferred parents"
 msgstr "Käytä ensisijaisina vanhempina"
 
-#: gramps.glade:6328
+#: gramps.glade:6698
 msgid "_Text:"
 msgstr "_Teksti:"
 
-#: gramps.glade:6487
+#: gramps.glade:6865
 msgid "Select columns"
 msgstr "Valitse sarakkeet"
 
-#: gramps.glade:6659 gramps.glade:28552
+#: gramps.glade:7046 gramps.glade:30667
 msgid "_Given name:"
 msgstr "_Etunimi:"
 
-#: gramps.glade:6684 gramps.glade:28826
+#: gramps.glade:7075 gramps.glade:30965
 msgid "_Family name:"
 msgstr "_Sukunimi:"
 
-#: gramps.glade:6709
+#: gramps.glade:7104
 msgid "Famil_y prefix:"
 msgstr "Sukunimen _etuliite:"
 
-#: gramps.glade:6734
+#: gramps.glade:7133
 msgid "S_uffix:"
 msgstr "P_ääte:"
 
-#: gramps.glade:6784
+#: gramps.glade:7191
 msgid "Nic_kname:"
 msgstr "_Lempinimi:"
 
-#: gramps.glade:6809 gramps.glade:28608
+#: gramps.glade:7220 gramps.glade:30731
 msgid "T_ype:"
 msgstr "T_yyppi:"
 
-#: gramps.glade:6833
+#: gramps.glade:7248
 msgid "An optional suffix to the name, such as \"Jr.\" or \"III\""
 msgstr "Valinnainen pääte nimelle, kuten \"Jr.\" tai \"III\""
 
-#: gramps.glade:6855
+#: gramps.glade:7270
 msgid "A title used to refer to the person, such as \"Dr.\" or \"Rev.\""
 msgstr "Henkilöstä käytetty titteli, kuten \"Fil. Toht.\""
 
-#: gramps.glade:6877
+#: gramps.glade:7292
 msgid "A name that the person was more commonly known by"
 msgstr "Nimi, jolla henkilö paremmin tunnettiin"
 
-#: gramps.glade:6899
+#: gramps.glade:7314
 msgid "Preferred name"
 msgstr "Ensisijainen nimi"
 
-#: gramps.glade:6930
+#: gramps.glade:7349
 msgid "_male"
 msgstr "_mies"
 
-#: gramps.glade:6950
+#: gramps.glade:7369
 msgid "fema_le"
 msgstr "_nainen"
 
-#: gramps.glade:6971
+#: gramps.glade:7390
 msgid "u_nknown"
 msgstr "_tuntematon"
 
-#: gramps.glade:7001
+#: gramps.glade:7420
 msgid "Birth"
 msgstr "Syntymä"
 
-#: gramps.glade:7025
+#: gramps.glade:7448
 msgid "GRAMPS _ID:"
 msgstr "_GRAMPS tunnus:"
 
-#: gramps.glade:7071
+#: gramps.glade:7498
 msgid "Death"
 msgstr "Kuolema"
 
-#: gramps.glade:7109
+#: gramps.glade:7543
 msgid "An optional prefix for the family name that is not used in sorting, such as \"de\" or \"van\""
 msgstr "Valinnainen etuliite sukunimelle, jota ei käytetä lajittelussa, kuten \"de\" tai \"van\""
 
-#: gramps.glade:7131
+#: gramps.glade:7565
 msgid "The person's given name"
 msgstr "Henkilön etunimi"
 
-#: gramps.glade:7176
+#: gramps.glade:7610
 msgid "Edit the preferred name"
 msgstr "Muokkaa ensisijaista nimeä"
 
-#: gramps.glade:7206
+#: gramps.glade:7640
 msgid "Gender"
 msgstr "Sukupuoli"
 
-#: gramps.glade:7229
+#: gramps.glade:7667
 msgid "Identification"
 msgstr "Tunniste"
 
-#: gramps.glade:7277
+#: gramps.glade:7719
 msgid "Image"
 msgstr "Kuva"
 
-#: gramps.glade:7308 gramps.glade:12091
+#: gramps.glade:7754 gramps.glade:12980
 msgid "Information i_s complete"
 msgstr "Tiedoissa e_i ole puutteita"
 
-#: gramps.glade:7330
+#: gramps.glade:7776
 msgid "Information is pri_vate"
 msgstr "Tiedot ovat _yksityisiä"
 
-#: gramps.glade:7360 gramps.glade:11012 gramps.glade:18007 gramps.glade:22978
-#: gramps.glade:25147 gramps.glade:27388
+#: gramps.glade:7806 gramps.glade:11812 gramps.glade:19397 gramps.glade:24769
+#: gramps.glade:27075 gramps.glade:29438
 msgid "_Date:"
 msgstr "_Päivämäärä:"
 
-#: gramps.glade:7384 gramps.glade:11084 gramps.glade:25203
+#: gramps.glade:7834 gramps.glade:11892 gramps.glade:27139
 msgid "_Place:"
 msgstr "P_aikka:"
 
-#: gramps.glade:7431
+#: gramps.glade:7885
 msgid "Invoke birth event editor"
 msgstr "Avaa syntymä-editori"
 
-#: gramps.glade:7486 gramps.glade:7589 gramps.glade:11628 gramps.glade:11688
-#: gramps.glade:11748 gramps.glade:13846 gramps.glade:18436 gramps.glade:23027
-#: gramps.glade:29116
+#: gramps.glade:7940 gramps.glade:8047 gramps.glade:12490 gramps.glade:12550
+#: gramps.glade:12610 gramps.glade:14899 gramps.glade:19866 gramps.glade:24822
+#: gramps.glade:31293
 msgid "Invoke date editor"
 msgstr "Avaa päivämäärä-editori"
 
-#: gramps.glade:7539 gramps.glade:11177
+#: gramps.glade:7993 gramps.glade:11993
 msgid "D_ate:"
 msgstr "P_äivämäärä:"
 
-#: gramps.glade:7625
+#: gramps.glade:8083
 msgid "Invoke death event editor"
 msgstr "Avaa kuolema-editori"
 
-#: gramps.glade:7655
+#: gramps.glade:8113
 msgid "Plac_e:"
 msgstr "P_aikka:"
 
-#: gramps.glade:7798 gramps.glade:8608 gramps.glade:9122 gramps.glade:9558
-#: gramps.glade:12304 gramps.glade:12751
+#: gramps.glade:8268 gramps.glade:9185 gramps.glade:9758 gramps.glade:10241
+#: gramps.glade:13221 gramps.glade:13719
 msgid "Confidence:"
 msgstr "Luottamus:"
 
-#: gramps.glade:7822
+#: gramps.glade:8296
 msgid "Family prefix:"
 msgstr "Sukunimen etuliite:"
 
-#: gramps.glade:7966
+#: gramps.glade:8464
 msgid "Alternate name"
 msgstr "Vaihtoehtoinen nimi"
 
-#: gramps.glade:7990 gramps.glade:8560 gramps.glade:9074 gramps.glade:9654
-#: gramps.glade:12375 gramps.glade:12823
+#: gramps.glade:8492 gramps.glade:9129 gramps.glade:9702 gramps.glade:10353
+#: gramps.glade:13304 gramps.glade:13803
 msgid "Primary source"
 msgstr "Ensisijainen lähde"
 
-#: gramps.glade:8266
+#: gramps.glade:8807
 msgid "Create an alternate name for this person"
 msgstr "Luo vaihtoehtoinen nimi tälle henkilölle"
 
-#: gramps.glade:8295
+#: gramps.glade:8836
 msgid "Edit the selected name"
 msgstr "Muokkaa valittua nimeä"
 
-#: gramps.glade:8323
+#: gramps.glade:8864
 msgid "Delete the selected name"
 msgstr "Poista valittu nimi"
 
-#: gramps.glade:8375
+#: gramps.glade:8916
 msgid "Names"
 msgstr "Nimet"
 
-#: gramps.glade:8416
+#: gramps.glade:8961
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: gramps.glade:8464 gramps.glade:12232
+#: gramps.glade:9017 gramps.glade:13137
 msgid "Cause:"
 msgstr "Syy:"
 
-#: gramps.glade:8845
+#: gramps.glade:9457
 msgid "Create a new event"
 msgstr "Luo uusi tapahtuma"
 
-#: gramps.glade:8874
+#: gramps.glade:9486
 msgid "Edit the selected event"
 msgstr "Muokkaa valittua tapahtumaa"
 
-#: gramps.glade:8902
+#: gramps.glade:9514
 msgid "Delete the selected event"
 msgstr "Poista valittu tapahtuma"
 
-#: gramps.glade:9002 gramps.glade:12847 gramps.glade:22174 gramps.glade:23205
+#: gramps.glade:9618 gramps.glade:13831 gramps.glade:23910 gramps.glade:25020
 msgid "Attributes"
 msgstr "Ominaisuudet"
 
-#: gramps.glade:9287
+#: gramps.glade:9946
 msgid "Create a new attribute"
 msgstr "Luo uusi ominaisuus"
 
-#: gramps.glade:9316
+#: gramps.glade:9975
 msgid "Edit the selected attribute"
 msgstr "Muokkaa valittua ominaisuutta"
 
-#: gramps.glade:9344 gramps.glade:13065 gramps.glade:22299 gramps.glade:23329
+#: gramps.glade:10003 gramps.glade:14072 gramps.glade:24042 gramps.glade:25151
 msgid "Delete the selected attribute"
 msgstr "Poista valittu ominaisuus"
 
-#: gramps.glade:9403 gramps.glade:13117 gramps.glade:22364 gramps.glade:23395
+#: gramps.glade:10062 gramps.glade:14124 gramps.glade:24107 gramps.glade:25217
 msgid "Attributes"
 msgstr "Ominaisuudet"
 
-#: gramps.glade:9438
+#: gramps.glade:10101
 msgid "City/County:"
 msgstr "Kaupunki/kunta:"
 
-#: gramps.glade:9630
+#: gramps.glade:10325
 msgid "Addresses"
 msgstr "Osoitteet"
 
-#: gramps.glade:9995
+#: gramps.glade:10741
 msgid "Create a new address"
 msgstr "Luo uusi osoite"
 
-#: gramps.glade:10024
+#: gramps.glade:10770
 msgid "Edit the selected address"
 msgstr "Muokkaa valittua osoitetta"
 
-#: gramps.glade:10052
+#: gramps.glade:10798
 msgid "Delete the selected address"
 msgstr "Poista valittu osoite"
 
-#: gramps.glade:10145
+#: gramps.glade:10895
 msgid "Enter miscellaneous relevant data and documentation"
 msgstr "Anna muut relevantit tiedot ja dokumentaatiot"
 
-#: gramps.glade:10268 gramps.glade:13271 gramps.glade:21989 gramps.glade:23549
+#: gramps.glade:11022 gramps.glade:14286 gramps.glade:23701 gramps.glade:25379
 #: plugins/IndivComplete.py:166 plugins/WebPage.py:567
 msgid "Notes"
 msgstr "Huomioita"
 
-#: gramps.glade:10326
+#: gramps.glade:11087
 msgid "Add a source"
 msgstr "Lisää lähde"
 
-#: gramps.glade:10353
+#: gramps.glade:11114
 msgid "Edit the selected source"
 msgstr "Muokkaa valittua lähdettä"
 
-#: gramps.glade:10379
+#: gramps.glade:11140
 msgid "Remove the selected source"
 msgstr "Poista valittu lähde"
 
-#: gramps.glade:10423 gramps.glade:13423 gramps.glade:15520 gramps.glade:22542
-#: gramps.glade:23771 gramps.glade:25590 gramps.glade:26594 gramps.glade:27962
-#: gramps.glade:29392 plugins/Ancestors.py:159 plugins/IndivComplete.py:324
+#: gramps.glade:11184 gramps.glade:14445 gramps.glade:16716 gramps.glade:24292
+#: gramps.glade:25615 gramps.glade:27544 gramps.glade:28594 gramps.glade:30047
+#: gramps.glade:31576 plugins/Ancestors.py:159 plugins/IndivComplete.py:324
 #: plugins/ScratchPad.py:153 plugins/ScratchPad.py:293
 #: plugins/ScratchPad.py:326 plugins/WebPage.py:224
 msgid "Sources"
 msgstr "Lähteet"
 
-#: gramps.glade:10573
+#: gramps.glade:11338
 msgid "Remove the selected object from this gallery only"
-msgstr "Poista valittu objekti vain tästä galleriasta"
+msgstr "Poista valittu tiedosto vain tästä galleriasta"
 
-#: gramps.glade:10656 gramps.glade:15766
+#: gramps.glade:11425 gramps.glade:16970
 msgid "Web address:"
 msgstr "WWW-osoite:"
 
-#: gramps.glade:10751 gramps.glade:15861
+#: gramps.glade:11536 gramps.glade:17081
 msgid "Internet addresses"
 msgstr "Internet osoitteet"
 
-#: gramps.glade:10822
+#: gramps.glade:11614
 msgid "Add an internet reference about this person"
 msgstr "Lisää henkilöön liittyvä internet-viite"
 
-#: gramps.glade:10851
+#: gramps.glade:11643
 msgid "Edit the selected internet address"
 msgstr "Muokkaa valittua internet-osoitetta"
 
-#: gramps.glade:10878
+#: gramps.glade:11670
 msgid "Go to this web page"
 msgstr "Siirry tälle WWW-sivulle"
 
-#: gramps.glade:10907
+#: gramps.glade:11699
 msgid "Delete selected reference"
 msgstr "Poista valittu viite"
 
-#: gramps.glade:10959 gramps.glade:16075
+#: gramps.glade:11751 gramps.glade:17302
 msgid "Internet"
 msgstr "Internet"
 
-#: gramps.glade:10988
+#: gramps.glade:11784
 msgid "LDS baptism"
 msgstr "Mormonikaste"
 
-#: gramps.glade:11037
+#: gramps.glade:11841
 msgid "LDS _temple:"
 msgstr "Mormoni_temppeli:"
 
-#: gramps.glade:11065 gramps.glade:11279 gramps.glade:11368 gramps.glade:13740
+#: gramps.glade:11873 gramps.glade:12107 gramps.glade:12204 gramps.glade:14786
 msgid "Sources..."
 msgstr "Lähteet..."
 
-#: gramps.glade:11134 gramps.glade:11299 gramps.glade:11437 gramps.glade:13760
+#: gramps.glade:11946 gramps.glade:12127 gramps.glade:12277 gramps.glade:14806
 msgid "Note..."
 msgstr "Huomioita..."
 
-#: gramps.glade:11153
+#: gramps.glade:11965
 msgid "Endowment"
 msgstr "Lahjoitus"
 
-#: gramps.glade:11205
+#: gramps.glade:12025
 msgid "LDS te_mple:"
 msgstr "Mormonite_mppeli:"
 
-#: gramps.glade:11229 gramps.glade:17568
+#: gramps.glade:12053 gramps.glade:18925
 msgid "P_lace:"
 msgstr "P_aikka:"
 
-#: gramps.glade:11318 gramps.glade:29067
+#: gramps.glade:12146 gramps.glade:31240
 msgid "Dat_e:"
 msgstr "P_äivämäärä:"
 
-#: gramps.glade:11343
+#: gramps.glade:12175
 msgid "LD_S temple:"
 msgstr "Mormo_nitemppeli:"
 
-#: gramps.glade:11387
+#: gramps.glade:12223
 msgid "Pla_ce:"
 msgstr "P_aikka:"
 
-#: gramps.glade:11456
+#: gramps.glade:12296
 msgid "Pa_rents:"
 msgstr "_Vanhemmat:"
 
-#: gramps.glade:11481
+#: gramps.glade:12325
 msgid "Sealed to parents"
 msgstr "Liitetty vanhempiinsa"
 
-#: gramps.glade:11788 gramps.glade:13894
+#: gramps.glade:12650 gramps.glade:14947
 msgid "LDS"
 msgstr "MAP"
 
-#: gramps.glade:11978
+#: gramps.glade:12853
 msgid "_GRAMPS ID:"
 msgstr "_GRAMPS tunnus:"
 
-#: gramps.glade:12042 gramps.glade:14569
+#: gramps.glade:12923 gramps.glade:15675
 msgid "Last Changed:"
 msgstr "Viimeksi muutettu:"
 
-#: gramps.glade:12351
+#: gramps.glade:13276
 msgid "Events"
 msgstr "Tapahtuma"
 
-#: gramps.glade:12586
+#: gramps.glade:13546
 msgid "Add new event for this marriage"
 msgstr "Lisää uusi tapahtuma tälle avioliitolle"
 
-#: gramps.glade:12640
+#: gramps.glade:13600
 msgid "Delete selected event"
 msgstr "Poista valittu tapahtuma"
 
-#: gramps.glade:13011
+#: gramps.glade:14018
 msgid "Create a new attribute for this marriage"
 msgstr "Luo uusi ominaisuus tälle avioliitolle"
 
-#: gramps.glade:13540
+#: gramps.glade:14566
 msgid "Edit the properties of the selected objects"
 msgstr "Muokkaa valittujen objektien ominaisuuksia"
 
-#: gramps.glade:13643
+#: gramps.glade:14673
 msgid "Sealed to spouse"
 msgstr "Liitetty puolisoon"
 
-#: gramps.glade:13691
+#: gramps.glade:14729
 msgid "Temple:"
 msgstr "Temppeli:"
 
-#: gramps.glade:14087
+#: gramps.glade:15153
 msgid "C_ity:"
 msgstr "_Kaupunki:"
 
-#: gramps.glade:14115 gramps.glade:26987
+#: gramps.glade:15185 gramps.glade:29016
 msgid "_State:"
 msgstr "_Osavaltio:"
 
-#: gramps.glade:14143 gramps.glade:26930
-msgid "C_ounty:"
+#: gramps.glade:15217
+msgid "Co_unty:"
 msgstr "K_unta:"
 
-#: gramps.glade:14171
-msgid "Co_untry:"
+#: gramps.glade:15249
+msgid "Count_ry:"
 msgstr "_Maa:"
 
-#: gramps.glade:14199
+#: gramps.glade:15281
 msgid "_Longitude:"
 msgstr "_Pituusaste:"
 
-#: gramps.glade:14227
+#: gramps.glade:15313
 msgid "L_atitude:"
 msgstr "_Leveysaste:"
 
-#: gramps.glade:14255 gramps.glade:27016
+#: gramps.glade:15345 gramps.glade:29049
 msgid "Church _parish:"
 msgstr "_Seurakunta:"
 
-#: gramps.glade:14477 gramps.glade:17203 gramps.glade:27528
+#: gramps.glade:15575 gramps.glade:18532 gramps.glade:29598
 msgid "_ZIP/Postal code:"
-msgstr "Po_stinumero:"
+msgstr "Pos_tinumero:"
 
-#: gramps.glade:14523 gramps.glade:27150 gramps.glade:27705
-msgid "P_hone:"
+#: gramps.glade:15625
+msgid "Phon_e:"
 msgstr "Pu_helin:"
 
-#: gramps.glade:14658
+#: gramps.glade:15776
 msgid "County:"
 msgstr "Kunta:"
 
-#: gramps.glade:14706
+#: gramps.glade:15832
 msgid "State:"
 msgstr "Osavaltio:"
 
-#: gramps.glade:14754
+#: gramps.glade:15888
 msgid "Church parish:"
 msgstr "Seurakunta:"
 
-#: gramps.glade:14855
+#: gramps.glade:16005
 msgid "Zip/Postal code:"
 msgstr "Postinumero:"
 
-#: gramps.glade:14927
+#: gramps.glade:16089
 msgid "Other names"
 msgstr "Muut nimet"
 
-#: gramps.glade:15188
+#: gramps.glade:16369
 msgid "Other names"
 msgstr "Muut nimet"
 
-#: gramps.glade:16162
+#: gramps.glade:17397
 msgid "GRAMPS Preferences"
 msgstr "GRAMPS asetukset"
 
-#: gramps.glade:16234
+#: gramps.glade:17470
 msgid "Categories:"
 msgstr "Kategoriat:"
 
-#: gramps.glade:16349
+#: gramps.glade:17592
 msgid "To change your preferences, select one of the subcategories in the menu on the left hand side of the window."
 msgstr "Vaihtaaksesi asetuksiasi, valitse jokin vasemmanpuoleisen valikon alakategorioista."
 
-#: gramps.glade:16413
+#: gramps.glade:17664
 msgid "Database"
 msgstr "Tietokanta"
 
-#: gramps.glade:16438
+#: gramps.glade:17693
 msgid "_Automatically load last database"
 msgstr "_Lataa automaattisesti viimeisin tietokanta"
 
-#: gramps.glade:16459
+#: gramps.glade:17714
 msgid "Family name guessing"
 msgstr "Oletussukunimi"
 
-#: gramps.glade:16546
+#: gramps.glade:17811
 msgid "Toolbar"
 msgstr "Työkalupalkki"
 
-#: gramps.glade:16571
+#: gramps.glade:17840
 msgid "Active person's _relationship to Home Person"
 msgstr "_Näytä henkilön suhde \"koti\"-henkilöön"
 
-#: gramps.glade:16594
+#: gramps.glade:17863
 msgid "Active person's name and _GRAMPS ID"
 msgstr "Näytä henkilön nimi ja _GRAMPS tunnus"
 
-#: gramps.glade:16616
+#: gramps.glade:17885
 msgid "Statusbar"
 msgstr "Tilapalkki"
 
-#: gramps.glade:16644
+#: gramps.glade:17917
 msgid ""
 "GNOME settings\n"
 "Icons Only\n"
@@ -5389,171 +5457,171 @@ msgstr ""
 "Teksti ikonien alla\n"
 "Teksti ikonien vieressä"
 
-#: gramps.glade:16709
+#: gramps.glade:17988
 msgid "_Always display the LDS ordinance tabs"
 msgstr ""
 "_Näytä aina välilehti MAP-temppelitoimituksille\n"
 "(MAP = Myöhempien Aikojen Pyhien Jeesuksen Kristuksen Kirkko)"
 
-#: gramps.glade:16731
+#: gramps.glade:18010
 msgid "Display"
 msgstr "Näyttö"
 
-#: gramps.glade:16755
+#: gramps.glade:18038
 msgid "Default view"
 msgstr "Oletusnäkymä"
 
-#: gramps.glade:16780
+#: gramps.glade:18067
 msgid "_Person view"
 msgstr "_Henkilönäkymä"
 
-#: gramps.glade:16803
+#: gramps.glade:18090
 msgid "_Family view"
 msgstr "Perhenäkymä"
 
-#: gramps.glade:16825
+#: gramps.glade:18112
 msgid "Family view style"
 msgstr "Perhenäkymätyyli"
 
-#: gramps.glade:16850
+#: gramps.glade:18141
 msgid "Left to right"
 msgstr "Vasemmalta oikealle"
 
-#: gramps.glade:16873
+#: gramps.glade:18164
 msgid "Top to bottom"
 msgstr "Ylhäältä alas"
 
-#: gramps.glade:16898
+#: gramps.glade:18189
 msgid "_Display Tip of the Day"
 msgstr "_Näytä päivän vihje"
 
-#: gramps.glade:16967
+#: gramps.glade:18262
 msgid "_Date format:"
 msgstr "_Päivämäärän muoto:"
 
-#: gramps.glade:16992
+#: gramps.glade:18291
 msgid "Display formats"
 msgstr "Näyttömuodot"
 
-#: gramps.glade:17078 rule.glade:397
+#: gramps.glade:18387 rule.glade:397
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: gramps.glade:17103
+#: gramps.glade:18416
 msgid "_Address:"
 msgstr "_Osoite:"
 
-#: gramps.glade:17128 gramps.glade:26902
+#: gramps.glade:18445 gramps.glade:28919
 msgid "_City:"
 msgstr "_Kaupunki:"
 
-#: gramps.glade:17153 gramps.glade:27472
+#: gramps.glade:18474 gramps.glade:29534
 msgid "_State/Province:"
 msgstr "Maa_kunta:"
 
-#: gramps.glade:17178
+#: gramps.glade:18503
 msgid "_Country:"
 msgstr "_Maa:"
 
-#: gramps.glade:17228
+#: gramps.glade:18561
 msgid "_Phone:"
 msgstr "_Puhelin:"
 
-#: gramps.glade:17253
+#: gramps.glade:18590
 msgid "_Email:"
 msgstr "S_ähköposti:"
 
-#: gramps.glade:17446
+#: gramps.glade:18787
 msgid "Researcher information"
 msgstr "Tutkijan tiedot"
 
-#: gramps.glade:17518 gramps.glade:29700
+#: gramps.glade:18867 gramps.glade:31901
 msgid "_Person:"
 msgstr "_Henkilö:"
 
-#: gramps.glade:17543
+#: gramps.glade:18896
 msgid "_Family:"
 msgstr "_Perhe:"
 
-#: gramps.glade:17593
+#: gramps.glade:18954
 msgid "_Source:"
 msgstr "_Lähde:"
 
-#: gramps.glade:17618
+#: gramps.glade:18983
 msgid "_Media object:"
-msgstr "_Media-objekti:"
+msgstr "_Mediatiedosto:"
 
-#: gramps.glade:17647
+#: gramps.glade:19016
 msgid "I"
 msgstr "I"
 
-#: gramps.glade:17668
+#: gramps.glade:19037
 msgid "F"
 msgstr "F"
 
-#: gramps.glade:17689
+#: gramps.glade:19058
 msgid "P"
 msgstr "P"
 
-#: gramps.glade:17710
+#: gramps.glade:19079
 msgid "S"
 msgstr "S"
 
-#: gramps.glade:17731
+#: gramps.glade:19100
 msgid "O"
 msgstr "P"
 
-#: gramps.glade:17748
+#: gramps.glade:19117
 msgid "GRAMPS ID prefixes"
 msgstr "GRAMPS tunnusten etuliitteet"
 
-#: gramps.glade:17957
+#: gramps.glade:19339
 msgid "_Confidence:"
 msgstr "_Luottamus:"
 
-#: gramps.glade:17982
+#: gramps.glade:19368
 msgid "_Volume/Film/Page:"
 msgstr "_Osa/filmi/sivu:"
 
-#: gramps.glade:18035
+#: gramps.glade:19429
 msgid "Te_xt:"
 msgstr "_Teksti:"
 
-#: gramps.glade:18062
+#: gramps.glade:19460
 msgid "Co_mments:"
 msgstr "_Kommentit:"
 
-#: gramps.glade:18089
+#: gramps.glade:19491
 msgid "Publication information:"
 msgstr "Julkaisutiedot:"
 
-#: gramps.glade:18113 mergedata.glade:919 mergedata.glade:941
+#: gramps.glade:19519 mergedata.glade:919 mergedata.glade:941
 #: plugins.glade:362
 msgid "Author:"
 msgstr "Tekijä:"
 
-#: gramps.glade:18209
+#: gramps.glade:19631
 msgid "Source selection"
 msgstr "Lähteen valinta"
 
-#: gramps.glade:18233
+#: gramps.glade:19659
 msgid "Source details"
 msgstr "Lähteen yksityiskohdat"
 
-#: gramps.glade:18372
+#: gramps.glade:19802
 msgid "Creates a new source"
 msgstr "Luo uusi lähde"
 
-#: gramps.glade:18374
+#: gramps.glade:19804
 msgid "_New..."
 msgstr "_Uusi..."
 
-#: gramps.glade:18394 gramps.glade:21784 gramps.glade:25344 gramps.glade:26354
-#: gramps.glade:27557 gramps.glade:28334 gramps.glade:29869
+#: gramps.glade:19824 gramps.glade:23484 gramps.glade:27288 gramps.glade:28344
+#: gramps.glade:29631 gramps.glade:30444 gramps.glade:32078
 msgid "_Private record"
 msgstr "_Yksityinen tietue"
 
-#: gramps.glade:18469
+#: gramps.glade:19899
 msgid ""
 "Very Low\n"
 "Low\n"
@@ -5567,299 +5635,307 @@ msgstr ""
 "Korkea\n"
 "Hyvin korkea"
 
-#: gramps.glade:18644
+#: gramps.glade:20083
 msgid "Double click will edit the selected source"
 msgstr "Tuplaklikkaus muokkaa valittua lähdettä"
 
-#: gramps.glade:19700
+#: gramps.glade:21219
 msgid "Style _name:"
 msgstr "Tyylin _nimi:"
 
-#: gramps.glade:19858 rule.glade:1144
+#: gramps.glade:21392 rule.glade:1144
 msgid "Description"
 msgstr "Kuvaus"
 
-#: gramps.glade:19887
+#: gramps.glade:21425
 msgid "pt"
 msgstr "pt"
 
-#: gramps.glade:19914 gramps.glade:20222
+#: gramps.glade:21456 gramps.glade:21788
 msgid "Pick a color"
 msgstr "Valitse väri"
 
-#: gramps.glade:19953
+#: gramps.glade:21495
 msgid "_Bold"
 msgstr "_Lihavoitu"
 
-#: gramps.glade:19975
+#: gramps.glade:21517
 msgid "_Italic"
 msgstr "_Kursiivi"
 
-#: gramps.glade:19997
+#: gramps.glade:21539
 msgid "_Underline"
 msgstr "_Alleviivattu"
 
-#: gramps.glade:20018
+#: gramps.glade:21560
 msgid "Type face"
 msgstr "Kirjasintyyli"
 
-#: gramps.glade:20042
+#: gramps.glade:21588
 msgid "Size"
 msgstr "Koko"
 
-#: gramps.glade:20066
+#: gramps.glade:21616
 msgid "Color"
 msgstr "Väri"
 
-#: gramps.glade:20140
+#: gramps.glade:21702
 msgid "_Roman (Times, serif)"
 msgstr "_Roman (Times, serif)"
 
-#: gramps.glade:20162
+#: gramps.glade:21724
 msgid "_Swiss (Arial, Helvetica, sans-serif)"
 msgstr "_Swiss (Arial, Helvetica, sans-serif)"
 
-#: gramps.glade:20190
+#: gramps.glade:21752
 msgid "Font options"
 msgstr "Kirjasinasetukset"
 
-#: gramps.glade:20238
+#: gramps.glade:21804
 msgid "R_ight:"
 msgstr "O_ikea:"
 
-#: gramps.glade:20266
+#: gramps.glade:21836
 msgid "L_eft:"
 msgstr "V_asen:"
 
-#: gramps.glade:20294
+#: gramps.glade:21868
 msgid "_Padding:"
 msgstr "T_äyte:"
 
-#: gramps.glade:20458
+#: gramps.glade:22048
 msgid "_Left"
 msgstr "_Vasen"
 
-#: gramps.glade:20480
+#: gramps.glade:22070
 msgid "_Right"
 msgstr "_Oikea"
 
-#: gramps.glade:20503
+#: gramps.glade:22093
 msgid "_Justify"
 msgstr "_Tasaa"
 
-#: gramps.glade:20526
+#: gramps.glade:22116
 msgid "_Center"
 msgstr "_Keskitä"
 
-#: gramps.glade:20548
+#: gramps.glade:22138
 msgid "Background"
 msgstr "Tausta"
 
-#: gramps.glade:20572
+#: gramps.glade:22166
 msgid "Margins"
 msgstr "Marginaalit"
 
-#: gramps.glade:20621
+#: gramps.glade:22223
 msgid "Alignment"
 msgstr "Asemointi"
 
-#: gramps.glade:20645
+#: gramps.glade:22251
 msgid "Borders"
 msgstr "Reunukset"
 
-#: gramps.glade:20670
+#: gramps.glade:22280
 msgid "Le_ft"
 msgstr "Va_sen"
 
-#: gramps.glade:20692
+#: gramps.glade:22302
 msgid "Ri_ght"
 msgstr "Oi_kea"
 
-#: gramps.glade:20714
+#: gramps.glade:22324
 msgid "_Top"
 msgstr "_Ylä"
 
-#: gramps.glade:20736
+#: gramps.glade:22346
 msgid "_Bottom"
 msgstr "A_la"
 
-#: gramps.glade:20757
+#: gramps.glade:22367
 msgid "First line"
 msgstr "Ensimmäinen rivi"
 
-#: gramps.glade:20826
+#: gramps.glade:22444
 msgid "I_ndent:"
 msgstr "S_isennys:"
 
-#: gramps.glade:20857
+#: gramps.glade:22479
 msgid "Paragraph options"
 msgstr "Kappaleasetukset"
 
-#: gramps.glade:21143
+#: gramps.glade:22782
 msgid "Internal note"
 msgstr "Sisäinen huomio"
 
-#: gramps.glade:21399 gramps.glade:22796
+#: gramps.glade:23055 gramps.glade:24567
 msgid "Object type:"
 msgstr "Objektin tyyppi:"
 
-#: gramps.glade:21579
+#: gramps.glade:23259
 msgid "Lower X:"
 msgstr "Ala-X:"
 
-#: gramps.glade:21603
+#: gramps.glade:23287
 msgid "Upper X:"
 msgstr "Ylä-X:"
 
-#: gramps.glade:21627
+#: gramps.glade:23315
 msgid "Upper Y:"
 msgstr "Ylä-Y:"
 
-#: gramps.glade:21651
+#: gramps.glade:23343
 msgid "Lower Y:"
 msgstr "Ala-Y:"
 
-#: gramps.glade:21759
+#: gramps.glade:23455
 msgid "Subsection"
 msgstr "Alaosio"
 
-#: gramps.glade:21805
+#: gramps.glade:23505
 msgid "Privacy"
 msgstr "Yksityisyys"
 
-#: gramps.glade:22044
+#: gramps.glade:23760
 msgid "Global Notes"
 msgstr "Yleiset huomiot"
 
-#: gramps.glade:22245
+#: gramps.glade:23988
 msgid "Creates a new object attribute from the above data"
 msgstr "Luo uuden objektin ominaisuuden ylläolevasta tiedosta"
 
-#: gramps.glade:23275
+#: gramps.glade:25097
 msgid "Creates a new attribute from the above data"
 msgstr "Luo uuden ominaisuuden ylläolevasta tiedosta"
 
-#: gramps.glade:23969
+#: gramps.glade:25827
 msgid "Close _without saving"
 msgstr "Sulje tallentamatta"
 
-#: gramps.glade:24095
+#: gramps.glade:25961
 msgid "Do not ask again"
 msgstr "Älä kysy uudelleen"
 
-#: gramps.glade:24713
+#: gramps.glade:26616
 msgid "Remove object and all references to it from the database"
 msgstr "Poista objekti ja kaikki sen viitteet tietokannasta"
 
-#: gramps.glade:24758
+#: gramps.glade:26661
 msgid "_Remove Object"
 msgstr "P_oista objekti"
 
-#: gramps.glade:24785
+#: gramps.glade:26692
 msgid "Keep reference to the missing file"
 msgstr "Pidä viite puuttuvaan tiedostoon"
 
-#: gramps.glade:24788
+#: gramps.glade:26695
 msgid "_Keep Reference"
 msgstr "P_idä viite"
 
-#: gramps.glade:24799
+#: gramps.glade:26706
 msgid "Select replacement for the missing file"
 msgstr "Valitse korvaava tiedosto"
 
-#: gramps.glade:24846
+#: gramps.glade:26753
 msgid "_Select File"
 msgstr "_Valitse tiedosto"
 
-#: gramps.glade:24959
+#: gramps.glade:26878
 msgid "If you check this button, all the missing media files will be automatically treated according to the currently selected option. No further dialogs will be presented for any missing medial files."
 msgstr "Valitsemalla tämän, kaikkia puuttuvia media tiedostoja käsitellään sillä hetkellä voimassa olevien asetusten mukaisesti, eikä minkään puuttuvan media tiedoston kohdalla enää näytetä dialogeja."
 
-#: gramps.glade:24961
+#: gramps.glade:26880
 msgid "_Use this selection for all missing media files"
 msgstr "_Käytä tätä valintaa kaikille puuttuville media tiedostoille"
 
-#: gramps.glade:25022
+#: gramps.glade:26942
 msgid "Close window without changes"
 msgstr "Sulje ikkuna ilman muutoksia"
 
-#: gramps.glade:25123
+#: gramps.glade:27047
 msgid "_Event type:"
 msgstr "_Tapahtumatyyppi:"
 
-#: gramps.glade:25175
+#: gramps.glade:27107
 msgid "De_scription:"
 msgstr "_Kuvaus:"
 
-#: gramps.glade:25231
+#: gramps.glade:27171
 msgid "_Cause:"
 msgstr "_Syy:"
 
-#: gramps.glade:26301
+#: gramps.glade:28283
 msgid "_Attribute:"
 msgstr "_Ominaisuus:"
 
-#: gramps.glade:26325
+#: gramps.glade:28311
 msgid "_Value:"
 msgstr "_Arvo:"
 
-#: gramps.glade:26958 gramps.glade:27500
+#: gramps.glade:28951
+msgid "C_ounty:"
+msgstr "K_unta:"
+
+#: gramps.glade:28983 gramps.glade:29566
 msgid "Cou_ntry:"
 msgstr "_Maa:"
 
-#: gramps.glade:27196
+#: gramps.glade:29187 gramps.glade:29779
+msgid "P_hone:"
+msgstr "Pu_helin:"
+
+#: gramps.glade:29237
 msgid "_Zip/Postal code:"
 msgstr "Po_stinumero:"
 
-#: gramps.glade:27416
+#: gramps.glade:29470
 msgid "Add_ress:"
 msgstr "Oso_ite:"
 
-#: gramps.glade:27444
+#: gramps.glade:29502
 msgid "_City/County:"
 msgstr "_Kaupunki/kunta:"
 
-#: gramps.glade:28271
+#: gramps.glade:30373
 msgid "_Web address:"
 msgstr "_WWW-osoite:"
 
-#: gramps.glade:28299
+#: gramps.glade:30405
 msgid "_Description:"
 msgstr "_Kuvaus:"
 
-#: gramps.glade:28580
+#: gramps.glade:30699
 msgid "Suffi_x:"
 msgstr "_Pääte:"
 
-#: gramps.glade:28664
+#: gramps.glade:30795
 msgid "P_rivate record"
 msgstr "_Yksityinen tietue"
 
-#: gramps.glade:28685
+#: gramps.glade:30816
 msgid "Family _prefix:"
 msgstr "Perheen et_uliite:"
 
-#: gramps.glade:28798
+#: gramps.glade:30933
 msgid "P_atronymic:"
 msgstr "Patron_yymi:"
 
-#: gramps.glade:28891
+#: gramps.glade:31037
 msgid "G_roup as:"
 msgstr "_Ryhmittele:"
 
-#: gramps.glade:28916
+#: gramps.glade:31066
 msgid "_Sort as:"
 msgstr "_Järjestä:"
 
-#: gramps.glade:28943
+#: gramps.glade:31097
 msgid "_Display as:"
 msgstr "_Näytä:"
 
-#: gramps.glade:28970
+#: gramps.glade:31128
 msgid "Name Information"
 msgstr "Nimen tiedot"
 
-#: gramps.glade:29034
+#: gramps.glade:31203
 msgid ""
 "Default (based on locale)\n"
 "Family name, Given name\n"
@@ -5869,7 +5945,7 @@ msgstr ""
 "Sukunimi, Etunimi\n"
 "Etunimi, Sukunimi"
 
-#: gramps.glade:29052
+#: gramps.glade:31223
 msgid ""
 "Default (based on locale)\n"
 "Given name Family name\n"
@@ -5879,95 +5955,95 @@ msgstr ""
 "Etunimi Sukunimi\n"
 "Sukunimi Etunimi\n"
 
-#: gramps.glade:29178
+#: gramps.glade:31355
 msgid "_Override"
 msgstr "_Ylikirjoita"
 
-#: gramps.glade:29728
+#: gramps.glade:31933
 msgid "_Comment:"
 msgstr "_Kommentti:"
 
-#: gramps.glade:29780
+#: gramps.glade:31989
 msgid "Person is in the _database"
 msgstr "Henkil_ö on tietokannassa"
 
-#: gramps.glade:29848
+#: gramps.glade:32057
 msgid "Choose a person from the database"
 msgstr "Valitse henkilö tietokannasta"
 
-#: gramps.glade:29850
+#: gramps.glade:32059
 msgid "_Select"
 msgstr "_Valitse"
 
-#: gramps.glade:29979
+#: gramps.glade:32189
 msgid "_Next"
 msgstr "_Seuraava"
 
-#: gramps.glade:30038
+#: gramps.glade:32252
 msgid "_Display on startup"
 msgstr "_Näytä käynnistettäessä"
 
-#: gramps.glade:30101
+#: gramps.glade:32319
 msgid "Gramps' Tip of the Day"
 msgstr "Grampsin päivän vihje"
 
-#: gramps.glade:30134
+#: gramps.glade:32356
 msgid "GRAMPS - Loading Database"
 msgstr "GRAMPS - Lataan tietokantaa"
 
-#: gramps.glade:30159
+#: gramps.glade:32382
 msgid "Loading database"
 msgstr "Lataan tietokantaa"
 
-#: gramps.glade:30183
+#: gramps.glade:32410
 msgid "GRAMPS is loading the database you selected. Please wait."
 msgstr "GRAMPS lataa valitsemaasi tietokantaa. Odota."
 
-#: gramps.glade:30366
+#: gramps.glade:32606
 msgid "Calenda_r:"
 msgstr "Kalente_ri:"
 
-#: gramps.glade:30416
+#: gramps.glade:32662
 msgid "Q_uality"
 msgstr "_Laatu"
 
-#: gramps.glade:30458
+#: gramps.glade:32710
 msgid "_Type"
 msgstr "_Tyyppi"
 
-#: gramps.glade:30500
+#: gramps.glade:32758
 msgid "Date"
 msgstr "Päivämäärä"
 
-#: gramps.glade:30524
+#: gramps.glade:32786
 msgid "_Day"
 msgstr "_Päivä"
 
-#: gramps.glade:30549
+#: gramps.glade:32815
 msgid "_Month"
 msgstr "_Kuukausi"
 
-#: gramps.glade:30574
+#: gramps.glade:32844
 msgid "_Year"
 msgstr "_Vuosi"
 
-#: gramps.glade:30658
+#: gramps.glade:32934
 msgid "Second date"
 msgstr "Toinen päivämäärä"
 
-#: gramps.glade:30682
+#: gramps.glade:32962
 msgid "D_ay"
 msgstr "P_äivä"
 
-#: gramps.glade:30707
+#: gramps.glade:32991
 msgid "Mo_nth"
 msgstr "K_uukausi"
 
-#: gramps.glade:30732
+#: gramps.glade:33020
 msgid "Y_ear"
 msgstr "_Vuosi"
 
-#: gramps.glade:30829
+#: gramps.glade:33123
 msgid "Te_xt comment:"
 msgstr "_Tekstikommentti:"
 
@@ -6021,11 +6097,11 @@ msgstr ""
 "miten käytät ohjelmaa.\n"
 "\n"
 "1. Tietojen talletukseen käytetään Berkeley-DB tietokantaa.\n"
-"   Tästä johtuen tiedot talletaan levylle välittömästi ja GRAMPS:n\n"
-"   tietokanta skaalautuu nyt kymmeniin tuhansiin henkilöihin.\n"
-"   Talleta toiminnallisuutta EI enää ole!\n"
-"2. GRAMPS ei hallinnoi media-objekteja.\n"
-"   Enää ei ole paikallisia objekteja (kuvia jne.), ainoastaan ulkoisia.\n"
+"   Tästä johtuen tiedot talletaan levylle välittömästi ja GRAMPS\n"
+"   pystyy nyt käsittelemään kymmeniä tuhansia henkilöitä.\n"
+"   Erillistä tallenna toiminnallisuutta EI enää ole!\n"
+"2. GRAMPS ei hallinnoi mediatiedostoja.\n"
+"   Enää ei ole paikallisia tiedostoja (kuvia jne.), ainoastaan ulkoisia.\n"
 "   Olet itse vastuussa tiedostoistasi.  Jos poistat kuvatiedoston\n"
 "   levyltä, sitä ei enää ole!\n"
 "3. Aikaisempien GRAMPS versioiden tarjoama versionhallinta\n"
@@ -6078,28 +6154,30 @@ msgstr "Henkilöt, joiden tiedot sisältävät..."
 msgid "People with records matching regular expression..."
 msgstr "Henkilöt, joiden tiedot täsmäävät regular expressioniin..."
 
-#: gramps_main.py:1074 gramps_main.py:1097
+#: gramps_main.py:1074 gramps_main.py:1086 gramps_main.py:1104
+#: gramps_main.py:1116
 msgid "Cannot merge people."
 msgstr "Henkilöiden liittäminen ei onnistu."
 
-#: gramps_main.py:1075 gramps_main.py:1098
+#: gramps_main.py:1075 gramps_main.py:1087 gramps_main.py:1105
+#: gramps_main.py:1117
 msgid "Exactly two people must be selected to perform a merge. A second person can be selected by holding down the control key while clicking on the desired person."
 msgstr "Tasan kaksi henkilöä pitää olla valittuna yhdistettäväksi. Toinen henkilö voidaan valita pitämällä Control-näppäintä alhaalla klikatessa."
 
-#: gramps_main.py:1221
+#: gramps_main.py:1235
 msgid "Cannot unpak archive"
 msgstr "Arkiston purkaminen ei onnistu"
 
-#: gramps_main.py:1222 plugins/ReadPkg.py:67
+#: gramps_main.py:1236 plugins/ReadPkg.py:67
 msgid "Temporary directory %s is not writable"
 msgstr "Valiaikaishakemisto '%s' ei ole kirjoitettavissa"
 
-#: gramps_main.py:1264 gramps_main.py:1270 gramps_main.py:1291
-#: gramps_main.py:1295 gramps_main.py:1298
+#: gramps_main.py:1278 gramps_main.py:1284 gramps_main.py:1305
+#: gramps_main.py:1309 gramps_main.py:1312
 msgid "Cannot open database"
 msgstr "Tietokannan aukaisu ei onnistu"
 
-#: gramps_main.py:1265
+#: gramps_main.py:1279
 msgid ""
 "The selected file is a directory, not a file.\n"
 "A GRAMPS database must be a file."
@@ -6107,129 +6185,129 @@ msgstr ""
 "Valittu tiedosto on hakemisto, ei tiedosto.\n"
 "GRAMPSin tietokanta voi olla vain tiedosto."
 
-#: gramps_main.py:1271
+#: gramps_main.py:1285
 msgid "You do not have read access to the selected file."
 msgstr "Sinulla ei ole lukuoikeutta valittuun tiedostoon."
 
-#: gramps_main.py:1276
+#: gramps_main.py:1290
 msgid "Read only database"
 msgstr "Tietokanta on kirjoitussuojattu"
 
-#: gramps_main.py:1277
+#: gramps_main.py:1291
 msgid "You do not have write access to the selected file."
 msgstr "Sinulla ei ole kirjoitusoikeutta valittuun tiedostoon."
 
-#: gramps_main.py:1286
+#: gramps_main.py:1300
 msgid "Read Only"
 msgstr "Kirjoitussuojattu"
 
-#: gramps_main.py:1292
+#: gramps_main.py:1306
 msgid "The database file specified could not be opened."
 msgstr "Annettua tietokantaa ei voitu avata."
 
-#: gramps_main.py:1299
+#: gramps_main.py:1313
 msgid "%s could not be opened."
 msgstr "%s:n avaus epäonnistui."
 
-#: gramps_main.py:1358
+#: gramps_main.py:1372
 msgid "Save Media Object"
-msgstr "Tallenna media-objekti"
+msgstr "Tallenna mediatiedosto"
 
-#: gramps_main.py:1404 plugins/Check.py:284 plugins/WriteCD.py:255
+#: gramps_main.py:1418 plugins/Check.py:284 plugins/WriteCD.py:255
 #: plugins/WritePkg.py:171
 msgid "Media object could not be found"
-msgstr "Media-objektia ei löydy"
+msgstr "Mediatiedostoa ei löydy"
 
-#: gramps_main.py:1405 plugins/WriteCD.py:256 plugins/WritePkg.py:172
+#: gramps_main.py:1419 plugins/WriteCD.py:256 plugins/WritePkg.py:172
 msgid "%(file_name)s is referenced in the database, but no longer exists. The file may have been deleted or moved to a different location. You may choose to either remove the reference from the database, keep the reference to the missing file, or select a new file."
 msgstr "%(file_name)s tiedostoon viitataan tietokannassa, mutta sitä ei löydy. Tiedosto on saatettu poistaa tai siirtää. Voit valita joko viitteen poiston tietokannasta, pitää viitteen ennallaan tai viitata uuteen tiedostoon."
 
-#: gramps_main.py:1451
+#: gramps_main.py:1465
 msgid "Deleting the person will remove the person from the database."
 msgstr "Henkilön poistaminen tuhoaa hänet tietokannasta."
 
-#: gramps_main.py:1455
+#: gramps_main.py:1469
 msgid "_Delete Person"
 msgstr "_Poista henkilö"
 
-#: gramps_main.py:1519
+#: gramps_main.py:1533
 msgid "Delete Person (%s)"
 msgstr "_Poista henkilö (%s)"
 
-#: gramps_main.py:1603
+#: gramps_main.py:1617
 msgid "%(relationship)s of %(person)s"
 msgstr "%(person)s:n %(relationship)s"
 
-#: gramps_main.py:1765
+#: gramps_main.py:1779
 msgid "Upgrading database..."
 msgstr "Päivitän tietokantaa..."
 
-#: gramps_main.py:1778
+#: gramps_main.py:1792
 msgid "Setup complete"
 msgstr "Asennus valmis"
 
-#: gramps_main.py:1795
+#: gramps_main.py:1809
 msgid "Loading %s..."
 msgstr "Ladataan %s..."
 
-#: gramps_main.py:1798
+#: gramps_main.py:1812
 msgid "Opening database..."
 msgstr "Avaan tietokantaa..."
 
-#: gramps_main.py:1829
+#: gramps_main.py:1843
 msgid "No Home Person has been set."
 msgstr "\"Koti\"-henkilöä ei ole asetettu."
 
-#: gramps_main.py:1830
+#: gramps_main.py:1844
 msgid "The Home Person may be set from the Edit menu."
 msgstr "\"Koti\"-henkilö voidaan asettaa Muokkaa-valikosta."
 
-#: gramps_main.py:1836
+#: gramps_main.py:1850
 msgid "%s has been bookmarked"
 msgstr "%s on kirjanmerkitty"
 
-#: gramps_main.py:1839
+#: gramps_main.py:1853
 msgid "Could Not Set a Bookmark"
 msgstr "Kirjanmerkin asetus epäonnistui"
 
-#: gramps_main.py:1840
+#: gramps_main.py:1854
 msgid "A bookmark could not be set because no one was selected."
 msgstr "Kirjanmerkin asetus epäonnistui, koska ketään ei ollut valittuna."
 
-#: gramps_main.py:1854
+#: gramps_main.py:1868
 msgid "Could not go to a Person"
 msgstr "Henkilöön siirtyminen epäonnistui"
 
-#: gramps_main.py:1855
+#: gramps_main.py:1869
 msgid "Either stale bookmark or broken history caused by IDs reorder."
 msgstr "Vanhentunut kirjanmerkki tai tunnuksien uudelleenjärjestelyn aiheuttama historian epäkelpoisuus."
 
-#: gramps_main.py:1865
+#: gramps_main.py:1879
 msgid "Set %s as the Home Person"
 msgstr "Aseta %s \"Koti\"-henkilöksi"
 
-#: gramps_main.py:1866
+#: gramps_main.py:1880
 msgid "Once a Home Person is defined, pressing the Home button on the toolbar will make the home person the active person."
 msgstr "\"Koti\"-henkilön asettamisen jälkeen \"Koti\" nappulan painaminen työkalupalkissa aktivoi \"koti\"-henkilön."
 
-#: gramps_main.py:1869
+#: gramps_main.py:1883
 msgid "_Set Home Person"
 msgstr "_Aseta \"koti\"-henkilö"
 
-#: gramps_main.py:1880
+#: gramps_main.py:1894
 msgid "A person must be selected to export"
 msgstr "Vientiä varten pitää valita henkilö"
 
-#: gramps_main.py:1881
+#: gramps_main.py:1895
 msgid "Exporting requires that an active person be selected. Please select a person and try again."
 msgstr "Vienti vaatii, että joku henkilö on valittuna. Valitse henkilö ja yritä uudelleen."
 
-#: gramps_main.py:1912 gramps_main.py:1916 gramps_main.py:1920
-#: gramps_main.py:1934 gramps_main.py:1936
+#: gramps_main.py:1926 gramps_main.py:1930 gramps_main.py:1934
+#: gramps_main.py:1948 gramps_main.py:1950
 msgid "Could not create example database"
 msgstr "Esimerkkitietokannan luonti epäonnistui"
 
-#: gramps_main.py:1913 gramps_main.py:1917 gramps_main.py:1921
+#: gramps_main.py:1927 gramps_main.py:1931 gramps_main.py:1935
 msgid "The directory ~/.gramps/example could not be created."
 msgstr "Hakemistoa ~/.gramps/example ei voitu luoda."
 
@@ -6297,7 +6375,7 @@ msgstr "Tekijän sähköposti:"
 #: plugins/AncestorChart.py:245 plugins/AncestorChart2.py:499
 #: plugins/AncestorReport.py:290 plugins/Ancestors.py:909
 #: plugins/Ancestors.py:925 plugins/Ancestors.py:931 plugins/DesGraph.py:333
-#: plugins/DetAncestralReport.py:520 plugins/FamilyGroup.py:514
+#: plugins/DetAncestralReport.py:520 plugins/FamilyGroup.py:515
 #: plugins/FanChart.py:299 plugins/FtmStyleAncestors.py:390
 #: plugins/FtmStyleAncestors.py:395 plugins/FtmStyleAncestors.py:400
 #: plugins/FtmStyleAncestors.py:405 plugins/FtmStyleDescendants.py:536
@@ -6325,7 +6403,7 @@ msgstr "Kaavio esivanhemmista"
 #: plugins/AncestorReport.py:306 plugins/Ancestors.py:968
 #: plugins/BookReport.py:1117 plugins/CountAncestors.py:122
 #: plugins/DescendReport.py:198 plugins/DetAncestralReport.py:618
-#: plugins/DetDescendantReport.py:639 plugins/FamilyGroup.py:548
+#: plugins/DetDescendantReport.py:639 plugins/FamilyGroup.py:549
 #: plugins/FtmStyleAncestors.py:422 plugins/FtmStyleDescendants.py:572
 #: plugins/GraphViz.py:971 plugins/GraphViz.py:985
 #: plugins/IndivComplete.py:595 plugins/IndivSummary.py:391
@@ -6431,7 +6509,7 @@ msgstr ", hautauspaikka %s."
 
 #: plugins/AncestorReport.py:276 plugins/Ancestors.py:894
 #: plugins/DescendReport.py:174 plugins/DetAncestralReport.py:484
-#: plugins/DetDescendantReport.py:505 plugins/FamilyGroup.py:505
+#: plugins/DetDescendantReport.py:505 plugins/FamilyGroup.py:506
 #: plugins/FtmStyleAncestors.py:375 plugins/FtmStyleDescendants.py:521
 #: plugins/IndivComplete.py:552 plugins/IndivSummary.py:348
 #: plugins/SimpleBookTitle.py:265 plugins/StatisticsChart.py:812
@@ -6632,7 +6710,7 @@ msgstr "Valittu _kirja"
 
 #: plugins/BookReport.py:632 plugins/StatisticsChart.py:76
 msgid "Item name"
-msgstr "Kohteen nimi"
+msgstr "Kohteen nimen mukaan"
 
 #: plugins/BookReport.py:633
 msgid "Center person"
@@ -6761,7 +6839,7 @@ msgstr "Ei havaittu virheitä"
 
 #: plugins/Check.py:454
 msgid "The database has passed internal checks"
-msgstr "Tietokannan sisäiset tarkistukset läpikäyty ja kunnossa"
+msgstr "Tietokannan sisäiset tarkistukset eivät löytäneet ongelmia"
 
 #: plugins/Check.py:461
 msgid "1 broken child/family link was fixed\n"
@@ -6813,35 +6891,35 @@ msgstr "%d vioittunutta perhesuhdetta korjattu\n"
 
 #: plugins/Check.py:506
 msgid "1 media object was referenced, but not found\n"
-msgstr "Yhteen media-objektiin on viite, mutta sitä ei löydy\n"
+msgstr "Yhteen mediatiedostoon on viite, mutta sitä ei löydy\n"
 
 #: plugins/Check.py:508
 msgid "%d media objects were referenced, but not found\n"
-msgstr "%d:n media-objektiin viitteitä, vaikka niitä ei löydy\n"
+msgstr "%d:n mediatiedostoon viitteitä, vaikka niitä ei löydy\n"
 
 #: plugins/Check.py:510
 msgid "Reference to 1 missing media object was kept\n"
-msgstr "Viite yhteen puuttuvaan media-objektiin säilytetty\n"
+msgstr "Viite yhteen puuttuvaan mediatiedostoon säilytetty\n"
 
 #: plugins/Check.py:512
 msgid "References to %d media objects were kept\n"
-msgstr "Viitteet %d:n media-objektiin säilytetty\n"
+msgstr "Viitteet %d mediatiedostoon säilytetty\n"
 
 #: plugins/Check.py:514
 msgid "1 missing media object was replaced\n"
-msgstr "Yksi puuttuva media-objekti korvattiin\n"
+msgstr "Yksi puuttuva mediatiedosto korvattiin\n"
 
 #: plugins/Check.py:516
 msgid "%d missing media objects were replaced\n"
-msgstr "%d puuttuvaa media-objektia korvattiin\n"
+msgstr "%d puuttuvaa mediatiedostoa korvattiin\n"
 
 #: plugins/Check.py:518
 msgid "1 missing media object was removed\n"
-msgstr "Yksi puuttuva media-objekti poistettu\n"
+msgstr "Yksi puuttuva mediatiedosto poistettu\n"
 
 #: plugins/Check.py:520
 msgid "%d missing media objects were removed\n"
-msgstr "%d puuttuvaa media-objektia poistettu\n"
+msgstr "%d puuttuvaa mediatiedostoa poistettu\n"
 
 #: plugins/Check.py:522
 msgid "1 invalid event reference was removed\n"
@@ -6944,7 +7022,7 @@ msgid "Descendant Graph"
 msgstr "Jälkeläiskaavio"
 
 #: plugins/DesGraph.py:349 plugins/FanChart.py:325
-#: plugins/StatisticsChart.py:958
+#: plugins/StatisticsChart.py:963
 msgid "Alpha"
 msgstr "Alpha"
 
@@ -7133,35 +7211,35 @@ msgstr "Vertaa yksittäisiä tapahtumia"
 msgid "Aids in the analysis of data by allowing the development of custom filters that can be applied to the database to find similar events"
 msgstr "Auttaa analysoinnissa sallimalla erikoissuotimien luomisen, joita voidaan käyttää samankaltaisten tapahtumien etsimiseen tietokannasta"
 
-#: plugins/ExportVCalendar.py:54
+#: plugins/ExportVCalendar.py:55
 msgid "Export to vCalendar"
 msgstr "Vie vCalendar-muotoon"
 
-#: plugins/ExportVCalendar.py:199
+#: plugins/ExportVCalendar.py:209
 msgid "Marriage of %s"
 msgstr "Avioliitto: %s"
 
-#: plugins/ExportVCalendar.py:217 plugins/ExportVCalendar.py:219
+#: plugins/ExportVCalendar.py:227 plugins/ExportVCalendar.py:229
 msgid "Birth of %s"
 msgstr "Syntymä: %s"
 
-#: plugins/ExportVCalendar.py:228 plugins/ExportVCalendar.py:230
+#: plugins/ExportVCalendar.py:238 plugins/ExportVCalendar.py:240
 msgid "Death of %s"
 msgstr "Kuolema: %s"
 
-#: plugins/ExportVCalendar.py:283
+#: plugins/ExportVCalendar.py:293
 msgid "Anniversary: %s"
 msgstr "Syntymäpäivä: %s"
 
-#: plugins/ExportVCalendar.py:310
+#: plugins/ExportVCalendar.py:320
 msgid "vCalendar"
 msgstr "vCalendar"
 
-#: plugins/ExportVCalendar.py:311
+#: plugins/ExportVCalendar.py:321
 msgid "vCalendar is used in many calendaring and pim applications."
 msgstr "vCalendar-muotoa käytetään useissa kalenteri- ja PIM-sovelluksissa."
 
-#: plugins/ExportVCalendar.py:312
+#: plugins/ExportVCalendar.py:322
 msgid "vCalendar export options"
 msgstr "vCalendar vienti-asetukset"
 
@@ -7169,15 +7247,15 @@ msgstr "vCalendar vienti-asetukset"
 msgid "Export to vCard"
 msgstr "Vie vCard-muotoon"
 
-#: plugins/ExportVCard.py:234
+#: plugins/ExportVCard.py:243
 msgid "vCard"
 msgstr "vCard"
 
-#: plugins/ExportVCard.py:235
+#: plugins/ExportVCard.py:244
 msgid "vCard is used in many addressbook and pim applications."
 msgstr "vCard-muotoa käytetään monissa osoitekirja- ja PIM-sovelluksissa."
 
-#: plugins/ExportVCard.py:236
+#: plugins/ExportVCard.py:245
 msgid "vCard export options"
 msgstr "vCard vienti-asetukset"
 
@@ -7189,19 +7267,19 @@ msgstr "Aviomies"
 msgid "Wife"
 msgstr "Vaimo"
 
-#: plugins/FamilyGroup.py:383 plugins/FamilyGroup.py:547
+#: plugins/FamilyGroup.py:383 plugins/FamilyGroup.py:548
 msgid "Family Group Report"
 msgstr "Perheryhmäraportti"
 
-#: plugins/FamilyGroup.py:523
+#: plugins/FamilyGroup.py:524
 msgid "The style used for the text related to the children."
 msgstr "Lapsiin liittyvän tekstin tyyli."
 
-#: plugins/FamilyGroup.py:532
+#: plugins/FamilyGroup.py:533
 msgid "The style used for the parent's name"
 msgstr "Vanhempien nimen tyyli"
 
-#: plugins/FamilyGroup.py:551
+#: plugins/FamilyGroup.py:552
 msgid "Creates a family group report, showing information on a set of parents and their children."
 msgstr "Luo perheryhmäraportin, joka näyttää tietoja valituista vanhemmista ja heidän lapsistaan."
 
@@ -7663,7 +7741,7 @@ msgstr "Nainen"
 
 #: plugins/IndivComplete.py:533
 msgid "Include Source Information"
-msgstr "Lisää lahdetiedot"
+msgstr "Lisää lähdetiedot"
 
 #: plugins/IndivComplete.py:562 plugins/IndivSummary.py:358
 msgid "The style used for category labels."
@@ -7890,7 +7968,7 @@ msgstr "Muistio"
 
 #: plugins/ScratchPad.py:900
 msgid "The Scratch Pad provides a temporary note pad to store objects for easy reuse."
-msgstr "Muistio tarjoaa väliaikaisen säilytyspaikan, jonne voit tallentaa objekteja uudelleenkäyttöä varten."
+msgstr "Muistio tarjoaa väliaikaisen säilytyspaikan, jonne voit tallentaa asioita uudelleenkäyttöä varten."
 
 #: plugins/SimpleBookTitle.py:128
 msgid "Title of the Book"
@@ -7959,7 +8037,7 @@ msgstr "Tuota SoundEx koodeja nimille"
 
 #: plugins/StatisticsChart.py:75
 msgid "Item count"
-msgstr "Kohteen lukumäärä"
+msgstr "Kohteen lukumäärän mukaan"
 
 #: plugins/StatisticsChart.py:79
 msgid "Both"
@@ -8136,55 +8214,55 @@ msgstr "Valitse käyttääksesi käänteistä järjestystä."
 msgid "Sort in reverse order"
 msgstr "Käänteisessä järjestyksessä"
 
-#: plugins/StatisticsChart.py:877
+#: plugins/StatisticsChart.py:881
 msgid "Select year range within which people need to be born to be selected for statistics."
 msgstr "Valitse vuosijakso, jonka aikana ihmisten pitää olla syntyneet, jotta heidät otetaan huomioon tilastossa."
 
-#: plugins/StatisticsChart.py:878
+#: plugins/StatisticsChart.py:882
 msgid "People born between"
 msgstr "Ihmiset syntyneet vuosina"
 
-#: plugins/StatisticsChart.py:882
+#: plugins/StatisticsChart.py:886
 msgid "Check this if you want people who have no known birth date or year to be accounted also in the statistics."
 msgstr "Valitse tämä, jos haluat sisällyttää tilastoihin myös ihmiset, joilta puuttuu syntymäpäivä tai -vuosi."
 
-#: plugins/StatisticsChart.py:883
+#: plugins/StatisticsChart.py:887
 msgid "Include people without known birth years"
 msgstr "Sisällytä ihmiset, joiden syntymävuosi ei ole tiedossa"
 
-#: plugins/StatisticsChart.py:895
+#: plugins/StatisticsChart.py:899
 msgid "Select which genders are included into statistics."
 msgstr "Valitse tilastoon sisällytettävät sukupuolet."
 
-#: plugins/StatisticsChart.py:896
+#: plugins/StatisticsChart.py:900
 msgid "Genders included"
 msgstr "Sisällytettävät sukupuolet"
 
-#: plugins/StatisticsChart.py:899
+#: plugins/StatisticsChart.py:903
 msgid "With fewer items pie chart and legend will be used instead of a bar chart."
 msgstr "Jos näytettäviä tietoja on vähemmän, piirakkakaaviota käytetään pylväskaavion sijaan."
 
-#: plugins/StatisticsChart.py:902
+#: plugins/StatisticsChart.py:907
 msgid "Max. items for a pie"
 msgstr "Enin määrä asioita piiraaseen"
 
-#: plugins/StatisticsChart.py:921
+#: plugins/StatisticsChart.py:926
 msgid "Mark checkboxes to add charts with indicated data"
 msgstr "Valitse mistä tiedoista haluat kaaviot"
 
-#: plugins/StatisticsChart.py:922 plugins/StatisticsChart.py:927
+#: plugins/StatisticsChart.py:927 plugins/StatisticsChart.py:932
 msgid "Chart Selection"
 msgstr "Kaavion valinta"
 
-#: plugins/StatisticsChart.py:926
+#: plugins/StatisticsChart.py:931
 msgid "Note that both biological and adopted children are taken into account."
 msgstr "Huomaa, että tilastoissa ei eroiteta adoptoituja lapsia biologisista lapsista."
 
-#: plugins/StatisticsChart.py:957
+#: plugins/StatisticsChart.py:962
 msgid "Statistics Chart"
 msgstr "Tilastokaaviot"
 
-#: plugins/StatisticsChart.py:961
+#: plugins/StatisticsChart.py:966
 msgid "Generates statistical bar and pie charts of the people in the database."
 msgstr "Luo palkki- ja ympyrätilastokaavioita tietokannassa olevista henkilöistä."
 
@@ -8202,7 +8280,7 @@ msgstr "Henkilöt puutteellisilla nimillä"
 
 #: plugins/Summary.py:115
 msgid "Individuals missing birth dates"
-msgstr "Henkilöt, joilta puuttuu syntymäpäivämäärät"
+msgstr "Henkilöt puutteellisilla syntymäajoilla"
 
 #: plugins/Summary.py:117
 msgid "Family Information"
@@ -8218,23 +8296,23 @@ msgstr "Uniikit sukunimet"
 
 #: plugins/Summary.py:121
 msgid "Media Objects"
-msgstr "Media-objektit"
+msgstr "Mediatiedostot"
 
 #: plugins/Summary.py:123
 msgid "Individuals with media objects"
-msgstr "Henkilöt, joihin liittyy media-objekteja"
+msgstr "Henkilöt, joihin liittyy mediatiedostoja"
 
 #: plugins/Summary.py:124
 msgid "Total number of media object references"
-msgstr "Media-objektien viitteiden kokonaismäärä"
+msgstr "Mediatiedostojen viitteiden kokonaismäärä"
 
 #: plugins/Summary.py:125
 msgid "Number of unique media objects"
-msgstr "Uniikkien media-objektien määrä"
+msgstr "Uniikkien mediatiedostojen määrä"
 
 #: plugins/Summary.py:126
 msgid "Total size of media objects"
-msgstr "Media-objektien yhteenlaskettu koko"
+msgstr "Mediatiedostojen yhteenlaskettu koko"
 
 #: plugins/Summary.py:127
 msgid "bytes"
@@ -8242,7 +8320,7 @@ msgstr "tavua"
 
 #: plugins/Summary.py:130
 msgid "Missing Media Objects"
-msgstr "Puuttuvia media-objekteja"
+msgstr "Puuttuvia mediatiedostoja"
 
 #: plugins/Summary.py:156
 msgid "Database summary"
@@ -8821,33 +8899,33 @@ msgstr "Vie CD:lle (_yhteensopiva XML)"
 
 #: plugins/WriteCD.py:307
 msgid "Exporting to CD copies all your data and media object files to the CD Creator. You may later burn the CD with this data, and that copy will be completely portable across different machines and binary architectures."
-msgstr "CD:lle vienti kopioi kaikki tietosi ja niihin liittyvät media-objektit CD:n luontiohjelmalle. Voit myöhemmin polttaa nämä CD:lle, ja luotu kopio on yhteensopiva eri tietokoneiden ja konearkkitehtuurien välillä."
+msgstr "CD:lle vienti kopioi kaikki tietosi ja niihin liittyvät mediatiedostot CD:n luontiohjelmalle. Voit sitten myöhemmin polttaa ne CD:lle, ja luotu kopio on yhteensopiva eri tietokoneiden ja konearkkitehtuurien välillä."
 
-#: plugins/WriteFtree.py:273
+#: plugins/WriteFtree.py:281
 msgid "_Web Family Tree"
 msgstr "_Web Family Tree"
 
-#: plugins/WriteFtree.py:274
+#: plugins/WriteFtree.py:282
 msgid "Web Family Tree format."
 msgstr "Web Family Tree -muoto."
 
-#: plugins/WriteFtree.py:275
+#: plugins/WriteFtree.py:283
 msgid "Web Family Tree export options"
 msgstr "Web Family Tree vientiasetukset"
 
-#: plugins/WriteGeneWeb.py:218
+#: plugins/WriteGeneWeb.py:227
 msgid "No families matched by selected filter"
 msgstr "Yksikään perhe ei täsmää valittuun suotimeen"
 
-#: plugins/WriteGeneWeb.py:577
+#: plugins/WriteGeneWeb.py:586
 msgid "G_eneWeb"
 msgstr "_GeneWeb"
 
-#: plugins/WriteGeneWeb.py:578
+#: plugins/WriteGeneWeb.py:587
 msgid "GeneWeb is a web based genealogy program."
 msgstr "GeneWeb on www-pohjainen sukututkimusohjelma."
 
-#: plugins/WriteGeneWeb.py:579
+#: plugins/WriteGeneWeb.py:588
 msgid "GeneWeb export options"
 msgstr "GeneWeb vienti-asetukset"
 
@@ -8857,7 +8935,7 @@ msgstr "GRAM_PS paketti (yhteensopiva XML)"
 
 #: plugins/WritePkg.py:203
 msgid "GRAMPS package is an archived XML database together with the media object files."
-msgstr "GRAMPS paketti sisältää tietokannan XML muodossa ja kaikki siihen liittyvät media-objektit."
+msgstr "GRAMPS paketti sisältää tietokannan XML muodossa ja kaikki siihen liittyvät mediatiedostot."
 
 #: plugins/book.glade:11
 msgid "Book"
diff --git a/gramps2/src/po/fr.po b/gramps2/src/po/fr.po
index aae48e9f4..b5c972eb9 100644
--- a/gramps2/src/po/fr.po
+++ b/gramps2/src/po/fr.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: Fri May 13 12:02:11 2005\n"
-"PO-Revision-Date: 2005-05-17 18:11+0200\n"
+"POT-Creation-Date: Thu Jun 23 14:11:42 2005\n"
+"PO-Revision-Date: 2005-06-28 21:48+0200\n"
 "Last-Translator: Matthieu Pupat \n"
 "Language-Team: Franais \n"
 "MIME-Version: 1.0\n"
@@ -32,11 +32,11 @@ msgstr "Impossible d'importer %s"
 msgid "The filename supplied could not be found."
 msgstr "Le fichier indiqu est introuvable."
 
-#: AddMedia.py:143 MediaView.py:371 MediaView.py:395
+#: AddMedia.py:143 MediaView.py:410 MediaView.py:434
 msgid "Add Media Object"
 msgstr "Ajouter un media"
 
-#: AddSpouse.py:115
+#: AddSpouse.py:114
 msgid "Choose Spouse/Partner of %s"
 msgstr "Slectionner l'poux(se) ou le partenaire de %s"
 
@@ -44,57 +44,95 @@ msgstr "S
 msgid "Choose Spouse/Partner"
 msgstr "Slectionner l'poux(se) ou le partenaire"
 
-#: AddSpouse.py:160 ChooseParents.py:225 EditPerson.py:338 EditSource.py:298
-#: FamilyView.py:74 ImageSelect.py:1101 PeopleView.py:58 PeopleView.py:148
-#: SelectChild.py:124 SelectPerson.py:78 plugins/BookReport.py:631
-#: plugins/FilterEditor.py:451 plugins/IndivComplete.py:404
-#: plugins/IndivSummary.py:225 plugins/NavWebPage.py:194
-#: plugins/PatchNames.py:191 plugins/RelCalc.py:95 plugins/ScratchPad.py:154
-#: plugins/ScratchPad.py:195 plugins/ScratchPad.py:237
-#: plugins/ScratchPad.py:294 plugins/ScratchPad.py:327
-#: plugins/ScratchPad.py:369 plugins/ScratchPad.py:380
-#: plugins/ScratchPad.py:381 plugins/ScratchPad.py:392
-#: plugins/ScratchPad.py:463 plugins/ScratchPad.py:474 plugins/TimeLine.py:431
-#: plugins/WebPage.py:317
+#: AddSpouse.py:142 ChooseParents.py:252 EditPerson.py:338 EditSource.py:312
+#: FamilyView.py:74 ImageSelect.py:1104 PeopleView.py:58 PeopleView.py:134
+#: SelectChild.py:129 SelectPerson.py:78 plugins/BookReport.py:631
+#: plugins/FilterEditor.py:459 plugins/IndivComplete.py:405
+#: plugins/IndivSummary.py:226 plugins/PatchNames.py:191 plugins/RelCalc.py:95
+#: plugins/ScratchPad.py:154 plugins/ScratchPad.py:195
+#: plugins/ScratchPad.py:237 plugins/ScratchPad.py:294
+#: plugins/ScratchPad.py:327 plugins/ScratchPad.py:369
+#: plugins/ScratchPad.py:380 plugins/ScratchPad.py:381
+#: plugins/ScratchPad.py:392 plugins/ScratchPad.py:463
+#: plugins/ScratchPad.py:474 plugins/TimeLine.py:431 plugins/WebPage.py:320
 msgid "Name"
 msgstr "Nom"
 
-#: AddSpouse.py:165 ChooseParents.py:231 EditSource.py:298 FamilyView.py:73
-#: ImageSelect.py:1101 MediaView.py:58 MergePeople.py:107 PeopleView.py:59
-#: PlaceView.py:50 SelectChild.py:129 SelectObject.py:85 SelectPerson.py:84
+#: AddSpouse.py:146 ChooseParents.py:261 EditSource.py:312 FamilyView.py:73
+#: ImageSelect.py:1104 MediaView.py:58 MergePeople.py:107 PeopleView.py:59
+#: PlaceView.py:50 SelectChild.py:134 SelectObject.py:85 SelectPerson.py:84
 #: SourceView.py:52 Sources.py:108 Sources.py:242 Witness.py:64
 #: plugins/PatchNames.py:182 plugins/RelCalc.py:95
 msgid "ID"
 msgstr "Id"
 
-#: AddSpouse.py:170 ChooseParents.py:237 SelectChild.py:134 SelectPerson.py:90
+#: AddSpouse.py:150 ChooseParents.py:271 SelectChild.py:139 SelectPerson.py:90
 msgid "Birth date"
 msgstr "Date de naissance"
 
-#: AddSpouse.py:253 AddSpouse.py:261 AddSpouse.py:272 AddSpouse.py:276
+#: AddSpouse.py:232 AddSpouse.py:257
 msgid "Error adding a spouse"
 msgstr "Erreur lors de l'ajout d'un conjoint"
 
-#: AddSpouse.py:254
+#: AddSpouse.py:233
 msgid "A person cannot be linked as his/her spouse"
 msgstr "Une personne ne peut tre son propre conjoint"
 
-#: AddSpouse.py:262
-msgid "A person cannot be linked as his/her child's spouse"
-msgstr "Une personne ne peut tre le conjoint de son enfant"
+#: AddSpouse.py:241
+msgid "Spouse is a parent"
+msgstr "Le conjoint est un parent"
 
-#: AddSpouse.py:273
+#: AddSpouse.py:242
+msgid ""
+"The person selected as a spouse is a parent of the active person. Usually, "
+"this is a mistake. You may choose either to proceed with adding a spouse, or "
+"to return to the Choose Spouse dialog to fix the problem."
+msgstr ""
+"La personne slectionne comme conjoint est un parent de la personne active. "
+"Habituellement, c'est une erreur. Vous pouvez choisir de continuer la "
+"sauvegarde ou d'diter la fiche pour corriger le problme."
+
+#: AddSpouse.py:246 AddSpouse.py:267
+msgid "Proceed with adding"
+msgstr "Forcer l'ajout"
+
+#: AddSpouse.py:246 AddSpouse.py:267
+msgid "Return to dialog"
+msgstr "Retour  la fentre"
+
+#: AddSpouse.py:258
 msgid "The spouse is already present in this family"
 msgstr "Le conjoint est dj prsent dans la famille"
 
-#: AddSpouse.py:277
-msgid "A person cannot be linked as his/her parent's spouse"
-msgstr "Une personne ne peut tre le conjoint de son pre ou de sa mre"
+#: AddSpouse.py:262
+msgid "Spouse is a child"
+msgstr "Le conjoint est un enfant"
 
-#: AddSpouse.py:302 FamilyView.py:726
+#: AddSpouse.py:263
+msgid ""
+"The person selected as a spouse is a child of the active person. Usually, "
+"this is a mistake. You may choose either to proceed with adding a spouse, or "
+"to return to the Choose Spouse dialog to fix the problem."
+msgstr ""
+"La personne choisie comme conjoint est un enfant de la personne active. "
+"Habituellement, c'est une erreur. Vous pouvez choisir de continuer la "
+"sauvegarde ou d'diter la fiche pour corriger le problme."
+
+#: AddSpouse.py:293 FamilyView.py:725
 msgid "Add Spouse"
 msgstr "Ajouter un conjoint"
 
+#: AddSpouse.py:392 ChooseParents.py:811 GenericFilter.py:132
+#: GenericFilter.py:147 GenericFilter.py:263 GenericFilter.py:277
+#: GenericFilter.py:300 GenericFilter.py:323 GenericFilter.py:338
+#: GenericFilter.py:353 GenericFilter.py:979 GenericFilter.py:1223
+#: GenericFilter.py:1247 GenericFilter.py:1276 GenericFilter.py:1308
+#: GenericFilter.py:1325 GenericFilter.py:1346 GenericFilter.py:1429
+#: GenericFilter.py:1483 GenericFilter.py:1545 GenericFilter.py:1564
+#: GenericFilter.py:1634 GenericFilter.py:1801 SelectChild.py:305
+msgid "General filters"
+msgstr "Filtres gnraux"
+
 #: AddrEdit.py:106 AddrEdit.py:174
 msgid "Address Editor"
 msgstr "Adresse"
@@ -104,11 +142,11 @@ msgstr "Adresse"
 msgid "Address"
 msgstr "Adresse"
 
-#: ArgHandler.py:282 DbPrompter.py:214
+#: ArgHandler.py:279 DbPrompter.py:216
 msgid "Opening non-native format"
 msgstr "Ouverture d'un format externe"
 
-#: ArgHandler.py:283 DbPrompter.py:215
+#: ArgHandler.py:280 DbPrompter.py:217
 msgid ""
 "New GRAMPS database has to be set up when opening non-native formats. The "
 "following dialog will let you select the new database."
@@ -117,20 +155,22 @@ msgstr ""
 "externes. La fentre suivante vous permettra de choisir la nouvelle base de "
 "donnes."
 
-#: ArgHandler.py:291
+#: ArgHandler.py:288
 msgid "New GRAMPS database was not set up"
 msgstr "Le nouvelle base GRAMPS n'a pas t cre"
 
-#: ArgHandler.py:292
-msgid "GRAMPS cannot open non-native data without setting up new GRAMPS database."
-msgstr "GRAMPS ne peut ouvrir un format externe sans crer de nouvelle base GRAMPS."
+#: ArgHandler.py:289
+msgid ""
+"GRAMPS cannot open non-native data without setting up new GRAMPS database."
+msgstr ""
+"GRAMPS ne peut ouvrir un format externe sans crer de nouvelle base GRAMPS."
 
-#: ArgHandler.py:302 DbPrompter.py:201 DbPrompter.py:228 DbPrompter.py:304
-#: DbPrompter.py:333
+#: ArgHandler.py:299 DbPrompter.py:203 DbPrompter.py:230 DbPrompter.py:306
+#: DbPrompter.py:335
 msgid "Could not open file: %s"
 msgstr "Impossible d'ouvrir le fichier : %s"
 
-#: ArgHandler.py:303 DbPrompter.py:229 DbPrompter.py:334 DbPrompter.py:483
+#: ArgHandler.py:300 DbPrompter.py:231 DbPrompter.py:336 DbPrompter.py:486
 msgid ""
 "File type \"%s\" is unknown to GRAMPS.\n"
 "\n"
@@ -153,7 +193,7 @@ msgstr "Attribut pour %s"
 msgid "New Attribute"
 msgstr "Nouvel attribut"
 
-#: AttrEdit.py:175 EditPerson.py:326 ImageSelect.py:681 ImageSelect.py:951
+#: AttrEdit.py:175 EditPerson.py:326 ImageSelect.py:682 ImageSelect.py:954
 #: Marriage.py:214 plugins/ScratchPad.py:273 plugins/ScratchPad.py:281
 msgid "Attribute"
 msgstr "Attribut"
@@ -174,63 +214,81 @@ msgstr ""
 msgid "Edit Bookmarks"
 msgstr "Grer les signets"
 
-#: ChooseParents.py:116
+#: ChooseParents.py:129 ChooseParents.py:130
+msgid "Loading..."
+msgstr "Chargement ..."
+
+#: ChooseParents.py:133
 msgid "Choose the Parents of %s"
 msgstr "Slectionner les parents de %s"
 
-#: ChooseParents.py:118 ChooseParents.py:263 ChooseParents.py:493
-#: ChooseParents.py:564
+#: ChooseParents.py:135 ChooseParents.py:300 ChooseParents.py:572
+#: ChooseParents.py:659
 msgid "Choose Parents"
 msgstr "Slectionner les parents"
 
-#: ChooseParents.py:287 ChooseParents.py:619
+#: ChooseParents.py:366 ChooseParents.py:714
 msgid "Par_ent"
 msgstr "Par_ent"
 
-#: ChooseParents.py:289
+#: ChooseParents.py:368
 msgid "Fath_er"
 msgstr "P_re"
 
-#: ChooseParents.py:297 ChooseParents.py:618
+#: ChooseParents.py:376 ChooseParents.py:713
 msgid "Pa_rent"
 msgstr "Pa_rent"
 
-#: ChooseParents.py:299
+#: ChooseParents.py:378
 msgid "Mothe_r"
 msgstr "M_re"
 
-#: ChooseParents.py:485 SelectChild.py:287 SelectChild.py:306
+#: ChooseParents.py:564 SelectChild.py:192 SelectChild.py:211
 msgid "Error selecting a child"
 msgstr "Erreur lors de la slection d'un enfant"
 
-#: ChooseParents.py:486
+#: ChooseParents.py:565
 msgid "A person cannot be linked as his/her own parent"
 msgstr "Une personne ne peut tre son propre parent"
 
-#: ChooseParents.py:594
+#: ChooseParents.py:689
 msgid "Modify the Parents of %s"
 msgstr "Modifier les parents de %s"
 
-#: ChooseParents.py:595 ChooseParents.py:707
+#: ChooseParents.py:690 ChooseParents.py:802
 msgid "Modify Parents"
 msgstr "Modifier les parents"
 
-#: ChooseParents.py:621 FamilyView.py:1100 MergePeople.py:136
+#: ChooseParents.py:716 FamilyView.py:1112 MergePeople.py:136
 #: plugins/FamilyGroup.py:261 plugins/IndivComplete.py:215
-#: plugins/IndivComplete.py:217 plugins/IndivComplete.py:449
-#: plugins/IndivSummary.py:289 plugins/NavWebPage.py:725
-#: plugins/WebPage.py:337 plugins/WebPage.py:340
+#: plugins/IndivComplete.py:217 plugins/IndivComplete.py:450
+#: plugins/IndivSummary.py:290 plugins/WebPage.py:340 plugins/WebPage.py:343
 msgid "Mother"
 msgstr "Mre"
 
-#: ChooseParents.py:622 FamilyView.py:1098 MergePeople.py:134
+#: ChooseParents.py:717 FamilyView.py:1110 MergePeople.py:134
 #: plugins/FamilyGroup.py:248 plugins/IndivComplete.py:206
-#: plugins/IndivComplete.py:208 plugins/IndivComplete.py:444
-#: plugins/IndivSummary.py:275 plugins/NavWebPage.py:721
-#: plugins/WebPage.py:336 plugins/WebPage.py:339
+#: plugins/IndivComplete.py:208 plugins/IndivComplete.py:445
+#: plugins/IndivSummary.py:276 plugins/WebPage.py:339 plugins/WebPage.py:342
 msgid "Father"
 msgstr "Pre"
 
+#: ChooseParents.py:834
+msgid "Likely Father"
+msgstr "Pre suppos"
+
+#: ChooseParents.py:835
+msgid "Matches likely fathers"
+msgstr "Tous les pres supposs"
+
+#: ChooseParents.py:844
+msgid "Likely Mother"
+msgstr "Mre suppose"
+
+#: ChooseParents.py:845
+msgid "Matches likely mothers"
+msgstr "Toutes les mres supposes"
+
 #: ColumnOrder.py:40
 msgid "Select Columns"
 msgstr "Slectionner les colonnes"
@@ -243,54 +301,30 @@ msgstr "Affichage"
 msgid "Column Name"
 msgstr "Nom de la colonne"
 
-#: Date.py:104
+#: Date.py:105
 msgid "Gregorian"
 msgstr "Grgorien"
 
-#: Date.py:105
+#: Date.py:106
 msgid "Julian"
 msgstr "Julien"
 
-#: Date.py:106
+#: Date.py:107
 msgid "Hebrew"
 msgstr "Hbreu"
 
-#: Date.py:107
+#: Date.py:108
 msgid "French Republican"
 msgstr "Rpublicain (France)"
 
-#: Date.py:108
+#: Date.py:109
 msgid "Persian"
 msgstr "Persan"
 
-#: Date.py:109
+#: Date.py:110
 msgid "Islamic"
 msgstr "Islamique"
 
-#: DateDisplay.py:295
-msgid "Month Day, Year"
-msgstr "Mois Jour, Anne"
-
-#: DateDisplay.py:295
-msgid "Numerical"
-msgstr "Numrique"
-
-#: DateDisplay.py:295
-msgid "YYYY-MM-DD (ISO)"
-msgstr "AAAA-MM-JJ (ISO)"
-
-#: DateDisplay.py:296
-msgid "DAY MON YEAR"
-msgstr "JOUR MOIS ANNEE"
-
-#: DateDisplay.py:296
-msgid "Day Month Year"
-msgstr "Jour Mois Anne"
-
-#: DateDisplay.py:296
-msgid "MON DAY, YEAR"
-msgstr "MOIS JOUR, ANNEE"
-
 #: DateEdit.py:74 DateEdit.py:83
 msgid "Regular"
 msgstr "Normal"
@@ -327,11 +361,11 @@ msgstr "Estim
 msgid "Calculated"
 msgstr "Calcul(e)"
 
-#: DateEdit.py:193
+#: DateEdit.py:194
 msgid "Date selection"
 msgstr "Slection de la date"
 
-#: DateEdit.py:263 gramps_main.py:1149 gramps_main.py:1156
+#: DateEdit.py:264 gramps_main.py:1168 gramps_main.py:1175
 msgid "Could not open help"
 msgstr "Impossible d'ouvrir l'aide"
 
@@ -359,19 +393,20 @@ msgstr "Aide non disponible"
 msgid "GRAMPS: Open database"
 msgstr "GRAMPS : Ouvrir une base de donnes"
 
-#: DbPrompter.py:258
+#: DbPrompter.py:260
 msgid "GRAMPS: Import database"
 msgstr "Importer une base GRAMPS"
 
-#: DbPrompter.py:359
+#: DbPrompter.py:361
 msgid "GRAMPS: Create GRAMPS database"
 msgstr "GRAMPS : Crer une nouvelle base de donnes GRAMPS"
 
-#: DbPrompter.py:432
+#: DbPrompter.py:434
 msgid "GRAMPS: Select filename for a new database"
-msgstr "GRAMPS : Slectionner un nom de fichier pour la nouvelle base de donnes"
+msgstr ""
+"GRAMPS : Slectionner un nom de fichier pour la nouvelle base de donnes"
 
-#: DbPrompter.py:482
+#: DbPrompter.py:485
 msgid "Could not save file: %s"
 msgstr "Impossible de sauvegarder le fichier : %s"
 
@@ -383,7 +418,7 @@ msgstr "D
 msgid "Select file _type:"
 msgstr "Choisir un _type de fichier :"
 
-#: DbPrompter.py:611 gramps_main.py:1368
+#: DbPrompter.py:611 gramps_main.py:1388
 msgid "All files"
 msgstr "Tous les fichiers"
 
@@ -404,28 +439,27 @@ msgid "GEDCOM files"
 msgstr "Fichiers GEDCOM"
 
 #: DisplayModels.py:47 GrampsMime.py:46 GrampsMime.py:53 MergePeople.py:50
-#: PeopleModel.py:381 SelectChild.py:245 Utils.py:123 const.py:169
+#: PeopleModel.py:387 Utils.py:118 const.py:169
 #: plugins/DetAncestralReport.py:308 plugins/DetAncestralReport.py:315
 #: plugins/DetDescendantReport.py:330 plugins/DetDescendantReport.py:337
 #: plugins/FamilyGroup.py:458 plugins/IndivComplete.py:281
-#: plugins/IndivSummary.py:165 plugins/NavWebPage.py:772
-#: plugins/RelCalc.py:115 plugins/WebPage.py:652
+#: plugins/IndivSummary.py:165 plugins/RelCalc.py:115 plugins/WebPage.py:656
 msgid "unknown"
 msgstr "inconnu"
 
-#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:381 SelectChild.py:241
-#: const.py:167 plugins/RelCalc.py:111
+#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:387 const.py:167
+#: plugins/RelCalc.py:111
 msgid "male"
 msgstr "masculin"
 
-#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:381 SelectChild.py:243
-#: const.py:168 plugins/RelCalc.py:113
+#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:387 const.py:168
+#: plugins/RelCalc.py:113
 msgid "female"
 msgstr "fminin"
 
-#: DisplayModels.py:417 ImageSelect.py:980 MediaView.py:203 NoteEdit.py:104
-#: Utils.py:160 gramps.glade:5208 gramps.glade:15309 gramps.glade:25714
-#: gramps.glade:26716 gramps.glade:28084 gramps.glade:29515
+#: DisplayModels.py:468 ImageSelect.py:983 MediaView.py:243 NoteEdit.py:104
+#: Utils.py:155 gramps.glade:5501 gramps.glade:16531 gramps.glade:27709
+#: gramps.glade:28757 gramps.glade:30210 gramps.glade:31740
 msgid "Note"
 msgstr "Note"
 
@@ -447,7 +481,7 @@ msgstr ""
 msgid "Internal Error"
 msgstr "Erreur interne"
 
-#: EditPerson.py:132 EditPerson.py:634
+#: EditPerson.py:132 EditPerson.py:635
 msgid "Edit Person"
 msgstr "Editeur d'individu"
 
@@ -455,12 +489,12 @@ msgstr "Editeur d'individu"
 msgid "Patronymic:"
 msgstr "Patronyme :"
 
-#: EditPerson.py:306 EditSource.py:318 EventEdit.py:278 ImageSelect.py:1122
+#: EditPerson.py:306 EditSource.py:332 EventEdit.py:278 ImageSelect.py:1125
 #: Marriage.py:213 plugins/ScratchPad.py:166 plugins/ScratchPad.py:180
 msgid "Event"
 msgstr "Evnement"
 
-#: EditPerson.py:307 EditPerson.py:344 EditPlace.py:130 const.py:435
+#: EditPerson.py:307 EditPerson.py:344 EditPlace.py:131 const.py:435
 #: plugins/ScratchPad.py:185 plugins/ScratchPad.py:227
 #: plugins/ScratchPad.py:262
 msgid "Description"
@@ -472,22 +506,21 @@ msgstr "Description"
 msgid "Date"
 msgstr "Date"
 
-#: EditPerson.py:309 EditPlace.py:271 EditSource.py:324 ImageSelect.py:1128
-#: Marriage.py:213 MediaView.py:63 gramps.glade:12175
-#: plugins/NavWebPage.py:247 plugins/ScratchPad.py:183
+#: EditPerson.py:309 EditPlace.py:289 EditSource.py:338 ImageSelect.py:1131
+#: Marriage.py:213 gramps.glade:13109 plugins/ScratchPad.py:183
 #: plugins/ScratchPad.py:225
 msgid "Place"
 msgstr "Lieu"
 
-#: EditPerson.py:326 EditSource.py:156 ImageSelect.py:681 ImageSelect.py:951
-#: Marriage.py:214 gramps.glade:12694 plugins/FilterEditor.py:451
+#: EditPerson.py:326 EditSource.py:160 ImageSelect.py:682 ImageSelect.py:954
+#: Marriage.py:214 gramps.glade:13691 plugins/FilterEditor.py:459
 #: plugins/PatchNames.py:188 plugins/ScratchPad.py:284
 #: plugins/ScratchPad.py:317 plugins/ScratchPad.py:543
 #: plugins/ScratchPad.py:549
 msgid "Value"
 msgstr "Valeur"
 
-#: EditPerson.py:338 EditSource.py:298 ImageSelect.py:1101 MediaView.py:59
+#: EditPerson.py:338 EditSource.py:312 ImageSelect.py:1104 MediaView.py:59
 #: MergePeople.py:152 SelectObject.py:86 plugins/BookReport.py:631
 #: plugins/BookReport.py:632 plugins/PatchNames.py:185
 #: plugins/ScratchPad.py:181 plugins/ScratchPad.py:223
@@ -497,59 +530,59 @@ msgstr "Valeur"
 msgid "Type"
 msgstr "Type"
 
-#: EditPerson.py:344 EditPlace.py:129 MediaView.py:60
+#: EditPerson.py:344 EditPlace.py:130 MediaView.py:60
 #: plugins/ScratchPad.py:260
 msgid "Path"
 msgstr "Chemin"
 
-#: EditPerson.py:566 ImageSelect.py:609 ImageSelect.py:1036 MediaView.py:235
+#: EditPerson.py:567 ImageSelect.py:610 ImageSelect.py:1041 MediaView.py:275
 #: plugins/ScratchPad.py:424 plugins/ScratchPad.py:432
 msgid "Media Object"
 msgstr "Objects media"
 
-#: EditPerson.py:572 ImageSelect.py:615 docgen/AbiWord2Doc.py:327
+#: EditPerson.py:573 ImageSelect.py:616 docgen/AbiWord2Doc.py:335
 #: docgen/AsciiDoc.py:371 docgen/HtmlDoc.py:486 docgen/KwordDoc.py:494
 #: docgen/PdfDoc.py:631 docgen/RTFDoc.py:427
 msgid "Open in %s"
 msgstr "Ouvrir dans %s"
 
-#: EditPerson.py:575 ImageSelect.py:618 MediaView.py:248
+#: EditPerson.py:576 ImageSelect.py:619 MediaView.py:288
 msgid "Edit with the GIMP"
 msgstr "Afficher avec GIMP"
 
-#: EditPerson.py:577 ImageSelect.py:620
+#: EditPerson.py:578 ImageSelect.py:621
 msgid "Edit Object Properties"
 msgstr "Afficher les proprits de l'objet"
 
-#: EditPerson.py:628
+#: EditPerson.py:629
 msgid "New Person"
 msgstr "Nouvelle personne"
 
-#: EditPerson.py:753 GrampsCfg.py:63 const.py:233 const.py:246
+#: EditPerson.py:754 GrampsCfg.py:63 const.py:233 const.py:246
 msgid "None"
 msgstr "Aucun(e)"
 
-#: EditPerson.py:1288
+#: EditPerson.py:1291
 msgid "Save changes to %s?"
 msgstr "Enregistrer les changements  la fiche de %s ?"
 
-#: EditPerson.py:1289 EditPerson.py:1305 Marriage.py:622 Marriage.py:635
+#: EditPerson.py:1292 EditPerson.py:1308 Marriage.py:622 Marriage.py:635
 msgid "If you close without saving, the changes you have made will be lost"
 msgstr "Si vous fermez sans sauvegarder, vous perdrez vos modifications"
 
-#: EditPerson.py:1304
+#: EditPerson.py:1307
 msgid "Save Changes to %s?"
 msgstr "Enregistrer sous %s?"
 
-#: EditPerson.py:1650
+#: EditPerson.py:1653
 msgid "Make the selected name the preferred name"
 msgstr "Enregistrer le nom slectionner comme nom favori"
 
-#: EditPerson.py:1694
+#: EditPerson.py:1697
 msgid "Unknown gender specified"
 msgstr "Sexe inconnu"
 
-#: EditPerson.py:1695
+#: EditPerson.py:1698
 msgid ""
 "The gender of the person is currently unknown. Usually, this is a mistake. "
 "You may choose to either continue saving, or returning to the Edit Person "
@@ -559,19 +592,19 @@ msgstr ""
 "pouvez choisir de continuer la sauvegarde ou d'diter la fiche pour corriger "
 "le problme."
 
-#: EditPerson.py:1699
+#: EditPerson.py:1702
 msgid "Continue saving"
 msgstr "Continuer la sauvegarde"
 
-#: EditPerson.py:1699
+#: EditPerson.py:1702
 msgid "Return to window"
 msgstr "Retour  la fentre"
 
-#: EditPerson.py:1727 Marriage.py:654
+#: EditPerson.py:1730 Marriage.py:654
 msgid "GRAMPS ID value was not changed."
 msgstr "Les identifiants GRAMPS sont inchangs."
 
-#: EditPerson.py:1728
+#: EditPerson.py:1731
 msgid ""
 "You have attempted to change the GRAMPS ID to a value of %(grampsid)s. This "
 "value is already used by %(person)s."
@@ -579,11 +612,11 @@ msgstr ""
 "Vous tentez de changer la valeur de l'identifiant GRAMPS en %(grampsid)s. "
 "Cette valeur est dj affecte  %(person)s."
 
-#: EditPerson.py:1840
+#: EditPerson.py:1843
 msgid "Problem changing the gender"
 msgstr "Problme pour changer le sexe"
 
-#: EditPerson.py:1841
+#: EditPerson.py:1844
 msgid ""
 "Changing the gender caused problems with marriage information.\n"
 "Please check the person's marriages."
@@ -592,110 +625,108 @@ msgstr ""
 "informations disponibles sur le mariage de cet individu.\n"
 "Assurez-vous de vrifier les informations de mariage."
 
-#: EditPerson.py:1884
+#: EditPerson.py:1887
 msgid "Edit Person (%s)"
 msgstr "Editeur d'individu (%s)"
 
-#: EditPerson.py:1900 ImageSelect.py:1161
+#: EditPerson.py:1903 ImageSelect.py:1165
 msgid "Add Place (%s)"
 msgstr "Ajouter un lieu (%s)"
 
-#: EditPlace.py:90 EditPlace.py:277
+#: EditPlace.py:91 EditPlace.py:295
 msgid "Place Editor"
 msgstr "Lieu"
 
-#: EditPlace.py:149 PlaceView.py:53
+#: EditPlace.py:150 PlaceView.py:53
 msgid "City"
 msgstr "Ville"
 
-#: EditPlace.py:149 PlaceView.py:54
+#: EditPlace.py:150 PlaceView.py:54
 msgid "County"
 msgstr "Dpartement"
 
-#: EditPlace.py:150 PlaceView.py:55
+#: EditPlace.py:151 PlaceView.py:55
 msgid "State"
 msgstr "Rgion"
 
-#: EditPlace.py:150 PlaceView.py:56
+#: EditPlace.py:151 PlaceView.py:56
 msgid "Country"
 msgstr "Pays"
 
-#: EditPlace.py:266 EditPlace.py:270
+#: EditPlace.py:284 EditPlace.py:288
 msgid "New Place"
 msgstr "Nouveau lieu"
 
-#: EditPlace.py:397
+#: EditPlace.py:391
+msgid "Place title is already in use"
+msgstr "Le nom de lieu est dj utilis"
+
+#: EditPlace.py:392
+msgid ""
+"Each place must have a unique title, and title you have selected is already "
+"used by another place"
+msgstr ""
+"Chaque lieu doit avoir un titre unique. Le titre slectionn est utilis "
+"pour un autre lieu"
+
+#: EditPlace.py:427
 msgid "Edit Place (%s)"
 msgstr "Editer le lieu (%s)"
 
-#: EditPlace.py:515
+#: EditPlace.py:546
 msgid "People"
 msgstr "Individus"
 
-#: EditPlace.py:517 EditPlace.py:526
+#: EditPlace.py:548 EditPlace.py:557
 msgid "%s [%s]: event %s\n"
 msgstr "%s [%s] : vnement %s\n"
 
-#: EditPlace.py:524
+#: EditPlace.py:555
 msgid "Families"
 msgstr "Familles"
 
-#: EditPlace.py:532 Utils.py:115
+#: EditPlace.py:563 Utils.py:110
 msgid "%(father)s and %(mother)s"
 msgstr "%(father)s et %(mother)s"
 
-#: EditPlace.py:600 PlaceView.py:190
+#: EditPlace.py:633 PlaceView.py:224
 msgid "Delete Place (%s)"
 msgstr "Supprimer le lieu (%s)"
 
-#: EditSource.py:86 EditSource.py:242
+#: EditSource.py:90 EditSource.py:249
 msgid "Source Editor"
 msgstr "Source"
 
-#: EditSource.py:156
+#: EditSource.py:160
 msgid "Key"
 msgstr "Cl"
 
-#: EditSource.py:231 EditSource.py:235 Sources.py:449 Sources.py:451
+#: EditSource.py:238 EditSource.py:242 Sources.py:451 Sources.py:453
 msgid "New Source"
 msgstr "Nouvelle source"
 
-#: EditSource.py:236 EditSource.py:330 ImageSelect.py:1134 Utils.py:165
-#: Utils.py:167
+#: EditSource.py:243 EditSource.py:344 ImageSelect.py:1137 Utils.py:160
+#: Utils.py:162
 msgid "Source"
 msgstr "Source"
 
-#: EditSource.py:274 EventEdit.py:339 MergePeople.py:110 const.py:233
-#: const.py:241 plugins/EventCmp.py:408 plugins/FamilyGroup.py:200
-#: plugins/FamilyGroup.py:334 plugins/GraphViz.py:236 plugins/GraphViz.py:237
-#: plugins/NavWebPage.py:641 plugins/ScratchPad.py:464
-msgid "Birth"
-msgstr "Naissance"
-
-#: EditSource.py:274 EventEdit.py:339 MergePeople.py:112
-#: plugins/EventCmp.py:408 plugins/FamilyGroup.py:218
-#: plugins/FamilyGroup.py:336 plugins/FamilyGroup.py:338
-#: plugins/NavWebPage.py:649
-msgid "Death"
-msgstr "Dcs"
-
-#: EditSource.py:306 ImageSelect.py:1110 plugins/EventCmp.py:408
+#: EditSource.py:320 ImageSelect.py:1113 plugins/EventCmp.py:408
 msgid "Person"
 msgstr "Personne"
 
-#: EditSource.py:312 ImageSelect.py:1116
+#: EditSource.py:326 ImageSelect.py:1119
 msgid "Family"
 msgstr "Famille"
 
-#: EditSource.py:336
+#: EditSource.py:350
 msgid "Media"
 msgstr "Media"
 
-#: EditSource.py:390
+#: EditSource.py:404
 msgid "Edit Source (%s)"
 msgstr "Editer la source (%s)"
 
-#: EditSource.py:454
+#: EditSource.py:471
 msgid "Delete Source (%s)"
 msgstr "Supprimer la source (%s)"
 
@@ -719,6 +750,19 @@ msgstr "L'
 msgid "You must specify an event type before you can save the event"
 msgstr "Vous devez spcifier un type d'vnement avant de pouvoir le sauver"
 
+#: EventEdit.py:339 MergePeople.py:110 const.py:233 const.py:241
+#: plugins/EventCmp.py:408 plugins/FamilyGroup.py:200
+#: plugins/FamilyGroup.py:334 plugins/GraphViz.py:236 plugins/GraphViz.py:237
+#: plugins/ScratchPad.py:464
+msgid "Birth"
+msgstr "Naissance"
+
+#: EventEdit.py:339 MergePeople.py:112 plugins/EventCmp.py:408
+#: plugins/FamilyGroup.py:218 plugins/FamilyGroup.py:336
+#: plugins/FamilyGroup.py:338
+msgid "Death"
+msgstr "Dcs"
+
 #: EventEdit.py:341
 msgid "New event type created"
 msgstr "Le nouveau type d'vnement a t cr"
@@ -859,7 +903,7 @@ msgstr ""
 
 #: FamilyView.py:67 PedView.py:62 plugins/AncestorChart.py:56
 #: plugins/AncestorChart2.py:57 plugins/DesGraph.py:57
-#: plugins/DescendReport.py:53 plugins/WebPage.py:71
+#: plugins/DescendReport.py:53 plugins/WebPage.py:73
 msgid "b."
 msgstr "n."
 
@@ -874,9 +918,8 @@ msgid "#"
 msgstr "Numro"
 
 #: FamilyView.py:75 MergePeople.py:108 PeopleView.py:60
-#: plugins/IndivComplete.py:417 plugins/IndivSummary.py:239
-#: plugins/NavWebPage.py:632 plugins/WebPage.py:327 plugins/WebPage.py:329
-#: plugins/WebPage.py:331
+#: plugins/IndivComplete.py:418 plugins/IndivSummary.py:240
+#: plugins/WebPage.py:330 plugins/WebPage.py:332 plugins/WebPage.py:334
 msgid "Gender"
 msgstr "Sexe"
 
@@ -897,93 +940,92 @@ msgstr "Lieu de naissance"
 msgid "Death Place"
 msgstr "Lieu de dcs"
 
-#: FamilyView.py:396 FamilyView.py:406 FamilyView.py:427 FamilyView.py:434
-#: FamilyView.py:466 FamilyView.py:531 FamilyView.py:537 FamilyView.py:607
-#: FamilyView.py:613 FamilyView.py:1173 FamilyView.py:1179 FamilyView.py:1212
-#: FamilyView.py:1218 PedView.py:561 PedView.py:570 PeopleView.py:304
-#: gramps.glade:821 gramps_main.py:659 plugins/NavWebPage.py:393
-#: plugins/NavWebPage.py:396
+#: FamilyView.py:395 FamilyView.py:405 FamilyView.py:426 FamilyView.py:433
+#: FamilyView.py:465 FamilyView.py:530 FamilyView.py:536 FamilyView.py:606
+#: FamilyView.py:612 FamilyView.py:1176 FamilyView.py:1182 FamilyView.py:1215
+#: FamilyView.py:1221 PedView.py:564 PedView.py:573 PeopleView.py:301
+#: gramps.glade:822 gramps_main.py:659
 msgid "Home"
 msgstr "Personne de rfrence"
 
-#: FamilyView.py:397 PeopleView.py:287
+#: FamilyView.py:396 PeopleView.py:284
 msgid "Add Bookmark"
 msgstr "Ajouter un signet"
 
-#: FamilyView.py:400 FamilyView.py:430 FamilyView.py:459 FamilyView.py:490
-#: PedView.py:584 PedView.py:595 PeopleView.py:300
+#: FamilyView.py:399 FamilyView.py:429 FamilyView.py:458 FamilyView.py:489
+#: PedView.py:587 PedView.py:598 PeopleView.py:297
 msgid "People Menu"
 msgstr "Menu Individu"
 
-#: FamilyView.py:455 FamilyView.py:487 FamilyView.py:1192 FamilyView.py:1231
+#: FamilyView.py:454 FamilyView.py:486 FamilyView.py:1195 FamilyView.py:1234
 msgid "Add parents"
 msgstr "Ajouter des parents"
 
-#: FamilyView.py:522
+#: FamilyView.py:521
 msgid "Child Menu"
 msgstr "Menu Enfant"
 
-#: FamilyView.py:548
+#: FamilyView.py:547
 msgid "Make the selected child an active person"
 msgstr "Rendre actif l'enfant slectionn"
 
-#: FamilyView.py:549 FamilyView.py:1191 FamilyView.py:1230
+#: FamilyView.py:548 FamilyView.py:1194 FamilyView.py:1233
 msgid "Edit the child/parent relationships"
 msgstr "Modifier les relations parentales"
 
-#: FamilyView.py:550
+#: FamilyView.py:549
 msgid "Edit the selected child"
 msgstr "Modifier l'enfant slectionn"
 
-#: FamilyView.py:551
+#: FamilyView.py:550
 msgid "Remove the selected child"
 msgstr "Supprimer l'enfant slectionn"
 
-#: FamilyView.py:598
+#: FamilyView.py:597
 msgid "Spouse Menu"
 msgstr "Menu Epoux(se)"
 
-#: FamilyView.py:624
+#: FamilyView.py:623
 msgid "Make the selected spouse an active person"
 msgstr "Slectionner l'poux(se) en cours"
 
-#: FamilyView.py:625
+#: FamilyView.py:624
 msgid "Edit relationship"
 msgstr "Modifier la relation"
 
-#: FamilyView.py:626
+#: FamilyView.py:625
 msgid "Remove the selected spouse"
 msgstr "Supprimer l'poux(se) en cours"
 
-#: FamilyView.py:627
+#: FamilyView.py:626
 msgid "Edit the selected spouse"
 msgstr "Modifier l'poux(se) en cours"
 
-#: FamilyView.py:628
+#: FamilyView.py:627
 msgid "Set the selected spouse as the preferred spouse"
 msgstr "Choisir l'poux(se) en cours comme favori(te)"
 
-#: FamilyView.py:641
+#: FamilyView.py:640
 msgid "Set Preferred Spouse (%s)"
 msgstr "Dfinir le conjoint prfr (%s)"
 
-#: FamilyView.py:774
+#: FamilyView.py:773
 msgid "Modify family"
 msgstr "Modifier la famille"
 
-#: FamilyView.py:800 FamilyView.py:1445 SelectChild.py:85 SelectChild.py:148
+#: FamilyView.py:800 FamilyView.py:1448 SelectChild.py:88 SelectChild.py:153
 msgid "Add Child to Family"
 msgstr "Ajouter une enfant  la famille"
 
-#: FamilyView.py:839
+#: FamilyView.py:854
 msgid "Remove Child (%s)"
 msgstr "Enlever l'enfant (%s)"
 
-#: FamilyView.py:845
+#: FamilyView.py:862
 msgid "Remove %s as a spouse of %s?"
 msgstr "Voulez vous supprimer %s en tant qu'poux(se) de %s?"
 
-#: FamilyView.py:846
+#: FamilyView.py:863
 msgid ""
 "Removing a spouse removes the relationship between the spouse and the active "
 "person. It does not remove the spouse from the database"
@@ -991,27 +1033,27 @@ msgstr ""
 "Dtruire un poux(se) revient  dtruire son lien avec la personne "
 "slectionn. Cela ne supprime pas l'poux(se) de la base de donnes"
 
-#: FamilyView.py:849
+#: FamilyView.py:866
 msgid "_Remove Spouse"
 msgstr "_Enlever un(e) poux(se)"
 
-#: FamilyView.py:893
+#: FamilyView.py:905
 msgid "Remove Spouse (%s)"
 msgstr "Enlever le conjoint (%s)"
 
-#: FamilyView.py:934
+#: FamilyView.py:946
 msgid "Select Parents (%s)"
 msgstr "Slectionner les parents (%s)"
 
-#: FamilyView.py:1049
+#: FamilyView.py:1061
 msgid ""
 msgstr ""
 
-#: FamilyView.py:1066
+#: FamilyView.py:1078
 msgid "Database corruption detected"
 msgstr "Corruption de la base de donnes dtecte"
 
-#: FamilyView.py:1067
+#: FamilyView.py:1079
 msgid ""
 "A problem was detected with the database. Please run the Check and Repair "
 "Database tool to fix the problem."
@@ -1020,7 +1062,7 @@ msgstr ""
 "vrification et de rparation de la base de donnes pour corriger le "
 "problme."
 
-#: FamilyView.py:1118
+#: FamilyView.py:1130
 msgid ""
 "%s: %s [%s]\n"
 "\tRelationship: %s"
@@ -1028,31 +1070,31 @@ msgstr ""
 "%s : %s [%s]\n"
 "\tRelation : %s"
 
-#: FamilyView.py:1120
+#: FamilyView.py:1132
 msgid "%s: unknown"
 msgstr "%s : inconnu"
 
-#: FamilyView.py:1164
+#: FamilyView.py:1167
 msgid "Parents Menu"
 msgstr "Menu Parents"
 
-#: FamilyView.py:1190 FamilyView.py:1229
+#: FamilyView.py:1193 FamilyView.py:1232
 msgid "Make the selected parents the active family"
 msgstr "Choisir les parents en cours comme famille en cours"
 
-#: FamilyView.py:1193 FamilyView.py:1232
+#: FamilyView.py:1196 FamilyView.py:1235
 msgid "Remove parents"
 msgstr "Supprimer les parents"
 
-#: FamilyView.py:1203
+#: FamilyView.py:1206
 msgid "Spouse Parents Menu"
 msgstr "Menu des parents de l'poux(se)"
 
-#: FamilyView.py:1295 FamilyView.py:1310
+#: FamilyView.py:1298 FamilyView.py:1313
 msgid "Remove Parents of %s"
 msgstr "Supprimer les parents de %s"
 
-#: FamilyView.py:1296 FamilyView.py:1311
+#: FamilyView.py:1299 FamilyView.py:1314
 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 "
@@ -1062,559 +1104,629 @@ msgstr ""
 "parents. Cela ne supprime pas les parents de la base de donnes et la "
 "relation entre les parents ne sera nullement modifie."
 
-#: FamilyView.py:1300 FamilyView.py:1315
+#: FamilyView.py:1303 FamilyView.py:1318
 msgid "_Remove Parents"
 msgstr "_Supprimer les Parents"
 
-#: FamilyView.py:1408
+#: FamilyView.py:1411
 msgid "Remove Parents (%s)"
 msgstr "Supprimer les parents (%s)"
 
-#: FamilyView.py:1476
+#: FamilyView.py:1483
 msgid "Attempt to Reorder Children Failed"
 msgstr "La tentative de rordonner les enfants a chou"
 
-#: FamilyView.py:1477
+#: FamilyView.py:1484
 msgid "Children must be ordered by their birth dates."
 msgstr "Les enfants doivent tre tris par date de naissance."
 
-#: FamilyView.py:1482
+#: FamilyView.py:1489
 msgid "Reorder children"
 msgstr "Rordonner les enfants"
 
-#: FamilyView.py:1516
+#: FamilyView.py:1523
 msgid "Reorder spouses"
 msgstr "Rordonner les conjoints"
 
-#: GenericFilter.py:113
+#: GenericFilter.py:91
 msgid "Miscellaneous filters"
 msgstr "Filtres divers"
 
-#: GenericFilter.py:116 rule.glade:1165
+#: GenericFilter.py:92 rule.glade:1165
 msgid "No description"
 msgstr "Pas de description"
 
-#: GenericFilter.py:145 GenericFilter.py:167 GenericFilter.py:294
-#: GenericFilter.py:316 GenericFilter.py:341 GenericFilter.py:362
-#: GenericFilter.py:384 GenericFilter.py:1059 GenericFilter.py:1392
-#: GenericFilter.py:1431 GenericFilter.py:1456 GenericFilter.py:1588
-#: GenericFilter.py:1686 GenericFilter.py:1787 GenericFilter.py:1811
-#: GenericFilter.py:1926
-msgid "General filters"
-msgstr "Filtres gnraux"
+#: GenericFilter.py:131
+msgid "Everyone"
+msgstr "Tout le monde"
 
-#: GenericFilter.py:148
+#: GenericFilter.py:133
 msgid "Matches everyone in the database"
 msgstr "Assortir tout un chacun dans la base"
 
-#: GenericFilter.py:170
-msgid "Matches individuals that have no relationships"
-msgstr "Trouver les individus sans relations"
+#: GenericFilter.py:146
+msgid "Disconnected people"
+msgstr "Individus dconnects"
 
-#: GenericFilter.py:186 GenericFilter.py:285 GenericFilter.py:401
-#: GenericFilter.py:481 GenericFilter.py:528 GenericFilter.py:664
-#: GenericFilter.py:714 GenericFilter.py:820 GenericFilter.py:875
-#: GenericFilter.py:971 gramps.glade:3363 gramps.glade:19154
-#: gramps.glade:21342 gramps.glade:22739 plugins/FilterEditor.py:677
+#: GenericFilter.py:148
+msgid ""
+"Matches people that have no family relationships to any other person in the "
+"database"
+msgstr ""
+"Assortir les individus n'ayant de relation avec aucun individu de la base"
+
+#: GenericFilter.py:164 GenericFilter.py:260 GenericFilter.py:368
+#: GenericFilter.py:459 GenericFilter.py:502 GenericFilter.py:623
+#: GenericFilter.py:670 GenericFilter.py:768 GenericFilter.py:820
+#: GenericFilter.py:907 gramps.glade:3521 gramps.glade:20666
+#: gramps.glade:23027 gramps.glade:24539 plugins/FilterEditor.py:680
 msgid "ID:"
 msgstr "Id :"
 
-#: GenericFilter.py:202
+#: GenericFilter.py:165
+msgid "Relationship path between "
+msgstr "Relation entre "
+
+#: GenericFilter.py:166
 msgid "Relationship filters"
 msgstr "Filtres relationnels"
 
-#: GenericFilter.py:205
+#: GenericFilter.py:167
 msgid ""
-"Matches the ancestors of two people back to a common ancestor, producing the "
-"relationship path between two people."
+"Matches the ancestors of two persons back to a common ancestor, producing "
+"the relationship path between two persons."
 msgstr ""
 "Assortir les anctres de deux individus  un anctre commun, de faon  "
 "relier ces deux personnes."
 
-#: GenericFilter.py:291
-msgid "Matches the person with a specified GRAMPS ID"
-msgstr "Assortir l'individu  son identifiant GRAMPS"
+#: GenericFilter.py:261
+msgid "People with "
+msgstr "Individus avec "
 
-#: GenericFilter.py:313
+#: GenericFilter.py:262
+msgid "Matches people with a specified GRAMPS ID"
+msgstr "Assortir les individus avec l'identifiant GRAMPS"
+
+#: GenericFilter.py:276
+msgid "Default person"
+msgstr "Individu par dfaut"
+
+#: GenericFilter.py:278
 msgid "Matches the default person"
 msgstr "Trouver l'individu par dfaut"
 
-#: GenericFilter.py:338
+#: GenericFilter.py:299
+msgid "Bookmarked people"
+msgstr "Personnes avec un marque-pages"
+
+#: GenericFilter.py:301
 msgid "Matches the people on the bookmark list"
 msgstr "Trouver les personnes sur un marque-page"
 
-#: GenericFilter.py:365
+#: GenericFilter.py:322
+msgid "People with complete records"
+msgstr "Individus ayant un enregistrement complet"
+
+#: GenericFilter.py:324
 msgid "Matches all people whose records are complete"
 msgstr "Rassemble les individus aux enregistrements complets"
 
-#: GenericFilter.py:387
+#: GenericFilter.py:337 gramps_main.py:957 plugins/Summary.py:113
+msgid "Females"
+msgstr "Femmes"
+
+#: GenericFilter.py:339
 msgid "Matches all females"
 msgstr "Corresponds  toutes les femmes de la base de donnes"
 
-#: GenericFilter.py:401 GenericFilter.py:455 GenericFilter.py:714
-#: GenericFilter.py:772 plugins/FilterEditor.py:689
+#: GenericFilter.py:352 gramps_main.py:967
+msgid "People with unknown gender"
+msgstr "Individus sans sexe connu"
+
+#: GenericFilter.py:354
+msgid "Matches all people with unknown gender"
+msgstr "Rassemble les individus sans sexe connu"
+
+#: GenericFilter.py:368 GenericFilter.py:416 GenericFilter.py:670
+#: GenericFilter.py:724 plugins/FilterEditor.py:692
 msgid "Inclusive:"
 msgstr "Inclusif :"
 
-#: GenericFilter.py:425 GenericFilter.py:464 GenericFilter.py:496
-#: GenericFilter.py:547 GenericFilter.py:670
+#: GenericFilter.py:369
+msgid "Descendants of "
+msgstr "Descendants de "
+
+#: GenericFilter.py:370 GenericFilter.py:418 GenericFilter.py:461
+#: GenericFilter.py:504 GenericFilter.py:625
 msgid "Descendant filters"
 msgstr "Filtres des descendants"
 
-#: GenericFilter.py:428
+#: GenericFilter.py:371
 msgid "Matches all descendants for the specified person"
 msgstr "Assortir selon les descendants de la personne spcifie"
 
-#: GenericFilter.py:455 GenericFilter.py:573 GenericFilter.py:618
-#: GenericFilter.py:772 GenericFilter.py:928 GenericFilter.py:1020
-#: GenericFilter.py:1475 GenericFilter.py:1518 plugins/FilterEditor.py:681
+#: GenericFilter.py:416 GenericFilter.py:544 GenericFilter.py:582
+#: GenericFilter.py:724 GenericFilter.py:870 GenericFilter.py:951
+#: GenericFilter.py:1343 GenericFilter.py:1386 plugins/FilterEditor.py:684
 msgid "Filter name:"
 msgstr "Filtre sur le nom :"
 
-#: GenericFilter.py:467
-msgid "Matches people that are descendants of someone matched by a filter"
-msgstr "Assortir les descendants d'un individu aux rsultats du filtrage"
+#: GenericFilter.py:417
+msgid "Descendants of  match"
+msgstr "Est le descendant du filtre "
 
-#: GenericFilter.py:481 GenericFilter.py:528 GenericFilter.py:820
-#: GenericFilter.py:875 plugins/FilterEditor.py:675
+#: GenericFilter.py:419
+msgid "Matches people that are descendants of anybody matched by a filter"
+msgstr "Descendants des individus rsultant d'un filtre"
+
+#: GenericFilter.py:459 GenericFilter.py:502 GenericFilter.py:768
+#: GenericFilter.py:820 plugins/FilterEditor.py:678
 msgid "Number of generations:"
 msgstr "Nombre de gnrations :"
 
-#: GenericFilter.py:499
+#: GenericFilter.py:460
+msgid "Descendants of  not more than  generations away"
+msgstr "Est le descendant de  sur moins de  gnrations"
+
+#: GenericFilter.py:462
 msgid ""
 "Matches people that are descendants of a specified person not more than N "
 "generations away"
 msgstr "Assortir les descendants d'un individu sur moins de N gnrations"
 
-#: GenericFilter.py:543
+#: GenericFilter.py:503
+msgid "Descendants of  at least  generations away"
+msgstr "Est le descendant de  sur au moins  gnrations"
+
+#: GenericFilter.py:505
 msgid ""
 "Matches people that are descendants of a specified person at least N "
 "generations away"
 msgstr "Assortir les descendants d'un individu sur au moins N gnrations"
 
-#: GenericFilter.py:592
-msgid "Matches the person that is a child of someone matched by a filter"
-msgstr "Assortir les enfants d'un individu aux rsultats du filtrage"
+#: GenericFilter.py:545
+msgid "Children of  match"
+msgstr "Enfants du filtre "
 
-#: GenericFilter.py:595 GenericFilter.py:640 GenericFilter.py:950
-#: GenericFilter.py:1192 GenericFilter.py:1527 GenericFilter.py:1560
-#: GenericFilter.py:1612 GenericFilter.py:1638 GenericFilter.py:1662
+#: GenericFilter.py:546 GenericFilter.py:584 GenericFilter.py:872
+#: GenericFilter.py:1096 GenericFilter.py:1389 GenericFilter.py:1412
+#: GenericFilter.py:1442 GenericFilter.py:1457 GenericFilter.py:1470
 msgid "Family filters"
 msgstr "Filtres familiaux"
 
-#: GenericFilter.py:637
-msgid "Matches the person that is a sibling of someone matched by a filter"
-msgstr "Trouver les frres et soeurs d'une personne grce  un filtre"
+#: GenericFilter.py:547
+msgid "Matches children of anybody matched by a filter"
+msgstr "Enfants des individus rsultant d'un filtre"
 
-#: GenericFilter.py:673
+#: GenericFilter.py:583
+msgid "Siblings of  match"
+msgstr "Est un frre ou une soeur du filtre "
+
+#: GenericFilter.py:585
+msgid "Matches siblings of anybody matched by a filter"
+msgstr "Frres et soeurs des individus rsultant d'un filtre"
+
+#: GenericFilter.py:624
+msgid "Descendant family members of "
+msgstr "Est un membre de la famille descendant de "
+
+#: GenericFilter.py:626
 msgid ""
 "Matches people that are descendants or the spouse of a descendant of a "
 "specified person"
 msgstr "Assortir les descendants ou leurs poux(se)  un individu"
 
-#: GenericFilter.py:737
-msgid "Matches people that are ancestors of a specified person"
-msgstr "Assortir les ascendants  un individu"
+#: GenericFilter.py:671
+msgid "Ancestors of "
+msgstr "Anctres de "
 
-#: GenericFilter.py:740 GenericFilter.py:806 GenericFilter.py:839
-#: GenericFilter.py:894 GenericFilter.py:981 GenericFilter.py:1030
+#: GenericFilter.py:672 GenericFilter.py:726 GenericFilter.py:770
+#: GenericFilter.py:822 GenericFilter.py:909 GenericFilter.py:955
 msgid "Ancestral filters"
 msgstr "Filtres des ascendants"
 
-#: GenericFilter.py:802
-msgid "Matches people that are ancestors of someone matched by a filter"
+#: GenericFilter.py:673
+msgid "Matches people that are ancestors of a specified person"
+msgstr "Assortir les ascendants  un individu"
+
+#: GenericFilter.py:725
+msgid "Ancestors of  match"
+msgstr "Est l'ascendant du filtre "
+
+#: GenericFilter.py:727
+#, fuzzy
+msgid "Matches people that are ancestors of anybody matched by a filter"
 msgstr "Assortir les ascendants d'un individu aux rsultats du filtrage"
 
-#: GenericFilter.py:835
+#: GenericFilter.py:769
+#, fuzzy
+msgid "Ancestors of  not more than  generations away"
+msgstr "Est l'ascendant d'un individu sur moins de N gnrations"
+
+#: GenericFilter.py:771
 msgid ""
 "Matches people that are ancestors of a specified person not more than N "
 "generations away"
 msgstr "Assortir les ascendants d'un individu sur moins de N gnrations"
 
-#: GenericFilter.py:890
+#: GenericFilter.py:821
+#, fuzzy
+msgid "Ancestors of  at least  generations away"
+msgstr "Est l'ascendant d'un individu sur au moins N gnrations"
+
+#: GenericFilter.py:823
 msgid ""
 "Matches people that are ancestors of a specified person at least N "
 "generations away"
 msgstr "Assortir les ascendants d'un individu sur au moins N gnrations"
 
-#: GenericFilter.py:947
-msgid "Matches the person that is a parent of someone matched by a filter"
-msgstr "Assortir les parents d'un individu aux rsultats du filtrage"
+#: GenericFilter.py:871
+#, fuzzy
+msgid "Parents of  match"
+msgstr "Est le parent d'un individu rsultant du filtrage"
 
-#: GenericFilter.py:977
+#: GenericFilter.py:873
+#, fuzzy
+msgid "Matches parents of anybody matched by a filter"
+msgstr "Assortir les ascendants d'un individu aux rsultats du filtrage"
+
+#: GenericFilter.py:908
+#, fuzzy
+msgid "People with a common ancestor with "
+msgstr "Personnes dont l'anctre commun est %s"
+
+#: GenericFilter.py:910
 msgid "Matches people that have a common ancestor with a specified person"
 msgstr "Assortir les individus ayant des ascendants commun  un individu"
 
-#: GenericFilter.py:1026
-msgid "Matches people that have a common ancestor with someone matched by a filter"
-msgstr "Assortir les individus ayant des ascendants commun aux rsultats du filtrage"
+#: GenericFilter.py:952
+#, fuzzy
+msgid "People with a common ancestor with  match"
+msgstr "A un ascendant commun avec les individus rsultant du filtrage"
 
-#: GenericFilter.py:1062
+#: GenericFilter.py:953
+#, fuzzy
+msgid ""
+"Matches people that have a common ancestor with anybody matched by a filter"
+msgstr ""
+"Assortir les individus ayant des ascendants commun aux rsultats du filtrage"
+
+#: GenericFilter.py:978 gramps_main.py:962 plugins/Summary.py:112
+msgid "Males"
+msgstr "Hommes"
+
+#: GenericFilter.py:980
 msgid "Matches all males"
 msgstr "Corresponds  tous les hommes de la base de donnes"
 
-#: GenericFilter.py:1075 GenericFilter.py:1128 GenericFilter.py:1239
-#: GenericFilter.py:1285 gramps.glade:8407 gramps.glade:10647
-#: gramps.glade:12223 gramps.glade:15757
-msgid "Description:"
-msgstr "Description :"
-
-#: GenericFilter.py:1075 GenericFilter.py:1128 GenericFilter.py:1239
-#: GenericFilter.py:1285 gramps.glade:8455 gramps.glade:13682
-#: plugins/FilterEditor.py:673
-msgid "Place:"
-msgstr "Lieu :"
-
-#: GenericFilter.py:1075 GenericFilter.py:1128 GenericFilter.py:1239
-#: GenericFilter.py:1285 gramps.glade:8503 gramps.glade:9429
-#: gramps.glade:12127 gramps.glade:13634
-msgid "Date:"
-msgstr "Date :"
-
-#: GenericFilter.py:1075 GenericFilter.py:1826 plugins/FilterEditor.py:58
+#: GenericFilter.py:993 GenericFilter.py:1575 plugins/FilterEditor.py:58
 msgid "Personal event:"
 msgstr "Evnement individuel :"
 
-#: GenericFilter.py:1088
-msgid "Matches the person with a personal event of a particular value"
+#: GenericFilter.py:994 GenericFilter.py:1043 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:9101 gramps.glade:10129
+#: gramps.glade:13053 gramps.glade:14701
+msgid "Date:"
+msgstr "Date :"
+
+#: GenericFilter.py:995 GenericFilter.py:1044 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:9045 gramps.glade:14757
+#: plugins/FilterEditor.py:676
+msgid "Place:"
+msgstr "Lieu :"
+
+#: GenericFilter.py:996 GenericFilter.py:1045 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:8989 gramps.glade:11453
+#: gramps.glade:13165 gramps.glade:16998
+msgid "Description:"
+msgstr "Description :"
+
+#: GenericFilter.py:997
+#, fuzzy
+msgid "People with the personal "
+msgstr "A l'vnement individuel"
+
+#: GenericFilter.py:998
+#, fuzzy
+msgid "Matches people with a personal event of a particular value"
 msgstr "Assortir les individus ayant un vnement individuel de mme valeur"
 
-#: GenericFilter.py:1091 GenericFilter.py:1144 GenericFilter.py:1255
-#: GenericFilter.py:1301 GenericFilter.py:1716 GenericFilter.py:1747
-#: GenericFilter.py:1843 GenericFilter.py:2046
+#: GenericFilter.py:999 GenericFilter.py:1048 GenericFilter.py:1145
+#: GenericFilter.py:1184 GenericFilter.py:1502 GenericFilter.py:1522
+#: GenericFilter.py:1578
 msgid "Event filters"
 msgstr "Filtres vnements"
 
-#: GenericFilter.py:1128 GenericFilter.py:1826 plugins/FilterEditor.py:59
+#: GenericFilter.py:1042 GenericFilter.py:1575 plugins/FilterEditor.py:59
 msgid "Family event:"
 msgstr "Evnement familial :"
 
-#: GenericFilter.py:1141
-msgid "Matches the person with a family event of a particular value"
+#: GenericFilter.py:1046
+#, fuzzy
+msgid "People with the family "
+msgstr "A l'vnement familial"
+
+#: GenericFilter.py:1047
+#, fuzzy
+msgid "Matches people with a family event of a particular value"
 msgstr "Assortir les individu ayant un vnement familial de mme valeur"
 
-#: GenericFilter.py:1181
+#: GenericFilter.py:1091
 msgid "Number of relationships:"
 msgstr "Nombre de relations :"
 
-#: GenericFilter.py:1182 plugins/FilterEditor.py:65
+#: GenericFilter.py:1092 plugins/FilterEditor.py:65
 msgid "Relationship type:"
 msgstr "Type de relation :"
 
-#: GenericFilter.py:1183
+#: GenericFilter.py:1093
 msgid "Number of children:"
 msgstr "Nombre d'enfants :"
 
-#: GenericFilter.py:1189
-msgid "Matches the person who has a particular relationship"
+#: GenericFilter.py:1094
+#, fuzzy
+msgid "People with the "
+msgstr "A les relations"
+
+#: GenericFilter.py:1095
+#, fuzzy
+msgid "Matches people with a particular relationship"
 msgstr "Assortir les individus ayant une relation identique"
 
-#: GenericFilter.py:1252
-msgid "Matches the person with a birth of a particular value"
+#: GenericFilter.py:1143
+#, fuzzy
+msgid "People with the "
+msgstr "Individus sans date de naissance"
+
+#: GenericFilter.py:1144
+#, fuzzy
+msgid "Matches people with birth data of a particular value"
 msgstr "Assortir les individus ayant une mme date de naissance"
 
-#: GenericFilter.py:1298
-msgid "Matches the person with a death of a particular value"
+#: GenericFilter.py:1182
+#, fuzzy
+msgid "People with the "
+msgstr "Individus sans date de naissance"
+
+#: GenericFilter.py:1183
+#, fuzzy
+msgid "Matches people with death data of a particular value"
 msgstr "Assortir les individus ayant une mme date de dcs"
 
-#: GenericFilter.py:1331 GenericFilter.py:1356 gramps.glade:9017
-#: gramps.glade:22070 gramps.glade:23077
+#: GenericFilter.py:1220 GenericFilter.py:1244 gramps.glade:9674
+#: gramps.glade:23827 gramps.glade:24909
 msgid "Value:"
 msgstr "Valeur :"
 
-#: GenericFilter.py:1331 plugins/FilterEditor.py:60
+#: GenericFilter.py:1220 plugins/FilterEditor.py:60
 msgid "Personal attribute:"
 msgstr "Attribut individuel :"
 
-#: GenericFilter.py:1356 plugins/FilterEditor.py:61
+#: GenericFilter.py:1221
+#, fuzzy
+msgid "People with the personal "
+msgstr "A l'attribut individuel"
+
+#: GenericFilter.py:1222
+#, fuzzy
+msgid "Matches people with the personal attribute of a particular value"
+msgstr "Assortir les individus ayant un vnement individuel de mme valeur"
+
+#: GenericFilter.py:1244 plugins/FilterEditor.py:61
 msgid "Family attribute:"
 msgstr "Attribut familial :"
 
-#: GenericFilter.py:1383 gramps.glade:3457 gramps.glade:7885
-#: gramps.glade:19248 gramps.glade:21487 gramps.glade:30957
-#: mergedata.glade:905 mergedata.glade:927
-msgid "Title:"
-msgstr "Titre :"
+#: GenericFilter.py:1245
+#, fuzzy
+msgid "People with the family "
+msgstr "A l'attribut familial"
 
-#: GenericFilter.py:1383 gramps.glade:7813
-msgid "Suffix:"
-msgstr "Suffixe :"
+#: GenericFilter.py:1246
+#, fuzzy
+msgid "Matches people with the family attribute of a particular value"
+msgstr "Assortir les individu ayant un vnement familial de mme valeur"
 
-#: GenericFilter.py:1383 gramps.glade:7837
-msgid "Family name:"
-msgstr "Nom de famille :"
-
-#: GenericFilter.py:1383 gramps.glade:7861
+#: GenericFilter.py:1270 gramps.glade:8380
 msgid "Given name:"
 msgstr "Prnom :"
 
-#: GenericFilter.py:1389 GenericFilter.py:1428
-msgid "Matches the person with a specified (partial) name"
+#: GenericFilter.py:1271 gramps.glade:8352
+msgid "Family name:"
+msgstr "Nom de famille :"
+
+#: GenericFilter.py:1272 gramps.glade:8324
+msgid "Suffix:"
+msgstr "Suffixe :"
+
+#: GenericFilter.py:1273 gramps.glade:3631 gramps.glade:8408
+#: gramps.glade:20776 gramps.glade:23196 gramps.glade:33293
+#: mergedata.glade:874 mergedata.glade:896
+msgid "Title:"
+msgstr "Titre :"
+
+#: GenericFilter.py:1274
+#, fuzzy
+msgid "People with the "
+msgstr "Individus ayant des noms incomplets"
+
+#: GenericFilter.py:1275 GenericFilter.py:1307
+#, fuzzy
+msgid "Matches people with a specified (partial) name"
 msgstr "Assortir les individus ayant quasiment le mme nom"
 
-#: GenericFilter.py:1422 GenericFilter.py:1887
+#: GenericFilter.py:1305 GenericFilter.py:1629
 msgid "Substring:"
 msgstr "Sous-chaine :"
 
-#: GenericFilter.py:1453
-msgid "Matches people with firstname or lastname missing"
-msgstr "Trouver les personnes sans nom ou sans prnom"
+#: GenericFilter.py:1306
+#, fuzzy
+msgid "People matching the "
+msgstr "Individus ayant des noms incomplets"
 
-#: GenericFilter.py:1524
-msgid "Matches the person married to someone matching a filter"
-msgstr "Assortir les individus maris  un individu rsultant du filtrage"
-
-#: GenericFilter.py:1557
-msgid "Matches person who were adopted"
-msgstr "Individus ayant t adopts"
-
-#: GenericFilter.py:1585
-msgid "Matches person who have images in the gallery"
-msgstr "Trouver les personnes ayant des images dans la galerie"
-
-#: GenericFilter.py:1609
-msgid "Matches persons who have children"
-msgstr "Trouver les personnes ayant des enfants"
-
-#: GenericFilter.py:1635
-msgid "Matches persons who have have no spouse"
-msgstr "Trouver les personnes sans conjoints"
-
-#: GenericFilter.py:1659
-msgid "Matches persons who have more than one spouse"
-msgstr "Trouver les personnes ayant plus d'un conjoint"
-
-#: GenericFilter.py:1683
-msgid "Matches persons without a birthdate"
-msgstr "Individus sans date de naissance"
-
-#: GenericFilter.py:1713
-msgid "Matches persons with missing date or place in an event"
-msgstr "Individus sans dates ou lieu dans un vnement"
-
-#: GenericFilter.py:1744
-msgid "Matches persons with missing date or place in an event of the family"
-msgstr "Individus avec un date ou lieu manquant dans un vnement de famille"
-
-#: GenericFilter.py:1772
-msgid "On year:"
-msgstr "L'anne :"
-
-#: GenericFilter.py:1784
-msgid "Matches persons without indications of death that are not too old"
-msgstr "Individus dans indications de dcs qui ne sont pas trop vieilles"
-
-#: GenericFilter.py:1808
-msgid "Matches persons that are indicated as private"
-msgstr "Individus marqus comme privs"
-
-#: GenericFilter.py:1840
-msgid "Matches persons who are witnesses in an event"
-msgstr "Tmoins d'un vnement"
-
-#: GenericFilter.py:1887 plugins/FilterEditor.py:691
-msgid "Case sensitive:"
-msgstr "Sensible  la casse :"
-
-#: GenericFilter.py:1887 plugins/FilterEditor.py:693
-msgid "Regular-Expression matching:"
-msgstr "Expression rgulire :"
-
-#: GenericFilter.py:1923
-msgid "Matches persons whose records contain text matching a substring"
-msgstr "Individus dont un enregistrement contient une sous-chaine"
-
-#: GenericFilter.py:2037 plugins/FilterEditor.py:679
-msgid "Source ID:"
-msgstr "Identifiant de la source :"
-
-#: GenericFilter.py:2049
-msgid "Matches people who have a particular source"
-msgstr "Individus avec une source particulire"
-
-#: GenericFilter.py:2195
-msgid "Everyone"
-msgstr "Tout le monde"
-
-#: GenericFilter.py:2196
-msgid "Is default person"
-msgstr "Individu par dfaut"
-
-#: GenericFilter.py:2197
-msgid "Is bookmarked person"
-msgstr "Individu avec un marque-page"
-
-#: GenericFilter.py:2198
-msgid "Has the Id"
-msgstr "A l'identifiant"
-
-#: GenericFilter.py:2199
-msgid "Has a name"
-msgstr "A un nom"
-
-#: GenericFilter.py:2200
-msgid "Has the relationships"
-msgstr "A les relations"
-
-#: GenericFilter.py:2201
-msgid "Has the death"
-msgstr "A le dcs"
-
-#: GenericFilter.py:2202
-msgid "Has the birth"
-msgstr "A la naissance"
-
-#: GenericFilter.py:2203
-msgid "Is a descendant of"
-msgstr "Est le descendant de"
-
-#: GenericFilter.py:2204
-msgid "Is a descendant family member of"
-msgstr "Est un membre de la famille descendant de"
-
-#: GenericFilter.py:2205
-msgid "Is a descendant of filter match"
-msgstr "Est le descendant d'un individu rsultant du filtrage"
-
-#: GenericFilter.py:2206
-msgid "Is a descendant of person not more than N generations away"
-msgstr "Est le descendant d'un individu sur moins de N gnrations"
-
-#: GenericFilter.py:2208
-msgid "Is a descendant of person at least N generations away"
-msgstr "Est le descendant d'un individu sur au moins N gnrations"
-
-#: GenericFilter.py:2210
-msgid "Is a child of filter match"
-msgstr "Est un enfant d'un individu rsultant du filtrage"
-
-#: GenericFilter.py:2211
-msgid "Is an ancestor of"
-msgstr "Est l'anctre de"
-
-#: GenericFilter.py:2212
-msgid "Is an ancestor of filter match"
-msgstr "Est l'ascendant d'un individu rsultant du filtrage"
-
-#: GenericFilter.py:2213
-msgid "Is an ancestor of person not more than N generations away"
-msgstr "Est l'ascendant d'un individu sur moins de N gnrations"
-
-#: GenericFilter.py:2215
-msgid "Is an ancestor of person at least N generations away"
-msgstr "Est l'ascendant d'un individu sur au moins N gnrations"
-
-#: GenericFilter.py:2217
-msgid "Is a parent of filter match"
-msgstr "Est le parent d'un individu rsultant du filtrage"
-
-#: GenericFilter.py:2218
-msgid "Has a common ancestor with"
-msgstr "A un anctre commun avec"
-
-#: GenericFilter.py:2219
-msgid "Has a common ancestor with filter match"
-msgstr "A un ascendant commun avec les individus rsultant du filtrage"
-
-#: GenericFilter.py:2221
-msgid "Is a female"
-msgstr "Est une femme"
-
-#: GenericFilter.py:2222
-msgid "Is a male"
-msgstr "Est un homme"
-
-#: GenericFilter.py:2223
-msgid "Has complete record"
-msgstr "A un enregistrement complet"
-
-#: GenericFilter.py:2224
-msgid "Has the personal event"
-msgstr "A l'vnement individuel"
-
-#: GenericFilter.py:2225
-msgid "Has the family event"
-msgstr "A l'vnement familial"
-
-#: GenericFilter.py:2226
-msgid "Has the personal attribute"
-msgstr "A l'attribut individuel"
-
-#: GenericFilter.py:2227
-msgid "Has the family attribute"
-msgstr "A l'attribut familial"
-
-#: GenericFilter.py:2228
-msgid "Has source of"
-msgstr "Contient la source"
-
-#: GenericFilter.py:2229
-msgid "Matches the filter named"
-msgstr "Correspond au critre suivant"
-
-#: GenericFilter.py:2230
-msgid "Is spouse of filter match"
-msgstr "Est l'poux(se) d'un individu rsultant du filtrage"
-
-#: GenericFilter.py:2231
-msgid "Is a sibling of filter match"
-msgstr "Est un frre ou une soeur d'un individu rsultant du filtrage"
-
-#: GenericFilter.py:2232
-msgid "Relationship path between two people"
-msgstr "Relation entre deux individus"
-
-#: GenericFilter.py:2234 gramps_main.py:977
-msgid "People who were adopted"
-msgstr "Individus ayant t adopts"
-
-#: GenericFilter.py:2235 gramps_main.py:982
-msgid "People who have images"
-msgstr "Individus ayant des images"
-
-#: GenericFilter.py:2236 gramps_main.py:992
-msgid "People with children"
-msgstr "Individus ayant des enfants"
-
-#: GenericFilter.py:2237 gramps_main.py:987
+#: GenericFilter.py:1323 gramps_main.py:992
 msgid "People with incomplete names"
 msgstr "Individus ayant des noms incomplets"
 
-#: GenericFilter.py:2238 gramps_main.py:997
+#: GenericFilter.py:1324
+msgid "Matches people with firstname or lastname missing"
+msgstr "Trouver les personnes sans nom ou sans prnom"
+
+#: GenericFilter.py:1344
+#, fuzzy
+msgid "People matching the "
+msgstr "Slection du fichier"
+
+#: GenericFilter.py:1345
+#, fuzzy
+msgid "Matches people macthed by the specified filter name"
+msgstr "Assortir les individus ayant quasiment le mme nom"
+
+#: GenericFilter.py:1387
+#, fuzzy
+msgid "Spouses of  match"
+msgstr "Est l'poux(se) d'un individu rsultant du filtrage"
+
+#: GenericFilter.py:1388
+#, fuzzy
+msgid "Matches people married to anybody matching a filter"
+msgstr "Assortir les individus maris  un individu rsultant du filtrage"
+
+#: GenericFilter.py:1410 gramps_main.py:982
+#, fuzzy
+msgid "Adopted people"
+msgstr "Adoption"
+
+#: GenericFilter.py:1411
+#, fuzzy
+msgid "Matches people who were adopted"
+msgstr "Individus ayant t adopts"
+
+#: GenericFilter.py:1427 gramps_main.py:987
+#, fuzzy
+msgid "People with images"
+msgstr "Individus ayant des images"
+
+#: GenericFilter.py:1428
+#, fuzzy
+msgid "Matches people with images in the gallery"
+msgstr "Trouver les personnes ayant des images dans la galerie"
+
+#: GenericFilter.py:1440 gramps_main.py:997
+msgid "People with children"
+msgstr "Individus ayant des enfants"
+
+#: GenericFilter.py:1441
+#, fuzzy
+msgid "Matches people who have children"
+msgstr "Trouver les personnes ayant des enfants"
+
+#: GenericFilter.py:1455 gramps_main.py:1002
 msgid "People with no marriage records"
 msgstr "Individus sans aucun mariage"
 
-#: GenericFilter.py:2239 gramps_main.py:1002
+#: GenericFilter.py:1456
+#, fuzzy
+msgid "Matches people who have no spouse"
+msgstr "Trouver les personnes sans conjoints"
+
+#: GenericFilter.py:1468 gramps_main.py:1007
 msgid "People with multiple marriage records"
 msgstr "Individus ayant contract plusieurs mariages"
 
-#: GenericFilter.py:2240 gramps_main.py:1007
-msgid "People without a birth date"
+#: GenericFilter.py:1469
+#, fuzzy
+msgid "Matches people who have more than one spouse"
+msgstr "Trouver les personnes ayant plus d'un conjoint"
+
+#: GenericFilter.py:1481 gramps_main.py:1012
+#, fuzzy
+msgid "People without a known birth date"
 msgstr "Individus sans date de naissance"
 
-#: GenericFilter.py:2241 gramps_main.py:1012
+#: GenericFilter.py:1482
+#, fuzzy
+msgid "Matches people without a known birthdate"
+msgstr "Individus sans date de naissance"
+
+#: GenericFilter.py:1500 gramps_main.py:1017
 msgid "People with incomplete events"
 msgstr "Individus ayant des vnements incomplets"
 
-#: GenericFilter.py:2242 gramps_main.py:1017
+#: GenericFilter.py:1501
+#, fuzzy
+msgid "Matches people with missing date or place in an event"
+msgstr "Individus sans dates ou lieu dans un vnement"
+
+#: GenericFilter.py:1520 gramps_main.py:1022
 msgid "Families with incomplete events"
 msgstr "Familles avec des vnements incomplets"
 
-#: GenericFilter.py:2243 gramps_main.py:1022
+#: GenericFilter.py:1521
+#, fuzzy
+msgid "Matches people with missing date or place in an event of the family"
+msgstr "Individus avec un date ou lieu manquant dans un vnement de famille"
+
+#: GenericFilter.py:1542
+msgid "On year:"
+msgstr "L'anne :"
+
+#: GenericFilter.py:1543 gramps_main.py:1027
 msgid "People probably alive"
 msgstr "Personnes probablement en vie"
 
-#: GenericFilter.py:2244 gramps_main.py:1027
+#: GenericFilter.py:1544
+#, fuzzy
+msgid "Matches people without indications of death that are not too old"
+msgstr "Individus dans indications de dcs qui ne sont pas trop vieilles"
+
+#: GenericFilter.py:1562 gramps_main.py:1032
 msgid "People marked private"
 msgstr "Individus marqus comme privs"
 
-#: GenericFilter.py:2245 gramps.glade:25893 gramps_main.py:1032
+#: GenericFilter.py:1563
+#, fuzzy
+msgid "Matches people that are indicated as private"
+msgstr "Individus marqus comme privs"
+
+#: GenericFilter.py:1576 gramps.glade:27895 gramps_main.py:1037
 msgid "Witnesses"
 msgstr "Tmoins"
 
-#: GenericFilter.py:2247
-msgid "Has text matching substring of"
-msgstr "A du texte contenant"
+#: GenericFilter.py:1577
+#, fuzzy
+msgid "Matches people who are witnesses in any event"
+msgstr "Tmoins d'un vnement"
+
+#: GenericFilter.py:1630 plugins/FilterEditor.py:694
+msgid "Case sensitive:"
+msgstr "Sensible  la casse :"
+
+#: GenericFilter.py:1631 plugins/FilterEditor.py:696
+msgid "Regular-Expression matching:"
+msgstr "Expression rgulire :"
+
+#: GenericFilter.py:1632
+#, fuzzy
+msgid "People with records containing "
+msgstr "Individus dont un enregistrement contient une sous-chaine"
+
+#: GenericFilter.py:1633
+#, fuzzy
+msgid "Matches people whose records contain text matching a substring"
+msgstr "Individus dont un enregistrement contient une sous-chaine"
+
+#: GenericFilter.py:1799 plugins/FilterEditor.py:682
+msgid "Source ID:"
+msgstr "Identifiant de la source :"
+
+#: GenericFilter.py:1800
+#, fuzzy
+msgid "People with the "
+msgstr "Individus ayant des enfants"
+
+#: GenericFilter.py:1802
+msgid "Matches people who have a particular source"
+msgstr "Individus avec une source particulire"
 
 #: GrampsCfg.py:62
 msgid "Father's surname"
@@ -1628,7 +1740,7 @@ msgstr "Combinaison des noms de la m
 msgid "Icelandic style"
 msgstr "Style islandais"
 
-#: GrampsCfg.py:70 GrampsCfg.py:74 gramps.glade:7700 gramps.glade:21802
+#: GrampsCfg.py:70 GrampsCfg.py:74 gramps.glade:8195 gramps.glade:23539
 msgid "General"
 msgstr "Gnral"
 
@@ -1652,47 +1764,47 @@ msgstr "Identifiants GRAMPS"
 msgid "Researcher Information"
 msgstr "Chercheur"
 
-#: GrampsDbBase.py:938 GrampsDbBase.py:976
+#: GrampsDbBase.py:953 GrampsDbBase.py:991
 msgid "_Undo %s"
 msgstr "_Annuler %s"
 
-#: ImageSelect.py:485 ImageSelect.py:506
+#: ImageSelect.py:486 ImageSelect.py:507
 msgid "Drag Media Object"
 msgstr "Glisser un objet media"
 
-#: ImageSelect.py:496 RelImage.py:52
+#: ImageSelect.py:497 RelImage.py:51
 msgid "Could not import %s"
 msgstr "Impossible d'importer %s"
 
-#: ImageSelect.py:567 plugins/SimpleBookTitle.py:237
+#: ImageSelect.py:568 plugins/SimpleBookTitle.py:237
 msgid "Select an Object"
 msgstr "Slectionner un objet"
 
-#: ImageSelect.py:669
+#: ImageSelect.py:670
 msgid "Media Reference Editor"
 msgstr "Editeur de rfrence de media"
 
-#: ImageSelect.py:765
+#: ImageSelect.py:766
 msgid "Media Reference"
 msgstr "Rfrence de media"
 
-#: ImageSelect.py:771
+#: ImageSelect.py:772
 msgid "Reference Editor"
 msgstr "Editeur de rfrence"
 
-#: ImageSelect.py:827 ImageSelect.py:1190 MediaView.py:305
+#: ImageSelect.py:828 ImageSelect.py:1194 MediaView.py:345
 msgid "Edit Media Object"
 msgstr "Editer l'objet media"
 
-#: ImageSelect.py:909
+#: ImageSelect.py:912
 msgid "Media Properties Editor"
 msgstr "Editeur de proprits de media"
 
-#: ImageSelect.py:1042
+#: ImageSelect.py:1047
 msgid "Properties Editor"
 msgstr "Editeur de proprits"
 
-#: ImageSelect.py:1285
+#: ImageSelect.py:1291
 msgid "Remove Media Object"
 msgstr "Supprimer un objet media"
 
@@ -1704,7 +1816,7 @@ msgstr "Endroit"
 msgid "Marriage/Relationship Editor"
 msgstr "Editeur de mariage et de relation"
 
-#: Marriage.py:146 Marriage.py:805 Marriage.py:828 Utils.py:135
+#: Marriage.py:146 Marriage.py:805 Marriage.py:828 Utils.py:130
 msgid "%s and %s"
 msgstr "%s et %s"
 
@@ -1717,15 +1829,16 @@ msgid "Save Changes?"
 msgstr "Enregistrer les modifications?"
 
 #: Marriage.py:655
-msgid "The GRAMPS ID that you chose for this relationship is already being used."
+msgid ""
+"The GRAMPS ID that you chose for this relationship is already being used."
 msgstr "L'identifiant GRAMPS choisi pour cette relation est dj utilis."
 
 #: Marriage.py:711
 msgid "Edit Marriage"
 msgstr "Editer le mariage"
 
-#: MediaView.py:57 MediaView.py:137 SelectObject.py:85 SourceView.py:51
-#: SourceView.py:90 Sources.py:108 Sources.py:242
+#: MediaView.py:57 MediaView.py:174 SelectObject.py:85 SourceView.py:51
+#: SourceView.py:116 Sources.py:108 Sources.py:242
 #: plugins/AncestorChart2.py:482 plugins/BookReport.py:789
 #: plugins/PatchNames.py:218 plugins/ScratchPad.py:354
 #: plugins/ScratchPad.py:542 plugins/ScratchPad.py:548
@@ -1737,19 +1850,19 @@ msgstr "Titre"
 msgid "Last Changed"
 msgstr "Dernire modification"
 
-#: MediaView.py:212 SelectObject.py:130
+#: MediaView.py:252 SelectObject.py:129
 msgid "The file no longer exists"
 msgstr "Ce fichier n'existe plus"
 
-#: MediaView.py:244
+#: MediaView.py:284
 msgid "View in the default viewer"
 msgstr "Afficher avec le logiciel par dfaut"
 
-#: MediaView.py:260
+#: MediaView.py:300
 msgid "Edit properties"
 msgstr "Modifier les proprits"
 
-#: MediaView.py:317
+#: MediaView.py:357
 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."
@@ -1757,19 +1870,19 @@ msgstr ""
 "Ce media est actuellement utilis, si vous le supprimez, il sera dtruit "
 "dans la base ainsi que toute rfrence au sein des enregistrements."
 
-#: MediaView.py:321
+#: MediaView.py:361
 msgid "Deleting media object will remove it from the database."
 msgstr "Supprimer l'objet le supprimera de la base de donnes."
 
-#: MediaView.py:324
+#: MediaView.py:364
 msgid "Delete Media Object?"
 msgstr "Supprimer un media ?"
 
-#: MediaView.py:325
+#: MediaView.py:365
 msgid "_Delete Media Object"
 msgstr "_Supprimer un media"
 
-#: MediaView.py:382
+#: MediaView.py:421
 msgid "Image import failed"
 msgstr "L'importation de l'image a chou"
 
@@ -1793,12 +1906,11 @@ msgstr "Comparer des personnes"
 msgid "Alternate Names"
 msgstr "Autres noms"
 
-#: MergePeople.py:122 gramps.glade:8928 gramps.glade:12659
-#: plugins/NavWebPage.py:657
+#: MergePeople.py:122 gramps.glade:9573 gramps.glade:13652
 msgid "Events"
 msgstr "Evnements"
 
-#: MergePeople.py:129 PedView.py:693 plugins/NavWebPage.py:717
+#: MergePeople.py:129 PedView.py:696
 msgid "Parents"
 msgstr "Parents"
 
@@ -1810,7 +1922,7 @@ msgstr "Num
 msgid "No parents found"
 msgstr "Pas de parents"
 
-#: MergePeople.py:140 PedView.py:598 plugins/NavWebPage.py:730
+#: MergePeople.py:140 PedView.py:601
 msgid "Spouses"
 msgstr "Conjoints"
 
@@ -1823,7 +1935,7 @@ msgstr "Epoux(se)"
 msgid "Marriage"
 msgstr "Mariage"
 
-#: MergePeople.py:159 const.py:902
+#: MergePeople.py:159 const.py:909
 msgid "Child"
 msgstr "Enfant"
 
@@ -1831,7 +1943,7 @@ msgstr "Enfant"
 msgid "No spouses or children found"
 msgstr "Pas d'poux ni d'enfant"
 
-#: MergePeople.py:165 gramps.glade:10078
+#: MergePeople.py:165 gramps.glade:10857
 msgid "Addresses"
 msgstr "Adresses"
 
@@ -1907,29 +2019,28 @@ msgstr "inh."
 msgid "crem."
 msgstr "crem."
 
-#: PedView.py:379
+#: PedView.py:382
 msgid "Anchor"
 msgstr "Ancre"
 
-#: PedView.py:496
+#: PedView.py:499
 msgid "Double clicking will make %s the active person"
 msgstr "Un double clic activera l'individu %s"
 
-#: PedView.py:563
+#: PedView.py:566
 msgid "Set anchor"
 msgstr "Jeter l'ancre"
 
-#: PedView.py:564
+#: PedView.py:567
 msgid "Remove anchor"
 msgstr "Lever l'ancre"
 
-#: PedView.py:629 plugins/WebPage.py:711
+#: PedView.py:632 plugins/WebPage.py:715
 msgid "Siblings"
 msgstr "Frres et soeurs"
 
-#: PedView.py:659 plugins/FamilyGroup.py:400 plugins/IndivComplete.py:295
-#: plugins/IndivSummary.py:179 plugins/NavWebPage.py:739
-#: plugins/WebPage.py:670
+#: PedView.py:662 plugins/FamilyGroup.py:400 plugins/IndivComplete.py:295
+#: plugins/IndivSummary.py:179 plugins/WebPage.py:674
 msgid "Children"
 msgstr "Enfants"
 
@@ -1941,25 +2052,25 @@ msgstr "Derni
 msgid "Cause of Death"
 msgstr "Cause du dcs"
 
-#: PeopleView.py:83 WriteGedcom.py:327 gramps_main.py:952
-#: plugins/EventCmp.py:158 plugins/ExportVCalendar.py:81
+#: PeopleView.py:83 WriteGedcom.py:329 gramps_main.py:952
+#: plugins/EventCmp.py:158 plugins/ExportVCalendar.py:82
 #: plugins/ExportVCard.py:84 plugins/GraphViz.py:513
-#: plugins/IndivComplete.py:509 plugins/NavWebPage.py:1067
-#: plugins/StatisticsChart.py:827 plugins/TimeLine.py:411
-#: plugins/WebPage.py:1261 plugins/WriteFtree.py:86 plugins/WriteGeneWeb.py:87
+#: plugins/IndivComplete.py:510 plugins/StatisticsChart.py:827
+#: plugins/TimeLine.py:411 plugins/WebPage.py:1265 plugins/WriteFtree.py:86
+#: plugins/WriteGeneWeb.py:87
 msgid "Entire Database"
 msgstr "Toute la base de donnes"
 
-#: PeopleView.py:263 gramps_main.py:1643
+#: PeopleView.py:260 gramps_main.py:1672
 msgid "Updating display..."
 msgstr "Chargement en cours ..."
 
-#: PeopleView.py:291 PlaceView.py:169 SourceView.py:158 gramps.glade:955
+#: PeopleView.py:288 PlaceView.py:203 SourceView.py:191 gramps.glade:956
 #: plugins/BookReport.py:832
 msgid "Edit"
 msgstr "Editer"
 
-#: PlaceView.py:49 PlaceView.py:93
+#: PlaceView.py:49 PlaceView.py:120
 msgid "Place Name"
 msgstr "Nom du lieu"
 
@@ -1979,15 +2090,15 @@ msgstr "Longitude"
 msgid "Latitude"
 msgstr "Latitude"
 
-#: PlaceView.py:173
+#: PlaceView.py:207
 msgid "Place Menu"
 msgstr "Menu des lieux"
 
-#: PlaceView.py:220 SourceView.py:194 gramps_main.py:1448
+#: PlaceView.py:254 SourceView.py:227 gramps_main.py:1468
 msgid "Delete %s?"
 msgstr "Supprimer %s ?"
 
-#: PlaceView.py:221
+#: PlaceView.py:255
 msgid ""
 "This place is currently being used by at least one record in the database. "
 "Deleting it will remove it from the database and remove it from all records "
@@ -1997,15 +2108,15 @@ msgstr ""
 "base, le supprimer revient  la fois  le supprimer de la base et des "
 "enregistrements y faisant rfrence."
 
-#: PlaceView.py:225
+#: PlaceView.py:259
 msgid "_Delete Place"
 msgstr "_Supprimer un lieu"
 
-#: PlaceView.py:248
+#: PlaceView.py:290
 msgid "Cannot merge places."
 msgstr "GRAMPS n'a pas pu accomplir la fusion de lieux demande."
 
-#: PlaceView.py:249
+#: PlaceView.py:291
 msgid ""
 "Exactly two places must be selected to perform a merge. A second place can "
 "be selected by holding down the control key while clicking on the desired "
@@ -2024,13 +2135,13 @@ msgstr "Inclassable"
 
 #: PluginMgr.py:162 PluginMgr.py:163 PluginMgr.py:164 PluginMgr.py:189
 #: PluginMgr.py:191 PluginMgr.py:192 PluginMgr.py:223 PluginMgr.py:224
-#: PluginMgr.py:225 ReportUtils.py:1755 Witness.py:83 Witness.py:166
-#: const.py:234 const.py:247 const.py:493 const.py:506 gramps_main.py:1721
-#: plugins/Check.py:474 plugins/ScratchPad.py:78 plugins/WebPage.py:331
+#: PluginMgr.py:225 ReportUtils.py:1757 Witness.py:83 Witness.py:166
+#: const.py:234 const.py:247 const.py:493 gramps_main.py:1750
+#: plugins/Check.py:474 plugins/ScratchPad.py:78 plugins/WebPage.py:334
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: Plugins.py:125 gramps.glade:1396
+#: Plugins.py:125 gramps.glade:1427
 msgid "_Apply"
 msgstr "_Appliquer"
 
@@ -2083,13 +2194,14 @@ msgid "Reload plugins"
 msgstr "Recharger les modules"
 
 #: Plugins.py:727 plugins/Eval.py:140 plugins/Leak.py:136
-#: plugins/TestcaseGenerator.py:648
+#: plugins/TestcaseGenerator.py:779
 msgid "Debug"
 msgstr "Dboguer"
 
 #: Plugins.py:728
 msgid "Attempt to reload plugins. Note: This tool itself is not reloaded!"
-msgstr "Essayer de recharger les modules. Note : cet outil ne sera pas recharg !"
+msgstr ""
+"Essayer de recharger les modules. Note : cet outil ne sera pas recharg !"
 
 #: ReadGedcom.py:79 ReadGedcom.py:80
 msgid "Windows 9x file system"
@@ -2111,14 +2223,14 @@ msgstr "Partage r
 msgid "GEDCOM import status"
 msgstr "Avancement de l'importation GEDCOM"
 
-#: ReadGedcom.py:187 ReadGedcom.py:201 plugins/ImportGeneWeb.py:68
-#: plugins/ImportGeneWeb.py:71 plugins/ImportGeneWeb.py:79
+#: ReadGedcom.py:187 ReadGedcom.py:201 plugins/ImportGeneWeb.py:69
+#: plugins/ImportGeneWeb.py:72 plugins/ImportGeneWeb.py:80
 #: plugins/ImportvCard.py:66 plugins/ImportvCard.py:69
 #: plugins/ImportvCard.py:77
 msgid "%s could not be opened\n"
 msgstr "GRAMPS n'a pas pu ouvrir %s\n"
 
-#: ReadGedcom.py:269 ReadGedcom.py:1724
+#: ReadGedcom.py:269 ReadGedcom.py:1747
 msgid "Import from %s"
 msgstr "Importer depuis %s"
 
@@ -2154,7 +2266,7 @@ msgstr "Attention : la ligne %d 
 msgid "Warning: line %d was not understood, so it was ignored."
 msgstr "Attention : la ligne %d n'a pas t reconnue, elle sera donc ignore."
 
-#: ReadGedcom.py:510 plugins/ImportGeneWeb.py:162 plugins/ImportvCard.py:158
+#: ReadGedcom.py:510 plugins/ImportGeneWeb.py:163 plugins/ImportvCard.py:158
 msgid "Import Complete: %d seconds"
 msgstr "Importation termine : %d secondes"
 
@@ -2162,11 +2274,11 @@ msgstr "Importation termin
 msgid "GEDCOM import"
 msgstr "Import GEDCOM"
 
-#: ReadGedcom.py:1179 ReadGedcom.py:1223
+#: ReadGedcom.py:1189 ReadGedcom.py:1234
 msgid "Warning: could not import %s"
 msgstr "Attention : importation impossible %s"
 
-#: ReadGedcom.py:1180 ReadGedcom.py:1224
+#: ReadGedcom.py:1190 ReadGedcom.py:1235
 msgid ""
 "\tThe following paths were tried:\n"
 "\t\t"
@@ -2174,15 +2286,26 @@ msgstr ""
 "\tLes chemins suivants ont t essays :\n"
 "\t\t"
 
-#: ReadGedcom.py:1744
+#: ReadGedcom.py:1767
 msgid "Overridden"
 msgstr "Ecras"
 
-#: ReadGrdb.py:60 ReadXML.py:104 ReadXML.py:111 WriteGrdb.py:57
+#: ReadGrdb.py:60 ReadGrdb.py:68 ReadXML.py:104 ReadXML.py:111 WriteGrdb.py:57
 msgid "%s could not be opened"
 msgstr "%s ouverture impossible"
 
-#: ReadGrdb.py:98 ReadGrdb.py:162
+#: ReadGrdb.py:65
+msgid ""
+"The database version is not supported by this version of GRAMPS.\n"
+"Please upgrade to the corresponding version or use XML for porting data "
+"between different database versions."
+msgstr ""
+
+#: ReadGrdb.py:69
+msgid "The Database version is not supported by this version of GRAMPS."
+msgstr ""
+
+#: ReadGrdb.py:107 ReadGrdb.py:171
 msgid "Import database"
 msgstr "Importer une base de donnes"
 
@@ -2192,7 +2315,8 @@ msgstr "Erreur de lecture de %s"
 
 #: ReadXML.py:134
 msgid "The file is probably either corrupt or not a valid GRAMPS database."
-msgstr "Ce fichier est probablement corrompu ou n'est pas une base GRAMPS valide."
+msgstr ""
+"Ce fichier est probablement corrompu ou n'est pas une base GRAMPS valide."
 
 #: ReadXML.py:173
 msgid "Could not copy file"
@@ -2202,15 +2326,15 @@ msgstr "Erreur lors de la copie du fichier"
 msgid "GRAMPS XML import"
 msgstr "Import de fichier au format XML GRAMPS"
 
-#: RelImage.py:53
+#: RelImage.py:52
 msgid "The file has been moved or deleted"
 msgstr "Le fichier a t dplac ou dtruit"
 
-#: RelImage.py:66 RelImage.py:79
+#: RelImage.py:65 RelImage.py:78
 msgid "Cannot display %s"
 msgstr "Affichage de %s impossible"
 
-#: RelImage.py:67 RelImage.py:80
+#: RelImage.py:66 RelImage.py:79
 msgid ""
 "GRAMPS is not able to display the image file. This may be caused by a "
 "corrupt file."
@@ -2218,7 +2342,60 @@ msgstr ""
 "GRAMPS n'est pas capable d'afficher cette image. Cela peut tre du  un "
 "fichier corrompu."
 
+#: Relationship.py:268
+#, fuzzy
+msgid "husband"
+msgstr "Mari"
+
+#: Relationship.py:270
+#, fuzzy
+msgid "wife"
+msgstr "Femme"
+
+#: Relationship.py:272
+#, fuzzy
+msgid "gender unknown|spouse"
+msgstr "(sexe inconnu)"
+
+#: Relationship.py:275
+#, fuzzy
+msgid "unmarried|husband"
+msgstr "N'est plus mari(e)"
+
 #: Relationship.py:277
+#, fuzzy
+msgid "unmarried|wife"
+msgstr "N'est plus mari(e)"
+
+#: Relationship.py:279
+msgid "gender unknown,unmarried|spouse"
+msgstr ""
+
+#: Relationship.py:282
+msgid "male,civil union|partner"
+msgstr ""
+
+#: Relationship.py:284
+msgid "female,civil union|partner"
+msgstr ""
+
+#: Relationship.py:286
+msgid "gender unknown,civil union|partner"
+msgstr ""
+
+#: Relationship.py:289
+msgid "male,unknown relation|partner"
+msgstr ""
+
+#: Relationship.py:291
+msgid "female,unknown relation|partner"
+msgstr ""
+
+#: Relationship.py:293
+msgid "gender unknown,unknown relation|partner"
+msgstr ""
+
+#: Relationship.py:325
 msgid "Relationship loop detected"
 msgstr "Relation en boucle dtecte"
 
@@ -2230,7 +2407,7 @@ msgstr "Mod
 msgid "User Defined Template"
 msgstr "Modle utilisateur"
 
-#: Report.py:152 Report.py:172 Utils.py:279
+#: Report.py:152 Report.py:172 Utils.py:274
 msgid "default"
 msgstr "dfaut"
 
@@ -2386,7 +2563,7 @@ msgstr "Style"
 msgid "Report Options"
 msgstr "Options du rapport"
 
-#: Report.py:658 plugins/FilterEditor.py:331 plugins/FilterEditor.py:517
+#: Report.py:658 plugins/FilterEditor.py:339 plugins/FilterEditor.py:525
 msgid "Filter"
 msgstr "Filtre"
 
@@ -2398,7 +2575,7 @@ msgstr "G
 msgid "Page break between generations"
 msgstr "Saut de page entre les gnrations"
 
-#: Report.py:868 Witness.py:211 plugins/FilterEditor.py:211
+#: Report.py:868 Witness.py:211 plugins/FilterEditor.py:219
 msgid "Select Person"
 msgstr "Slectionner un individu"
 
@@ -2438,8 +2615,8 @@ msgstr "Taille"
 msgid "Height"
 msgstr "Hauteur"
 
-#: Report.py:1199 Report.py:1215 gramps.glade:20289 gramps.glade:20313
-#: gramps.glade:20337 gramps.glade:20769
+#: Report.py:1199 Report.py:1215 gramps.glade:21900 gramps.glade:21928
+#: gramps.glade:21956 gramps.glade:22416
 msgid "cm"
 msgstr "cm"
 
@@ -2459,15 +2636,15 @@ msgstr "Compteur de page"
 msgid "HTML Options"
 msgstr "Options HTML"
 
-#: Report.py:1262 plugins/WebPage.py:1435
+#: Report.py:1262 plugins/WebPage.py:1439
 msgid "Template"
 msgstr "Modle"
 
-#: Report.py:1286 plugins/WebPage.py:1436
+#: Report.py:1286 plugins/WebPage.py:1440
 msgid "User Template"
 msgstr "Modle utilisateur"
 
-#: Report.py:1290 plugins/WebPage.py:1394
+#: Report.py:1290 plugins/WebPage.py:1398
 msgid "Choose File"
 msgstr "Choisir un fichier"
 
@@ -2488,7 +2665,8 @@ msgid "File already exists"
 msgstr "Fichier existant"
 
 #: Report.py:1329
-msgid "You can choose to either overwrite the file, or change the selected filename."
+msgid ""
+"You can choose to either overwrite the file, or change the selected filename."
 msgstr ""
 "Vous pouvez choisir soit d'craser le fichier ou de changer de nom de "
 "fichier."
@@ -2501,25 +2679,25 @@ msgstr "_Ecraser"
 msgid "_Change filename"
 msgstr "_Renommer"
 
-#: ReportUtils.py:297 ReportUtils.py:298 Utils.py:170 Utils.py:172
+#: ReportUtils.py:297 ReportUtils.py:298 Utils.py:165 Utils.py:167
 msgid "Private"
 msgstr "Priv(e)"
 
-#: ReportUtils.py:502 ReportUtils.py:1056 ReportUtils.py:1154
-#: ReportUtils.py:1445 ReportUtils.py:1538 plugins/DetAncestralReport.py:192
+#: ReportUtils.py:504 ReportUtils.py:1058 ReportUtils.py:1156
+#: ReportUtils.py:1447 ReportUtils.py:1540 plugins/DetAncestralReport.py:192
 #: plugins/DetAncestralReport.py:350 plugins/DetDescendantReport.py:216
 #: plugins/DetDescendantReport.py:371
 msgid "He"
 msgstr "Il"
 
-#: ReportUtils.py:504 ReportUtils.py:1058 ReportUtils.py:1156
-#: ReportUtils.py:1447 ReportUtils.py:1540 plugins/DetAncestralReport.py:194
+#: ReportUtils.py:506 ReportUtils.py:1060 ReportUtils.py:1158
+#: ReportUtils.py:1449 ReportUtils.py:1542 plugins/DetAncestralReport.py:194
 #: plugins/DetAncestralReport.py:348 plugins/DetDescendantReport.py:218
 #: plugins/DetDescendantReport.py:369
 msgid "She"
 msgstr "Elle"
 
-#: ReportUtils.py:517
+#: ReportUtils.py:519
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died %(death_date)s in %(death_place)s%"
@@ -2529,7 +2707,7 @@ msgstr ""
 "(birth_endnotes)s, et dcd le %(death_date)s  %(death_place)s%"
 "(death_endnotes)s."
 
-#: ReportUtils.py:526
+#: ReportUtils.py:528
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
@@ -2537,7 +2715,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s est n le %(birth_date)s  %(birth_place)s%"
 "(birth_endnotes)s, et dcd le %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:535
+#: ReportUtils.py:537
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
@@ -2545,7 +2723,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s est n le %(birth_date)s  %(birth_place)s%"
 "(birth_endnotes)s, et dcd  %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:543
+#: ReportUtils.py:545
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s."
@@ -2553,7 +2731,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s est n le %(birth_date)s  %(birth_place)s%"
 "(birth_endnotes)s."
 
-#: ReportUtils.py:551
+#: ReportUtils.py:553
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died %(death_date)s in %(death_place)s%(death_endnotes)s."
@@ -2561,7 +2739,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s est n le %(birth_date)s%(birth_endnotes)s, et "
 "dcd le %(death_date)s  %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:560
+#: ReportUtils.py:562
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died %(death_date)s%(death_endnotes)s."
@@ -2569,7 +2747,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s est n le %(birth_date)s%(birth_endnotes)s, et "
 "dcd le %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:569
+#: ReportUtils.py:571
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died in %(death_place)s%(death_endnotes)s."
@@ -2577,11 +2755,11 @@ msgstr ""
 "%(male_name)s%(endnotes)s est n le %(birth_date)s%(birth_endnotes)s, et "
 "dcd  %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:577
+#: ReportUtils.py:579
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s est n le %(birth_date)s%(birth_endnotes)s."
 
-#: ReportUtils.py:585
+#: ReportUtils.py:587
 msgid ""
 "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and "
 "died %(death_date)s in %(death_place)s%(death_endnotes)s."
@@ -2589,7 +2767,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s est n  %(birth_place)s%(birth_endnotes)s, et "
 "dcd le %(death_date)s  %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:594
+#: ReportUtils.py:596
 msgid ""
 "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and "
 "died %(death_date)s%(death_endnotes)s."
@@ -2597,7 +2775,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s est n  %(birth_place)s%(birth_endnotes)s, et "
 "dcd le %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:603
+#: ReportUtils.py:605
 msgid ""
 "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and "
 "died in %(death_place)s%(death_endnotes)s."
@@ -2605,11 +2783,12 @@ msgstr ""
 "%(male_name)s%(endnotes)s est n le %(birth_place)s%(birth_endnotes)s, et "
 "dcd  %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:611
-msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s."
+#: ReportUtils.py:613
+msgid ""
+"%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s est n  %(birth_place)s%(birth_endnotes)s."
 
-#: ReportUtils.py:619
+#: ReportUtils.py:621
 msgid ""
 "%(male_name)s%(endnotes)s died %(death_date)s in %(death_place)s%"
 "(death_endnotes)s."
@@ -2617,19 +2796,21 @@ msgstr ""
 "%(male_name)s%(endnotes)s est dcd le %(death_date)s  %(death_place)s%"
 "(death_endnotes)s."
 
-#: ReportUtils.py:625
+#: ReportUtils.py:627
 msgid "%(male_name)s%(endnotes)s died %(death_date)s%(death_endnotes)s."
-msgstr "%(male_name)s%(endnotes)s est dcd le %(death_date)s%(death_endnotes)s."
+msgstr ""
+"%(male_name)s%(endnotes)s est dcd le %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:632
+#: ReportUtils.py:634
 msgid "%(male_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s."
-msgstr "%(male_name)s%(endnotes)s est dcd  %(death_place)s%(death_endnotes)s."
+msgstr ""
+"%(male_name)s%(endnotes)s est dcd  %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:638
+#: ReportUtils.py:640
 msgid "%(male_name)s%(endnotes)s."
 msgstr "%(male_name)s%(endnotes)s."
 
-#: ReportUtils.py:645
+#: ReportUtils.py:647
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died %(death_date)s in %(death_place)s%"
@@ -2639,7 +2820,7 @@ msgstr ""
 "(birth_endnotes)s, et dcd %(death_date)s  %(death_place)s%"
 "(death_endnotes)s."
 
-#: ReportUtils.py:654
+#: ReportUtils.py:656
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
@@ -2647,7 +2828,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s est ne le %(birth_date)s  %(birth_place)s%"
 "(birth_endnotes)s, et dcd %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:663
+#: ReportUtils.py:665
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
@@ -2655,7 +2836,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s est ne le %(birth_date)s  %(birth_place)s%"
 "(birth_endnotes)s, et dcd  %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:671
+#: ReportUtils.py:673
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s."
@@ -2663,7 +2844,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s est ne le %(birth_date)s  %(birth_place)s%"
 "(birth_endnotes)s."
 
-#: ReportUtils.py:679
+#: ReportUtils.py:681
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died %(death_date)s in %(death_place)s%(death_endnotes)s."
@@ -2671,7 +2852,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s est ne le %(birth_date)s%(birth_endnotes)s, and "
 "dcde %(death_date)s  %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:688
+#: ReportUtils.py:690
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died %(death_date)s%(death_endnotes)s."
@@ -2679,7 +2860,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s est ne le %(birth_date)s%(birth_endnotes)s, and "
 "dcde %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:697
+#: ReportUtils.py:699
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died in %(death_place)s%(death_endnotes)s."
@@ -2687,11 +2868,12 @@ msgstr ""
 "%(female_name)s%(endnotes)s est ne le %(birth_date)s%(birth_endnotes)s, and "
 "dcde  %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:705
+#: ReportUtils.py:707
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s."
-msgstr "%(female_name)s%(endnotes)s est ne le %(birth_date)s%(birth_endnotes)s."
+msgstr ""
+"%(female_name)s%(endnotes)s est ne le %(birth_date)s%(birth_endnotes)s."
 
-#: ReportUtils.py:713
+#: ReportUtils.py:715
 msgid ""
 "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
 "and died %(death_date)s in %(death_place)s%(death_endnotes)s."
@@ -2699,7 +2881,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s est ne  %(birth_place)s%(birth_endnotes)s, et "
 "dcd %(death_date)s  %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:722
+#: ReportUtils.py:724
 msgid ""
 "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
 "and died %(death_date)s%(death_endnotes)s."
@@ -2707,7 +2889,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s est ne  %(birth_place)s%(birth_endnotes)s, et "
 "dcd %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:731
+#: ReportUtils.py:733
 msgid ""
 "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
 "and died in %(death_place)s%(death_endnotes)s."
@@ -2715,11 +2897,13 @@ msgstr ""
 "%(female_name)s%(endnotes)s est ne  %(birth_place)s%(birth_endnotes)s, et "
 "dcd  %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:739
-msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s."
-msgstr "%(female_name)s%(endnotes)s est ne  %(birth_place)s%(birth_endnotes)s."
+#: ReportUtils.py:741
+msgid ""
+"%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s."
+msgstr ""
+"%(female_name)s%(endnotes)s est ne  %(birth_place)s%(birth_endnotes)s."
 
-#: ReportUtils.py:747
+#: ReportUtils.py:749
 msgid ""
 "%(female_name)s%(endnotes)s died %(death_date)s in %(death_place)s%"
 "(death_endnotes)s."
@@ -2727,199 +2911,200 @@ msgstr ""
 "%(female_name)s%(endnotes)s dcde %(death_date)s  %(death_place)s%"
 "(death_endnotes)s."
 
-#: ReportUtils.py:753
+#: ReportUtils.py:755
 msgid "%(female_name)s%(endnotes)s died %(death_date)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s dcde %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:760
+#: ReportUtils.py:762
 msgid "%(female_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s."
-msgstr "%(female_name)s%(endnotes)s dcde  %(death_place)s%(death_endnotes)s."
+msgstr ""
+"%(female_name)s%(endnotes)s dcde  %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:766
+#: ReportUtils.py:768
 msgid "%(female_name)s%(endnotes)s."
 msgstr "%(female_name)s%(endnotes)s."
 
-#: ReportUtils.py:820
+#: ReportUtils.py:822
 msgid "He married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "il pousa %(spouse)s %(date)s  %(place)s%(endnotes)s."
 
-#: ReportUtils.py:826
+#: ReportUtils.py:828
 msgid "She married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "elle pousa %(spouse)s %(date)s  %(place)s%(endnotes)s."
 
-#: ReportUtils.py:833
+#: ReportUtils.py:835
 msgid "He married %(spouse)s %(date)s%(endnotes)s."
 msgstr "il pousa %(spouse)s %(date)s%(endnotes)s."
 
-#: ReportUtils.py:838 ReportUtils.py:849
+#: ReportUtils.py:840 ReportUtils.py:851
 msgid "She married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "elle pousa %(spouse)s  %(place)s%(endnotes)s."
 
-#: ReportUtils.py:844
+#: ReportUtils.py:846
 msgid "He married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "il pousa %(spouse)s  %(place)s%(endnotes)s."
 
-#: ReportUtils.py:855
+#: ReportUtils.py:857
 msgid "He married %(spouse)s%(endnotes)s."
 msgstr "il pousa %(spouse)s%(endnotes)s."
 
-#: ReportUtils.py:859
+#: ReportUtils.py:861
 msgid "She married %(spouse)s%(endnotes)s."
 msgstr "Elle pousa %(spouse)s%(endnotes)s."
 
-#: ReportUtils.py:865
+#: ReportUtils.py:867
 msgid "He also married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Il pousa galement %(spouse)s %(date)s  %(place)s%(endnotes)s."
 
-#: ReportUtils.py:871
+#: ReportUtils.py:873
 msgid "She also married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Elle pousa galement %(spouse)s %(date)s  %(place)s%(endnotes)s."
 
-#: ReportUtils.py:878
+#: ReportUtils.py:880
 msgid "He also married %(spouse)s %(date)s%(endnotes)s."
 msgstr "Il pousa galement %(spouse)s %(date)s%(endnotes)s."
 
-#: ReportUtils.py:883 ReportUtils.py:894
+#: ReportUtils.py:885 ReportUtils.py:896
 msgid "She also married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Elle pousa galement %(spouse)s  %(place)s%(endnotes)s."
 
-#: ReportUtils.py:889
+#: ReportUtils.py:891
 msgid "He also married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Il pousa galement %(spouse)s  %(place)s%(endnotes)s."
 
-#: ReportUtils.py:900
+#: ReportUtils.py:902
 msgid "He also married %(spouse)s%(endnotes)s."
 msgstr "Il pousa galement %(spouse)s%(endnotes)s."
 
-#: ReportUtils.py:904
+#: ReportUtils.py:906
 msgid "She also married %(spouse)s%(endnotes)s."
 msgstr "Elle pousa galement %(spouse)s%(endnotes)s."
 
-#: ReportUtils.py:925
+#: ReportUtils.py:927
 msgid "He married %(spouse)s."
 msgstr "Il pousa %(spouse)s."
 
-#: ReportUtils.py:927
+#: ReportUtils.py:929
 msgid "She married %(spouse)s."
 msgstr "Elle pousa %(spouse)s."
 
-#: ReportUtils.py:930
+#: ReportUtils.py:932
 msgid "He had relationship with %(spouse)s."
 msgstr "Il eut une relation avec %(spouse)s."
 
-#: ReportUtils.py:933
+#: ReportUtils.py:935
 msgid "She had relationship with %(spouse)s."
 msgstr "Elle eut une relation avec %(spouse)s."
 
-#: ReportUtils.py:938
+#: ReportUtils.py:940
 msgid "He also married %(spouse)s."
 msgstr "Il pousa galement %(spouse)s."
 
-#: ReportUtils.py:940
+#: ReportUtils.py:942
 msgid "She also married %(spouse)s."
 msgstr "Elle pousa galement %(spouse)s."
 
-#: ReportUtils.py:943
+#: ReportUtils.py:945
 msgid "He also had relationship with %(spouse)s."
 msgstr "Il eut une relation avec %(spouse)s."
 
-#: ReportUtils.py:946
+#: ReportUtils.py:948
 msgid "She also had relationship with %(spouse)s."
 msgstr "Elle eut galement une relation avec %(spouse)s."
 
-#: ReportUtils.py:977
+#: ReportUtils.py:979
 msgid "He was the son of %(father)s and %(mother)s."
 msgstr "Il tait le fils de %(father)s et %(mother)s."
 
-#: ReportUtils.py:981
+#: ReportUtils.py:983
 msgid "He is the son of %(father)s and %(mother)s."
 msgstr "Il est le fils de %(father)s et %(mother)s."
 
-#: ReportUtils.py:986
+#: ReportUtils.py:988
 msgid "He was the son of %(mother)s."
 msgstr "il tait le fils de %(mother)s."
 
-#: ReportUtils.py:989
+#: ReportUtils.py:991
 msgid "He is the son of %(mother)s."
 msgstr "il est le fils de %(mother)s."
 
-#: ReportUtils.py:993
+#: ReportUtils.py:995
 msgid "He was the son of %(father)s."
 msgstr "il tait le fils de %(father)s."
 
-#: ReportUtils.py:996
+#: ReportUtils.py:998
 msgid "He is the son of %(father)s."
 msgstr "il est le fils de %(father)s."
 
-#: ReportUtils.py:1001
+#: ReportUtils.py:1003
 msgid "She was the daughter of %(father)s and %(mother)s."
 msgstr "elle tait la fille de %(father)s et %(mother)s."
 
-#: ReportUtils.py:1005
+#: ReportUtils.py:1007
 msgid "She is the daughter of %(father)s and %(mother)s."
 msgstr "elle est la fille de %(father)s et %(mother)s."
 
-#: ReportUtils.py:1010
+#: ReportUtils.py:1012
 msgid "She was the daughter of %(mother)s."
 msgstr "elle tait la file de %(mother)s."
 
-#: ReportUtils.py:1013
+#: ReportUtils.py:1015
 msgid "She is the daughter of %(mother)s."
 msgstr "elle est la fille de %(mother)s."
 
-#: ReportUtils.py:1017
+#: ReportUtils.py:1019
 msgid "She was the daughter of %(father)s."
 msgstr "elle tait la fille de %(father)s."
 
-#: ReportUtils.py:1020
+#: ReportUtils.py:1022
 msgid "She is the daughter of %(father)s."
 msgstr "elle est la fille de %(father)s."
 
-#: ReportUtils.py:1068
+#: ReportUtils.py:1070
 msgid "%(male_name)s was born on %(birth_date)s in %(birth_place)s."
 msgstr "%(male_name)s est n le %(birth_date)s  %(birth_place)s."
 
-#: ReportUtils.py:1073
+#: ReportUtils.py:1075
 msgid "%(male_name)s was born on %(birth_date)s."
 msgstr "%(male_name)s est n le %(birth_date)s."
 
-#: ReportUtils.py:1077
+#: ReportUtils.py:1079
 msgid "%(male_name)s was born in %(month_year)s in %(birth_place)s."
 msgstr "%(male_name)s est n en %(month_year)s  %(birth_place)s."
 
-#: ReportUtils.py:1082
+#: ReportUtils.py:1084
 msgid "%(male_name)s was born in %(month_year)s."
 msgstr "%(male_name)s est n en %(month_year)s."
 
-#: ReportUtils.py:1086
+#: ReportUtils.py:1088
 msgid "%(male_name)s was born in %(birth_place)s."
 msgstr "%(male_name)s est n  %(birth_place)s."
 
-#: ReportUtils.py:1093
+#: ReportUtils.py:1095
 msgid "%(female_name)s was born on %(birth_date)s in %(birth_place)s."
 msgstr "%(female_name)s est ne le %(birth_date)s  %(birth_place)s."
 
-#: ReportUtils.py:1098
+#: ReportUtils.py:1100
 msgid "%(female_name)s was born on %(birth_date)s."
 msgstr "%(female_name)s est ne le %(birth_date)s."
 
-#: ReportUtils.py:1102
+#: ReportUtils.py:1104
 msgid "%(female_name)s was born in %(month_year)s in %(birth_place)s."
 msgstr "%(female_name)s est ne en %(month_year)s  %(birth_place)s."
 
-#: ReportUtils.py:1107
+#: ReportUtils.py:1109
 msgid "%(female_name)s was born in %(month_year)s."
 msgstr "%(female_name)s est ne en %(month_year)s."
 
-#: ReportUtils.py:1111
+#: ReportUtils.py:1113
 msgid "%(female_name)s was born in %(birth_place)s."
 msgstr "%(female_name)s est ne  %(birth_place)s."
 
-#: ReportUtils.py:1167
+#: ReportUtils.py:1169
 msgid "%(male_name)s died on %(death_date)s in %(death_place)s."
 msgstr "%(male_name)s est mort le %(death_date)s  %(death_place)s."
 
-#: ReportUtils.py:1172
+#: ReportUtils.py:1174
 msgid ""
 "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)"
 "d years."
@@ -2927,7 +3112,7 @@ msgstr ""
 "%(male_name)s est mort le %(death_date)s  %(death_place)s  l'ge de %(age)"
 "d ans."
 
-#: ReportUtils.py:1179
+#: ReportUtils.py:1181
 msgid ""
 "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)"
 "d months."
@@ -2935,7 +3120,7 @@ msgstr ""
 "%(male_name)s est mort le %(death_date)s  %(death_place)s  l'ge de %(age)"
 "d mois."
 
-#: ReportUtils.py:1186
+#: ReportUtils.py:1188
 msgid ""
 "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)"
 "d days."
@@ -2943,27 +3128,27 @@ msgstr ""
 "%(male_name)s est mort le %(death_date)s  %(death_place)s  l'ge de %(age)"
 "d jours."
 
-#: ReportUtils.py:1194
+#: ReportUtils.py:1196
 msgid "%(male_name)s died on %(death_date)s."
 msgstr "%(male_name)s est mort le %(death_date)s."
 
-#: ReportUtils.py:1197
+#: ReportUtils.py:1199
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d years."
 msgstr "%(male_name)s dcd le %(death_date)s  l'ge de %(age)d ans."
 
-#: ReportUtils.py:1202
+#: ReportUtils.py:1204
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d months."
 msgstr "%(male_name)s dcd le %(death_date)s  l'ge de %(age)d mois."
 
-#: ReportUtils.py:1207
+#: ReportUtils.py:1209
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d days."
 msgstr "%(male_name)s est dcd le %(death_date)s  l'ge de %(age)d jours."
 
-#: ReportUtils.py:1214
+#: ReportUtils.py:1216
 msgid "%(male_name)s died in %(month_year)s in %(death_place)s."
 msgstr "%(male_name)s est dcd en %(month_year)s  %(death_place)s."
 
-#: ReportUtils.py:1219
+#: ReportUtils.py:1221
 msgid ""
 "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)"
 "d years."
@@ -2971,7 +3156,7 @@ msgstr ""
 "%(male_name)s dcd en %(month_year)s  %(death_place)s  l'ge de %(age)d "
 "ans."
 
-#: ReportUtils.py:1226
+#: ReportUtils.py:1228
 msgid ""
 "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)"
 "d months."
@@ -2979,7 +3164,7 @@ msgstr ""
 "%(male_name)s dcd en %(month_year)s  %(death_place)s  l'ge de %(age)d "
 "mois."
 
-#: ReportUtils.py:1233
+#: ReportUtils.py:1235
 msgid ""
 "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)"
 "d days."
@@ -2987,55 +3172,55 @@ msgstr ""
 "%(male_name)s est dcd en %(month_year)s  %(death_place)s  l'ge de %"
 "(age)d jours."
 
-#: ReportUtils.py:1241
+#: ReportUtils.py:1243
 msgid "%(male_name)s died in %(month_year)s."
 msgstr "%(male_name)s est dcd en %(month_year)s."
 
-#: ReportUtils.py:1244
+#: ReportUtils.py:1246
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d years."
 msgstr "%(male_name)s dcd en %(month_year)s  l'ge de %(age)d ans."
 
-#: ReportUtils.py:1249
+#: ReportUtils.py:1251
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d months."
 msgstr "%(male_name)s dcd en %(month_year)s  l'ge de %(age)d mois."
 
-#: ReportUtils.py:1254
+#: ReportUtils.py:1256
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d days."
 msgstr "%(male_name)s dcd en %(month_year)s  l'ge de %(age)d jours."
 
-#: ReportUtils.py:1261
+#: ReportUtils.py:1263
 msgid "%(male_name)s died in %(death_place)s."
 msgstr "%(male_name)s  %(death_place)s."
 
-#: ReportUtils.py:1264
+#: ReportUtils.py:1266
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d years."
 msgstr "%(male_name)s est dcd  %(death_place)s  l'ge de %(age)d ans."
 
-#: ReportUtils.py:1269
+#: ReportUtils.py:1271
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d months."
 msgstr "%(male_name)s est dcd  %(death_place)s  l'ge de %(age)d mois."
 
-#: ReportUtils.py:1274
+#: ReportUtils.py:1276
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d days."
 msgstr "%(male_name)s est dcd  %(death_place)s  l'ge de %(age)d jours."
 
-#: ReportUtils.py:1283
+#: ReportUtils.py:1285
 msgid "%(male_name)s died at the age of %(age)d years."
 msgstr "%(male_name)s dcd  l'ge de %(age)d ans."
 
-#: ReportUtils.py:1287
+#: ReportUtils.py:1289
 msgid "%(male_name)s died at the age of %(age)d months."
 msgstr "%(male_name)s dcd  l'ge de %(age)d mois."
 
-#: ReportUtils.py:1291
+#: ReportUtils.py:1293
 msgid "%(male_name)s died at the age of %(age)d days."
 msgstr "%(male_name)s dcd  l'ge de %(age)d jours."
 
-#: ReportUtils.py:1298
+#: ReportUtils.py:1300
 msgid "%(female_name)s died on %(death_date)s in %(death_place)s."
 msgstr "%(female_name)s est dcde le %(death_date)s  %(death_place)s."
 
-#: ReportUtils.py:1303
+#: ReportUtils.py:1305
 msgid ""
 "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %"
 "(age)d years."
@@ -3043,7 +3228,7 @@ msgstr ""
 "%(female_name)s est dcde le %(death_date)s  %(death_place)s  l'ge de %"
 "(age)d ans."
 
-#: ReportUtils.py:1310
+#: ReportUtils.py:1312
 msgid ""
 "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %"
 "(age)d months."
@@ -3051,7 +3236,7 @@ msgstr ""
 "%(female_name)s est dcde le %(death_date)s  %(death_place)s  l'ge de %"
 "(age)d mois."
 
-#: ReportUtils.py:1317
+#: ReportUtils.py:1319
 msgid ""
 "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %"
 "(age)d days."
@@ -3059,43 +3244,43 @@ msgstr ""
 "%(female_name)s est dcde le %(death_date)s  %(death_place)s  l'ge de %"
 "(age)d jours."
 
-#: ReportUtils.py:1325
+#: ReportUtils.py:1327
 msgid "%(female_name)s died on %(death_date)s."
 msgstr "%(female_name)s est dcde le %(deathdate)s."
 
-#: ReportUtils.py:1328
+#: ReportUtils.py:1330
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d years."
 msgstr "%(female_name)s dcde le %(death_date)s  l'ge de %(age)d ans."
 
-#: ReportUtils.py:1333
+#: ReportUtils.py:1335
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d months."
 msgstr "%(female_name)s dcde le %(death_date)s  l'ge de %(age)d mois."
 
-#: ReportUtils.py:1338
+#: ReportUtils.py:1340
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d days."
 msgstr "%(female_name)s est dcde le %(deathdate)s  l'ge de %(age)d jours."
 
-#: ReportUtils.py:1345
+#: ReportUtils.py:1347
 msgid "%(female_name)s died in %(month_year)s in %(death_place)s."
 msgstr "%(female_name)s est dcde en %(month_year)s  %(death_place)s."
 
-#: ReportUtils.py:1350
+#: ReportUtils.py:1352
 msgid ""
 "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %"
 "(age)d years."
 msgstr ""
-"%(female_name)s dcde en %(month_year)s  %(death_place)  l'ge de %(age)"
+"%(female_name)s dcde en %(month_year)s  %(death_place)s  l'ge de %(age)"
 "d ans."
 
-#: ReportUtils.py:1357
+#: ReportUtils.py:1359
 msgid ""
 "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %"
 "(age)d months."
 msgstr ""
-"%(female_name)s dcde en %(month_year)s  %(death_place)  l'ge de %(age)"
+"%(female_name)s dcde en %(month_year)s  %(death_place)s  l'ge de %(age)"
 "d mois."
 
-#: ReportUtils.py:1364
+#: ReportUtils.py:1366
 msgid ""
 "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %"
 "(age)d days."
@@ -3103,99 +3288,100 @@ msgstr ""
 "%(female_name)s est dcde en %(month_year)s  %(death_place)s  l'ge de %"
 "(age)d jours."
 
-#: ReportUtils.py:1372
+#: ReportUtils.py:1374
 msgid "%(female_name)s died in %(month_year)s."
 msgstr "%(female_name)s est dcde en %(month_year)s."
 
-#: ReportUtils.py:1375
+#: ReportUtils.py:1377
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d years."
 msgstr "%(female_name)s dcde en %(month_year)s  l'ge de %(age)d ans."
 
-#: ReportUtils.py:1380
+#: ReportUtils.py:1382
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d months."
 msgstr "%(female_name)s dcde en %(month_year)s  l'ge de %(age)d mois."
 
-#: ReportUtils.py:1385
+#: ReportUtils.py:1387
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d days."
 msgstr "%(female_name)s dcde en %(month_year)s  l'ge de %(age)d jours."
 
-#: ReportUtils.py:1392
+#: ReportUtils.py:1394
 msgid "%(female_name)s died in %(death_place)s."
 msgstr "%(female_name)s est dcde  %(death_place)s."
 
-#: ReportUtils.py:1395
+#: ReportUtils.py:1397
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d years."
 msgstr "%(female_name)s est dcde  %(death_place)s  l'ge de %(age)d ans."
 
-#: ReportUtils.py:1400
+#: ReportUtils.py:1402
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d months."
 msgstr "%(female_name)s est dcde  %(death_place)s  l'ge de %(age)d mois."
 
-#: ReportUtils.py:1405
+#: ReportUtils.py:1407
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d days."
-msgstr "%(female_name)s est dcde  %(death_place)s  l'ge de %(age)d jours."
+msgstr ""
+"%(female_name)s est dcde  %(death_place)s  l'ge de %(age)d jours."
 
-#: ReportUtils.py:1414
+#: ReportUtils.py:1416
 msgid "%(female_name)s died at the age of %(age)d years."
 msgstr "%(female_name)s dcde  l'ge de %(age)d ans."
 
-#: ReportUtils.py:1418
+#: ReportUtils.py:1420
 msgid "%(female_name)s died at the age of %(age)d months."
 msgstr "%(female_name)s dcde  l'ge de %(age)d mois."
 
-#: ReportUtils.py:1422
+#: ReportUtils.py:1424
 msgid "%(female_name)s died at the age of %(age)d days."
 msgstr "%(female_name)s dcde  l'ge de %(age)d jours."
 
-#: ReportUtils.py:1475
+#: ReportUtils.py:1477
 msgid "%(male_name)s was buried on %(burial_date)s in %(burial_place)s."
-msgstr "%(male_name)s% a t enterr le %(burial_date)s  %(burial_place)s."
+msgstr "%(male_name)s a t enterr le %(burial_date)s  %(burial_place)s."
 
-#: ReportUtils.py:1480
+#: ReportUtils.py:1482
 msgid "%(male_name)s was buried on %(burial_date)s."
-msgstr "%(male_name)s% a t enterr le %(burial_date)s."
+msgstr "%(male_name)s a t enterr le %(burial_date)s."
 
-#: ReportUtils.py:1484
+#: ReportUtils.py:1486
 msgid "%(male_name)s was buried in %(month_year)s in %(burial_place)s."
-msgstr "%(male_name)s% a t enterr en %(month_year)s  %(burial_place)s."
+msgstr "%(male_name)s a t enterr en %(month_year)s  %(burial_place)s."
 
-#: ReportUtils.py:1489
+#: ReportUtils.py:1491
 msgid "%(male_name)s was buried in %(month_year)s."
 msgstr "%(male_name)s a t inhum en %(month_year)s."
 
-#: ReportUtils.py:1493
+#: ReportUtils.py:1495
 msgid "%(male_name)s was buried in %(burial_place)s."
-msgstr "%(male_name)s% a t enterr  %(burial_place)s."
+msgstr "%(male_name)s a t enterr  %(burial_place)s."
 
-#: ReportUtils.py:1496
+#: ReportUtils.py:1498
 msgid "%(male_name)s was buried."
-msgstr "%(male_name)s% a t enterr."
+msgstr "%(male_name)s a t enterr."
 
-#: ReportUtils.py:1501
+#: ReportUtils.py:1503
 msgid "%(female_name)s was buried on %(burial_date)s in %(burial_place)s."
-msgstr "%(female_name)s% a t enterre le %(burial_date)s  %(burial_place)s."
+msgstr "%(female_name)s a t enterre le %(burial_date)s  %(burial_place)s."
 
-#: ReportUtils.py:1506
+#: ReportUtils.py:1508
 msgid "%(female_name)s was buried on %(burial_date)s."
-msgstr "%(female_name)s% a t enterre le %(burial_date)s."
+msgstr "%(female_name)s a t enterre le %(burial_date)s."
 
-#: ReportUtils.py:1510
+#: ReportUtils.py:1512
 msgid "%(female_name)s was buried in %(month_year)s in %(burial_place)s."
-msgstr "%(female_name)s% a t enterre en %(month_year)s  %(burial_place)s."
+msgstr "%(female_name)s a t enterre en %(month_year)s  %(burial_place)s."
 
-#: ReportUtils.py:1515
+#: ReportUtils.py:1517
 msgid "%(female_name)s was buried in %(month_year)s."
-msgstr "%(female_name)s% a t enterre en %(month_year)s."
+msgstr "%(female_name)s a t enterre en %(month_year)s."
 
-#: ReportUtils.py:1519
+#: ReportUtils.py:1521
 msgid "%(female_name)s was buried in %(burial_place)s."
-msgstr "%(female_name)s% a t enterre  %(burial_place)s."
+msgstr "%(female_name)s a t enterre  %(burial_place)s."
 
-#: ReportUtils.py:1522
+#: ReportUtils.py:1524
 msgid "%(female_name)s was buried."
 msgstr "%(female_name)s a t inhume."
 
-#: ReportUtils.py:1552
+#: ReportUtils.py:1554
 msgid ""
 "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s %"
 "(death_place)s."
@@ -3203,67 +3389,75 @@ msgstr ""
 "%(male_name)s N : %(birth_date)s %(birth_place)s Dcd : %(death_date)s %"
 "(death_place)s."
 
-#: ReportUtils.py:1559
-msgid "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s."
-msgstr "%(male_name)s N : %(birth_date)s %(birth_place)s Dcd : %(death_date)s."
+#: ReportUtils.py:1561
+msgid ""
+"%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s."
+msgstr ""
+"%(male_name)s N : %(birth_date)s %(birth_place)s Dcd : %(death_date)s."
 
-#: ReportUtils.py:1567
-msgid "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_place)s."
-msgstr "%(male_name)s N : %(birth_date)s %(birth_place)s Dcd : %(death_place)s."
+#: ReportUtils.py:1569
+msgid ""
+"%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_place)s."
+msgstr ""
+"%(male_name)s N : %(birth_date)s %(birth_place)s Dcd : %(death_place)s."
 
-#: ReportUtils.py:1574
+#: ReportUtils.py:1576
 msgid "%(male_name)s Born: %(birth_date)s %(birth_place)s."
 msgstr "%(male_name)s N : %(birth_date)s %(birth_place)s."
 
-#: ReportUtils.py:1581
-msgid "%(male_name)s Born: %(birth_date)s Died: %(death_date)s %(death_place)s."
-msgstr "%(male_name)s N : %(birth_date)s Dcd : %(death_date)s %(death_place)s."
+#: ReportUtils.py:1583
+msgid ""
+"%(male_name)s Born: %(birth_date)s Died: %(death_date)s %(death_place)s."
+msgstr ""
+"%(male_name)s N : %(birth_date)s Dcd : %(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1586
+#: ReportUtils.py:1588
 msgid "%(male_name)s Born: %(birth_date)s Died: %(death_date)s."
 msgstr "%(male_name)s N : %(birth_date)s Dcd : %(death_date)s."
 
-#: ReportUtils.py:1592
+#: ReportUtils.py:1594
 msgid "%(male_name)s Born: %(birth_date)s Died: %(death_place)s."
 msgstr "%(male_name)s N : %(birth_date)s Dcd : %(death_place)s."
 
-#: ReportUtils.py:1597
+#: ReportUtils.py:1599
 msgid "%(male_name)s Born: %(birth_date)s."
 msgstr "%(male_name)s N : %(birth_date)s."
 
-#: ReportUtils.py:1603
-msgid "%(male_name)s Born: %(birth_place)s Died: %(death_date)s %(death_place)s."
-msgstr "%(male_name)s N : %(birth_place)s Dcd : %(death_date)s %(death_place)s."
+#: ReportUtils.py:1605
+msgid ""
+"%(male_name)s Born: %(birth_place)s Died: %(death_date)s %(death_place)s."
+msgstr ""
+"%(male_name)s N : %(birth_place)s Dcd : %(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1610
+#: ReportUtils.py:1612
 msgid "%(male_name)s Born: %(birth_place)s Died: %(death_date)s."
 msgstr "%(male_name)s N : %(birth_place)s Dcd : %(death_date)s."
 
-#: ReportUtils.py:1618
+#: ReportUtils.py:1620
 msgid "%(male_name)s Born: %(birth_place)s Died: %(death_place)s."
 msgstr "%(male_name)s N : %(birth_place)s Dcd : %(death_place)s."
 
-#: ReportUtils.py:1625
+#: ReportUtils.py:1627
 msgid "%(male_name)s Born: %(birth_place)s."
 msgstr "%(male_name)s N : %(birth_place)s."
 
-#: ReportUtils.py:1631
+#: ReportUtils.py:1633
 msgid "%(male_name)s Died: %(death_date)s %(death_place)s."
 msgstr "%(male_name)s  Dcd : %(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1636
+#: ReportUtils.py:1638
 msgid "%(male_name)s Died: %(death_date)s."
 msgstr "%(male_name)s  Dcd : %(death_date)s."
 
-#: ReportUtils.py:1641
+#: ReportUtils.py:1643
 msgid "%(male_name)s Died: %(death_place)s."
 msgstr "%(male_name)s Dcd : %(death_place)s."
 
-#: ReportUtils.py:1644
+#: ReportUtils.py:1646
 msgid "%(male_name)s."
 msgstr "%(male_name)s."
 
-#: ReportUtils.py:1651
+#: ReportUtils.py:1653
 msgid ""
 "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s %"
 "(death_place)s."
@@ -3271,97 +3465,101 @@ msgstr ""
 "%(female_name)s Ne : %(birth_date)s %(birth_place)s Dcde : %(death_date)"
 "s %(death_place)s."
 
-#: ReportUtils.py:1658
-msgid "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s."
+#: ReportUtils.py:1660
+msgid ""
+"%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s."
 msgstr ""
 "%(female_name)s Ne : %(birth_date)s %(birth_place)s Dcde : %(death_date)"
 "s."
 
-#: ReportUtils.py:1666
-msgid "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_place)s."
+#: ReportUtils.py:1668
+msgid ""
+"%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_place)s."
 msgstr ""
 "%(female_name)s Ne : %(birth_date)s %(birth_place)s Dcde : %(death_place)"
 "s."
 
-#: ReportUtils.py:1673
+#: ReportUtils.py:1675
 msgid "%(female_name)s Born: %(birth_date)s %(birth_place)s."
 msgstr "%(female_name)s Ne : %(birth_date)s %(birth_place)s."
 
-#: ReportUtils.py:1680
-msgid "%(female_name)s Born: %(birth_date)s Died: %(death_date)s %(death_place)s."
+#: ReportUtils.py:1682
+msgid ""
+"%(female_name)s Born: %(birth_date)s Died: %(death_date)s %(death_place)s."
 msgstr ""
 "%(female_name)s Ne : %(birth_date)s Dcde : %(death_date)s %(death_place)"
 "s."
 
-#: ReportUtils.py:1685
+#: ReportUtils.py:1687
 msgid "%(female_name)s Born: %(birth_date)s Died: %(death_date)s."
 msgstr "%(female_name)s Ne : %(birth_date)s Dcde : %(death_date)s."
 
-#: ReportUtils.py:1691
+#: ReportUtils.py:1693
 msgid "%(female_name)s Born: %(birth_date)s Died: %(death_place)s."
 msgstr "%(female_name)s Ne : %(birth_date)s Dcde : %(death_place)s."
 
-#: ReportUtils.py:1696
+#: ReportUtils.py:1698
 msgid "%(female_name)s Born: %(birth_date)s."
 msgstr "%(female_name)s Ne : %(birth_date)s."
 
-#: ReportUtils.py:1702
-msgid "%(female_name)s Born: %(birth_place)s Died: %(death_date)s %(death_place)s."
+#: ReportUtils.py:1704
+msgid ""
+"%(female_name)s Born: %(birth_place)s Died: %(death_date)s %(death_place)s."
 msgstr ""
 "%(female_name)s Ne : %(birth_place)s Dcde : %(death_date)s %(death_place)"
 "s."
 
-#: ReportUtils.py:1709
+#: ReportUtils.py:1711
 msgid "%(female_name)s Born: %(birth_place)s Died: %(death_date)s."
 msgstr "%(female_name)s Ne : %(birth_place)s Dcde : %(death_date)s."
 
-#: ReportUtils.py:1717
+#: ReportUtils.py:1719
 msgid "%(female_name)s Born: %(birth_place)s Died: %(death_place)s."
 msgstr "%(female_name)s Ne : %(birth_place)s Dcde: %(death_place)s."
 
-#: ReportUtils.py:1724
+#: ReportUtils.py:1726
 msgid "%(female_name)s Born: %(birth_place)s."
 msgstr "%(female_name)s Ne : %(birth_place)s."
 
-#: ReportUtils.py:1730
+#: ReportUtils.py:1732
 msgid "%(female_name)s Died: %(death_date)s %(death_place)s."
 msgstr "%(female_name)s Dcde : %(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1735
+#: ReportUtils.py:1737
 msgid "%(female_name)s Died: %(death_date)s."
 msgstr "%(female_name)s Dcde : %(death_date)s."
 
-#: ReportUtils.py:1740
+#: ReportUtils.py:1742
 msgid "%(female_name)s Died: %(death_place)s."
 msgstr "%(female_name)s Dcde : %(death_place)s."
 
-#: ReportUtils.py:1743
+#: ReportUtils.py:1745
 msgid "%(female_name)s."
 msgstr "%(female_name)s."
 
-#: ReportUtils.py:1752 const.py:490 gramps.glade:4344
+#: ReportUtils.py:1754 const.py:490 gramps.glade:4582
 #: plugins/FamilyGroup.py:376 plugins/FamilyGroup.py:378
 msgid "Married"
 msgstr "Mari(e)"
 
-#: ReportUtils.py:1753 const.py:491
+#: ReportUtils.py:1755 const.py:491
 msgid "Unmarried"
 msgstr "N'est plus mari(e)"
 
-#: ReportUtils.py:1754 const.py:492
+#: ReportUtils.py:1756 const.py:492
 msgid "Civil Union"
 msgstr "Union civile"
 
-#: ReportUtils.py:1756 const.py:234 const.py:248 const.py:494
-#: mergedata.glade:255
+#: ReportUtils.py:1758 const.py:234 const.py:248 const.py:494
+#: mergedata.glade:242
 msgid "Other"
 msgstr "Autre"
 
-#: SelectChild.py:288 SelectChild.py:307
+#: SelectChild.py:193 SelectChild.py:212
 msgid "A person cannot be linked as his/her own child"
 msgstr "Une personne ne peut tre son propre parent"
 
-#: SelectChild.py:331
+#: SelectChild.py:237
 msgid "Add Child to Family (%s)"
 msgstr "Ajouter un enfant  la famille (%s)"
 
@@ -3377,11 +3575,11 @@ msgstr "Abr
 msgid "Publication Information"
 msgstr "Information de publication"
 
-#: SourceView.py:162
+#: SourceView.py:195
 msgid "Source Menu"
 msgstr "Menu source"
 
-#: SourceView.py:187
+#: SourceView.py:220
 msgid ""
 "This source is currently being used. Deleting it will remove it from the "
 "database and from all records that reference it."
@@ -3389,19 +3587,19 @@ msgstr ""
 "Cette source est actuellement utilise, la dtruire revient  la supprimer "
 "de la base et des enregistrements qui y font rfrence."
 
-#: SourceView.py:191
+#: SourceView.py:224
 msgid "Deleting source will remove it from the database."
 msgstr "Supprimer la source l'enlvera de la base de donnes."
 
-#: SourceView.py:195
+#: SourceView.py:228
 msgid "_Delete Source"
 msgstr "_Supprimer une source"
 
-#: SourceView.py:228
+#: SourceView.py:269
 msgid "Cannot merge sources."
 msgstr "Impossible de fusionner les sources."
 
-#: SourceView.py:229
+#: SourceView.py:270
 msgid ""
 "Exactly two sources must be selected to perform a merge. A second source can "
 "be selected by holding down the control key while clicking on the desired "
@@ -3415,7 +3613,7 @@ msgstr ""
 msgid "Source Reference Selection"
 msgstr ""
 
-#: Sources.py:145 Sources.py:452
+#: Sources.py:145 Sources.py:454
 msgid "Source Reference"
 msgstr ""
 
@@ -3423,7 +3621,7 @@ msgstr ""
 msgid "Reference Selector"
 msgstr "Slectionner une source de rfrence"
 
-#: Sources.py:376 Sources.py:458
+#: Sources.py:378 Sources.py:460
 msgid "Source Information"
 msgstr "Source d'information"
 
@@ -3512,33 +3710,33 @@ msgstr ""
 "GEDCOM valides. Si vous ne prvoyez pas gnrer des fichiers GEDCOM, vous "
 "pouvez opter de n'entrer aucune information."
 
-#: StartupDialog.py:243 gramps.glade:5910 gramps.glade:5981 gramps.glade:7741
-#: gramps.glade:8551 gramps.glade:9065 gramps.glade:9501 gramps.glade:12247
-#: gramps.glade:12742 plugins/soundex.glade:110
+#: StartupDialog.py:243 gramps.glade:6235 gramps.glade:6318 gramps.glade:8240
+#: gramps.glade:9157 gramps.glade:9730 gramps.glade:10213 gramps.glade:13193
+#: gramps.glade:13747 plugins/soundex.glade:110
 msgid "Name:"
 msgstr "Nom :"
 
-#: StartupDialog.py:244 gramps.glade:9453 plugins/Ancestors.py:503
+#: StartupDialog.py:244 gramps.glade:10157 plugins/Ancestors.py:505
 msgid "Address:"
 msgstr "Adresse :"
 
-#: StartupDialog.py:245 gramps.glade:14649
+#: StartupDialog.py:245 gramps.glade:15804
 msgid "City:"
 msgstr "Ville :"
 
-#: StartupDialog.py:246 gramps.glade:9573
+#: StartupDialog.py:246 gramps.glade:10297
 msgid "State/Province:"
 msgstr "Etat ou province :"
 
-#: StartupDialog.py:247 gramps.glade:9477 gramps.glade:14697
+#: StartupDialog.py:247 gramps.glade:10185 gramps.glade:15860
 msgid "Country:"
 msgstr "Pays :"
 
-#: StartupDialog.py:248 gramps.glade:9549
+#: StartupDialog.py:248 gramps.glade:10269
 msgid "ZIP/Postal code:"
 msgstr "Code postal :"
 
-#: StartupDialog.py:249 gramps.glade:9835 gramps.glade:14944
+#: StartupDialog.py:249 gramps.glade:10603 gramps.glade:16147
 msgid "Phone:"
 msgstr "Tlphone :"
 
@@ -3614,7 +3812,7 @@ msgstr "Adresse Internet"
 msgid "Internet Address Editor for %s"
 msgstr "Adresse Internet de %s"
 
-#: Utils.py:72
+#: Utils.py:67
 msgid ""
 "The data can only be recovered by Undo operation or by quitting with "
 "abandoning changes."
@@ -3645,34 +3843,33 @@ msgstr ""
 "slectionner les personne  l'aide du bouton Slectionner.\n"
 "Essayez de nouveau. Le tmoin n'a pas t chang."
 
-#: WriteGedcom.py:331 plugins/DescendReport.py:116
-#: plugins/ExportVCalendar.py:85 plugins/ExportVCard.py:88
+#: WriteGedcom.py:334 plugins/DescendReport.py:116
+#: plugins/ExportVCalendar.py:87 plugins/ExportVCard.py:89
 #: plugins/FtmStyleDescendants.py:121 plugins/GraphViz.py:517
-#: plugins/IndivComplete.py:513 plugins/NavWebPage.py:1071
-#: plugins/StatisticsChart.py:831 plugins/TimeLine.py:415
-#: plugins/WebPage.py:1265 plugins/WriteFtree.py:90 plugins/WriteGeneWeb.py:91
+#: plugins/IndivComplete.py:514 plugins/StatisticsChart.py:831
+#: plugins/TimeLine.py:415 plugins/WebPage.py:1269 plugins/WriteFtree.py:91
+#: plugins/WriteGeneWeb.py:92
 msgid "Descendants of %s"
 msgstr "Descendants de %s"
 
-#: WriteGedcom.py:335 plugins/Ancestors.py:141 plugins/ExportVCalendar.py:89
-#: plugins/ExportVCard.py:92 plugins/FtmStyleAncestors.py:96
-#: plugins/GraphViz.py:521 plugins/IndivComplete.py:517
-#: plugins/NavWebPage.py:1079 plugins/StatisticsChart.py:835
-#: plugins/TimeLine.py:419 plugins/WebPage.py:1273 plugins/WriteFtree.py:94
-#: plugins/WriteGeneWeb.py:95
+#: WriteGedcom.py:340 plugins/Ancestors.py:141 plugins/ExportVCalendar.py:93
+#: plugins/ExportVCard.py:95 plugins/FtmStyleAncestors.py:96
+#: plugins/GraphViz.py:521 plugins/IndivComplete.py:518
+#: plugins/StatisticsChart.py:835 plugins/TimeLine.py:419
+#: plugins/WebPage.py:1277 plugins/WriteFtree.py:97 plugins/WriteGeneWeb.py:98
 msgid "Ancestors of %s"
 msgstr "Anctres de %s"
 
-#: WriteGedcom.py:339 plugins/ExportVCalendar.py:93 plugins/ExportVCard.py:96
-#: plugins/GraphViz.py:525 plugins/IndivComplete.py:521
-#: plugins/NavWebPage.py:1083 plugins/StatisticsChart.py:839
-#: plugins/TimeLine.py:423 plugins/WebPage.py:1277 plugins/WriteFtree.py:98
-#: plugins/WriteGeneWeb.py:99
+#: WriteGedcom.py:346 plugins/ExportVCalendar.py:99 plugins/ExportVCard.py:101
+#: plugins/GraphViz.py:525 plugins/IndivComplete.py:522
+#: plugins/StatisticsChart.py:839 plugins/TimeLine.py:423
+#: plugins/WebPage.py:1281 plugins/WriteFtree.py:103
+#: plugins/WriteGeneWeb.py:104
 msgid "People with common ancestor with %s"
 msgstr "Personnes dont l'anctre commun est %s"
 
-#: WriteGedcom.py:555 WriteGedcom.py:560 docgen/AbiWord2Doc.py:77
-#: docgen/AbiWord2Doc.py:80 docgen/AsciiDoc.py:113 docgen/AsciiDoc.py:116
+#: WriteGedcom.py:565 WriteGedcom.py:570 docgen/AbiWord2Doc.py:75
+#: docgen/AbiWord2Doc.py:78 docgen/AsciiDoc.py:113 docgen/AsciiDoc.py:116
 #: docgen/HtmlDoc.py:225 docgen/HtmlDoc.py:228 docgen/HtmlDoc.py:353
 #: docgen/HtmlDoc.py:356 docgen/LaTeXDoc.py:87 docgen/LaTeXDoc.py:90
 #: docgen/OpenSpreadSheet.py:76 docgen/OpenSpreadSheet.py:78
@@ -3681,18 +3878,18 @@ msgstr "Personnes dont l'anc
 #: docgen/OpenSpreadSheet.py:436 docgen/OpenSpreadSheet.py:440
 #: docgen/PSDrawDoc.py:95 docgen/PSDrawDoc.py:98 docgen/PdfDoc.py:180
 #: docgen/RTFDoc.py:80 docgen/RTFDoc.py:83 docgen/SvgDrawDoc.py:75
-#: docgen/SvgDrawDoc.py:77 plugins/ExportVCalendar.py:168
-#: plugins/ExportVCalendar.py:172 plugins/ExportVCard.py:153
-#: plugins/ExportVCard.py:157 plugins/WriteGeneWeb.py:210
-#: plugins/WriteGeneWeb.py:214
+#: docgen/SvgDrawDoc.py:77 plugins/ExportVCalendar.py:178
+#: plugins/ExportVCalendar.py:182 plugins/ExportVCard.py:162
+#: plugins/ExportVCard.py:166 plugins/WriteGeneWeb.py:219
+#: plugins/WriteGeneWeb.py:223
 msgid "Could not create %s"
 msgstr "Impossible de crer %s"
 
-#: WriteGedcom.py:1238
+#: WriteGedcom.py:1272
 msgid "GE_DCOM"
 msgstr "GE_DCOM"
 
-#: WriteGedcom.py:1239
+#: WriteGedcom.py:1273
 msgid ""
 "GEDCOM is used to transfer data between genealogy programs. Most genealogy "
 "software will accept a GEDCOM file as input. "
@@ -3701,7 +3898,7 @@ msgstr ""
 "logiciels de gnalogie. La plupart des  logiciels de gnalogie acceptent "
 "ce format. "
 
-#: WriteGedcom.py:1241
+#: WriteGedcom.py:1275
 msgid "GEDCOM export options"
 msgstr "Options d'export GEDCOM"
 
@@ -3732,11 +3929,11 @@ msgstr ""
 "d'criture sur le fichier.Veuillez vous assurer d'acqurir ces droits puis "
 "ressayez  nouveau."
 
-#: WriteXML.py:891
+#: WriteXML.py:881
 msgid "GRAMPS _XML database"
 msgstr "Base de donnes GRAMPS _XML"
 
-#: WriteXML.py:892
+#: WriteXML.py:882
 msgid ""
 "The GRAMPS XML database is a format used by older versions of GRAMPS. It is "
 "read-write compatible with the present GRAMPS database format."
@@ -3986,7 +4183,8 @@ msgstr "Num
 
 #: const.py:490
 msgid "A legal or common-law relationship between a husband and wife"
-msgstr "Une relation lgalise par le droit coutumier entre un homme et une femme"
+msgstr ""
+"Une relation lgalise par le droit coutumier entre un homme et une femme"
 
 #: const.py:491
 msgid "No legal or common-law relationship between man and woman"
@@ -4004,476 +4202,479 @@ msgstr "Relation non identifi
 msgid "An unspecified relationship between a man and woman"
 msgstr "Relation non spcifie entre un homme et une femme"
 
-#: const.py:515
+#: const.py:522
 msgid "Also Known As"
 msgstr "Connu galement sous le nom de"
 
-#: const.py:516
+#: const.py:523
 msgid "Birth Name"
 msgstr "Nom de naissance"
 
-#: const.py:517
+#: const.py:524
 msgid "Married Name"
 msgstr "Nom marital (nom de famille de l'poux)"
 
-#: const.py:518
+#: const.py:525
 msgid "Other Name"
 msgstr "Nom alternatif"
 
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid ""
 msgstr ""
 
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid "Cleared"
 msgstr "Correct"
 
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid "Completed"
 msgstr "Complet"
 
-#: const.py:903
+#: const.py:910
 msgid "Infant"
 msgstr "Nourrisson"
 
-#: const.py:903 const.py:909
+#: const.py:910 const.py:916
 msgid "Stillborn"
 msgstr "Mort-n(e)"
 
-#: const.py:903 const.py:909 const.py:915
+#: const.py:910 const.py:916 const.py:922
 msgid "Pre-1970"
 msgstr "Pre-1970"
 
-#: const.py:903 const.py:909 const.py:915
+#: const.py:910 const.py:916 const.py:922
 msgid "Qualified"
 msgstr "Qualifi(e)"
 
-#: const.py:904 const.py:910 const.py:916
+#: const.py:911 const.py:917 const.py:923
 msgid "Submitted"
 msgstr "Soumis(e)"
 
-#: const.py:904 const.py:910 const.py:916
+#: const.py:911 const.py:917 const.py:923
 msgid "Uncleared"
 msgstr "Incorrect"
 
-#: const.py:908
+#: const.py:915
 msgid "BIC"
 msgstr "BIC"
 
-#: const.py:909 const.py:915
+#: const.py:916 const.py:922
 msgid "DNS"
 msgstr "DNS"
 
-#: const.py:914
+#: const.py:921
 msgid "Canceled"
 msgstr "Annul(e)"
 
-#: const.py:915
+#: const.py:922
 msgid "DNS/CAN"
 msgstr "DNS/CAN"
 
-#: const.py:921
+#: const.py:928
 msgid "Flowed"
 msgstr "Libre"
 
-#: const.py:922
+#: const.py:929
 msgid "Preformatted"
 msgstr "Prformatt(e)"
 
-#: const.py:934
+#: const.py:941
 msgid "Text Reports"
 msgstr "Rapports texte"
 
-#: const.py:935
+#: const.py:942
 msgid "Graphical Reports"
 msgstr "Rapports graphiques"
 
-#: const.py:936
+#: const.py:943
 msgid "Code Generators"
 msgstr "Gnrateurs de code"
 
-#: const.py:937 plugins/NavWebPage.py:1247 plugins/WebPage.py:1715
+#: const.py:944 plugins/WebPage.py:1719
 msgid "Web Page"
 msgstr "Page internet"
 
-#: const.py:938
+#: const.py:945
 msgid "View"
 msgstr "Statistiques"
 
-#: const.py:939
+#: const.py:946
 msgid "Books"
 msgstr "Livres"
 
-#: const.py:943 plugins/NavWebPage.py:1149 plugins/ScratchPad.py:356
-#: plugins/ScratchPad.py:405 plugins/ScratchPad.py:413
-#: plugins/SimpleBookTitle.py:169 plugins/SimpleBookTitle.py:170
-#: plugins/SimpleBookTitle.py:171
+#: const.py:950 plugins/ScratchPad.py:356 plugins/ScratchPad.py:405
+#: plugins/ScratchPad.py:413 plugins/SimpleBookTitle.py:169
+#: plugins/SimpleBookTitle.py:170 plugins/SimpleBookTitle.py:171
 msgid "Text"
 msgstr "Texte"
 
-#: const.py:944
+#: const.py:951
 msgid "Graphics"
 msgstr "Graphiques"
 
-#: data/tips.xml:8
+#: data/tips.xml:9
 msgid ""
-"You can represent a range of dates by using the format of \"between "
-"January 4, 2000 and March 20, 2003\""
+"A range of dates can be given by using the format \"between January 4, 2000 "
+"and March 20, 2003\""
 msgstr ""
 
-#: data/tips.xml:12
+#: data/tips.xml:16
 msgid ""
-"You can drag and drop an image from either the Media View or any gallery "
-"into another gallery"
+"In most cases double clicking on a name, source, place or media entry will "
+"bring up a window to allow you to edit the object. Note that the result can "
+"be dependent on context. For example, in the Family View clicking on a "
+"parent or child will bring up the relationship editor."
 msgstr ""
 
-#: data/tips.xml:15
+#: data/tips.xml:20
 msgid ""
-"You can add an image to any gallery or the Media View by dragging and "
-"dropping from a file manager or a web browser."
+"An image can be added to any gallery or the Media View by dragging and "
+"dropping it from a file manager or a web browser."
 msgstr ""
 
-#: data/tips.xml:18
+#: data/tips.xml:24
 msgid ""
-"You can set the birth order of children in a family even if you do not have "
-"birth dates by using drag and drop."
+"Birth order of children in a family can be set, even if they do not have "
+"birth dates, by using drag and drop."
 msgstr ""
 
-#: data/tips.xml:22
+#: data/tips.xml:34
 msgid ""
-"You can convert an alternate name to the person's preferred name by "
-"selecting the desired name in the person's name list, bringing up the "
-"context menu by clicking the right mouse button, and selecting from the menu."
+"Talk to Relatives Before It Is Too Late: Your oldest relatives can be "
+"your most important source of information. They usually know things about "
+"the family that haven't been written down. They might tell you nuggets about "
+"people that may one day lead to a new avenue of research. At the very least, "
+"you will get to hear some great stories. Don't forget to record the "
+"conversations!"
 msgstr ""
 
-#: data/tips.xml:32
+#: data/tips.xml:42
 msgid ""
-"ASKING RELATIVES BEFORE IT IS TOO LATE: Your oldest relatives could "
-"be your most important source of information. They usually know things about "
-"the family that hasn't been written down. They might tell you nuggets about "
-"people, the information about whom might one day be reduced to numbers. We "
-"often wonder why we didn't write down pieces of information that grandfather "
-"told us while we were young. Don't wait till it's too late..."
+"Example of a Family Tree: To see an example of what a family looks "
+"like in GRAMPS, check Help > Open example database. You will then be "
+"viewing the elaborate Smith family database, which includes 42 individuals "
+"and 15 families, with fairly complete data about many of the individuals."
 msgstr ""
 
-#: data/tips.xml:52
+#: data/tips.xml:51
 msgid ""
-"THE PEOPLE VIEW: The People view throws up a list of all individuals "
-"in the database."
+"The People View: The People View shows a list of all individuals in "
+"the database. The listings can be sorted by simply clicking on a heading "
+"such as name, gender, birth date or death date. Clicking the heading a "
+"second time will reverse the sort."
 msgstr ""
 
-#: data/tips.xml:60
+#: data/tips.xml:61
 msgid ""
-"FILTERING PEOPLE OUT: In the People view, you can 'filter' out "
-"individuals based on certain criteria. Go to the Filter (just to the right "
-"of the People icon) and choose one of the dozen different presets. For "
-"instance, all adopted people in the family tree can be located. People "
-"without a birth date mentioned can also be filtered. To get the results, "
-"click on Apply."
+"Filtering People: In the People View, you can 'filter' individuals "
+"based on many criteria. Go to the Filter (just to the right of the People "
+"icon) and choose one of the dozen different presets. For example, all "
+"adopted people in the family tree can be located. People without a birth "
+"date mentioned can also be filtered. To get the results click Apply. If the "
+"filter controls are not visible, enable them by choosing View > Filter."
 msgstr ""
 
-#: data/tips.xml:67
+#: data/tips.xml:68
 msgid ""
-"INVERTED FILTERING: You can get another set of results by using the "
-"'invert' option. For instance, if you choose to filter the 'People with "
-"children' preset filter, and then invert it, you'll find all the people "
-"without children in the family tree."
+"Inverted Filtering: Filters can easily be reversed by using the "
+"'invert' option. For instance, by inverting the 'People with children' "
+"filter you can select all people without children."
 msgstr ""
 
-#: data/tips.xml:73
+#: data/tips.xml:74
 msgid ""
-"LOCATING PEOPLE: In the People view, you can locate any individual by "
-"through the list of surnames. Then, click on the names themselves to unfold "
-"display of all the individuals with the same last name."
+"Locating People: By default, each surname in the People View is "
+"listed only once. By clicking on the arrow to the left of a name, the list "
+"will expand to show all individuals with that last name."
 msgstr ""
 
-#: data/tips.xml:80
+#: data/tips.xml:79
 msgid ""
-"TO ADD INFORMATION TO SELECTED PEOPLE: First, locate them in the "
-"People view. (Use the list of surnames, and click on the names to unfold the "
-"display of all individuals sharing the name). Then, go to the Family view, "
-"and add the relevant information."
+"The Family View: The Family View is used to display a typical family "
+"unit---the parents, spouses and children of an individual."
 msgstr ""
 
-#: data/tips.xml:86
+#: data/tips.xml:89
 msgid ""
-"THE FAMILY VIEW: The Family view display a family of parents, "
-"grandparents and children along with the birth and death dates (if relevant) "
-"and relationships. You can navigate to nearby relatives with a single click."
+"Shifting a Family View: Changing the Active Person in the Family View "
+"is easy. A spouse can be made the Active Person by clicking the button just "
+"to the right of the Active Person. A father can be made the Active Person by "
+"clicking on the arrow to the right of their name. A child can be made the "
+"Active Person by selecting them from the Children list and then clicking the "
+"arrow button to the right of the Children."
 msgstr ""
 
-#: data/tips.xml:94
+#: data/tips.xml:96
 msgid ""
-"IMPROVING GRAMPS: Users are entitled to request enhancements to "
-"GRAMPS. Requesting an enhancement can be done either through the gramps-"
-"users or gramps-devel mailing lists, or by creating a Request for "
-"Enhancement (RFE) at http://sourceforge.net/tracker/?group_id=25770&"
-"atid=385140 The last is preferred."
-msgstr ""
-
-#: data/tips.xml:101
-msgid ""
-"WHO WAS BORN WHEN: The 'Compare individual events' tool allows you to "
+"Who Was Born When: The 'Compare individual events' tool allows you to "
 "compare data of all (or some of) the individuals in your database. This is "
-"useful, say, if you wish to list the birth-dates of everyone in your "
-"database. For best results, your data needs to be complete."
+"useful, say, if you wish to list the birth dates of everyone in your "
+"database."
 msgstr ""
 
-#: data/tips.xml:110
+#: data/tips.xml:104
 msgid ""
-"WHO'S THE OLDEST OF US ALL? You can find out a lot of statistical "
-"information about your entire family, using the Tools > Utilities > Verify "
-"the database facility. For instance, what was the maximum age of any "
-"individual in the family? Or the largest husband-wife age difference. Or the "
-"minimum age at which anyone in your family ever married. Or even the minimum "
-"age at which a woman bore a child."
+"GRAMPS comes with a rich set of tools. These allows you to undertake "
+"operations such as checking database for errors and consistency, as well as "
+"research and analysis tools such as event comparison, finding duplicate "
+"people, interactive descendant browser, and others. All tools can be "
+"accessed through the Tools menu."
 msgstr ""
 
-#: data/tips.xml:117
+#: data/tips.xml:111
 msgid ""
-"CALCULATING RELATIONSHIPS: This allows you to check if someone else "
-"in the entire family is related (by blood, not marriage) to you. Precise "
-"relationships as well as the common ancestors are reported. See Tools > "
-"Utilities > Relationship calculator."
+"Calculating Relationships: This tool, under Tools > Utilities > "
+"Relationship calculator allows you to check if someone else in the "
+"family is related (by blood, not marriage) to you. Precise relationships as "
+"well as the common ancestors are reported."
 msgstr ""
 
-#: data/tips.xml:126
+#: data/tips.xml:122
 msgid ""
-"USEFUL CODES FOR SURNAMES: SoundEx is a utility that will allow you "
-"to type in a surname, then give you the SoundEx Code for that name. Knowing "
-"the SoundEx Code for a surname is very helpful for researching Census Data "
-"files (microfiche) at a library or other research facility. To get your "
-"Soundex codes for surnames in your database, go to Tools > Utilities > "
-"Generate SoundEx codes."
+"SoundEx can help with family research: SoundEx solves a long standing "
+"problem in genealogy---how to handle spelling variations. The SoundEx "
+"utility takes a surname and generates a simplified form that is equivalent "
+"for similar sounding names. Knowing the SoundEx Code for a surname is very "
+"helpful for researching Census Data files (microfiche) at a library or other "
+"research facility. To get the SoundEx codes for surnames in your database, "
+"go to Tools > Utilities > Generate SoundEx codes."
 msgstr ""
 
-#: data/tips.xml:131
+#: data/tips.xml:128
 msgid ""
-"SETTING YOUR PREFERENCES: Edit > Preferences will allow you to choose "
-"a number of settings, determining how your GRAMPS program should work."
+"Setting Your Preferences: Not happy with some default behavior of "
+"GRAMPS? Edit > Preferences lets you to modify a number of settings, "
+"allowing you to tailor GRAMPS to your needs."
 msgstr ""
 
-#: data/tips.xml:137
+#: data/tips.xml:134
 msgid ""
-"GRAMPS REPORTS: GRAMPS offers a wide number of reports that can be "
-"generated. The Text Reports are particularly useful if you want to send out "
-"the results of your family tree to members of the family, via e-mail."
+"GRAMPS Reports: GRAMPS offers a wide variety of reports. The Text "
+"Reports are particularly useful if you want to send the results of your "
+"family tree to members of the family via email."
 msgstr ""
 
-#: data/tips.xml:144
+#: data/tips.xml:142
 msgid ""
-"STARTING A NEW FAMILY TREE: The best way to start a new family tree "
-"is probably to add-in all the members of the family into the database (use "
-"Edit > Add or click on the Add button under the People menu). Then go about "
-"tracing the relationships among them all under the Family menu."
+"Starting a New Family Tree: A good way to start a new family tree is "
+"to enter all the members of the family into the database (use Edit > Add or click on the Add button under the People menu). Then go to the Family "
+"View and create relationships between people. Then go about tracing the "
+"relationships among them all under the Family menu."
 msgstr ""
 
-#: data/tips.xml:152
+#: data/tips.xml:147
 msgid ""
-"TRACING RELATIONSHIPS: People from an existing database can easily be "
-"all linked into the family. Go to Family, and choose the second button to "
-"the right of the Relationship window. (The first button to the right of the "
-"relationship window adds a new person to the database, and adds to a new "
-"relationship.)"
+"Unsure what a button does? Simply hold the mouse over a button and a tooltip "
+"will appear."
 msgstr ""
 
-#: data/tips.xml:160
+#: data/tips.xml:156
 msgid ""
-"ASKING RELATIONS FOR DETAILS: To get inputs for building your family "
-"tree, ask key members of your extended family (including other families "
-"connected to yours via marriage) to send in information. Most important is "
-"the full name, date and places of birth and death (if expired), relationship "
-"within the family."
+"Unsure of a Date? If you're unsure about the date an event occurred "
+"(for example birth or death), GRAMPS allows you to enter a wide range of "
+"date formats based on a guess or an estimate. For instance, \"about 1908\" "
+"is a valid entry for a birth date in GRAMPS. See section 3.7.2.2 of the "
+"GRAMPS manual for a complete description of date entry options."
+msgstr ""
+
+#: data/tips.xml:162
+msgid ""
+"Duplicate Entries: Tools > Database Processing > Find possible "
+"duplicate people allows you to located (and merge) entries of the same "
+"person entered more than once in the database."
 msgstr ""
 
 #: data/tips.xml:168
 msgid ""
-"UNSURE ABOUT BIRTH-DATES? If you're unsure about the birth-dates "
-"about individuals in your family, GRAMPS allows you to enter a wide range, "
-"based on a guess or an estimate. For instance, \"about 1908\" is also a "
-"valid entry. for a birth date in GRAMPS. Subsequently, the precise dates "
-"could be included once it is available."
+"The 'merge' function allows you to combine separately listed people into "
+"one. This is very useful for combining two databases with overlapping "
+"people, or combining erroneously entered differing names for one individual."
 msgstr ""
 
 #: data/tips.xml:174
+#, fuzzy
 msgid ""
-"DUPLICATE ENTRIES: Tools > Database Processing > Find possible "
-"duplicate people allows you to located (and merge) entries of the same "
-"person entered more than once in the database."
+"To easily merge two people, select them both (a second person can be "
+"selected by holding the Control key while clicking) and clicking on Edit "
+"> Fast Merge."
+msgstr ""
+"Exactement deux individus doivent tre slectionns pour accomplir une "
+"fusion. Le deuxime individu peut tre slectionn en maintenant la touche "
+"Contrle (Ctrl)."
+
+#: data/tips.xml:180
+msgid ""
+"GRAMPS maintains a list of previous Active People. You can move forward and "
+"backward through the list using Go > Forward and Go > Back."
 msgstr ""
 
-#: data/tips.xml:182
+#: data/tips.xml:186
 msgid ""
-"ADDING A SIBLING: To add siblings in Gramps, make either of your "
-"parents an active person (i.e. navigate to either of your parents). Then "
-"switch to the Family View and add a new child by clicking the button second "
-"from the top on the right of the Children list (the \"New\" button). Enter "
-"the data for the new person and click OK."
+"Tired of having to take your hand off the keyboard to use the mouse? Many "
+"functions in GRAMPS have keyboard shortcuts. If one exists for a function it "
+"is displayed on the right side of the menu."
 msgstr ""
 
-#: data/tips.xml:190
+#: data/tips.xml:193
 msgid ""
-"EDITING THE RELATIONSHIP OF A CHILD: You can edit the relationship of "
-"the child to each parent by selecting the child, right-clicking, and "
-"choosing \"Edit the child-parent relationship\" item. If this is not your "
-"child but your wife's child, you would select \"Birth\" in relationship to "
-"her and \"Stepchild\" in relationship to you."
+"Don't forget to read the GRAMPS manual, Help > User Manual. The "
+"developers have worked hard to make most operations intuitive but the manual "
+"is full of information that will make your time spent on genealogy more "
+"productive."
 msgstr ""
 
-#: data/tips.xml:197
+#: data/tips.xml:203
 msgid ""
-"ADDING A CHILD: If the child is already in the database, then you "
-"don't need to add him to the database. Just add the child to the family, "
-"which can be done by pressing the third button from the top (the \"Select\" "
-"button). Then, select the person from the list."
+"Adding Children: To add children in GRAMPS make either of the parents "
+"the Active Person then switch to the Family View. If the child is already in "
+"the database, click on the third button down to the right of the Children "
+"list. If the person is not already in the database, click on the second "
+"button down to the right of the Children list. After the child's information "
+"is entered they will automatically be listed as a child of the Active Person."
 msgstr ""
 
-#: data/tips.xml:204
+#: data/tips.xml:212
 msgid ""
-"SHOW-ALL CHECKBUTTON: The list of people you can add into a family is "
-"filtered to display only people who could possibly be the child (based on he "
-"birth-dates). In case GRAMPS is wrong in making this choice, you can always "
-"over-ride that filtering by checking \"Show all\" checkbutton."
+"Editing The Relationship of a Child: Not all children are the related "
+"by birth to their parents. You can edit the relationship of a child to each "
+"parent by selecting the child, right-clicking, and choosing \"Edit the child "
+"parent relationship\". Relationships can be any of Birth, Adopted, "
+"Stepchild, Sponsored, Foster, or Unknown."
 msgstr ""
 
-#: data/tips.xml:210
+#: data/tips.xml:220
 msgid ""
-"KEYBINDINGS: GRAMPS's manual is quite elaborate and well written; it "
-"also is detailed about keybindings (in a separate appendix) and other "
-"matters. Check it out."
+"Show All Checkbutton: When adding a spouse or child, the list of "
+"people shown is filtered to display only people who could realistically fit "
+"the role (based on dates in the database). In case GRAMPS is wrong in making "
+"this choice, you can override that filter by checking the \"Show All\" "
+"checkbutton."
 msgstr ""
 
-#: data/tips.xml:217
+#: data/tips.xml:227
 msgid ""
-"GRAMPS-USERS: Want to answer your queries about GRAMPS? Check out the "
-"gramps-users list. Many users are on the list, so you're likely to get an "
-"answer faster. If you need to ask questions -- use either gramps-devel or "
-"gramps-users at lists.sf.net, as appropriate for your questions."
-msgstr ""
-
-#: data/tips.xml:224
-msgid ""
-"TIPS OF THE DAY: GRAMPS's has the option of popping up a window with "
-"the tip of the day about the use of GRAMPS. The tip is chosen randomly from "
-"the pool of tips. To add your own tip, send it in to gramps-users@lists.sf."
-"net"
-msgstr ""
-
-#: data/tips.xml:230
-msgid ""
-"GRAMPS (Genealogical Research and Analysis Management Programming System) "
-"offers you a well-designed user interface to make entering data easy, and "
-"browser-like controls to allow you to navigate your family tree with ease."
+"GRAMPS Manual: The GRAMPS manual is quite elaborate and well written. "
+"It includes details on keybindings and includes some useful tips that will "
+"help you in your genealogy work. Check it out."
 msgstr ""
 
 #: data/tips.xml:236
 msgid ""
-"DIFFERENT VIEWS: There are six different views for navigating your "
+"Improving GRAMPS: Users are encouraged to request enhancements to "
+"GRAMPS. Requesting an enhancement can be done either through the gramps-"
+"users or gramps-devel mailing lists, or by creating a Request for "
+"Enhancement (RFE) at http://sourceforge.net/tracker/?group_id=25770&"
+"atid=385140 Filing an RFE is preferred."
+msgstr ""
+
+#: data/tips.xml:245
+msgid ""
+"GRAMPS Mailing Lists: Want answers to your queries about GRAMPS? "
+"Check out the gramps-users list. Many people are on the list, so you're "
+"likely to get an answer quickly. If you have questions related to the "
+"development of GRAMPS, try gramps-devel. Information on both mailing lists "
+"can be found at lists.sf.net."
+msgstr ""
+
+#: data/tips.xml:256
+msgid ""
+"Contributing to GRAMPS: Want to help with GRAMPS but can't program? "
+"Not a problem. A project as large as GRAMPS requires people with a wide "
+"variety of skills. Contributions can vary from writing documentation to "
+"testing development versions to helping with the web site. Start by "
+"subscribing to the gramps developers mailing list, gramps-devel and "
+"introducing yourself. Subscription information can be found at lists.sf.net."
+msgstr ""
+
+#: data/tips.xml:264
+msgid ""
+"GRAMPS is the Genealogical Research and Analysis Management Program System. "
+"It is a full-featured genealogy program letting you store, edit, and "
+"research genealogical data. Gramps database back end is so robust that some "
+"users are managing genealogies containing hundreds of thousands of people."
+msgstr ""
+
+#: data/tips.xml:271
+msgid ""
+"Different Views: There are six different views for navigating your "
 "family: People, Family, Pedigree, Sources, Places, Media. Each helps you to "
 "achieve one or more specific tasks."
 msgstr ""
 
-#: data/tips.xml:242
+#: data/tips.xml:280
 msgid ""
-"CHANGING A CHILD/PARENT RELATIONSHIP: In the Family view, a right-"
-"click on the Children allows you to edit the child/parent relationship. This "
-"is used to mark out children as adopted or step-children."
-msgstr ""
-
-#: data/tips.xml:249
-msgid ""
-"BOOKMARKING INDIVIDUALS: To 'bookmark' individuals in your database, "
-"navigate to them using the Family view, then right-click and 'add bookmark'. "
-"You can visit these bookmarks much like in your browser, simply via Bookmark "
-"> Go to bookmark."
-msgstr ""
-
-#: data/tips.xml:255
-msgid ""
-"DATES: Incorrect date formats will show up with the red button "
-"alongside the date. Green means okay, and amber signifies acceptable. Click "
-"on the colored button to invoke Date Selection dialog, if you like."
-msgstr ""
-
-#: data/tips.xml:265
-msgid ""
-"LISTING EVENTS: Events in the life of any individual in the database "
-"may be added via the Person > Edit Person > Events option. This space can be "
-"used to include a wide range of options ranging from adoptions, to baptisms "
-"(and other religious ceremonies), burials, causes of death, Census listings, "
-"degrees earned in education, divorce filings, elections, emigration, "
-"military service, nobility titles, number of marriages, occupations, "
-"ordination, property, religion, retirement, wills, etc."
-msgstr ""
-
-#: data/tips.xml:282
-msgid ""
-"CHANGING PREFERRED NAME: If a person has several names, it is very "
-"easy to manage these names in Gramps. Find the person in the Family view, "
-"double-click on the record, and open Names tab. You can add different types "
-"of names here, like Married Name, Birth Name, etc. Selecting a preferred "
-"name is just a matter of right-clicking on the name and choosing the only "
-"item in the menu."
+"Bookmarking Individuals: The Bookmark menu at the top of the window "
+"is a convenient place to store the names of frequently used individuals. "
+"Clicking on a bookmarked individual will make that person the Active Person. "
+"To create a bookmark for a person, make them the Active Person, right click "
+"on their name and click on 'add bookmark'."
 msgstr ""
 
 #: data/tips.xml:288
 msgid ""
-"The Pedigree view display the family in the traditional pedigree view. Hold "
-"the mouse over individuals to see more information about them and to move to "
-"more distant parts of the tree."
+"Incorrect Dates: Everyone occasionally enters dates with a nonvalid "
+"format. Incorrect date formats will show up with the red button next to the "
+"date. Green means okay, and amber signifies acceptable. The Date Selection "
+"dialog can be invoked by clicking on the colored button."
 msgstr ""
 
-#: data/tips.xml:295
-msgid "The Sources view shows all the family's referenced sources in a single view."
-msgstr ""
-
-#: data/tips.xml:304
-msgid "The Places view shows all places referred to in the database."
-msgstr ""
-
-#: data/tips.xml:310
+#: data/tips.xml:298
 msgid ""
-"The Media list includes all forms of media referenced by the database. These "
-"could be graphic images, videos, sound clips, spreadsheets, documents, and "
-"more."
+"Listing Events: Events in the life of any individual may be added to "
+"the database via the Person > Edit Person > Events option. This space "
+"can be used to include a wide range of options ranging from adoptions, to "
+"baptisms (and other religious ceremonies), burials, causes of death, Census "
+"listings, degrees earned, elections, emigration, military service, nobility "
+"titles, occupations, ordination, property, religion, retirement, wills, etc."
+msgstr ""
+
+#: data/tips.xml:308
+msgid ""
+"Changing The Preferred Name: It is easy to manage people with several "
+"names in GRAMPS. Make the person the Active Person, doubleclick on the "
+"record, and select the Names tab. Different types of names can be added. For "
+"example, Married Name, Birth Name, etc. Selecting a preferred name is just a "
+"matter of right-clicking on the name and choosing the only item in the menu."
 msgstr ""
 
 #: data/tips.xml:315
 msgid ""
-"GRAMPS allows you to bookmark key individuals in your family tree, for quick "
-"access. The number able to be marked is unlimited."
+"The Pedigree View displays a traditional pedigree chart. Hold the mouse over "
+"an individual to see more information about them or right click on an "
+"individual to view a menu to quickly access their spouses, siblings, "
+"children, or parents."
 msgstr ""
 
-#: data/tips.xml:322
+#: data/tips.xml:321
 msgid ""
-"GRAMPS comes with a rich set of tools. This allows you to undertake "
-"operations such as checking database for errors and consistency, as well as "
-"the research and analysis tools such as event comparison, finding duplicate "
-"people, interactive descendant browser, and others."
+"The Sources View shows a list of all sources in a single window. Double-"
+"click on each to edit, add notes, and to see which individuals reference the "
+"source."
 msgstr ""
 
-#: data/tips.xml:328
+#: data/tips.xml:327
 msgid ""
-"The 'merge' function allows you to combine separately-listed people into "
-"one. This is very useful for combining two databases with overlapping "
-"people, or combining erroneously-entered differing names for one individual."
+"The Places View shows a list of all places in the database. The list can be "
+"sorted by a number of different criteria, such as City, County or State."
 msgstr ""
 
-#: data/tips.xml:334
+#: data/tips.xml:333
 msgid ""
-"The Soundex generator allows you to generate the standard codes commonly "
-"used in genealogy, to compare similar sounding names even though spelled "
-"differently."
+"The Media View shows a list of all media entered in the database. These can "
+"be graphic images, videos, sound clips, spreadsheets, documents, and more."
 msgstr ""
 
-#: data/tips.xml:340
+#: data/tips.xml:342
 msgid ""
-"Custom filters allow you to dig out family data and interesting facts, in a "
-"number of interesting selections. Such custom filters can be used in "
-"addition to the numerous preset filters."
+"Filters allow you to limit the people seen in the People View. In addition "
+"to the many preset filters, Custom Filters can be created that allow you to "
+"create filters limited only by your imagination. Custom filters can be "
+"created from Tools > Utilities > Custom Filter Editor."
 msgstr ""
 
-#: data/tips.xml:347
+#: data/tips.xml:349
 msgid ""
 "GRAMPS allows you to import from, and export to, GEDCOM format. There is "
 "extensive support for the industry standard GEDCOM version 5.5, so you can "
@@ -4481,350 +4682,215 @@ msgid ""
 "programs."
 msgstr ""
 
-#: data/tips.xml:353
-msgid ""
-"You can convert your data into a GRAMPS 'package', which is a compressed "
-"file containing your family tree data and any other files used. This is "
-"useful for backup or sharing with other GRAMPS users."
-msgstr ""
-
 #: data/tips.xml:358
 msgid ""
-"Make your data portable -- you can export your family tree data and media "
+"You can convert your data into a GRAMPS package, which is a compressed file "
+"containing your family tree data and includes all other files used by the "
+"database, such as images. This file is completely portable so is useful for "
+"backups or sharing with other GRAMPS users. This format has advantages over "
+"GEDCOM in that no information is ever lost in exporting and importing."
+msgstr ""
+
+#: data/tips.xml:363
+msgid ""
+"Make your data portable --- your family tree data and media can be exported "
 "directly to the GNOME file manager (Nautilus), for burning onto a CD."
 msgstr ""
 
-#: data/tips.xml:364
+#: data/tips.xml:369
 msgid ""
-"Web Family Tree (WFT) allows you to display your family tree online with "
-"only a single file, instead of many html files. GRAMPS allows you to export "
-"data to the WFT format."
-msgstr ""
-
-#: data/tips.xml:368
-msgid "GRAMPS currently runs on Linux, BSD, and Solaris."
+"GRAMPS can export data to the Web Family Tree (WFT) format. This format "
+"allows a family tree to be displayed online using a single file, instead of "
+"many html files."
 msgstr ""
 
 #: data/tips.xml:375
 msgid ""
-"There are several ways to report a bug, including the GRAMPS Bugs mailing "
-"list. The best way to report a bug is to use the GRAMPS Bug Tracker at "
-"Sourceforge. Using the bug tracker will make sure that your issue will be "
-"handled, and doesn't miss the developers' attention."
-msgstr ""
-
-#: data/tips.xml:383
-msgid ""
-"GRAMPS is taken forward by a set of useful mailing-lists, which any serious "
-"user needs to consider joining. These lists include gramps-announce "
-"(announcements relating to the software project), gramps-bugs (to track "
-"bugs), gramps-devel (for developers), and gramps-users (for all users, "
-"including beginners)."
-msgstr ""
-
-#: data/tips.xml:387
-msgid "Tonnes of GRAMPS-related information at http://gramps.sourceforge.net/"
-msgstr ""
-
-#: data/tips.xml:393
-msgid ""
-"GRAMPS stands for Genealogical Research and Analysis Management Programming "
-"System. It allows you to store, edit, and research genealogical data, with "
-"similar functionality to other genealogical programs."
-msgstr ""
-
-#: data/tips.xml:401
-msgid ""
-"GRAMPS offers some unique features, including the ability to input any bits "
-"and pieces of information directly into GRAMPS and rearrange/manipulate any "
-"data events in the entire data base (in any order or sequence) to assist the "
-"user in doing research, analysis and correlation with the potential of "
-"filling relationship gaps."
-msgstr ""
-
-#: data/tips.xml:407
-msgid ""
-"Respect the privacy of people in your family tree. Genealogy shouldn't "
-"reveal anyone's current health condition, their financial information, and "
-"other information they would prefer be kept confidential."
-msgstr ""
-
-#: data/tips.xml:415
-msgid ""
-"Be accurate when recording genealogical information. Don't make assumptions "
-"while recording primary information; write it exactly as you see it. Use "
-"bracketed comments to indicate your additions, deletions or comments. Use of "
-"the Latin 'sic' is recommended to confirm the accurate transcription of what "
-"seems to be an error."
-msgstr ""
-
-#: data/tips.xml:420
-msgid ""
-"You can link any 'media' (including non-text information) and other file-"
-"types to your GRAMPS family tree."
-msgstr ""
-
-#: data/tips.xml:426
-msgid ""
-"Privacy options allow the restriction of any information marked or "
-"information about living individuals. Data marked with this option can be "
-"excluded from reports and data exports."
-msgstr ""
-
-#: data/tips.xml:432
-msgid ""
-"GRAMPS allows you to generate brief or detailed reports for the ancestors or "
-"descendents of any individual in your family tree, depending on your "
-"requirements."
-msgstr ""
-
-#: data/tips.xml:437
-msgid ""
-"Multiple styles of reports are currently available by default. Users can "
-"also create their own custom styles."
-msgstr ""
-
-#: data/tips.xml:444
-msgid ""
-"Eight output formats are supported by GRAMPS -- PDF, AbiWord, KWord, "
-"OpenOffice Writer, HTML, Rich Text Format (RTF), Latex, and plain text. "
-"These formats generate data which can be read on all computers, making it "
-"easy for anyone to access it."
-msgstr ""
-
-#: data/tips.xml:449
-msgid ""
-"Custom reports can be created by advanced users under the \"plugin\" system "
-"which allows the sharing of custom report styles between users."
-msgstr ""
-
-#: data/tips.xml:455
-msgid ""
-"Book report allows the user to collect a variety of reports in a single "
-"document, which in turn is easier to distribute, especially in a paper "
-"format."
-msgstr ""
-
-#: data/tips.xml:461
-msgid ""
-"Want improvements in GRAMPS? You can do it yourself too. Since GRAMPS is "
-"free/libre and open source software, nobody prevents you from taking all of "
-"the code and continuing its development in whatever direction you see fit."
-msgstr ""
-
-#: data/tips.xml:467
-msgid ""
-"Interested in getting notified when a GRAMPS release is made? Sign up on the "
-"gramps-announce mailing list ultra-low bandwidth, at http://lists."
-"sourceforge.net/lists/listinfo/gramps-announce"
-msgstr ""
-
-#: data/tips.xml:474
-msgid ""
-"Have questions about GRAMPS, or are you looking to discuss GRAMPS related "
-"items? The best place is the gramps-users mailing list http://lists."
-"sourceforge.net/lists/listinfo/gramps-users You need to first sign-up to be "
-"able to post."
-msgstr ""
-
-#: data/tips.xml:481
-msgid ""
-"Need enhancements for GRAMPS? Requesting an enhancement can be done either "
-"through the gramps-users or gramps-devel mailing lists, or by creating a "
-"Request for Enhancement (RFE) http://sourceforge.net/tracker/?"
-"group_id=25770&atid=385140"
-msgstr ""
-
-#: data/tips.xml:487
-msgid ""
-"Good genealogy tip: Information collated about your family is only as good "
-"as the source it came from. Take time and trouble to write down all the "
-"details of where the information came from."
-msgstr ""
-
-#: data/tips.xml:494
-msgid ""
-"Go from what you know to what you do not. Always record everything that is "
-"known before making conjecture. Often the facts at hand suggest plenty of "
-"direction for more research. Don't waste time looking through thousands of "
-"records hoping for a trail when you have other unexplored options."
-msgstr ""
-
-#: data/tips.xml:501
-msgid ""
-"Genealogy isn't only about dates and names. It is about people. Be "
-"descriptive. Include the why of how things happened, and how "
-"descendents might have been shaped by the events they went through. "
-"Narratives go a long way in making your family interesting to others too."
-msgstr ""
-
-#: data/tips.xml:506
-msgid ""
-"Join the gramps-users mailing list at http://lists.sourceforge.net/lists/"
-"listinfo/gramps-users"
-msgstr ""
-
-#: data/tips.xml:512
-msgid ""
-"You can create graphical ancestor or descendent charts in several formats -- "
-"box charts, a fan chart, multiple formats (OpenOffice Draw, PDF, PostScript, "
-"SVG), and custom charts."
-msgstr ""
-
-#: data/tips.xml:518
-msgid ""
 "You can easily export your family tree to a web page. Select the entire "
 "database, family lines or selected individuals to a collection of web pages "
 "ready for upload to the World Wide Web."
 msgstr ""
 
-#: data/tips.xml:522
-msgid "Multiple calendars and date ranges are supported by GRAMPS."
+#: data/tips.xml:380
+msgid ""
+"The best way to report a bug in GRAMPS is to use the GRAMPS Bug Tracker at "
+"Sourceforge, http://sourceforge.net/tracker/?group_id=25770&atid=385137"
 msgstr ""
 
-#: data/tips.xml:526
-msgid "Support is mature for multiple languages and cultures."
+#: data/tips.xml:384
+msgid "The GRAMPS homepage is at http://gramps-project.org/"
 msgstr ""
 
-#: data/tips.xml:530
-msgid "GRAMPS offers translations for 15 languages."
+#: data/tips.xml:392
+msgid ""
+"GRAMPS has some unique features, including the ability to input any piece of "
+"information directly into GRAMPS. All data in the data base can be "
+"rearranged/manipulated to assist the user in doing research, analysis and "
+"correlation with the potential of filling relationship gaps."
 msgstr ""
 
-#: data/tips.xml:536
+#: data/tips.xml:398
+msgid ""
+"GRAMPS helps you to keep personal information secure by allowing you to mark "
+"information as private. Data marked as private can be excluded from reports "
+"and data exports."
+msgstr ""
+
+#: data/tips.xml:406
+msgid ""
+"Be accurate when recording genealogical information. Don't make assumptions "
+"while recording primary information; write it exactly as you see it. Use "
+"bracketed comments to indicate your additions, deletions or comments. Use of "
+"the Latin 'sic' is recommended to confirm the accurate transcription of what "
+"appears to be an error in a source."
+msgstr ""
+
+#: data/tips.xml:411
+msgid ""
+"You can link any electronic media (including non-text information) and other "
+"file types to your GRAMPS family tree."
+msgstr ""
+
+#: data/tips.xml:420
+msgid ""
+"GRAMPS allows you to generate a number of reports (both text and graphical) "
+"based on your genealogical information. There is great flexibility in "
+"selecting what people are included in the reports as well as the output "
+"format (html, pdf, OpenOffice, RTF, AbiWord, KWord, LaTeX and plain text). "
+"Experiment with the reports under the Reports menu to get an idea of "
+"how powerful GRAMPS is."
+msgstr ""
+
+#: data/tips.xml:426
+msgid ""
+"Custom reports can be created by advanced users under the \"plugin\" system. "
+"More information on custom reports can be found at http://developers.gramps-"
+"project.org"
+msgstr ""
+
+#: data/tips.xml:432
+msgid ""
+"The Book report, Reports > Books > Book Report, allows users to "
+"collect a variety of reports into a single document. This single report is "
+"easier to distribute than multiple reports, especially when printed."
+msgstr ""
+
+#: data/tips.xml:438
+msgid ""
+"Interested in getting notified when a new version of GRAMPS is released? "
+"Join the gramps-announce mailing list at http://lists.sourceforge.net/lists/"
+"listinfo/gramps-announce"
+msgstr ""
+
+#: data/tips.xml:446
+msgid ""
+"Good genealogy tip: Information collected about your family is only "
+"as good as the source it came from. Take time and trouble to record all the "
+"details of where the information came from. Whenever possible get a copy of "
+"original documents."
+msgstr ""
+
+#: data/tips.xml:453
+msgid ""
+"Go from what you know to what you do not. Always record everything that is "
+"known before making conjecture. Often the facts at hand suggest plenty of "
+"direction for more research. Don't waste time looking through thousands of "
+"records hoping for a trail when you have other unexplored leads."
+msgstr ""
+
+#: data/tips.xml:460
+msgid ""
+"Genealogy isn't only about dates and names. It is about people. Be "
+"descriptive. Include the why of how things happened, and how "
+"descendants might have been shaped by the events they went through. "
+"Narratives go a long way in making your family history come alive."
+msgstr ""
+
+#: data/tips.xml:466
+msgid ""
+"GRAMPS has been translated to 15 languages. If GRAMPS supports your language "
+"and it is not being displayed, set the default language on your machine and "
+"restart GRAMPS."
+msgstr ""
+
+#: data/tips.xml:472
 msgid ""
 "GRAMPS has been designed so that new translations can easily be added with "
 "little development effort. If you are interested in participating please "
 "email gramps-devel@lists.sf.net"
 msgstr ""
 
-#: data/tips.xml:540
-msgid "Relationship calculators in GRAMPS are available in four languages."
+#: data/tips.xml:476
+msgid "Relationship calculators in GRAMPS are available in ten languages."
 msgstr ""
 
-#: data/tips.xml:545
+#: data/tips.xml:481
 msgid ""
 "GRAMPS offers full Unicode support. Characters for all languages are "
 "properly displayed."
 msgstr ""
 
-#: data/tips.xml:552
+#: data/tips.xml:487
 msgid ""
-"You can choose anyone as your 'home person' in GRAMPS. Use Edit -> Set Home "
-"Person. The home person is the person who is selected when the database is "
-"opened, when the home-button is pressed in your browser-like GRAMPS "
-"interface, and when Home is selected from the context menu anywhere."
+"Anyone can be chosen as the 'home person' in GRAMPS. Use Edit -> Set Home "
+"Person. The home person is the person who is selected when the database "
+"is opened or when the home button is pressed."
 msgstr ""
 
-#: data/tips.xml:557
+#: data/tips.xml:492
 msgid ""
-"You can specify several names for a single person -- such as, birth name, "
-"marriage name, etc."
+"Multiple names can be specified for individuals. Examples are birth name, "
+"marriage name or aliases."
 msgstr ""
 
-#: data/tips.xml:565
+#: data/tips.xml:497
 msgid ""
-"To switch between the different names of a single individual (birth name, "
-"marriage name, etc) right-click on the name wanted in the list of "
-"alternative names (under the Names tag in the EditPerson dialog) and select "
-"an item from the context menu. This name will become the primary name, and "
-"will be used in all display-related places."
+"An alternate name can be selected as a person's preferred name by selecting "
+"the desired name in the person's name list, bringing up the context menu by "
+"clicking the right mouse button, and selecting from the menu."
 msgstr ""
 
-#: data/tips.xml:572
+#: data/tips.xml:504
 msgid ""
-"Many current GRAMPS users contribute reports, suggestions, and feedback to "
-"the developers through various public mailing lists. The program is only a "
-"few years old and already has wide capabilities and features. Would you like "
-"to help too?"
+"GRAMPS is written in a computer language called Python using the GTK and "
+"GNOME libraries for the graphical interface. GRAMPS is supported on any "
+"computer system where these programs have been ported."
 msgstr ""
 
-#: data/tips.xml:576
-msgid "Numerous GRAMPS releases are made each year."
-msgstr ""
-
-#: data/tips.xml:583
-msgid ""
-"GRAMPS is written in a computer language called Python using GTK and GNOME "
-"libraries. While only well supported in certain Unix and Linux environments, "
-"these are multi-platform development libraries, meaning that GRAMPS can be "
-"ported to any platform the required libraries are ported to."
-msgstr ""
-
-#: data/tips.xml:589
+#: data/tips.xml:510
 msgid ""
 "The Free/Libre and Open Source Software (FLOSS) development model means "
 "GRAMPS can be extended by any programmer since all of the source code is "
 "freely available under its license."
 msgstr ""
 
-#: data/tips.xml:594
+#: data/tips.xml:515
 msgid ""
 "GRAMPS is freely distributable under the General Public License, see http://"
-"www.gnu.org/licenses/licenses.html#GPL !"
+"www.gnu.org/licenses/licenses.html#GPL"
 msgstr ""
 
-#: data/tips.xml:601
+#: data/tips.xml:520
 msgid ""
-"GRAMPS does not support TempleReady GEDCOM extensions, and offers limited "
-"drag-and-drop support. Currently, there is no support for drag and drop "
-"between databases. Graph reports are also limited in functionality."
+"GRAMPS works even when using KDE, as long as the required GNOME libraries "
+"are installed."
 msgstr ""
 
-#: data/tips.xml:607
-msgid ""
-"GRAMPS is the Genealogical Research and Analysis Management Program System. "
-"In other words, it a personal genealogy program letting you store, edit, and "
-"research genealogical data using the powers of your computer."
-msgstr ""
-
-#: data/tips.xml:615
-msgid ""
-"GRAMPS can be downloaded from Sourceforge http://sf.net/projects/gramps at "
-"no charge. GRAMPS is an Free/Libre and Open Source Software project covered "
-"by the GNU General Public License http://www.gnu.org/copyleft/gpl.html . You "
-"have full access to the source code and are allowed to distribute the "
-"program and source code freely."
-msgstr ""
-
-#: data/tips.xml:623
-msgid ""
-"A port of GRAMPS to Mac OS X exists from the Fink project http://fink."
-"sourceforge.net/pdb/package.php/gramps . It is not unusual for this version "
-"to lag behind the Linux version. The port is not supported by the GRAMPS "
-"project (since few if any of us have Macs), but we try to help out where we "
-"can."
-msgstr ""
-
-#: data/tips.xml:628
-msgid ""
-"GRAMPS works with KDE too, as long as the required GNOME libraries are "
-"installed."
-msgstr ""
-
-#: data/tips.xml:633
+#: data/tips.xml:525
 msgid ""
 "To run GRAMPS, you need to have GNOME installed. But you do not need to be "
 "running the GNOME desktop."
 msgstr ""
 
-#: data/tips.xml:641
+#: data/tips.xml:531
 msgid ""
 "GRAMPS makes every effort to maintain compatibility with GEDCOM, the general "
-"standard of recording genealogical information. We have import and export "
-"filters that enable GRAMPS to read and write GEDCOM files. Please do inform "
-"us about any GEDCOM flavor not supported by GRAMPS, and we will do our best "
-"to support it!"
-msgstr ""
-
-#: data/tips.xml:647
-msgid ""
-"GRAMPS can produce many different charts and reports. Moreover, the plugin "
-"architecture enables a user (you) to create his own plugins which could be "
-"new reports, charts, or research tools."
+"standard of recording genealogical information. Filters exist that make "
+"importing and exporting GEDCOM files trivial."
 msgstr ""
 
 # msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz"
-#: docgen/AbiWord2Doc.py:332
+#: docgen/AbiWord2Doc.py:340
 msgid "AbiWord document"
 msgstr "Document AbiWord"
 
@@ -4906,7 +4972,7 @@ msgstr "SVG (Scalable Vector Graphics)"
 msgid "Encoding"
 msgstr "Encodage"
 
-#: gedcomexport.glade:127 gramps.glade:20057 gramps.glade:28961
+#: gedcomexport.glade:127 gramps.glade:21644 gramps.glade:31156
 #: plugins/genewebexport.glade:103 plugins/merge.glade:385
 #: plugins/vcalendarexport.glade:103 plugins/vcardexport.glade:103
 #: plugins/writeftree.glade:124
@@ -5008,7 +5074,7 @@ msgstr "Cr
 msgid "Status"
 msgstr "Situation"
 
-#: gedcomimport.glade:216 gramps.glade:3482 gramps.glade:19273
+#: gedcomimport.glade:216 gramps.glade:3660 gramps.glade:20805
 msgid "Information"
 msgstr "Information"
 
@@ -5062,343 +5128,344 @@ msgstr ""
 "ASCII\n"
 "UNICODE"
 
-#: gramps.glade:10 gramps.glade:31049
+#: gramps.glade:10 gramps.glade:33389
 msgid "GRAMPS"
 msgstr "GRAMPS"
 
-#: gramps.glade:44
+#: gramps.glade:45
 msgid "_File"
 msgstr "_Fichier"
 
-#: gramps.glade:53
+#: gramps.glade:54
 msgid "_New"
 msgstr "_Nouveau"
 
-#: gramps.glade:75
+#: gramps.glade:76
 msgid "_Open..."
 msgstr "_Ouvrir ..."
 
-#: gramps.glade:97
+#: gramps.glade:98
 msgid "Open _Recent"
 msgstr "Fichiers _rcemment ouverts"
 
-#: gramps.glade:112
+#: gramps.glade:113
 msgid "_Import..."
 msgstr "_Importer ..."
 
-#: gramps.glade:134
+#: gramps.glade:135
 msgid "Save _As..."
 msgstr "Enregistrer _sous ..."
 
-#: gramps.glade:156
+#: gramps.glade:157
 msgid "E_xport..."
 msgstr "E_xporter ..."
 
-#: gramps.glade:184
+#: gramps.glade:185
 msgid "A_bandon changes and quit"
 msgstr "A_bandonner les modifications et quitter"
 
-#: gramps.glade:193
+#: gramps.glade:194
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: gramps.glade:219
+#: gramps.glade:220
 msgid "_Edit"
 msgstr "_Edition"
 
-#: gramps.glade:228 gramps_main.py:536
+#: gramps.glade:229 gramps_main.py:536
 msgid "_Undo"
 msgstr "_Annuler"
 
-#: gramps.glade:256 gramps.glade:918
+#: gramps.glade:257 gramps.glade:919
 msgid "Add a new item"
 msgstr "Ajouter un nouvel article"
 
-#: gramps.glade:257 rule.glade:135 rule.glade:722
+#: gramps.glade:258 rule.glade:135 rule.glade:722
 msgid "_Add..."
 msgstr "A_jouter ..."
 
-#: gramps.glade:279 gramps.glade:936
+#: gramps.glade:280 gramps.glade:937
 msgid "Remove the currently selected item"
 msgstr "Supprimer l'enregistrement slectionn"
 
-#: gramps.glade:280
+#: gramps.glade:281
 msgid "R_emove"
 msgstr "_Supprimer"
 
-#: gramps.glade:302 gramps.glade:954
+#: gramps.glade:303 gramps.glade:955
 msgid "Edit the selected item"
 msgstr "Editer l'item slectionn"
 
-#: gramps.glade:303
+#: gramps.glade:304
 msgid "E_dit..."
 msgstr "M_odifier ..."
 
-#: gramps.glade:318
+#: gramps.glade:319
 msgid "Compare and _Merge..."
 msgstr "Comparaison et _Fusion ..."
 
-#: gramps.glade:340
+#: gramps.glade:341
 msgid "Fast Mer_ge"
 msgstr "F_usion rapide"
 
-#: gramps.glade:355
+#: gramps.glade:356
 msgid "Prefere_nces..."
 msgstr "Prfre_nces ..."
 
-#: gramps.glade:376
+#: gramps.glade:377
 msgid "_Column Editor..."
 msgstr "Editeur de _colonnes ..."
 
-#: gramps.glade:397
+#: gramps.glade:398
 msgid "Set _Home person..."
 msgstr "Changer la personne de _rfrence ..."
 
-#: gramps.glade:422
+#: gramps.glade:423
 msgid "_View"
 msgstr "_Affichage"
 
-#: gramps.glade:431
+#: gramps.glade:432
 msgid "_Filter"
 msgstr "_Filtre"
 
-#: gramps.glade:441
+#: gramps.glade:442
 msgid "_Sidebar"
 msgstr "_Barre verticale"
 
-#: gramps.glade:451
+#: gramps.glade:452
 msgid "_Toolbar"
 msgstr "Barre d'_outils"
 
-#: gramps.glade:465
+#: gramps.glade:466
 msgid "_Go"
 msgstr "_Aller "
 
-#: gramps.glade:473
+#: gramps.glade:474
 msgid "_Bookmarks"
 msgstr "_Signets"
 
-#: gramps.glade:482
+#: gramps.glade:483
 msgid "_Add bookmark"
 msgstr "_Ajouter un signet"
 
-#: gramps.glade:504
+#: gramps.glade:505
 msgid "_Edit bookmarks..."
 msgstr "_Grer les signets ..."
 
-#: gramps.glade:532
+#: gramps.glade:533
 msgid "_Go to bookmark"
 msgstr "_Liste des signets"
 
-#: gramps.glade:544
+#: gramps.glade:545
 msgid "_Reports"
 msgstr "_Rapports"
 
-#: gramps.glade:552
+#: gramps.glade:553
 msgid "_Tools"
 msgstr "_Outils"
 
-#: gramps.glade:560
+#: gramps.glade:561
 msgid "_Windows"
 msgstr "_Fentre"
 
-#: gramps.glade:568
+#: gramps.glade:569
 msgid "_Help"
 msgstr "Ai_de"
 
-#: gramps.glade:577
+#: gramps.glade:578
 msgid "_User manual"
 msgstr "_Manuel utilisateur"
 
-#: gramps.glade:599
+#: gramps.glade:600
 msgid "_FAQ"
 msgstr "_Foire aux questions (FAQ)"
 
-#: gramps.glade:626
+#: gramps.glade:627
 msgid "GRAMPS _home page"
 msgstr "Page d'accueil de GRAMPS"
 
-#: gramps.glade:647
+#: gramps.glade:648
 msgid "GRAMPS _mailing lists"
 msgstr "Liste de diffusion de GRAMPS"
 
-#: gramps.glade:668
+#: gramps.glade:669
 msgid "_Report a bug"
 msgstr "_Rapporter un bogue"
 
-#: gramps.glade:683
+#: gramps.glade:684
 msgid "_Show plugin status..."
 msgstr "_Afficher l'tat des modules ..."
 
-#: gramps.glade:692
+#: gramps.glade:693
 msgid "_Open example database"
 msgstr "_Ouvrir la base de donnes exemple"
 
-#: gramps.glade:701
+#: gramps.glade:702
 msgid "_About"
 msgstr "_ propos de GRAMPS"
 
-#: gramps.glade:751
+#: gramps.glade:752
 msgid "Open database"
 msgstr "Ouvrir une base de donnes"
 
-#: gramps.glade:752
+#: gramps.glade:753
 msgid "Open"
 msgstr "Ouvrir"
 
-#: gramps.glade:782
+#: gramps.glade:783
 msgid "Go back in history"
 msgstr "Remonter dans le temps"
 
-#: gramps.glade:783
+#: gramps.glade:784
 msgid "Back"
 msgstr "Prcdent"
 
-#: gramps.glade:801
+#: gramps.glade:802
 msgid "Go forward in history"
 msgstr "Avancer dans le temps"
 
-#: gramps.glade:802
+#: gramps.glade:803
 msgid "Forward"
 msgstr "Suivant"
 
-#: gramps.glade:820
+#: gramps.glade:821
 msgid "Make the Home Person the active person"
 msgstr "Rendre active la personne rfrence"
 
-#: gramps.glade:851
+#: gramps.glade:852
 msgid "Open Scratch Pad"
 msgstr "Ouvrir le presse-papiers"
 
-#: gramps.glade:852
+#: gramps.glade:853
 msgid "ScratchPad"
 msgstr "Presse-papiers"
 
-#: gramps.glade:869
+#: gramps.glade:870
 msgid "Generate reports"
 msgstr "Gnration des rapports"
 
-#: gramps.glade:870
+#: gramps.glade:871
 msgid "Reports"
 msgstr "Rapports"
 
-#: gramps.glade:887
+#: gramps.glade:888
 msgid "Run tools"
 msgstr "Lancer l'outil"
 
-#: gramps.glade:888
+#: gramps.glade:889
 msgid "Tools"
 msgstr "Outils"
 
-#: gramps.glade:919
+#: gramps.glade:920
 msgid "Add"
 msgstr "Ajouter"
 
-#: gramps.glade:937
+#: gramps.glade:938
 msgid "Remove"
 msgstr "Supprimer"
 
-#: gramps.glade:1028 gramps.glade:1452
+#: gramps.glade:1029 gramps.glade:1486
 msgid "People"
 msgstr "Individus"
 
-#: gramps.glade:1076 gramps.glade:2237 gramps.glade:2992
+#: gramps.glade:1081 gramps.glade:2310 gramps.glade:3104
 msgid "Family"
 msgstr "Famille"
 
-#: gramps.glade:1124 gramps.glade:3039
+#: gramps.glade:1133 gramps.glade:3155
 msgid "Pedigree"
 msgstr "Arborescence"
 
-#: gramps.glade:1172 gramps.glade:3097
+#: gramps.glade:1185 gramps.glade:3220
 msgid "Sources"
 msgstr "Sources"
 
-#: gramps.glade:1220 gramps.glade:3155
+#: gramps.glade:1237 gramps.glade:3285
 msgid "Places"
 msgstr "Lieux"
 
-#: gramps.glade:1268 gramps.glade:3554
+#: gramps.glade:1289 gramps.glade:3739
 msgid "Media"
 msgstr "Media"
 
-#: gramps.glade:1376
+#: gramps.glade:1407
 msgid "Invert"
 msgstr "_Inverser"
 
-#: gramps.glade:1394
+#: gramps.glade:1425
 msgid "Apply filter using the selected controls"
 msgstr "Appliquer les filtres demands"
 
-#: gramps.glade:1481 gramps.glade:2956
+#: gramps.glade:1519 gramps.glade:3068
 msgid "Exchange the current spouse with the active person"
 msgstr "Echanger l'poux(se) en cours avec la personne en cours"
 
-#: gramps.glade:1547 gramps.glade:2718
+#: gramps.glade:1585 gramps.glade:2822
 msgid "Adds a new person to the database and to a new relationship"
 msgstr "Ajouter un nouvel individu  la base et crer une nouvelle relation"
 
-#: gramps.glade:1574 gramps.glade:2745
-msgid "Selects an existing person from the database and adds to a new relationship"
+#: gramps.glade:1612 gramps.glade:2849
+msgid ""
+"Selects an existing person from the database and adds to a new relationship"
 msgstr "Ajouter une personne existante et lui crer une nouvelle relation"
 
-#: gramps.glade:1601 gramps.glade:2772
+#: gramps.glade:1639 gramps.glade:2876
 msgid "Removes the currently selected spouse"
 msgstr "Supprimer l'poux(se) slectionn(e)"
 
-#: gramps.glade:1644 gramps.glade:2865
+#: gramps.glade:1682 gramps.glade:2977
 msgid "Make the active person's parents the active family"
 msgstr "Visualiser la famille des parents"
 
-#: gramps.glade:1671 gramps.glade:2892
+#: gramps.glade:1709 gramps.glade:3004
 msgid "Adds a new set of parents to the active person"
 msgstr "Ajouter de nouveaux parents"
 
-#: gramps.glade:1698 gramps.glade:2919
+#: gramps.glade:1736 gramps.glade:3031
 msgid "Deletes the selected parents from the active person"
 msgstr "Supprimer les parents"
 
-#: gramps.glade:1744 gramps.glade:2026 gramps.glade:2360 gramps.glade:2390
+#: gramps.glade:1782 gramps.glade:2090 gramps.glade:2447 gramps.glade:2480
 msgid "Double-click to edit the relationship to the selected parents"
 msgstr "Double-cliquer pour afficher les relations des parents"
 
-#: gramps.glade:1771 gramps.glade:2596
+#: gramps.glade:1812 gramps.glade:2696
 msgid "Make the selected spouse's parents the active family"
 msgstr "Visualiser la famille de l'poux(se)"
 
-#: gramps.glade:1798 gramps.glade:2623
+#: gramps.glade:1839 gramps.glade:2723
 msgid "Adds a new set of parents to the selected spouse"
 msgstr "Ajouter de nouveaux parents  l'poux(se)"
 
-#: gramps.glade:1825 gramps.glade:2650
+#: gramps.glade:1866 gramps.glade:2750
 msgid "Deletes the selected parents from the selected spouse"
 msgstr "Supprimer les parents de l'poux(se)"
 
-#: gramps.glade:1862 gramps.glade:2296
+#: gramps.glade:1903 gramps.glade:2376
 msgid "_Children"
 msgstr "_Enfants"
 
-#: gramps.glade:1887 gramps.glade:2809
+#: gramps.glade:1932 gramps.glade:2913
 msgid "_Active person"
 msgstr "_Individu actif"
 
-#: gramps.glade:1912 gramps.glade:2834
+#: gramps.glade:1961 gramps.glade:2942
 msgid "Active person's _parents"
 msgstr "_Parents actifs"
 
-#: gramps.glade:1937 gramps.glade:2687
+#: gramps.glade:1990 gramps.glade:2787
 msgid "Relati_onship"
 msgstr "Relati_ons"
 
-#: gramps.glade:1962 gramps.glade:2565
+#: gramps.glade:2019 gramps.glade:2661
 msgid "Spo_use's parents"
 msgstr "Parents de l'p_oux(se)"
 
-#: gramps.glade:2056 gramps.glade:2420
+#: gramps.glade:2123 gramps.glade:2513
 msgid "Double-click to edit the active person"
 msgstr "Double-cliquer pour afficher la personne active"
 
-#: gramps.glade:2086 gramps.glade:2275
+#: gramps.glade:2156 gramps.glade:2352
 msgid ""
 "Double-click to edit the relationship information, Shift-click to edit the "
 "person"
@@ -5406,44 +5473,45 @@ msgstr ""
 "Double-cliquer pour afficher les relations, Shift-Clic pour afficher la "
 "Personne"
 
-#: gramps.glade:2113 gramps.glade:2447
+#: gramps.glade:2186 gramps.glade:2543
 msgid "Make the selected child the active person"
 msgstr "Slectionner l'enfant en cours"
 
-#: gramps.glade:2140 gramps.glade:2474
+#: gramps.glade:2213 gramps.glade:2570
 msgid "Adds a new child to the database and to the current family"
 msgstr "Ajouter un nouvel enfant  la base et  la famille en cours"
 
-#: gramps.glade:2167 gramps.glade:2501
+#: gramps.glade:2240 gramps.glade:2597
 msgid ""
 "Selects an existing person from the database and adds as a child to the "
 "current family"
-msgstr "Slectionner un individu et l'ajouter comme enfant de la famille en cours"
+msgstr ""
+"Slectionner un individu et l'ajouter comme enfant de la famille en cours"
 
-#: gramps.glade:2194 gramps.glade:2528
+#: gramps.glade:2267 gramps.glade:2624
 msgid "Deletes the selected child from the selected family"
 msgstr "Supprimer l'enfant slectionn dans cette famille"
 
-#: gramps.glade:3206 gramps.glade:18997 gramps.glade:21017 gramps.glade:21282
-#: gramps.glade:22679
+#: gramps.glade:3340 gramps.glade:20485 gramps.glade:22681 gramps.glade:22959
+#: gramps.glade:24471
 msgid "Preview"
 msgstr "Aperu"
 
-#: gramps.glade:3242 gramps.glade:19033
+#: gramps.glade:3380 gramps.glade:20525
 msgid "Details:"
 msgstr "Dtails :"
 
-#: gramps.glade:3313 gramps.glade:19104 gramps.glade:21318 gramps.glade:22715
+#: gramps.glade:3463 gramps.glade:20608 gramps.glade:22999 gramps.glade:24511
 msgid "Path:"
 msgstr "Chemin :"
 
-#: gramps.glade:3338 gramps.glade:7909 gramps.glade:8479 gramps.glade:8993
-#: gramps.glade:12151 gramps.glade:12766 gramps.glade:19129 gramps.glade:22046
-#: gramps.glade:23124
+#: gramps.glade:3492 gramps.glade:8436 gramps.glade:9073 gramps.glade:9646
+#: gramps.glade:13081 gramps.glade:13775 gramps.glade:20637 gramps.glade:23799
+#: gramps.glade:24964
 msgid "Type:"
 msgstr "Type :"
 
-#: gramps.glade:3778
+#: gramps.glade:3975
 msgid ""
 "Check to show all people in the list.  Uncheck to get the list filtered by "
 "birth and death dates."
@@ -5451,15 +5519,15 @@ msgstr ""
 "Cocher pour afficher toute les personnes de la liste, dcocher pour filtrer "
 "la liste par date de naissance et de dcs."
 
-#: gramps.glade:3780 gramps.glade:4156 gramps.glade:4574
+#: gramps.glade:3977 gramps.glade:4380 gramps.glade:4826
 msgid "_Show all"
 msgstr "_Tout afficher"
 
-#: gramps.glade:3827 gramps.glade:11921
+#: gramps.glade:4024 gramps.glade:12825
 msgid "_Relationship type:"
 msgstr "_Type de relation :"
 
-#: gramps.glade:3855
+#: gramps.glade:4056
 msgid ""
 "Married\n"
 "Unmarried\n"
@@ -5473,83 +5541,83 @@ msgstr ""
 "Inconnu\n"
 "Autre"
 
-#: gramps.glade:4025
+#: gramps.glade:4233
 msgid "_Father's relationship to child:"
 msgstr "_Relation pre enfant :"
 
-#: gramps.glade:4049
+#: gramps.glade:4261
 msgid "_Mother's relationship to child:"
 msgstr "_Relation mre enfant :"
 
-#: gramps.glade:4073
+#: gramps.glade:4289
 msgid "_Parents' relationship to each other:"
 msgstr "_Relation pre mre :"
 
-#: gramps.glade:4097
+#: gramps.glade:4317
 msgid "Fat_her"
 msgstr "P_re"
 
-#: gramps.glade:4192
+#: gramps.glade:4416
 msgid "Moth_er"
 msgstr "M_re"
 
-#: gramps.glade:4217
+#: gramps.glade:4445
 msgid "Relationships"
 msgstr "Relations"
 
-#: gramps.glade:4311
+#: gramps.glade:4549
 msgid "Show _all"
 msgstr "Afficher _tout"
 
-#: gramps.glade:4643
+#: gramps.glade:4895
 msgid "Relationship to father:"
 msgstr "Relation avec le pre :"
 
-#: gramps.glade:4667
+#: gramps.glade:4923
 msgid "Relationship to mother:"
 msgstr "Relation avec la mre :"
 
-#: gramps.glade:4758 gramps.glade:6549 gramps.glade:11813 gramps.glade:28418
+#: gramps.glade:5023 gramps.glade:6932 gramps.glade:12713 gramps.glade:30562
 msgid "Abandon changes and close window"
 msgstr "Abandonner les modifications et fermer la fentre"
 
-#: gramps.glade:4773 gramps.glade:6564 gramps.glade:11828 gramps.glade:25005
-#: gramps.glade:27269 gramps.glade:28163 gramps.glade:28433
+#: gramps.glade:5038 gramps.glade:6947 gramps.glade:12728 gramps.glade:26958
+#: gramps.glade:29348 gramps.glade:30294 gramps.glade:30577
 msgid "Accept changes and close window"
 msgstr "Accepter les modifications et fermer la fentre de dialogue"
 
-#: gramps.glade:4860 gramps.glade:6759 gramps.glade:14026 gramps.glade:18104
-#: gramps.glade:21063 gramps.glade:22899 gramps.glade:28602
+#: gramps.glade:5129 gramps.glade:7162 gramps.glade:15121 gramps.glade:19547
+#: gramps.glade:22731 gramps.glade:24719 gramps.glade:30762
 msgid "_Title:"
 msgstr "_Titre :"
 
-#: gramps.glade:4885
+#: gramps.glade:5158
 msgid "_Author:"
 msgstr "_Auteur :"
 
-#: gramps.glade:4956
+#: gramps.glade:5233
 msgid "_Publication information:"
 msgstr "_Information de publication :"
 
-#: gramps.glade:5023
+#: gramps.glade:5304
 msgid "A_bbreviation:"
 msgstr "A_brviation :"
 
-#: gramps.glade:5054 gramps.glade:12092 gramps.glade:14420 gramps.glade:14590
-#: gramps.glade:23042 gramps.glade:25379 gramps.glade:26383 gramps.glade:27751
-#: gramps.glade:29180 plugins/verify.glade:530
+#: gramps.glade:5339 gramps.glade:13014 gramps.glade:15547 gramps.glade:15737
+#: gramps.glade:24870 gramps.glade:27359 gramps.glade:28409 gramps.glade:29862
+#: gramps.glade:31390 plugins/verify.glade:530
 msgid "General"
 msgstr "Gnral"
 
-#: gramps.glade:5124 gramps.glade:10150 gramps.glade:13154 gramps.glade:15225
-#: gramps.glade:21872 gramps.glade:23432 gramps.glade:25630 gramps.glade:26632
-#: gramps.glade:28000 gramps.glade:29431
+#: gramps.glade:5413 gramps.glade:10933 gramps.glade:14198 gramps.glade:16443
+#: gramps.glade:23613 gramps.glade:25291 gramps.glade:27621 gramps.glade:28669
+#: gramps.glade:30122 gramps.glade:31652
 msgid "Format"
 msgstr "Format"
 
-#: gramps.glade:5148 gramps.glade:10175 gramps.glade:13178 gramps.glade:15249
-#: gramps.glade:21896 gramps.glade:23456 gramps.glade:25654 gramps.glade:26656
-#: gramps.glade:28024 gramps.glade:29455
+#: gramps.glade:5441 gramps.glade:10962 gramps.glade:14226 gramps.glade:16471
+#: gramps.glade:23641 gramps.glade:25319 gramps.glade:27649 gramps.glade:28697
+#: gramps.glade:30150 gramps.glade:31680
 msgid ""
 "Multiple spaces, tabs, and single line breaks are replaced with single "
 "spaces. Two consecutive line breaks mark a new paragraph."
@@ -5557,15 +5625,15 @@ msgstr ""
 "Plusieurs espaces, tabulations et saut de lignes sont remplacs par des "
 "espaces. Deux saut de ligne conscutifs forme un nouveau paragraphe."
 
-#: gramps.glade:5150 gramps.glade:10177 gramps.glade:13180 gramps.glade:15251
-#: gramps.glade:21898 gramps.glade:23458 gramps.glade:25656 gramps.glade:26658
-#: gramps.glade:28026 gramps.glade:29457
+#: gramps.glade:5443 gramps.glade:10964 gramps.glade:14228 gramps.glade:16473
+#: gramps.glade:23643 gramps.glade:25321 gramps.glade:27651 gramps.glade:28699
+#: gramps.glade:30152 gramps.glade:31682
 msgid "_Flowed"
 msgstr "_Libre"
 
-#: gramps.glade:5171 gramps.glade:10198 gramps.glade:13201 gramps.glade:15272
-#: gramps.glade:21919 gramps.glade:23479 gramps.glade:25677 gramps.glade:26679
-#: gramps.glade:28047 gramps.glade:29478
+#: gramps.glade:5464 gramps.glade:10985 gramps.glade:14249 gramps.glade:16494
+#: gramps.glade:23664 gramps.glade:25342 gramps.glade:27672 gramps.glade:28720
+#: gramps.glade:30173 gramps.glade:31703
 msgid ""
 "Formatting is preserved, except for the leading whitespace. Multiple spaces, "
 "tabs, and all line breaks are respected."
@@ -5573,75 +5641,76 @@ msgstr ""
 "Le format est prserv, sauf en ce qui concerne les espaces de tte. Les "
 "espaces multiples, tabulations et autres sauts de ligne sont respects."
 
-#: gramps.glade:5173 gramps.glade:10200 gramps.glade:13203 gramps.glade:15274
-#: gramps.glade:21921 gramps.glade:23481 gramps.glade:25679 gramps.glade:26681
-#: gramps.glade:28049 gramps.glade:29480
+#: gramps.glade:5466 gramps.glade:10987 gramps.glade:14251 gramps.glade:16496
+#: gramps.glade:23666 gramps.glade:25344 gramps.glade:27674 gramps.glade:28722
+#: gramps.glade:30175 gramps.glade:31705
 msgid "_Preformatted"
 msgstr "_Prformatt"
 
-#: gramps.glade:5268 gramps.glade:5405 gramps.glade:10457 gramps.glade:13451
-#: gramps.glade:15554 gramps.glade:25960
+#: gramps.glade:5568 gramps.glade:5709 gramps.glade:11255 gramps.glade:14510
+#: gramps.glade:16787 gramps.glade:27966
 msgid "Add a new media object to the database and place it in this gallery"
 msgstr "Ajouter un nouveau media  la base et le placer dans la galerie"
 
-#: gramps.glade:5296 gramps.glade:5489 gramps.glade:13534 gramps.glade:15637
-#: gramps.glade:26043
+#: gramps.glade:5596 gramps.glade:5793 gramps.glade:14593 gramps.glade:16870
+#: gramps.glade:28049
 msgid "Remove selected object from this gallery only"
 msgstr "Supprimer l'objet slectionn de cette galerie uniquement"
 
-#: gramps.glade:5337
+#: gramps.glade:5637
 msgid "Data"
 msgstr "Donnes"
 
-#: gramps.glade:5433 gramps.glade:10485 gramps.glade:13479 gramps.glade:15582
-#: gramps.glade:25988
+#: gramps.glade:5737 gramps.glade:11283 gramps.glade:14538 gramps.glade:16815
+#: gramps.glade:27994
 msgid ""
 "Select an existing media object from the database and place it in this "
 "gallery"
-msgstr "Choisir un media dj existant dans la base et le placer dans la galerie"
+msgstr ""
+"Choisir un media dj existant dans la base et le placer dans la galerie"
 
-#: gramps.glade:5461 gramps.glade:10513 gramps.glade:15610 gramps.glade:26016
+#: gramps.glade:5765 gramps.glade:11311 gramps.glade:16843 gramps.glade:28022
 msgid "Edit the properties of the selected object"
 msgstr "Editer les proprits de l'objet slectionn"
 
-#: gramps.glade:5550 gramps.glade:10588 gramps.glade:13575 gramps.glade:15698
-#: gramps.glade:26104 plugins/WebPage.py:428
+#: gramps.glade:5854 gramps.glade:11386 gramps.glade:14634 gramps.glade:16931
+#: gramps.glade:28110 plugins/WebPage.py:432
 msgid "Gallery"
 msgstr "Galerie"
 
-#: gramps.glade:5595 gramps.glade:16095 gramps.glade:23560
+#: gramps.glade:5906 gramps.glade:17359 gramps.glade:25430
 msgid "References"
 msgstr "Rfrences"
 
-#: gramps.glade:5742
+#: gramps.glade:6062
 msgid "Open an _existing database"
 msgstr "_Ouvrir une base de donnes existante"
 
-#: gramps.glade:5762
+#: gramps.glade:6082
 msgid "Create a _new database"
 msgstr "Crer une nouvelle base de donnes"
 
-#: gramps.glade:5957
+#: gramps.glade:6290
 msgid "_Relationship:"
 msgstr "_Relation :"
 
-#: gramps.glade:6005
+#: gramps.glade:6346
 msgid "Relation_ship:"
 msgstr "Relation :"
 
-#: gramps.glade:6056
+#: gramps.glade:6405
 msgid "Father"
 msgstr "Pre"
 
-#: gramps.glade:6080
+#: gramps.glade:6433
 msgid "Mother"
 msgstr "Mre"
 
-#: gramps.glade:6103
+#: gramps.glade:6460
 msgid "Preference"
 msgstr "Prfrence"
 
-#: gramps.glade:6126
+#: gramps.glade:6487
 msgid ""
 "Indicates that the parents should be used as the preferred parents for "
 "reporting and display purposes"
@@ -5649,106 +5718,83 @@ msgstr ""
 "Indiquer si les parents doivent apparatre sur les rapports et autres "
 "affichages"
 
-#: gramps.glade:6128
+#: gramps.glade:6489
 msgid "Use as preferred parents"
 msgstr "En faire les parents favoris"
 
-#: gramps.glade:6328
+#: gramps.glade:6698
 msgid "_Text:"
 msgstr "_Texte :"
 
-#: gramps.glade:6487
+#: gramps.glade:6865
 msgid "Select columns"
 msgstr "Slectionner les colonnes"
 
-#: gramps.glade:6659 gramps.glade:28519
+#: gramps.glade:7046 gramps.glade:30667
 msgid "_Given name:"
 msgstr "_Prnom :"
 
-#: gramps.glade:6684 gramps.glade:28793
+#: gramps.glade:7075 gramps.glade:30965
 msgid "_Family name:"
 msgstr "_Nom de famille :"
 
-#: gramps.glade:6709
+#: gramps.glade:7104
 msgid "Famil_y prefix:"
 msgstr "Particule :"
 
-#: gramps.glade:6734
+#: gramps.glade:7133
 msgid "S_uffix:"
 msgstr "S_uffixe :"
 
-#: gramps.glade:6784
+#: gramps.glade:7191
 msgid "Nic_kname:"
 msgstr "Sur_nom :"
 
-#: gramps.glade:6809 gramps.glade:28575
+#: gramps.glade:7220 gramps.glade:30731
 msgid "T_ype:"
 msgstr "_Type :"
 
-#: gramps.glade:6833 gramps.glade:10979 gramps.glade:17974 gramps.glade:22945
-#: gramps.glade:25114 gramps.glade:27355
-msgid "_Date:"
-msgstr "_Date :"
-
-#: gramps.glade:6858
+#: gramps.glade:7248
 msgid "An optional suffix to the name, such as \"Jr.\" or \"III\""
 msgstr "Un suffixe au prnom, tel que, \"Jr.\" or \"III\""
 
-#: gramps.glade:6880
+#: gramps.glade:7270
 msgid "A title used to refer to the person, such as \"Dr.\" or \"Rev.\""
 msgstr "Un titre qui se rfre  une personne, tel que  \"Dr.\" ou \"Rev.\""
 
-#: gramps.glade:6902
+#: gramps.glade:7292
 msgid "A name that the person was more commonly known by"
 msgstr "Un nom sous lequel la personne tait plus communment connue"
 
-#: gramps.glade:6924
+#: gramps.glade:7314
 msgid "Preferred name"
 msgstr "Nom d'usage"
 
-#: gramps.glade:6955
+#: gramps.glade:7349
 msgid "_male"
 msgstr "_masculin"
 
-#: gramps.glade:6975
+#: gramps.glade:7369
 msgid "fema_le"
 msgstr "_fminin"
 
-#: gramps.glade:6996
+#: gramps.glade:7390
 msgid "u_nknown"
 msgstr "i_nconnu"
 
-#: gramps.glade:7026
+#: gramps.glade:7420
 msgid "Birth"
 msgstr "Naissance"
 
-#: gramps.glade:7050
+#: gramps.glade:7448
 msgid "GRAMPS _ID:"
 msgstr "_Identifiant GRAMPS :"
 
-#: gramps.glade:7096 gramps.glade:11051 gramps.glade:25170
-msgid "_Place:"
-msgstr "_Lieu :"
-
-#: gramps.glade:7121
+#: gramps.glade:7498
 msgid "Death"
 msgstr "Dcs"
 
-#: gramps.glade:7145 gramps.glade:11144
-msgid "D_ate:"
-msgstr "D_ate :"
-
-#: gramps.glade:7173
-msgid "Plac_e:"
-msgstr "Lie_u :"
-
-#: gramps.glade:7279 gramps.glade:7544 gramps.glade:11595 gramps.glade:11655
-#: gramps.glade:11715 gramps.glade:13813 gramps.glade:18403 gramps.glade:22994
-#: gramps.glade:29083
-msgid "Invoke date editor"
-msgstr "Ouvrir l'diteur de dates"
-
-#: gramps.glade:7314
+#: gramps.glade:7543
 msgid ""
 "An optional prefix for the family name that is not used in sorting, such as "
 "\"de\" or \"van\""
@@ -5756,355 +5802,380 @@ msgstr ""
 "Une particule qui n'est pas utilise lors des tris, telle que, \"de\" ou "
 "\"van\""
 
-#: gramps.glade:7336
+#: gramps.glade:7565
 msgid "The person's given name"
 msgstr "Prnom de l'individu"
 
-#: gramps.glade:7361
-msgid "Invoke birth event editor"
-msgstr "Ouvrir l'diteur des vnements  la naissance"
-
-#: gramps.glade:7412
+#: gramps.glade:7610
 msgid "Edit the preferred name"
 msgstr "Editer le nom par dfaut"
 
-#: gramps.glade:7442
+#: gramps.glade:7640
 msgid "Gender"
 msgstr "Sexe"
 
-#: gramps.glade:7465
+#: gramps.glade:7667
 msgid "Identification"
 msgstr "Identification"
 
-#: gramps.glade:7489
-msgid "Invoke death event editor"
-msgstr "Ouvrir l'diteur des vnements survenus au dcs"
-
-#: gramps.glade:7604
+#: gramps.glade:7719
 msgid "Image"
 msgstr "Image"
 
-#: gramps.glade:7635 gramps.glade:12058
+#: gramps.glade:7754 gramps.glade:12980
 msgid "Information i_s complete"
 msgstr "Information _complte"
 
-#: gramps.glade:7657
+#: gramps.glade:7776
 msgid "Information is pri_vate"
 msgstr "Information _prive"
 
-#: gramps.glade:7765 gramps.glade:8575 gramps.glade:9089 gramps.glade:9525
-#: gramps.glade:12271 gramps.glade:12718
+#: gramps.glade:7806 gramps.glade:11812 gramps.glade:19397 gramps.glade:24769
+#: gramps.glade:27075 gramps.glade:29438
+msgid "_Date:"
+msgstr "_Date :"
+
+#: gramps.glade:7834 gramps.glade:11892 gramps.glade:27139
+msgid "_Place:"
+msgstr "_Lieu :"
+
+#: gramps.glade:7885
+msgid "Invoke birth event editor"
+msgstr "Ouvrir l'diteur des vnements  la naissance"
+
+#: gramps.glade:7940 gramps.glade:8047 gramps.glade:12490 gramps.glade:12550
+#: gramps.glade:12610 gramps.glade:14899 gramps.glade:19866 gramps.glade:24822
+#: gramps.glade:31293
+msgid "Invoke date editor"
+msgstr "Ouvrir l'diteur de dates"
+
+#: gramps.glade:7993 gramps.glade:11993
+msgid "D_ate:"
+msgstr "D_ate :"
+
+#: gramps.glade:8083
+msgid "Invoke death event editor"
+msgstr "Ouvrir l'diteur des vnements survenus au dcs"
+
+#: gramps.glade:8113
+msgid "Plac_e:"
+msgstr "Lie_u :"
+
+#: gramps.glade:8268 gramps.glade:9185 gramps.glade:9758 gramps.glade:10241
+#: gramps.glade:13221 gramps.glade:13719
 msgid "Confidence:"
 msgstr "Niveau de confiance :"
 
-#: gramps.glade:7789
+#: gramps.glade:8296
 msgid "Family prefix:"
 msgstr "Particule :"
 
-#: gramps.glade:7933
+#: gramps.glade:8464
 msgid "Alternate name"
 msgstr "Nom alternatif"
 
-#: gramps.glade:7957 gramps.glade:8527 gramps.glade:9041 gramps.glade:9621
-#: gramps.glade:12342 gramps.glade:12790
+#: gramps.glade:8492 gramps.glade:9129 gramps.glade:9702 gramps.glade:10353
+#: gramps.glade:13304 gramps.glade:13803
 msgid "Primary source"
 msgstr "Source principale"
 
-#: gramps.glade:8233
+#: gramps.glade:8807
 msgid "Create an alternate name for this person"
 msgstr "Crer un nom supplmentaire pour cette personne"
 
-#: gramps.glade:8262
+#: gramps.glade:8836
 msgid "Edit the selected name"
 msgstr "Editer le nom slectionn"
 
-#: gramps.glade:8290
+#: gramps.glade:8864
 msgid "Delete the selected name"
 msgstr "Supprimer le nom slectionn"
 
-#: gramps.glade:8342
+#: gramps.glade:8916
 msgid "Names"
 msgstr "Noms"
 
-#: gramps.glade:8383
+#: gramps.glade:8961
 msgid "Event"
 msgstr "Evnement"
 
-#: gramps.glade:8431 gramps.glade:12199
+#: gramps.glade:9017 gramps.glade:13137
 msgid "Cause:"
 msgstr "Cause :"
 
-#: gramps.glade:8812
+#: gramps.glade:9457
 msgid "Create a new event"
 msgstr "Cre un nouvel vnement"
 
-#: gramps.glade:8841
+#: gramps.glade:9486
 msgid "Edit the selected event"
 msgstr "Modifier l'vnement slectionn"
 
-#: gramps.glade:8869
+#: gramps.glade:9514
 msgid "Delete the selected event"
 msgstr "Supprimer l'vnement slectionn"
 
-#: gramps.glade:8969 gramps.glade:12814 gramps.glade:22141 gramps.glade:23172
+#: gramps.glade:9618 gramps.glade:13831 gramps.glade:23910 gramps.glade:25020
 msgid "Attributes"
 msgstr "Attributs"
 
-#: gramps.glade:9254
+#: gramps.glade:9946
 msgid "Create a new attribute"
 msgstr "Cre un nouvel attribut"
 
-#: gramps.glade:9283
+#: gramps.glade:9975
 msgid "Edit the selected attribute"
 msgstr "Editer l'attribut slectionn"
 
-#: gramps.glade:9311 gramps.glade:13032 gramps.glade:22266 gramps.glade:23296
+#: gramps.glade:10003 gramps.glade:14072 gramps.glade:24042 gramps.glade:25151
 msgid "Delete the selected attribute"
 msgstr "Supprimer l'attribut slectionn"
 
-#: gramps.glade:9370 gramps.glade:13084 gramps.glade:22331 gramps.glade:23362
+#: gramps.glade:10062 gramps.glade:14124 gramps.glade:24107 gramps.glade:25217
 msgid "Attributes"
 msgstr "Attributs"
 
-#: gramps.glade:9405
+#: gramps.glade:10101
 msgid "City/County:"
 msgstr "Ville ou dpartement :"
 
-#: gramps.glade:9597
+#: gramps.glade:10325
 msgid "Addresses"
 msgstr "Adresses"
 
-#: gramps.glade:9962
+#: gramps.glade:10741
 msgid "Create a new address"
 msgstr "Cre une nouvelle adresse"
 
-#: gramps.glade:9991
+#: gramps.glade:10770
 msgid "Edit the selected address"
 msgstr "Editer l'adresse slectionne"
 
-#: gramps.glade:10019
+#: gramps.glade:10798
 msgid "Delete the selected address"
 msgstr "Supprimer l'adresse slectionne"
 
-#: gramps.glade:10112
+#: gramps.glade:10895
 msgid "Enter miscellaneous relevant data and documentation"
 msgstr "Entrer diverses informations et documentations"
 
-#: gramps.glade:10235 gramps.glade:13238 gramps.glade:21956 gramps.glade:23516
-#: plugins/IndivComplete.py:166 plugins/WebPage.py:563
+#: gramps.glade:11022 gramps.glade:14286 gramps.glade:23701 gramps.glade:25379
+#: plugins/IndivComplete.py:166 plugins/WebPage.py:567
 msgid "Notes"
 msgstr "Notes"
 
-#: gramps.glade:10293
+#: gramps.glade:11087
 msgid "Add a source"
 msgstr "Ajouter une source"
 
-#: gramps.glade:10320
+#: gramps.glade:11114
 msgid "Edit the selected source"
 msgstr "Editer la source slectionne"
 
-#: gramps.glade:10346
+#: gramps.glade:11140
 msgid "Remove the selected source"
 msgstr "Supprimer la source slectionne"
 
-#: gramps.glade:10390 gramps.glade:13390 gramps.glade:15487 gramps.glade:22509
-#: gramps.glade:23738 gramps.glade:25557 gramps.glade:26561 gramps.glade:27929
-#: gramps.glade:29359 plugins/Ancestors.py:159 plugins/IndivComplete.py:324
-#: plugins/NavWebPage.py:439 plugins/NavWebPage.py:444
-#: plugins/NavWebPage.py:540 plugins/ScratchPad.py:153
-#: plugins/ScratchPad.py:293 plugins/ScratchPad.py:326 plugins/WebPage.py:222
+#: gramps.glade:11184 gramps.glade:14445 gramps.glade:16716 gramps.glade:24292
+#: gramps.glade:25615 gramps.glade:27544 gramps.glade:28594 gramps.glade:30047
+#: gramps.glade:31576 plugins/Ancestors.py:159 plugins/IndivComplete.py:324
+#: plugins/ScratchPad.py:153 plugins/ScratchPad.py:293
+#: plugins/ScratchPad.py:326 plugins/WebPage.py:224
 msgid "Sources"
 msgstr "Sources"
 
-#: gramps.glade:10540
+#: gramps.glade:11338
 msgid "Remove the selected object from this gallery only"
 msgstr "Supprimer l'objet slectionn de cette galerie uniquement"
 
-#: gramps.glade:10623 gramps.glade:15733
+#: gramps.glade:11425 gramps.glade:16970
 msgid "Web address:"
 msgstr "Adresse Web :"
 
-#: gramps.glade:10718 gramps.glade:15828
+#: gramps.glade:11536 gramps.glade:17081
 msgid "Internet addresses"
 msgstr "Adresses Web"
 
-#: gramps.glade:10789
+#: gramps.glade:11614
 msgid "Add an internet reference about this person"
 msgstr "Ajouter une rfrence Internet pour cette personne"
 
-#: gramps.glade:10818
+#: gramps.glade:11643
 msgid "Edit the selected internet address"
 msgstr "Editer l'adresse Internet slectionne"
 
-#: gramps.glade:10845
+#: gramps.glade:11670
 msgid "Go to this web page"
 msgstr "Ouvrir cette page web"
 
-#: gramps.glade:10874
+#: gramps.glade:11699
 msgid "Delete selected reference"
 msgstr "Supprimer la rfrence slectionne"
 
-#: gramps.glade:10926 gramps.glade:16042
+#: gramps.glade:11751 gramps.glade:17302
 msgid "Internet"
 msgstr "Internet"
 
-#: gramps.glade:10955
+#: gramps.glade:11784
 msgid "LDS baptism"
 msgstr "Baptme Mormon"
 
-#: gramps.glade:11004
+#: gramps.glade:11841
 msgid "LDS _temple:"
 msgstr "_Temple Mormon :"
 
-#: gramps.glade:11032 gramps.glade:11246 gramps.glade:11335 gramps.glade:13707
+#: gramps.glade:11873 gramps.glade:12107 gramps.glade:12204 gramps.glade:14786
 msgid "Sources..."
 msgstr "Sources ..."
 
-#: gramps.glade:11101 gramps.glade:11266 gramps.glade:11404 gramps.glade:13727
+#: gramps.glade:11946 gramps.glade:12127 gramps.glade:12277 gramps.glade:14806
 msgid "Note..."
 msgstr "Note ..."
 
-#: gramps.glade:11120
+#: gramps.glade:11965
 msgid "Endowment"
 msgstr "Dotation"
 
-#: gramps.glade:11172
+#: gramps.glade:12025
 msgid "LDS te_mple:"
 msgstr "Te_mple Mormon :"
 
-#: gramps.glade:11196 gramps.glade:17535
+#: gramps.glade:12053 gramps.glade:18925
 msgid "P_lace:"
 msgstr "L_ieux :"
 
-#: gramps.glade:11285 gramps.glade:29034
+#: gramps.glade:12146 gramps.glade:31240
 msgid "Dat_e:"
 msgstr "Da_te :"
 
-#: gramps.glade:11310
+#: gramps.glade:12175
 msgid "LD_S temple:"
 msgstr "Temple Mo_rmon :"
 
-#: gramps.glade:11354
+#: gramps.glade:12223
 msgid "Pla_ce:"
 msgstr "Lie_u :"
 
-#: gramps.glade:11423
+#: gramps.glade:12296
 msgid "Pa_rents:"
 msgstr "Pa_rents :"
 
-#: gramps.glade:11448
+#: gramps.glade:12325
 msgid "Sealed to parents"
 msgstr "Parents officiels"
 
-#: gramps.glade:11755 gramps.glade:13861
+#: gramps.glade:12650 gramps.glade:14947
 msgid "LDS"
 msgstr "Mormons"
 
-#: gramps.glade:11945
+#: gramps.glade:12853
 msgid "_GRAMPS ID:"
 msgstr "_Identifiant GRAMPS :"
 
-#: gramps.glade:12009 gramps.glade:14536
+#: gramps.glade:12923 gramps.glade:15675
 msgid "Last Changed:"
 msgstr "Dernire modification :"
 
-#: gramps.glade:12318
+#: gramps.glade:13276
 msgid "Events"
 msgstr "Evnements"
 
-#: gramps.glade:12553
+#: gramps.glade:13546
 msgid "Add new event for this marriage"
 msgstr "Ajouter un nouvel vnement pour ce mariage"
 
-#: gramps.glade:12607
+#: gramps.glade:13600
 msgid "Delete selected event"
 msgstr "Supprimer un vnement slectionn"
 
-#: gramps.glade:12978
+#: gramps.glade:14018
 msgid "Create a new attribute for this marriage"
 msgstr "Cre un nouvel attribut pour ce mariage"
 
-#: gramps.glade:13507
+#: gramps.glade:14566
 msgid "Edit the properties of the selected objects"
 msgstr "Editer les proprits des objets slectionns"
 
-#: gramps.glade:13610
+#: gramps.glade:14673
 msgid "Sealed to spouse"
 msgstr "Epoux(se) Officiel(le)"
 
-#: gramps.glade:13658
+#: gramps.glade:14729
 msgid "Temple:"
 msgstr "Temple :"
 
-#: gramps.glade:14054
+#: gramps.glade:15153
 msgid "C_ity:"
 msgstr "V_ille :"
 
-#: gramps.glade:14082 gramps.glade:26954
+#: gramps.glade:15185 gramps.glade:29016
 msgid "_State:"
 msgstr "_Rgion :"
 
-#: gramps.glade:14110 gramps.glade:26897
-msgid "C_ounty:"
-msgstr "_Dpartement :"
-
-#: gramps.glade:14138
-msgid "Co_untry:"
+#: gramps.glade:15217
+#, fuzzy
+msgid "Co_unty:"
 msgstr "Pa_ys :"
 
-#: gramps.glade:14166
+#: gramps.glade:15249
+#, fuzzy
+msgid "Count_ry:"
+msgstr "Pays :"
+
+#: gramps.glade:15281
 msgid "_Longitude:"
 msgstr "_Longitude :"
 
-#: gramps.glade:14194
+#: gramps.glade:15313
 msgid "L_atitude:"
 msgstr "L_attitude :"
 
-#: gramps.glade:14222 gramps.glade:26983
+#: gramps.glade:15345 gramps.glade:29049
 msgid "Church _parish:"
 msgstr "_Paroisse :"
 
-#: gramps.glade:14444 gramps.glade:17170 gramps.glade:27495
+#: gramps.glade:15575 gramps.glade:18532 gramps.glade:29598
 msgid "_ZIP/Postal code:"
 msgstr "_Code postal :"
 
-#: gramps.glade:14490 gramps.glade:27117 gramps.glade:27672
-msgid "P_hone:"
-msgstr "T_lphone :"
+#: gramps.glade:15625
+#, fuzzy
+msgid "Phon_e:"
+msgstr "Tlphone :"
 
-#: gramps.glade:14625
+#: gramps.glade:15776
 msgid "County:"
 msgstr "Dpartement :"
 
-#: gramps.glade:14673
+#: gramps.glade:15832
 msgid "State:"
 msgstr "Rgion :"
 
-#: gramps.glade:14721
+#: gramps.glade:15888
 msgid "Church parish:"
 msgstr "Paroisse :"
 
-#: gramps.glade:14822
+#: gramps.glade:16005
 msgid "Zip/Postal code:"
 msgstr "Code postal :"
 
-#: gramps.glade:14894
+#: gramps.glade:16089
 msgid "Other names"
 msgstr "Noms alternatifs"
 
-#: gramps.glade:15155
+#: gramps.glade:16369
 msgid "Other names"
 msgstr "Noms alternatifs"
 
-#: gramps.glade:16129
+#: gramps.glade:17397
 msgid "GRAMPS Preferences"
 msgstr "Prfrences GRAMPS"
 
-#: gramps.glade:16201
+#: gramps.glade:17470
 msgid "Categories:"
 msgstr "Catgories :"
 
-#: gramps.glade:16316
+#: gramps.glade:17592
 msgid ""
 "To change your preferences, select one of the subcategories in the menu on "
 "the left hand side of the window."
@@ -6112,37 +6183,37 @@ msgstr ""
 "Pour changer vos prfrences, slectionner une des sous catgorie du menu "
 "dans la partie gauche de la fentre."
 
-#: gramps.glade:16380
+#: gramps.glade:17664
 msgid "Database"
 msgstr "Base de donnes"
 
-#: gramps.glade:16405
+#: gramps.glade:17693
 msgid "_Automatically load last database"
 msgstr ""
 "_Charger automatiquement la dernire base de donnes au dmarrage de "
 "l'application"
 
-#: gramps.glade:16426
+#: gramps.glade:17714
 msgid "Family name guessing"
 msgstr "Dtermination du nom de famille"
 
-#: gramps.glade:16513
+#: gramps.glade:17811
 msgid "Toolbar"
 msgstr "Barre d'outils"
 
-#: gramps.glade:16538
+#: gramps.glade:17840
 msgid "Active person's _relationship to Home Person"
 msgstr "Afficher la relation avec la personne de rfrence"
 
-#: gramps.glade:16561
+#: gramps.glade:17863
 msgid "Active person's name and _GRAMPS ID"
 msgstr "Nom de l'individu et son identifiant GRAMPS"
 
-#: gramps.glade:16583
+#: gramps.glade:17885
 msgid "Statusbar"
 msgstr "Barre d'tat"
 
-#: gramps.glade:16611
+#: gramps.glade:17917
 msgid ""
 "GNOME settings\n"
 "Icons Only\n"
@@ -6156,169 +6227,169 @@ msgstr ""
 "Texte sous les icnes\n"
 "Texte  ct des icnes"
 
-#: gramps.glade:16676
+#: gramps.glade:17988
 msgid "_Always display the LDS ordinance tabs"
 msgstr "_Toujours afficher les tables d'ordonnance des Mormons"
 
-#: gramps.glade:16698
+#: gramps.glade:18010
 msgid "Display"
 msgstr "Affichage"
 
-#: gramps.glade:16722
+#: gramps.glade:18038
 msgid "Default view"
 msgstr "Aperu"
 
-#: gramps.glade:16747
+#: gramps.glade:18067
 msgid "_Person view"
 msgstr "_Fiche individuelle"
 
-#: gramps.glade:16770
+#: gramps.glade:18090
 msgid "_Family view"
 msgstr "_Fiche familiale"
 
-#: gramps.glade:16792
+#: gramps.glade:18112
 msgid "Family view style"
 msgstr "Mode d'affichage de la vue \"Famille\""
 
-#: gramps.glade:16817
+#: gramps.glade:18141
 msgid "Left to right"
 msgstr "De gauche  droite"
 
-#: gramps.glade:16840
+#: gramps.glade:18164
 msgid "Top to bottom"
 msgstr "de haut en bas"
 
-#: gramps.glade:16865
+#: gramps.glade:18189
 msgid "_Display Tip of the Day"
 msgstr "_Afficher l'astuce du jour"
 
-#: gramps.glade:16934
+#: gramps.glade:18262
 msgid "_Date format:"
 msgstr "_Format de date :"
 
-#: gramps.glade:16959
+#: gramps.glade:18291
 msgid "Display formats"
 msgstr "Formats d'affichage"
 
-#: gramps.glade:17045 rule.glade:397
+#: gramps.glade:18387 rule.glade:397
 msgid "_Name:"
 msgstr "_Nom :"
 
-#: gramps.glade:17070
+#: gramps.glade:18416
 msgid "_Address:"
 msgstr "_Adresse :"
 
-#: gramps.glade:17095 gramps.glade:26869
+#: gramps.glade:18445 gramps.glade:28919
 msgid "_City:"
 msgstr "_Ville :"
 
-#: gramps.glade:17120 gramps.glade:27439
+#: gramps.glade:18474 gramps.glade:29534
 msgid "_State/Province:"
 msgstr "_Etat ou province :"
 
-#: gramps.glade:17145
+#: gramps.glade:18503
 msgid "_Country:"
 msgstr "_Pays :"
 
-#: gramps.glade:17195
+#: gramps.glade:18561
 msgid "_Phone:"
 msgstr "_Tlphone :"
 
-#: gramps.glade:17220
+#: gramps.glade:18590
 msgid "_Email:"
 msgstr "_Messagerie :"
 
-#: gramps.glade:17413
+#: gramps.glade:18787
 msgid "Researcher information"
 msgstr "Information sur le chercheur"
 
-#: gramps.glade:17485 gramps.glade:29667
+#: gramps.glade:18867 gramps.glade:31901
 msgid "_Person:"
 msgstr "_Personne :"
 
-#: gramps.glade:17510
+#: gramps.glade:18896
 msgid "_Family:"
 msgstr "_Famille :"
 
-#: gramps.glade:17560
+#: gramps.glade:18954
 msgid "_Source:"
 msgstr "_Source :"
 
-#: gramps.glade:17585
+#: gramps.glade:18983
 msgid "_Media object:"
 msgstr "_Media :"
 
-#: gramps.glade:17614
+#: gramps.glade:19016
 msgid "I"
 msgstr "I"
 
-#: gramps.glade:17635
+#: gramps.glade:19037
 msgid "F"
 msgstr "F"
 
-#: gramps.glade:17656
+#: gramps.glade:19058
 msgid "P"
 msgstr "P"
 
-#: gramps.glade:17677
+#: gramps.glade:19079
 msgid "S"
 msgstr "S"
 
-#: gramps.glade:17698
+#: gramps.glade:19100
 msgid "O"
 msgstr "O"
 
-#: gramps.glade:17715
+#: gramps.glade:19117
 msgid "GRAMPS ID prefixes"
 msgstr ""
 
-#: gramps.glade:17924
+#: gramps.glade:19339
 msgid "_Confidence:"
 msgstr "Niveau de _confiance :"
 
-#: gramps.glade:17949
+#: gramps.glade:19368
 msgid "_Volume/Film/Page:"
 msgstr "_Volume, film ou page :"
 
-#: gramps.glade:18002
+#: gramps.glade:19429
 msgid "Te_xt:"
 msgstr "Te_xte :"
 
-#: gramps.glade:18029
+#: gramps.glade:19460
 msgid "Co_mments:"
 msgstr "Co_mmentaires :"
 
-#: gramps.glade:18056
+#: gramps.glade:19491
 msgid "Publication information:"
 msgstr "Information de publication :"
 
-#: gramps.glade:18080 mergedata.glade:950 mergedata.glade:972
+#: gramps.glade:19519 mergedata.glade:919 mergedata.glade:941
 #: plugins.glade:362
 msgid "Author:"
 msgstr "Auteur :"
 
-#: gramps.glade:18176
+#: gramps.glade:19631
 msgid "Source selection"
 msgstr "Slectionner une source"
 
-#: gramps.glade:18200
+#: gramps.glade:19659
 msgid "Source details"
 msgstr "Dtails de la source"
 
-#: gramps.glade:18339
+#: gramps.glade:19802
 msgid "Creates a new source"
 msgstr "Crer une nouvelle source"
 
-#: gramps.glade:18341
+#: gramps.glade:19804
 msgid "_New..."
 msgstr "_Nouveau ..."
 
-#: gramps.glade:18361 gramps.glade:21751 gramps.glade:25311 gramps.glade:26321
-#: gramps.glade:27524 gramps.glade:28301 gramps.glade:29836
+#: gramps.glade:19824 gramps.glade:23484 gramps.glade:27288 gramps.glade:28344
+#: gramps.glade:29631 gramps.glade:30444 gramps.glade:32078
 msgid "_Private record"
 msgstr "Cette _information ne doit pas tre diffuse publiquement"
 
-#: gramps.glade:18436
+#: gramps.glade:19899
 msgid ""
 "Very Low\n"
 "Low\n"
@@ -6332,211 +6403,211 @@ msgstr ""
 "Elev\n"
 "Trs lev"
 
-#: gramps.glade:18611
+#: gramps.glade:20083
 msgid "Double click will edit the selected source"
 msgstr "Double-cliquer pour afficher la source"
 
-#: gramps.glade:19667
+#: gramps.glade:21219
 msgid "Style _name:"
 msgstr "_Nom du style :"
 
-#: gramps.glade:19825 rule.glade:1144
+#: gramps.glade:21392 rule.glade:1144
 msgid "Description"
 msgstr "Description"
 
-#: gramps.glade:19854
+#: gramps.glade:21425
 msgid "pt"
 msgstr "pt"
 
-#: gramps.glade:19881 gramps.glade:20189
+#: gramps.glade:21456 gramps.glade:21788
 msgid "Pick a color"
 msgstr "Choisir une couleur"
 
-#: gramps.glade:19920
+#: gramps.glade:21495
 msgid "_Bold"
 msgstr "_Gras"
 
-#: gramps.glade:19942
+#: gramps.glade:21517
 msgid "_Italic"
 msgstr "_Italique"
 
-#: gramps.glade:19964
+#: gramps.glade:21539
 msgid "_Underline"
 msgstr "_Soulign"
 
-#: gramps.glade:19985
+#: gramps.glade:21560
 msgid "Type face"
 msgstr "Police"
 
-#: gramps.glade:20009
+#: gramps.glade:21588
 msgid "Size"
 msgstr "Taille"
 
-#: gramps.glade:20033
+#: gramps.glade:21616
 msgid "Color"
 msgstr "Couleur"
 
-#: gramps.glade:20107
+#: gramps.glade:21702
 msgid "_Roman (Times, serif)"
 msgstr "_Roman (Times, serif)"
 
-#: gramps.glade:20129
+#: gramps.glade:21724
 msgid "_Swiss (Arial, Helvetica, sans-serif)"
 msgstr "_Swiss (Arial, Helvetica, sans-serif)"
 
-#: gramps.glade:20157
+#: gramps.glade:21752
 msgid "Font options"
 msgstr "Options de police"
 
-#: gramps.glade:20205
+#: gramps.glade:21804
 msgid "R_ight:"
 msgstr " d_roite :"
 
-#: gramps.glade:20233
+#: gramps.glade:21836
 msgid "L_eft:"
 msgstr " g_auche :"
 
-#: gramps.glade:20261
+#: gramps.glade:21868
 msgid "_Padding:"
 msgstr "_Remplissage :"
 
-#: gramps.glade:20425
+#: gramps.glade:22048
 msgid "_Left"
 msgstr "A _gauche"
 
-#: gramps.glade:20447
+#: gramps.glade:22070
 msgid "_Right"
 msgstr "A _droite"
 
-#: gramps.glade:20470
+#: gramps.glade:22093
 msgid "_Justify"
 msgstr "_Justifi"
 
-#: gramps.glade:20493
+#: gramps.glade:22116
 msgid "_Center"
 msgstr "_Centr"
 
-#: gramps.glade:20515
+#: gramps.glade:22138
 msgid "Background"
 msgstr "Fond"
 
-#: gramps.glade:20539
+#: gramps.glade:22166
 msgid "Margins"
 msgstr "Marges"
 
-#: gramps.glade:20588
+#: gramps.glade:22223
 msgid "Alignment"
 msgstr "Alignement"
 
-#: gramps.glade:20612
+#: gramps.glade:22251
 msgid "Borders"
 msgstr "Bordures"
 
-#: gramps.glade:20637
+#: gramps.glade:22280
 msgid "Le_ft"
 msgstr " gau_che"
 
-#: gramps.glade:20659
+#: gramps.glade:22302
 msgid "Ri_ght"
 msgstr " droi_te"
 
-#: gramps.glade:20681
+#: gramps.glade:22324
 msgid "_Top"
 msgstr "_En-tte"
 
-#: gramps.glade:20703
+#: gramps.glade:22346
 msgid "_Bottom"
 msgstr "_Pied de page"
 
-#: gramps.glade:20724
+#: gramps.glade:22367
 msgid "First line"
 msgstr "Premire ligne"
 
-#: gramps.glade:20793
+#: gramps.glade:22444
 msgid "I_ndent:"
 msgstr "I_ndenter :"
 
-#: gramps.glade:20824
+#: gramps.glade:22479
 msgid "Paragraph options"
 msgstr "Options de paragraphe"
 
-#: gramps.glade:21110
+#: gramps.glade:22782
 msgid "Internal note"
 msgstr "Note interne"
 
-#: gramps.glade:21366 gramps.glade:22763
+#: gramps.glade:23055 gramps.glade:24567
 msgid "Object type:"
 msgstr "Type d'objet :"
 
-#: gramps.glade:21546
+#: gramps.glade:23259
 msgid "Lower X:"
 msgstr ""
 
-#: gramps.glade:21570
+#: gramps.glade:23287
 msgid "Upper X:"
 msgstr ""
 
-#: gramps.glade:21594
+#: gramps.glade:23315
 msgid "Upper Y:"
 msgstr ""
 
-#: gramps.glade:21618
+#: gramps.glade:23343
 msgid "Lower Y:"
 msgstr ""
 
-#: gramps.glade:21726
+#: gramps.glade:23455
 msgid "Subsection"
 msgstr "Sous-section"
 
-#: gramps.glade:21772
+#: gramps.glade:23505
 msgid "Privacy"
 msgstr "Vie prive
"
 
-#: gramps.glade:22011
+#: gramps.glade:23760
 msgid "Global Notes"
 msgstr "Notes globales"
 
-#: gramps.glade:22212
+#: gramps.glade:23988
 msgid "Creates a new object attribute from the above data"
 msgstr "Cre un nouvel attribut  partir des donnes ci-dessus"
 
-#: gramps.glade:23242
+#: gramps.glade:25097
 msgid "Creates a new attribute from the above data"
 msgstr "Cre un nouvel attribut  partir des donnes ci-dessus"
 
-#: gramps.glade:23936
+#: gramps.glade:25827
 msgid "Close _without saving"
 msgstr "Fermer _sans sauvegarder"
 
-#: gramps.glade:24062
+#: gramps.glade:25961
 msgid "Do not ask again"
 msgstr "Ne plus poser la question"
 
-#: gramps.glade:24680
+#: gramps.glade:26616
 msgid "Remove object and all references to it from the database"
 msgstr "Supprimer l'objet et toutes ses rfrences dans la base"
 
-#: gramps.glade:24725
+#: gramps.glade:26661
 msgid "_Remove Object"
 msgstr "_Supprimer l'objet"
 
-#: gramps.glade:24752
+#: gramps.glade:26692
 msgid "Keep reference to the missing file"
 msgstr "Conserver la rfrence au fichier manquant"
 
-#: gramps.glade:24755
+#: gramps.glade:26695
 msgid "_Keep Reference"
 msgstr "_Conserver la rfrence"
 
-#: gramps.glade:24766
+#: gramps.glade:26706
 msgid "Select replacement for the missing file"
 msgstr "Slectionner le nouvel emplacement du fichier manquant"
 
-#: gramps.glade:24813
+#: gramps.glade:26753
 msgid "_Select File"
 msgstr "_Choisir un fichier"
 
-#: gramps.glade:24926
+#: gramps.glade:26878
 msgid ""
 "If you check this button, all the missing media files will be automatically "
 "treated according to the currently selected option. No further dialogs will "
@@ -6546,91 +6617,99 @@ msgstr ""
 "selon les options actuellement retenues, aucun message ne vous avertira lors "
 "de fichier media manquant."
 
-#: gramps.glade:24928
+#: gramps.glade:26880
 msgid "_Use this selection for all missing media files"
 msgstr "_Utiliser cette option pour toute absence de fichier media"
 
-#: gramps.glade:24989
+#: gramps.glade:26942
 msgid "Close window without changes"
 msgstr "Fermer la fentre sans modification"
 
-#: gramps.glade:25090
+#: gramps.glade:27047
 msgid "_Event type:"
 msgstr "_Type d'vnement :"
 
-#: gramps.glade:25142
+#: gramps.glade:27107
 msgid "De_scription:"
 msgstr "_Description :"
 
-#: gramps.glade:25198
+#: gramps.glade:27171
 msgid "_Cause:"
 msgstr "_Cause :"
 
-#: gramps.glade:26268
+#: gramps.glade:28283
 msgid "_Attribute:"
 msgstr "_Attribut :"
 
-#: gramps.glade:26292
+#: gramps.glade:28311
 msgid "_Value:"
 msgstr "_Valeur :"
 
-#: gramps.glade:26925 gramps.glade:27467
+#: gramps.glade:28951
+msgid "C_ounty:"
+msgstr "_Dpartement :"
+
+#: gramps.glade:28983 gramps.glade:29566
 msgid "Cou_ntry:"
 msgstr "_Pays :"
 
-#: gramps.glade:27163
+#: gramps.glade:29187 gramps.glade:29779
+msgid "P_hone:"
+msgstr "T_lphone :"
+
+#: gramps.glade:29237
 msgid "_Zip/Postal code:"
 msgstr "_Code postal :"
 
-#: gramps.glade:27383
+#: gramps.glade:29470
 msgid "Add_ress:"
 msgstr "Ad_resse :"
 
-#: gramps.glade:27411
+#: gramps.glade:29502
 msgid "_City/County:"
 msgstr "_Ville ou dpartement :"
 
-#: gramps.glade:28238
+#: gramps.glade:30373
 msgid "_Web address:"
 msgstr "_Adresse Web :"
 
-#: gramps.glade:28266
+#: gramps.glade:30405
 msgid "_Description:"
 msgstr "_Description :"
 
-#: gramps.glade:28547
+#: gramps.glade:30699
 msgid "Suffi_x:"
 msgstr "_Suffixe :"
 
-#: gramps.glade:28631
+#: gramps.glade:30795
 msgid "P_rivate record"
 msgstr "Cette _information ne doit pas tre diffuse publiquement"
 
-#: gramps.glade:28652
+#: gramps.glade:30816
 msgid "Family _prefix:"
 msgstr "_Particule :"
 
-#: gramps.glade:28765
+#: gramps.glade:30933
 msgid "P_atronymic:"
 msgstr ""
 
-#: gramps.glade:28858
+#: gramps.glade:31037
 msgid "G_roup as:"
 msgstr "G_rouper comme :"
 
-#: gramps.glade:28883
+#: gramps.glade:31066
 msgid "_Sort as:"
 msgstr "_Trier comme :"
 
-#: gramps.glade:28910
+#: gramps.glade:31097
 msgid "_Display as:"
 msgstr "_Afficher comme :"
 
-#: gramps.glade:28937
+#: gramps.glade:31128
 msgid "Name Information"
 msgstr "Information sur le nom"
 
-#: gramps.glade:29001
+#: gramps.glade:31203
 msgid ""
 "Default (based on locale)\n"
 "Family name, Given name\n"
@@ -6640,7 +6719,7 @@ msgstr ""
 "Nom, Prnom\n"
 "Prnom, Nom"
 
-#: gramps.glade:29019
+#: gramps.glade:31223
 msgid ""
 "Default (based on locale)\n"
 "Given name Family name\n"
@@ -6650,95 +6729,97 @@ msgstr ""
 "Prnom Nom\n"
 "Nom Prnom\n"
 
-#: gramps.glade:29145
+#: gramps.glade:31355
 msgid "_Override"
 msgstr "_Ecraser"
 
-#: gramps.glade:29695
+#: gramps.glade:31933
 msgid "_Comment:"
 msgstr "_Commentaire :"
 
-#: gramps.glade:29747
+#: gramps.glade:31989
 msgid "Person is in the _database"
 msgstr "_Individu dans la base de donnes"
 
-#: gramps.glade:29815
+#: gramps.glade:32057
 msgid "Choose a person from the database"
 msgstr "Choisir un individu dans la base de donnes"
 
-#: gramps.glade:29817
+#: gramps.glade:32059
 msgid "_Select"
 msgstr "_Slectionner"
 
-#: gramps.glade:29946
+#: gramps.glade:32189
 msgid "_Next"
 msgstr "_Suivant"
 
-#: gramps.glade:30005
+#: gramps.glade:32252
 msgid "_Display on startup"
 msgstr "_Afficher au dmarrage"
 
-#: gramps.glade:30068
+#: gramps.glade:32319
 msgid "Gramps' Tip of the Day"
-msgstr "L'astuce du jour de GRAMPS"
+msgstr ""
+"L'astuce du jour de GRAMPS"
 
-#: gramps.glade:30101
+#: gramps.glade:32356
 msgid "GRAMPS - Loading Database"
 msgstr "GRAMPS - Chargement de la base de donne"
 
-#: gramps.glade:30126
+#: gramps.glade:32382
 msgid "Loading database"
-msgstr "Chargement de la base de donnes"
+msgstr ""
+"Chargement de la base de donnes"
 
-#: gramps.glade:30150
+#: gramps.glade:32410
 msgid "GRAMPS is loading the database you selected. Please wait."
 msgstr "GRAMPS charge la base de donnes slectionne. Patientez."
 
-#: gramps.glade:30333
+#: gramps.glade:32606
 msgid "Calenda_r:"
 msgstr "_Calendrier :"
 
-#: gramps.glade:30383
+#: gramps.glade:32662
 msgid "Q_uality"
 msgstr "Q_ualit"
 
-#: gramps.glade:30425
+#: gramps.glade:32710
 msgid "_Type"
 msgstr "_Type"
 
-#: gramps.glade:30467
+#: gramps.glade:32758
 msgid "Date"
 msgstr "Date"
 
-#: gramps.glade:30491
+#: gramps.glade:32786
 msgid "_Day"
 msgstr "_Jour"
 
-#: gramps.glade:30516
+#: gramps.glade:32815
 msgid "_Month"
 msgstr "_Mois"
 
-#: gramps.glade:30541
+#: gramps.glade:32844
 msgid "_Year"
 msgstr "_Anne"
 
-#: gramps.glade:30625
+#: gramps.glade:32934
 msgid "Second date"
 msgstr "Deuxime date"
 
-#: gramps.glade:30649
+#: gramps.glade:32962
 msgid "D_ay"
 msgstr "J_our"
 
-#: gramps.glade:30674
+#: gramps.glade:32991
 msgid "Mo_nth"
 msgstr "M_ois"
 
-#: gramps.glade:30699
+#: gramps.glade:33020
 msgid "Y_ear"
 msgstr "A_nne"
 
-#: gramps.glade:30796
+#: gramps.glade:33123
 msgid "Te_xt comment:"
 msgstr "_Commentaire :"
 
@@ -6839,35 +6920,30 @@ msgstr "Menu Arri
 msgid "Forward Menu"
 msgstr "Menu Avant"
 
-#: gramps_main.py:957 plugins/Summary.py:113
-msgid "Females"
-msgstr "Femmes"
-
-#: gramps_main.py:962 plugins/Summary.py:112
-msgid "Males"
-msgstr "Hommes"
-
-#: gramps_main.py:967 plugins/Summary.py:116
+#: gramps_main.py:972 plugins/Summary.py:116
 msgid "Disconnected individuals"
 msgstr "Individus dconnects"
 
-#: gramps_main.py:972
-msgid "Name contains..."
-msgstr "Le nom contient ..."
-
-#: gramps_main.py:1037
-msgid "Any textual record contains..."
-msgstr ""
+#: gramps_main.py:977
+#, fuzzy
+msgid "People with names containing..."
+msgstr "Individus ayant des noms incomplets"
 
 #: gramps_main.py:1042
-msgid "Any textual record matches regular expression..."
+msgid "People with records containing..."
 msgstr ""
 
-#: gramps_main.py:1069 gramps_main.py:1092
+#: gramps_main.py:1047
+msgid "People with records matching regular expression..."
+msgstr ""
+
+#: gramps_main.py:1074 gramps_main.py:1086 gramps_main.py:1104
+#: gramps_main.py:1116
 msgid "Cannot merge people."
 msgstr "GRAMPS n'a pas pu accomplir la fusion des individus demande."
 
-#: gramps_main.py:1070 gramps_main.py:1093
+#: gramps_main.py:1075 gramps_main.py:1087 gramps_main.py:1105
+#: gramps_main.py:1117
 msgid ""
 "Exactly two people must be selected to perform a merge. A second person can "
 "be selected by holding down the control key while clicking on the desired "
@@ -6877,20 +6953,20 @@ msgstr ""
 "fusion. Le deuxime individu peut tre slectionn en maintenant la touche "
 "Contrle (Ctrl)."
 
-#: gramps_main.py:1216
+#: gramps_main.py:1235
 msgid "Cannot unpak archive"
 msgstr "Impossible les fichiers de l'archive"
 
-#: gramps_main.py:1217 plugins/ReadPkg.py:67
+#: gramps_main.py:1236 plugins/ReadPkg.py:67
 msgid "Temporary directory %s is not writable"
 msgstr "Le rpertoire temporaire %s ne possde pas les droits d'criture"
 
-#: gramps_main.py:1260 gramps_main.py:1266 gramps_main.py:1287
-#: gramps_main.py:1291 gramps_main.py:1294
+#: gramps_main.py:1278 gramps_main.py:1284 gramps_main.py:1305
+#: gramps_main.py:1309 gramps_main.py:1312
 msgid "Cannot open database"
 msgstr "Impossible d'ouvrir la base de donnes"
 
-#: gramps_main.py:1261
+#: gramps_main.py:1279
 msgid ""
 "The selected file is a directory, not a file.\n"
 "A GRAMPS database must be a file."
@@ -6898,40 +6974,40 @@ msgstr ""
 "Le fichier slectionner est un rpertoire, pas un fichier.\n"
 "Une base de donnes GRAMPS doit tre un fichier."
 
-#: gramps_main.py:1267
+#: gramps_main.py:1285
 msgid "You do not have read access to the selected file."
 msgstr "Vous n'avez pas d'accs en lecture sur le fichier slectionn."
 
-#: gramps_main.py:1272
+#: gramps_main.py:1290
 msgid "Read only database"
 msgstr "Base de donnes en lecture seule"
 
-#: gramps_main.py:1273
+#: gramps_main.py:1291
 msgid "You do not have write access to the selected file."
 msgstr "Vous n'avez pas accs en criture au fichier slectionn."
 
-#: gramps_main.py:1282
+#: gramps_main.py:1300
 msgid "Read Only"
 msgstr "Lecture seule"
 
-#: gramps_main.py:1288
+#: gramps_main.py:1306
 msgid "The database file specified could not be opened."
 msgstr "La base de donnes indique ne peut tre ouverte."
 
-#: gramps_main.py:1295
+#: gramps_main.py:1313
 msgid "%s could not be opened."
 msgstr "%s ne peut tre ouvert."
 
-#: gramps_main.py:1352
+#: gramps_main.py:1372
 msgid "Save Media Object"
 msgstr "Sauver l'objet media"
 
-#: gramps_main.py:1398 plugins/Check.py:284 plugins/WriteCD.py:253
+#: gramps_main.py:1418 plugins/Check.py:284 plugins/WriteCD.py:255
 #: plugins/WritePkg.py:171
 msgid "Media object could not be found"
 msgstr "Le media est introuvable"
 
-#: gramps_main.py:1399 plugins/WriteCD.py:254 plugins/WritePkg.py:172
+#: gramps_main.py:1419 plugins/WriteCD.py:256 plugins/WritePkg.py:172
 msgid ""
 "%(file_name)s is referenced in the database, but no longer exists. The file "
 "may have been deleted or moved to a different location. You may choose to "
@@ -6943,73 +7019,73 @@ msgstr ""
 "cette rfrence vers un fichier manquant ou encore slectionner un autre "
 "fichier."
 
-#: gramps_main.py:1445
+#: gramps_main.py:1465
 msgid "Deleting the person will remove the person from the database."
 msgstr "Effacer la personne la supprimera de la base de donnes."
 
-#: gramps_main.py:1449
+#: gramps_main.py:1469
 msgid "_Delete Person"
 msgstr "_Supprimer un individu"
 
-#: gramps_main.py:1513
+#: gramps_main.py:1533
 msgid "Delete Person (%s)"
 msgstr "Supprimer l'individu (%s)"
 
-#: gramps_main.py:1588
+#: gramps_main.py:1617
 msgid "%(relationship)s of %(person)s"
 msgstr "%(relationship)s de %(person)s"
 
-#: gramps_main.py:1745
+#: gramps_main.py:1779
 msgid "Upgrading database..."
 msgstr "Mise  jour de la base de donnes ..."
 
-#: gramps_main.py:1758
+#: gramps_main.py:1792
 msgid "Setup complete"
 msgstr "Chargement termin"
 
-#: gramps_main.py:1775
+#: gramps_main.py:1809
 msgid "Loading %s..."
 msgstr "Chargement de %s ..."
 
-#: gramps_main.py:1778
+#: gramps_main.py:1812
 msgid "Opening database..."
 msgstr "Ouverture de la base de donnes ..."
 
-#: gramps_main.py:1809
+#: gramps_main.py:1843
 msgid "No Home Person has been set."
 msgstr "La personne de rfrence n'a pas t dfinie."
 
-#: gramps_main.py:1810
+#: gramps_main.py:1844
 msgid "The Home Person may be set from the Edit menu."
 msgstr "La personne de rfrence peut tre dfinie dans le menu Edition."
 
-#: gramps_main.py:1816
+#: gramps_main.py:1850
 msgid "%s has been bookmarked"
 msgstr "%s a t signal"
 
-#: gramps_main.py:1819
+#: gramps_main.py:1853
 msgid "Could Not Set a Bookmark"
 msgstr "Gestion des signets impossible"
 
-#: gramps_main.py:1820
+#: gramps_main.py:1854
 msgid "A bookmark could not be set because no one was selected."
 msgstr "Un signet ne peut tre cr personne n'a t slectionn."
 
-#: gramps_main.py:1834
+#: gramps_main.py:1868
 msgid "Could not go to a Person"
 msgstr "Accs  un individu impossible"
 
-#: gramps_main.py:1835
+#: gramps_main.py:1869
 msgid "Either stale bookmark or broken history caused by IDs reorder."
 msgstr ""
 "Les signets ou l'historique sont endommags par le rordonnancement des "
 "identifiants."
 
-#: gramps_main.py:1845
+#: gramps_main.py:1879
 msgid "Set %s as the Home Person"
 msgstr "Retenir %s comme personne de rfrence"
 
-#: gramps_main.py:1846
+#: gramps_main.py:1880
 msgid ""
 "Once a Home Person is defined, pressing the Home button on the toolbar will "
 "make the home person the active person."
@@ -7018,15 +7094,15 @@ msgstr ""
 "rfrence' sur la barre de tche vous positionnera directement sur la racine "
 "de votre arbre."
 
-#: gramps_main.py:1849
+#: gramps_main.py:1883
 msgid "_Set Home Person"
 msgstr "_Changer la personne de rfrence"
 
-#: gramps_main.py:1860
+#: gramps_main.py:1894
 msgid "A person must be selected to export"
 msgstr "Un individu doit tre slectionn au pralable"
 
-#: gramps_main.py:1861
+#: gramps_main.py:1895
 msgid ""
 "Exporting requires that an active person be selected. Please select a person "
 "and try again."
@@ -7034,49 +7110,61 @@ msgstr ""
 "L'exportation ncessite qu'un individu soit slectionn au pralable "
 "Veuillez choisir une personne puis ressayez."
 
-#: mergedata.glade:206
+#: gramps_main.py:1926 gramps_main.py:1930 gramps_main.py:1934
+#: gramps_main.py:1948 gramps_main.py:1950
+#, fuzzy
+msgid "Could not create example database"
+msgstr "Impossible de crer %s"
+
+#: gramps_main.py:1927 gramps_main.py:1931 gramps_main.py:1935
+#, fuzzy
+msgid "The directory ~/.gramps/example could not be created."
+msgstr "Le rapport n'a pas pu tre cr"
+
+#: mergedata.glade:193
 msgid "Place 1"
 msgstr "Lieu 1"
 
-#: mergedata.glade:230
+#: mergedata.glade:217
 msgid "Place 2"
 msgstr "Lieu 2"
 
-#: mergedata.glade:343
+#: mergedata.glade:329
 msgid "Merge and _edit"
 msgstr "Fusionner puis _diter"
 
-#: mergedata.glade:357
+#: mergedata.glade:343
 msgid "_Merge and close"
 msgstr "_Fusionner puis fermer"
 
-#: mergedata.glade:507 mergedata.glade:529 plugins/ChangeNames.py:115
+#: mergedata.glade:489 mergedata.glade:511 plugins/ChangeNames.py:115
 #: plugins/PatchNames.py:179 plugins/SimpleBookTitle.py:209
 msgid "Select"
 msgstr "Slectionner"
 
-#: mergedata.glade:680
+#: mergedata.glade:657
 msgid "Source 1"
 msgstr "Source 1"
 
-#: mergedata.glade:708
+#: mergedata.glade:681
 msgid "Source 2"
 msgstr "Source 2"
 
-#: mergedata.glade:995 mergedata.glade:1017
+#: mergedata.glade:964 mergedata.glade:986
 msgid "Abbreviation:"
 msgstr "Abrviation :"
 
-#: mergedata.glade:1040 mergedata.glade:1062
+#: mergedata.glade:1009 mergedata.glade:1031
 msgid "Publication:"
 msgstr "Publication :"
 
-#: mergedata.glade:1085 mergedata.glade:1107
+#: mergedata.glade:1054 mergedata.glade:1076
 msgid "GRAMPS ID:"
 msgstr "_Identifiant GRAMPS :"
 
-#: mergedata.glade:1291
-msgid "Select the person that will provide the primary data for the merged person."
+#: mergedata.glade:1255
+msgid ""
+"Select the person that will provide the primary data for the merged person."
 msgstr ""
 "Slectionner la personne dont les donnes seront utilises en priorit pour "
 "la personne fusionne."
@@ -7098,15 +7186,15 @@ msgid "Author's email:"
 msgstr "Adresse de l'auteur :"
 
 #: plugins/AncestorChart.py:245 plugins/AncestorChart2.py:499
-#: plugins/AncestorReport.py:290 plugins/Ancestors.py:907
-#: plugins/Ancestors.py:923 plugins/Ancestors.py:929 plugins/DesGraph.py:333
-#: plugins/DetAncestralReport.py:520 plugins/FamilyGroup.py:514
+#: plugins/AncestorReport.py:290 plugins/Ancestors.py:909
+#: plugins/Ancestors.py:925 plugins/Ancestors.py:931 plugins/DesGraph.py:333
+#: plugins/DetAncestralReport.py:520 plugins/FamilyGroup.py:515
 #: plugins/FanChart.py:299 plugins/FtmStyleAncestors.py:390
 #: plugins/FtmStyleAncestors.py:395 plugins/FtmStyleAncestors.py:400
 #: plugins/FtmStyleAncestors.py:405 plugins/FtmStyleDescendants.py:536
 #: plugins/FtmStyleDescendants.py:541 plugins/FtmStyleDescendants.py:551
-#: plugins/FtmStyleDescendants.py:556 plugins/IndivComplete.py:577
-#: plugins/IndivSummary.py:373
+#: plugins/FtmStyleDescendants.py:556 plugins/IndivComplete.py:578
+#: plugins/IndivSummary.py:374
 msgid "The basic style used for the text display."
 msgstr "Le style de base pour afficher du texte."
 
@@ -7125,15 +7213,14 @@ msgid "Ancestor Chart"
 msgstr "Arbre des ascendants"
 
 #: plugins/AncestorChart.py:273 plugins/AncestorChart2.py:524
-#: plugins/AncestorReport.py:306 plugins/Ancestors.py:966
+#: plugins/AncestorReport.py:306 plugins/Ancestors.py:968
 #: plugins/BookReport.py:1117 plugins/CountAncestors.py:122
 #: plugins/DescendReport.py:198 plugins/DetAncestralReport.py:618
-#: plugins/DetDescendantReport.py:639 plugins/FamilyGroup.py:548
+#: plugins/DetDescendantReport.py:639 plugins/FamilyGroup.py:549
 #: plugins/FtmStyleAncestors.py:422 plugins/FtmStyleDescendants.py:572
 #: plugins/GraphViz.py:971 plugins/GraphViz.py:985
-#: plugins/IndivComplete.py:594 plugins/IndivSummary.py:390
-#: plugins/NavWebPage.py:1339 plugins/Summary.py:178 plugins/TimeLine.py:479
-#: plugins/WebPage.py:1904
+#: plugins/IndivComplete.py:595 plugins/IndivSummary.py:391
+#: plugins/Summary.py:178 plugins/TimeLine.py:479 plugins/WebPage.py:1908
 msgid "Beta"
 msgstr "Bta"
 
@@ -7233,17 +7320,17 @@ msgstr ", et f
 msgid " and was buried in %s."
 msgstr ", et ft inhum le %s."
 
-#: plugins/AncestorReport.py:276 plugins/Ancestors.py:892
+#: plugins/AncestorReport.py:276 plugins/Ancestors.py:894
 #: plugins/DescendReport.py:174 plugins/DetAncestralReport.py:484
-#: plugins/DetDescendantReport.py:505 plugins/FamilyGroup.py:505
+#: plugins/DetDescendantReport.py:505 plugins/FamilyGroup.py:506
 #: plugins/FtmStyleAncestors.py:375 plugins/FtmStyleDescendants.py:521
-#: plugins/IndivComplete.py:551 plugins/IndivSummary.py:347
+#: plugins/IndivComplete.py:552 plugins/IndivSummary.py:348
 #: plugins/SimpleBookTitle.py:265 plugins/StatisticsChart.py:812
-#: plugins/TimeLine.py:398 plugins/WebPage.py:1557
+#: plugins/TimeLine.py:398 plugins/WebPage.py:1561
 msgid "The style used for the title of the page."
 msgstr "Le style utilis pour les titres de page."
 
-#: plugins/AncestorReport.py:285 plugins/Ancestors.py:902
+#: plugins/AncestorReport.py:285 plugins/Ancestors.py:904
 #: plugins/DetAncestralReport.py:493 plugins/DetDescendantReport.py:514
 #: plugins/FtmStyleAncestors.py:385 plugins/FtmStyleDescendants.py:531
 msgid "The style used for the generation header."
@@ -7277,135 +7364,135 @@ msgstr "%(name)s est le %(parents)s"
 msgid "%(name)s's paternal %(grandparents)s"
 msgstr "%(name)s est le %(grandparents)s paternel"
 
-#: plugins/Ancestors.py:398
+#: plugins/Ancestors.py:399
 msgid "(no photo)"
 msgstr "(pas de photo)"
 
-#: plugins/Ancestors.py:416
+#: plugins/Ancestors.py:418
 msgid " (mentioned above)."
 msgstr " (mention ci-dessus)."
 
-#: plugins/Ancestors.py:475
+#: plugins/Ancestors.py:477
 msgid " on %(specific_date)s"
 msgstr " le %(specific_date)s"
 
-#: plugins/Ancestors.py:478
+#: plugins/Ancestors.py:480
 msgid " in %(month_or_year)s"
 msgstr " en %(month_or_year)s"
 
-#: plugins/Ancestors.py:485
+#: plugins/Ancestors.py:487
 msgid " in %(place)s"
 msgstr "  %(place)s"
 
-#: plugins/Ancestors.py:524
+#: plugins/Ancestors.py:526
 msgid " b. %(birth_date)s"
 msgstr " n. %(birth_date)s"
 
-#: plugins/Ancestors.py:532
+#: plugins/Ancestors.py:534
 msgid " d. %(death_date)s"
 msgstr " d. %(death_date)s"
 
-#: plugins/Ancestors.py:545
+#: plugins/Ancestors.py:547
 msgid "born"
 msgstr "n(e) le"
 
-#: plugins/Ancestors.py:557
+#: plugins/Ancestors.py:559
 msgid "died"
 msgstr "dcd le"
 
-#: plugins/Ancestors.py:603
+#: plugins/Ancestors.py:605
 msgid "Mrs."
 msgstr "Mme."
 
-#: plugins/Ancestors.py:605
+#: plugins/Ancestors.py:607
 msgid "Miss"
 msgstr "Mlle"
 
-#: plugins/Ancestors.py:607
+#: plugins/Ancestors.py:609
 msgid "Mr."
 msgstr "M."
 
-#: plugins/Ancestors.py:609
+#: plugins/Ancestors.py:611
 msgid "(gender unknown)"
 msgstr "(sexe inconnu)"
 
-#: plugins/Ancestors.py:663
+#: plugins/Ancestors.py:665
 msgid " (unknown)"
 msgstr " (inconnu)"
 
-#: plugins/Ancestors.py:697
+#: plugins/Ancestors.py:699
 msgid ", and they had a child named "
 msgstr " et eurent un enfant nomm "
 
-#: plugins/Ancestors.py:699
+#: plugins/Ancestors.py:701
 msgid ", and they had %d children: "
 msgstr " et eurent %d enfants : "
 
-#: plugins/Ancestors.py:712
+#: plugins/Ancestors.py:714
 msgid " and "
 msgstr " et "
 
-#: plugins/Ancestors.py:728
+#: plugins/Ancestors.py:730
 msgid "  She later married %(name)s"
 msgstr "  Elle se maria plus tard avec %(name)s"
 
-#: plugins/Ancestors.py:731
+#: plugins/Ancestors.py:733
 msgid "  He later married %(name)s"
 msgstr "  Il se maria plus tard avec %(name)s"
 
-#: plugins/Ancestors.py:738
+#: plugins/Ancestors.py:740
 msgid "  She married %(name)s"
 msgstr "  Elle pousa %(name)s"
 
-#: plugins/Ancestors.py:741
+#: plugins/Ancestors.py:743
 msgid "  He married %(name)s"
 msgstr "  Il pousa %(name)s"
 
-#: plugins/Ancestors.py:749
+#: plugins/Ancestors.py:751
 msgid "  She later had a relationship with %(name)s"
 msgstr "  Elle se maria plus tard avec %(name)s"
 
-#: plugins/Ancestors.py:752
+#: plugins/Ancestors.py:754
 msgid "  He later had a relationship with %(name)s"
 msgstr "  Il se maria plus tard avec %(name)s"
 
-#: plugins/Ancestors.py:756
+#: plugins/Ancestors.py:758
 msgid "  She had a relationship with %(name)s"
 msgstr "  Elle eu plus tard une relation avec %(name)s"
 
-#: plugins/Ancestors.py:759
+#: plugins/Ancestors.py:761
 msgid "  He had a relationship with %(name)s"
 msgstr "  Il eut plus tard une relation avec %(name)s"
 
-#: plugins/Ancestors.py:773
+#: plugins/Ancestors.py:775
 msgid "  Note about their name: "
 msgstr "  Note  propos de leur nom : "
 
-#: plugins/Ancestors.py:810
+#: plugins/Ancestors.py:812
 msgid "More about %(name)s:"
 msgstr "Encore  propos de %(name)s :"
 
-#: plugins/Ancestors.py:911
+#: plugins/Ancestors.py:913
 msgid "Text style for missing photo."
 msgstr "Style de texte pour photo manquante."
 
-#: plugins/Ancestors.py:918
+#: plugins/Ancestors.py:920
 msgid "Style for details about a person."
 msgstr "Style de description d'un individu."
 
-#: plugins/Ancestors.py:934
+#: plugins/Ancestors.py:936
 msgid "Introduction to the children."
 msgstr "Prface  l'intention des enfants."
 
-#: plugins/Ancestors.py:944
+#: plugins/Ancestors.py:946
 msgid "Cite sources"
 msgstr "Citer les sources"
 
-#: plugins/Ancestors.py:965
+#: plugins/Ancestors.py:967
 msgid "Comprehensive Ancestors Report"
 msgstr "Liste simplifie des ascendants"
 
-#: plugins/Ancestors.py:967
+#: plugins/Ancestors.py:969
 msgid "Produces a detailed ancestral report."
 msgstr "Produit une liste dtaille des ascendants."
 
@@ -7516,7 +7603,8 @@ msgid "Database Processing"
 msgstr "Traitement de la base de donnes"
 
 #: plugins/ChangeNames.py:203
-msgid "Searches the entire database and attempts to fix capitalization of the names."
+msgid ""
+"Searches the entire database and attempts to fix capitalization of the names."
 msgstr "Recherche dans toute la base pour tenter de rparer la casse des noms."
 
 #: plugins/ChangeTypes.py:89
@@ -7547,7 +7635,7 @@ msgstr "Permet de basculer les 
 msgid "Check Integrity"
 msgstr "Contrle d'intgrit"
 
-#: plugins/Check.py:265 plugins/WriteCD.py:229 plugins/WritePkg.py:147
+#: plugins/Check.py:265 plugins/WriteCD.py:230 plugins/WritePkg.py:147
 msgid "Select file"
 msgstr "Choisir un fichier"
 
@@ -7696,8 +7784,10 @@ msgid "Check and repair database"
 msgstr "Vrifier et rparer la base de donnes"
 
 #: plugins/Check.py:606
-msgid "Checks the database for integrity problems, fixing the problems that it can"
-msgstr "Vrifie l'intgrit de la base de donnes, corrigeant les problmes ventuels"
+msgid ""
+"Checks the database for integrity problems, fixing the problems that it can"
+msgstr ""
+"Vrifie l'intgrit de la base de donnes, corrigeant les problmes ventuels"
 
 #: plugins/CountAncestors.py:71
 msgid "Number of ancestors of \"%s\" by generation"
@@ -7756,7 +7846,7 @@ msgid "Descendant Graph"
 msgstr "Graphique des descendants"
 
 #: plugins/DesGraph.py:349 plugins/FanChart.py:325
-#: plugins/StatisticsChart.py:958
+#: plugins/StatisticsChart.py:963
 msgid "Alpha"
 msgstr "Alpha"
 
@@ -7802,7 +7892,7 @@ msgstr "G
 
 #: plugins/DetAncestralReport.py:208
 msgid "%(name)s is the same person as [%(id_str)s]."
-msgstr "%(name) est la mme personne que [%(id_str)s]."
+msgstr "%(name)s est la mme personne que [%(id_str)s]."
 
 #: plugins/DetAncestralReport.py:243 plugins/DetDescendantReport.py:264
 msgid "Notes for %s"
@@ -7949,37 +8039,37 @@ msgstr ""
 "Aide  l'analyse des donnes autorisant le dveloppement de filtres "
 "personnaliss pour rechercher des vnements similaires"
 
-#: plugins/ExportVCalendar.py:54
+#: plugins/ExportVCalendar.py:55
 msgid "Export to vCalendar"
 msgstr "Exporter vers vCalendar"
 
-#: plugins/ExportVCalendar.py:199
+#: plugins/ExportVCalendar.py:209
 msgid "Marriage of %s"
 msgstr "Mariage de %s"
 
-#: plugins/ExportVCalendar.py:217 plugins/ExportVCalendar.py:219
+#: plugins/ExportVCalendar.py:227 plugins/ExportVCalendar.py:229
 msgid "Birth of %s"
 msgstr "Naissance de %s"
 
-#: plugins/ExportVCalendar.py:228 plugins/ExportVCalendar.py:230
+#: plugins/ExportVCalendar.py:238 plugins/ExportVCalendar.py:240
 msgid "Death of %s"
 msgstr "Dcs de %s"
 
-#: plugins/ExportVCalendar.py:283
+#: plugins/ExportVCalendar.py:293
 msgid "Anniversary: %s"
 msgstr "Anniversaire : %s"
 
-#: plugins/ExportVCalendar.py:310
+#: plugins/ExportVCalendar.py:320
 msgid "vCalendar"
 msgstr "vCalendar"
 
-#: plugins/ExportVCalendar.py:311
+#: plugins/ExportVCalendar.py:321
 msgid "vCalendar is used in many calendaring and pim applications."
 msgstr ""
 "Le format vCalendar est utilis dans plusieurs applications de gestion "
 "d'agenda et de gestion d'informations personnelles."
 
-#: plugins/ExportVCalendar.py:312
+#: plugins/ExportVCalendar.py:322
 msgid "vCalendar export options"
 msgstr "Options d'exportation vCalendar"
 
@@ -7987,41 +8077,41 @@ msgstr "Options d'exportation vCalendar"
 msgid "Export to vCard"
 msgstr "Exporter en format vCard"
 
-#: plugins/ExportVCard.py:234
+#: plugins/ExportVCard.py:243
 msgid "vCard"
 msgstr "vCard"
 
-#: plugins/ExportVCard.py:235
+#: plugins/ExportVCard.py:244
 msgid "vCard is used in many addressbook and pim applications."
 msgstr ""
 "Les vCards sont utilises dans la plupart des logiciels de carnets "
 "d'adresses et de gestion de donnes personnelles."
 
-#: plugins/ExportVCard.py:236
+#: plugins/ExportVCard.py:245
 msgid "vCard export options"
 msgstr "Options d'exportation vCard"
 
-#: plugins/FamilyGroup.py:163 plugins/NavWebPage.py:759
+#: plugins/FamilyGroup.py:163
 msgid "Husband"
 msgstr "Mari"
 
-#: plugins/FamilyGroup.py:165 plugins/NavWebPage.py:761
+#: plugins/FamilyGroup.py:165
 msgid "Wife"
 msgstr "Femme"
 
-#: plugins/FamilyGroup.py:383 plugins/FamilyGroup.py:547
+#: plugins/FamilyGroup.py:383 plugins/FamilyGroup.py:548
 msgid "Family Group Report"
 msgstr "Rapport de famille"
 
-#: plugins/FamilyGroup.py:523
+#: plugins/FamilyGroup.py:524
 msgid "The style used for the text related to the children."
 msgstr "Le style utilis pour le texte relatif aux enfants."
 
-#: plugins/FamilyGroup.py:532
+#: plugins/FamilyGroup.py:533
 msgid "The style used for the parent's name"
 msgstr "Le style utilis pour le nom des parents"
 
-#: plugins/FamilyGroup.py:551
+#: plugins/FamilyGroup.py:552
 msgid ""
 "Creates a family group report, showing information on a set of parents and "
 "their children."
@@ -8045,101 +8135,101 @@ msgstr "Roue des ascendants"
 msgid "Produces a five generation fan chart"
 msgstr "Produit une roue des ascendants sur cinq gnrations"
 
-#: plugins/FilterEditor.py:199
+#: plugins/FilterEditor.py:207
 msgid "Select..."
 msgstr "Slectionner ..."
 
-#: plugins/FilterEditor.py:205
+#: plugins/FilterEditor.py:213
 msgid "Select person from a list"
 msgstr "Slectionner une personne de la liste"
 
-#: plugins/FilterEditor.py:227
+#: plugins/FilterEditor.py:235
 msgid "Not a valid person"
 msgstr "Personne incorrecte"
 
-#: plugins/FilterEditor.py:318
+#: plugins/FilterEditor.py:326
 msgid "User defined filters"
 msgstr "Filtres utilisateurs"
 
-#: plugins/FilterEditor.py:331 plugins/ScratchPad.py:357
+#: plugins/FilterEditor.py:339 plugins/ScratchPad.py:357
 msgid "Comment"
 msgstr "Commentaire"
 
-#: plugins/FilterEditor.py:357
+#: plugins/FilterEditor.py:365
 msgid "Filter Editor tool"
 msgstr "Outil d'dition de filtres"
 
-#: plugins/FilterEditor.py:362
+#: plugins/FilterEditor.py:370
 msgid "Filter List"
 msgstr "Liste des filtres"
 
-#: plugins/FilterEditor.py:447
+#: plugins/FilterEditor.py:455
 msgid "Define filter"
 msgstr "Dfinir un filtre"
 
-#: plugins/FilterEditor.py:512 plugins/FilterEditor.py:516
+#: plugins/FilterEditor.py:520 plugins/FilterEditor.py:524
 msgid "New Filter"
 msgstr "Nouveau filtre"
 
-#: plugins/FilterEditor.py:523
+#: plugins/FilterEditor.py:531
 msgid "Define Filter"
 msgstr "Dfinir un filtre"
 
-#: plugins/FilterEditor.py:578
+#: plugins/FilterEditor.py:586
 msgid "Add Rule"
 msgstr "Ajouter une rgle"
 
-#: plugins/FilterEditor.py:584
+#: plugins/FilterEditor.py:592
 msgid "Edit Rule"
 msgstr "Modifier une rgle"
 
-#: plugins/FilterEditor.py:690
+#: plugins/FilterEditor.py:693
 msgid "Include original person"
 msgstr "Inclure la personne d'origine"
 
-#: plugins/FilterEditor.py:692
+#: plugins/FilterEditor.py:695
 msgid "Use exact case of letters"
 msgstr "Utiliser la casse exacte"
 
-#: plugins/FilterEditor.py:694
+#: plugins/FilterEditor.py:697
 msgid "Use regular expression"
 msgstr "Utiliser l'expression rgulire"
 
-#: plugins/FilterEditor.py:707
+#: plugins/FilterEditor.py:710
 msgid "Rule Name"
 msgstr "Nom de la rgle"
 
-#: plugins/FilterEditor.py:782
+#: plugins/FilterEditor.py:796
 msgid "New Rule"
 msgstr "Nouvelle rgle"
 
-#: plugins/FilterEditor.py:783
+#: plugins/FilterEditor.py:797
 msgid "Rule"
 msgstr "Rgle"
 
-#: plugins/FilterEditor.py:807 rule.glade:1123
+#: plugins/FilterEditor.py:821 plugins/FilterEditor.py:832 rule.glade:1123
 msgid "No rule selected"
 msgstr "Aucune rgle retenue"
 
-#: plugins/FilterEditor.py:858
+#: plugins/FilterEditor.py:871
 msgid "Filter Test"
 msgstr "Test du filtre"
 
-#: plugins/FilterEditor.py:888
+#: plugins/FilterEditor.py:901
 msgid "Test"
 msgstr "Test"
 
-#: plugins/FilterEditor.py:926
+#: plugins/FilterEditor.py:939
 msgid "Custom Filter Editor"
 msgstr "Filtres personnaliss"
 
-#: plugins/FilterEditor.py:927 plugins/FilterEditor.py:940
-#: plugins/RelCalc.py:208 plugins/ScratchPad.py:894 plugins/SoundGen.py:160
+#: plugins/FilterEditor.py:940 plugins/FilterEditor.py:953
+#: plugins/RelCalc.py:208 plugins/ScratchPad.py:899 plugins/SoundGen.py:160
 #: plugins/Verify.py:553
 msgid "Utilities"
 msgstr "Utilitaires"
 
-#: plugins/FilterEditor.py:928
+#: plugins/FilterEditor.py:941
 msgid ""
 "The Custom Filter Editor builds custom filters that can be used to select "
 "people included in reports, exports, and other utilities."
@@ -8148,11 +8238,11 @@ msgstr ""
 "restreindre les rapports, les exports et autres utilitaires aux individus."
 "recherchs."
 
-#: plugins/FilterEditor.py:939
+#: plugins/FilterEditor.py:952
 msgid "System Filter Editor"
 msgstr "Filtres systmes"
 
-#: plugins/FilterEditor.py:941
+#: plugins/FilterEditor.py:954
 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 "
@@ -8419,7 +8509,8 @@ msgstr "Indiquer les relations autres que la naissance avec des pointill
 
 #: plugins/GraphViz.py:668
 msgid "Non-birth relationships will show up as dotted lines in the graph."
-msgstr "Les relations autres que la naissance seront en pointill sur le graphique."
+msgstr ""
+"Les relations autres que la naissance seront en pointill sur le graphique."
 
 #: plugins/GraphViz.py:671
 msgid "Show family nodes"
@@ -8427,7 +8518,8 @@ msgstr "Affiche les noeuds familiaux"
 
 #: plugins/GraphViz.py:675
 msgid "Families will show up as ellipses, linked to parents and children."
-msgstr "Les familles seront affiches en cercles, relies aux parents et aux enfants."
+msgstr ""
+"Les familles seront affiches en cercles, relies aux parents et aux enfants."
 
 #: plugins/GraphViz.py:687 plugins/GraphViz.py:690 plugins/GraphViz.py:702
 #: plugins/GraphViz.py:709
@@ -8498,15 +8590,15 @@ msgstr ""
 "convertir en graphique. SI vous voulez le fichier 'dot', utilisez les "
 "Gnrateurs de code."
 
-#: plugins/ImportGeneWeb.py:164
+#: plugins/ImportGeneWeb.py:165
 msgid "GeneWeb import"
 msgstr "Import GeneWeb"
 
-#: plugins/ImportGeneWeb.py:713
+#: plugins/ImportGeneWeb.py:736
 msgid "GeneWeb files"
 msgstr "Fichiers GeneWeb"
 
-#: plugins/ImportGeneWeb.py:715
+#: plugins/ImportGeneWeb.py:738
 msgid "GeneWeb"
 msgstr "GeneWeb"
 
@@ -8527,55 +8619,55 @@ msgid "Alternate Parents"
 msgstr "Autres parents possibles"
 
 #: plugins/IndivComplete.py:263 plugins/IndivSummary.py:146
-#: plugins/WebPage.py:629
+#: plugins/WebPage.py:633
 msgid "Marriages/Children"
 msgstr "Mariages et enfants"
 
-#: plugins/IndivComplete.py:343 plugins/IndivSummary.py:308
+#: plugins/IndivComplete.py:343 plugins/IndivSummary.py:309
 msgid "Individual Facts"
 msgstr "Actes individuels"
 
 #: plugins/IndivComplete.py:386 plugins/IndivSummary.py:205
-#: plugins/WebPage.py:129 plugins/WebPage.py:282
+#: plugins/WebPage.py:131 plugins/WebPage.py:284
 msgid "Summary of %s"
 msgstr "Fiche de %s"
 
-#: plugins/IndivComplete.py:419 plugins/IndivSummary.py:246
-#: plugins/WebPage.py:327
+#: plugins/IndivComplete.py:420 plugins/IndivSummary.py:247
+#: plugins/WebPage.py:330
 msgid "Male"
 msgstr "Masculin"
 
-#: plugins/IndivComplete.py:421 plugins/IndivSummary.py:248
-#: plugins/WebPage.py:329
+#: plugins/IndivComplete.py:422 plugins/IndivSummary.py:249
+#: plugins/WebPage.py:332
 msgid "Female"
 msgstr "Fminin"
 
-#: plugins/IndivComplete.py:532
+#: plugins/IndivComplete.py:533
 msgid "Include Source Information"
 msgstr "Inclure une source d'information"
 
-#: plugins/IndivComplete.py:561 plugins/IndivSummary.py:357
+#: plugins/IndivComplete.py:562 plugins/IndivSummary.py:358
 msgid "The style used for category labels."
 msgstr "Style pour l'tiquette des catgories."
 
-#: plugins/IndivComplete.py:570 plugins/IndivSummary.py:366
-#: plugins/WebPage.py:1629
+#: plugins/IndivComplete.py:571 plugins/IndivSummary.py:367
+#: plugins/WebPage.py:1633
 msgid "The style used for the spouse's name."
 msgstr "Style pour le nom de jeune fille."
 
-#: plugins/IndivComplete.py:593
+#: plugins/IndivComplete.py:594
 msgid "Complete Individual Report"
 msgstr "Liste individuelle complte"
 
-#: plugins/IndivComplete.py:595
+#: plugins/IndivComplete.py:596
 msgid "Produces a complete report on the selected people."
 msgstr "Produit une liste complte de la personne slectionne."
 
-#: plugins/IndivSummary.py:389
+#: plugins/IndivSummary.py:390
 msgid "Individual Summary"
 msgstr "Fiche personnelle"
 
-#: plugins/IndivSummary.py:391
+#: plugins/IndivSummary.py:392
 msgid "Produces a detailed report on the selected person."
 msgstr "Produit une liste dtaille de la personne slectionne."
 
@@ -8649,180 +8741,6 @@ msgid ""
 "represent the same person."
 msgstr "Recherche dans la base de donnes pour trouver d'ventuels doublons."
 
-#: plugins/NavWebPage.py:185 plugins/NavWebPage.py:188 plugins/Summary.py:109
-msgid "Individuals"
-msgstr "Individus"
-
-#: plugins/NavWebPage.py:189
-msgid "Index of individuals, sorted by last name."
-msgstr "Index des individus tri par nom."
-
-#: plugins/NavWebPage.py:193 plugins/NavWebPage.py:312
-msgid "Surname"
-msgstr "Nom de famille"
-
-#: plugins/NavWebPage.py:234 plugins/NavWebPage.py:237
-msgid "Places"
-msgstr "Lieux"
-
-#: plugins/NavWebPage.py:238
-msgid "Index of all the places in the project."
-msgstr "Index de tous les lieux du projet."
-
-#: plugins/NavWebPage.py:245 plugins/NavWebPage.py:310
-msgid "Letter"
-msgstr "Lettres"
-
-#: plugins/NavWebPage.py:297 plugins/NavWebPage.py:300
-#: plugins/StatisticsChart.py:98
-msgid "Surnames"
-msgstr "Noms de famille"
-
-#: plugins/NavWebPage.py:301
-msgid ""
-"Index of all the surnames in the project. The links lead to a list of "
-"individuals in the database with this same surname."
-msgstr ""
-"Index des noms de famille du projet. Les liens mnent vers la liste des "
-"individus de la base ayant le mme nom de famille."
-
-#: plugins/NavWebPage.py:359 plugins/NavWebPage.py:362
-msgid "Introduction"
-msgstr "Introduction"
-
-#: plugins/NavWebPage.py:445
-msgid "All sources cited in the project."
-msgstr "Toutes les sources cites dans le projet."
-
-#: plugins/NavWebPage.py:471 plugins/NavWebPage.py:474
-msgid "Download"
-msgstr "Tlcharger"
-
-#: plugins/NavWebPage.py:491 plugins/NavWebPage.py:494
-msgid "Contact"
-msgstr "Contact"
-
-#: plugins/NavWebPage.py:583
-msgid "Pedigree"
-msgstr "Arborescence"
-
-#: plugins/NavWebPage.py:674
-msgid "Narrative"
-msgstr "Narratif"
-
-#: plugins/NavWebPage.py:707
-msgid "Relationships"
-msgstr "Relations"
-
-#: plugins/NavWebPage.py:763 plugins/NavWebPage.py:765
-msgid "Partner"
-msgstr "Partenaire"
-
-#: plugins/NavWebPage.py:832
-msgid "%(description)s,    %(date)s    at    %(place)s"
-msgstr "%(description)s,    %(date)s        %(place)s"
-
-#: plugins/NavWebPage.py:834
-msgid "%(description)s,    %(date)s   "
-msgstr "%(description)s,    %(date)s   "
-
-#: plugins/NavWebPage.py:838
-msgid "%(date)s    at    %(place)s"
-msgstr "%(date)s        %(place)s"
-
-#: plugins/NavWebPage.py:915 plugins/WebPage.py:818
-msgid "Generate HTML reports - GRAMPS"
-msgstr "Gnration des pages HTML - GRAMPS"
-
-#: plugins/NavWebPage.py:917 plugins/WebPage.py:820
-msgid "Creating Web Pages"
-msgstr "Cration du site Web"
-
-#: plugins/NavWebPage.py:926 plugins/WebPage.py:1097
-msgid "Neither %s nor %s are directories"
-msgstr "Ni %s ni %s ne sont des rpertoires"
-
-#: plugins/NavWebPage.py:933 plugins/NavWebPage.py:937
-#: plugins/NavWebPage.py:949 plugins/NavWebPage.py:953 plugins/WebPage.py:1104
-#: plugins/WebPage.py:1108 plugins/WebPage.py:1120 plugins/WebPage.py:1124
-msgid "Could not create the directory: %s"
-msgstr "Impossible de crer le rpertoire : %s"
-
-#: plugins/NavWebPage.py:1075 plugins/WebPage.py:1269
-msgid "Descendant Families of %s"
-msgstr "Familles descendantes de %s"
-
-#: plugins/NavWebPage.py:1089 plugins/WebPage.py:1284
-msgid "Do not include records marked private"
-msgstr "Ne pas inclure les fiches prives"
-
-#: plugins/NavWebPage.py:1090 plugins/WebPage.py:1285
-msgid "Restrict information on living people"
-msgstr "Restreindre l'information sur les personnes vivantes"
-
-#: plugins/NavWebPage.py:1091 plugins/WebPage.py:1286
-msgid "Do not use images"
-msgstr "Ne pas inclure les images"
-
-#: plugins/NavWebPage.py:1092 plugins/WebPage.py:1287
-msgid "Do not use images for living people"
-msgstr "Ne pas inclure les images pour les personnes vivantes"
-
-#: plugins/NavWebPage.py:1093 plugins/WebPage.py:1288
-msgid "Do not include comments and text in source information"
-msgstr "Ne pas inclure de commentaire ni de texte dans les sources"
-
-#: plugins/NavWebPage.py:1094 plugins/WebPage.py:1292
-msgid "Image subdirectory"
-msgstr "Rpertoire d'images"
-
-#: plugins/NavWebPage.py:1095
-msgid "Web site title"
-msgstr "Nom du site web"
-
-#: plugins/NavWebPage.py:1096 plugins/WebPage.py:1294
-msgid "File extension"
-msgstr "Extension de fichier"
-
-#: plugins/NavWebPage.py:1097 plugins/WebPage.py:1296
-msgid "Split alphabetical sections to separate pages"
-msgstr "Scinder les sections alphabtiques en pages distinctes"
-
-#: plugins/NavWebPage.py:1098 plugins/WebPage.py:1299
-msgid "Include short ancestor tree"
-msgstr "Inclure un arbre restreint des ascendants"
-
-#: plugins/NavWebPage.py:1150
-msgid "Home Note ID"
-msgstr ""
-
-#: plugins/NavWebPage.py:1152
-msgid "Introduction Note ID"
-msgstr ""
-
-#: plugins/NavWebPage.py:1155 plugins/WebPage.py:1427
-msgid "Privacy"
-msgstr "Vie prive"
-
-#: plugins/NavWebPage.py:1222 plugins/NavWebPage.py:1247
-#: plugins/WebPage.py:1699 plugins/WebPage.py:1715 plugins/WebPage.py:1903
-msgid "Generate Web Site"
-msgstr "Gnration de site internet"
-
-#: plugins/NavWebPage.py:1252 plugins/WebPage.py:1720
-msgid "Target Directory"
-msgstr "Rpertoire cible"
-
-#: plugins/NavWebPage.py:1338
-msgid "Narrative Web Site"
-msgstr "Gnration de site internet dtaill"
-
-#: plugins/NavWebPage.py:1340 plugins/WebPage.py:1905
-msgid "Generates web (HTML) pages for individuals, or a set of individuals."
-msgstr ""
-"Gnration de pages internet (HTML) pour tous les indivdus ou une partie des "
-"individus."
-
 #: plugins/PatchNames.py:147
 msgid "No titles or nicknames were found"
 msgstr "Aucun titre ou surnom dtects"
@@ -8953,12 +8871,12 @@ msgstr ""
 msgid "Person Link"
 msgstr ""
 
-#: plugins/ScratchPad.py:830 plugins/ScratchPad.py:893
+#: plugins/ScratchPad.py:835 plugins/ScratchPad.py:898
 #: plugins/scratchpad.glade:9
 msgid "Scratch Pad"
 msgstr "Presse-papiers"
 
-#: plugins/ScratchPad.py:895
+#: plugins/ScratchPad.py:900
 msgid ""
 "The Scratch Pad provides a temporary note pad to store objects for easy "
 "reuse."
@@ -9053,6 +8971,10 @@ msgstr "Femmes"
 msgid "Titles"
 msgstr "Titres"
 
+#: plugins/StatisticsChart.py:98
+msgid "Surnames"
+msgstr "Noms de famille"
+
 #: plugins/StatisticsChart.py:100
 msgid "Forenames"
 msgstr "Prnoms"
@@ -9184,7 +9106,8 @@ msgstr ""
 
 #: plugins/StatisticsChart.py:529
 msgid "Persons born %(year_from)04d-%(year_to)04d: %(chart_title)s"
-msgstr "Personnes nes entre %(year_from)04d et %(year_to)04d : %(chart_title)s"
+msgstr ""
+"Personnes nes entre %(year_from)04d et %(year_to)04d : %(chart_title)s"
 
 #: plugins/StatisticsChart.py:803
 msgid "The style used for the items and values."
@@ -9206,64 +9129,72 @@ msgstr "Inverser l'ordre de tri."
 msgid "Sort in reverse order"
 msgstr "Trier dans l'ordre inverse"
 
-#: plugins/StatisticsChart.py:877
+#: plugins/StatisticsChart.py:881
 msgid ""
 "Select year range within which people need to be born to be selected for "
 "statistics."
 msgstr "Choisir l'intervalle des annes de naissance pour les statistiques."
 
-#: plugins/StatisticsChart.py:878
+#: plugins/StatisticsChart.py:882
 msgid "People born between"
 msgstr "Personnes nes entre"
 
-#: plugins/StatisticsChart.py:882
+#: plugins/StatisticsChart.py:886
+#, fuzzy
 msgid ""
-"Check this if you want people who have no birth date or year to be accounted "
-"also in the statistics."
-msgstr "Inclure les personnes sans date ni anne de naissance dans les statistiques."
+"Check this if you want people who have no known birth date or year to be "
+"accounted also in the statistics."
+msgstr ""
+"Inclure les personnes sans date ni anne de naissance dans les statistiques."
 
-#: plugins/StatisticsChart.py:883
-msgid "Include people without birth years"
+#: plugins/StatisticsChart.py:887
+#, fuzzy
+msgid "Include people without known birth years"
 msgstr "Individus sans anne de naissance"
 
-#: plugins/StatisticsChart.py:895
+#: plugins/StatisticsChart.py:899
 msgid "Select which genders are included into statistics."
 msgstr "Choisir les sexes  inclure dans les statistiques."
 
-#: plugins/StatisticsChart.py:896
+#: plugins/StatisticsChart.py:900
 msgid "Genders included"
 msgstr "Sexes choisis"
 
-#: plugins/StatisticsChart.py:899
-msgid "With fewer items pie chart and legend will be used instead of a bar chart."
+#: plugins/StatisticsChart.py:903
+msgid ""
+"With fewer items pie chart and legend will be used instead of a bar chart."
 msgstr ""
 "S'il y a moins d'lments que spcifi un diagramme en camembert avec "
 "lgende sera gnr  la place d'un diagramme en barres."
 
-#: plugins/StatisticsChart.py:902
-msgid "Min. bar char items"
-msgstr "Nombre minimum d'entres pour les diagrammes en barres"
+#: plugins/StatisticsChart.py:907
+msgid "Max. items for a pie"
+msgstr ""
 
-#: plugins/StatisticsChart.py:921
+#: plugins/StatisticsChart.py:926
 msgid "Mark checkboxes to add charts with indicated data"
 msgstr ""
 
-#: plugins/StatisticsChart.py:922 plugins/StatisticsChart.py:927
+#: plugins/StatisticsChart.py:927 plugins/StatisticsChart.py:932
 msgid "Chart Selection"
 msgstr "Slection d'un diagramme"
 
-#: plugins/StatisticsChart.py:926
+#: plugins/StatisticsChart.py:931
 msgid "Note that both biological and adopted children are taken into account."
 msgstr "Notez que les enfants naturels et adopts seront pris en compte."
 
-#: plugins/StatisticsChart.py:957
+#: plugins/StatisticsChart.py:962
 msgid "Statistics Chart"
 msgstr "Diagrammes statistiques"
 
-#: plugins/StatisticsChart.py:961
+#: plugins/StatisticsChart.py:966
 msgid "Generates statistical bar and pie charts of the people in the database."
 msgstr ""
 
+#: plugins/Summary.py:109
+msgid "Individuals"
+msgstr "Individus"
+
 #: plugins/Summary.py:111
 msgid "Number of individuals"
 msgstr "Nombre d'individus"
@@ -9357,19 +9288,19 @@ msgstr ""
 "Gnration des personnes et des familles.\n"
 "Patientez."
 
-#: plugins/TestcaseGenerator.py:169
+#: plugins/TestcaseGenerator.py:288
 msgid "Testcase generator"
 msgstr ""
 
-#: plugins/TestcaseGenerator.py:623
+#: plugins/TestcaseGenerator.py:754
 msgid "Testcase generator step %d"
 msgstr ""
 
-#: plugins/TestcaseGenerator.py:647
+#: plugins/TestcaseGenerator.py:778
 msgid "Generate Testcases for persons and families"
 msgstr ""
 
-#: plugins/TestcaseGenerator.py:649
+#: plugins/TestcaseGenerator.py:780
 msgid ""
 "The testcase generator will generate some persons and families that have "
 "broken links in the database or data that is in conflict to a relation."
@@ -9408,7 +9339,8 @@ msgid "Database Verify"
 msgstr "Vrification de la base de donnes"
 
 #: plugins/Verify.py:180
-msgid "Baptized before birth: %(male_name)s born %(byear)d, baptized %(bapyear)d.\n"
+msgid ""
+"Baptized before birth: %(male_name)s born %(byear)d, baptized %(bapyear)d.\n"
 msgstr ""
 "Baptis avant la naissance : %(male_name)s n %(byear)d, baptis %(bapyear)"
 "d.\n"
@@ -9423,27 +9355,32 @@ msgstr ""
 
 #: plugins/Verify.py:187
 msgid "Baptized late: %(male_name)s born %(byear)d, baptized %(bapyear)d.\n"
-msgstr "Baptis tardivement : %(male_name)s n %(byear)d, baptis %(bapyear)d.\n"
+msgstr ""
+"Baptis tardivement : %(male_name)s n %(byear)d, baptis %(bapyear)d.\n"
 
 #: plugins/Verify.py:190
 msgid "Baptized late: %(female_name)s born %(byear)d, baptized %(bapyear)d.\n"
-msgstr "Baptise tardivement : %(female_name)s ne %(byear)d, baptise %(bapyear)d.\n"
+msgstr ""
+"Baptise tardivement : %(female_name)s ne %(byear)d, baptise %(bapyear)d.\n"
 
 #: plugins/Verify.py:195
-msgid "Buried before death: %(male_name)s died %(dyear)d, buried %(buryear)d.\n"
+msgid ""
+"Buried before death: %(male_name)s died %(dyear)d, buried %(buryear)d.\n"
 msgstr ""
 "Enterr avant la mort : %(male_name)s dcd %(dyear)d, enterr %(buryear)"
 "d.\n"
 
 #: plugins/Verify.py:198
-msgid "Buried before death: %(female_name)s died %(dyear)d, buried %(buryear)d.\n"
+msgid ""
+"Buried before death: %(female_name)s died %(dyear)d, buried %(buryear)d.\n"
 msgstr ""
 "Enterre avant la mort : %(female_name)s dcde %(dyear)d, enterre %"
 "(buryear)d.\n"
 
 #: plugins/Verify.py:202
 msgid "Buried late: %(male_name)s died %(dyear)d, buried %(buryear)d.\n"
-msgstr "Enterr tardivement : %(male_name)s dcd %(dyear)d, enterr %(buryear)d.\n"
+msgstr ""
+"Enterr tardivement : %(male_name)s dcd %(dyear)d, enterr %(buryear)d.\n"
 
 #: plugins/Verify.py:205
 msgid "Buried late: %(female_name)s died %(dyear)d, buried %(buryear)d.\n"
@@ -9453,7 +9390,8 @@ msgstr ""
 
 #: plugins/Verify.py:209
 msgid "Died before birth: %(male_name)s born %(byear)d, died %(dyear)d.\n"
-msgstr "Mort avant la naissance : %(male_name)s n %(byear)d, dcd %(dyear)d.\n"
+msgstr ""
+"Mort avant la naissance : %(male_name)s n %(byear)d, dcd %(dyear)d.\n"
 
 #: plugins/Verify.py:212
 msgid "Died before birth: %(female_name)s born %(byear)d, died %(dyear)d.\n"
@@ -9462,25 +9400,29 @@ msgstr ""
 "d.\n"
 
 #: plugins/Verify.py:216
-msgid "Died before baptism: %(male_name)s baptized %(bapyear)d, died %(dyear)d.\n"
+msgid ""
+"Died before baptism: %(male_name)s baptized %(bapyear)d, died %(dyear)d.\n"
 msgstr ""
 "Dcd avant le baptme : %(male_name)s baptis %(bapyear)d, dcd %(dyear)"
 "d.\n"
 
 #: plugins/Verify.py:219
-msgid "Died before baptism: %(female_name)s baptized %(bapyear)d, died %(dyear)d.\n"
+msgid ""
+"Died before baptism: %(female_name)s baptized %(bapyear)d, died %(dyear)d.\n"
 msgstr ""
 "Dcde avant le baptme : %(female_name)s baptise %(bapyear)d, dcde %"
 "(dyear)d.\n"
 
 #: plugins/Verify.py:223
-msgid "Buried before birth: %(male_name)s born %(byear)d, buried %(buryear)d.\n"
+msgid ""
+"Buried before birth: %(male_name)s born %(byear)d, buried %(buryear)d.\n"
 msgstr ""
 "Enterr avant la naissance : %(male_name)s n %(byear)d, enterr %(buryear)"
 "d.\n"
 
 #: plugins/Verify.py:226
-msgid "Buried before birth: %(female_name)s born %(byear)d, buried %(buryear)d.\n"
+msgid ""
+"Buried before birth: %(female_name)s born %(byear)d, buried %(buryear)d.\n"
 msgstr ""
 "Enterre avant la naissance : %(female_name)s ne %(byear)d, enterre %"
 "(buryear)d.\n"
@@ -9570,7 +9512,8 @@ msgid "Husband and wife with the same surname: %s in family %s, and %s.\n"
 msgstr "Mari et femme ayant le mme nom : %s dans la famille %s, et %s.\n"
 
 #: plugins/Verify.py:322
-msgid "Large age difference between husband and wife: %s in family %s, and %s.\n"
+msgid ""
+"Large age difference between husband and wife: %s in family %s, and %s.\n"
 msgstr ""
 "Diffrence d'ge importante entre le mari et la femme : %s dans la famille %"
 "s, et %s.\n"
@@ -9592,19 +9535,25 @@ msgstr ""
 "(maryear)d  %(spouse)s.\n"
 
 #: plugins/Verify.py:362
-msgid "Young marriage: %(male_name)s married at age %(marage)d to %(spouse)s.\n"
-msgstr "Jeune mariage : %(male_name)s mari  l'ge de %(marage)d ans  %(spouse)s.\n"
+msgid ""
+"Young marriage: %(male_name)s married at age %(marage)d to %(spouse)s.\n"
+msgstr ""
+"Jeune mariage : %(male_name)s mari  l'ge de %(marage)d ans  %(spouse)s.\n"
 
 #: plugins/Verify.py:365
-msgid "Young marriage: %(female_name)s married at age %(marage)d to %(spouse)s.\n"
-msgstr "Jeune mariage : %(female_name)s marie  l'ge de %(marage)d  %(spouse)s.\n"
+msgid ""
+"Young marriage: %(female_name)s married at age %(marage)d to %(spouse)s.\n"
+msgstr ""
+"Jeune mariage : %(female_name)s marie  l'ge de %(marage)d  %(spouse)s.\n"
 
 #: plugins/Verify.py:369
 msgid "Old marriage: %(male_name)s married at age %(marage)d to %(spouse)s.\n"
-msgstr "Vieux mariage : %(male_name)s mari(e)  l'ge de %(marage)d  %(spouse)s.\n"
+msgstr ""
+"Vieux mariage : %(male_name)s mari(e)  l'ge de %(marage)d  %(spouse)s.\n"
 
 #: plugins/Verify.py:372
-msgid "Old marriage: %(female_name)s married at age %(marage)d to %(spouse)s.\n"
+msgid ""
+"Old marriage: %(female_name)s married at age %(marage)d to %(spouse)s.\n"
 msgstr ""
 "Vieux mariage : %(female_name)s mari(e)  l'ge de %(marage)d  %(spouse)"
 "s.\n"
@@ -9753,180 +9702,255 @@ msgstr "V
 msgid "Lists exceptions to assertions or checks about the database"
 msgstr "Liste les critres de cohrence puis vrifie dans la base de donnes"
 
-#: plugins/WebPage.py:324
+#: plugins/WebPage.py:327
 msgid "ID Number"
 msgstr "Numro d'identifiant"
 
-#: plugins/WebPage.py:371 plugins/WebPage.py:927
+#: plugins/WebPage.py:374 plugins/WebPage.py:931
 msgid "Return to the index of people"
 msgstr "Retour  l'index des individus"
 
-#: plugins/WebPage.py:376 plugins/WebPage.py:1085
+#: plugins/WebPage.py:379 plugins/WebPage.py:1089
 msgid "Return to the index of places"
 msgstr "Retour  l'index des lieux"
 
-#: plugins/WebPage.py:480
+#: plugins/WebPage.py:484
 msgid "Links"
 msgstr "Liens"
 
-#: plugins/WebPage.py:526
+#: plugins/WebPage.py:530
 msgid "Facts and Events"
 msgstr "Faits et vnements"
 
-#: plugins/WebPage.py:862 plugins/WebPage.py:866
+#: plugins/WebPage.py:822
+msgid "Generate HTML reports - GRAMPS"
+msgstr "Gnration des pages HTML - GRAMPS"
+
+#: plugins/WebPage.py:824
+msgid "Creating Web Pages"
+msgstr "Cration du site Web"
+
+#: plugins/WebPage.py:866 plugins/WebPage.py:870
 msgid "Place Index"
 msgstr "Index des lieux"
 
-#: plugins/WebPage.py:937 plugins/WebPage.py:941
+#: plugins/WebPage.py:941 plugins/WebPage.py:945
 msgid "Family Tree Index"
 msgstr "Index de l'arbre familial"
 
-#: plugins/WebPage.py:983 plugins/WebPage.py:987
+#: plugins/WebPage.py:986 plugins/WebPage.py:990
 msgid "Section %s"
 msgstr "Section %s"
 
-#: plugins/WebPage.py:1075
+#: plugins/WebPage.py:1079
 msgid "%s (continued)"
 msgstr "%s (en cours)"
 
-#: plugins/WebPage.py:1283
+#: plugins/WebPage.py:1101
+msgid "Neither %s nor %s are directories"
+msgstr "Ni %s ni %s ne sont des rpertoires"
+
+#: plugins/WebPage.py:1108 plugins/WebPage.py:1112 plugins/WebPage.py:1124
+#: plugins/WebPage.py:1128
+msgid "Could not create the directory: %s"
+msgstr "Impossible de crer le rpertoire : %s"
+
+#: plugins/WebPage.py:1273
+msgid "Descendant Families of %s"
+msgstr "Familles descendantes de %s"
+
+#: plugins/WebPage.py:1287
 msgid "Include a link to the index page"
 msgstr "Inclure un lien vers une page d'index"
 
+#: plugins/WebPage.py:1288
+msgid "Do not include records marked private"
+msgstr "Ne pas inclure les fiches prives"
+
 #: plugins/WebPage.py:1289
+msgid "Restrict information on living people"
+msgstr "Restreindre l'information sur les personnes vivantes"
+
+#: plugins/WebPage.py:1290
+msgid "Do not use images"
+msgstr "Ne pas inclure les images"
+
+#: plugins/WebPage.py:1291
+msgid "Do not use images for living people"
+msgstr "Ne pas inclure les images pour les personnes vivantes"
+
+#: plugins/WebPage.py:1292
+msgid "Do not include comments and text in source information"
+msgstr "Ne pas inclure de commentaire ni de texte dans les sources"
+
+#: plugins/WebPage.py:1293
 msgid "Include the GRAMPS ID in the report"
 msgstr "Inclure l'identifiant GRAMPS au rapport"
 
-#: plugins/WebPage.py:1290
+#: plugins/WebPage.py:1294
 msgid "Create a GENDEX index"
 msgstr "Crer un index GENDEX"
 
-#: plugins/WebPage.py:1291
+#: plugins/WebPage.py:1295
 msgid "Create an index of all Places"
 msgstr "Crer un index des lieux"
 
-#: plugins/WebPage.py:1293
+#: plugins/WebPage.py:1296
+msgid "Image subdirectory"
+msgstr "Rpertoire d'images"
+
+#: plugins/WebPage.py:1297
 msgid "Ancestor tree depth"
 msgstr "Profondeur de l'arbre des ascendants"
 
-#: plugins/WebPage.py:1295
+#: plugins/WebPage.py:1298
+msgid "File extension"
+msgstr "Extension de fichier"
+
+#: plugins/WebPage.py:1299
 msgid "Links to alphabetical sections in index page"
 msgstr "Lien vers les sections alphabtiques sur la page d'index"
 
-#: plugins/WebPage.py:1297
+#: plugins/WebPage.py:1300
+msgid "Split alphabetical sections to separate pages"
+msgstr "Scinder les sections alphabtiques en pages distinctes"
+
+#: plugins/WebPage.py:1301
 msgid "Append birth dates to the names"
 msgstr "Ajouter les dates de naissances aux noms"
 
-#: plugins/WebPage.py:1298
+#: plugins/WebPage.py:1302
 msgid "Use only year of birth"
 msgstr "Utiliser seulement l'anne de naissance"
 
-#: plugins/WebPage.py:1434
+#: plugins/WebPage.py:1303
+msgid "Include short ancestor tree"
+msgstr "Inclure un arbre restreint des ascendants"
+
+#: plugins/WebPage.py:1431
+msgid "Privacy"
+msgstr "Vie prive"
+
+#: plugins/WebPage.py:1438
 msgid "Index page"
 msgstr "Page d'index"
 
-#: plugins/WebPage.py:1439
+#: plugins/WebPage.py:1443
 msgid "Number of columns"
 msgstr "Nombre de colonnes"
 
-#: plugins/WebPage.py:1443
+#: plugins/WebPage.py:1447
 msgid "Advanced"
 msgstr "Avanc"
 
-#: plugins/WebPage.py:1445
+#: plugins/WebPage.py:1449
 msgid "GRAMPS ID link URL"
 msgstr "URL de l'identifiant GRAMPS"
 
-#: plugins/WebPage.py:1564
+#: plugins/WebPage.py:1568
 msgid "The style used for the header that identifies facts and events."
 msgstr "Style d'en-tte pour le titre des faits et des vnements."
 
-#: plugins/WebPage.py:1572
+#: plugins/WebPage.py:1576
 msgid "The style used for the header for the notes section."
 msgstr "Style pour les titres des notes."
 
-#: plugins/WebPage.py:1579
+#: plugins/WebPage.py:1583
 msgid "The style used for the copyright notice."
 msgstr "Style pour les copyrights."
 
-#: plugins/WebPage.py:1586
+#: plugins/WebPage.py:1590
 msgid "The style used for the header for the sources section."
 msgstr "Style pour le titre des sources."
 
-#: plugins/WebPage.py:1593
+#: plugins/WebPage.py:1597
 msgid "The style used on the index page that labels each section."
 msgstr "Style pour la page d'index de chaque section."
 
-#: plugins/WebPage.py:1600
+#: plugins/WebPage.py:1604
 msgid "The style used on the index page that labels links to each section."
 msgstr ""
 
-#: plugins/WebPage.py:1607
+#: plugins/WebPage.py:1611
 msgid "The style used for the header for the image section."
 msgstr "Style pour le titre des Images."
 
-#: plugins/WebPage.py:1614
+#: plugins/WebPage.py:1618
 msgid "The style used for the header for the siblings section."
 msgstr ""
 
-#: plugins/WebPage.py:1621
+#: plugins/WebPage.py:1625
 msgid "The style used for the header for the marriages and children section."
 msgstr "Style pour le titre des sections mariages et enfants."
 
-#: plugins/WebPage.py:1636
+#: plugins/WebPage.py:1640
 msgid "The style used for the general data labels."
 msgstr "Style pour les donnes gnrales."
 
-#: plugins/WebPage.py:1643
+#: plugins/WebPage.py:1647
 msgid "The style used for the general data."
 msgstr "Style pour les donnes gnrales."
 
-#: plugins/WebPage.py:1650
+#: plugins/WebPage.py:1654
 msgid "The style used for the description of images."
 msgstr "Style pour la description des images."
 
-#: plugins/WebPage.py:1657
+#: plugins/WebPage.py:1661
 msgid "The style used for the notes associated with images."
 msgstr "Style pour les notes associes aux images."
 
-#: plugins/WebPage.py:1664
+#: plugins/WebPage.py:1668
 msgid "The style used for the source information."
 msgstr "Style utilis pour une source d'information."
 
-#: plugins/WebPage.py:1671
+#: plugins/WebPage.py:1675
 msgid "The style used for the note information."
 msgstr "Style utilis pour une note d'information."
 
-#: plugins/WebPage.py:1678
+#: plugins/WebPage.py:1682
 msgid "The style used for the header for the URL section."
 msgstr "Style pour l'en-tte des sections URL."
 
-#: plugins/WebPage.py:1685
+#: plugins/WebPage.py:1689
 msgid "The style used for the URL information."
 msgstr "Style utilis pour une les informations URL."
 
+#: plugins/WebPage.py:1703 plugins/WebPage.py:1719 plugins/WebPage.py:1907
+msgid "Generate Web Site"
+msgstr "Gnration de site internet"
+
+#: plugins/WebPage.py:1724
+msgid "Target Directory"
+msgstr "Rpertoire cible"
+
+#: plugins/WebPage.py:1909
+msgid "Generates web (HTML) pages for individuals, or a set of individuals."
+msgstr ""
+"Gnration de pages internet (HTML) pour tous les indivdus ou une partie des "
+"individus."
+
 #: plugins/WriteCD.py:60
 msgid "Export to CD"
 msgstr "Exporter sur un CD"
 
-#: plugins/WriteCD.py:102 plugins/WriteCD.py:146 plugins/WriteCD.py:150
-#: plugins/WriteCD.py:162
+#: plugins/WriteCD.py:102 plugins/WriteCD.py:147 plugins/WriteCD.py:151
+#: plugins/WriteCD.py:163
 msgid "CD export preparation failed"
 msgstr "La prparation de l'exportation sur CD a choue"
 
-#: plugins/WriteCD.py:151
+#: plugins/WriteCD.py:152
 msgid "Could not create burn:///%s"
 msgstr "Impossible de crer burn:///%s"
 
-#: plugins/WriteCD.py:163
+#: plugins/WriteCD.py:164
 msgid "Could not create burn:///%s/.thumb"
 msgstr "Impossible de crer burn:///%s/.thumb"
 
-#: plugins/WriteCD.py:304
+#: plugins/WriteCD.py:306
 msgid "Export to CD (p_ortable XML)"
 msgstr "Exporter sur un CD (XML p_ortable)"
 
-#: plugins/WriteCD.py:305
+#: plugins/WriteCD.py:307
 msgid ""
 "Exporting to CD copies all your data and media object files to the CD "
 "Creator. You may later burn the CD with this data, and that copy will be "
@@ -9936,31 +9960,31 @@ msgstr ""
 "CD. Vous pourrez graver le CD plus tard, cette copie tant totalement "
 "compatible entre diffrents ordinateurs et diffrentes architectures."
 
-#: plugins/WriteFtree.py:273
+#: plugins/WriteFtree.py:281
 msgid "_Web Family Tree"
 msgstr "_Web Family Tree"
 
-#: plugins/WriteFtree.py:274
+#: plugins/WriteFtree.py:282
 msgid "Web Family Tree format."
 msgstr "Format Web Family Tree."
 
-#: plugins/WriteFtree.py:275
+#: plugins/WriteFtree.py:283
 msgid "Web Family Tree export options"
 msgstr "Options d'export Web Family Tree"
 
-#: plugins/WriteGeneWeb.py:218
+#: plugins/WriteGeneWeb.py:227
 msgid "No families matched by selected filter"
 msgstr "Pas de famille correspondant au filtre slectionn"
 
-#: plugins/WriteGeneWeb.py:577
+#: plugins/WriteGeneWeb.py:586
 msgid "G_eneWeb"
 msgstr "G_eneWeb"
 
-#: plugins/WriteGeneWeb.py:578
+#: plugins/WriteGeneWeb.py:587
 msgid "GeneWeb is a web based genealogy program."
 msgstr "GeneWeb est un logiciel de gnalogie fonctionnant sur le web."
 
-#: plugins/WriteGeneWeb.py:579
+#: plugins/WriteGeneWeb.py:588
 msgid "GeneWeb export options"
 msgstr "Options d'exportation en format GeneWeb"
 
@@ -10070,7 +10094,8 @@ msgstr "_Nouveau type d'
 
 #: plugins/desbrowse.glade:126
 msgid "Double-click on the row to edit personal information"
-msgstr "Double-cliquer sur la ligne pour diter les informations personnelles"
+msgstr ""
+"Double-cliquer sur la ligne pour diter les informations personnelles"
 
 #: plugins/eval.glade:202
 msgid "Evaluation Window"
@@ -10098,7 +10123,8 @@ msgstr "Enregistrer les donn
 
 #: plugins/eventcmp.glade:118
 msgid "Select file to save OpenOffice.org spreadsheet"
-msgstr "Slectionner une feuille de calcul OpenOffice.org pour sauver les rsultats"
+msgstr ""
+"Slectionner une feuille de calcul OpenOffice.org pour sauver les rsultats"
 
 #: plugins/eventcmp.glade:416
 msgid ""
@@ -10152,7 +10178,7 @@ msgstr ""
 msgid "Select a person to determine the relationship"
 msgstr "Slectionner une personne pour dterminer la parent"
 
-#: plugins/scratchpad.glade:54
+#: plugins/scratchpad.glade:55
 msgid "Clear _All"
 msgstr "Effacer _tout"
 
@@ -10323,4 +10349,3 @@ msgstr "Crit
 #: rule.glade:1186
 msgid "Values"
 msgstr "Valeurs"
-
diff --git a/gramps2/src/po/nb.po b/gramps2/src/po/nb.po
index 1a77defec..6fe0cd90f 100644
--- a/gramps2/src/po/nb.po
+++ b/gramps2/src/po/nb.po
@@ -11,8 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
-"POT-Creation-Date: Wed Jun  1 09:58:59 2005\n"
-"PO-Revision-Date: 2005-06-03 14:23+0200\n"
+"POT-Creation-Date: Thu Jun 23 14:11:42 2005\n"
+"PO-Revision-Date: 2005-06-24 23:33+0200\n"
 "Last-Translator: Frode Jemtland \n"
 "Language-Team: Norsk Bokml\n"
 "MIME-Version: 1.0\n"
@@ -37,17 +37,17 @@ msgstr "Fant ikke den angitte fila."
 msgid "Add Media Object"
 msgstr "Legg til mediaobjekt"
 
-#: AddSpouse.py:115
+#: AddSpouse.py:114
 msgid "Choose Spouse/Partner of %s"
 msgstr "Velg ektefelle/partner til %s"
 
-#: AddSpouse.py:120
+#: AddSpouse.py:119
 msgid "Choose Spouse/Partner"
 msgstr "Velg ektefelle/partner"
 
-#: AddSpouse.py:161 ChooseParents.py:230 EditPerson.py:338 EditSource.py:305
-#: FamilyView.py:74 ImageSelect.py:1102 PeopleView.py:58 PeopleView.py:148
-#: SelectChild.py:124 SelectPerson.py:78 plugins/BookReport.py:631
+#: AddSpouse.py:142 ChooseParents.py:252 EditPerson.py:338 EditSource.py:312
+#: FamilyView.py:74 ImageSelect.py:1104 PeopleView.py:58 PeopleView.py:134
+#: SelectChild.py:129 SelectPerson.py:78 plugins/BookReport.py:631
 #: plugins/FilterEditor.py:459 plugins/IndivComplete.py:405
 #: plugins/IndivSummary.py:226 plugins/PatchNames.py:191 plugins/RelCalc.py:95
 #: plugins/ScratchPad.py:154 plugins/ScratchPad.py:195
@@ -59,64 +59,75 @@ msgstr "Velg ektefelle/partner"
 msgid "Name"
 msgstr "Navn"
 
-#: AddSpouse.py:166 ChooseParents.py:236 EditSource.py:305 FamilyView.py:73
-#: ImageSelect.py:1102 MediaView.py:58 MergePeople.py:107 PeopleView.py:59
-#: PlaceView.py:50 SelectChild.py:129 SelectObject.py:85 SelectPerson.py:84
+#: AddSpouse.py:146 ChooseParents.py:261 EditSource.py:312 FamilyView.py:73
+#: ImageSelect.py:1104 MediaView.py:58 MergePeople.py:107 PeopleView.py:59
+#: PlaceView.py:50 SelectChild.py:134 SelectObject.py:85 SelectPerson.py:84
 #: SourceView.py:52 Sources.py:108 Sources.py:242 Witness.py:64
 #: plugins/PatchNames.py:182 plugins/RelCalc.py:95
 msgid "ID"
 msgstr "ID"
 
-#: AddSpouse.py:171 ChooseParents.py:242 SelectChild.py:134 SelectPerson.py:90
+#: AddSpouse.py:150 ChooseParents.py:271 SelectChild.py:139 SelectPerson.py:90
 msgid "Birth date"
 msgstr "Fdselsdato"
 
-#: AddSpouse.py:254 AddSpouse.py:279
+#: AddSpouse.py:232 AddSpouse.py:257
 msgid "Error adding a spouse"
 msgstr "Klarte ikke  legge til ektefelle"
 
-#: AddSpouse.py:255
+#: AddSpouse.py:233
 msgid "A person cannot be linked as his/her spouse"
 msgstr "En person kan ikke angis som sin egen ektefelle"
 
-#: AddSpouse.py:263
+#: AddSpouse.py:241
 #, fuzzy
 msgid "Spouse is a parent"
 msgstr "Ektefellen er en forelder"
 
-#: AddSpouse.py:264
+#: AddSpouse.py:242
 #, fuzzy
 msgid "The person selected as a spouse is a parent of the active person. Usually, this is a mistake. You may choose either to proceed with adding a spouse, or to return to the Choose Spouse dialog to fix the problem."
-msgstr "Kjnnet til personen er for yeblikket ukjent. Vanligvis er dette en feil. Du kan velge  fortsette lagringen, eller g tilbake til Rediger person-dialogvinduet for  rette opp feilen."
+msgstr "Personen som er valgt til ektefelle er en forelder av den aktive personen. Vanligvis er dette feil. Du kan velge enten  g videre med  legge til ektefellen, eller  g tilbake til Velg ektefelle dialogen for  rette opp feilen."
 
-#: AddSpouse.py:268 AddSpouse.py:289
+#: AddSpouse.py:246 AddSpouse.py:267
 #, fuzzy
 msgid "Proceed with adding"
 msgstr "Fortsett med  legge til"
 
-#: AddSpouse.py:268 AddSpouse.py:289
+#: AddSpouse.py:246 AddSpouse.py:267
 #, fuzzy
 msgid "Return to dialog"
 msgstr "G tilbake til dialogen"
 
-#: AddSpouse.py:280
+#: AddSpouse.py:258
 msgid "The spouse is already present in this family"
 msgstr "Ektefellen er allerede tilstede i denne familien"
 
-#: AddSpouse.py:284
+#: AddSpouse.py:262
 #, fuzzy
 msgid "Spouse is a child"
 msgstr "Ektefellen er et barn"
 
-#: AddSpouse.py:285
+#: AddSpouse.py:263
 #, fuzzy
 msgid "The person selected as a spouse is a child of the active person. Usually, this is a mistake. You may choose either to proceed with adding a spouse, or to return to the Choose Spouse dialog to fix the problem."
-msgstr "Kjnnet til personen er for yeblikket ukjent. Vanligvis er dette en feil. Du kan velge  fortsette lagringen, eller g tilbake til Rediger person-dialogvinduet for  rette opp feilen."
+msgstr "Personen som er valgt til ektefelle er et barn av den aktive personen. Vanligvis er dette feil. Du kan velge enten  g videre med  legge til ektefellen, eller  g tilbake til Velg ektefelle dialogen for  rette opp feilen."
 
-#: AddSpouse.py:315 FamilyView.py:725
+#: AddSpouse.py:293 FamilyView.py:725
 msgid "Add Spouse"
 msgstr "Legg til ektefelle"
 
+#: AddSpouse.py:392 ChooseParents.py:811 GenericFilter.py:132
+#: GenericFilter.py:147 GenericFilter.py:263 GenericFilter.py:277
+#: GenericFilter.py:300 GenericFilter.py:323 GenericFilter.py:338
+#: GenericFilter.py:353 GenericFilter.py:979 GenericFilter.py:1223
+#: GenericFilter.py:1247 GenericFilter.py:1276 GenericFilter.py:1308
+#: GenericFilter.py:1325 GenericFilter.py:1346 GenericFilter.py:1429
+#: GenericFilter.py:1483 GenericFilter.py:1545 GenericFilter.py:1564
+#: GenericFilter.py:1634 GenericFilter.py:1801 SelectChild.py:305
+msgid "General filters"
+msgstr "Generelle filtre"
+
 #: AddrEdit.py:106 AddrEdit.py:174
 msgid "Address Editor"
 msgstr "Adressebehandler"
@@ -169,7 +180,7 @@ msgstr "Egenskapsbehandler for %s"
 msgid "New Attribute"
 msgstr "Ny egenskap"
 
-#: AttrEdit.py:175 EditPerson.py:326 ImageSelect.py:682 ImageSelect.py:952
+#: AttrEdit.py:175 EditPerson.py:326 ImageSelect.py:682 ImageSelect.py:954
 #: Marriage.py:214 plugins/ScratchPad.py:273 plugins/ScratchPad.py:281
 msgid "Attribute"
 msgstr "Egenskap"
@@ -190,71 +201,85 @@ msgstr ""
 msgid "Edit Bookmarks"
 msgstr "Rediger bokmerker"
 
-#: ChooseParents.py:121
+#: ChooseParents.py:129 ChooseParents.py:130
+msgid "Loading..."
+msgstr "Laster inn..."
+
+#: ChooseParents.py:133
 msgid "Choose the Parents of %s"
 msgstr "Velg foreldrene til %s"
 
-#: ChooseParents.py:123 ChooseParents.py:268 ChooseParents.py:510
-#: ChooseParents.py:593
+#: ChooseParents.py:135 ChooseParents.py:300 ChooseParents.py:572
+#: ChooseParents.py:659
 msgid "Choose Parents"
 msgstr "Velg foreldrene"
 
-#: ChooseParents.py:304 ChooseParents.py:648
+#: ChooseParents.py:366 ChooseParents.py:714
 msgid "Par_ent"
 msgstr "For_elder"
 
-#: ChooseParents.py:306
+#: ChooseParents.py:368
 msgid "Fath_er"
 msgstr "F_ar"
 
-#: ChooseParents.py:314 ChooseParents.py:647
+#: ChooseParents.py:376 ChooseParents.py:713
 msgid "Pa_rent"
 msgstr "Fo_relder"
 
-#: ChooseParents.py:316
+#: ChooseParents.py:378
 msgid "Mothe_r"
 msgstr "Mo_r"
 
-#: ChooseParents.py:502 SelectChild.py:287 SelectChild.py:306
+#: ChooseParents.py:564 SelectChild.py:192 SelectChild.py:211
 msgid "Error selecting a child"
 msgstr "Feil ved valg av barn"
 
-#: ChooseParents.py:503
+#: ChooseParents.py:565
 msgid "A person cannot be linked as his/her own parent"
 msgstr "En person kan ikke angis som sin egen forelder"
 
-#: ChooseParents.py:532 ChooseParents.py:545
-#, fuzzy
-msgid "Added person is not visible"
-msgstr "Personen som ble lagt til er ikke synlig"
-
-#: ChooseParents.py:533 ChooseParents.py:546
-#, fuzzy
-msgid "The person you added is currently not visible due to the chosen filter. This may occur if you did not specify a birth date."
-msgstr "Personen du la til er for tiden ikke synlig grunnet det aktive filteret. Dette kan oppst hvis du ikke la til en fdselsdato."
-
-#: ChooseParents.py:623
+#: ChooseParents.py:689
 msgid "Modify the Parents of %s"
 msgstr "Endre foreldrene til %s"
 
-#: ChooseParents.py:624 ChooseParents.py:736
+#: ChooseParents.py:690 ChooseParents.py:802
 msgid "Modify Parents"
 msgstr "Endre foreldre"
 
-#: ChooseParents.py:650 FamilyView.py:1100 MergePeople.py:136
+#: ChooseParents.py:716 FamilyView.py:1112 MergePeople.py:136
 #: plugins/FamilyGroup.py:261 plugins/IndivComplete.py:215
 #: plugins/IndivComplete.py:217 plugins/IndivComplete.py:450
 #: plugins/IndivSummary.py:290 plugins/WebPage.py:340 plugins/WebPage.py:343
 msgid "Mother"
 msgstr "Mor"
 
-#: ChooseParents.py:651 FamilyView.py:1098 MergePeople.py:134
+#: ChooseParents.py:717 FamilyView.py:1110 MergePeople.py:134
 #: plugins/FamilyGroup.py:248 plugins/IndivComplete.py:206
 #: plugins/IndivComplete.py:208 plugins/IndivComplete.py:445
 #: plugins/IndivSummary.py:276 plugins/WebPage.py:339 plugins/WebPage.py:342
 msgid "Father"
 msgstr "Far"
 
+#: ChooseParents.py:834
+#, fuzzy
+msgid "Likely Father"
+msgstr "Sansynlig vis far"
+
+#: ChooseParents.py:835
+#, fuzzy
+msgid "Matches likely fathers"
+msgstr "Samsvarer med mest sansynlige fedre"
+
+#: ChooseParents.py:844
+#, fuzzy
+msgid "Likely Mother"
+msgstr "Sansynlig vis mor"
+
+#: ChooseParents.py:845
+#, fuzzy
+msgid "Matches likely mothers"
+msgstr "Samsvarer med sansynlige mdre"
+
 #: ColumnOrder.py:40
 msgid "Select Columns"
 msgstr "Velg kolonner"
@@ -331,7 +356,7 @@ msgstr "Kalkulert"
 msgid "Date selection"
 msgstr "Datovalg"
 
-#: DateEdit.py:264 gramps_main.py:1154 gramps_main.py:1161
+#: DateEdit.py:264 gramps_main.py:1168 gramps_main.py:1175
 msgid "Could not open help"
 msgstr "Kunne ikke pne hjelpen"
 
@@ -383,7 +408,7 @@ msgstr "Automatisk funnet"
 msgid "Select file _type:"
 msgstr "Velg fil _type:"
 
-#: DbPrompter.py:611 gramps_main.py:1374
+#: DbPrompter.py:611 gramps_main.py:1388
 msgid "All files"
 msgstr "Alle filer"
 
@@ -404,7 +429,7 @@ msgid "GEDCOM files"
 msgstr "GEDCOM-filer"
 
 #: DisplayModels.py:47 GrampsMime.py:46 GrampsMime.py:53 MergePeople.py:50
-#: PeopleModel.py:381 SelectChild.py:245 Utils.py:123 const.py:169
+#: PeopleModel.py:387 Utils.py:118 const.py:169
 #: plugins/DetAncestralReport.py:308 plugins/DetAncestralReport.py:315
 #: plugins/DetDescendantReport.py:330 plugins/DetDescendantReport.py:337
 #: plugins/FamilyGroup.py:458 plugins/IndivComplete.py:281
@@ -412,19 +437,19 @@ msgstr "GEDCOM-filer"
 msgid "unknown"
 msgstr "ukjent"
 
-#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:381 SelectChild.py:241
-#: const.py:167 plugins/RelCalc.py:111
+#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:387 const.py:167
+#: plugins/RelCalc.py:111
 msgid "male"
 msgstr "mann"
 
-#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:381 SelectChild.py:243
-#: const.py:168 plugins/RelCalc.py:113
+#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:387 const.py:168
+#: plugins/RelCalc.py:113
 msgid "female"
 msgstr "kvinne"
 
-#: DisplayModels.py:468 ImageSelect.py:981 MediaView.py:243 NoteEdit.py:104
-#: Utils.py:160 gramps.glade:5208 gramps.glade:15342 gramps.glade:25747
-#: gramps.glade:26749 gramps.glade:28117 gramps.glade:29548
+#: DisplayModels.py:468 ImageSelect.py:983 MediaView.py:243 NoteEdit.py:104
+#: Utils.py:155 gramps.glade:5501 gramps.glade:16531 gramps.glade:27709
+#: gramps.glade:28757 gramps.glade:30210 gramps.glade:31740
 msgid "Note"
 msgstr "Kommentar"
 
@@ -446,7 +471,7 @@ msgstr ""
 msgid "Internal Error"
 msgstr "Intern feil"
 
-#: EditPerson.py:132 EditPerson.py:634
+#: EditPerson.py:132 EditPerson.py:635
 msgid "Edit Person"
 msgstr "Rediger person"
 
@@ -454,12 +479,12 @@ msgstr "Rediger person"
 msgid "Patronymic:"
 msgstr "Avstamningsnavn:"
 
-#: EditPerson.py:306 EditSource.py:325 EventEdit.py:278 ImageSelect.py:1123
+#: EditPerson.py:306 EditSource.py:332 EventEdit.py:278 ImageSelect.py:1125
 #: Marriage.py:213 plugins/ScratchPad.py:166 plugins/ScratchPad.py:180
 msgid "Event"
 msgstr "Hendelse"
 
-#: EditPerson.py:307 EditPerson.py:344 EditPlace.py:130 const.py:435
+#: EditPerson.py:307 EditPerson.py:344 EditPlace.py:131 const.py:435
 #: plugins/ScratchPad.py:185 plugins/ScratchPad.py:227
 #: plugins/ScratchPad.py:262
 msgid "Description"
@@ -471,21 +496,21 @@ msgstr "Beskrivelse"
 msgid "Date"
 msgstr "Dato"
 
-#: EditPerson.py:309 EditPlace.py:271 EditSource.py:331 ImageSelect.py:1129
-#: Marriage.py:213 gramps.glade:12208 plugins/ScratchPad.py:183
+#: EditPerson.py:309 EditPlace.py:289 EditSource.py:338 ImageSelect.py:1131
+#: Marriage.py:213 gramps.glade:13109 plugins/ScratchPad.py:183
 #: plugins/ScratchPad.py:225
 msgid "Place"
 msgstr "Sted"
 
-#: EditPerson.py:326 EditSource.py:156 ImageSelect.py:682 ImageSelect.py:952
-#: Marriage.py:214 gramps.glade:12727 plugins/FilterEditor.py:459
+#: EditPerson.py:326 EditSource.py:160 ImageSelect.py:682 ImageSelect.py:954
+#: Marriage.py:214 gramps.glade:13691 plugins/FilterEditor.py:459
 #: plugins/PatchNames.py:188 plugins/ScratchPad.py:284
 #: plugins/ScratchPad.py:317 plugins/ScratchPad.py:543
 #: plugins/ScratchPad.py:549
 msgid "Value"
 msgstr "Verdi"
 
-#: EditPerson.py:338 EditSource.py:305 ImageSelect.py:1102 MediaView.py:59
+#: EditPerson.py:338 EditSource.py:312 ImageSelect.py:1104 MediaView.py:59
 #: MergePeople.py:152 SelectObject.py:86 plugins/BookReport.py:631
 #: plugins/BookReport.py:632 plugins/PatchNames.py:185
 #: plugins/ScratchPad.py:181 plugins/ScratchPad.py:223
@@ -495,83 +520,83 @@ msgstr "Verdi"
 msgid "Type"
 msgstr "Type"
 
-#: EditPerson.py:344 EditPlace.py:129 MediaView.py:60
+#: EditPerson.py:344 EditPlace.py:130 MediaView.py:60
 #: plugins/ScratchPad.py:260
 msgid "Path"
 msgstr "Sti"
 
-#: EditPerson.py:566 ImageSelect.py:610 ImageSelect.py:1037 MediaView.py:275
+#: EditPerson.py:567 ImageSelect.py:610 ImageSelect.py:1041 MediaView.py:275
 #: plugins/ScratchPad.py:424 plugins/ScratchPad.py:432
 msgid "Media Object"
 msgstr "Mediaobjekt"
 
-#: EditPerson.py:572 ImageSelect.py:616 docgen/AbiWord2Doc.py:327
+#: EditPerson.py:573 ImageSelect.py:616 docgen/AbiWord2Doc.py:335
 #: docgen/AsciiDoc.py:371 docgen/HtmlDoc.py:486 docgen/KwordDoc.py:494
 #: docgen/PdfDoc.py:631 docgen/RTFDoc.py:427
 msgid "Open in %s"
 msgstr "pne i %s"
 
-#: EditPerson.py:575 ImageSelect.py:619 MediaView.py:288
+#: EditPerson.py:576 ImageSelect.py:619 MediaView.py:288
 msgid "Edit with the GIMP"
 msgstr "Rediger med GIMP"
 
-#: EditPerson.py:577 ImageSelect.py:621
+#: EditPerson.py:578 ImageSelect.py:621
 msgid "Edit Object Properties"
 msgstr "Rediger objekt-egenskapene"
 
-#: EditPerson.py:628
+#: EditPerson.py:629
 msgid "New Person"
 msgstr "Ny person"
 
-#: EditPerson.py:753 GrampsCfg.py:63 const.py:233 const.py:246
+#: EditPerson.py:754 GrampsCfg.py:63 const.py:233 const.py:246
 msgid "None"
 msgstr "Ingen"
 
-#: EditPerson.py:1290
+#: EditPerson.py:1291
 msgid "Save changes to %s?"
 msgstr "Lagre endringene i %s?"
 
-#: EditPerson.py:1291 EditPerson.py:1307 Marriage.py:622 Marriage.py:635
+#: EditPerson.py:1292 EditPerson.py:1308 Marriage.py:622 Marriage.py:635
 msgid "If you close without saving, the changes you have made will be lost"
 msgstr "Hvis du lukker uten  lagre, vil dine endringer g tapt"
 
-#: EditPerson.py:1306
+#: EditPerson.py:1307
 msgid "Save Changes to %s?"
 msgstr "Lagre endringene i %s?"
 
-#: EditPerson.py:1652
+#: EditPerson.py:1653
 msgid "Make the selected name the preferred name"
 msgstr "Gjr det valgte navnet til det foretrukne"
 
-#: EditPerson.py:1696
+#: EditPerson.py:1697
 msgid "Unknown gender specified"
 msgstr "Det angitte kjnnet er ukjent"
 
-#: EditPerson.py:1697
+#: EditPerson.py:1698
 msgid "The gender of the person is currently unknown. Usually, this is a mistake. You may choose to either continue saving, or returning to the Edit Person dialog to fix the problem."
 msgstr "Kjnnet til personen er for yeblikket ukjent. Vanligvis er dette en feil. Du kan velge  fortsette lagringen, eller g tilbake til Rediger person-dialogvinduet for  rette opp feilen."
 
-#: EditPerson.py:1701
+#: EditPerson.py:1702
 msgid "Continue saving"
 msgstr "Fortsette  lagre"
 
-#: EditPerson.py:1701
+#: EditPerson.py:1702
 msgid "Return to window"
 msgstr "G tilbake til vindu"
 
-#: EditPerson.py:1729 Marriage.py:654
+#: EditPerson.py:1730 Marriage.py:654
 msgid "GRAMPS ID value was not changed."
 msgstr "GRAMPS ID-verdi ble ikke endret."
 
-#: EditPerson.py:1730
+#: EditPerson.py:1731
 msgid "You have attempted to change the GRAMPS ID to a value of %(grampsid)s. This value is already used by %(person)s."
 msgstr "Du har prvd  forandre GRAMPS ID-en til verdien %(grampsid)s. Denne verdien er allerede i bruk av %(person)s."
 
-#: EditPerson.py:1842
+#: EditPerson.py:1843
 msgid "Problem changing the gender"
 msgstr "Problem med  endre kjnn"
 
-#: EditPerson.py:1843
+#: EditPerson.py:1844
 msgid ""
 "Changing the gender caused problems with marriage information.\n"
 "Please check the person's marriages."
@@ -579,96 +604,106 @@ msgstr ""
 "Endring av kjnn frte til problemer med informasjonen om ekteskapet.\n"
 "Sjekk personens gifteml."
 
-#: EditPerson.py:1886
+#: EditPerson.py:1887
 msgid "Edit Person (%s)"
 msgstr "Rediger person (%s)"
 
-#: EditPerson.py:1902 ImageSelect.py:1162
+#: EditPerson.py:1903 ImageSelect.py:1165
 msgid "Add Place (%s)"
 msgstr "Legg til sted (%s)"
 
-#: EditPlace.py:90 EditPlace.py:277
+#: EditPlace.py:91 EditPlace.py:295
 msgid "Place Editor"
 msgstr "Stedsbehandler"
 
-#: EditPlace.py:149 PlaceView.py:53
+#: EditPlace.py:150 PlaceView.py:53
 msgid "City"
 msgstr "By"
 
-#: EditPlace.py:149 PlaceView.py:54
+#: EditPlace.py:150 PlaceView.py:54
 msgid "County"
 msgstr "Fylke"
 
-#: EditPlace.py:150 PlaceView.py:55
+#: EditPlace.py:151 PlaceView.py:55
 msgid "State"
 msgstr "Stat"
 
-#: EditPlace.py:150 PlaceView.py:56
+#: EditPlace.py:151 PlaceView.py:56
 msgid "Country"
 msgstr "Land"
 
-#: EditPlace.py:266 EditPlace.py:270
+#: EditPlace.py:284 EditPlace.py:288
 msgid "New Place"
 msgstr "Nytt sted"
 
-#: EditPlace.py:400
+#: EditPlace.py:391
+#, fuzzy
+msgid "Place title is already in use"
+msgstr "Steds titel er allerede i bruk"
+
+#: EditPlace.py:392
+#, fuzzy
+msgid "Each place must have a unique title, and title you have selected is already used by another place"
+msgstr "Hvert sted m ha en unik titel, og titelen du har valgt er allerede i bruk til et annet sted"
+
+#: EditPlace.py:427
 msgid "Edit Place (%s)"
 msgstr "Rediger sted (%s)"
 
-#: EditPlace.py:518
+#: EditPlace.py:546
 msgid "People"
 msgstr "Personer"
 
-#: EditPlace.py:520 EditPlace.py:529
+#: EditPlace.py:548 EditPlace.py:557
 msgid "%s [%s]: event %s\n"
 msgstr "%s [%s] hendelse %s\n"
 
-#: EditPlace.py:527
+#: EditPlace.py:555
 msgid "Families"
 msgstr "Familier"
 
-#: EditPlace.py:535 Utils.py:115
+#: EditPlace.py:563 Utils.py:110
 msgid "%(father)s and %(mother)s"
 msgstr "%(father)s og %(mother)s"
 
-#: EditPlace.py:605 PlaceView.py:221
+#: EditPlace.py:633 PlaceView.py:224
 msgid "Delete Place (%s)"
 msgstr "Slett sted (%s)"
 
-#: EditSource.py:86 EditSource.py:242
+#: EditSource.py:90 EditSource.py:249
 msgid "Source Editor"
 msgstr "Kildebehandler"
 
-#: EditSource.py:156
+#: EditSource.py:160
 msgid "Key"
 msgstr "Tast"
 
-#: EditSource.py:231 EditSource.py:235 Sources.py:451 Sources.py:453
+#: EditSource.py:238 EditSource.py:242 Sources.py:451 Sources.py:453
 msgid "New Source"
 msgstr "Ny kilde"
 
-#: EditSource.py:236 EditSource.py:337 ImageSelect.py:1135 Utils.py:165
-#: Utils.py:167
+#: EditSource.py:243 EditSource.py:344 ImageSelect.py:1137 Utils.py:160
+#: Utils.py:162
 msgid "Source"
 msgstr "Kilde"
 
-#: EditSource.py:313 ImageSelect.py:1111 plugins/EventCmp.py:408
+#: EditSource.py:320 ImageSelect.py:1113 plugins/EventCmp.py:408
 msgid "Person"
 msgstr "Person"
 
-#: EditSource.py:319 ImageSelect.py:1117
+#: EditSource.py:326 ImageSelect.py:1119
 msgid "Family"
 msgstr "Familie"
 
-#: EditSource.py:343
+#: EditSource.py:350
 msgid "Media"
 msgstr "Media"
 
-#: EditSource.py:397
+#: EditSource.py:404
 msgid "Edit Source (%s)"
 msgstr "Rediger kilde (%s)"
 
-#: EditSource.py:463
+#: EditSource.py:471
 msgid "Delete Source (%s)"
 msgstr "Slett kilde (%s)"
 
@@ -858,22 +893,22 @@ msgstr "D
 
 #: FamilyView.py:395 FamilyView.py:405 FamilyView.py:426 FamilyView.py:433
 #: FamilyView.py:465 FamilyView.py:530 FamilyView.py:536 FamilyView.py:606
-#: FamilyView.py:612 FamilyView.py:1173 FamilyView.py:1179 FamilyView.py:1212
-#: FamilyView.py:1218 PedView.py:561 PedView.py:570 PeopleView.py:308
-#: gramps.glade:821 gramps_main.py:659
+#: FamilyView.py:612 FamilyView.py:1176 FamilyView.py:1182 FamilyView.py:1215
+#: FamilyView.py:1221 PedView.py:564 PedView.py:573 PeopleView.py:301
+#: gramps.glade:822 gramps_main.py:659
 msgid "Home"
 msgstr "Hjem"
 
-#: FamilyView.py:396 PeopleView.py:291
+#: FamilyView.py:396 PeopleView.py:284
 msgid "Add Bookmark"
 msgstr "Legg til bokmerke"
 
 #: FamilyView.py:399 FamilyView.py:429 FamilyView.py:458 FamilyView.py:489
-#: PedView.py:584 PedView.py:595 PeopleView.py:304
+#: PedView.py:587 PedView.py:598 PeopleView.py:297
 msgid "People Menu"
 msgstr "Personmeny"
 
-#: FamilyView.py:454 FamilyView.py:486 FamilyView.py:1192 FamilyView.py:1231
+#: FamilyView.py:454 FamilyView.py:486 FamilyView.py:1195 FamilyView.py:1234
 msgid "Add parents"
 msgstr "Legg til foreldre"
 
@@ -885,7 +920,7 @@ msgstr "Barnemeny"
 msgid "Make the selected child an active person"
 msgstr "Gjr det valgte barnet til en aktiv person"
 
-#: FamilyView.py:548 FamilyView.py:1191 FamilyView.py:1230
+#: FamilyView.py:548 FamilyView.py:1194 FamilyView.py:1233
 msgid "Edit the child/parent relationships"
 msgstr "Rediger barn/foreldre-relasjonene"
 
@@ -929,47 +964,47 @@ msgstr "Sett foretrukket ektefelle (%s)"
 msgid "Modify family"
 msgstr "Rediger familie"
 
-#: FamilyView.py:800 FamilyView.py:1445 SelectChild.py:85 SelectChild.py:148
+#: FamilyView.py:800 FamilyView.py:1448 SelectChild.py:88 SelectChild.py:153
 msgid "Add Child to Family"
 msgstr "Legg til et barn i en familie"
 
-#: FamilyView.py:839
+#: FamilyView.py:854
 msgid "Remove Child (%s)"
 msgstr "Fjern barn (%s)"
 
-#: FamilyView.py:845
+#: FamilyView.py:862
 msgid "Remove %s as a spouse of %s?"
 msgstr "Fjern %s som ektefelle av %s?"
 
-#: FamilyView.py:846
+#: FamilyView.py:863
 msgid "Removing a spouse removes the relationship between the spouse and the active person. It does not remove the spouse from the database"
 msgstr " fjerne ektefellen vil fjerne relasjonen mellom ektefellen og den aktive personen. Ektefellen blir ikke fjernet fra databasen."
 
-#: FamilyView.py:849
+#: FamilyView.py:866
 msgid "_Remove Spouse"
 msgstr "Fje_rn ektefelle"
 
-#: FamilyView.py:893
+#: FamilyView.py:905
 msgid "Remove Spouse (%s)"
 msgstr "Fjern ektefelle (%s)"
 
-#: FamilyView.py:934
+#: FamilyView.py:946
 msgid "Select Parents (%s)"
 msgstr "Velg foreldre (%s)"
 
-#: FamilyView.py:1049
+#: FamilyView.py:1061
 msgid ""
 msgstr ""
 
-#: FamilyView.py:1066
+#: FamilyView.py:1078
 msgid "Database corruption detected"
 msgstr "delagt database ble oppdaget"
 
-#: FamilyView.py:1067
+#: FamilyView.py:1079
 msgid "A problem was detected with the database. Please run the Check and Repair Database tool to fix the problem."
 msgstr "Det ble oppdaget et problem med databasen. Kjr Sjekk og reparer databsen-verktyet for  ordne problemet."
 
-#: FamilyView.py:1118
+#: FamilyView.py:1130
 msgid ""
 "%s: %s [%s]\n"
 "\tRelationship: %s"
@@ -977,105 +1012,96 @@ msgstr ""
 "%s: %s [%s]\n"
 "\tRelasjon: %s"
 
-#: FamilyView.py:1120
+#: FamilyView.py:1132
 msgid "%s: unknown"
 msgstr "%s: ukjent"
 
-#: FamilyView.py:1164
+#: FamilyView.py:1167
 msgid "Parents Menu"
 msgstr "Foreldremeny"
 
-#: FamilyView.py:1190 FamilyView.py:1229
+#: FamilyView.py:1193 FamilyView.py:1232
 msgid "Make the selected parents the active family"
 msgstr "Gjr de valgte foreldrene til den aktive familien"
 
-#: FamilyView.py:1193 FamilyView.py:1232
+#: FamilyView.py:1196 FamilyView.py:1235
 msgid "Remove parents"
 msgstr "Fjern foreldrene"
 
-#: FamilyView.py:1203
+#: FamilyView.py:1206
 msgid "Spouse Parents Menu"
 msgstr "Ektefelle/foreldre-meny"
 
-#: FamilyView.py:1295 FamilyView.py:1310
+#: FamilyView.py:1298 FamilyView.py:1313
 msgid "Remove Parents of %s"
 msgstr "Fjern foreldrene til %s"
 
-#: FamilyView.py:1296 FamilyView.py:1311
+#: FamilyView.py:1299 FamilyView.py:1314
 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 " fjerne foreldrene til en person vil fjerne personen som barn av foreldrene. Foreldrene blir ikke fjernet fra databasen, og relasjonen mellom foreldrene blir ikke forandret."
 
-#: FamilyView.py:1300 FamilyView.py:1315
+#: FamilyView.py:1303 FamilyView.py:1318
 msgid "_Remove Parents"
 msgstr "Fje_rne foreldre"
 
-#: FamilyView.py:1408
+#: FamilyView.py:1411
 msgid "Remove Parents (%s)"
 msgstr "Fjern foreldre (%s)"
 
-#: FamilyView.py:1480
+#: FamilyView.py:1483
 msgid "Attempt to Reorder Children Failed"
 msgstr "Klarte ikke  omsortere barna"
 
-#: FamilyView.py:1481
+#: FamilyView.py:1484
 msgid "Children must be ordered by their birth dates."
 msgstr "Barn m sorteres etter fdselsdato."
 
-#: FamilyView.py:1486
+#: FamilyView.py:1489
 msgid "Reorder children"
 msgstr "Omsortere barna"
 
-#: FamilyView.py:1520
+#: FamilyView.py:1523
 msgid "Reorder spouses"
 msgstr "Omsortere ektefeller"
 
-#: GenericFilter.py:90
+#: GenericFilter.py:91
 msgid "Miscellaneous filters"
 msgstr "Diverse filtre"
 
-#: GenericFilter.py:91 rule.glade:1165
+#: GenericFilter.py:92 rule.glade:1165
 msgid "No description"
 msgstr "Ingen beskrivelse"
 
-#: GenericFilter.py:130
+#: GenericFilter.py:131
 msgid "Everyone"
 msgstr "Enhver"
 
-#: GenericFilter.py:131 GenericFilter.py:146 GenericFilter.py:263
-#: GenericFilter.py:277 GenericFilter.py:295 GenericFilter.py:312
-#: GenericFilter.py:327 GenericFilter.py:342 GenericFilter.py:969
-#: GenericFilter.py:1218 GenericFilter.py:1243 GenericFilter.py:1273
-#: GenericFilter.py:1306 GenericFilter.py:1324 GenericFilter.py:1346
-#: GenericFilter.py:1431 GenericFilter.py:1489 GenericFilter.py:1554
-#: GenericFilter.py:1574 GenericFilter.py:1645 GenericFilter.py:1810
-msgid "General filters"
-msgstr "Generelle filtre"
-
-#: GenericFilter.py:132
+#: GenericFilter.py:133
+#, fuzzy
 msgid "Matches everyone in the database"
-msgstr "Gjelder alle i databasen"
+msgstr "Samsvarer med alle i databasen"
 
-#: GenericFilter.py:145
+#: GenericFilter.py:146
 msgid "Disconnected people"
 msgstr "Slektslse personer"
 
-#: GenericFilter.py:147
+#: GenericFilter.py:148
 #, fuzzy
 msgid "Matches people that have no family relationships to any other person in the database"
-msgstr "Gjelder personer som ikke er beslektet med noan andre i databasen"
+msgstr "Samsvarer med personer som ikke er beslektet med noan andre i databasen"
 
-#: GenericFilter.py:164 GenericFilter.py:260 GenericFilter.py:357
-#: GenericFilter.py:448 GenericFilter.py:492 GenericFilter.py:614
-#: GenericFilter.py:661 GenericFilter.py:759 GenericFilter.py:811
-#: GenericFilter.py:898 gramps.glade:3363 gramps.glade:19187
-#: gramps.glade:21375 gramps.glade:22772 plugins/FilterEditor.py:680
+#: GenericFilter.py:164 GenericFilter.py:260 GenericFilter.py:368
+#: GenericFilter.py:459 GenericFilter.py:502 GenericFilter.py:623
+#: GenericFilter.py:670 GenericFilter.py:768 GenericFilter.py:820
+#: GenericFilter.py:907 gramps.glade:3521 gramps.glade:20666
+#: gramps.glade:23027 gramps.glade:24539 plugins/FilterEditor.py:680
 msgid "ID:"
 msgstr "ID:"
 
 #: GenericFilter.py:165
 #, fuzzy
 msgid "Relationship path between "
-msgstr "Relasjonslinje mellem "
+msgstr "Relasjonslinje mellom "
 
 #: GenericFilter.py:166
 msgid "Relationship filters"
@@ -1084,7 +1110,7 @@ msgstr "Relasjonsfiltere"
 #: GenericFilter.py:167
 #, fuzzy
 msgid "Matches the ancestors of two persons back to a common ancestor, producing the relationship path between two persons."
-msgstr "Gjelder for anene til to personer tilbake til en felles forfar. Dette gir relasjonslinja for et slektskap mellom to personer."
+msgstr "Samsvarer med to personers aner, tilbake til en felles ane. Dette gir relasjonslinje for et slektskap mellom to personer."
 
 #: GenericFilter.py:261
 #, fuzzy
@@ -1094,7 +1120,7 @@ msgstr "Personer med "
 #: GenericFilter.py:262
 #, fuzzy
 msgid "Matches people with a specified GRAMPS ID"
-msgstr "Gjelder personen med en spesifisert GRAMPS ID"
+msgstr "Samsvarer med personen med en spesifikk GRAMPS ID"
 
 #: GenericFilter.py:276
 #, fuzzy
@@ -1102,402 +1128,412 @@ msgid "Default person"
 msgstr "Standardperson"
 
 #: GenericFilter.py:278
+#, fuzzy
 msgid "Matches the default person"
-msgstr "Gjelder standardpersonen"
+msgstr "Samsvarer med standardpersonen"
 
-#: GenericFilter.py:294
+#: GenericFilter.py:299
 #, fuzzy
 msgid "Bookmarked people"
 msgstr "Personer med bokmerke"
 
-#: GenericFilter.py:296
+#: GenericFilter.py:301
+#, fuzzy
 msgid "Matches the people on the bookmark list"
-msgstr "Gjelder personer i lista over bokmerker"
+msgstr "Samsvarer med alle personer som er bokmerker"
 
-#: GenericFilter.py:311
+#: GenericFilter.py:322
 #, fuzzy
 msgid "People with complete records"
 msgstr "Personer med fullstendige opplysninger"
 
-#: GenericFilter.py:313
+#: GenericFilter.py:324
+#, fuzzy
 msgid "Matches all people whose records are complete"
-msgstr "Gjelder alle personer med komplett informasjon"
+msgstr "Samsvarer med alle personer med komplett informasjon"
 
-#: GenericFilter.py:326 gramps_main.py:957 plugins/Summary.py:113
+#: GenericFilter.py:337 gramps_main.py:957 plugins/Summary.py:113
 msgid "Females"
 msgstr "Kvinner"
 
-#: GenericFilter.py:328
+#: GenericFilter.py:339
+#, fuzzy
 msgid "Matches all females"
-msgstr "Gjelder alle kvinner"
+msgstr "Samsvarer med alle kvinner"
 
-#: GenericFilter.py:341 gramps_main.py:967
+#: GenericFilter.py:352 gramps_main.py:967
 #, fuzzy
 msgid "People with unknown gender"
 msgstr "Personer med ukjent kjnn"
 
-#: GenericFilter.py:343
+#: GenericFilter.py:354
 #, fuzzy
 msgid "Matches all people with unknown gender"
-msgstr "Gjelder alle personer med ukjent kjnn"
+msgstr "Samsvarer med alle personer med ukjent kjnn"
 
-#: GenericFilter.py:357 GenericFilter.py:406 GenericFilter.py:661
-#: GenericFilter.py:716 plugins/FilterEditor.py:692
+#: GenericFilter.py:368 GenericFilter.py:416 GenericFilter.py:670
+#: GenericFilter.py:724 plugins/FilterEditor.py:692
 msgid "Inclusive:"
 msgstr "Inkludert:"
 
-#: GenericFilter.py:358
+#: GenericFilter.py:369
 #, fuzzy
 msgid "Descendants of "
 msgstr "Etterkommere av "
 
-#: GenericFilter.py:359 GenericFilter.py:408 GenericFilter.py:450
-#: GenericFilter.py:494 GenericFilter.py:616
+#: GenericFilter.py:370 GenericFilter.py:418 GenericFilter.py:461
+#: GenericFilter.py:504 GenericFilter.py:625
 msgid "Descendant filters"
 msgstr "Filtere for etterkommere"
 
-#: GenericFilter.py:360
+#: GenericFilter.py:371
+#, fuzzy
 msgid "Matches all descendants for the specified person"
-msgstr "Gjelder alle etterkommerne til den valgte personen"
+msgstr "Samsvarer med alle etterkommerne til den valgte personen"
 
-#: GenericFilter.py:406 GenericFilter.py:535 GenericFilter.py:573
-#: GenericFilter.py:716 GenericFilter.py:861 GenericFilter.py:941
+#: GenericFilter.py:416 GenericFilter.py:544 GenericFilter.py:582
+#: GenericFilter.py:724 GenericFilter.py:870 GenericFilter.py:951
 #: GenericFilter.py:1343 GenericFilter.py:1386 plugins/FilterEditor.py:684
 msgid "Filter name:"
 msgstr "Filternavn:"
 
-#: GenericFilter.py:407
+#: GenericFilter.py:417
 #, fuzzy
 msgid "Descendants of  match"
 msgstr "Etterkommer av  filtersk"
 
-#: GenericFilter.py:409
+#: GenericFilter.py:419
 #, fuzzy
 msgid "Matches people that are descendants of anybody matched by a filter"
-msgstr "Gjelder personer som er etterkommere av noen som er funnet ved hjelp av et filter."
+msgstr "Samsvarer med personer som er etterkommere av noen som samsvarer med et filter."
 
-#: GenericFilter.py:448 GenericFilter.py:492 GenericFilter.py:759
-#: GenericFilter.py:811 plugins/FilterEditor.py:678
+#: GenericFilter.py:459 GenericFilter.py:502 GenericFilter.py:768
+#: GenericFilter.py:820 plugins/FilterEditor.py:678
 msgid "Number of generations:"
 msgstr "Antall generasjoner:"
 
-#: GenericFilter.py:449
+#: GenericFilter.py:460
 #, fuzzy
 msgid "Descendants of  not more than  generations away"
-msgstr "Etterkommer av  som ikke er mer enn N generasjoner unna"
+msgstr "Etterkommer av , ikke er mer enn  generasjoner unna"
 
-#: GenericFilter.py:451
+#: GenericFilter.py:462
+#, fuzzy
 msgid "Matches people that are descendants of a specified person not more than N generations away"
-msgstr "Gjelder personer som er etterkommere av en bestemt person ikke mer enn N antall generasjoner unna"
+msgstr "Samsvarer med personer som er etterkommere av en bestemt person ikke mer enn N antall generasjoner unna"
 
-#: GenericFilter.py:493
+#: GenericFilter.py:503
 #, fuzzy
 msgid "Descendants of  at least  generations away"
 msgstr "Etterkommer av , minst  generasjoner unna"
 
-#: GenericFilter.py:495
+#: GenericFilter.py:505
+#, fuzzy
 msgid "Matches people that are descendants of a specified person at least N generations away"
-msgstr "Gjelder de som er etterkommere av en bestemt person minst N generasjoner unna"
+msgstr "Samsvarer med de som er etterkommere av en bestemt person minst N generasjoner unna"
 
-#: GenericFilter.py:536
+#: GenericFilter.py:545
 #, fuzzy
 msgid "Children of  match"
 msgstr "Barn av  filtersk"
 
-#: GenericFilter.py:537 GenericFilter.py:575 GenericFilter.py:863
-#: GenericFilter.py:1088 GenericFilter.py:1389 GenericFilter.py:1413
-#: GenericFilter.py:1445 GenericFilter.py:1461 GenericFilter.py:1475
+#: GenericFilter.py:546 GenericFilter.py:584 GenericFilter.py:872
+#: GenericFilter.py:1096 GenericFilter.py:1389 GenericFilter.py:1412
+#: GenericFilter.py:1442 GenericFilter.py:1457 GenericFilter.py:1470
 msgid "Family filters"
 msgstr "Familie-filtere"
 
-#: GenericFilter.py:538
+#: GenericFilter.py:547
 #, fuzzy
 msgid "Matches children of anybody matched by a filter"
-msgstr "Gjelder barn av en person som er funnet ved et filter"
+msgstr "Samsvarer med barn av en person som er funnet ved et filter"
 
-#: GenericFilter.py:574
+#: GenericFilter.py:583
 #, fuzzy
 msgid "Siblings of  match"
-msgstr "Er et ssken av  filtersk"
+msgstr "Ssken av  filtersk"
 
-#: GenericFilter.py:576
+#: GenericFilter.py:585
 #, fuzzy
 msgid "Matches siblings of anybody matched by a filter"
-msgstr "Gjelder ssken av noen som er funnet ved et filter"
+msgstr "Samsvarer med ssken av noen som er funnet ved et filter"
 
-#: GenericFilter.py:615
+#: GenericFilter.py:624
 #, fuzzy
 msgid "Descendant family members of "
 msgstr "Etterkommende familiemedlem av "
 
-#: GenericFilter.py:617
+#: GenericFilter.py:626
+#, fuzzy
 msgid "Matches people that are descendants or the spouse of a descendant of a specified person"
-msgstr "Gjelder personer som er etterkommere, eller ektefellen til en etterkommer, av en bestemt person"
+msgstr "Samsvarer med personer som er etterkommere, eller ektefellen til en etterkommer, av en bestemt person"
 
-#: GenericFilter.py:662
+#: GenericFilter.py:671
 #, fuzzy
 msgid "Ancestors of "
 msgstr "Ane av "
 
-#: GenericFilter.py:663 GenericFilter.py:718 GenericFilter.py:761
-#: GenericFilter.py:813 GenericFilter.py:900 GenericFilter.py:945
+#: GenericFilter.py:672 GenericFilter.py:726 GenericFilter.py:770
+#: GenericFilter.py:822 GenericFilter.py:909 GenericFilter.py:955
 #, fuzzy
 msgid "Ancestral filters"
 msgstr "Anefiltre"
 
-#: GenericFilter.py:664
+#: GenericFilter.py:673
 #, fuzzy
 msgid "Matches people that are ancestors of a specified person"
-msgstr "Gjelder personer som er aner til en bestemt person"
+msgstr "Samsvarer med personer som er aner til en bestemt person"
 
 # <
-#: GenericFilter.py:717
+#: GenericFilter.py:725
 #, fuzzy
 msgid "Ancestors of  match"
 msgstr "Ane av  filtersk"
 
-#: GenericFilter.py:719
+#: GenericFilter.py:727
+#, fuzzy
 msgid "Matches people that are ancestors of anybody matched by a filter"
-msgstr "Gjelder anene av noen som er funnet ved et filter"
+msgstr "Samsvarer med anene av noen som er funnet ved et filter"
 
-#: GenericFilter.py:760
+#: GenericFilter.py:769
 #, fuzzy
 msgid "Ancestors of  not more than  generations away"
 msgstr "Ane av , ikke mer enn  generasjoner unna"
 
-#: GenericFilter.py:762
+#: GenericFilter.py:771
 #, fuzzy
 msgid "Matches people that are ancestors of a specified person not more than N generations away"
-msgstr "Gjelder personer som er aner av en bestemt person ikke mer enn N generasjoner unna"
+msgstr "Samsvarer med personer som er aner av en bestemt person ikke mer enn N generasjoner unna"
 
-#: GenericFilter.py:812
+#: GenericFilter.py:821
 #, fuzzy
 msgid "Ancestors of  at least  generations away"
 msgstr "Ane av , minst  generasjoner unna"
 
-#: GenericFilter.py:814
+#: GenericFilter.py:823
 #, fuzzy
 msgid "Matches people that are ancestors of a specified person at least N generations away"
-msgstr "Gjelder personer som er aner av en bestemt person minst N generasjoner unna"
+msgstr "Samsvarer med personer som er aner av en bestemt person minst N generasjoner unna"
 
-#: GenericFilter.py:862
+#: GenericFilter.py:871
 #, fuzzy
 msgid "Parents of  match"
 msgstr "Forelder av  filtersk"
 
-#: GenericFilter.py:864
+#: GenericFilter.py:873
 #, fuzzy
 msgid "Matches parents of anybody matched by a filter"
-msgstr "Gjelder personer som er aner av noen som er funnet ved hjelp av et filter"
+msgstr "Samsvare med personer som er aner av noen som samsvarer med et filter"
 
-#: GenericFilter.py:899
+#: GenericFilter.py:908
 #, fuzzy
 msgid "People with a common ancestor with "
 msgstr "Personer med samme aner som "
 
-#: GenericFilter.py:901
+#: GenericFilter.py:910
+#, fuzzy
 msgid "Matches people that have a common ancestor with a specified person"
-msgstr "Gjelder personer som har en felles forfader med en bestemt person"
+msgstr "Samsvarer med personer som har en felles ane med en bestemt person"
 
-#: GenericFilter.py:942
+#: GenericFilter.py:952
 #, fuzzy
 msgid "People with a common ancestor with  match"
-msgstr "Personer som har en felles stamfar med  filtersk"
+msgstr "Personer som har en ane felles med  filtersk"
 
-#: GenericFilter.py:943
+#: GenericFilter.py:953
 #, fuzzy
 msgid "Matches people that have a common ancestor with anybody matched by a filter"
-msgstr "Gjelder personer som har en felles forfader med noen som er funnet ved hjelp av et filter"
+msgstr "Samsvarer med personer som har en felles ane med noen som samsvarer med et filter"
 
-#: GenericFilter.py:968 gramps_main.py:962 plugins/Summary.py:112
+#: GenericFilter.py:978 gramps_main.py:962 plugins/Summary.py:112
 msgid "Males"
 msgstr "Menn"
 
-#: GenericFilter.py:970
+#: GenericFilter.py:980
 msgid "Matches all males"
-msgstr "Gjelder alle menn"
+msgstr "Samsvarer med alle menn"
 
-#: GenericFilter.py:983 GenericFilter.py:1586 plugins/FilterEditor.py:58
+#: GenericFilter.py:993 GenericFilter.py:1575 plugins/FilterEditor.py:58
 msgid "Personal event:"
 msgstr "Personlig hendelse:"
 
-#: GenericFilter.py:984 GenericFilter.py:1034 GenericFilter.py:1135
-#: GenericFilter.py:1175 gramps.glade:8536 gramps.glade:9462
-#: gramps.glade:12160 gramps.glade:13667
+#: GenericFilter.py:994 GenericFilter.py:1043 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:9101 gramps.glade:10129
+#: gramps.glade:13053 gramps.glade:14701
 msgid "Date:"
 msgstr "Dato:"
 
-#: GenericFilter.py:985 GenericFilter.py:1035 GenericFilter.py:1135
-#: GenericFilter.py:1175 gramps.glade:8488 gramps.glade:13715
+#: GenericFilter.py:995 GenericFilter.py:1044 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:9045 gramps.glade:14757
 #: plugins/FilterEditor.py:676
 msgid "Place:"
 msgstr "Sted:"
 
-#: GenericFilter.py:986 GenericFilter.py:1036 GenericFilter.py:1135
-#: GenericFilter.py:1175 gramps.glade:8440 gramps.glade:10680
-#: gramps.glade:12256 gramps.glade:15790
+#: GenericFilter.py:996 GenericFilter.py:1045 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:8989 gramps.glade:11453
+#: gramps.glade:13165 gramps.glade:16998
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: GenericFilter.py:987
+#: GenericFilter.py:997
 #, fuzzy
 msgid "People with the personal "
 msgstr "Personer som har person-hendelsen "
 
-#: GenericFilter.py:988
+#: GenericFilter.py:998
 #, fuzzy
 msgid "Matches people with a personal event of a particular value"
-msgstr "Gjelder personen med en personlig hendelse med en bestemt verdi"
+msgstr "Samsvarer med en personen som har personlig hendelse med en bestemt verdi"
 
-#: GenericFilter.py:989 GenericFilter.py:1039 GenericFilter.py:1138
-#: GenericFilter.py:1178 GenericFilter.py:1509 GenericFilter.py:1530
-#: GenericFilter.py:1589
+#: GenericFilter.py:999 GenericFilter.py:1048 GenericFilter.py:1145
+#: GenericFilter.py:1184 GenericFilter.py:1502 GenericFilter.py:1522
+#: GenericFilter.py:1578
 msgid "Event filters"
 msgstr "Filter for hendelser"
 
-#: GenericFilter.py:1033 GenericFilter.py:1586 plugins/FilterEditor.py:59
+#: GenericFilter.py:1042 GenericFilter.py:1575 plugins/FilterEditor.py:59
 msgid "Family event:"
 msgstr "Familie-hendelse:"
 
-#: GenericFilter.py:1037
+#: GenericFilter.py:1046
 #, fuzzy
 msgid "People with the family "
 msgstr "Personer med familie-hendelsen "
 
-#: GenericFilter.py:1038
+#: GenericFilter.py:1047
 #, fuzzy
 msgid "Matches people with a family event of a particular value"
-msgstr "Gjelder personen med en familie-hendelse av en bestemt verdi"
+msgstr "Samsvarer med en person som har en familie-hendelse av en bestemt verdi"
 
-#: GenericFilter.py:1083
+#: GenericFilter.py:1091
 msgid "Number of relationships:"
 msgstr "Antall relasjoner:"
 
-#: GenericFilter.py:1084 plugins/FilterEditor.py:65
+#: GenericFilter.py:1092 plugins/FilterEditor.py:65
 msgid "Relationship type:"
 msgstr "Relasjonstype:"
 
-#: GenericFilter.py:1085
+#: GenericFilter.py:1093
 msgid "Number of children:"
 msgstr "Antall barn:"
 
-#: GenericFilter.py:1086
+#: GenericFilter.py:1094
 #, fuzzy
 msgid "People with the "
 msgstr "Personer med "
 
-#: GenericFilter.py:1087
+#: GenericFilter.py:1095
 #, fuzzy
 msgid "Matches people with a particular relationship"
-msgstr "Gjelder personen som har en bestemt relasjon"
+msgstr "Samsvarer med personen som har en bestemt relasjon"
 
-#: GenericFilter.py:1136
+#: GenericFilter.py:1143
 #, fuzzy
 msgid "People with the "
 msgstr "Personer med "
 
-#: GenericFilter.py:1137
+#: GenericFilter.py:1144
 #, fuzzy
 msgid "Matches people with birth data of a particular value"
-msgstr "Gjelder personen som har fdsel av en bestemt verdi"
+msgstr "Samsvarer med personen som har fdselsdata av en bestemt verdi"
 
-#: GenericFilter.py:1176
+#: GenericFilter.py:1182
 #, fuzzy
 msgid "People with the "
 msgstr "Personer med "
 
-#: GenericFilter.py:1177
+#: GenericFilter.py:1183
 #, fuzzy
 msgid "Matches people with death data of a particular value"
-msgstr "Gjelder personen som har ddsfall av en bestemt verdi"
+msgstr "Samsvarer med personen som har ddsfall av en bestemt verdi"
 
-#: GenericFilter.py:1215 GenericFilter.py:1240 gramps.glade:9050
-#: gramps.glade:22103 gramps.glade:23110
+#: GenericFilter.py:1220 GenericFilter.py:1244 gramps.glade:9674
+#: gramps.glade:23827 gramps.glade:24909
 msgid "Value:"
 msgstr "Verdi:"
 
-#: GenericFilter.py:1215 plugins/FilterEditor.py:60
+#: GenericFilter.py:1220 plugins/FilterEditor.py:60
 msgid "Personal attribute:"
 msgstr "Personlig egenskap:"
 
-#: GenericFilter.py:1216
+#: GenericFilter.py:1221
 #, fuzzy
 msgid "People with the personal "
 msgstr "Persone med den personlige "
 
-#: GenericFilter.py:1217
+#: GenericFilter.py:1222
 #, fuzzy
 msgid "Matches people with the personal attribute of a particular value"
-msgstr "Gjelder personen med en personlig hendelse med en bestemt verdi"
+msgstr "Samsvarer med personer med en personlig hendelse med en bestemt verdi"
 
-#: GenericFilter.py:1240 plugins/FilterEditor.py:61
+#: GenericFilter.py:1244 plugins/FilterEditor.py:61
 msgid "Family attribute:"
 msgstr "Familie-egenskap:"
 
-#: GenericFilter.py:1241
+#: GenericFilter.py:1245
 #, fuzzy
 msgid "People with the family "
 msgstr "Personer med familie "
 
-#: GenericFilter.py:1242
+#: GenericFilter.py:1246
 #, fuzzy
 msgid "Matches people with the family attribute of a particular value"
-msgstr "Gjelder personen med en familie-hendelse av en bestemt verdi"
+msgstr "Samsvarer med personen med en familie-hendelse av en bestemt verdi"
 
-#: GenericFilter.py:1267 gramps.glade:7894
+#: GenericFilter.py:1270 gramps.glade:8380
 msgid "Given name:"
 msgstr "Fornavn:"
 
-#: GenericFilter.py:1268 gramps.glade:7870
+#: GenericFilter.py:1271 gramps.glade:8352
 msgid "Family name:"
 msgstr "Etternavn:"
 
-#: GenericFilter.py:1269 gramps.glade:7846
+#: GenericFilter.py:1272 gramps.glade:8324
 msgid "Suffix:"
 msgstr "Etterstavelse:"
 
-#: GenericFilter.py:1270 gramps.glade:3457 gramps.glade:7918
-#: gramps.glade:19281 gramps.glade:21520 gramps.glade:30990
+#: GenericFilter.py:1273 gramps.glade:3631 gramps.glade:8408
+#: gramps.glade:20776 gramps.glade:23196 gramps.glade:33293
 #: mergedata.glade:874 mergedata.glade:896
 msgid "Title:"
 msgstr "Tittel:"
 
-#: GenericFilter.py:1271
+#: GenericFilter.py:1274
 #, fuzzy
 msgid "People with the "
 msgstr "Personer med "
 
-#: GenericFilter.py:1272 GenericFilter.py:1305
+#: GenericFilter.py:1275 GenericFilter.py:1307
 #, fuzzy
 msgid "Matches people with a specified (partial) name"
-msgstr "Gjelder personen med et bestemt (del av et) navn"
+msgstr "Samsvarer med personen med et bestemt (del av et) navn"
 
-#: GenericFilter.py:1303 GenericFilter.py:1640
+#: GenericFilter.py:1305 GenericFilter.py:1629
 msgid "Substring:"
 msgstr "Delstreng:"
 
-#: GenericFilter.py:1304
+#: GenericFilter.py:1306
 #, fuzzy
 msgid "People matching the "
-msgstr "Gjelder personer med "
+msgstr "Samsvarer med personer med "
 
-#: GenericFilter.py:1322 gramps_main.py:992
+#: GenericFilter.py:1323 gramps_main.py:992
 msgid "People with incomplete names"
 msgstr "Personer med ufullstendige navn"
 
-#: GenericFilter.py:1323
+#: GenericFilter.py:1324
 msgid "Matches people with firstname or lastname missing"
-msgstr "Gjelder personer som mangler for- eller etternavn"
+msgstr "Samsvarer med personer som mangler for- eller etternavn"
 
 #: GenericFilter.py:1344
 #, fuzzy
 msgid "People matching the "
-msgstr "Gjelder personer med "
+msgstr "Samsvarer med personer med "
 
 #: GenericFilter.py:1345
 #, fuzzy
 msgid "Matches people macthed by the specified filter name"
-msgstr "Gjelder personen fra et bestemt filter"
+msgstr "Samsvarer med personen fra et bestemt filter"
 
 #: GenericFilter.py:1387
 #, fuzzy
@@ -1507,144 +1543,144 @@ msgstr "Ektefelle av et  treff"
 #: GenericFilter.py:1388
 #, fuzzy
 msgid "Matches people married to anybody matching a filter"
-msgstr "Gjelder personen som er gift med en som er funnet ved hjelp av et filter"
+msgstr "Samsvarer med personen som er gift med en som er funnet ved hjelp av et filter"
 
-#: GenericFilter.py:1411 gramps_main.py:982
+#: GenericFilter.py:1410 gramps_main.py:982
 #, fuzzy
 msgid "Adopted people"
 msgstr "Adopterte personer"
 
-#: GenericFilter.py:1412
+#: GenericFilter.py:1411
 #, fuzzy
 msgid "Matches people who were adopted"
-msgstr "Gjelder personer som er adoptert"
+msgstr "Samsvarer med personer som er adoptert"
 
-#: GenericFilter.py:1429 gramps_main.py:987
+#: GenericFilter.py:1427 gramps_main.py:987
 #, fuzzy
 msgid "People with images"
 msgstr "Personer med bilder"
 
-#: GenericFilter.py:1430
+#: GenericFilter.py:1428
 #, fuzzy
 msgid "Matches people with images in the gallery"
-msgstr "Gjelder personer som har bilder i galleriet"
+msgstr "Samsvarer med personer som har bilder i galleriet"
 
-#: GenericFilter.py:1443 gramps_main.py:997
+#: GenericFilter.py:1440 gramps_main.py:997
 msgid "People with children"
 msgstr "Personer med barn"
 
-#: GenericFilter.py:1444
+#: GenericFilter.py:1441
 #, fuzzy
 msgid "Matches people who have children"
-msgstr "Gjelder personen som har barn"
+msgstr "Samsvarer med personen som har barn"
 
-#: GenericFilter.py:1459 gramps_main.py:1002
+#: GenericFilter.py:1455 gramps_main.py:1002
 msgid "People with no marriage records"
 msgstr "Personer der informasjon om ekteskap mangler"
 
-#: GenericFilter.py:1460
+#: GenericFilter.py:1456
 #, fuzzy
 msgid "Matches people who have no spouse"
-msgstr "Gjelder personer som ikke har ektefeller"
+msgstr "Samsvarer med personer som ikke har ektefeller"
 
-#: GenericFilter.py:1473 gramps_main.py:1007
+#: GenericFilter.py:1468 gramps_main.py:1007
 msgid "People with multiple marriage records"
 msgstr "Personer med flere ekteskap"
 
-#: GenericFilter.py:1474
+#: GenericFilter.py:1469
 #, fuzzy
 msgid "Matches people who have more than one spouse"
-msgstr "Gjelder personen som har mer enn en ektefelle"
+msgstr "Samsvarer med personen som har mer enn en ektefelle"
 
-#: GenericFilter.py:1487 gramps_main.py:1012
+#: GenericFilter.py:1481 gramps_main.py:1012
 #, fuzzy
 msgid "People without a known birth date"
 msgstr "Personer uten fdselsdato"
 
-#: GenericFilter.py:1488
+#: GenericFilter.py:1482
 #, fuzzy
 msgid "Matches people without a known birthdate"
-msgstr "Gjelder personer uten fdselsdato"
+msgstr "Samsvarer med personer uten fdselsdato"
 
-#: GenericFilter.py:1507 gramps_main.py:1017
+#: GenericFilter.py:1500 gramps_main.py:1017
 msgid "People with incomplete events"
 msgstr "Personer med ufullstendige hendelser"
 
-#: GenericFilter.py:1508
+#: GenericFilter.py:1501
 #, fuzzy
 msgid "Matches people with missing date or place in an event"
-msgstr "Gjelder personer som mangler dato eller sted i en hendelse"
+msgstr "Samsvarer med personer som mangler dato eller sted i en hendelse"
 
-#: GenericFilter.py:1528 gramps_main.py:1022
+#: GenericFilter.py:1520 gramps_main.py:1022
 msgid "Families with incomplete events"
 msgstr "Familier med ufullstendige hendelser"
 
-#: GenericFilter.py:1529
+#: GenericFilter.py:1521
 #, fuzzy
 msgid "Matches people with missing date or place in an event of the family"
-msgstr "Gjelder personer som mangler dato eller sted i en familiehendelse"
+msgstr "Samsvarer med personer som mangler dato eller sted i en familiehendelse"
 
-#: GenericFilter.py:1551
+#: GenericFilter.py:1542
 msgid "On year:"
 msgstr "P r:"
 
-#: GenericFilter.py:1552 gramps_main.py:1027
+#: GenericFilter.py:1543 gramps_main.py:1027
 msgid "People probably alive"
 msgstr "Personer som sannsynligvis lever"
 
-#: GenericFilter.py:1553
+#: GenericFilter.py:1544
 #, fuzzy
 msgid "Matches people without indications of death that are not too old"
-msgstr "Gjelder personer uten ddsindikasjon som ikke er for gamle"
+msgstr "Samsvarer med personer uten ddsindikasjon som ikke er for gamle"
 
-#: GenericFilter.py:1572 gramps_main.py:1032
+#: GenericFilter.py:1562 gramps_main.py:1032
 msgid "People marked private"
 msgstr "Personer som er merket private"
 
-#: GenericFilter.py:1573
+#: GenericFilter.py:1563
 #, fuzzy
 msgid "Matches people that are indicated as private"
-msgstr "Gjelder personer som er merket private"
+msgstr "Samsvarer med personer som er merket private"
 
-#: GenericFilter.py:1587 gramps.glade:25926 gramps_main.py:1037
+#: GenericFilter.py:1576 gramps.glade:27895 gramps_main.py:1037
 msgid "Witnesses"
 msgstr "Vitner"
 
-#: GenericFilter.py:1588
+#: GenericFilter.py:1577
 #, fuzzy
 msgid "Matches people who are witnesses in any event"
-msgstr "Gjelder personer som er vitne til en hendelse"
+msgstr "Samsvarer med personer som er vitne til en hendelse"
 
-#: GenericFilter.py:1641 plugins/FilterEditor.py:694
+#: GenericFilter.py:1630 plugins/FilterEditor.py:694
 msgid "Case sensitive:"
 msgstr "Skill mellom store og sm bokstaver:"
 
-#: GenericFilter.py:1642 plugins/FilterEditor.py:696
+#: GenericFilter.py:1631 plugins/FilterEditor.py:696
 msgid "Regular-Expression matching:"
 msgstr "Regulrt uttrykk:"
 
-#: GenericFilter.py:1643
+#: GenericFilter.py:1632
 #, fuzzy
 msgid "People with records containing "
-msgstr "Gjelder personer med poster som inneholder "
+msgstr "Samsvarer med personer med poster som inneholder "
 
-#: GenericFilter.py:1644
+#: GenericFilter.py:1633
 #, fuzzy
 msgid "Matches people whose records contain text matching a substring"
-msgstr "Gjelder personer med poster som inneholder tekst fra et treff p en delstreng"
+msgstr "Samsvarer med personer med poster som inneholder tekst fra et treff p en delstreng"
 
-#: GenericFilter.py:1808 plugins/FilterEditor.py:682
+#: GenericFilter.py:1799 plugins/FilterEditor.py:682
 msgid "Source ID:"
 msgstr "Kilde ID:"
 
-#: GenericFilter.py:1809
+#: GenericFilter.py:1800
 #, fuzzy
 msgid "People with the "
 msgstr "Personer med "
 
-#: GenericFilter.py:1811
+#: GenericFilter.py:1802
 msgid "Matches people who have a particular source"
-msgstr "Gjelder personer som har en bestemt kilde"
+msgstr "Samsvarer med personer som har en bestemt kilde"
 
 #: GrampsCfg.py:62
 msgid "Father's surname"
@@ -1658,7 +1694,7 @@ msgstr "Kombinasjon av mors og fars etternavn"
 msgid "Icelandic style"
 msgstr "Islandsk stil"
 
-#: GrampsCfg.py:70 GrampsCfg.py:74 gramps.glade:7733 gramps.glade:21835
+#: GrampsCfg.py:70 GrampsCfg.py:74 gramps.glade:8195 gramps.glade:23539
 msgid "General"
 msgstr "Generelt"
 
@@ -1710,19 +1746,19 @@ msgstr "Mediareferanse"
 msgid "Reference Editor"
 msgstr "Referansebehandler"
 
-#: ImageSelect.py:828 ImageSelect.py:1191 MediaView.py:345
+#: ImageSelect.py:828 ImageSelect.py:1194 MediaView.py:345
 msgid "Edit Media Object"
 msgstr "Rediger mediaobjekt"
 
-#: ImageSelect.py:910
+#: ImageSelect.py:912
 msgid "Media Properties Editor"
 msgstr "Mediaegenskapsbehandler"
 
-#: ImageSelect.py:1043
+#: ImageSelect.py:1047
 msgid "Properties Editor"
 msgstr "Egenskapsbehandler"
 
-#: ImageSelect.py:1288
+#: ImageSelect.py:1291
 msgid "Remove Media Object"
 msgstr "Fjern mediaobjekt"
 
@@ -1734,7 +1770,7 @@ msgstr "Stedsbehandler"
 msgid "Marriage/Relationship Editor"
 msgstr "Ekteskap-/relasjonsbehandler"
 
-#: Marriage.py:146 Marriage.py:805 Marriage.py:828 Utils.py:135
+#: Marriage.py:146 Marriage.py:805 Marriage.py:828 Utils.py:130
 msgid "%s and %s"
 msgstr "%s og %s"
 
@@ -1819,11 +1855,11 @@ msgstr "Sammenligne personer"
 msgid "Alternate Names"
 msgstr "Alternative navn"
 
-#: MergePeople.py:122 gramps.glade:8961 gramps.glade:12692
+#: MergePeople.py:122 gramps.glade:9573 gramps.glade:13652
 msgid "Events"
 msgstr "Hendelser"
 
-#: MergePeople.py:129 PedView.py:693
+#: MergePeople.py:129 PedView.py:696
 msgid "Parents"
 msgstr "Foreldre"
 
@@ -1835,7 +1871,7 @@ msgstr "Familie-ID"
 msgid "No parents found"
 msgstr "Fant ingen foreldre"
 
-#: MergePeople.py:140 PedView.py:598
+#: MergePeople.py:140 PedView.py:601
 msgid "Spouses"
 msgstr "Ektefeller"
 
@@ -1848,7 +1884,7 @@ msgstr "Ektefelle"
 msgid "Marriage"
 msgstr "Ekteskap"
 
-#: MergePeople.py:159 const.py:902
+#: MergePeople.py:159 const.py:909
 msgid "Child"
 msgstr "Barn"
 
@@ -1856,7 +1892,7 @@ msgstr "Barn"
 msgid "No spouses or children found"
 msgstr "Fant ingen ektefeller eller barn"
 
-#: MergePeople.py:165 gramps.glade:10111
+#: MergePeople.py:165 gramps.glade:10857
 msgid "Addresses"
 msgstr "Adresser"
 
@@ -1928,27 +1964,27 @@ msgstr "begr."
 msgid "crem."
 msgstr "krem."
 
-#: PedView.py:379
+#: PedView.py:382
 msgid "Anchor"
 msgstr "Anker"
 
-#: PedView.py:496
+#: PedView.py:499
 msgid "Double clicking will make %s the active person"
 msgstr "Et dobbeltklikk vil gjre %s til den aktive personen"
 
-#: PedView.py:563
+#: PedView.py:566
 msgid "Set anchor"
 msgstr "Sett anker"
 
-#: PedView.py:564
+#: PedView.py:567
 msgid "Remove anchor"
 msgstr "Fjern anker"
 
-#: PedView.py:629 plugins/WebPage.py:715
+#: PedView.py:632 plugins/WebPage.py:715
 msgid "Siblings"
 msgstr "Ssken"
 
-#: PedView.py:659 plugins/FamilyGroup.py:400 plugins/IndivComplete.py:295
+#: PedView.py:662 plugins/FamilyGroup.py:400 plugins/IndivComplete.py:295
 #: plugins/IndivSummary.py:179 plugins/WebPage.py:674
 msgid "Children"
 msgstr "Barn"
@@ -1962,7 +1998,7 @@ msgid "Cause of Death"
 msgstr "Ddsrsak"
 
 #: PeopleView.py:83 WriteGedcom.py:329 gramps_main.py:952
-#: plugins/EventCmp.py:158 plugins/ExportVCalendar.py:81
+#: plugins/EventCmp.py:158 plugins/ExportVCalendar.py:82
 #: plugins/ExportVCard.py:84 plugins/GraphViz.py:513
 #: plugins/IndivComplete.py:510 plugins/StatisticsChart.py:827
 #: plugins/TimeLine.py:411 plugins/WebPage.py:1265 plugins/WriteFtree.py:86
@@ -1970,16 +2006,16 @@ msgstr "D
 msgid "Entire Database"
 msgstr "Hele databasen"
 
-#: PeopleView.py:267 gramps_main.py:1658
+#: PeopleView.py:260 gramps_main.py:1672
 msgid "Updating display..."
 msgstr "Oppdater visningen ..."
 
-#: PeopleView.py:295 PlaceView.py:200 SourceView.py:189 gramps.glade:955
+#: PeopleView.py:288 PlaceView.py:203 SourceView.py:191 gramps.glade:956
 #: plugins/BookReport.py:832
 msgid "Edit"
 msgstr "Rediger"
 
-#: PlaceView.py:49 PlaceView.py:119
+#: PlaceView.py:49 PlaceView.py:120
 msgid "Place Name"
 msgstr "Stedsnavn"
 
@@ -1999,27 +2035,27 @@ msgstr "Lengdegrad"
 msgid "Latitude"
 msgstr "Breddegrad"
 
-#: PlaceView.py:204
+#: PlaceView.py:207
 msgid "Place Menu"
 msgstr "Stedsmeny"
 
-#: PlaceView.py:251 SourceView.py:225 gramps_main.py:1454
+#: PlaceView.py:254 SourceView.py:227 gramps_main.py:1468
 msgid "Delete %s?"
 msgstr "Vil du slette %s?"
 
-#: PlaceView.py:252
+#: PlaceView.py:255
 msgid "This place is currently being used by at least one record in the database. Deleting it will remove it from the database and remove it from all records that reference it."
 msgstr "Dette stedsnavnet brukes av minst en post i databasen. Hvis du sletter den, vil den bli fjernet fra databasen, samt fra alle poster det er henvisninger til."
 
-#: PlaceView.py:256
+#: PlaceView.py:259
 msgid "_Delete Place"
 msgstr "Slett ste_d"
 
-#: PlaceView.py:287
+#: PlaceView.py:290
 msgid "Cannot merge places."
 msgstr "Kan ikke flette steder."
 
-#: PlaceView.py:288
+#: PlaceView.py:291
 msgid "Exactly two places must be selected to perform a merge. A second place can be selected by holding down the control key while clicking on the desired place."
 msgstr "Akkurat to steder m vre valgt for  kunne flette. Du kan velge sted nummer to ved  holde nede Ctrl-tasten mens du klikker p det andre stedet."
 
@@ -2033,13 +2069,13 @@ msgstr "Ukategorisert"
 
 #: PluginMgr.py:162 PluginMgr.py:163 PluginMgr.py:164 PluginMgr.py:189
 #: PluginMgr.py:191 PluginMgr.py:192 PluginMgr.py:223 PluginMgr.py:224
-#: PluginMgr.py:225 ReportUtils.py:1756 Witness.py:83 Witness.py:166
-#: const.py:234 const.py:247 const.py:493 const.py:506 gramps_main.py:1736
+#: PluginMgr.py:225 ReportUtils.py:1757 Witness.py:83 Witness.py:166
+#: const.py:234 const.py:247 const.py:493 gramps_main.py:1750
 #: plugins/Check.py:474 plugins/ScratchPad.py:78 plugins/WebPage.py:334
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: Plugins.py:125 gramps.glade:1396
+#: Plugins.py:125 gramps.glade:1427
 msgid "_Apply"
 msgstr "_Bruk"
 
@@ -2225,7 +2261,60 @@ msgstr "Kan ikke vise %s"
 msgid "GRAMPS is not able to display the image file. This may be caused by a corrupt file."
 msgstr "GRAMPS kan ikke vise billedfila. Dette kan skyldes en delagt fil."
 
+#: Relationship.py:268
+#, fuzzy
+msgid "husband"
+msgstr "Ektemann"
+
+#: Relationship.py:270
+#, fuzzy
+msgid "wife"
+msgstr "Kone"
+
+#: Relationship.py:272
+#, fuzzy
+msgid "gender unknown|spouse"
+msgstr "(kjnn ukjent)"
+
+#: Relationship.py:275
+#, fuzzy
+msgid "unmarried|husband"
+msgstr "Ugift"
+
 #: Relationship.py:277
+#, fuzzy
+msgid "unmarried|wife"
+msgstr "Ugift"
+
+#: Relationship.py:279
+msgid "gender unknown,unmarried|spouse"
+msgstr ""
+
+#: Relationship.py:282
+msgid "male,civil union|partner"
+msgstr ""
+
+#: Relationship.py:284
+msgid "female,civil union|partner"
+msgstr ""
+
+#: Relationship.py:286
+msgid "gender unknown,civil union|partner"
+msgstr ""
+
+#: Relationship.py:289
+msgid "male,unknown relation|partner"
+msgstr ""
+
+#: Relationship.py:291
+msgid "female,unknown relation|partner"
+msgstr ""
+
+#: Relationship.py:293
+msgid "gender unknown,unknown relation|partner"
+msgstr ""
+
+#: Relationship.py:325
 msgid "Relationship loop detected"
 msgstr "Fant en relasjons-lkke"
 
@@ -2237,7 +2326,7 @@ msgstr "Standardmaler"
 msgid "User Defined Template"
 msgstr "Egendefinerte maler"
 
-#: Report.py:152 Report.py:172 Utils.py:279
+#: Report.py:152 Report.py:172 Utils.py:274
 msgid "default"
 msgstr "standard"
 
@@ -2445,8 +2534,8 @@ msgstr "St
 msgid "Height"
 msgstr "Hyde"
 
-#: Report.py:1199 Report.py:1215 gramps.glade:20322 gramps.glade:20346
-#: gramps.glade:20370 gramps.glade:20802
+#: Report.py:1199 Report.py:1215 gramps.glade:21900 gramps.glade:21928
+#: gramps.glade:21956 gramps.glade:22416
 msgid "cm"
 msgstr "cm"
 
@@ -2506,711 +2595,711 @@ msgstr "_Overskriv"
 msgid "_Change filename"
 msgstr "Endre filnavn"
 
-#: ReportUtils.py:297 ReportUtils.py:298 Utils.py:170 Utils.py:172
+#: ReportUtils.py:297 ReportUtils.py:298 Utils.py:165 Utils.py:167
 msgid "Private"
 msgstr "Privat"
 
-#: ReportUtils.py:503 ReportUtils.py:1057 ReportUtils.py:1155
-#: ReportUtils.py:1446 ReportUtils.py:1539 plugins/DetAncestralReport.py:192
+#: ReportUtils.py:504 ReportUtils.py:1058 ReportUtils.py:1156
+#: ReportUtils.py:1447 ReportUtils.py:1540 plugins/DetAncestralReport.py:192
 #: plugins/DetAncestralReport.py:350 plugins/DetDescendantReport.py:216
 #: plugins/DetDescendantReport.py:371
 msgid "He"
 msgstr "Han"
 
-#: ReportUtils.py:505 ReportUtils.py:1059 ReportUtils.py:1157
-#: ReportUtils.py:1448 ReportUtils.py:1541 plugins/DetAncestralReport.py:194
+#: ReportUtils.py:506 ReportUtils.py:1060 ReportUtils.py:1158
+#: ReportUtils.py:1449 ReportUtils.py:1542 plugins/DetAncestralReport.py:194
 #: plugins/DetAncestralReport.py:348 plugins/DetDescendantReport.py:218
 #: plugins/DetDescendantReport.py:369
 msgid "She"
 msgstr "Hun"
 
-#: ReportUtils.py:518
+#: ReportUtils.py:519
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt %(birth_date)s i %(birth_place)s%(birth_endnotes)s, og dde %(death_date)s i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:527
+#: ReportUtils.py:528
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt %(birth_date)s i %(birth_place)s%(birth_endnotes)s, og dde %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:536
+#: ReportUtils.py:537
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt %(birth_date)s i %(birth_place)s%(birth_endnotes)s, og dde i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:544
+#: ReportUtils.py:545
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt %(birth_date)s i %(birth_place)s%(birth_endnotes)s."
 
-#: ReportUtils.py:552
+#: ReportUtils.py:553
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt %(birth_date)s%(birth_endnotes)s, og dde %(death_date)s i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:561
+#: ReportUtils.py:562
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt %(birth_date)s%(birth_endnotes)s, og dde %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:570
+#: ReportUtils.py:571
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt %(birth_date)s%(birth_endnotes)s, og dde i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:578
+#: ReportUtils.py:579
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt %(birth_date)s%(birth_endnotes)s."
 
-#: ReportUtils.py:586
+#: ReportUtils.py:587
 msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt i %(birth_place)s%(birth_endnotes)s, og dde %(death_date)s i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:595
+#: ReportUtils.py:596
 msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt i %(birth_place)s%(birth_endnotes)s, og dde %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:604
+#: ReportUtils.py:605
 msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt i %(birth_place)s%(birth_endnotes)s, og dde i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:612
+#: ReportUtils.py:613
 msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt i %(birth_place)s%(birth_endnotes)s."
 
-#: ReportUtils.py:620
+#: ReportUtils.py:621
 msgid "%(male_name)s%(endnotes)s died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s dde %(death_date)s i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:626
+#: ReportUtils.py:627
 msgid "%(male_name)s%(endnotes)s died %(death_date)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s dde %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:633
+#: ReportUtils.py:634
 msgid "%(male_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s dde i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:639
+#: ReportUtils.py:640
 msgid "%(male_name)s%(endnotes)s."
 msgstr "%(male_name)s%(endnotes)s."
 
-#: ReportUtils.py:646
+#: ReportUtils.py:647
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt %(birth_date)s i %(birth_place)s%(birth_endnotes)s, og dde %(death_date)s i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:655
+#: ReportUtils.py:656
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt %(birth_date)s i %(birth_place)s%(birth_endnotes)s, og dde %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:664
+#: ReportUtils.py:665
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt %(birth_date)s i %(birth_place)s%(birth_endnotes)s, og dde i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:672
+#: ReportUtils.py:673
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt %(birth_date)s i %(birth_place)s%(birth_endnotes)s."
 
-#: ReportUtils.py:680
+#: ReportUtils.py:681
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt %(birth_date)s%(birth_endnotes)s, og dde %(death_date)s i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:689
+#: ReportUtils.py:690
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt %(birth_date)s%(birth_endnotes)s, og dde %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:698
+#: ReportUtils.py:699
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt %(birth_date)s%(birth_endnotes)s, og dde i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:706
+#: ReportUtils.py:707
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt %(birth_date)s%(birth_endnotes)s."
 
-#: ReportUtils.py:714
+#: ReportUtils.py:715
 msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt i %(birth_place)s%(birth_endnotes)s, og dde %(death_date)s i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:723
+#: ReportUtils.py:724
 msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt i %(birth_place)s%(birth_endnotes)s, og dde %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:732
+#: ReportUtils.py:733
 msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt i %(birth_place)s%(birth_endnotes)s, og dde i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:740
+#: ReportUtils.py:741
 msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt i %(birth_place)s%(birth_endnotes)s."
 
-#: ReportUtils.py:748
+#: ReportUtils.py:749
 msgid "%(female_name)s%(endnotes)s died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s dde %(death_date)s i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:754
+#: ReportUtils.py:755
 msgid "%(female_name)s%(endnotes)s died %(death_date)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s dde %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:761
+#: ReportUtils.py:762
 msgid "%(female_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s dde i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:767
+#: ReportUtils.py:768
 msgid "%(female_name)s%(endnotes)s."
 msgstr "%(female_name)s%(endnotes)s."
 
-#: ReportUtils.py:821
+#: ReportUtils.py:822
 msgid "He married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Han giftet seg med %(spouse)s %(date)s i %(place)s%(endnotes)s."
 
-#: ReportUtils.py:827
+#: ReportUtils.py:828
 msgid "She married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Hun giftet seg med %(spouse)s %(date)s i %(place)s%(endnotes)s."
 
-#: ReportUtils.py:834
+#: ReportUtils.py:835
 msgid "He married %(spouse)s %(date)s%(endnotes)s."
 msgstr "Han giftet seg med %(spouse)s %(date)s%(endnotes)s."
 
-#: ReportUtils.py:839 ReportUtils.py:850
+#: ReportUtils.py:840 ReportUtils.py:851
 msgid "She married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Hun giftet seg med %(spouse)s i %(place)s%(endnotes)s."
 
-#: ReportUtils.py:845
+#: ReportUtils.py:846
 msgid "He married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Han giftet seg med %(spouse)s i %(place)s%(endnotes)s."
 
-#: ReportUtils.py:856
+#: ReportUtils.py:857
 msgid "He married %(spouse)s%(endnotes)s."
 msgstr "Han giftet seg med %(spouse)s%(endnotes)s."
 
-#: ReportUtils.py:860
+#: ReportUtils.py:861
 msgid "She married %(spouse)s%(endnotes)s."
 msgstr "Hun giftet seg med %(spouse)s%(endnotes)s."
 
-#: ReportUtils.py:866
+#: ReportUtils.py:867
 msgid "He also married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Han giftet seg ogs med %(spouse)s, %(date)s i %(place)s %(endnotes)s."
 
-#: ReportUtils.py:872
+#: ReportUtils.py:873
 msgid "She also married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Hun giftet seg ogs med %(spouse)s, %(date)s i %(place)s %(endnotes)s."
 
-#: ReportUtils.py:879
+#: ReportUtils.py:880
 msgid "He also married %(spouse)s %(date)s%(endnotes)s."
 msgstr "Han giftet seg ogs med %(spouse)s, %(date)s %(endnotes)s."
 
-#: ReportUtils.py:884 ReportUtils.py:895
+#: ReportUtils.py:885 ReportUtils.py:896
 msgid "She also married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Hun giftet seg ogs med %(spouse)s i %(place)s %(endnotes)s."
 
-#: ReportUtils.py:890
+#: ReportUtils.py:891
 msgid "He also married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Han giftet seg ogs med %(spouse)s, %(place)s %(endnotes)s."
 
-#: ReportUtils.py:901
+#: ReportUtils.py:902
 msgid "He also married %(spouse)s%(endnotes)s."
 msgstr "Han giftet seg ogs med %(spouse)s, %(endnotes)s."
 
-#: ReportUtils.py:905
+#: ReportUtils.py:906
 msgid "She also married %(spouse)s%(endnotes)s."
 msgstr "Hun giftet seg ogs med %(spouse)s, %(endnotes)s."
 
-#: ReportUtils.py:926
+#: ReportUtils.py:927
 msgid "He married %(spouse)s."
 msgstr "Han giftet seg med %(spouse)s."
 
-#: ReportUtils.py:928
+#: ReportUtils.py:929
 msgid "She married %(spouse)s."
 msgstr "Hun giftet seg med %(spouse)s."
 
-#: ReportUtils.py:931
+#: ReportUtils.py:932
 msgid "He had relationship with %(spouse)s."
 msgstr "Han hadde en relasjon til %(spouse)s."
 
-#: ReportUtils.py:934
+#: ReportUtils.py:935
 msgid "She had relationship with %(spouse)s."
 msgstr "Hun hadde en relasjon til %(spouse)s."
 
-#: ReportUtils.py:939
+#: ReportUtils.py:940
 msgid "He also married %(spouse)s."
 msgstr "Han giftet seg ogs med %(spouse)s."
 
-#: ReportUtils.py:941
+#: ReportUtils.py:942
 msgid "She also married %(spouse)s."
 msgstr "Hun giftet seg ogs med %(spouse)s."
 
-#: ReportUtils.py:944
+#: ReportUtils.py:945
 msgid "He also had relationship with %(spouse)s."
 msgstr "Han hadde ogs en relasjon til %(spouse)s."
 
-#: ReportUtils.py:947
+#: ReportUtils.py:948
 msgid "She also had relationship with %(spouse)s."
 msgstr "Hun hadde ogs en relasjon til %(spouse)s."
 
-#: ReportUtils.py:978
+#: ReportUtils.py:979
 msgid "He was the son of %(father)s and %(mother)s."
 msgstr "Han var snn av %(father)s og %(mother)s."
 
-#: ReportUtils.py:982
+#: ReportUtils.py:983
 msgid "He is the son of %(father)s and %(mother)s."
 msgstr "Han er snn av %(father)s og %(mother)s."
 
-#: ReportUtils.py:987
+#: ReportUtils.py:988
 msgid "He was the son of %(mother)s."
 msgstr "Han var snn av %(mother)s."
 
-#: ReportUtils.py:990
+#: ReportUtils.py:991
 msgid "He is the son of %(mother)s."
 msgstr "Han er snn av %(mother)s."
 
-#: ReportUtils.py:994
+#: ReportUtils.py:995
 msgid "He was the son of %(father)s."
 msgstr "Han var snn av %(father)s."
 
-#: ReportUtils.py:997
+#: ReportUtils.py:998
 msgid "He is the son of %(father)s."
 msgstr "Han er snn av %(father)s."
 
-#: ReportUtils.py:1002
+#: ReportUtils.py:1003
 msgid "She was the daughter of %(father)s and %(mother)s."
 msgstr "Hun var datter av %(father)s og %(mother)s."
 
-#: ReportUtils.py:1006
+#: ReportUtils.py:1007
 msgid "She is the daughter of %(father)s and %(mother)s."
 msgstr "Hun er datter av %(father)s og %(mother)s."
 
-#: ReportUtils.py:1011
+#: ReportUtils.py:1012
 msgid "She was the daughter of %(mother)s."
 msgstr "Hun var datter av %(mother)s."
 
-#: ReportUtils.py:1014
+#: ReportUtils.py:1015
 msgid "She is the daughter of %(mother)s."
 msgstr "Hun er datter av %(mother)s."
 
-#: ReportUtils.py:1018
+#: ReportUtils.py:1019
 msgid "She was the daughter of %(father)s."
 msgstr "Hun var datter av %(father)s."
 
-#: ReportUtils.py:1021
+#: ReportUtils.py:1022
 msgid "She is the daughter of %(father)s."
 msgstr "Hun er datter av %(father)s."
 
-#: ReportUtils.py:1069
+#: ReportUtils.py:1070
 msgid "%(male_name)s was born on %(birth_date)s in %(birth_place)s."
 msgstr "%(male_name)s ble fdt %(birth_date)s, %(birth_place)s."
 
-#: ReportUtils.py:1074
+#: ReportUtils.py:1075
 msgid "%(male_name)s was born on %(birth_date)s."
 msgstr "%(male_name)s ble fdt %(birth_date)s."
 
-#: ReportUtils.py:1078
+#: ReportUtils.py:1079
 msgid "%(male_name)s was born in %(month_year)s in %(birth_place)s."
 msgstr "%(male_name)s ble fdt %(month_year)s, %(birth_place)s."
 
-#: ReportUtils.py:1083
+#: ReportUtils.py:1084
 msgid "%(male_name)s was born in %(month_year)s."
 msgstr "%(male_name)s ble fdt %(month_year)s."
 
-#: ReportUtils.py:1087
+#: ReportUtils.py:1088
 msgid "%(male_name)s was born in %(birth_place)s."
 msgstr "%(male_name)s ble fdt %(birth_place)s."
 
-#: ReportUtils.py:1094
+#: ReportUtils.py:1095
 msgid "%(female_name)s was born on %(birth_date)s in %(birth_place)s."
 msgstr "%(female_name)s ble fdt %(birth_date)s, %(birth_place)s."
 
-#: ReportUtils.py:1099
+#: ReportUtils.py:1100
 msgid "%(female_name)s was born on %(birth_date)s."
 msgstr "%(female_name)s ble fdt %(birth_date)s."
 
-#: ReportUtils.py:1103
+#: ReportUtils.py:1104
 msgid "%(female_name)s was born in %(month_year)s in %(birth_place)s."
 msgstr "%(female_name)s ble fdt %(month_year)s, %(birth_place)s."
 
-#: ReportUtils.py:1108
+#: ReportUtils.py:1109
 msgid "%(female_name)s was born in %(month_year)s."
 msgstr "%(female_name)s ble fdt %(month_year)s."
 
-#: ReportUtils.py:1112
+#: ReportUtils.py:1113
 msgid "%(female_name)s was born in %(birth_place)s."
 msgstr "%(female_name)s ble fdt %(birth_place)s."
 
-#: ReportUtils.py:1168
+#: ReportUtils.py:1169
 msgid "%(male_name)s died on %(death_date)s in %(death_place)s."
 msgstr "%(male_name)s dde %(death_date)s, %(death_place)s."
 
-#: ReportUtils.py:1173
+#: ReportUtils.py:1174
 msgid "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d years."
 msgstr "%(male_name)s dde %(death_date)s, %(death_place)s i en alder av %(age)d r."
 
-#: ReportUtils.py:1180
+#: ReportUtils.py:1181
 msgid "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d months."
 msgstr "%(male_name)s dde %(death_date)s, %(death_place)s i en alder av %(age)d mneder."
 
-#: ReportUtils.py:1187
+#: ReportUtils.py:1188
 msgid "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d days."
 msgstr "%(male_name)s dde %(death_date)s, %(death_place)s i en alder av %(age)d dager."
 
-#: ReportUtils.py:1195
+#: ReportUtils.py:1196
 msgid "%(male_name)s died on %(death_date)s."
 msgstr "%(male_name)s dde %(death_date)s."
 
-#: ReportUtils.py:1198
+#: ReportUtils.py:1199
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d years."
 msgstr "%(male_name)s dde %(death_date)s i en alder av %(age)s r."
 
-#: ReportUtils.py:1203
+#: ReportUtils.py:1204
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d months."
 msgstr "%(male_name)s dde %(death_date)s i en alder av %(age)s mneder."
 
-#: ReportUtils.py:1208
+#: ReportUtils.py:1209
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d days."
 msgstr "%(male_name)s dde %(death_date)s i en alder av %(age)s dager."
 
-#: ReportUtils.py:1215
+#: ReportUtils.py:1216
 msgid "%(male_name)s died in %(month_year)s in %(death_place)s."
 msgstr "%(male_name)s dde %(month_year)s, %(death_place)s."
 
-#: ReportUtils.py:1220
+#: ReportUtils.py:1221
 msgid "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d years."
 msgstr "%(male_name)s dde %(month_year)s, %(death_place)s i en alder av %(age)d r."
 
-#: ReportUtils.py:1227
+#: ReportUtils.py:1228
 msgid "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d months."
 msgstr "%(male_name)s dde %(month_year)s, %(death_place)s i en alder av %(age)d mneder."
 
-#: ReportUtils.py:1234
+#: ReportUtils.py:1235
 msgid "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d days."
 msgstr "%(male_name)s dde %(month_year)s, %(death_place)s i en alder av %(age)d dager."
 
-#: ReportUtils.py:1242
+#: ReportUtils.py:1243
 msgid "%(male_name)s died in %(month_year)s."
 msgstr "%(male_name)s dde %(month_year)s."
 
-#: ReportUtils.py:1245
+#: ReportUtils.py:1246
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d years."
 msgstr "%(male_name)s dde %(month_year)s, i en alder av %(age)d r."
 
-#: ReportUtils.py:1250
+#: ReportUtils.py:1251
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d months."
 msgstr "%(male_name)s dde %(month_year)s, i en alder av %(age)d mneder."
 
-#: ReportUtils.py:1255
+#: ReportUtils.py:1256
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d days."
 msgstr "%(male_name)s dde %(month_year)s, i en alder av %(age)d dager."
 
-#: ReportUtils.py:1262
+#: ReportUtils.py:1263
 msgid "%(male_name)s died in %(death_place)s."
 msgstr "%(male_name)s dde %(death_place)s."
 
-#: ReportUtils.py:1265
+#: ReportUtils.py:1266
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d years."
 msgstr "%(male_name)s dde %(death_place)s i en alder av %(age)d r."
 
-#: ReportUtils.py:1270
+#: ReportUtils.py:1271
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d months."
 msgstr "%(male_name)s dde %(death_place)s i en alder av %(age)d mneder."
 
-#: ReportUtils.py:1275
+#: ReportUtils.py:1276
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d days."
 msgstr "%(male_name)s dde %(death_place)s i en alder av %(age)d dager."
 
-#: ReportUtils.py:1284
+#: ReportUtils.py:1285
 msgid "%(male_name)s died at the age of %(age)d years."
 msgstr "%(male_name)s dde i en alder av %(age)d r."
 
-#: ReportUtils.py:1288
+#: ReportUtils.py:1289
 msgid "%(male_name)s died at the age of %(age)d months."
 msgstr "%(male_name)s dde i en alder av %(age)d mneder."
 
-#: ReportUtils.py:1292
+#: ReportUtils.py:1293
 msgid "%(male_name)s died at the age of %(age)d days."
 msgstr "%(male_name)s dde i en alder av %(age)d dager."
 
-#: ReportUtils.py:1299
+#: ReportUtils.py:1300
 msgid "%(female_name)s died on %(death_date)s in %(death_place)s."
 msgstr "%(female_name)s dde %(month_date)s, %(death_place)s."
 
-#: ReportUtils.py:1304
+#: ReportUtils.py:1305
 msgid "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d years."
 msgstr "%(female_name)s dde %(month_date)s, %(death_place)s i en alder av %(age)d r."
 
-#: ReportUtils.py:1311
+#: ReportUtils.py:1312
 msgid "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d months."
 msgstr "%(female_name)s dde %(month_date)s, %(death_place)s i en alder av %(age)d mneder."
 
-#: ReportUtils.py:1318
+#: ReportUtils.py:1319
 msgid "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d days."
 msgstr "%(female_name)s dde %(month_date)s, %(death_place)s i en alder av %(age)d dager."
 
-#: ReportUtils.py:1326
+#: ReportUtils.py:1327
 msgid "%(female_name)s died on %(death_date)s."
 msgstr "%(female_name)s dde %(month_date)s."
 
-#: ReportUtils.py:1329
+#: ReportUtils.py:1330
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d years."
 msgstr "%(female_name)s dde %(death_date)s, i en alder av %(age)d r."
 
-#: ReportUtils.py:1334
+#: ReportUtils.py:1335
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d months."
 msgstr "%(female_name)s dde %(death_date)s, i en alder av %(age)d mneder."
 
-#: ReportUtils.py:1339
+#: ReportUtils.py:1340
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d days."
 msgstr "%(female_name)s dde %(death_date)s, i en alder av %(age)d dager."
 
-#: ReportUtils.py:1346
+#: ReportUtils.py:1347
 msgid "%(female_name)s died in %(month_year)s in %(death_place)s."
 msgstr "%(female_name)s dde %(month_year)s, %(death_place)s."
 
-#: ReportUtils.py:1351
+#: ReportUtils.py:1352
 msgid "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d years."
 msgstr "%(female_name)s dde %(month_year)s, %(death_place)s i en alder av %(age)d r."
 
-#: ReportUtils.py:1358
+#: ReportUtils.py:1359
 msgid "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d months."
 msgstr "%(female_name)s dde %(month_year)s, %(death_place)s i en alder av %(age)d mneder."
 
-#: ReportUtils.py:1365
+#: ReportUtils.py:1366
 msgid "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d days."
 msgstr "%(female_name)s dde %(month_year)s, %(death_place)s i en alder av %(age)d dager."
 
-#: ReportUtils.py:1373
+#: ReportUtils.py:1374
 msgid "%(female_name)s died in %(month_year)s."
 msgstr "%(female_name)s dde %(month_year)s."
 
-#: ReportUtils.py:1376
+#: ReportUtils.py:1377
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d years."
 msgstr "%(female_name)s dde %(month_year)s, i en alder av %(age)d r."
 
-#: ReportUtils.py:1381
+#: ReportUtils.py:1382
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d months."
 msgstr "%(female_name)s dde %(month_year)s, i en alder av %(age)d mneder."
 
-#: ReportUtils.py:1386
+#: ReportUtils.py:1387
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d days."
 msgstr "%(female_name)s dde %(month_year)s, i en alder av %(age)d dager."
 
-#: ReportUtils.py:1393
+#: ReportUtils.py:1394
 msgid "%(female_name)s died in %(death_place)s."
 msgstr "%(female_name)s dde %(death_place)s."
 
-#: ReportUtils.py:1396
+#: ReportUtils.py:1397
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d years."
 msgstr "%(female_name)s dde %(death_place)s, i en alder av %(age)d r."
 
-#: ReportUtils.py:1401
+#: ReportUtils.py:1402
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d months."
 msgstr "%(female_name)s dde %(death_place)s, i en alder av %(age)d mneder."
 
-#: ReportUtils.py:1406
+#: ReportUtils.py:1407
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d days."
 msgstr "%(female_name)s dde %(death_place)s, i en alder av %(age)d dager."
 
-#: ReportUtils.py:1415
+#: ReportUtils.py:1416
 msgid "%(female_name)s died at the age of %(age)d years."
 msgstr "%(female_name)s dde i en alder av %(age)d r."
 
-#: ReportUtils.py:1419
+#: ReportUtils.py:1420
 msgid "%(female_name)s died at the age of %(age)d months."
 msgstr "%(female_name)s dde i en alder av %(age)d mneder."
 
-#: ReportUtils.py:1423
+#: ReportUtils.py:1424
 msgid "%(female_name)s died at the age of %(age)d days."
 msgstr "%(female_name)s dde i en alder av %(age)d dager."
 
-#: ReportUtils.py:1476
+#: ReportUtils.py:1477
 msgid "%(male_name)s was buried on %(burial_date)s in %(burial_place)s."
 msgstr "%(male_name)s ble begravet %(birth_date)s, %(birth_place)s."
 
-#: ReportUtils.py:1481
+#: ReportUtils.py:1482
 msgid "%(male_name)s was buried on %(burial_date)s."
 msgstr "%(male_name)s ble begravet %(birth_date)s."
 
-#: ReportUtils.py:1485
+#: ReportUtils.py:1486
 msgid "%(male_name)s was buried in %(month_year)s in %(burial_place)s."
 msgstr "%(male_name)s ble begravet %(month_year)s, %(birth_place)s."
 
-#: ReportUtils.py:1490
+#: ReportUtils.py:1491
 msgid "%(male_name)s was buried in %(month_year)s."
 msgstr "%(male_name)s ble begravet %(month_year)s."
 
-#: ReportUtils.py:1494
+#: ReportUtils.py:1495
 msgid "%(male_name)s was buried in %(burial_place)s."
 msgstr "%(male_name)s ble begravet %(birth_place)s."
 
-#: ReportUtils.py:1497
+#: ReportUtils.py:1498
 msgid "%(male_name)s was buried."
 msgstr "%(male_name)s ble begravet."
 
-#: ReportUtils.py:1502
+#: ReportUtils.py:1503
 msgid "%(female_name)s was buried on %(burial_date)s in %(burial_place)s."
 msgstr "%(female_name)s ble begravet %(birth_date)s, %(birth_place)s."
 
-#: ReportUtils.py:1507
+#: ReportUtils.py:1508
 msgid "%(female_name)s was buried on %(burial_date)s."
 msgstr "%(female_name)s ble begravet %(birth_date)s."
 
-#: ReportUtils.py:1511
+#: ReportUtils.py:1512
 msgid "%(female_name)s was buried in %(month_year)s in %(burial_place)s."
 msgstr "%(female_name)s ble begravet %(month_year)s, %(birth_place)s."
 
-#: ReportUtils.py:1516
+#: ReportUtils.py:1517
 msgid "%(female_name)s was buried in %(month_year)s."
 msgstr "%(female_name)s ble begravet %(month_year)s."
 
-#: ReportUtils.py:1520
+#: ReportUtils.py:1521
 msgid "%(female_name)s was buried in %(burial_place)s."
 msgstr "%(female_name)s ble begravet %(birth_place)s."
 
-#: ReportUtils.py:1523
+#: ReportUtils.py:1524
 msgid "%(female_name)s was buried."
 msgstr "%(female_name)s ble begravet."
 
-#: ReportUtils.py:1553
+#: ReportUtils.py:1554
 msgid "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s %(death_place)s."
 msgstr "%(male_name)s. Fdt: %(birth_date)s, %(birth_place)s. Dde: %(death_date)s, %(death_place)s."
 
-#: ReportUtils.py:1560
+#: ReportUtils.py:1561
 msgid "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s."
 msgstr "%(male_name)s. Fdt: %(birth_date)s, %(birth_place)s. Dde: %(death_date)s."
 
-#: ReportUtils.py:1568
+#: ReportUtils.py:1569
 msgid "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_place)s."
 msgstr "%(male_name)s. Fdt: %(birth_date)s, %(birth_place)s. Dde: %(death_place)s."
 
-#: ReportUtils.py:1575
+#: ReportUtils.py:1576
 msgid "%(male_name)s Born: %(birth_date)s %(birth_place)s."
 msgstr "%(male_name)s. Fdt: %(birth_date)s, %(birth_place)s."
 
-#: ReportUtils.py:1582
+#: ReportUtils.py:1583
 msgid "%(male_name)s Born: %(birth_date)s Died: %(death_date)s %(death_place)s."
 msgstr "%(male_name)s. Fdt: %(birth_date)s. Dde: %(death_date)s, %(death_place)s."
 
-#: ReportUtils.py:1587
+#: ReportUtils.py:1588
 msgid "%(male_name)s Born: %(birth_date)s Died: %(death_date)s."
 msgstr "%(male_name)s. Fdt: %(birth_date)s. Dde: %(death_date)s."
 
-#: ReportUtils.py:1593
+#: ReportUtils.py:1594
 msgid "%(male_name)s Born: %(birth_date)s Died: %(death_place)s."
 msgstr "%(male_name)s. Fdt: %(birth_date)s. Dde: %(death_place)s."
 
-#: ReportUtils.py:1598
+#: ReportUtils.py:1599
 msgid "%(male_name)s Born: %(birth_date)s."
 msgstr "%(male_name)s. Fdt: %(birth_date)s."
 
-#: ReportUtils.py:1604
+#: ReportUtils.py:1605
 msgid "%(male_name)s Born: %(birth_place)s Died: %(death_date)s %(death_place)s."
 msgstr "%(male_name)s. Fdt: %(birth_place)s. Dde: %(death_date)s, %(death_place)s."
 
-#: ReportUtils.py:1611
+#: ReportUtils.py:1612
 msgid "%(male_name)s Born: %(birth_place)s Died: %(death_date)s."
 msgstr "%(male_name)s. Fdt: %(birth_place)s. Dde: %(death_date)s."
 
-#: ReportUtils.py:1619
+#: ReportUtils.py:1620
 msgid "%(male_name)s Born: %(birth_place)s Died: %(death_place)s."
 msgstr "%(male_name)s. Fdt: %(birth_place)s. Dde: %(death_place)s."
 
-#: ReportUtils.py:1626
+#: ReportUtils.py:1627
 msgid "%(male_name)s Born: %(birth_place)s."
 msgstr "%(male_name)s. Fdt: %(birth_place)s."
 
-#: ReportUtils.py:1632
+#: ReportUtils.py:1633
 msgid "%(male_name)s Died: %(death_date)s %(death_place)s."
 msgstr "%(male_name)s. Dde: %(death_date)s, %(death_place)s."
 
-#: ReportUtils.py:1637
+#: ReportUtils.py:1638
 msgid "%(male_name)s Died: %(death_date)s."
 msgstr "%(male_name)s. Dde: %(death_date)s."
 
-#: ReportUtils.py:1642
+#: ReportUtils.py:1643
 msgid "%(male_name)s Died: %(death_place)s."
 msgstr "%(male_name)s. Dde: %(death_place)s."
 
-#: ReportUtils.py:1645
+#: ReportUtils.py:1646
 msgid "%(male_name)s."
 msgstr "%(male_name)s."
 
-#: ReportUtils.py:1652
+#: ReportUtils.py:1653
 msgid "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s %(death_place)s."
 msgstr "%(female_name)s. Fdt: %(birth_date)s, %(birth_place)s. Dde: %(death_date)s, %(death_place)s."
 
-#: ReportUtils.py:1659
+#: ReportUtils.py:1660
 msgid "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s."
 msgstr "%(female_name)s. Fdt: %(birth_date)s, %(birth_place)s. Dde: %(death_date)s."
 
-#: ReportUtils.py:1667
+#: ReportUtils.py:1668
 msgid "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_place)s."
 msgstr "%(female_name)s. Fdt: %(birth_date)s, %(birth_place)s. Dde: %(death_place)s."
 
-#: ReportUtils.py:1674
+#: ReportUtils.py:1675
 msgid "%(female_name)s Born: %(birth_date)s %(birth_place)s."
 msgstr "%(female_name)s. Fdt: %(birth_date)s, %(birth_place)s."
 
-#: ReportUtils.py:1681
+#: ReportUtils.py:1682
 msgid "%(female_name)s Born: %(birth_date)s Died: %(death_date)s %(death_place)s."
 msgstr "%(female_name)s. Fdt: %(birth_date)s. Dde: %(death_date)s, %(death_place)s."
 
-#: ReportUtils.py:1686
+#: ReportUtils.py:1687
 msgid "%(female_name)s Born: %(birth_date)s Died: %(death_date)s."
 msgstr "%(female_name)s. Fdt: %(birth_date)s. Dde: %(death_date)s."
 
-#: ReportUtils.py:1692
+#: ReportUtils.py:1693
 msgid "%(female_name)s Born: %(birth_date)s Died: %(death_place)s."
 msgstr "%(female_name)s. Fdt: %(birth_date)s. Dde: %(death_place)s."
 
-#: ReportUtils.py:1697
+#: ReportUtils.py:1698
 msgid "%(female_name)s Born: %(birth_date)s."
 msgstr "%(female_name)s. Fdt: %(birth_date)s."
 
-#: ReportUtils.py:1703
+#: ReportUtils.py:1704
 msgid "%(female_name)s Born: %(birth_place)s Died: %(death_date)s %(death_place)s."
 msgstr "%(female_name)s. Fdt: %(birth_place)s. Dde: %(death_date)s, %(death_place)s."
 
-#: ReportUtils.py:1710
+#: ReportUtils.py:1711
 msgid "%(female_name)s Born: %(birth_place)s Died: %(death_date)s."
 msgstr "%(female_name)s. Fdt: %(birth_place)s. Dde: %(death_date)s."
 
-#: ReportUtils.py:1718
+#: ReportUtils.py:1719
 msgid "%(female_name)s Born: %(birth_place)s Died: %(death_place)s."
 msgstr "%(female_name)s. Fdt: %(birth_place)s. Dde: %(death_place)s."
 
-#: ReportUtils.py:1725
+#: ReportUtils.py:1726
 msgid "%(female_name)s Born: %(birth_place)s."
 msgstr "%(female_name)s. Fdt: %(birth_place)s."
 
-#: ReportUtils.py:1731
+#: ReportUtils.py:1732
 msgid "%(female_name)s Died: %(death_date)s %(death_place)s."
 msgstr "%(female_name)s. Dde: %(death_date)s, %(death_place)s."
 
-#: ReportUtils.py:1736
+#: ReportUtils.py:1737
 msgid "%(female_name)s Died: %(death_date)s."
 msgstr "%(female_name)s. Dde: %(death_date)s."
 
-#: ReportUtils.py:1741
+#: ReportUtils.py:1742
 msgid "%(female_name)s Died: %(death_place)s."
 msgstr "%(female_name)s. Dde: %(death_place)s."
 
-#: ReportUtils.py:1744
+#: ReportUtils.py:1745
 msgid "%(female_name)s."
 msgstr "%(female_name)s."
 
-#: ReportUtils.py:1753 const.py:490 gramps.glade:4344
+#: ReportUtils.py:1754 const.py:490 gramps.glade:4582
 #: plugins/FamilyGroup.py:376 plugins/FamilyGroup.py:378
 msgid "Married"
 msgstr "Gift"
 
-#: ReportUtils.py:1754 const.py:491
+#: ReportUtils.py:1755 const.py:491
 msgid "Unmarried"
 msgstr "Ugift"
 
-#: ReportUtils.py:1755 const.py:492
+#: ReportUtils.py:1756 const.py:492
 msgid "Civil Union"
 msgstr "Partnerskap"
 
-#: ReportUtils.py:1757 const.py:234 const.py:248 const.py:494
+#: ReportUtils.py:1758 const.py:234 const.py:248 const.py:494
 #: mergedata.glade:242
 msgid "Other"
 msgstr "Andre"
 
-#: SelectChild.py:288 SelectChild.py:307
+#: SelectChild.py:193 SelectChild.py:212
 msgid "A person cannot be linked as his/her own child"
 msgstr "En person kan ikke angis som sitt eget barn"
 
-#: SelectChild.py:332
+#: SelectChild.py:237
 msgid "Add Child to Family (%s)"
 msgstr "Legg til barn i familien (%s)"
 
@@ -3226,27 +3315,27 @@ msgstr "Forkortelse"
 msgid "Publication Information"
 msgstr "Publikasjonsinformasjon"
 
-#: SourceView.py:193
+#: SourceView.py:195
 msgid "Source Menu"
 msgstr "Kildemeny"
 
-#: SourceView.py:218
+#: SourceView.py:220
 msgid "This source is currently being used. Deleting it will remove it from the database and from all records that reference it."
 msgstr "Denne kilden er for yeblikket i bruk. Hvis du sletter denne vil den bli fjernet fra databasen og alle henviste poster."
 
-#: SourceView.py:222
+#: SourceView.py:224
 msgid "Deleting source will remove it from the database."
 msgstr "Sletting av kilden vil fjerne den fra databasen."
 
-#: SourceView.py:226
+#: SourceView.py:228
 msgid "_Delete Source"
 msgstr "Slett kil_de"
 
-#: SourceView.py:267
+#: SourceView.py:269
 msgid "Cannot merge sources."
 msgstr "Kan ikke flette sammen kilder."
 
-#: SourceView.py:268
+#: SourceView.py:270
 msgid "Exactly two sources must be selected to perform a merge. A second source can be selected by holding down the control key while clicking on the desired source."
 msgstr "Nyaktig to kilder m vre valgt for  gjennomfre en fletting. Den andre kilden kan merkes ved  holde nede Ctrl-tasten samtidig som du klikker p den nskede kilden."
 
@@ -3321,33 +3410,33 @@ msgstr ""
 msgid "In order to create valid GEDCOM files, the following information needs to be entered. If you do not plan to generate GEDCOM files, you may leave this empty."
 msgstr "For  lage gyldige GEDCOM-filer, trengs flgende informasjon. Hvis du ikke har tenkt  lage GEDCOM-filer, kan du la vre  fylle ut dette."
 
-#: StartupDialog.py:243 gramps.glade:5910 gramps.glade:5981 gramps.glade:7774
-#: gramps.glade:8584 gramps.glade:9098 gramps.glade:9534 gramps.glade:12280
-#: gramps.glade:12775 plugins/soundex.glade:110
+#: StartupDialog.py:243 gramps.glade:6235 gramps.glade:6318 gramps.glade:8240
+#: gramps.glade:9157 gramps.glade:9730 gramps.glade:10213 gramps.glade:13193
+#: gramps.glade:13747 plugins/soundex.glade:110
 msgid "Name:"
 msgstr "Navn:"
 
-#: StartupDialog.py:244 gramps.glade:9486 plugins/Ancestors.py:505
+#: StartupDialog.py:244 gramps.glade:10157 plugins/Ancestors.py:505
 msgid "Address:"
 msgstr "Adresse:"
 
-#: StartupDialog.py:245 gramps.glade:14682
+#: StartupDialog.py:245 gramps.glade:15804
 msgid "City:"
 msgstr "By:"
 
-#: StartupDialog.py:246 gramps.glade:9606
+#: StartupDialog.py:246 gramps.glade:10297
 msgid "State/Province:"
 msgstr "Stat/provins:"
 
-#: StartupDialog.py:247 gramps.glade:9510 gramps.glade:14730
+#: StartupDialog.py:247 gramps.glade:10185 gramps.glade:15860
 msgid "Country:"
 msgstr "Land:"
 
-#: StartupDialog.py:248 gramps.glade:9582
+#: StartupDialog.py:248 gramps.glade:10269
 msgid "ZIP/Postal code:"
 msgstr "Postnummer:"
 
-#: StartupDialog.py:249 gramps.glade:9868 gramps.glade:14977
+#: StartupDialog.py:249 gramps.glade:10603 gramps.glade:16147
 msgid "Phone:"
 msgstr "Telefon:"
 
@@ -3415,7 +3504,7 @@ msgstr "Internettadressebehandler"
 msgid "Internet Address Editor for %s"
 msgstr "Internettadressebehandler for %s"
 
-#: Utils.py:72
+#: Utils.py:67
 msgid "The data can only be recovered by Undo operation or by quitting with abandoning changes."
 msgstr "Dataene kan kun gjenopprettes ved hjelp av Angre-operasjonen, eller ved  avslutte uten  lagre endringene som er gjort."
 
@@ -3441,34 +3530,35 @@ msgstr ""
 "\n"
 "Prv p nytt. Vitnet har ikke blitt endret."
 
-#: WriteGedcom.py:333 plugins/DescendReport.py:116
-#: plugins/ExportVCalendar.py:85 plugins/ExportVCard.py:88
+#: WriteGedcom.py:334 plugins/DescendReport.py:116
+#: plugins/ExportVCalendar.py:87 plugins/ExportVCard.py:89
 #: plugins/FtmStyleDescendants.py:121 plugins/GraphViz.py:517
 #: plugins/IndivComplete.py:514 plugins/StatisticsChart.py:831
-#: plugins/TimeLine.py:415 plugins/WebPage.py:1269 plugins/WriteFtree.py:90
-#: plugins/WriteGeneWeb.py:91
+#: plugins/TimeLine.py:415 plugins/WebPage.py:1269 plugins/WriteFtree.py:91
+#: plugins/WriteGeneWeb.py:92
 msgid "Descendants of %s"
 msgstr "Etterkommere av %s"
 
-#: WriteGedcom.py:337 plugins/Ancestors.py:141 plugins/ExportVCalendar.py:89
-#: plugins/ExportVCard.py:92 plugins/FtmStyleAncestors.py:96
+#: WriteGedcom.py:340 plugins/Ancestors.py:141 plugins/ExportVCalendar.py:93
+#: plugins/ExportVCard.py:95 plugins/FtmStyleAncestors.py:96
 #: plugins/GraphViz.py:521 plugins/IndivComplete.py:518
 #: plugins/StatisticsChart.py:835 plugins/TimeLine.py:419
-#: plugins/WebPage.py:1277 plugins/WriteFtree.py:94 plugins/WriteGeneWeb.py:95
+#: plugins/WebPage.py:1277 plugins/WriteFtree.py:97 plugins/WriteGeneWeb.py:98
 #, fuzzy
 msgid "Ancestors of %s"
 msgstr "Aner av %s"
 
-#: WriteGedcom.py:341 plugins/ExportVCalendar.py:93 plugins/ExportVCard.py:96
+#: WriteGedcom.py:346 plugins/ExportVCalendar.py:99 plugins/ExportVCard.py:101
 #: plugins/GraphViz.py:525 plugins/IndivComplete.py:522
 #: plugins/StatisticsChart.py:839 plugins/TimeLine.py:423
-#: plugins/WebPage.py:1281 plugins/WriteFtree.py:98 plugins/WriteGeneWeb.py:99
+#: plugins/WebPage.py:1281 plugins/WriteFtree.py:103
+#: plugins/WriteGeneWeb.py:104
 #, fuzzy
 msgid "People with common ancestor with %s"
 msgstr "Personer med samme aner som %s"
 
-#: WriteGedcom.py:557 WriteGedcom.py:562 docgen/AbiWord2Doc.py:77
-#: docgen/AbiWord2Doc.py:80 docgen/AsciiDoc.py:113 docgen/AsciiDoc.py:116
+#: WriteGedcom.py:565 WriteGedcom.py:570 docgen/AbiWord2Doc.py:75
+#: docgen/AbiWord2Doc.py:78 docgen/AsciiDoc.py:113 docgen/AsciiDoc.py:116
 #: docgen/HtmlDoc.py:225 docgen/HtmlDoc.py:228 docgen/HtmlDoc.py:353
 #: docgen/HtmlDoc.py:356 docgen/LaTeXDoc.py:87 docgen/LaTeXDoc.py:90
 #: docgen/OpenSpreadSheet.py:76 docgen/OpenSpreadSheet.py:78
@@ -3477,22 +3567,22 @@ msgstr "Personer med samme aner som %s"
 #: docgen/OpenSpreadSheet.py:436 docgen/OpenSpreadSheet.py:440
 #: docgen/PSDrawDoc.py:95 docgen/PSDrawDoc.py:98 docgen/PdfDoc.py:180
 #: docgen/RTFDoc.py:80 docgen/RTFDoc.py:83 docgen/SvgDrawDoc.py:75
-#: docgen/SvgDrawDoc.py:77 plugins/ExportVCalendar.py:168
-#: plugins/ExportVCalendar.py:172 plugins/ExportVCard.py:153
-#: plugins/ExportVCard.py:157 plugins/WriteGeneWeb.py:210
-#: plugins/WriteGeneWeb.py:214
+#: docgen/SvgDrawDoc.py:77 plugins/ExportVCalendar.py:178
+#: plugins/ExportVCalendar.py:182 plugins/ExportVCard.py:162
+#: plugins/ExportVCard.py:166 plugins/WriteGeneWeb.py:219
+#: plugins/WriteGeneWeb.py:223
 msgid "Could not create %s"
 msgstr "Kunne ikke lage %s"
 
-#: WriteGedcom.py:1252
+#: WriteGedcom.py:1272
 msgid "GE_DCOM"
 msgstr "GE_DCOM"
 
-#: WriteGedcom.py:1253
+#: WriteGedcom.py:1273
 msgid "GEDCOM is used to transfer data between genealogy programs. Most genealogy software will accept a GEDCOM file as input. "
 msgstr "GEDCOM brukes til  overfre data mellom slektsforskningsprogrammer. De fleste slektsforskningsprogram vil godta en GEDCOM-fil som inndata."
 
-#: WriteGedcom.py:1255
+#: WriteGedcom.py:1275
 msgid "GEDCOM export options"
 msgstr "GEDCOM-eksportinnstillinger"
 
@@ -3772,113 +3862,113 @@ msgstr "Ukjent relasjon mellom mann og kvinne"
 msgid "An unspecified relationship between a man and woman"
 msgstr "En uspesifisert relasjon mellom mann og kvinne"
 
-#: const.py:515
+#: const.py:522
 msgid "Also Known As"
 msgstr "Ogs kjent som"
 
-#: const.py:516
+#: const.py:523
 msgid "Birth Name"
 msgstr "Fdselsnavn"
 
-#: const.py:517
+#: const.py:524
 msgid "Married Name"
 msgstr "Navn som gift"
 
-#: const.py:518
+#: const.py:525
 msgid "Other Name"
 msgstr "Annet navn"
 
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid ""
 msgstr ""
 
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid "Cleared"
 msgstr "Ryddet"
 
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid "Completed"
 msgstr "Komplet"
 
-#: const.py:903
+#: const.py:910
 msgid "Infant"
 msgstr "Spedbarn"
 
-#: const.py:903 const.py:909
+#: const.py:910 const.py:916
 msgid "Stillborn"
 msgstr "Ddfdt"
 
-#: const.py:903 const.py:909 const.py:915
+#: const.py:910 const.py:916 const.py:922
 msgid "Pre-1970"
 msgstr "Fr 1970"
 
-#: const.py:903 const.py:909 const.py:915
+#: const.py:910 const.py:916 const.py:922
 msgid "Qualified"
 msgstr "Kvalifisert"
 
-#: const.py:904 const.py:910 const.py:916
+#: const.py:911 const.py:917 const.py:923
 msgid "Submitted"
 msgstr "Avgitt"
 
-#: const.py:904 const.py:910 const.py:916
+#: const.py:911 const.py:917 const.py:923
 msgid "Uncleared"
 msgstr "Uavklart"
 
-#: const.py:908
+#: const.py:915
 msgid "BIC"
 msgstr "BIC"
 
-#: const.py:909 const.py:915
+#: const.py:916 const.py:922
 msgid "DNS"
 msgstr "DNS"
 
-#: const.py:914
+#: const.py:921
 msgid "Canceled"
 msgstr "Avbrutt"
 
-#: const.py:915
+#: const.py:922
 msgid "DNS/CAN"
 msgstr "DNS/CAN"
 
-#: const.py:921
+#: const.py:928
 msgid "Flowed"
 msgstr "Flyt"
 
-#: const.py:922
+#: const.py:929
 msgid "Preformatted"
 msgstr "Preformatert"
 
-#: const.py:934
+#: const.py:941
 msgid "Text Reports"
 msgstr "Tekstrapporter"
 
-#: const.py:935
+#: const.py:942
 msgid "Graphical Reports"
 msgstr "Grafiske rapporter"
 
-#: const.py:936
+#: const.py:943
 msgid "Code Generators"
 msgstr "Kodegeneratorer"
 
-#: const.py:937 plugins/WebPage.py:1719
+#: const.py:944 plugins/WebPage.py:1719
 msgid "Web Page"
 msgstr "Nettside"
 
-#: const.py:938
+#: const.py:945
 msgid "View"
 msgstr "Vis"
 
-#: const.py:939
+#: const.py:946
 msgid "Books"
 msgstr "Bker"
 
-#: const.py:943 plugins/ScratchPad.py:356 plugins/ScratchPad.py:405
+#: const.py:950 plugins/ScratchPad.py:356 plugins/ScratchPad.py:405
 #: plugins/ScratchPad.py:413 plugins/SimpleBookTitle.py:169
 #: plugins/SimpleBookTitle.py:170 plugins/SimpleBookTitle.py:171
 msgid "Text"
 msgstr "Tekst"
 
-#: const.py:944
+#: const.py:951
 msgid "Graphics"
 msgstr "Grafikk"
 
@@ -4188,7 +4278,7 @@ msgstr ""
 msgid "GRAMPS makes every effort to maintain compatibility with GEDCOM, the general standard of recording genealogical information. Filters exist that make importing and exporting GEDCOM files trivial."
 msgstr ""
 
-#: docgen/AbiWord2Doc.py:332
+#: docgen/AbiWord2Doc.py:340
 msgid "AbiWord document"
 msgstr "AbiWord-dokument"
 
@@ -4270,7 +4360,7 @@ msgstr "SVG (Skalerbar Vektor Grafikk)"
 msgid "Encoding"
 msgstr "Koding"
 
-#: gedcomexport.glade:127 gramps.glade:20090 gramps.glade:28994
+#: gedcomexport.glade:127 gramps.glade:21644 gramps.glade:31156
 #: plugins/genewebexport.glade:103 plugins/merge.glade:385
 #: plugins/vcalendarexport.glade:103 plugins/vcardexport.glade:103
 #: plugins/writeftree.glade:124
@@ -4372,7 +4462,7 @@ msgstr "Laget av:"
 msgid "Status"
 msgstr "Status"
 
-#: gedcomimport.glade:216 gramps.glade:3482 gramps.glade:19306
+#: gedcomimport.glade:216 gramps.glade:3660 gramps.glade:20805
 msgid "Information"
 msgstr "Informasjon"
 
@@ -4418,394 +4508,394 @@ msgstr ""
 "ASCII\n"
 "UNICODE"
 
-#: gramps.glade:10 gramps.glade:31082
+#: gramps.glade:10 gramps.glade:33389
 msgid "GRAMPS"
 msgstr "GRAMPS"
 
-#: gramps.glade:44
+#: gramps.glade:45
 msgid "_File"
 msgstr "_Fil"
 
-#: gramps.glade:53
+#: gramps.glade:54
 msgid "_New"
 msgstr "_Ny"
 
-#: gramps.glade:75
+#: gramps.glade:76
 msgid "_Open..."
 msgstr "_pne ..."
 
-#: gramps.glade:97
+#: gramps.glade:98
 msgid "Open _Recent"
 msgstr "pne _nylig brukt"
 
-#: gramps.glade:112
+#: gramps.glade:113
 msgid "_Import..."
 msgstr "_Import ..."
 
-#: gramps.glade:134
+#: gramps.glade:135
 msgid "Save _As..."
 msgstr "L_agre som ..."
 
-#: gramps.glade:156
+#: gramps.glade:157
 msgid "E_xport..."
 msgstr "_Eksport ..."
 
-#: gramps.glade:184
+#: gramps.glade:185
 msgid "A_bandon changes and quit"
 msgstr "_Avslutt uten  lagre endringer"
 
-#: gramps.glade:193
+#: gramps.glade:194
 msgid "_Quit"
 msgstr "A_vslutt"
 
-#: gramps.glade:219
+#: gramps.glade:220
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: gramps.glade:228 gramps_main.py:536
+#: gramps.glade:229 gramps_main.py:536
 msgid "_Undo"
 msgstr "_Angre"
 
-#: gramps.glade:256 gramps.glade:918
+#: gramps.glade:257 gramps.glade:919
 msgid "Add a new item"
 msgstr "Legg til et nytt element"
 
-#: gramps.glade:257 rule.glade:135 rule.glade:722
+#: gramps.glade:258 rule.glade:135 rule.glade:722
 msgid "_Add..."
 msgstr "_Legg til ..."
 
-#: gramps.glade:279 gramps.glade:936
+#: gramps.glade:280 gramps.glade:937
 msgid "Remove the currently selected item"
 msgstr "Fjern det valgte elementet"
 
-#: gramps.glade:280
+#: gramps.glade:281
 msgid "R_emove"
 msgstr "Fj_erne"
 
-#: gramps.glade:302 gramps.glade:954
+#: gramps.glade:303 gramps.glade:955
 msgid "Edit the selected item"
 msgstr "Rediger det valgte elementet"
 
-#: gramps.glade:303
+#: gramps.glade:304
 msgid "E_dit..."
 msgstr "Re_diger ..."
 
-#: gramps.glade:318
+#: gramps.glade:319
 msgid "Compare and _Merge..."
 msgstr "_Sammenligne og flett sammen ..."
 
-#: gramps.glade:340
+#: gramps.glade:341
 msgid "Fast Mer_ge"
 msgstr "_Rask sammenfletting"
 
-#: gramps.glade:355
+#: gramps.glade:356
 msgid "Prefere_nces..."
 msgstr "Foretruk_ne innstillinger ..."
 
-#: gramps.glade:376
+#: gramps.glade:377
 msgid "_Column Editor..."
 msgstr "_Kolonnebehandler ..."
 
-#: gramps.glade:397
+#: gramps.glade:398
 msgid "Set _Home person..."
 msgstr "Sett _hjemperson ..."
 
-#: gramps.glade:422
+#: gramps.glade:423
 msgid "_View"
 msgstr "_Vis"
 
-#: gramps.glade:431
+#: gramps.glade:432
 msgid "_Filter"
 msgstr "_Filter"
 
-#: gramps.glade:441
+#: gramps.glade:442
 msgid "_Sidebar"
 msgstr "_Sidestolpe"
 
-#: gramps.glade:451
+#: gramps.glade:452
 msgid "_Toolbar"
 msgstr "_Verktylinje"
 
-#: gramps.glade:465
+#: gramps.glade:466
 msgid "_Go"
 msgstr "_G"
 
-#: gramps.glade:473
+#: gramps.glade:474
 msgid "_Bookmarks"
 msgstr "_Bokmerker"
 
-#: gramps.glade:482
+#: gramps.glade:483
 msgid "_Add bookmark"
 msgstr "_Legg til bokmerke"
 
-#: gramps.glade:504
+#: gramps.glade:505
 msgid "_Edit bookmarks..."
 msgstr "_Rediger bokmerker ..."
 
-#: gramps.glade:532
+#: gramps.glade:533
 msgid "_Go to bookmark"
 msgstr "_G til bokmerke"
 
-#: gramps.glade:544
+#: gramps.glade:545
 msgid "_Reports"
 msgstr "_Rapporter"
 
-#: gramps.glade:552
+#: gramps.glade:553
 msgid "_Tools"
 msgstr "Verk_ty"
 
-#: gramps.glade:560
+#: gramps.glade:561
 msgid "_Windows"
 msgstr "_Vinduer"
 
-#: gramps.glade:568
+#: gramps.glade:569
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: gramps.glade:577
+#: gramps.glade:578
 msgid "_User manual"
 msgstr "_Brukerveiledning"
 
-#: gramps.glade:599
+#: gramps.glade:600
 msgid "_FAQ"
 msgstr "_OSS"
 
-#: gramps.glade:626
+#: gramps.glade:627
 msgid "GRAMPS _home page"
 msgstr "GRAMPS _hjemmeside"
 
-#: gramps.glade:647
+#: gramps.glade:648
 msgid "GRAMPS _mailing lists"
 msgstr "GRAMPS _e-postlister"
 
-#: gramps.glade:668
+#: gramps.glade:669
 msgid "_Report a bug"
 msgstr "_Rapporter en feil"
 
-#: gramps.glade:683
+#: gramps.glade:684
 msgid "_Show plugin status..."
 msgstr "Vi_s status for programtillegg ..."
 
-#: gramps.glade:692
+#: gramps.glade:693
 msgid "_Open example database"
 msgstr "_pne eksempel-database"
 
-#: gramps.glade:701
+#: gramps.glade:702
 msgid "_About"
 msgstr "_Om"
 
-#: gramps.glade:751
+#: gramps.glade:752
 msgid "Open database"
 msgstr "pne database"
 
-#: gramps.glade:752
+#: gramps.glade:753
 msgid "Open"
 msgstr "pne"
 
-#: gramps.glade:782
+#: gramps.glade:783
 msgid "Go back in history"
 msgstr "G tilbake i historikken"
 
-#: gramps.glade:783
+#: gramps.glade:784
 msgid "Back"
 msgstr "Tilbake"
 
-#: gramps.glade:801
+#: gramps.glade:802
 msgid "Go forward in history"
 msgstr "G fremover i historikken"
 
-#: gramps.glade:802
+#: gramps.glade:803
 msgid "Forward"
 msgstr "Fremover"
 
-#: gramps.glade:820
+#: gramps.glade:821
 msgid "Make the Home Person the active person"
 msgstr "Gjr hjempersonen til den aktive personen"
 
-#: gramps.glade:851
+#: gramps.glade:852
 msgid "Open Scratch Pad"
 msgstr "pne utklippstavle"
 
-#: gramps.glade:852
+#: gramps.glade:853
 msgid "ScratchPad"
 msgstr "Utklippstavle"
 
-#: gramps.glade:869
+#: gramps.glade:870
 msgid "Generate reports"
 msgstr "Lage rapporter"
 
-#: gramps.glade:870
+#: gramps.glade:871
 msgid "Reports"
 msgstr "Rapporter"
 
-#: gramps.glade:887
+#: gramps.glade:888
 msgid "Run tools"
 msgstr "Bruk verkty"
 
-#: gramps.glade:888
+#: gramps.glade:889
 msgid "Tools"
 msgstr "Verkty"
 
-#: gramps.glade:919
+#: gramps.glade:920
 msgid "Add"
 msgstr "Legg til"
 
-#: gramps.glade:937
+#: gramps.glade:938
 msgid "Remove"
 msgstr "Fjern"
 
-#: gramps.glade:1028 gramps.glade:1452
+#: gramps.glade:1029 gramps.glade:1486
 msgid "People"
 msgstr "Personer"
 
-#: gramps.glade:1076 gramps.glade:2237 gramps.glade:2992
+#: gramps.glade:1081 gramps.glade:2310 gramps.glade:3104
 msgid "Family"
 msgstr "Familie"
 
-#: gramps.glade:1124 gramps.glade:3039
+#: gramps.glade:1133 gramps.glade:3155
 msgid "Pedigree"
 msgstr "Stamtavle"
 
-#: gramps.glade:1172 gramps.glade:3097
+#: gramps.glade:1185 gramps.glade:3220
 msgid "Sources"
 msgstr "Kilder"
 
-#: gramps.glade:1220 gramps.glade:3155
+#: gramps.glade:1237 gramps.glade:3285
 msgid "Places"
 msgstr "Steder"
 
-#: gramps.glade:1268 gramps.glade:3554
+#: gramps.glade:1289 gramps.glade:3739
 msgid "Media"
 msgstr "Media"
 
-#: gramps.glade:1376
+#: gramps.glade:1407
 msgid "Invert"
 msgstr "Snu"
 
-#: gramps.glade:1394
+#: gramps.glade:1425
 msgid "Apply filter using the selected controls"
 msgstr "Bruk filteret med de valgte kontrollene"
 
-#: gramps.glade:1481 gramps.glade:2956
+#: gramps.glade:1519 gramps.glade:3068
 msgid "Exchange the current spouse with the active person"
 msgstr "Bytt ut gjeldende ektefelle med den aktive personen"
 
-#: gramps.glade:1547 gramps.glade:2718
+#: gramps.glade:1585 gramps.glade:2822
 msgid "Adds a new person to the database and to a new relationship"
 msgstr "Legg til en ny person i databasen med en ny relasjon"
 
-#: gramps.glade:1574 gramps.glade:2745
+#: gramps.glade:1612 gramps.glade:2849
 msgid "Selects an existing person from the database and adds to a new relationship"
 msgstr "Velger en eksisterende person fra databasen og legg til en ny relasjon"
 
-#: gramps.glade:1601 gramps.glade:2772
+#: gramps.glade:1639 gramps.glade:2876
 msgid "Removes the currently selected spouse"
 msgstr "Fjern den valgte ektefellen"
 
-#: gramps.glade:1644 gramps.glade:2865
+#: gramps.glade:1682 gramps.glade:2977
 msgid "Make the active person's parents the active family"
 msgstr "Gjr den aktive personens familie til den aktive familien"
 
-#: gramps.glade:1671 gramps.glade:2892
+#: gramps.glade:1709 gramps.glade:3004
 msgid "Adds a new set of parents to the active person"
 msgstr "Legg til et nytt sett med foreldre til den aktive personen"
 
-#: gramps.glade:1698 gramps.glade:2919
+#: gramps.glade:1736 gramps.glade:3031
 msgid "Deletes the selected parents from the active person"
 msgstr "Slett de valgte foreldrene fra den aktive personen"
 
-#: gramps.glade:1744 gramps.glade:2026 gramps.glade:2360 gramps.glade:2390
+#: gramps.glade:1782 gramps.glade:2090 gramps.glade:2447 gramps.glade:2480
 msgid "Double-click to edit the relationship to the selected parents"
 msgstr "Dobbeltklikk for  redigere relasjonene til de valgte foreldrene"
 
-#: gramps.glade:1771 gramps.glade:2596
+#: gramps.glade:1812 gramps.glade:2696
 msgid "Make the selected spouse's parents the active family"
 msgstr "Gjr den valgte ektefellens familie til den aktive familien"
 
-#: gramps.glade:1798 gramps.glade:2623
+#: gramps.glade:1839 gramps.glade:2723
 msgid "Adds a new set of parents to the selected spouse"
 msgstr "Legg til et nytt sett med foreldre til den valgte ektefellen"
 
-#: gramps.glade:1825 gramps.glade:2650
+#: gramps.glade:1866 gramps.glade:2750
 msgid "Deletes the selected parents from the selected spouse"
 msgstr "Fjern de valgte foreldrene fra den valgte ektefellen"
 
-#: gramps.glade:1862 gramps.glade:2296
+#: gramps.glade:1903 gramps.glade:2376
 msgid "_Children"
 msgstr "_Barn"
 
-#: gramps.glade:1887 gramps.glade:2809
+#: gramps.glade:1932 gramps.glade:2913
 msgid "_Active person"
 msgstr "_Aktiv person"
 
-#: gramps.glade:1912 gramps.glade:2834
+#: gramps.glade:1961 gramps.glade:2942
 msgid "Active person's _parents"
 msgstr "Den aktive personens _foreldre"
 
-#: gramps.glade:1937 gramps.glade:2687
+#: gramps.glade:1990 gramps.glade:2787
 msgid "Relati_onship"
 msgstr "Relasj_oner"
 
-#: gramps.glade:1962 gramps.glade:2565
+#: gramps.glade:2019 gramps.glade:2661
 msgid "Spo_use's parents"
 msgstr "_Ektefellens foreldre"
 
-#: gramps.glade:2056 gramps.glade:2420
+#: gramps.glade:2123 gramps.glade:2513
 msgid "Double-click to edit the active person"
 msgstr "Dobbeltklikk for  redigere den aktive personen"
 
-#: gramps.glade:2086 gramps.glade:2275
+#: gramps.glade:2156 gramps.glade:2352
 msgid "Double-click to edit the relationship information, Shift-click to edit the person"
 msgstr "Dobbeltklikk for  redigere relasjonsinformasjonen. Trykk Shift og klikk for  redigere personen"
 
-#: gramps.glade:2113 gramps.glade:2447
+#: gramps.glade:2186 gramps.glade:2543
 msgid "Make the selected child the active person"
 msgstr "Gjr det valgte barnet til den aktive personen"
 
-#: gramps.glade:2140 gramps.glade:2474
+#: gramps.glade:2213 gramps.glade:2570
 msgid "Adds a new child to the database and to the current family"
 msgstr "Legg til et nytt barn i databasen og i den aktuelle familien"
 
-#: gramps.glade:2167 gramps.glade:2501
+#: gramps.glade:2240 gramps.glade:2597
 msgid "Selects an existing person from the database and adds as a child to the current family"
 msgstr "Velger en eksisterende person fra databasen, og legger den til som et barn i den aktuelle familien"
 
-#: gramps.glade:2194 gramps.glade:2528
+#: gramps.glade:2267 gramps.glade:2624
 msgid "Deletes the selected child from the selected family"
 msgstr "Sletter det valgte barnet fra den valgte familien"
 
-#: gramps.glade:3206 gramps.glade:19030 gramps.glade:21050 gramps.glade:21315
-#: gramps.glade:22712
+#: gramps.glade:3340 gramps.glade:20485 gramps.glade:22681 gramps.glade:22959
+#: gramps.glade:24471
 msgid "Preview"
 msgstr "Forhndsvisning"
 
-#: gramps.glade:3242 gramps.glade:19066
+#: gramps.glade:3380 gramps.glade:20525
 msgid "Details:"
 msgstr "Detaljer:"
 
-#: gramps.glade:3313 gramps.glade:19137 gramps.glade:21351 gramps.glade:22748
+#: gramps.glade:3463 gramps.glade:20608 gramps.glade:22999 gramps.glade:24511
 msgid "Path:"
 msgstr "Sti:"
 
-#: gramps.glade:3338 gramps.glade:7942 gramps.glade:8512 gramps.glade:9026
-#: gramps.glade:12184 gramps.glade:12799 gramps.glade:19162 gramps.glade:22079
-#: gramps.glade:23157
+#: gramps.glade:3492 gramps.glade:8436 gramps.glade:9073 gramps.glade:9646
+#: gramps.glade:13081 gramps.glade:13775 gramps.glade:20637 gramps.glade:23799
+#: gramps.glade:24964
 msgid "Type:"
 msgstr "Type:"
 
-#: gramps.glade:3778
+#: gramps.glade:3975
 msgid "Check to show all people in the list.  Uncheck to get the list filtered by birth and death dates."
 msgstr "Kryss av for  vise alle personene i lista. Fjern krysset for  filtrere lista p fdsels- og ddsdatoer."
 
-#: gramps.glade:3780 gramps.glade:4156 gramps.glade:4574
+#: gramps.glade:3977 gramps.glade:4380 gramps.glade:4826
 msgid "_Show all"
 msgstr "_Vis alle"
 
-#: gramps.glade:3827 gramps.glade:11954
+#: gramps.glade:4024 gramps.glade:12825
 msgid "_Relationship type:"
 msgstr "_Relasjonstype:"
 
-#: gramps.glade:3855
+#: gramps.glade:4056
 msgid ""
 "Married\n"
 "Unmarried\n"
@@ -4819,651 +4909,654 @@ msgstr ""
 "Ukjent\n"
 "Annet"
 
-#: gramps.glade:4025
+#: gramps.glade:4233
 msgid "_Father's relationship to child:"
 msgstr "_Fars relasjon til barn:"
 
-#: gramps.glade:4049
+#: gramps.glade:4261
 msgid "_Mother's relationship to child:"
 msgstr "_Mors relasjon til et barn:"
 
-#: gramps.glade:4073
+#: gramps.glade:4289
 msgid "_Parents' relationship to each other:"
 msgstr "_Foreldrenes relasjon til hverandre:"
 
-#: gramps.glade:4097
+#: gramps.glade:4317
 msgid "Fat_her"
 msgstr "_Far"
 
-#: gramps.glade:4192
+#: gramps.glade:4416
 msgid "Moth_er"
 msgstr "_Mor"
 
-#: gramps.glade:4217
+#: gramps.glade:4445
 msgid "Relationships"
 msgstr "Relasjoner"
 
-#: gramps.glade:4311
+#: gramps.glade:4549
 msgid "Show _all"
 msgstr "Vis _alle"
 
-#: gramps.glade:4643
+#: gramps.glade:4895
 msgid "Relationship to father:"
 msgstr "Relasjon til far:"
 
-#: gramps.glade:4667
+#: gramps.glade:4923
 msgid "Relationship to mother:"
 msgstr "Relasjon til mor:"
 
-#: gramps.glade:4758 gramps.glade:6549 gramps.glade:11846 gramps.glade:28451
+#: gramps.glade:5023 gramps.glade:6932 gramps.glade:12713 gramps.glade:30562
 msgid "Abandon changes and close window"
 msgstr "Lukk vinduet uten  lagre endringene"
 
-#: gramps.glade:4773 gramps.glade:6564 gramps.glade:11861 gramps.glade:25038
-#: gramps.glade:27302 gramps.glade:28196 gramps.glade:28466
+#: gramps.glade:5038 gramps.glade:6947 gramps.glade:12728 gramps.glade:26958
+#: gramps.glade:29348 gramps.glade:30294 gramps.glade:30577
 msgid "Accept changes and close window"
 msgstr "Godta endringene og lukk vinduet"
 
-#: gramps.glade:4860 gramps.glade:6759 gramps.glade:14059 gramps.glade:18137
-#: gramps.glade:21096 gramps.glade:22932 gramps.glade:28635
+#: gramps.glade:5129 gramps.glade:7162 gramps.glade:15121 gramps.glade:19547
+#: gramps.glade:22731 gramps.glade:24719 gramps.glade:30762
 msgid "_Title:"
 msgstr "_Tittel:"
 
-#: gramps.glade:4885
+#: gramps.glade:5158
 msgid "_Author:"
 msgstr "_Forfatter:"
 
-#: gramps.glade:4956
+#: gramps.glade:5233
 msgid "_Publication information:"
 msgstr "_Publiseringsinformasjon:"
 
-#: gramps.glade:5023
+#: gramps.glade:5304
 msgid "A_bbreviation:"
 msgstr "_Forkortelse:"
 
-#: gramps.glade:5054 gramps.glade:12125 gramps.glade:14453 gramps.glade:14623
-#: gramps.glade:23075 gramps.glade:25412 gramps.glade:26416 gramps.glade:27784
-#: gramps.glade:29213 plugins/verify.glade:530
+#: gramps.glade:5339 gramps.glade:13014 gramps.glade:15547 gramps.glade:15737
+#: gramps.glade:24870 gramps.glade:27359 gramps.glade:28409 gramps.glade:29862
+#: gramps.glade:31390 plugins/verify.glade:530
 msgid "General"
 msgstr "Generelt"
 
-#: gramps.glade:5124 gramps.glade:10183 gramps.glade:13187 gramps.glade:15258
-#: gramps.glade:21905 gramps.glade:23465 gramps.glade:25663 gramps.glade:26665
-#: gramps.glade:28033 gramps.glade:29464
+#: gramps.glade:5413 gramps.glade:10933 gramps.glade:14198 gramps.glade:16443
+#: gramps.glade:23613 gramps.glade:25291 gramps.glade:27621 gramps.glade:28669
+#: gramps.glade:30122 gramps.glade:31652
 msgid "Format"
 msgstr "Format"
 
-#: gramps.glade:5148 gramps.glade:10208 gramps.glade:13211 gramps.glade:15282
-#: gramps.glade:21929 gramps.glade:23489 gramps.glade:25687 gramps.glade:26689
-#: gramps.glade:28057 gramps.glade:29488
+#: gramps.glade:5441 gramps.glade:10962 gramps.glade:14226 gramps.glade:16471
+#: gramps.glade:23641 gramps.glade:25319 gramps.glade:27649 gramps.glade:28697
+#: gramps.glade:30150 gramps.glade:31680
 msgid "Multiple spaces, tabs, and single line breaks are replaced with single spaces. Two consecutive line breaks mark a new paragraph."
 msgstr "Gjentakende mellomrom, tabulatorer og enkle linjeskift erstattes med et enkelt mellomrom. To etterflgende linjeskift markerer et nytt avsnitt."
 
-#: gramps.glade:5150 gramps.glade:10210 gramps.glade:13213 gramps.glade:15284
-#: gramps.glade:21931 gramps.glade:23491 gramps.glade:25689 gramps.glade:26691
-#: gramps.glade:28059 gramps.glade:29490
+#: gramps.glade:5443 gramps.glade:10964 gramps.glade:14228 gramps.glade:16473
+#: gramps.glade:23643 gramps.glade:25321 gramps.glade:27651 gramps.glade:28699
+#: gramps.glade:30152 gramps.glade:31682
 msgid "_Flowed"
 msgstr "_Flyt"
 
-#: gramps.glade:5171 gramps.glade:10231 gramps.glade:13234 gramps.glade:15305
-#: gramps.glade:21952 gramps.glade:23512 gramps.glade:25710 gramps.glade:26712
-#: gramps.glade:28080 gramps.glade:29511
+#: gramps.glade:5464 gramps.glade:10985 gramps.glade:14249 gramps.glade:16494
+#: gramps.glade:23664 gramps.glade:25342 gramps.glade:27672 gramps.glade:28720
+#: gramps.glade:30173 gramps.glade:31703
 msgid "Formatting is preserved, except for the leading whitespace. Multiple spaces, tabs, and all line breaks are respected."
 msgstr "Formateringer, bortsett fra innledende blanke tegn, blir beholdt. Gjentakende mellomrom, tabulatorer og alle linjeskift blir beholdt."
 
-#: gramps.glade:5173 gramps.glade:10233 gramps.glade:13236 gramps.glade:15307
-#: gramps.glade:21954 gramps.glade:23514 gramps.glade:25712 gramps.glade:26714
-#: gramps.glade:28082 gramps.glade:29513
+#: gramps.glade:5466 gramps.glade:10987 gramps.glade:14251 gramps.glade:16496
+#: gramps.glade:23666 gramps.glade:25344 gramps.glade:27674 gramps.glade:28722
+#: gramps.glade:30175 gramps.glade:31705
 msgid "_Preformatted"
 msgstr "_Preformatert"
 
-#: gramps.glade:5268 gramps.glade:5405 gramps.glade:10490 gramps.glade:13484
-#: gramps.glade:15587 gramps.glade:25993
+#: gramps.glade:5568 gramps.glade:5709 gramps.glade:11255 gramps.glade:14510
+#: gramps.glade:16787 gramps.glade:27966
 msgid "Add a new media object to the database and place it in this gallery"
 msgstr "Legg til et nytt mediaobjekt i databasen, og legg det til dette galleriet"
 
-#: gramps.glade:5296 gramps.glade:5489 gramps.glade:13567 gramps.glade:15670
-#: gramps.glade:26076
+#: gramps.glade:5596 gramps.glade:5793 gramps.glade:14593 gramps.glade:16870
+#: gramps.glade:28049
 msgid "Remove selected object from this gallery only"
 msgstr "Fjern det valgte objektet kun fra dette galleriet"
 
-#: gramps.glade:5337
+#: gramps.glade:5637
 msgid "Data"
 msgstr "Data"
 
-#: gramps.glade:5433 gramps.glade:10518 gramps.glade:13512 gramps.glade:15615
-#: gramps.glade:26021
+#: gramps.glade:5737 gramps.glade:11283 gramps.glade:14538 gramps.glade:16815
+#: gramps.glade:27994
 msgid "Select an existing media object from the database and place it in this gallery"
 msgstr "Velg et eksisterende mediaobjekt fra databasen, og legg det til dette galleriet"
 
-#: gramps.glade:5461 gramps.glade:10546 gramps.glade:15643 gramps.glade:26049
+#: gramps.glade:5765 gramps.glade:11311 gramps.glade:16843 gramps.glade:28022
 msgid "Edit the properties of the selected object"
 msgstr "Endre egenskapene til det valgte objektet"
 
-#: gramps.glade:5550 gramps.glade:10621 gramps.glade:13608 gramps.glade:15731
-#: gramps.glade:26137 plugins/WebPage.py:432
+#: gramps.glade:5854 gramps.glade:11386 gramps.glade:14634 gramps.glade:16931
+#: gramps.glade:28110 plugins/WebPage.py:432
 msgid "Gallery"
 msgstr "Galleri"
 
-#: gramps.glade:5595 gramps.glade:16128 gramps.glade:23593
+#: gramps.glade:5906 gramps.glade:17359 gramps.glade:25430
 msgid "References"
 msgstr "Referanser"
 
-#: gramps.glade:5742
+#: gramps.glade:6062
 msgid "Open an _existing database"
 msgstr "pne en _eksisterende database"
 
-#: gramps.glade:5762
+#: gramps.glade:6082
 msgid "Create a _new database"
 msgstr "Lag en _ny database"
 
-#: gramps.glade:5957
+#: gramps.glade:6290
 msgid "_Relationship:"
 msgstr "_Relasjon:"
 
-#: gramps.glade:6005
+#: gramps.glade:6346
 msgid "Relation_ship:"
 msgstr "Rela_sjon:"
 
-#: gramps.glade:6056
+#: gramps.glade:6405
 msgid "Father"
 msgstr "Far"
 
-#: gramps.glade:6080
+#: gramps.glade:6433
 msgid "Mother"
 msgstr "Mor"
 
-#: gramps.glade:6103
+#: gramps.glade:6460
 msgid "Preference"
 msgstr "Innstilling"
 
-#: gramps.glade:6126
+#: gramps.glade:6487
 msgid "Indicates that the parents should be used as the preferred parents for reporting and display purposes"
 msgstr "Angi at foreldrene skal bli brukt som de foretrukne foreldrene i rapporter og ved fremvisning"
 
-#: gramps.glade:6128
+#: gramps.glade:6489
 msgid "Use as preferred parents"
 msgstr "Bruk som foretrukne foreldre"
 
-#: gramps.glade:6328
+#: gramps.glade:6698
 msgid "_Text:"
 msgstr "_Tekst:"
 
-#: gramps.glade:6487
+#: gramps.glade:6865
 msgid "Select columns"
 msgstr " Velg kolonner"
 
-#: gramps.glade:6659 gramps.glade:28552
+#: gramps.glade:7046 gramps.glade:30667
 msgid "_Given name:"
 msgstr "_Fornavn:"
 
-#: gramps.glade:6684 gramps.glade:28826
+#: gramps.glade:7075 gramps.glade:30965
 msgid "_Family name:"
 msgstr "_Etternavn:"
 
-#: gramps.glade:6709
+#: gramps.glade:7104
 msgid "Famil_y prefix:"
 msgstr "Familieforstavelse:"
 
-#: gramps.glade:6734
+#: gramps.glade:7133
 msgid "S_uffix:"
 msgstr "Etterstavelse:"
 
-#: gramps.glade:6784
+#: gramps.glade:7191
 msgid "Nic_kname:"
 msgstr "_Kallenavn:"
 
-#: gramps.glade:6809 gramps.glade:28608
+#: gramps.glade:7220 gramps.glade:30731
 msgid "T_ype:"
 msgstr "T_ype:"
 
-#: gramps.glade:6833
+#: gramps.glade:7248
 msgid "An optional suffix to the name, such as \"Jr.\" or \"III\""
 msgstr "Valgfri etterstavelse p navnet, som for eksempel Jr. eller III"
 
-#: gramps.glade:6855
+#: gramps.glade:7270
 msgid "A title used to refer to the person, such as \"Dr.\" or \"Rev.\""
 msgstr "Tittel som brukes for  henvise til personen, som for eksempel Dr. eller Rev."
 
-#: gramps.glade:6877
+#: gramps.glade:7292
 msgid "A name that the person was more commonly known by"
 msgstr "Et navn som personen var mer kjent som"
 
-#: gramps.glade:6899
+#: gramps.glade:7314
 msgid "Preferred name"
 msgstr "Foretrukket navn"
 
-#: gramps.glade:6930
+#: gramps.glade:7349
 msgid "_male"
 msgstr "_mann"
 
-#: gramps.glade:6950
+#: gramps.glade:7369
 msgid "fema_le"
 msgstr "k_vinne"
 
-#: gramps.glade:6971
+#: gramps.glade:7390
 msgid "u_nknown"
 msgstr "ukje_nt"
 
-#: gramps.glade:7001
+#: gramps.glade:7420
 msgid "Birth"
 msgstr "Fdsel"
 
-#: gramps.glade:7025
+#: gramps.glade:7448
 msgid "GRAMPS _ID:"
 msgstr "GRAMPS _ID:"
 
-#: gramps.glade:7071
+#: gramps.glade:7498
 msgid "Death"
 msgstr "Dd"
 
-#: gramps.glade:7109
+#: gramps.glade:7543
 msgid "An optional prefix for the family name that is not used in sorting, such as \"de\" or \"van\""
 msgstr "Valgfri forstavelse for familienavn som ikke er med i sortering, som for eksempel de, van eller von"
 
-#: gramps.glade:7131
+#: gramps.glade:7565
 msgid "The person's given name"
 msgstr "Personens fornavn"
 
-#: gramps.glade:7176
+#: gramps.glade:7610
 msgid "Edit the preferred name"
 msgstr "Rediger det foretrukne navnet"
 
-#: gramps.glade:7206
+#: gramps.glade:7640
 msgid "Gender"
 msgstr "Kjnn"
 
-#: gramps.glade:7229
+#: gramps.glade:7667
 msgid "Identification"
 msgstr "Identifikasjon"
 
-#: gramps.glade:7277
+#: gramps.glade:7719
 msgid "Image"
 msgstr "Bilde"
 
-#: gramps.glade:7308 gramps.glade:12091
+#: gramps.glade:7754 gramps.glade:12980
 msgid "Information i_s complete"
 msgstr "Informa_sjonen er komplett"
 
-#: gramps.glade:7330
+#: gramps.glade:7776
 msgid "Information is pri_vate"
 msgstr "Informasjon er pri_vat"
 
-#: gramps.glade:7360 gramps.glade:11012 gramps.glade:18007 gramps.glade:22978
-#: gramps.glade:25147 gramps.glade:27388
+#: gramps.glade:7806 gramps.glade:11812 gramps.glade:19397 gramps.glade:24769
+#: gramps.glade:27075 gramps.glade:29438
 msgid "_Date:"
 msgstr "_Dato:"
 
-#: gramps.glade:7384 gramps.glade:11084 gramps.glade:25203
+#: gramps.glade:7834 gramps.glade:11892 gramps.glade:27139
 msgid "_Place:"
 msgstr "Ste_d:"
 
-#: gramps.glade:7431
+#: gramps.glade:7885
 msgid "Invoke birth event editor"
 msgstr "Starte fdselshendelsesbehandleren"
 
-#: gramps.glade:7486 gramps.glade:7589 gramps.glade:11628 gramps.glade:11688
-#: gramps.glade:11748 gramps.glade:13846 gramps.glade:18436 gramps.glade:23027
-#: gramps.glade:29116
+#: gramps.glade:7940 gramps.glade:8047 gramps.glade:12490 gramps.glade:12550
+#: gramps.glade:12610 gramps.glade:14899 gramps.glade:19866 gramps.glade:24822
+#: gramps.glade:31293
 msgid "Invoke date editor"
 msgstr "Starte datobehandler"
 
-#: gramps.glade:7539 gramps.glade:11177
+#: gramps.glade:7993 gramps.glade:11993
 msgid "D_ate:"
 msgstr "_Dato:"
 
-#: gramps.glade:7625
+#: gramps.glade:8083
 msgid "Invoke death event editor"
 msgstr "Starte ddsfallsbehandleren"
 
-#: gramps.glade:7655
+#: gramps.glade:8113
 msgid "Plac_e:"
 msgstr "St_ed:"
 
-#: gramps.glade:7798 gramps.glade:8608 gramps.glade:9122 gramps.glade:9558
-#: gramps.glade:12304 gramps.glade:12751
+#: gramps.glade:8268 gramps.glade:9185 gramps.glade:9758 gramps.glade:10241
+#: gramps.glade:13221 gramps.glade:13719
 msgid "Confidence:"
 msgstr "Troverdighet:"
 
-#: gramps.glade:7822
+#: gramps.glade:8296
 msgid "Family prefix:"
 msgstr "Familieforstavelse:"
 
-#: gramps.glade:7966
+#: gramps.glade:8464
 msgid "Alternate name"
 msgstr "Alternativt navn"
 
-#: gramps.glade:7990 gramps.glade:8560 gramps.glade:9074 gramps.glade:9654
-#: gramps.glade:12375 gramps.glade:12823
+#: gramps.glade:8492 gramps.glade:9129 gramps.glade:9702 gramps.glade:10353
+#: gramps.glade:13304 gramps.glade:13803
 msgid "Primary source"
 msgstr "Primrkilde"
 
-#: gramps.glade:8266
+#: gramps.glade:8807
 msgid "Create an alternate name for this person"
 msgstr "Lag et alternativt navn p denne personen"
 
-#: gramps.glade:8295
+#: gramps.glade:8836
 msgid "Edit the selected name"
 msgstr "Rediger det valgte navnet"
 
-#: gramps.glade:8323
+#: gramps.glade:8864
 msgid "Delete the selected name"
 msgstr "Slett det valgte navnet"
 
-#: gramps.glade:8375
+#: gramps.glade:8916
 msgid "Names"
 msgstr "Navn"
 
-#: gramps.glade:8416
+#: gramps.glade:8961
 msgid "Event"
 msgstr "Hendelse"
 
-#: gramps.glade:8464 gramps.glade:12232
+#: gramps.glade:9017 gramps.glade:13137
 msgid "Cause:"
 msgstr "Grunn:"
 
-#: gramps.glade:8845
+#: gramps.glade:9457
 msgid "Create a new event"
 msgstr "Lag en ny hendelse"
 
-#: gramps.glade:8874
+#: gramps.glade:9486
 msgid "Edit the selected event"
 msgstr "Rediger den valgte hendelsen"
 
-#: gramps.glade:8902
+#: gramps.glade:9514
 msgid "Delete the selected event"
 msgstr "Slett den valgte hendelsen"
 
-#: gramps.glade:9002 gramps.glade:12847 gramps.glade:22174 gramps.glade:23205
+#: gramps.glade:9618 gramps.glade:13831 gramps.glade:23910 gramps.glade:25020
 msgid "Attributes"
 msgstr "Egenskaper"
 
-#: gramps.glade:9287
+#: gramps.glade:9946
 msgid "Create a new attribute"
 msgstr "Lag en ny egenskap"
 
-#: gramps.glade:9316
+#: gramps.glade:9975
 msgid "Edit the selected attribute"
 msgstr "Rediger den valgte egenskapen"
 
-#: gramps.glade:9344 gramps.glade:13065 gramps.glade:22299 gramps.glade:23329
+#: gramps.glade:10003 gramps.glade:14072 gramps.glade:24042 gramps.glade:25151
 msgid "Delete the selected attribute"
 msgstr "Slett den valgte egenskapen"
 
-#: gramps.glade:9403 gramps.glade:13117 gramps.glade:22364 gramps.glade:23395
+#: gramps.glade:10062 gramps.glade:14124 gramps.glade:24107 gramps.glade:25217
 msgid "Attributes"
 msgstr "Egenskaper"
 
-#: gramps.glade:9438
+#: gramps.glade:10101
 msgid "City/County:"
 msgstr "By/fylke:"
 
-#: gramps.glade:9630
+#: gramps.glade:10325
 msgid "Addresses"
 msgstr "Adresser"
 
-#: gramps.glade:9995
+#: gramps.glade:10741
 msgid "Create a new address"
 msgstr "Lag ny adresse"
 
-#: gramps.glade:10024
+#: gramps.glade:10770
 msgid "Edit the selected address"
 msgstr "Rediger den valgte adressen"
 
-#: gramps.glade:10052
+#: gramps.glade:10798
 msgid "Delete the selected address"
 msgstr "Slett den valgte adressen"
 
-#: gramps.glade:10145
+#: gramps.glade:10895
 msgid "Enter miscellaneous relevant data and documentation"
 msgstr "Skriv inn annen informasjon og dokumentasjon"
 
-#: gramps.glade:10268 gramps.glade:13271 gramps.glade:21989 gramps.glade:23549
+#: gramps.glade:11022 gramps.glade:14286 gramps.glade:23701 gramps.glade:25379
 #: plugins/IndivComplete.py:166 plugins/WebPage.py:567
 msgid "Notes"
 msgstr "Kommentarer"
 
-#: gramps.glade:10326
+#: gramps.glade:11087
 msgid "Add a source"
 msgstr "Legg til kilde"
 
-#: gramps.glade:10353
+#: gramps.glade:11114
 msgid "Edit the selected source"
 msgstr "Rediger den valgte kilden"
 
-#: gramps.glade:10379
+#: gramps.glade:11140
 msgid "Remove the selected source"
 msgstr "Fjern den valgte kilden"
 
-#: gramps.glade:10423 gramps.glade:13423 gramps.glade:15520 gramps.glade:22542
-#: gramps.glade:23771 gramps.glade:25590 gramps.glade:26594 gramps.glade:27962
-#: gramps.glade:29392 plugins/Ancestors.py:159 plugins/IndivComplete.py:324
+#: gramps.glade:11184 gramps.glade:14445 gramps.glade:16716 gramps.glade:24292
+#: gramps.glade:25615 gramps.glade:27544 gramps.glade:28594 gramps.glade:30047
+#: gramps.glade:31576 plugins/Ancestors.py:159 plugins/IndivComplete.py:324
 #: plugins/ScratchPad.py:153 plugins/ScratchPad.py:293
 #: plugins/ScratchPad.py:326 plugins/WebPage.py:224
 msgid "Sources"
 msgstr "Kilder"
 
-#: gramps.glade:10573
+#: gramps.glade:11338
 msgid "Remove the selected object from this gallery only"
 msgstr "Fjern det valgte objektet fra kun dette galleriet"
 
-#: gramps.glade:10656 gramps.glade:15766
+#: gramps.glade:11425 gramps.glade:16970
 msgid "Web address:"
 msgstr "Nettadresse:"
 
-#: gramps.glade:10751 gramps.glade:15861
+#: gramps.glade:11536 gramps.glade:17081
 msgid "Internet addresses"
 msgstr "Internett-adresser"
 
-#: gramps.glade:10822
+#: gramps.glade:11614
 msgid "Add an internet reference about this person"
 msgstr "Legg til en internett-henvisning om denne personen"
 
-#: gramps.glade:10851
+#: gramps.glade:11643
 msgid "Edit the selected internet address"
 msgstr "Rediger den valgte internettadressen"
 
-#: gramps.glade:10878
+#: gramps.glade:11670
 msgid "Go to this web page"
 msgstr "G til denne nettadressen"
 
-#: gramps.glade:10907
+#: gramps.glade:11699
 msgid "Delete selected reference"
 msgstr "Slett den valgte henvisningen"
 
-#: gramps.glade:10959 gramps.glade:16075
+#: gramps.glade:11751 gramps.glade:17302
 msgid "Internet"
 msgstr "Internett"
 
-#: gramps.glade:10988
+#: gramps.glade:11784
 msgid "LDS baptism"
 msgstr "SDH-dp"
 
-#: gramps.glade:11037
+#: gramps.glade:11841
 msgid "LDS _temple:"
 msgstr "SDH-_tempel:"
 
-#: gramps.glade:11065 gramps.glade:11279 gramps.glade:11368 gramps.glade:13740
+#: gramps.glade:11873 gramps.glade:12107 gramps.glade:12204 gramps.glade:14786
 msgid "Sources..."
 msgstr "Kilder ..."
 
-#: gramps.glade:11134 gramps.glade:11299 gramps.glade:11437 gramps.glade:13760
+#: gramps.glade:11946 gramps.glade:12127 gramps.glade:12277 gramps.glade:14806
 msgid "Note..."
 msgstr "Kommentar ..."
 
-#: gramps.glade:11153
+#: gramps.glade:11965
 msgid "Endowment"
 msgstr "Begavelse"
 
-#: gramps.glade:11205
+#: gramps.glade:12025
 msgid "LDS te_mple:"
 msgstr "SDH-te_mpel:"
 
-#: gramps.glade:11229 gramps.glade:17568
+#: gramps.glade:12053 gramps.glade:18925
 msgid "P_lace:"
 msgstr "St_ed:"
 
-#: gramps.glade:11318 gramps.glade:29067
+#: gramps.glade:12146 gramps.glade:31240
 msgid "Dat_e:"
 msgstr "_Dato:"
 
-#: gramps.glade:11343
+#: gramps.glade:12175
 msgid "LD_S temple:"
 msgstr "_SDH-tempel:"
 
-#: gramps.glade:11387
+#: gramps.glade:12223
 msgid "Pla_ce:"
 msgstr "_Sted:"
 
-#: gramps.glade:11456
+#: gramps.glade:12296
 msgid "Pa_rents:"
 msgstr "Fo_reldrene:"
 
-#: gramps.glade:11481
+#: gramps.glade:12325
 msgid "Sealed to parents"
 msgstr "Bundet til foreldre"
 
-#: gramps.glade:11788 gramps.glade:13894
+#: gramps.glade:12650 gramps.glade:14947
 msgid "LDS"
 msgstr "SDH"
 
-#: gramps.glade:11978
+#: gramps.glade:12853
 msgid "_GRAMPS ID:"
 msgstr "_GRAMPS ID:"
 
-#: gramps.glade:12042 gramps.glade:14569
+#: gramps.glade:12923 gramps.glade:15675
 msgid "Last Changed:"
 msgstr "Sist endret:"
 
-#: gramps.glade:12351
+#: gramps.glade:13276
 msgid "Events"
 msgstr "Hendelser"
 
-#: gramps.glade:12586
+#: gramps.glade:13546
 msgid "Add new event for this marriage"
 msgstr "Legg til en ny hendelse for dette ekteskapet"
 
-#: gramps.glade:12640
+#: gramps.glade:13600
 msgid "Delete selected event"
 msgstr "Slett den valgte hendelsen"
 
-#: gramps.glade:13011
+#: gramps.glade:14018
 msgid "Create a new attribute for this marriage"
 msgstr "Lag en ny egenskap for dette ekteskapet"
 
-#: gramps.glade:13540
+#: gramps.glade:14566
 msgid "Edit the properties of the selected objects"
 msgstr "Endre egenskapene til det valgte objektet"
 
-#: gramps.glade:13643
+#: gramps.glade:14673
 msgid "Sealed to spouse"
 msgstr "Bundet til en ektefelle"
 
-#: gramps.glade:13691
+#: gramps.glade:14729
 msgid "Temple:"
 msgstr "Tempel:"
 
-#: gramps.glade:14087
+#: gramps.glade:15153
 msgid "C_ity:"
 msgstr "_By:"
 
-#: gramps.glade:14115 gramps.glade:26987
+#: gramps.glade:15185 gramps.glade:29016
 msgid "_State:"
 msgstr "_Stat:"
 
-#: gramps.glade:14143 gramps.glade:26930
-msgid "C_ounty:"
-msgstr "_Fylke:"
-
-#: gramps.glade:14171
-msgid "Co_untry:"
+#: gramps.glade:15217
+#, fuzzy
+msgid "Co_unty:"
 msgstr "Lan_d:"
 
-#: gramps.glade:14199
+#: gramps.glade:15249
+#, fuzzy
+msgid "Count_ry:"
+msgstr "Land:"
+
+#: gramps.glade:15281
 msgid "_Longitude:"
 msgstr "_Lengdegrad:"
 
-#: gramps.glade:14227
+#: gramps.glade:15313
 msgid "L_atitude:"
 msgstr "_Breddegrad:"
 
-#: gramps.glade:14255 gramps.glade:27016
+#: gramps.glade:15345 gramps.glade:29049
 msgid "Church _parish:"
 msgstr "Kirkes_ogn:"
 
-#: gramps.glade:14477 gramps.glade:17203 gramps.glade:27528
+#: gramps.glade:15575 gramps.glade:18532 gramps.glade:29598
 msgid "_ZIP/Postal code:"
 msgstr "Post_nummer:"
 
-#: gramps.glade:14523 gramps.glade:27150 gramps.glade:27705
-msgid "P_hone:"
-msgstr "_Telefon:"
+#: gramps.glade:15625
+#, fuzzy
+msgid "Phon_e:"
+msgstr "Telefon:"
 
-#: gramps.glade:14658
+#: gramps.glade:15776
 msgid "County:"
 msgstr "Fylke:"
 
-#: gramps.glade:14706
+#: gramps.glade:15832
 msgid "State:"
 msgstr "Stat:"
 
-#: gramps.glade:14754
+#: gramps.glade:15888
 msgid "Church parish:"
 msgstr "Kirkesogn:"
 
-#: gramps.glade:14855
+#: gramps.glade:16005
 msgid "Zip/Postal code:"
 msgstr "Postnummer:"
 
-#: gramps.glade:14927
+#: gramps.glade:16089
 msgid "Other names"
 msgstr "Andre navn"
 
-#: gramps.glade:15188
+#: gramps.glade:16369
 msgid "Other names"
 msgstr "Andre navn"
 
-#: gramps.glade:16162
+#: gramps.glade:17397
 msgid "GRAMPS Preferences"
 msgstr "GRAMPS-innstillinger"
 
-#: gramps.glade:16234
+#: gramps.glade:17470
 msgid "Categories:"
 msgstr "Kategorier:"
 
-#: gramps.glade:16349
+#: gramps.glade:17592
 msgid "To change your preferences, select one of the subcategories in the menu on the left hand side of the window."
 msgstr "For  endre innstillingene, velg en av underkategoriene i menyen p venstre side i vinduet."
 
-#: gramps.glade:16413
+#: gramps.glade:17664
 msgid "Database"
 msgstr "Database"
 
-#: gramps.glade:16438
+#: gramps.glade:17693
 msgid "_Automatically load last database"
 msgstr "Last inn den siste databasen _automatisk "
 
-#: gramps.glade:16459
+#: gramps.glade:17714
 msgid "Family name guessing"
 msgstr "Gjetting av familienavn"
 
-#: gramps.glade:16546
+#: gramps.glade:17811
 msgid "Toolbar"
 msgstr "Verktylinje"
 
-#: gramps.glade:16571
+#: gramps.glade:17840
 msgid "Active person's _relationship to Home Person"
 msgstr "Den aktive personens _relasjon til hjempersonen"
 
-#: gramps.glade:16594
+#: gramps.glade:17863
 msgid "Active person's name and _GRAMPS ID"
 msgstr "Den aktive personens navn og _GRAMPS-ID"
 
-#: gramps.glade:16616
+#: gramps.glade:17885
 msgid "Statusbar"
 msgstr "Statuslinje"
 
-#: gramps.glade:16644
+#: gramps.glade:17917
 msgid ""
 "GNOME settings\n"
 "Icons Only\n"
@@ -5477,169 +5570,169 @@ msgstr ""
 "Tekst under ikoner\n"
 "Tekst ved siden av ikoner"
 
-#: gramps.glade:16709
+#: gramps.glade:17988
 msgid "_Always display the LDS ordinance tabs"
 msgstr "Vis _alltid faneblader med SDH-ordinanser"
 
-#: gramps.glade:16731
+#: gramps.glade:18010
 msgid "Display"
 msgstr "Vis"
 
-#: gramps.glade:16755
+#: gramps.glade:18038
 msgid "Default view"
 msgstr "Standardvisning"
 
-#: gramps.glade:16780
+#: gramps.glade:18067
 msgid "_Person view"
 msgstr "_Personvisning"
 
-#: gramps.glade:16803
+#: gramps.glade:18090
 msgid "_Family view"
 msgstr "_Familievisning"
 
-#: gramps.glade:16825
+#: gramps.glade:18112
 msgid "Family view style"
 msgstr "Stil for familievisning"
 
-#: gramps.glade:16850
+#: gramps.glade:18141
 msgid "Left to right"
 msgstr "Fra venstre til hyre"
 
-#: gramps.glade:16873
+#: gramps.glade:18164
 msgid "Top to bottom"
 msgstr "Ovenfra og ned"
 
-#: gramps.glade:16898
+#: gramps.glade:18189
 msgid "_Display Tip of the Day"
 msgstr "Vis _dagens tips"
 
-#: gramps.glade:16967
+#: gramps.glade:18262
 msgid "_Date format:"
 msgstr "_Datoformat:"
 
-#: gramps.glade:16992
+#: gramps.glade:18291
 msgid "Display formats"
 msgstr "Vis formater"
 
-#: gramps.glade:17078 rule.glade:397
+#: gramps.glade:18387 rule.glade:397
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: gramps.glade:17103
+#: gramps.glade:18416
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: gramps.glade:17128 gramps.glade:26902
+#: gramps.glade:18445 gramps.glade:28919
 msgid "_City:"
 msgstr "_By:"
 
-#: gramps.glade:17153 gramps.glade:27472
+#: gramps.glade:18474 gramps.glade:29534
 msgid "_State/Province:"
 msgstr "_Stat/provins:"
 
-#: gramps.glade:17178
+#: gramps.glade:18503
 msgid "_Country:"
 msgstr "Land:"
 
-#: gramps.glade:17228
+#: gramps.glade:18561
 msgid "_Phone:"
 msgstr "Telefon:"
 
-#: gramps.glade:17253
+#: gramps.glade:18590
 msgid "_Email:"
 msgstr "_E-post:"
 
-#: gramps.glade:17446
+#: gramps.glade:18787
 msgid "Researcher information"
 msgstr "Forskerinformasjon"
 
-#: gramps.glade:17518 gramps.glade:29700
+#: gramps.glade:18867 gramps.glade:31901
 msgid "_Person:"
 msgstr "_Person:"
 
-#: gramps.glade:17543
+#: gramps.glade:18896
 msgid "_Family:"
 msgstr "_Familie:"
 
-#: gramps.glade:17593
+#: gramps.glade:18954
 msgid "_Source:"
 msgstr "_Kilde:"
 
-#: gramps.glade:17618
+#: gramps.glade:18983
 msgid "_Media object:"
 msgstr "_Mediaobjekt:"
 
-#: gramps.glade:17647
+#: gramps.glade:19016
 msgid "I"
 msgstr "I"
 
-#: gramps.glade:17668
+#: gramps.glade:19037
 msgid "F"
 msgstr "F"
 
-#: gramps.glade:17689
+#: gramps.glade:19058
 msgid "P"
 msgstr "P"
 
-#: gramps.glade:17710
+#: gramps.glade:19079
 msgid "S"
 msgstr "S"
 
-#: gramps.glade:17731
+#: gramps.glade:19100
 msgid "O"
 msgstr "O"
 
-#: gramps.glade:17748
+#: gramps.glade:19117
 msgid "GRAMPS ID prefixes"
 msgstr "GRAMPS ID forstavelser"
 
-#: gramps.glade:17957
+#: gramps.glade:19339
 msgid "_Confidence:"
 msgstr "_Troverdighet:"
 
-#: gramps.glade:17982
+#: gramps.glade:19368
 msgid "_Volume/Film/Page:"
 msgstr "_Bind/film/side:"
 
-#: gramps.glade:18035
+#: gramps.glade:19429
 msgid "Te_xt:"
 msgstr "_Tekst:"
 
-#: gramps.glade:18062
+#: gramps.glade:19460
 msgid "Co_mments:"
 msgstr "Ko_mmentarer:"
 
-#: gramps.glade:18089
+#: gramps.glade:19491
 msgid "Publication information:"
 msgstr "Publikasjonsinformasjon:"
 
-#: gramps.glade:18113 mergedata.glade:919 mergedata.glade:941
+#: gramps.glade:19519 mergedata.glade:919 mergedata.glade:941
 #: plugins.glade:362
 msgid "Author:"
 msgstr "Forfatter:"
 
-#: gramps.glade:18209
+#: gramps.glade:19631
 msgid "Source selection"
 msgstr "Valg av kilde"
 
-#: gramps.glade:18233
+#: gramps.glade:19659
 msgid "Source details"
 msgstr "Kildedetaljer"
 
-#: gramps.glade:18372
+#: gramps.glade:19802
 msgid "Creates a new source"
 msgstr "Lager en ny kilde"
 
-#: gramps.glade:18374
+#: gramps.glade:19804
 msgid "_New..."
 msgstr "_Ny ..."
 
-#: gramps.glade:18394 gramps.glade:21784 gramps.glade:25344 gramps.glade:26354
-#: gramps.glade:27557 gramps.glade:28334 gramps.glade:29869
+#: gramps.glade:19824 gramps.glade:23484 gramps.glade:27288 gramps.glade:28344
+#: gramps.glade:29631 gramps.glade:30444 gramps.glade:32078
 msgid "_Private record"
 msgstr "_Private opplysninger"
 
-#: gramps.glade:18469
+#: gramps.glade:19899
 msgid ""
 "Very Low\n"
 "Low\n"
@@ -5653,299 +5746,307 @@ msgstr ""
 "Hy\n"
 "Svrt hy"
 
-#: gramps.glade:18644
+#: gramps.glade:20083
 msgid "Double click will edit the selected source"
 msgstr "Et dobbeltklikk vil pne den valgte kilden for redigering"
 
-#: gramps.glade:19700
+#: gramps.glade:21219
 msgid "Style _name:"
 msgstr "Stil_navn:"
 
-#: gramps.glade:19858 rule.glade:1144
+#: gramps.glade:21392 rule.glade:1144
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: gramps.glade:19887
+#: gramps.glade:21425
 msgid "pt"
 msgstr "punkt"
 
-#: gramps.glade:19914 gramps.glade:20222
+#: gramps.glade:21456 gramps.glade:21788
 msgid "Pick a color"
 msgstr "Velg en farge"
 
-#: gramps.glade:19953
+#: gramps.glade:21495
 msgid "_Bold"
 msgstr "_Fet"
 
-#: gramps.glade:19975
+#: gramps.glade:21517
 msgid "_Italic"
 msgstr "_Kursiv"
 
-#: gramps.glade:19997
+#: gramps.glade:21539
 msgid "_Underline"
 msgstr "_Understrek"
 
-#: gramps.glade:20018
+#: gramps.glade:21560
 msgid "Type face"
 msgstr "Skrifttype"
 
-#: gramps.glade:20042
+#: gramps.glade:21588
 msgid "Size"
 msgstr "Strrelse"
 
-#: gramps.glade:20066
+#: gramps.glade:21616
 msgid "Color"
 msgstr "Farge"
 
-#: gramps.glade:20140
+#: gramps.glade:21702
 msgid "_Roman (Times, serif)"
 msgstr "_Roman (Times, serif)"
 
-#: gramps.glade:20162
+#: gramps.glade:21724
 msgid "_Swiss (Arial, Helvetica, sans-serif)"
 msgstr "_Swiss (Arial, Helvetica, sans-serif)"
 
-#: gramps.glade:20190
+#: gramps.glade:21752
 msgid "Font options"
 msgstr "Fontvalg"
 
-#: gramps.glade:20238
+#: gramps.glade:21804
 msgid "R_ight:"
 msgstr "_Hyre:"
 
-#: gramps.glade:20266
+#: gramps.glade:21836
 msgid "L_eft:"
 msgstr "_Venstre:"
 
-#: gramps.glade:20294
+#: gramps.glade:21868
 msgid "_Padding:"
 msgstr "_Utfylling:"
 
-#: gramps.glade:20458
+#: gramps.glade:22048
 msgid "_Left"
 msgstr "_Venstre"
 
-#: gramps.glade:20480
+#: gramps.glade:22070
 msgid "_Right"
 msgstr "Hy_re"
 
-#: gramps.glade:20503
+#: gramps.glade:22093
 msgid "_Justify"
 msgstr "_Justert"
 
-#: gramps.glade:20526
+#: gramps.glade:22116
 msgid "_Center"
 msgstr "_Midtstilt"
 
-#: gramps.glade:20548
+#: gramps.glade:22138
 msgid "Background"
 msgstr "Bakgrunn"
 
-#: gramps.glade:20572
+#: gramps.glade:22166
 msgid "Margins"
 msgstr "Marger"
 
-#: gramps.glade:20621
+#: gramps.glade:22223
 msgid "Alignment"
 msgstr "Justering"
 
-#: gramps.glade:20645
+#: gramps.glade:22251
 msgid "Borders"
 msgstr "Kanter"
 
-#: gramps.glade:20670
+#: gramps.glade:22280
 msgid "Le_ft"
 msgstr "_Venstre"
 
-#: gramps.glade:20692
+#: gramps.glade:22302
 msgid "Ri_ght"
 msgstr "_Hyre"
 
-#: gramps.glade:20714
+#: gramps.glade:22324
 msgid "_Top"
 msgstr "_verst"
 
-#: gramps.glade:20736
+#: gramps.glade:22346
 msgid "_Bottom"
 msgstr "_Nederst"
 
-#: gramps.glade:20757
+#: gramps.glade:22367
 msgid "First line"
 msgstr "Frste linje"
 
-#: gramps.glade:20826
+#: gramps.glade:22444
 msgid "I_ndent:"
 msgstr "I_nnrykk:"
 
-#: gramps.glade:20857
+#: gramps.glade:22479
 msgid "Paragraph options"
 msgstr "Avsnittsalternativer"
 
-#: gramps.glade:21143
+#: gramps.glade:22782
 msgid "Internal note"
 msgstr "Internt notat"
 
-#: gramps.glade:21399 gramps.glade:22796
+#: gramps.glade:23055 gramps.glade:24567
 msgid "Object type:"
 msgstr "Objekttype:"
 
-#: gramps.glade:21579
+#: gramps.glade:23259
 msgid "Lower X:"
 msgstr "Nedre X:"
 
-#: gramps.glade:21603
+#: gramps.glade:23287
 msgid "Upper X:"
 msgstr "vre X:"
 
-#: gramps.glade:21627
+#: gramps.glade:23315
 msgid "Upper Y:"
 msgstr "vre Y:"
 
-#: gramps.glade:21651
+#: gramps.glade:23343
 msgid "Lower Y:"
 msgstr "Nedre Y:"
 
-#: gramps.glade:21759
+#: gramps.glade:23455
 msgid "Subsection"
 msgstr "Underseksjon"
 
-#: gramps.glade:21805
+#: gramps.glade:23505
 msgid "Privacy"
 msgstr "Personlighetsgrad"
 
-#: gramps.glade:22044
+#: gramps.glade:23760
 msgid "Global Notes"
 msgstr "Globale notater"
 
-#: gramps.glade:22245
+#: gramps.glade:23988
 msgid "Creates a new object attribute from the above data"
 msgstr "Lager en ny objektegenskap av de ovenstende dataene"
 
-#: gramps.glade:23275
+#: gramps.glade:25097
 msgid "Creates a new attribute from the above data"
 msgstr "Lager en ny egenskap av de ovenstende dataene"
 
-#: gramps.glade:23969
+#: gramps.glade:25827
 msgid "Close _without saving"
 msgstr "Avslutt _uten  lagre"
 
-#: gramps.glade:24095
+#: gramps.glade:25961
 msgid "Do not ask again"
 msgstr "Ikke spr igjen"
 
-#: gramps.glade:24713
+#: gramps.glade:26616
 msgid "Remove object and all references to it from the database"
 msgstr "Fjern objektet og alle henvisningene til det fra databasen"
 
-#: gramps.glade:24758
+#: gramps.glade:26661
 msgid "_Remove Object"
 msgstr "_Slett objektet"
 
-#: gramps.glade:24785
+#: gramps.glade:26692
 msgid "Keep reference to the missing file"
 msgstr "Behold henvisningen til den savnede fila"
 
-#: gramps.glade:24788
+#: gramps.glade:26695
 msgid "_Keep Reference"
 msgstr "_Behold henvisningen"
 
-#: gramps.glade:24799
+#: gramps.glade:26706
 msgid "Select replacement for the missing file"
 msgstr "Velg en erstatning for den savnede fila"
 
-#: gramps.glade:24846
+#: gramps.glade:26753
 msgid "_Select File"
 msgstr "_Velg en fil"
 
-#: gramps.glade:24959
+#: gramps.glade:26878
 msgid "If you check this button, all the missing media files will be automatically treated according to the currently selected option. No further dialogs will be presented for any missing medial files."
 msgstr "Hvis du trykker p denne knappen vil alle manglende mediafiler automatisk bli behandlet i henhold til den valgte instillingen. Ingen flere dialogvinduer vil bli vist for manglende mediafiler."
 
-#: gramps.glade:24961
+#: gramps.glade:26880
 msgid "_Use this selection for all missing media files"
 msgstr "Br_uk dette valget for alle manglende mediafiler"
 
-#: gramps.glade:25022
+#: gramps.glade:26942
 msgid "Close window without changes"
 msgstr "Lukk vinduet uten  lagre endringene"
 
-#: gramps.glade:25123
+#: gramps.glade:27047
 msgid "_Event type:"
 msgstr "H_endelsestype:"
 
-#: gramps.glade:25175
+#: gramps.glade:27107
 msgid "De_scription:"
 msgstr "Be_skrivelse:"
 
-#: gramps.glade:25231
+#: gramps.glade:27171
 msgid "_Cause:"
 msgstr "_Grunn:"
 
-#: gramps.glade:26301
+#: gramps.glade:28283
 msgid "_Attribute:"
 msgstr "Egensk_ap:"
 
-#: gramps.glade:26325
+#: gramps.glade:28311
 msgid "_Value:"
 msgstr "_Verdi:"
 
-#: gramps.glade:26958 gramps.glade:27500
+#: gramps.glade:28951
+msgid "C_ounty:"
+msgstr "_Fylke:"
+
+#: gramps.glade:28983 gramps.glade:29566
 msgid "Cou_ntry:"
 msgstr "La_nd:"
 
-#: gramps.glade:27196
+#: gramps.glade:29187 gramps.glade:29779
+msgid "P_hone:"
+msgstr "_Telefon:"
+
+#: gramps.glade:29237
 msgid "_Zip/Postal code:"
 msgstr "_Postnummer:"
 
-#: gramps.glade:27416
+#: gramps.glade:29470
 msgid "Add_ress:"
 msgstr "Ad_resse:"
 
-#: gramps.glade:27444
+#: gramps.glade:29502
 msgid "_City/County:"
 msgstr "_By/fylke:"
 
-#: gramps.glade:28271
+#: gramps.glade:30373
 msgid "_Web address:"
 msgstr "_Nettadresse:"
 
-#: gramps.glade:28299
+#: gramps.glade:30405
 msgid "_Description:"
 msgstr "_Beskrivelse:"
 
-#: gramps.glade:28580
+#: gramps.glade:30699
 msgid "Suffi_x:"
 msgstr "Etterstave_lse:"
 
-#: gramps.glade:28664
+#: gramps.glade:30795
 msgid "P_rivate record"
 msgstr "P_rivat opplysning"
 
-#: gramps.glade:28685
+#: gramps.glade:30816
 msgid "Family _prefix:"
 msgstr "_Forstavelse:"
 
-#: gramps.glade:28798
+#: gramps.glade:30933
 msgid "P_atronymic:"
 msgstr "_Avstamningsnavn:"
 
-#: gramps.glade:28891
+#: gramps.glade:31037
 msgid "G_roup as:"
 msgstr "G_rupper som:"
 
-#: gramps.glade:28916
+#: gramps.glade:31066
 msgid "_Sort as:"
 msgstr "_Sorter som:"
 
-#: gramps.glade:28943
+#: gramps.glade:31097
 msgid "_Display as:"
 msgstr "_Vis som:"
 
-#: gramps.glade:28970
+#: gramps.glade:31128
 msgid "Name Information"
 msgstr " Navneinformasjon"
 
-#: gramps.glade:29034
+#: gramps.glade:31203
 msgid ""
 "Default (based on locale)\n"
 "Family name, Given name\n"
@@ -5955,7 +6056,7 @@ msgstr ""
 "Etternavn, Fornavn\n"
 "Fornavn, Etternavn"
 
-#: gramps.glade:29052
+#: gramps.glade:31223
 msgid ""
 "Default (based on locale)\n"
 "Given name Family name\n"
@@ -5965,95 +6066,95 @@ msgstr ""
 "Fornavn, Etternavn\n"
 "Etternavn, Fornavn\n"
 
-#: gramps.glade:29178
+#: gramps.glade:31355
 msgid "_Override"
 msgstr "_Overskriv"
 
-#: gramps.glade:29728
+#: gramps.glade:31933
 msgid "_Comment:"
 msgstr "_Kommentar:"
 
-#: gramps.glade:29780
+#: gramps.glade:31989
 msgid "Person is in the _database"
 msgstr "Personen er i _databasen"
 
-#: gramps.glade:29848
+#: gramps.glade:32057
 msgid "Choose a person from the database"
 msgstr "Velg en person fra databasen"
 
-#: gramps.glade:29850
+#: gramps.glade:32059
 msgid "_Select"
 msgstr "_Velg"
 
-#: gramps.glade:29979
+#: gramps.glade:32189
 msgid "_Next"
 msgstr "_Neste"
 
-#: gramps.glade:30038
+#: gramps.glade:32252
 msgid "_Display on startup"
 msgstr "_Vis ved oppstart"
 
-#: gramps.glade:30101
+#: gramps.glade:32319
 msgid "Gramps' Tip of the Day"
 msgstr "Dagens tips for GRAMPS"
 
-#: gramps.glade:30134
+#: gramps.glade:32356
 msgid "GRAMPS - Loading Database"
 msgstr "GRAMPS - Laster inn databasen"
 
-#: gramps.glade:30159
+#: gramps.glade:32382
 msgid "Loading database"
 msgstr " Laster inn databasen"
 
-#: gramps.glade:30183
+#: gramps.glade:32410
 msgid "GRAMPS is loading the database you selected. Please wait."
 msgstr "GRAMPS laster inn databasen du valgte. Vennligst vent."
 
-#: gramps.glade:30366
+#: gramps.glade:32606
 msgid "Calenda_r:"
 msgstr "Kalende_r:"
 
-#: gramps.glade:30416
+#: gramps.glade:32662
 msgid "Q_uality"
 msgstr "_Kvalitet"
 
-#: gramps.glade:30458
+#: gramps.glade:32710
 msgid "_Type"
 msgstr "_Type"
 
-#: gramps.glade:30500
+#: gramps.glade:32758
 msgid "Date"
 msgstr "Dato"
 
-#: gramps.glade:30524
+#: gramps.glade:32786
 msgid "_Day"
 msgstr "_Dag"
 
-#: gramps.glade:30549
+#: gramps.glade:32815
 msgid "_Month"
 msgstr "_Mned"
 
-#: gramps.glade:30574
+#: gramps.glade:32844
 msgid "_Year"
 msgstr "_r"
 
-#: gramps.glade:30658
+#: gramps.glade:32934
 msgid "Second date"
 msgstr "Andre dato"
 
-#: gramps.glade:30682
+#: gramps.glade:32962
 msgid "D_ay"
 msgstr "D_ag"
 
-#: gramps.glade:30707
+#: gramps.glade:32991
 msgid "Mo_nth"
 msgstr "M_ned"
 
-#: gramps.glade:30732
+#: gramps.glade:33020
 msgid "Y_ear"
 msgstr "_r"
 
-#: gramps.glade:30829
+#: gramps.glade:33123
 msgid "Te_xt comment:"
 msgstr "_Tekstkommentar:"
 
@@ -6164,28 +6265,30 @@ msgstr "Personer med poster som inneholder..."
 msgid "People with records matching regular expression..."
 msgstr "Personer med poster som passer regulruttrykket ..."
 
-#: gramps_main.py:1074 gramps_main.py:1097
+#: gramps_main.py:1074 gramps_main.py:1086 gramps_main.py:1104
+#: gramps_main.py:1116
 msgid "Cannot merge people."
 msgstr "Kan ikke flette personer."
 
-#: gramps_main.py:1075 gramps_main.py:1098
+#: gramps_main.py:1075 gramps_main.py:1087 gramps_main.py:1105
+#: gramps_main.py:1117
 msgid "Exactly two people must be selected to perform a merge. A second person can be selected by holding down the control key while clicking on the desired person."
 msgstr "Nyaktig to personer m vre valgt for  gjennomfre en fletting. Person nummer to kan bli valgt ved  holde nede Ctrl-tasten samtidig som man klikker p den andre personen."
 
-#: gramps_main.py:1221
+#: gramps_main.py:1235
 msgid "Cannot unpak archive"
 msgstr "Kan ikke pakke ut arkivet"
 
-#: gramps_main.py:1222 plugins/ReadPkg.py:67
+#: gramps_main.py:1236 plugins/ReadPkg.py:67
 msgid "Temporary directory %s is not writable"
 msgstr "Den midlertidige mappa %s er skrivebeskyttet"
 
-#: gramps_main.py:1264 gramps_main.py:1270 gramps_main.py:1291
-#: gramps_main.py:1295 gramps_main.py:1298
+#: gramps_main.py:1278 gramps_main.py:1284 gramps_main.py:1305
+#: gramps_main.py:1309 gramps_main.py:1312
 msgid "Cannot open database"
 msgstr "Kan ikke pne databasen"
 
-#: gramps_main.py:1265
+#: gramps_main.py:1279
 msgid ""
 "The selected file is a directory, not a file.\n"
 "A GRAMPS database must be a file."
@@ -6193,130 +6296,130 @@ msgstr ""
 "Den valgte fila er en mappe, ikke en fil.\n"
 "GRAMPS-databasen m vre en fil."
 
-#: gramps_main.py:1271
+#: gramps_main.py:1285
 msgid "You do not have read access to the selected file."
 msgstr "Du har ikke lesetilgang til den valgte fila."
 
-#: gramps_main.py:1276
+#: gramps_main.py:1290
 msgid "Read only database"
 msgstr "Skrivebeskyttet database"
 
-#: gramps_main.py:1277
+#: gramps_main.py:1291
 msgid "You do not have write access to the selected file."
 msgstr "Du har ikke skrivetilgang til den valgte fila."
 
-#: gramps_main.py:1286
+#: gramps_main.py:1300
 msgid "Read Only"
 msgstr "Skrivebeskyttet"
 
-#: gramps_main.py:1292
+#: gramps_main.py:1306
 msgid "The database file specified could not be opened."
 msgstr "Den angitte databasefila kunne ikke pnes."
 
-#: gramps_main.py:1299
+#: gramps_main.py:1313
 msgid "%s could not be opened."
 msgstr "Klarte ikke  pne %s"
 
-#: gramps_main.py:1358
+#: gramps_main.py:1372
 msgid "Save Media Object"
 msgstr "Lagre mediaobjekt"
 
-#: gramps_main.py:1404 plugins/Check.py:284 plugins/WriteCD.py:255
+#: gramps_main.py:1418 plugins/Check.py:284 plugins/WriteCD.py:255
 #: plugins/WritePkg.py:171
 msgid "Media object could not be found"
 msgstr "Fant ikke mediaobjektet"
 
-#: gramps_main.py:1405 plugins/WriteCD.py:256 plugins/WritePkg.py:172
+#: gramps_main.py:1419 plugins/WriteCD.py:256 plugins/WritePkg.py:172
 msgid "%(file_name)s is referenced in the database, but no longer exists. The file may have been deleted or moved to a different location. You may choose to either remove the reference from the database, keep the reference to the missing file, or select a new file."
 msgstr "%(file_name)s har en (eller flere) henvisning(er) i databasen, men eksisterer ikke lenger. Fila kan ha blitt slettet eller flyttet til et annet sted. Du kan enten slette referansen fra databasen, beholde referansen til den savnede fila, eller velge en ny fil."
 
-#: gramps_main.py:1451
+#: gramps_main.py:1465
 msgid "Deleting the person will remove the person from the database."
 msgstr " slette personen vil fjerne vedkommende fra databasen."
 
-#: gramps_main.py:1455
+#: gramps_main.py:1469
 msgid "_Delete Person"
 msgstr "_Slett en person"
 
-#: gramps_main.py:1519
+#: gramps_main.py:1533
 msgid "Delete Person (%s)"
 msgstr "Slett person (%s)"
 
-#: gramps_main.py:1603
+#: gramps_main.py:1617
 msgid "%(relationship)s of %(person)s"
 msgstr "%(relationship)s til %(person)s"
 
-#: gramps_main.py:1765
+#: gramps_main.py:1779
 msgid "Upgrading database..."
 msgstr "Oppgraderer databasen ..."
 
-#: gramps_main.py:1778
+#: gramps_main.py:1792
 msgid "Setup complete"
 msgstr "Ferdig med oppsett"
 
-#: gramps_main.py:1795
+#: gramps_main.py:1809
 msgid "Loading %s..."
 msgstr "Laster inn %s ..."
 
-#: gramps_main.py:1798
+#: gramps_main.py:1812
 msgid "Opening database..."
 msgstr "pner databasen ..."
 
-#: gramps_main.py:1829
+#: gramps_main.py:1843
 msgid "No Home Person has been set."
 msgstr "Ingen hjemperson er valgt."
 
-#: gramps_main.py:1830
+#: gramps_main.py:1844
 msgid "The Home Person may be set from the Edit menu."
 msgstr "Hjempersonen kan velges via Rediger-menyen."
 
-#: gramps_main.py:1836
+#: gramps_main.py:1850
 msgid "%s has been bookmarked"
 msgstr "%s er lagt til som et bokmerke"
 
-#: gramps_main.py:1839
+#: gramps_main.py:1853
 msgid "Could Not Set a Bookmark"
 msgstr "Klarte ikke  opprette bokmerket"
 
-#: gramps_main.py:1840
+#: gramps_main.py:1854
 msgid "A bookmark could not be set because no one was selected."
 msgstr "Bokmerket kunne ikke lages fordi ingen er valgt."
 
-#: gramps_main.py:1854
+#: gramps_main.py:1868
 msgid "Could not go to a Person"
 msgstr "Kunne ikke g til en person"
 
-#: gramps_main.py:1855
+#: gramps_main.py:1869
 msgid "Either stale bookmark or broken history caused by IDs reorder."
 msgstr "P grunn av omorganiserte ID-er er det enten oppsttt et gammelt bokmerke eller en delagt historie."
 
-#: gramps_main.py:1865
+#: gramps_main.py:1879
 msgid "Set %s as the Home Person"
 msgstr "Angi %s som hjemperson"
 
-#: gramps_main.py:1866
+#: gramps_main.py:1880
 msgid "Once a Home Person is defined, pressing the Home button on the toolbar will make the home person the active person."
 msgstr "S snart en hjemperson er angitt, vil man g til denne personen ved  tykke p Hjem-knappen p verktylinjen."
 
-#: gramps_main.py:1869
+#: gramps_main.py:1883
 msgid "_Set Home Person"
 msgstr "_Velg hjemperson"
 
-#: gramps_main.py:1880
+#: gramps_main.py:1894
 msgid "A person must be selected to export"
 msgstr "Du m ha valgt en person som skal eksporteres"
 
-#: gramps_main.py:1881
+#: gramps_main.py:1895
 msgid "Exporting requires that an active person be selected. Please select a person and try again."
 msgstr "Eksport krever at en aktiv person er valgt. Velg en person og prv igjen."
 
-#: gramps_main.py:1912 gramps_main.py:1916 gramps_main.py:1920
-#: gramps_main.py:1934 gramps_main.py:1936
+#: gramps_main.py:1926 gramps_main.py:1930 gramps_main.py:1934
+#: gramps_main.py:1948 gramps_main.py:1950
 #, fuzzy
 msgid "Could not create example database"
 msgstr "Kunne ikke lage eksempel database"
 
-#: gramps_main.py:1913 gramps_main.py:1917 gramps_main.py:1921
+#: gramps_main.py:1927 gramps_main.py:1931 gramps_main.py:1935
 #, fuzzy
 msgid "The directory ~/.gramps/example could not be created."
 msgstr "Klarte ikke  lage ~/.gramps/example"
@@ -6385,7 +6488,7 @@ msgstr "Forfatterens e-postadresse:"
 #: plugins/AncestorChart.py:245 plugins/AncestorChart2.py:499
 #: plugins/AncestorReport.py:290 plugins/Ancestors.py:909
 #: plugins/Ancestors.py:925 plugins/Ancestors.py:931 plugins/DesGraph.py:333
-#: plugins/DetAncestralReport.py:520 plugins/FamilyGroup.py:514
+#: plugins/DetAncestralReport.py:520 plugins/FamilyGroup.py:515
 #: plugins/FanChart.py:299 plugins/FtmStyleAncestors.py:390
 #: plugins/FtmStyleAncestors.py:395 plugins/FtmStyleAncestors.py:400
 #: plugins/FtmStyleAncestors.py:405 plugins/FtmStyleDescendants.py:536
@@ -6413,7 +6516,7 @@ msgstr "Slektstavle"
 #: plugins/AncestorReport.py:306 plugins/Ancestors.py:968
 #: plugins/BookReport.py:1117 plugins/CountAncestors.py:122
 #: plugins/DescendReport.py:198 plugins/DetAncestralReport.py:618
-#: plugins/DetDescendantReport.py:639 plugins/FamilyGroup.py:548
+#: plugins/DetDescendantReport.py:639 plugins/FamilyGroup.py:549
 #: plugins/FtmStyleAncestors.py:422 plugins/FtmStyleDescendants.py:572
 #: plugins/GraphViz.py:971 plugins/GraphViz.py:985
 #: plugins/IndivComplete.py:595 plugins/IndivSummary.py:391
@@ -6520,7 +6623,7 @@ msgstr ", og ble begravd i %s."
 
 #: plugins/AncestorReport.py:276 plugins/Ancestors.py:894
 #: plugins/DescendReport.py:174 plugins/DetAncestralReport.py:484
-#: plugins/DetDescendantReport.py:505 plugins/FamilyGroup.py:505
+#: plugins/DetDescendantReport.py:505 plugins/FamilyGroup.py:506
 #: plugins/FtmStyleAncestors.py:375 plugins/FtmStyleDescendants.py:521
 #: plugins/IndivComplete.py:552 plugins/IndivSummary.py:348
 #: plugins/SimpleBookTitle.py:265 plugins/StatisticsChart.py:812
@@ -7036,7 +7139,7 @@ msgid "Descendant Graph"
 msgstr "Slektstre over etterkommere"
 
 #: plugins/DesGraph.py:349 plugins/FanChart.py:325
-#: plugins/StatisticsChart.py:958
+#: plugins/StatisticsChart.py:963
 msgid "Alpha"
 msgstr "Alfa"
 
@@ -7225,35 +7328,35 @@ msgstr "Sammenlign individuelle hendelser"
 msgid "Aids in the analysis of data by allowing the development of custom filters that can be applied to the database to find similar events"
 msgstr "Hjelper til med  analysere data ved  la deg lage egne filtre. Disse kan brukes p databasen for  finne hendelser som ligner p hverandre."
 
-#: plugins/ExportVCalendar.py:54
+#: plugins/ExportVCalendar.py:55
 msgid "Export to vCalendar"
 msgstr "Eksporter til vCalendar"
 
-#: plugins/ExportVCalendar.py:199
+#: plugins/ExportVCalendar.py:209
 msgid "Marriage of %s"
 msgstr "Ekteskap til %s"
 
-#: plugins/ExportVCalendar.py:217 plugins/ExportVCalendar.py:219
+#: plugins/ExportVCalendar.py:227 plugins/ExportVCalendar.py:229
 msgid "Birth of %s"
 msgstr "Fdsel til %s"
 
-#: plugins/ExportVCalendar.py:228 plugins/ExportVCalendar.py:230
+#: plugins/ExportVCalendar.py:238 plugins/ExportVCalendar.py:240
 msgid "Death of %s"
 msgstr "Ddsfall til %s"
 
-#: plugins/ExportVCalendar.py:283
+#: plugins/ExportVCalendar.py:293
 msgid "Anniversary: %s"
 msgstr "Jubileum: %s"
 
-#: plugins/ExportVCalendar.py:310
+#: plugins/ExportVCalendar.py:320
 msgid "vCalendar"
 msgstr "vCalendar"
 
-#: plugins/ExportVCalendar.py:311
+#: plugins/ExportVCalendar.py:321
 msgid "vCalendar is used in many calendaring and pim applications."
 msgstr "vCalendar brukes av mange kalendere og sjette sans-programmer."
 
-#: plugins/ExportVCalendar.py:312
+#: plugins/ExportVCalendar.py:322
 msgid "vCalendar export options"
 msgstr "vCalender eksportvalg"
 
@@ -7261,15 +7364,15 @@ msgstr "vCalender eksportvalg"
 msgid "Export to vCard"
 msgstr "Eksporter til vCard"
 
-#: plugins/ExportVCard.py:234
+#: plugins/ExportVCard.py:243
 msgid "vCard"
 msgstr "vCard"
 
-#: plugins/ExportVCard.py:235
+#: plugins/ExportVCard.py:244
 msgid "vCard is used in many addressbook and pim applications."
 msgstr "vCard brukes av mange adressebok og sjette sans-programmer."
 
-#: plugins/ExportVCard.py:236
+#: plugins/ExportVCard.py:245
 msgid "vCard export options"
 msgstr "vCard eksportvalg"
 
@@ -7281,19 +7384,19 @@ msgstr "Ektemann"
 msgid "Wife"
 msgstr "Kone"
 
-#: plugins/FamilyGroup.py:383 plugins/FamilyGroup.py:547
+#: plugins/FamilyGroup.py:383 plugins/FamilyGroup.py:548
 msgid "Family Group Report"
 msgstr "Familierapport"
 
-#: plugins/FamilyGroup.py:523
+#: plugins/FamilyGroup.py:524
 msgid "The style used for the text related to the children."
 msgstr "Stil som blir brukt p tekst som henviser til barna"
 
-#: plugins/FamilyGroup.py:532
+#: plugins/FamilyGroup.py:533
 msgid "The style used for the parent's name"
 msgstr "Stil som blir brukt p foreldrenes navn"
 
-#: plugins/FamilyGroup.py:551
+#: plugins/FamilyGroup.py:552
 msgid "Creates a family group report, showing information on a set of parents and their children."
 msgstr "Lager en familierapport som viser informasjon om et foreldrepar og deres barn."
 
@@ -8228,58 +8331,58 @@ msgstr "Kryss av for 
 msgid "Sort in reverse order"
 msgstr "Sorter i motsatt rekkeflge"
 
-#: plugins/StatisticsChart.py:877
+#: plugins/StatisticsChart.py:881
 msgid "Select year range within which people need to be born to be selected for statistics."
 msgstr "Velg rsmellomrom for nr personer skal vre fdt."
 
-#: plugins/StatisticsChart.py:878
+#: plugins/StatisticsChart.py:882
 msgid "People born between"
 msgstr "Personer fdt mellom"
 
-#: plugins/StatisticsChart.py:882
+#: plugins/StatisticsChart.py:886
 #, fuzzy
 msgid "Check this if you want people who have no known birth date or year to be accounted also in the statistics."
 msgstr "Kryss av denne for  inkludere personer uten fdselsdato eller r i statistikken."
 
-#: plugins/StatisticsChart.py:883
+#: plugins/StatisticsChart.py:887
 #, fuzzy
 msgid "Include people without known birth years"
 msgstr "Ta med personer uten fdselsr"
 
-#: plugins/StatisticsChart.py:895
+#: plugins/StatisticsChart.py:899
 msgid "Select which genders are included into statistics."
 msgstr "Velg hvilke kjnn som skal tas med i statistikken."
 
-#: plugins/StatisticsChart.py:896
+#: plugins/StatisticsChart.py:900
 msgid "Genders included"
 msgstr "Inkluderte kjnn"
 
-#: plugins/StatisticsChart.py:899
+#: plugins/StatisticsChart.py:903
 msgid "With fewer items pie chart and legend will be used instead of a bar chart."
 msgstr "Med frre elementer vil et kakediagram med forklaringer bli brukt i stedet for stolpediagram."
 
-#: plugins/StatisticsChart.py:902
+#: plugins/StatisticsChart.py:907
 msgid "Max. items for a pie"
 msgstr ""
 
-#: plugins/StatisticsChart.py:921
+#: plugins/StatisticsChart.py:926
 msgid "Mark checkboxes to add charts with indicated data"
 msgstr "Kryss av i sjekkboksene for  legge til diagrammer med valgte data"
 
-#: plugins/StatisticsChart.py:922 plugins/StatisticsChart.py:927
+#: plugins/StatisticsChart.py:927 plugins/StatisticsChart.py:932
 #, fuzzy
 msgid "Chart Selection"
 msgstr "Rapport valg"
 
-#: plugins/StatisticsChart.py:926
+#: plugins/StatisticsChart.py:931
 msgid "Note that both biological and adopted children are taken into account."
 msgstr "Merk at bde biologiske og adopterte barn blir regnet med."
 
-#: plugins/StatisticsChart.py:957
+#: plugins/StatisticsChart.py:962
 msgid "Statistics Chart"
 msgstr "Statistikkdiagram"
 
-#: plugins/StatisticsChart.py:961
+#: plugins/StatisticsChart.py:966
 #, fuzzy
 msgid "Generates statistical bar and pie charts of the people in the database."
 msgstr "Lager statistiske stolpe- og kake-diagrammer over personene i databasen."
@@ -8920,31 +9023,31 @@ msgstr "Eksporter til CD (p_ortable XML)"
 msgid "Exporting to CD copies all your data and media object files to the CD Creator. You may later burn the CD with this data, and that copy will be completely portable across different machines and binary architectures."
 msgstr "Eksport til CD vil kopiere alle dine data og mediaobjektfiler til CD-lageren. Du kan senere brenne CD-en med disse dataene, og kopien vil vre kompatibel med forskjellige maskiner og binre arkitekturer."
 
-#: plugins/WriteFtree.py:273
+#: plugins/WriteFtree.py:281
 msgid "_Web Family Tree"
 msgstr "_Web Family Tree"
 
-#: plugins/WriteFtree.py:274
+#: plugins/WriteFtree.py:282
 msgid "Web Family Tree format."
 msgstr "Web Family Tree-format."
 
-#: plugins/WriteFtree.py:275
+#: plugins/WriteFtree.py:283
 msgid "Web Family Tree export options"
 msgstr "Web Family Tree-eksportvalg"
 
-#: plugins/WriteGeneWeb.py:218
+#: plugins/WriteGeneWeb.py:227
 msgid "No families matched by selected filter"
 msgstr "Sket ga ingen familier med dette filteret"
 
-#: plugins/WriteGeneWeb.py:577
+#: plugins/WriteGeneWeb.py:586
 msgid "G_eneWeb"
 msgstr "G_eneWeb"
 
-#: plugins/WriteGeneWeb.py:578
+#: plugins/WriteGeneWeb.py:587
 msgid "GeneWeb is a web based genealogy program."
 msgstr "GeneWeb er et nettbasert slektsforskningsprogram."
 
-#: plugins/WriteGeneWeb.py:579
+#: plugins/WriteGeneWeb.py:588
 msgid "GeneWeb export options"
 msgstr "GeneWeb-eksportvalg"
 
@@ -9286,6 +9389,14 @@ msgstr "Valgte regel"
 msgid "Values"
 msgstr "Verdier"
 
+#, fuzzy
+#~ msgid "Added person is not visible"
+#~ msgstr "Personen som ble lagt til er ikke synlig"
+
+#, fuzzy
+#~ msgid "The person you added is currently not visible due to the chosen filter. This may occur if you did not specify a birth date."
+#~ msgstr "Personen du la til er for tiden ikke synlig grunnet det aktive filteret. Dette kan oppst hvis du ikke spesifiserte en fdselsdato."
+
 #~ msgid "Month Day, Year"
 #~ msgstr "Mned Dag, r"
 
diff --git a/gramps2/src/po/no.po b/gramps2/src/po/no.po
index 1a77defec..6fe0cd90f 100644
--- a/gramps2/src/po/no.po
+++ b/gramps2/src/po/no.po
@@ -11,8 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
-"POT-Creation-Date: Wed Jun  1 09:58:59 2005\n"
-"PO-Revision-Date: 2005-06-03 14:23+0200\n"
+"POT-Creation-Date: Thu Jun 23 14:11:42 2005\n"
+"PO-Revision-Date: 2005-06-24 23:33+0200\n"
 "Last-Translator: Frode Jemtland \n"
 "Language-Team: Norsk Bokml\n"
 "MIME-Version: 1.0\n"
@@ -37,17 +37,17 @@ msgstr "Fant ikke den angitte fila."
 msgid "Add Media Object"
 msgstr "Legg til mediaobjekt"
 
-#: AddSpouse.py:115
+#: AddSpouse.py:114
 msgid "Choose Spouse/Partner of %s"
 msgstr "Velg ektefelle/partner til %s"
 
-#: AddSpouse.py:120
+#: AddSpouse.py:119
 msgid "Choose Spouse/Partner"
 msgstr "Velg ektefelle/partner"
 
-#: AddSpouse.py:161 ChooseParents.py:230 EditPerson.py:338 EditSource.py:305
-#: FamilyView.py:74 ImageSelect.py:1102 PeopleView.py:58 PeopleView.py:148
-#: SelectChild.py:124 SelectPerson.py:78 plugins/BookReport.py:631
+#: AddSpouse.py:142 ChooseParents.py:252 EditPerson.py:338 EditSource.py:312
+#: FamilyView.py:74 ImageSelect.py:1104 PeopleView.py:58 PeopleView.py:134
+#: SelectChild.py:129 SelectPerson.py:78 plugins/BookReport.py:631
 #: plugins/FilterEditor.py:459 plugins/IndivComplete.py:405
 #: plugins/IndivSummary.py:226 plugins/PatchNames.py:191 plugins/RelCalc.py:95
 #: plugins/ScratchPad.py:154 plugins/ScratchPad.py:195
@@ -59,64 +59,75 @@ msgstr "Velg ektefelle/partner"
 msgid "Name"
 msgstr "Navn"
 
-#: AddSpouse.py:166 ChooseParents.py:236 EditSource.py:305 FamilyView.py:73
-#: ImageSelect.py:1102 MediaView.py:58 MergePeople.py:107 PeopleView.py:59
-#: PlaceView.py:50 SelectChild.py:129 SelectObject.py:85 SelectPerson.py:84
+#: AddSpouse.py:146 ChooseParents.py:261 EditSource.py:312 FamilyView.py:73
+#: ImageSelect.py:1104 MediaView.py:58 MergePeople.py:107 PeopleView.py:59
+#: PlaceView.py:50 SelectChild.py:134 SelectObject.py:85 SelectPerson.py:84
 #: SourceView.py:52 Sources.py:108 Sources.py:242 Witness.py:64
 #: plugins/PatchNames.py:182 plugins/RelCalc.py:95
 msgid "ID"
 msgstr "ID"
 
-#: AddSpouse.py:171 ChooseParents.py:242 SelectChild.py:134 SelectPerson.py:90
+#: AddSpouse.py:150 ChooseParents.py:271 SelectChild.py:139 SelectPerson.py:90
 msgid "Birth date"
 msgstr "Fdselsdato"
 
-#: AddSpouse.py:254 AddSpouse.py:279
+#: AddSpouse.py:232 AddSpouse.py:257
 msgid "Error adding a spouse"
 msgstr "Klarte ikke  legge til ektefelle"
 
-#: AddSpouse.py:255
+#: AddSpouse.py:233
 msgid "A person cannot be linked as his/her spouse"
 msgstr "En person kan ikke angis som sin egen ektefelle"
 
-#: AddSpouse.py:263
+#: AddSpouse.py:241
 #, fuzzy
 msgid "Spouse is a parent"
 msgstr "Ektefellen er en forelder"
 
-#: AddSpouse.py:264
+#: AddSpouse.py:242
 #, fuzzy
 msgid "The person selected as a spouse is a parent of the active person. Usually, this is a mistake. You may choose either to proceed with adding a spouse, or to return to the Choose Spouse dialog to fix the problem."
-msgstr "Kjnnet til personen er for yeblikket ukjent. Vanligvis er dette en feil. Du kan velge  fortsette lagringen, eller g tilbake til Rediger person-dialogvinduet for  rette opp feilen."
+msgstr "Personen som er valgt til ektefelle er en forelder av den aktive personen. Vanligvis er dette feil. Du kan velge enten  g videre med  legge til ektefellen, eller  g tilbake til Velg ektefelle dialogen for  rette opp feilen."
 
-#: AddSpouse.py:268 AddSpouse.py:289
+#: AddSpouse.py:246 AddSpouse.py:267
 #, fuzzy
 msgid "Proceed with adding"
 msgstr "Fortsett med  legge til"
 
-#: AddSpouse.py:268 AddSpouse.py:289
+#: AddSpouse.py:246 AddSpouse.py:267
 #, fuzzy
 msgid "Return to dialog"
 msgstr "G tilbake til dialogen"
 
-#: AddSpouse.py:280
+#: AddSpouse.py:258
 msgid "The spouse is already present in this family"
 msgstr "Ektefellen er allerede tilstede i denne familien"
 
-#: AddSpouse.py:284
+#: AddSpouse.py:262
 #, fuzzy
 msgid "Spouse is a child"
 msgstr "Ektefellen er et barn"
 
-#: AddSpouse.py:285
+#: AddSpouse.py:263
 #, fuzzy
 msgid "The person selected as a spouse is a child of the active person. Usually, this is a mistake. You may choose either to proceed with adding a spouse, or to return to the Choose Spouse dialog to fix the problem."
-msgstr "Kjnnet til personen er for yeblikket ukjent. Vanligvis er dette en feil. Du kan velge  fortsette lagringen, eller g tilbake til Rediger person-dialogvinduet for  rette opp feilen."
+msgstr "Personen som er valgt til ektefelle er et barn av den aktive personen. Vanligvis er dette feil. Du kan velge enten  g videre med  legge til ektefellen, eller  g tilbake til Velg ektefelle dialogen for  rette opp feilen."
 
-#: AddSpouse.py:315 FamilyView.py:725
+#: AddSpouse.py:293 FamilyView.py:725
 msgid "Add Spouse"
 msgstr "Legg til ektefelle"
 
+#: AddSpouse.py:392 ChooseParents.py:811 GenericFilter.py:132
+#: GenericFilter.py:147 GenericFilter.py:263 GenericFilter.py:277
+#: GenericFilter.py:300 GenericFilter.py:323 GenericFilter.py:338
+#: GenericFilter.py:353 GenericFilter.py:979 GenericFilter.py:1223
+#: GenericFilter.py:1247 GenericFilter.py:1276 GenericFilter.py:1308
+#: GenericFilter.py:1325 GenericFilter.py:1346 GenericFilter.py:1429
+#: GenericFilter.py:1483 GenericFilter.py:1545 GenericFilter.py:1564
+#: GenericFilter.py:1634 GenericFilter.py:1801 SelectChild.py:305
+msgid "General filters"
+msgstr "Generelle filtre"
+
 #: AddrEdit.py:106 AddrEdit.py:174
 msgid "Address Editor"
 msgstr "Adressebehandler"
@@ -169,7 +180,7 @@ msgstr "Egenskapsbehandler for %s"
 msgid "New Attribute"
 msgstr "Ny egenskap"
 
-#: AttrEdit.py:175 EditPerson.py:326 ImageSelect.py:682 ImageSelect.py:952
+#: AttrEdit.py:175 EditPerson.py:326 ImageSelect.py:682 ImageSelect.py:954
 #: Marriage.py:214 plugins/ScratchPad.py:273 plugins/ScratchPad.py:281
 msgid "Attribute"
 msgstr "Egenskap"
@@ -190,71 +201,85 @@ msgstr ""
 msgid "Edit Bookmarks"
 msgstr "Rediger bokmerker"
 
-#: ChooseParents.py:121
+#: ChooseParents.py:129 ChooseParents.py:130
+msgid "Loading..."
+msgstr "Laster inn..."
+
+#: ChooseParents.py:133
 msgid "Choose the Parents of %s"
 msgstr "Velg foreldrene til %s"
 
-#: ChooseParents.py:123 ChooseParents.py:268 ChooseParents.py:510
-#: ChooseParents.py:593
+#: ChooseParents.py:135 ChooseParents.py:300 ChooseParents.py:572
+#: ChooseParents.py:659
 msgid "Choose Parents"
 msgstr "Velg foreldrene"
 
-#: ChooseParents.py:304 ChooseParents.py:648
+#: ChooseParents.py:366 ChooseParents.py:714
 msgid "Par_ent"
 msgstr "For_elder"
 
-#: ChooseParents.py:306
+#: ChooseParents.py:368
 msgid "Fath_er"
 msgstr "F_ar"
 
-#: ChooseParents.py:314 ChooseParents.py:647
+#: ChooseParents.py:376 ChooseParents.py:713
 msgid "Pa_rent"
 msgstr "Fo_relder"
 
-#: ChooseParents.py:316
+#: ChooseParents.py:378
 msgid "Mothe_r"
 msgstr "Mo_r"
 
-#: ChooseParents.py:502 SelectChild.py:287 SelectChild.py:306
+#: ChooseParents.py:564 SelectChild.py:192 SelectChild.py:211
 msgid "Error selecting a child"
 msgstr "Feil ved valg av barn"
 
-#: ChooseParents.py:503
+#: ChooseParents.py:565
 msgid "A person cannot be linked as his/her own parent"
 msgstr "En person kan ikke angis som sin egen forelder"
 
-#: ChooseParents.py:532 ChooseParents.py:545
-#, fuzzy
-msgid "Added person is not visible"
-msgstr "Personen som ble lagt til er ikke synlig"
-
-#: ChooseParents.py:533 ChooseParents.py:546
-#, fuzzy
-msgid "The person you added is currently not visible due to the chosen filter. This may occur if you did not specify a birth date."
-msgstr "Personen du la til er for tiden ikke synlig grunnet det aktive filteret. Dette kan oppst hvis du ikke la til en fdselsdato."
-
-#: ChooseParents.py:623
+#: ChooseParents.py:689
 msgid "Modify the Parents of %s"
 msgstr "Endre foreldrene til %s"
 
-#: ChooseParents.py:624 ChooseParents.py:736
+#: ChooseParents.py:690 ChooseParents.py:802
 msgid "Modify Parents"
 msgstr "Endre foreldre"
 
-#: ChooseParents.py:650 FamilyView.py:1100 MergePeople.py:136
+#: ChooseParents.py:716 FamilyView.py:1112 MergePeople.py:136
 #: plugins/FamilyGroup.py:261 plugins/IndivComplete.py:215
 #: plugins/IndivComplete.py:217 plugins/IndivComplete.py:450
 #: plugins/IndivSummary.py:290 plugins/WebPage.py:340 plugins/WebPage.py:343
 msgid "Mother"
 msgstr "Mor"
 
-#: ChooseParents.py:651 FamilyView.py:1098 MergePeople.py:134
+#: ChooseParents.py:717 FamilyView.py:1110 MergePeople.py:134
 #: plugins/FamilyGroup.py:248 plugins/IndivComplete.py:206
 #: plugins/IndivComplete.py:208 plugins/IndivComplete.py:445
 #: plugins/IndivSummary.py:276 plugins/WebPage.py:339 plugins/WebPage.py:342
 msgid "Father"
 msgstr "Far"
 
+#: ChooseParents.py:834
+#, fuzzy
+msgid "Likely Father"
+msgstr "Sansynlig vis far"
+
+#: ChooseParents.py:835
+#, fuzzy
+msgid "Matches likely fathers"
+msgstr "Samsvarer med mest sansynlige fedre"
+
+#: ChooseParents.py:844
+#, fuzzy
+msgid "Likely Mother"
+msgstr "Sansynlig vis mor"
+
+#: ChooseParents.py:845
+#, fuzzy
+msgid "Matches likely mothers"
+msgstr "Samsvarer med sansynlige mdre"
+
 #: ColumnOrder.py:40
 msgid "Select Columns"
 msgstr "Velg kolonner"
@@ -331,7 +356,7 @@ msgstr "Kalkulert"
 msgid "Date selection"
 msgstr "Datovalg"
 
-#: DateEdit.py:264 gramps_main.py:1154 gramps_main.py:1161
+#: DateEdit.py:264 gramps_main.py:1168 gramps_main.py:1175
 msgid "Could not open help"
 msgstr "Kunne ikke pne hjelpen"
 
@@ -383,7 +408,7 @@ msgstr "Automatisk funnet"
 msgid "Select file _type:"
 msgstr "Velg fil _type:"
 
-#: DbPrompter.py:611 gramps_main.py:1374
+#: DbPrompter.py:611 gramps_main.py:1388
 msgid "All files"
 msgstr "Alle filer"
 
@@ -404,7 +429,7 @@ msgid "GEDCOM files"
 msgstr "GEDCOM-filer"
 
 #: DisplayModels.py:47 GrampsMime.py:46 GrampsMime.py:53 MergePeople.py:50
-#: PeopleModel.py:381 SelectChild.py:245 Utils.py:123 const.py:169
+#: PeopleModel.py:387 Utils.py:118 const.py:169
 #: plugins/DetAncestralReport.py:308 plugins/DetAncestralReport.py:315
 #: plugins/DetDescendantReport.py:330 plugins/DetDescendantReport.py:337
 #: plugins/FamilyGroup.py:458 plugins/IndivComplete.py:281
@@ -412,19 +437,19 @@ msgstr "GEDCOM-filer"
 msgid "unknown"
 msgstr "ukjent"
 
-#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:381 SelectChild.py:241
-#: const.py:167 plugins/RelCalc.py:111
+#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:387 const.py:167
+#: plugins/RelCalc.py:111
 msgid "male"
 msgstr "mann"
 
-#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:381 SelectChild.py:243
-#: const.py:168 plugins/RelCalc.py:113
+#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:387 const.py:168
+#: plugins/RelCalc.py:113
 msgid "female"
 msgstr "kvinne"
 
-#: DisplayModels.py:468 ImageSelect.py:981 MediaView.py:243 NoteEdit.py:104
-#: Utils.py:160 gramps.glade:5208 gramps.glade:15342 gramps.glade:25747
-#: gramps.glade:26749 gramps.glade:28117 gramps.glade:29548
+#: DisplayModels.py:468 ImageSelect.py:983 MediaView.py:243 NoteEdit.py:104
+#: Utils.py:155 gramps.glade:5501 gramps.glade:16531 gramps.glade:27709
+#: gramps.glade:28757 gramps.glade:30210 gramps.glade:31740
 msgid "Note"
 msgstr "Kommentar"
 
@@ -446,7 +471,7 @@ msgstr ""
 msgid "Internal Error"
 msgstr "Intern feil"
 
-#: EditPerson.py:132 EditPerson.py:634
+#: EditPerson.py:132 EditPerson.py:635
 msgid "Edit Person"
 msgstr "Rediger person"
 
@@ -454,12 +479,12 @@ msgstr "Rediger person"
 msgid "Patronymic:"
 msgstr "Avstamningsnavn:"
 
-#: EditPerson.py:306 EditSource.py:325 EventEdit.py:278 ImageSelect.py:1123
+#: EditPerson.py:306 EditSource.py:332 EventEdit.py:278 ImageSelect.py:1125
 #: Marriage.py:213 plugins/ScratchPad.py:166 plugins/ScratchPad.py:180
 msgid "Event"
 msgstr "Hendelse"
 
-#: EditPerson.py:307 EditPerson.py:344 EditPlace.py:130 const.py:435
+#: EditPerson.py:307 EditPerson.py:344 EditPlace.py:131 const.py:435
 #: plugins/ScratchPad.py:185 plugins/ScratchPad.py:227
 #: plugins/ScratchPad.py:262
 msgid "Description"
@@ -471,21 +496,21 @@ msgstr "Beskrivelse"
 msgid "Date"
 msgstr "Dato"
 
-#: EditPerson.py:309 EditPlace.py:271 EditSource.py:331 ImageSelect.py:1129
-#: Marriage.py:213 gramps.glade:12208 plugins/ScratchPad.py:183
+#: EditPerson.py:309 EditPlace.py:289 EditSource.py:338 ImageSelect.py:1131
+#: Marriage.py:213 gramps.glade:13109 plugins/ScratchPad.py:183
 #: plugins/ScratchPad.py:225
 msgid "Place"
 msgstr "Sted"
 
-#: EditPerson.py:326 EditSource.py:156 ImageSelect.py:682 ImageSelect.py:952
-#: Marriage.py:214 gramps.glade:12727 plugins/FilterEditor.py:459
+#: EditPerson.py:326 EditSource.py:160 ImageSelect.py:682 ImageSelect.py:954
+#: Marriage.py:214 gramps.glade:13691 plugins/FilterEditor.py:459
 #: plugins/PatchNames.py:188 plugins/ScratchPad.py:284
 #: plugins/ScratchPad.py:317 plugins/ScratchPad.py:543
 #: plugins/ScratchPad.py:549
 msgid "Value"
 msgstr "Verdi"
 
-#: EditPerson.py:338 EditSource.py:305 ImageSelect.py:1102 MediaView.py:59
+#: EditPerson.py:338 EditSource.py:312 ImageSelect.py:1104 MediaView.py:59
 #: MergePeople.py:152 SelectObject.py:86 plugins/BookReport.py:631
 #: plugins/BookReport.py:632 plugins/PatchNames.py:185
 #: plugins/ScratchPad.py:181 plugins/ScratchPad.py:223
@@ -495,83 +520,83 @@ msgstr "Verdi"
 msgid "Type"
 msgstr "Type"
 
-#: EditPerson.py:344 EditPlace.py:129 MediaView.py:60
+#: EditPerson.py:344 EditPlace.py:130 MediaView.py:60
 #: plugins/ScratchPad.py:260
 msgid "Path"
 msgstr "Sti"
 
-#: EditPerson.py:566 ImageSelect.py:610 ImageSelect.py:1037 MediaView.py:275
+#: EditPerson.py:567 ImageSelect.py:610 ImageSelect.py:1041 MediaView.py:275
 #: plugins/ScratchPad.py:424 plugins/ScratchPad.py:432
 msgid "Media Object"
 msgstr "Mediaobjekt"
 
-#: EditPerson.py:572 ImageSelect.py:616 docgen/AbiWord2Doc.py:327
+#: EditPerson.py:573 ImageSelect.py:616 docgen/AbiWord2Doc.py:335
 #: docgen/AsciiDoc.py:371 docgen/HtmlDoc.py:486 docgen/KwordDoc.py:494
 #: docgen/PdfDoc.py:631 docgen/RTFDoc.py:427
 msgid "Open in %s"
 msgstr "pne i %s"
 
-#: EditPerson.py:575 ImageSelect.py:619 MediaView.py:288
+#: EditPerson.py:576 ImageSelect.py:619 MediaView.py:288
 msgid "Edit with the GIMP"
 msgstr "Rediger med GIMP"
 
-#: EditPerson.py:577 ImageSelect.py:621
+#: EditPerson.py:578 ImageSelect.py:621
 msgid "Edit Object Properties"
 msgstr "Rediger objekt-egenskapene"
 
-#: EditPerson.py:628
+#: EditPerson.py:629
 msgid "New Person"
 msgstr "Ny person"
 
-#: EditPerson.py:753 GrampsCfg.py:63 const.py:233 const.py:246
+#: EditPerson.py:754 GrampsCfg.py:63 const.py:233 const.py:246
 msgid "None"
 msgstr "Ingen"
 
-#: EditPerson.py:1290
+#: EditPerson.py:1291
 msgid "Save changes to %s?"
 msgstr "Lagre endringene i %s?"
 
-#: EditPerson.py:1291 EditPerson.py:1307 Marriage.py:622 Marriage.py:635
+#: EditPerson.py:1292 EditPerson.py:1308 Marriage.py:622 Marriage.py:635
 msgid "If you close without saving, the changes you have made will be lost"
 msgstr "Hvis du lukker uten  lagre, vil dine endringer g tapt"
 
-#: EditPerson.py:1306
+#: EditPerson.py:1307
 msgid "Save Changes to %s?"
 msgstr "Lagre endringene i %s?"
 
-#: EditPerson.py:1652
+#: EditPerson.py:1653
 msgid "Make the selected name the preferred name"
 msgstr "Gjr det valgte navnet til det foretrukne"
 
-#: EditPerson.py:1696
+#: EditPerson.py:1697
 msgid "Unknown gender specified"
 msgstr "Det angitte kjnnet er ukjent"
 
-#: EditPerson.py:1697
+#: EditPerson.py:1698
 msgid "The gender of the person is currently unknown. Usually, this is a mistake. You may choose to either continue saving, or returning to the Edit Person dialog to fix the problem."
 msgstr "Kjnnet til personen er for yeblikket ukjent. Vanligvis er dette en feil. Du kan velge  fortsette lagringen, eller g tilbake til Rediger person-dialogvinduet for  rette opp feilen."
 
-#: EditPerson.py:1701
+#: EditPerson.py:1702
 msgid "Continue saving"
 msgstr "Fortsette  lagre"
 
-#: EditPerson.py:1701
+#: EditPerson.py:1702
 msgid "Return to window"
 msgstr "G tilbake til vindu"
 
-#: EditPerson.py:1729 Marriage.py:654
+#: EditPerson.py:1730 Marriage.py:654
 msgid "GRAMPS ID value was not changed."
 msgstr "GRAMPS ID-verdi ble ikke endret."
 
-#: EditPerson.py:1730
+#: EditPerson.py:1731
 msgid "You have attempted to change the GRAMPS ID to a value of %(grampsid)s. This value is already used by %(person)s."
 msgstr "Du har prvd  forandre GRAMPS ID-en til verdien %(grampsid)s. Denne verdien er allerede i bruk av %(person)s."
 
-#: EditPerson.py:1842
+#: EditPerson.py:1843
 msgid "Problem changing the gender"
 msgstr "Problem med  endre kjnn"
 
-#: EditPerson.py:1843
+#: EditPerson.py:1844
 msgid ""
 "Changing the gender caused problems with marriage information.\n"
 "Please check the person's marriages."
@@ -579,96 +604,106 @@ msgstr ""
 "Endring av kjnn frte til problemer med informasjonen om ekteskapet.\n"
 "Sjekk personens gifteml."
 
-#: EditPerson.py:1886
+#: EditPerson.py:1887
 msgid "Edit Person (%s)"
 msgstr "Rediger person (%s)"
 
-#: EditPerson.py:1902 ImageSelect.py:1162
+#: EditPerson.py:1903 ImageSelect.py:1165
 msgid "Add Place (%s)"
 msgstr "Legg til sted (%s)"
 
-#: EditPlace.py:90 EditPlace.py:277
+#: EditPlace.py:91 EditPlace.py:295
 msgid "Place Editor"
 msgstr "Stedsbehandler"
 
-#: EditPlace.py:149 PlaceView.py:53
+#: EditPlace.py:150 PlaceView.py:53
 msgid "City"
 msgstr "By"
 
-#: EditPlace.py:149 PlaceView.py:54
+#: EditPlace.py:150 PlaceView.py:54
 msgid "County"
 msgstr "Fylke"
 
-#: EditPlace.py:150 PlaceView.py:55
+#: EditPlace.py:151 PlaceView.py:55
 msgid "State"
 msgstr "Stat"
 
-#: EditPlace.py:150 PlaceView.py:56
+#: EditPlace.py:151 PlaceView.py:56
 msgid "Country"
 msgstr "Land"
 
-#: EditPlace.py:266 EditPlace.py:270
+#: EditPlace.py:284 EditPlace.py:288
 msgid "New Place"
 msgstr "Nytt sted"
 
-#: EditPlace.py:400
+#: EditPlace.py:391
+#, fuzzy
+msgid "Place title is already in use"
+msgstr "Steds titel er allerede i bruk"
+
+#: EditPlace.py:392
+#, fuzzy
+msgid "Each place must have a unique title, and title you have selected is already used by another place"
+msgstr "Hvert sted m ha en unik titel, og titelen du har valgt er allerede i bruk til et annet sted"
+
+#: EditPlace.py:427
 msgid "Edit Place (%s)"
 msgstr "Rediger sted (%s)"
 
-#: EditPlace.py:518
+#: EditPlace.py:546
 msgid "People"
 msgstr "Personer"
 
-#: EditPlace.py:520 EditPlace.py:529
+#: EditPlace.py:548 EditPlace.py:557
 msgid "%s [%s]: event %s\n"
 msgstr "%s [%s] hendelse %s\n"
 
-#: EditPlace.py:527
+#: EditPlace.py:555
 msgid "Families"
 msgstr "Familier"
 
-#: EditPlace.py:535 Utils.py:115
+#: EditPlace.py:563 Utils.py:110
 msgid "%(father)s and %(mother)s"
 msgstr "%(father)s og %(mother)s"
 
-#: EditPlace.py:605 PlaceView.py:221
+#: EditPlace.py:633 PlaceView.py:224
 msgid "Delete Place (%s)"
 msgstr "Slett sted (%s)"
 
-#: EditSource.py:86 EditSource.py:242
+#: EditSource.py:90 EditSource.py:249
 msgid "Source Editor"
 msgstr "Kildebehandler"
 
-#: EditSource.py:156
+#: EditSource.py:160
 msgid "Key"
 msgstr "Tast"
 
-#: EditSource.py:231 EditSource.py:235 Sources.py:451 Sources.py:453
+#: EditSource.py:238 EditSource.py:242 Sources.py:451 Sources.py:453
 msgid "New Source"
 msgstr "Ny kilde"
 
-#: EditSource.py:236 EditSource.py:337 ImageSelect.py:1135 Utils.py:165
-#: Utils.py:167
+#: EditSource.py:243 EditSource.py:344 ImageSelect.py:1137 Utils.py:160
+#: Utils.py:162
 msgid "Source"
 msgstr "Kilde"
 
-#: EditSource.py:313 ImageSelect.py:1111 plugins/EventCmp.py:408
+#: EditSource.py:320 ImageSelect.py:1113 plugins/EventCmp.py:408
 msgid "Person"
 msgstr "Person"
 
-#: EditSource.py:319 ImageSelect.py:1117
+#: EditSource.py:326 ImageSelect.py:1119
 msgid "Family"
 msgstr "Familie"
 
-#: EditSource.py:343
+#: EditSource.py:350
 msgid "Media"
 msgstr "Media"
 
-#: EditSource.py:397
+#: EditSource.py:404
 msgid "Edit Source (%s)"
 msgstr "Rediger kilde (%s)"
 
-#: EditSource.py:463
+#: EditSource.py:471
 msgid "Delete Source (%s)"
 msgstr "Slett kilde (%s)"
 
@@ -858,22 +893,22 @@ msgstr "D
 
 #: FamilyView.py:395 FamilyView.py:405 FamilyView.py:426 FamilyView.py:433
 #: FamilyView.py:465 FamilyView.py:530 FamilyView.py:536 FamilyView.py:606
-#: FamilyView.py:612 FamilyView.py:1173 FamilyView.py:1179 FamilyView.py:1212
-#: FamilyView.py:1218 PedView.py:561 PedView.py:570 PeopleView.py:308
-#: gramps.glade:821 gramps_main.py:659
+#: FamilyView.py:612 FamilyView.py:1176 FamilyView.py:1182 FamilyView.py:1215
+#: FamilyView.py:1221 PedView.py:564 PedView.py:573 PeopleView.py:301
+#: gramps.glade:822 gramps_main.py:659
 msgid "Home"
 msgstr "Hjem"
 
-#: FamilyView.py:396 PeopleView.py:291
+#: FamilyView.py:396 PeopleView.py:284
 msgid "Add Bookmark"
 msgstr "Legg til bokmerke"
 
 #: FamilyView.py:399 FamilyView.py:429 FamilyView.py:458 FamilyView.py:489
-#: PedView.py:584 PedView.py:595 PeopleView.py:304
+#: PedView.py:587 PedView.py:598 PeopleView.py:297
 msgid "People Menu"
 msgstr "Personmeny"
 
-#: FamilyView.py:454 FamilyView.py:486 FamilyView.py:1192 FamilyView.py:1231
+#: FamilyView.py:454 FamilyView.py:486 FamilyView.py:1195 FamilyView.py:1234
 msgid "Add parents"
 msgstr "Legg til foreldre"
 
@@ -885,7 +920,7 @@ msgstr "Barnemeny"
 msgid "Make the selected child an active person"
 msgstr "Gjr det valgte barnet til en aktiv person"
 
-#: FamilyView.py:548 FamilyView.py:1191 FamilyView.py:1230
+#: FamilyView.py:548 FamilyView.py:1194 FamilyView.py:1233
 msgid "Edit the child/parent relationships"
 msgstr "Rediger barn/foreldre-relasjonene"
 
@@ -929,47 +964,47 @@ msgstr "Sett foretrukket ektefelle (%s)"
 msgid "Modify family"
 msgstr "Rediger familie"
 
-#: FamilyView.py:800 FamilyView.py:1445 SelectChild.py:85 SelectChild.py:148
+#: FamilyView.py:800 FamilyView.py:1448 SelectChild.py:88 SelectChild.py:153
 msgid "Add Child to Family"
 msgstr "Legg til et barn i en familie"
 
-#: FamilyView.py:839
+#: FamilyView.py:854
 msgid "Remove Child (%s)"
 msgstr "Fjern barn (%s)"
 
-#: FamilyView.py:845
+#: FamilyView.py:862
 msgid "Remove %s as a spouse of %s?"
 msgstr "Fjern %s som ektefelle av %s?"
 
-#: FamilyView.py:846
+#: FamilyView.py:863
 msgid "Removing a spouse removes the relationship between the spouse and the active person. It does not remove the spouse from the database"
 msgstr " fjerne ektefellen vil fjerne relasjonen mellom ektefellen og den aktive personen. Ektefellen blir ikke fjernet fra databasen."
 
-#: FamilyView.py:849
+#: FamilyView.py:866
 msgid "_Remove Spouse"
 msgstr "Fje_rn ektefelle"
 
-#: FamilyView.py:893
+#: FamilyView.py:905
 msgid "Remove Spouse (%s)"
 msgstr "Fjern ektefelle (%s)"
 
-#: FamilyView.py:934
+#: FamilyView.py:946
 msgid "Select Parents (%s)"
 msgstr "Velg foreldre (%s)"
 
-#: FamilyView.py:1049
+#: FamilyView.py:1061
 msgid ""
 msgstr ""
 
-#: FamilyView.py:1066
+#: FamilyView.py:1078
 msgid "Database corruption detected"
 msgstr "delagt database ble oppdaget"
 
-#: FamilyView.py:1067
+#: FamilyView.py:1079
 msgid "A problem was detected with the database. Please run the Check and Repair Database tool to fix the problem."
 msgstr "Det ble oppdaget et problem med databasen. Kjr Sjekk og reparer databsen-verktyet for  ordne problemet."
 
-#: FamilyView.py:1118
+#: FamilyView.py:1130
 msgid ""
 "%s: %s [%s]\n"
 "\tRelationship: %s"
@@ -977,105 +1012,96 @@ msgstr ""
 "%s: %s [%s]\n"
 "\tRelasjon: %s"
 
-#: FamilyView.py:1120
+#: FamilyView.py:1132
 msgid "%s: unknown"
 msgstr "%s: ukjent"
 
-#: FamilyView.py:1164
+#: FamilyView.py:1167
 msgid "Parents Menu"
 msgstr "Foreldremeny"
 
-#: FamilyView.py:1190 FamilyView.py:1229
+#: FamilyView.py:1193 FamilyView.py:1232
 msgid "Make the selected parents the active family"
 msgstr "Gjr de valgte foreldrene til den aktive familien"
 
-#: FamilyView.py:1193 FamilyView.py:1232
+#: FamilyView.py:1196 FamilyView.py:1235
 msgid "Remove parents"
 msgstr "Fjern foreldrene"
 
-#: FamilyView.py:1203
+#: FamilyView.py:1206
 msgid "Spouse Parents Menu"
 msgstr "Ektefelle/foreldre-meny"
 
-#: FamilyView.py:1295 FamilyView.py:1310
+#: FamilyView.py:1298 FamilyView.py:1313
 msgid "Remove Parents of %s"
 msgstr "Fjern foreldrene til %s"
 
-#: FamilyView.py:1296 FamilyView.py:1311
+#: FamilyView.py:1299 FamilyView.py:1314
 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 " fjerne foreldrene til en person vil fjerne personen som barn av foreldrene. Foreldrene blir ikke fjernet fra databasen, og relasjonen mellom foreldrene blir ikke forandret."
 
-#: FamilyView.py:1300 FamilyView.py:1315
+#: FamilyView.py:1303 FamilyView.py:1318
 msgid "_Remove Parents"
 msgstr "Fje_rne foreldre"
 
-#: FamilyView.py:1408
+#: FamilyView.py:1411
 msgid "Remove Parents (%s)"
 msgstr "Fjern foreldre (%s)"
 
-#: FamilyView.py:1480
+#: FamilyView.py:1483
 msgid "Attempt to Reorder Children Failed"
 msgstr "Klarte ikke  omsortere barna"
 
-#: FamilyView.py:1481
+#: FamilyView.py:1484
 msgid "Children must be ordered by their birth dates."
 msgstr "Barn m sorteres etter fdselsdato."
 
-#: FamilyView.py:1486
+#: FamilyView.py:1489
 msgid "Reorder children"
 msgstr "Omsortere barna"
 
-#: FamilyView.py:1520
+#: FamilyView.py:1523
 msgid "Reorder spouses"
 msgstr "Omsortere ektefeller"
 
-#: GenericFilter.py:90
+#: GenericFilter.py:91
 msgid "Miscellaneous filters"
 msgstr "Diverse filtre"
 
-#: GenericFilter.py:91 rule.glade:1165
+#: GenericFilter.py:92 rule.glade:1165
 msgid "No description"
 msgstr "Ingen beskrivelse"
 
-#: GenericFilter.py:130
+#: GenericFilter.py:131
 msgid "Everyone"
 msgstr "Enhver"
 
-#: GenericFilter.py:131 GenericFilter.py:146 GenericFilter.py:263
-#: GenericFilter.py:277 GenericFilter.py:295 GenericFilter.py:312
-#: GenericFilter.py:327 GenericFilter.py:342 GenericFilter.py:969
-#: GenericFilter.py:1218 GenericFilter.py:1243 GenericFilter.py:1273
-#: GenericFilter.py:1306 GenericFilter.py:1324 GenericFilter.py:1346
-#: GenericFilter.py:1431 GenericFilter.py:1489 GenericFilter.py:1554
-#: GenericFilter.py:1574 GenericFilter.py:1645 GenericFilter.py:1810
-msgid "General filters"
-msgstr "Generelle filtre"
-
-#: GenericFilter.py:132
+#: GenericFilter.py:133
+#, fuzzy
 msgid "Matches everyone in the database"
-msgstr "Gjelder alle i databasen"
+msgstr "Samsvarer med alle i databasen"
 
-#: GenericFilter.py:145
+#: GenericFilter.py:146
 msgid "Disconnected people"
 msgstr "Slektslse personer"
 
-#: GenericFilter.py:147
+#: GenericFilter.py:148
 #, fuzzy
 msgid "Matches people that have no family relationships to any other person in the database"
-msgstr "Gjelder personer som ikke er beslektet med noan andre i databasen"
+msgstr "Samsvarer med personer som ikke er beslektet med noan andre i databasen"
 
-#: GenericFilter.py:164 GenericFilter.py:260 GenericFilter.py:357
-#: GenericFilter.py:448 GenericFilter.py:492 GenericFilter.py:614
-#: GenericFilter.py:661 GenericFilter.py:759 GenericFilter.py:811
-#: GenericFilter.py:898 gramps.glade:3363 gramps.glade:19187
-#: gramps.glade:21375 gramps.glade:22772 plugins/FilterEditor.py:680
+#: GenericFilter.py:164 GenericFilter.py:260 GenericFilter.py:368
+#: GenericFilter.py:459 GenericFilter.py:502 GenericFilter.py:623
+#: GenericFilter.py:670 GenericFilter.py:768 GenericFilter.py:820
+#: GenericFilter.py:907 gramps.glade:3521 gramps.glade:20666
+#: gramps.glade:23027 gramps.glade:24539 plugins/FilterEditor.py:680
 msgid "ID:"
 msgstr "ID:"
 
 #: GenericFilter.py:165
 #, fuzzy
 msgid "Relationship path between "
-msgstr "Relasjonslinje mellem "
+msgstr "Relasjonslinje mellom "
 
 #: GenericFilter.py:166
 msgid "Relationship filters"
@@ -1084,7 +1110,7 @@ msgstr "Relasjonsfiltere"
 #: GenericFilter.py:167
 #, fuzzy
 msgid "Matches the ancestors of two persons back to a common ancestor, producing the relationship path between two persons."
-msgstr "Gjelder for anene til to personer tilbake til en felles forfar. Dette gir relasjonslinja for et slektskap mellom to personer."
+msgstr "Samsvarer med to personers aner, tilbake til en felles ane. Dette gir relasjonslinje for et slektskap mellom to personer."
 
 #: GenericFilter.py:261
 #, fuzzy
@@ -1094,7 +1120,7 @@ msgstr "Personer med "
 #: GenericFilter.py:262
 #, fuzzy
 msgid "Matches people with a specified GRAMPS ID"
-msgstr "Gjelder personen med en spesifisert GRAMPS ID"
+msgstr "Samsvarer med personen med en spesifikk GRAMPS ID"
 
 #: GenericFilter.py:276
 #, fuzzy
@@ -1102,402 +1128,412 @@ msgid "Default person"
 msgstr "Standardperson"
 
 #: GenericFilter.py:278
+#, fuzzy
 msgid "Matches the default person"
-msgstr "Gjelder standardpersonen"
+msgstr "Samsvarer med standardpersonen"
 
-#: GenericFilter.py:294
+#: GenericFilter.py:299
 #, fuzzy
 msgid "Bookmarked people"
 msgstr "Personer med bokmerke"
 
-#: GenericFilter.py:296
+#: GenericFilter.py:301
+#, fuzzy
 msgid "Matches the people on the bookmark list"
-msgstr "Gjelder personer i lista over bokmerker"
+msgstr "Samsvarer med alle personer som er bokmerker"
 
-#: GenericFilter.py:311
+#: GenericFilter.py:322
 #, fuzzy
 msgid "People with complete records"
 msgstr "Personer med fullstendige opplysninger"
 
-#: GenericFilter.py:313
+#: GenericFilter.py:324
+#, fuzzy
 msgid "Matches all people whose records are complete"
-msgstr "Gjelder alle personer med komplett informasjon"
+msgstr "Samsvarer med alle personer med komplett informasjon"
 
-#: GenericFilter.py:326 gramps_main.py:957 plugins/Summary.py:113
+#: GenericFilter.py:337 gramps_main.py:957 plugins/Summary.py:113
 msgid "Females"
 msgstr "Kvinner"
 
-#: GenericFilter.py:328
+#: GenericFilter.py:339
+#, fuzzy
 msgid "Matches all females"
-msgstr "Gjelder alle kvinner"
+msgstr "Samsvarer med alle kvinner"
 
-#: GenericFilter.py:341 gramps_main.py:967
+#: GenericFilter.py:352 gramps_main.py:967
 #, fuzzy
 msgid "People with unknown gender"
 msgstr "Personer med ukjent kjnn"
 
-#: GenericFilter.py:343
+#: GenericFilter.py:354
 #, fuzzy
 msgid "Matches all people with unknown gender"
-msgstr "Gjelder alle personer med ukjent kjnn"
+msgstr "Samsvarer med alle personer med ukjent kjnn"
 
-#: GenericFilter.py:357 GenericFilter.py:406 GenericFilter.py:661
-#: GenericFilter.py:716 plugins/FilterEditor.py:692
+#: GenericFilter.py:368 GenericFilter.py:416 GenericFilter.py:670
+#: GenericFilter.py:724 plugins/FilterEditor.py:692
 msgid "Inclusive:"
 msgstr "Inkludert:"
 
-#: GenericFilter.py:358
+#: GenericFilter.py:369
 #, fuzzy
 msgid "Descendants of "
 msgstr "Etterkommere av "
 
-#: GenericFilter.py:359 GenericFilter.py:408 GenericFilter.py:450
-#: GenericFilter.py:494 GenericFilter.py:616
+#: GenericFilter.py:370 GenericFilter.py:418 GenericFilter.py:461
+#: GenericFilter.py:504 GenericFilter.py:625
 msgid "Descendant filters"
 msgstr "Filtere for etterkommere"
 
-#: GenericFilter.py:360
+#: GenericFilter.py:371
+#, fuzzy
 msgid "Matches all descendants for the specified person"
-msgstr "Gjelder alle etterkommerne til den valgte personen"
+msgstr "Samsvarer med alle etterkommerne til den valgte personen"
 
-#: GenericFilter.py:406 GenericFilter.py:535 GenericFilter.py:573
-#: GenericFilter.py:716 GenericFilter.py:861 GenericFilter.py:941
+#: GenericFilter.py:416 GenericFilter.py:544 GenericFilter.py:582
+#: GenericFilter.py:724 GenericFilter.py:870 GenericFilter.py:951
 #: GenericFilter.py:1343 GenericFilter.py:1386 plugins/FilterEditor.py:684
 msgid "Filter name:"
 msgstr "Filternavn:"
 
-#: GenericFilter.py:407
+#: GenericFilter.py:417
 #, fuzzy
 msgid "Descendants of  match"
 msgstr "Etterkommer av  filtersk"
 
-#: GenericFilter.py:409
+#: GenericFilter.py:419
 #, fuzzy
 msgid "Matches people that are descendants of anybody matched by a filter"
-msgstr "Gjelder personer som er etterkommere av noen som er funnet ved hjelp av et filter."
+msgstr "Samsvarer med personer som er etterkommere av noen som samsvarer med et filter."
 
-#: GenericFilter.py:448 GenericFilter.py:492 GenericFilter.py:759
-#: GenericFilter.py:811 plugins/FilterEditor.py:678
+#: GenericFilter.py:459 GenericFilter.py:502 GenericFilter.py:768
+#: GenericFilter.py:820 plugins/FilterEditor.py:678
 msgid "Number of generations:"
 msgstr "Antall generasjoner:"
 
-#: GenericFilter.py:449
+#: GenericFilter.py:460
 #, fuzzy
 msgid "Descendants of  not more than  generations away"
-msgstr "Etterkommer av  som ikke er mer enn N generasjoner unna"
+msgstr "Etterkommer av , ikke er mer enn  generasjoner unna"
 
-#: GenericFilter.py:451
+#: GenericFilter.py:462
+#, fuzzy
 msgid "Matches people that are descendants of a specified person not more than N generations away"
-msgstr "Gjelder personer som er etterkommere av en bestemt person ikke mer enn N antall generasjoner unna"
+msgstr "Samsvarer med personer som er etterkommere av en bestemt person ikke mer enn N antall generasjoner unna"
 
-#: GenericFilter.py:493
+#: GenericFilter.py:503
 #, fuzzy
 msgid "Descendants of  at least  generations away"
 msgstr "Etterkommer av , minst  generasjoner unna"
 
-#: GenericFilter.py:495
+#: GenericFilter.py:505
+#, fuzzy
 msgid "Matches people that are descendants of a specified person at least N generations away"
-msgstr "Gjelder de som er etterkommere av en bestemt person minst N generasjoner unna"
+msgstr "Samsvarer med de som er etterkommere av en bestemt person minst N generasjoner unna"
 
-#: GenericFilter.py:536
+#: GenericFilter.py:545
 #, fuzzy
 msgid "Children of  match"
 msgstr "Barn av  filtersk"
 
-#: GenericFilter.py:537 GenericFilter.py:575 GenericFilter.py:863
-#: GenericFilter.py:1088 GenericFilter.py:1389 GenericFilter.py:1413
-#: GenericFilter.py:1445 GenericFilter.py:1461 GenericFilter.py:1475
+#: GenericFilter.py:546 GenericFilter.py:584 GenericFilter.py:872
+#: GenericFilter.py:1096 GenericFilter.py:1389 GenericFilter.py:1412
+#: GenericFilter.py:1442 GenericFilter.py:1457 GenericFilter.py:1470
 msgid "Family filters"
 msgstr "Familie-filtere"
 
-#: GenericFilter.py:538
+#: GenericFilter.py:547
 #, fuzzy
 msgid "Matches children of anybody matched by a filter"
-msgstr "Gjelder barn av en person som er funnet ved et filter"
+msgstr "Samsvarer med barn av en person som er funnet ved et filter"
 
-#: GenericFilter.py:574
+#: GenericFilter.py:583
 #, fuzzy
 msgid "Siblings of  match"
-msgstr "Er et ssken av  filtersk"
+msgstr "Ssken av  filtersk"
 
-#: GenericFilter.py:576
+#: GenericFilter.py:585
 #, fuzzy
 msgid "Matches siblings of anybody matched by a filter"
-msgstr "Gjelder ssken av noen som er funnet ved et filter"
+msgstr "Samsvarer med ssken av noen som er funnet ved et filter"
 
-#: GenericFilter.py:615
+#: GenericFilter.py:624
 #, fuzzy
 msgid "Descendant family members of "
 msgstr "Etterkommende familiemedlem av "
 
-#: GenericFilter.py:617
+#: GenericFilter.py:626
+#, fuzzy
 msgid "Matches people that are descendants or the spouse of a descendant of a specified person"
-msgstr "Gjelder personer som er etterkommere, eller ektefellen til en etterkommer, av en bestemt person"
+msgstr "Samsvarer med personer som er etterkommere, eller ektefellen til en etterkommer, av en bestemt person"
 
-#: GenericFilter.py:662
+#: GenericFilter.py:671
 #, fuzzy
 msgid "Ancestors of "
 msgstr "Ane av "
 
-#: GenericFilter.py:663 GenericFilter.py:718 GenericFilter.py:761
-#: GenericFilter.py:813 GenericFilter.py:900 GenericFilter.py:945
+#: GenericFilter.py:672 GenericFilter.py:726 GenericFilter.py:770
+#: GenericFilter.py:822 GenericFilter.py:909 GenericFilter.py:955
 #, fuzzy
 msgid "Ancestral filters"
 msgstr "Anefiltre"
 
-#: GenericFilter.py:664
+#: GenericFilter.py:673
 #, fuzzy
 msgid "Matches people that are ancestors of a specified person"
-msgstr "Gjelder personer som er aner til en bestemt person"
+msgstr "Samsvarer med personer som er aner til en bestemt person"
 
 # <
-#: GenericFilter.py:717
+#: GenericFilter.py:725
 #, fuzzy
 msgid "Ancestors of  match"
 msgstr "Ane av  filtersk"
 
-#: GenericFilter.py:719
+#: GenericFilter.py:727
+#, fuzzy
 msgid "Matches people that are ancestors of anybody matched by a filter"
-msgstr "Gjelder anene av noen som er funnet ved et filter"
+msgstr "Samsvarer med anene av noen som er funnet ved et filter"
 
-#: GenericFilter.py:760
+#: GenericFilter.py:769
 #, fuzzy
 msgid "Ancestors of  not more than  generations away"
 msgstr "Ane av , ikke mer enn  generasjoner unna"
 
-#: GenericFilter.py:762
+#: GenericFilter.py:771
 #, fuzzy
 msgid "Matches people that are ancestors of a specified person not more than N generations away"
-msgstr "Gjelder personer som er aner av en bestemt person ikke mer enn N generasjoner unna"
+msgstr "Samsvarer med personer som er aner av en bestemt person ikke mer enn N generasjoner unna"
 
-#: GenericFilter.py:812
+#: GenericFilter.py:821
 #, fuzzy
 msgid "Ancestors of  at least  generations away"
 msgstr "Ane av , minst  generasjoner unna"
 
-#: GenericFilter.py:814
+#: GenericFilter.py:823
 #, fuzzy
 msgid "Matches people that are ancestors of a specified person at least N generations away"
-msgstr "Gjelder personer som er aner av en bestemt person minst N generasjoner unna"
+msgstr "Samsvarer med personer som er aner av en bestemt person minst N generasjoner unna"
 
-#: GenericFilter.py:862
+#: GenericFilter.py:871
 #, fuzzy
 msgid "Parents of  match"
 msgstr "Forelder av  filtersk"
 
-#: GenericFilter.py:864
+#: GenericFilter.py:873
 #, fuzzy
 msgid "Matches parents of anybody matched by a filter"
-msgstr "Gjelder personer som er aner av noen som er funnet ved hjelp av et filter"
+msgstr "Samsvare med personer som er aner av noen som samsvarer med et filter"
 
-#: GenericFilter.py:899
+#: GenericFilter.py:908
 #, fuzzy
 msgid "People with a common ancestor with "
 msgstr "Personer med samme aner som "
 
-#: GenericFilter.py:901
+#: GenericFilter.py:910
+#, fuzzy
 msgid "Matches people that have a common ancestor with a specified person"
-msgstr "Gjelder personer som har en felles forfader med en bestemt person"
+msgstr "Samsvarer med personer som har en felles ane med en bestemt person"
 
-#: GenericFilter.py:942
+#: GenericFilter.py:952
 #, fuzzy
 msgid "People with a common ancestor with  match"
-msgstr "Personer som har en felles stamfar med  filtersk"
+msgstr "Personer som har en ane felles med  filtersk"
 
-#: GenericFilter.py:943
+#: GenericFilter.py:953
 #, fuzzy
 msgid "Matches people that have a common ancestor with anybody matched by a filter"
-msgstr "Gjelder personer som har en felles forfader med noen som er funnet ved hjelp av et filter"
+msgstr "Samsvarer med personer som har en felles ane med noen som samsvarer med et filter"
 
-#: GenericFilter.py:968 gramps_main.py:962 plugins/Summary.py:112
+#: GenericFilter.py:978 gramps_main.py:962 plugins/Summary.py:112
 msgid "Males"
 msgstr "Menn"
 
-#: GenericFilter.py:970
+#: GenericFilter.py:980
 msgid "Matches all males"
-msgstr "Gjelder alle menn"
+msgstr "Samsvarer med alle menn"
 
-#: GenericFilter.py:983 GenericFilter.py:1586 plugins/FilterEditor.py:58
+#: GenericFilter.py:993 GenericFilter.py:1575 plugins/FilterEditor.py:58
 msgid "Personal event:"
 msgstr "Personlig hendelse:"
 
-#: GenericFilter.py:984 GenericFilter.py:1034 GenericFilter.py:1135
-#: GenericFilter.py:1175 gramps.glade:8536 gramps.glade:9462
-#: gramps.glade:12160 gramps.glade:13667
+#: GenericFilter.py:994 GenericFilter.py:1043 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:9101 gramps.glade:10129
+#: gramps.glade:13053 gramps.glade:14701
 msgid "Date:"
 msgstr "Dato:"
 
-#: GenericFilter.py:985 GenericFilter.py:1035 GenericFilter.py:1135
-#: GenericFilter.py:1175 gramps.glade:8488 gramps.glade:13715
+#: GenericFilter.py:995 GenericFilter.py:1044 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:9045 gramps.glade:14757
 #: plugins/FilterEditor.py:676
 msgid "Place:"
 msgstr "Sted:"
 
-#: GenericFilter.py:986 GenericFilter.py:1036 GenericFilter.py:1135
-#: GenericFilter.py:1175 gramps.glade:8440 gramps.glade:10680
-#: gramps.glade:12256 gramps.glade:15790
+#: GenericFilter.py:996 GenericFilter.py:1045 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:8989 gramps.glade:11453
+#: gramps.glade:13165 gramps.glade:16998
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: GenericFilter.py:987
+#: GenericFilter.py:997
 #, fuzzy
 msgid "People with the personal "
 msgstr "Personer som har person-hendelsen "
 
-#: GenericFilter.py:988
+#: GenericFilter.py:998
 #, fuzzy
 msgid "Matches people with a personal event of a particular value"
-msgstr "Gjelder personen med en personlig hendelse med en bestemt verdi"
+msgstr "Samsvarer med en personen som har personlig hendelse med en bestemt verdi"
 
-#: GenericFilter.py:989 GenericFilter.py:1039 GenericFilter.py:1138
-#: GenericFilter.py:1178 GenericFilter.py:1509 GenericFilter.py:1530
-#: GenericFilter.py:1589
+#: GenericFilter.py:999 GenericFilter.py:1048 GenericFilter.py:1145
+#: GenericFilter.py:1184 GenericFilter.py:1502 GenericFilter.py:1522
+#: GenericFilter.py:1578
 msgid "Event filters"
 msgstr "Filter for hendelser"
 
-#: GenericFilter.py:1033 GenericFilter.py:1586 plugins/FilterEditor.py:59
+#: GenericFilter.py:1042 GenericFilter.py:1575 plugins/FilterEditor.py:59
 msgid "Family event:"
 msgstr "Familie-hendelse:"
 
-#: GenericFilter.py:1037
+#: GenericFilter.py:1046
 #, fuzzy
 msgid "People with the family "
 msgstr "Personer med familie-hendelsen "
 
-#: GenericFilter.py:1038
+#: GenericFilter.py:1047
 #, fuzzy
 msgid "Matches people with a family event of a particular value"
-msgstr "Gjelder personen med en familie-hendelse av en bestemt verdi"
+msgstr "Samsvarer med en person som har en familie-hendelse av en bestemt verdi"
 
-#: GenericFilter.py:1083
+#: GenericFilter.py:1091
 msgid "Number of relationships:"
 msgstr "Antall relasjoner:"
 
-#: GenericFilter.py:1084 plugins/FilterEditor.py:65
+#: GenericFilter.py:1092 plugins/FilterEditor.py:65
 msgid "Relationship type:"
 msgstr "Relasjonstype:"
 
-#: GenericFilter.py:1085
+#: GenericFilter.py:1093
 msgid "Number of children:"
 msgstr "Antall barn:"
 
-#: GenericFilter.py:1086
+#: GenericFilter.py:1094
 #, fuzzy
 msgid "People with the "
 msgstr "Personer med "
 
-#: GenericFilter.py:1087
+#: GenericFilter.py:1095
 #, fuzzy
 msgid "Matches people with a particular relationship"
-msgstr "Gjelder personen som har en bestemt relasjon"
+msgstr "Samsvarer med personen som har en bestemt relasjon"
 
-#: GenericFilter.py:1136
+#: GenericFilter.py:1143
 #, fuzzy
 msgid "People with the "
 msgstr "Personer med "
 
-#: GenericFilter.py:1137
+#: GenericFilter.py:1144
 #, fuzzy
 msgid "Matches people with birth data of a particular value"
-msgstr "Gjelder personen som har fdsel av en bestemt verdi"
+msgstr "Samsvarer med personen som har fdselsdata av en bestemt verdi"
 
-#: GenericFilter.py:1176
+#: GenericFilter.py:1182
 #, fuzzy
 msgid "People with the "
 msgstr "Personer med "
 
-#: GenericFilter.py:1177
+#: GenericFilter.py:1183
 #, fuzzy
 msgid "Matches people with death data of a particular value"
-msgstr "Gjelder personen som har ddsfall av en bestemt verdi"
+msgstr "Samsvarer med personen som har ddsfall av en bestemt verdi"
 
-#: GenericFilter.py:1215 GenericFilter.py:1240 gramps.glade:9050
-#: gramps.glade:22103 gramps.glade:23110
+#: GenericFilter.py:1220 GenericFilter.py:1244 gramps.glade:9674
+#: gramps.glade:23827 gramps.glade:24909
 msgid "Value:"
 msgstr "Verdi:"
 
-#: GenericFilter.py:1215 plugins/FilterEditor.py:60
+#: GenericFilter.py:1220 plugins/FilterEditor.py:60
 msgid "Personal attribute:"
 msgstr "Personlig egenskap:"
 
-#: GenericFilter.py:1216
+#: GenericFilter.py:1221
 #, fuzzy
 msgid "People with the personal "
 msgstr "Persone med den personlige "
 
-#: GenericFilter.py:1217
+#: GenericFilter.py:1222
 #, fuzzy
 msgid "Matches people with the personal attribute of a particular value"
-msgstr "Gjelder personen med en personlig hendelse med en bestemt verdi"
+msgstr "Samsvarer med personer med en personlig hendelse med en bestemt verdi"
 
-#: GenericFilter.py:1240 plugins/FilterEditor.py:61
+#: GenericFilter.py:1244 plugins/FilterEditor.py:61
 msgid "Family attribute:"
 msgstr "Familie-egenskap:"
 
-#: GenericFilter.py:1241
+#: GenericFilter.py:1245
 #, fuzzy
 msgid "People with the family "
 msgstr "Personer med familie "
 
-#: GenericFilter.py:1242
+#: GenericFilter.py:1246
 #, fuzzy
 msgid "Matches people with the family attribute of a particular value"
-msgstr "Gjelder personen med en familie-hendelse av en bestemt verdi"
+msgstr "Samsvarer med personen med en familie-hendelse av en bestemt verdi"
 
-#: GenericFilter.py:1267 gramps.glade:7894
+#: GenericFilter.py:1270 gramps.glade:8380
 msgid "Given name:"
 msgstr "Fornavn:"
 
-#: GenericFilter.py:1268 gramps.glade:7870
+#: GenericFilter.py:1271 gramps.glade:8352
 msgid "Family name:"
 msgstr "Etternavn:"
 
-#: GenericFilter.py:1269 gramps.glade:7846
+#: GenericFilter.py:1272 gramps.glade:8324
 msgid "Suffix:"
 msgstr "Etterstavelse:"
 
-#: GenericFilter.py:1270 gramps.glade:3457 gramps.glade:7918
-#: gramps.glade:19281 gramps.glade:21520 gramps.glade:30990
+#: GenericFilter.py:1273 gramps.glade:3631 gramps.glade:8408
+#: gramps.glade:20776 gramps.glade:23196 gramps.glade:33293
 #: mergedata.glade:874 mergedata.glade:896
 msgid "Title:"
 msgstr "Tittel:"
 
-#: GenericFilter.py:1271
+#: GenericFilter.py:1274
 #, fuzzy
 msgid "People with the "
 msgstr "Personer med "
 
-#: GenericFilter.py:1272 GenericFilter.py:1305
+#: GenericFilter.py:1275 GenericFilter.py:1307
 #, fuzzy
 msgid "Matches people with a specified (partial) name"
-msgstr "Gjelder personen med et bestemt (del av et) navn"
+msgstr "Samsvarer med personen med et bestemt (del av et) navn"
 
-#: GenericFilter.py:1303 GenericFilter.py:1640
+#: GenericFilter.py:1305 GenericFilter.py:1629
 msgid "Substring:"
 msgstr "Delstreng:"
 
-#: GenericFilter.py:1304
+#: GenericFilter.py:1306
 #, fuzzy
 msgid "People matching the "
-msgstr "Gjelder personer med "
+msgstr "Samsvarer med personer med "
 
-#: GenericFilter.py:1322 gramps_main.py:992
+#: GenericFilter.py:1323 gramps_main.py:992
 msgid "People with incomplete names"
 msgstr "Personer med ufullstendige navn"
 
-#: GenericFilter.py:1323
+#: GenericFilter.py:1324
 msgid "Matches people with firstname or lastname missing"
-msgstr "Gjelder personer som mangler for- eller etternavn"
+msgstr "Samsvarer med personer som mangler for- eller etternavn"
 
 #: GenericFilter.py:1344
 #, fuzzy
 msgid "People matching the "
-msgstr "Gjelder personer med "
+msgstr "Samsvarer med personer med "
 
 #: GenericFilter.py:1345
 #, fuzzy
 msgid "Matches people macthed by the specified filter name"
-msgstr "Gjelder personen fra et bestemt filter"
+msgstr "Samsvarer med personen fra et bestemt filter"
 
 #: GenericFilter.py:1387
 #, fuzzy
@@ -1507,144 +1543,144 @@ msgstr "Ektefelle av et  treff"
 #: GenericFilter.py:1388
 #, fuzzy
 msgid "Matches people married to anybody matching a filter"
-msgstr "Gjelder personen som er gift med en som er funnet ved hjelp av et filter"
+msgstr "Samsvarer med personen som er gift med en som er funnet ved hjelp av et filter"
 
-#: GenericFilter.py:1411 gramps_main.py:982
+#: GenericFilter.py:1410 gramps_main.py:982
 #, fuzzy
 msgid "Adopted people"
 msgstr "Adopterte personer"
 
-#: GenericFilter.py:1412
+#: GenericFilter.py:1411
 #, fuzzy
 msgid "Matches people who were adopted"
-msgstr "Gjelder personer som er adoptert"
+msgstr "Samsvarer med personer som er adoptert"
 
-#: GenericFilter.py:1429 gramps_main.py:987
+#: GenericFilter.py:1427 gramps_main.py:987
 #, fuzzy
 msgid "People with images"
 msgstr "Personer med bilder"
 
-#: GenericFilter.py:1430
+#: GenericFilter.py:1428
 #, fuzzy
 msgid "Matches people with images in the gallery"
-msgstr "Gjelder personer som har bilder i galleriet"
+msgstr "Samsvarer med personer som har bilder i galleriet"
 
-#: GenericFilter.py:1443 gramps_main.py:997
+#: GenericFilter.py:1440 gramps_main.py:997
 msgid "People with children"
 msgstr "Personer med barn"
 
-#: GenericFilter.py:1444
+#: GenericFilter.py:1441
 #, fuzzy
 msgid "Matches people who have children"
-msgstr "Gjelder personen som har barn"
+msgstr "Samsvarer med personen som har barn"
 
-#: GenericFilter.py:1459 gramps_main.py:1002
+#: GenericFilter.py:1455 gramps_main.py:1002
 msgid "People with no marriage records"
 msgstr "Personer der informasjon om ekteskap mangler"
 
-#: GenericFilter.py:1460
+#: GenericFilter.py:1456
 #, fuzzy
 msgid "Matches people who have no spouse"
-msgstr "Gjelder personer som ikke har ektefeller"
+msgstr "Samsvarer med personer som ikke har ektefeller"
 
-#: GenericFilter.py:1473 gramps_main.py:1007
+#: GenericFilter.py:1468 gramps_main.py:1007
 msgid "People with multiple marriage records"
 msgstr "Personer med flere ekteskap"
 
-#: GenericFilter.py:1474
+#: GenericFilter.py:1469
 #, fuzzy
 msgid "Matches people who have more than one spouse"
-msgstr "Gjelder personen som har mer enn en ektefelle"
+msgstr "Samsvarer med personen som har mer enn en ektefelle"
 
-#: GenericFilter.py:1487 gramps_main.py:1012
+#: GenericFilter.py:1481 gramps_main.py:1012
 #, fuzzy
 msgid "People without a known birth date"
 msgstr "Personer uten fdselsdato"
 
-#: GenericFilter.py:1488
+#: GenericFilter.py:1482
 #, fuzzy
 msgid "Matches people without a known birthdate"
-msgstr "Gjelder personer uten fdselsdato"
+msgstr "Samsvarer med personer uten fdselsdato"
 
-#: GenericFilter.py:1507 gramps_main.py:1017
+#: GenericFilter.py:1500 gramps_main.py:1017
 msgid "People with incomplete events"
 msgstr "Personer med ufullstendige hendelser"
 
-#: GenericFilter.py:1508
+#: GenericFilter.py:1501
 #, fuzzy
 msgid "Matches people with missing date or place in an event"
-msgstr "Gjelder personer som mangler dato eller sted i en hendelse"
+msgstr "Samsvarer med personer som mangler dato eller sted i en hendelse"
 
-#: GenericFilter.py:1528 gramps_main.py:1022
+#: GenericFilter.py:1520 gramps_main.py:1022
 msgid "Families with incomplete events"
 msgstr "Familier med ufullstendige hendelser"
 
-#: GenericFilter.py:1529
+#: GenericFilter.py:1521
 #, fuzzy
 msgid "Matches people with missing date or place in an event of the family"
-msgstr "Gjelder personer som mangler dato eller sted i en familiehendelse"
+msgstr "Samsvarer med personer som mangler dato eller sted i en familiehendelse"
 
-#: GenericFilter.py:1551
+#: GenericFilter.py:1542
 msgid "On year:"
 msgstr "P r:"
 
-#: GenericFilter.py:1552 gramps_main.py:1027
+#: GenericFilter.py:1543 gramps_main.py:1027
 msgid "People probably alive"
 msgstr "Personer som sannsynligvis lever"
 
-#: GenericFilter.py:1553
+#: GenericFilter.py:1544
 #, fuzzy
 msgid "Matches people without indications of death that are not too old"
-msgstr "Gjelder personer uten ddsindikasjon som ikke er for gamle"
+msgstr "Samsvarer med personer uten ddsindikasjon som ikke er for gamle"
 
-#: GenericFilter.py:1572 gramps_main.py:1032
+#: GenericFilter.py:1562 gramps_main.py:1032
 msgid "People marked private"
 msgstr "Personer som er merket private"
 
-#: GenericFilter.py:1573
+#: GenericFilter.py:1563
 #, fuzzy
 msgid "Matches people that are indicated as private"
-msgstr "Gjelder personer som er merket private"
+msgstr "Samsvarer med personer som er merket private"
 
-#: GenericFilter.py:1587 gramps.glade:25926 gramps_main.py:1037
+#: GenericFilter.py:1576 gramps.glade:27895 gramps_main.py:1037
 msgid "Witnesses"
 msgstr "Vitner"
 
-#: GenericFilter.py:1588
+#: GenericFilter.py:1577
 #, fuzzy
 msgid "Matches people who are witnesses in any event"
-msgstr "Gjelder personer som er vitne til en hendelse"
+msgstr "Samsvarer med personer som er vitne til en hendelse"
 
-#: GenericFilter.py:1641 plugins/FilterEditor.py:694
+#: GenericFilter.py:1630 plugins/FilterEditor.py:694
 msgid "Case sensitive:"
 msgstr "Skill mellom store og sm bokstaver:"
 
-#: GenericFilter.py:1642 plugins/FilterEditor.py:696
+#: GenericFilter.py:1631 plugins/FilterEditor.py:696
 msgid "Regular-Expression matching:"
 msgstr "Regulrt uttrykk:"
 
-#: GenericFilter.py:1643
+#: GenericFilter.py:1632
 #, fuzzy
 msgid "People with records containing "
-msgstr "Gjelder personer med poster som inneholder "
+msgstr "Samsvarer med personer med poster som inneholder "
 
-#: GenericFilter.py:1644
+#: GenericFilter.py:1633
 #, fuzzy
 msgid "Matches people whose records contain text matching a substring"
-msgstr "Gjelder personer med poster som inneholder tekst fra et treff p en delstreng"
+msgstr "Samsvarer med personer med poster som inneholder tekst fra et treff p en delstreng"
 
-#: GenericFilter.py:1808 plugins/FilterEditor.py:682
+#: GenericFilter.py:1799 plugins/FilterEditor.py:682
 msgid "Source ID:"
 msgstr "Kilde ID:"
 
-#: GenericFilter.py:1809
+#: GenericFilter.py:1800
 #, fuzzy
 msgid "People with the "
 msgstr "Personer med "
 
-#: GenericFilter.py:1811
+#: GenericFilter.py:1802
 msgid "Matches people who have a particular source"
-msgstr "Gjelder personer som har en bestemt kilde"
+msgstr "Samsvarer med personer som har en bestemt kilde"
 
 #: GrampsCfg.py:62
 msgid "Father's surname"
@@ -1658,7 +1694,7 @@ msgstr "Kombinasjon av mors og fars etternavn"
 msgid "Icelandic style"
 msgstr "Islandsk stil"
 
-#: GrampsCfg.py:70 GrampsCfg.py:74 gramps.glade:7733 gramps.glade:21835
+#: GrampsCfg.py:70 GrampsCfg.py:74 gramps.glade:8195 gramps.glade:23539
 msgid "General"
 msgstr "Generelt"
 
@@ -1710,19 +1746,19 @@ msgstr "Mediareferanse"
 msgid "Reference Editor"
 msgstr "Referansebehandler"
 
-#: ImageSelect.py:828 ImageSelect.py:1191 MediaView.py:345
+#: ImageSelect.py:828 ImageSelect.py:1194 MediaView.py:345
 msgid "Edit Media Object"
 msgstr "Rediger mediaobjekt"
 
-#: ImageSelect.py:910
+#: ImageSelect.py:912
 msgid "Media Properties Editor"
 msgstr "Mediaegenskapsbehandler"
 
-#: ImageSelect.py:1043
+#: ImageSelect.py:1047
 msgid "Properties Editor"
 msgstr "Egenskapsbehandler"
 
-#: ImageSelect.py:1288
+#: ImageSelect.py:1291
 msgid "Remove Media Object"
 msgstr "Fjern mediaobjekt"
 
@@ -1734,7 +1770,7 @@ msgstr "Stedsbehandler"
 msgid "Marriage/Relationship Editor"
 msgstr "Ekteskap-/relasjonsbehandler"
 
-#: Marriage.py:146 Marriage.py:805 Marriage.py:828 Utils.py:135
+#: Marriage.py:146 Marriage.py:805 Marriage.py:828 Utils.py:130
 msgid "%s and %s"
 msgstr "%s og %s"
 
@@ -1819,11 +1855,11 @@ msgstr "Sammenligne personer"
 msgid "Alternate Names"
 msgstr "Alternative navn"
 
-#: MergePeople.py:122 gramps.glade:8961 gramps.glade:12692
+#: MergePeople.py:122 gramps.glade:9573 gramps.glade:13652
 msgid "Events"
 msgstr "Hendelser"
 
-#: MergePeople.py:129 PedView.py:693
+#: MergePeople.py:129 PedView.py:696
 msgid "Parents"
 msgstr "Foreldre"
 
@@ -1835,7 +1871,7 @@ msgstr "Familie-ID"
 msgid "No parents found"
 msgstr "Fant ingen foreldre"
 
-#: MergePeople.py:140 PedView.py:598
+#: MergePeople.py:140 PedView.py:601
 msgid "Spouses"
 msgstr "Ektefeller"
 
@@ -1848,7 +1884,7 @@ msgstr "Ektefelle"
 msgid "Marriage"
 msgstr "Ekteskap"
 
-#: MergePeople.py:159 const.py:902
+#: MergePeople.py:159 const.py:909
 msgid "Child"
 msgstr "Barn"
 
@@ -1856,7 +1892,7 @@ msgstr "Barn"
 msgid "No spouses or children found"
 msgstr "Fant ingen ektefeller eller barn"
 
-#: MergePeople.py:165 gramps.glade:10111
+#: MergePeople.py:165 gramps.glade:10857
 msgid "Addresses"
 msgstr "Adresser"
 
@@ -1928,27 +1964,27 @@ msgstr "begr."
 msgid "crem."
 msgstr "krem."
 
-#: PedView.py:379
+#: PedView.py:382
 msgid "Anchor"
 msgstr "Anker"
 
-#: PedView.py:496
+#: PedView.py:499
 msgid "Double clicking will make %s the active person"
 msgstr "Et dobbeltklikk vil gjre %s til den aktive personen"
 
-#: PedView.py:563
+#: PedView.py:566
 msgid "Set anchor"
 msgstr "Sett anker"
 
-#: PedView.py:564
+#: PedView.py:567
 msgid "Remove anchor"
 msgstr "Fjern anker"
 
-#: PedView.py:629 plugins/WebPage.py:715
+#: PedView.py:632 plugins/WebPage.py:715
 msgid "Siblings"
 msgstr "Ssken"
 
-#: PedView.py:659 plugins/FamilyGroup.py:400 plugins/IndivComplete.py:295
+#: PedView.py:662 plugins/FamilyGroup.py:400 plugins/IndivComplete.py:295
 #: plugins/IndivSummary.py:179 plugins/WebPage.py:674
 msgid "Children"
 msgstr "Barn"
@@ -1962,7 +1998,7 @@ msgid "Cause of Death"
 msgstr "Ddsrsak"
 
 #: PeopleView.py:83 WriteGedcom.py:329 gramps_main.py:952
-#: plugins/EventCmp.py:158 plugins/ExportVCalendar.py:81
+#: plugins/EventCmp.py:158 plugins/ExportVCalendar.py:82
 #: plugins/ExportVCard.py:84 plugins/GraphViz.py:513
 #: plugins/IndivComplete.py:510 plugins/StatisticsChart.py:827
 #: plugins/TimeLine.py:411 plugins/WebPage.py:1265 plugins/WriteFtree.py:86
@@ -1970,16 +2006,16 @@ msgstr "D
 msgid "Entire Database"
 msgstr "Hele databasen"
 
-#: PeopleView.py:267 gramps_main.py:1658
+#: PeopleView.py:260 gramps_main.py:1672
 msgid "Updating display..."
 msgstr "Oppdater visningen ..."
 
-#: PeopleView.py:295 PlaceView.py:200 SourceView.py:189 gramps.glade:955
+#: PeopleView.py:288 PlaceView.py:203 SourceView.py:191 gramps.glade:956
 #: plugins/BookReport.py:832
 msgid "Edit"
 msgstr "Rediger"
 
-#: PlaceView.py:49 PlaceView.py:119
+#: PlaceView.py:49 PlaceView.py:120
 msgid "Place Name"
 msgstr "Stedsnavn"
 
@@ -1999,27 +2035,27 @@ msgstr "Lengdegrad"
 msgid "Latitude"
 msgstr "Breddegrad"
 
-#: PlaceView.py:204
+#: PlaceView.py:207
 msgid "Place Menu"
 msgstr "Stedsmeny"
 
-#: PlaceView.py:251 SourceView.py:225 gramps_main.py:1454
+#: PlaceView.py:254 SourceView.py:227 gramps_main.py:1468
 msgid "Delete %s?"
 msgstr "Vil du slette %s?"
 
-#: PlaceView.py:252
+#: PlaceView.py:255
 msgid "This place is currently being used by at least one record in the database. Deleting it will remove it from the database and remove it from all records that reference it."
 msgstr "Dette stedsnavnet brukes av minst en post i databasen. Hvis du sletter den, vil den bli fjernet fra databasen, samt fra alle poster det er henvisninger til."
 
-#: PlaceView.py:256
+#: PlaceView.py:259
 msgid "_Delete Place"
 msgstr "Slett ste_d"
 
-#: PlaceView.py:287
+#: PlaceView.py:290
 msgid "Cannot merge places."
 msgstr "Kan ikke flette steder."
 
-#: PlaceView.py:288
+#: PlaceView.py:291
 msgid "Exactly two places must be selected to perform a merge. A second place can be selected by holding down the control key while clicking on the desired place."
 msgstr "Akkurat to steder m vre valgt for  kunne flette. Du kan velge sted nummer to ved  holde nede Ctrl-tasten mens du klikker p det andre stedet."
 
@@ -2033,13 +2069,13 @@ msgstr "Ukategorisert"
 
 #: PluginMgr.py:162 PluginMgr.py:163 PluginMgr.py:164 PluginMgr.py:189
 #: PluginMgr.py:191 PluginMgr.py:192 PluginMgr.py:223 PluginMgr.py:224
-#: PluginMgr.py:225 ReportUtils.py:1756 Witness.py:83 Witness.py:166
-#: const.py:234 const.py:247 const.py:493 const.py:506 gramps_main.py:1736
+#: PluginMgr.py:225 ReportUtils.py:1757 Witness.py:83 Witness.py:166
+#: const.py:234 const.py:247 const.py:493 gramps_main.py:1750
 #: plugins/Check.py:474 plugins/ScratchPad.py:78 plugins/WebPage.py:334
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: Plugins.py:125 gramps.glade:1396
+#: Plugins.py:125 gramps.glade:1427
 msgid "_Apply"
 msgstr "_Bruk"
 
@@ -2225,7 +2261,60 @@ msgstr "Kan ikke vise %s"
 msgid "GRAMPS is not able to display the image file. This may be caused by a corrupt file."
 msgstr "GRAMPS kan ikke vise billedfila. Dette kan skyldes en delagt fil."
 
+#: Relationship.py:268
+#, fuzzy
+msgid "husband"
+msgstr "Ektemann"
+
+#: Relationship.py:270
+#, fuzzy
+msgid "wife"
+msgstr "Kone"
+
+#: Relationship.py:272
+#, fuzzy
+msgid "gender unknown|spouse"
+msgstr "(kjnn ukjent)"
+
+#: Relationship.py:275
+#, fuzzy
+msgid "unmarried|husband"
+msgstr "Ugift"
+
 #: Relationship.py:277
+#, fuzzy
+msgid "unmarried|wife"
+msgstr "Ugift"
+
+#: Relationship.py:279
+msgid "gender unknown,unmarried|spouse"
+msgstr ""
+
+#: Relationship.py:282
+msgid "male,civil union|partner"
+msgstr ""
+
+#: Relationship.py:284
+msgid "female,civil union|partner"
+msgstr ""
+
+#: Relationship.py:286
+msgid "gender unknown,civil union|partner"
+msgstr ""
+
+#: Relationship.py:289
+msgid "male,unknown relation|partner"
+msgstr ""
+
+#: Relationship.py:291
+msgid "female,unknown relation|partner"
+msgstr ""
+
+#: Relationship.py:293
+msgid "gender unknown,unknown relation|partner"
+msgstr ""
+
+#: Relationship.py:325
 msgid "Relationship loop detected"
 msgstr "Fant en relasjons-lkke"
 
@@ -2237,7 +2326,7 @@ msgstr "Standardmaler"
 msgid "User Defined Template"
 msgstr "Egendefinerte maler"
 
-#: Report.py:152 Report.py:172 Utils.py:279
+#: Report.py:152 Report.py:172 Utils.py:274
 msgid "default"
 msgstr "standard"
 
@@ -2445,8 +2534,8 @@ msgstr "St
 msgid "Height"
 msgstr "Hyde"
 
-#: Report.py:1199 Report.py:1215 gramps.glade:20322 gramps.glade:20346
-#: gramps.glade:20370 gramps.glade:20802
+#: Report.py:1199 Report.py:1215 gramps.glade:21900 gramps.glade:21928
+#: gramps.glade:21956 gramps.glade:22416
 msgid "cm"
 msgstr "cm"
 
@@ -2506,711 +2595,711 @@ msgstr "_Overskriv"
 msgid "_Change filename"
 msgstr "Endre filnavn"
 
-#: ReportUtils.py:297 ReportUtils.py:298 Utils.py:170 Utils.py:172
+#: ReportUtils.py:297 ReportUtils.py:298 Utils.py:165 Utils.py:167
 msgid "Private"
 msgstr "Privat"
 
-#: ReportUtils.py:503 ReportUtils.py:1057 ReportUtils.py:1155
-#: ReportUtils.py:1446 ReportUtils.py:1539 plugins/DetAncestralReport.py:192
+#: ReportUtils.py:504 ReportUtils.py:1058 ReportUtils.py:1156
+#: ReportUtils.py:1447 ReportUtils.py:1540 plugins/DetAncestralReport.py:192
 #: plugins/DetAncestralReport.py:350 plugins/DetDescendantReport.py:216
 #: plugins/DetDescendantReport.py:371
 msgid "He"
 msgstr "Han"
 
-#: ReportUtils.py:505 ReportUtils.py:1059 ReportUtils.py:1157
-#: ReportUtils.py:1448 ReportUtils.py:1541 plugins/DetAncestralReport.py:194
+#: ReportUtils.py:506 ReportUtils.py:1060 ReportUtils.py:1158
+#: ReportUtils.py:1449 ReportUtils.py:1542 plugins/DetAncestralReport.py:194
 #: plugins/DetAncestralReport.py:348 plugins/DetDescendantReport.py:218
 #: plugins/DetDescendantReport.py:369
 msgid "She"
 msgstr "Hun"
 
-#: ReportUtils.py:518
+#: ReportUtils.py:519
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt %(birth_date)s i %(birth_place)s%(birth_endnotes)s, og dde %(death_date)s i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:527
+#: ReportUtils.py:528
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt %(birth_date)s i %(birth_place)s%(birth_endnotes)s, og dde %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:536
+#: ReportUtils.py:537
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt %(birth_date)s i %(birth_place)s%(birth_endnotes)s, og dde i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:544
+#: ReportUtils.py:545
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt %(birth_date)s i %(birth_place)s%(birth_endnotes)s."
 
-#: ReportUtils.py:552
+#: ReportUtils.py:553
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt %(birth_date)s%(birth_endnotes)s, og dde %(death_date)s i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:561
+#: ReportUtils.py:562
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt %(birth_date)s%(birth_endnotes)s, og dde %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:570
+#: ReportUtils.py:571
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt %(birth_date)s%(birth_endnotes)s, og dde i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:578
+#: ReportUtils.py:579
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt %(birth_date)s%(birth_endnotes)s."
 
-#: ReportUtils.py:586
+#: ReportUtils.py:587
 msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt i %(birth_place)s%(birth_endnotes)s, og dde %(death_date)s i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:595
+#: ReportUtils.py:596
 msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt i %(birth_place)s%(birth_endnotes)s, og dde %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:604
+#: ReportUtils.py:605
 msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt i %(birth_place)s%(birth_endnotes)s, og dde i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:612
+#: ReportUtils.py:613
 msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s ble fdt i %(birth_place)s%(birth_endnotes)s."
 
-#: ReportUtils.py:620
+#: ReportUtils.py:621
 msgid "%(male_name)s%(endnotes)s died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s dde %(death_date)s i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:626
+#: ReportUtils.py:627
 msgid "%(male_name)s%(endnotes)s died %(death_date)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s dde %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:633
+#: ReportUtils.py:634
 msgid "%(male_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s dde i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:639
+#: ReportUtils.py:640
 msgid "%(male_name)s%(endnotes)s."
 msgstr "%(male_name)s%(endnotes)s."
 
-#: ReportUtils.py:646
+#: ReportUtils.py:647
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt %(birth_date)s i %(birth_place)s%(birth_endnotes)s, og dde %(death_date)s i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:655
+#: ReportUtils.py:656
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt %(birth_date)s i %(birth_place)s%(birth_endnotes)s, og dde %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:664
+#: ReportUtils.py:665
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt %(birth_date)s i %(birth_place)s%(birth_endnotes)s, og dde i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:672
+#: ReportUtils.py:673
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt %(birth_date)s i %(birth_place)s%(birth_endnotes)s."
 
-#: ReportUtils.py:680
+#: ReportUtils.py:681
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt %(birth_date)s%(birth_endnotes)s, og dde %(death_date)s i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:689
+#: ReportUtils.py:690
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt %(birth_date)s%(birth_endnotes)s, og dde %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:698
+#: ReportUtils.py:699
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt %(birth_date)s%(birth_endnotes)s, og dde i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:706
+#: ReportUtils.py:707
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt %(birth_date)s%(birth_endnotes)s."
 
-#: ReportUtils.py:714
+#: ReportUtils.py:715
 msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt i %(birth_place)s%(birth_endnotes)s, og dde %(death_date)s i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:723
+#: ReportUtils.py:724
 msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt i %(birth_place)s%(birth_endnotes)s, og dde %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:732
+#: ReportUtils.py:733
 msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt i %(birth_place)s%(birth_endnotes)s, og dde i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:740
+#: ReportUtils.py:741
 msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s ble fdt i %(birth_place)s%(birth_endnotes)s."
 
-#: ReportUtils.py:748
+#: ReportUtils.py:749
 msgid "%(female_name)s%(endnotes)s died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s dde %(death_date)s i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:754
+#: ReportUtils.py:755
 msgid "%(female_name)s%(endnotes)s died %(death_date)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s dde %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:761
+#: ReportUtils.py:762
 msgid "%(female_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s dde i %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:767
+#: ReportUtils.py:768
 msgid "%(female_name)s%(endnotes)s."
 msgstr "%(female_name)s%(endnotes)s."
 
-#: ReportUtils.py:821
+#: ReportUtils.py:822
 msgid "He married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Han giftet seg med %(spouse)s %(date)s i %(place)s%(endnotes)s."
 
-#: ReportUtils.py:827
+#: ReportUtils.py:828
 msgid "She married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Hun giftet seg med %(spouse)s %(date)s i %(place)s%(endnotes)s."
 
-#: ReportUtils.py:834
+#: ReportUtils.py:835
 msgid "He married %(spouse)s %(date)s%(endnotes)s."
 msgstr "Han giftet seg med %(spouse)s %(date)s%(endnotes)s."
 
-#: ReportUtils.py:839 ReportUtils.py:850
+#: ReportUtils.py:840 ReportUtils.py:851
 msgid "She married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Hun giftet seg med %(spouse)s i %(place)s%(endnotes)s."
 
-#: ReportUtils.py:845
+#: ReportUtils.py:846
 msgid "He married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Han giftet seg med %(spouse)s i %(place)s%(endnotes)s."
 
-#: ReportUtils.py:856
+#: ReportUtils.py:857
 msgid "He married %(spouse)s%(endnotes)s."
 msgstr "Han giftet seg med %(spouse)s%(endnotes)s."
 
-#: ReportUtils.py:860
+#: ReportUtils.py:861
 msgid "She married %(spouse)s%(endnotes)s."
 msgstr "Hun giftet seg med %(spouse)s%(endnotes)s."
 
-#: ReportUtils.py:866
+#: ReportUtils.py:867
 msgid "He also married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Han giftet seg ogs med %(spouse)s, %(date)s i %(place)s %(endnotes)s."
 
-#: ReportUtils.py:872
+#: ReportUtils.py:873
 msgid "She also married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Hun giftet seg ogs med %(spouse)s, %(date)s i %(place)s %(endnotes)s."
 
-#: ReportUtils.py:879
+#: ReportUtils.py:880
 msgid "He also married %(spouse)s %(date)s%(endnotes)s."
 msgstr "Han giftet seg ogs med %(spouse)s, %(date)s %(endnotes)s."
 
-#: ReportUtils.py:884 ReportUtils.py:895
+#: ReportUtils.py:885 ReportUtils.py:896
 msgid "She also married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Hun giftet seg ogs med %(spouse)s i %(place)s %(endnotes)s."
 
-#: ReportUtils.py:890
+#: ReportUtils.py:891
 msgid "He also married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Han giftet seg ogs med %(spouse)s, %(place)s %(endnotes)s."
 
-#: ReportUtils.py:901
+#: ReportUtils.py:902
 msgid "He also married %(spouse)s%(endnotes)s."
 msgstr "Han giftet seg ogs med %(spouse)s, %(endnotes)s."
 
-#: ReportUtils.py:905
+#: ReportUtils.py:906
 msgid "She also married %(spouse)s%(endnotes)s."
 msgstr "Hun giftet seg ogs med %(spouse)s, %(endnotes)s."
 
-#: ReportUtils.py:926
+#: ReportUtils.py:927
 msgid "He married %(spouse)s."
 msgstr "Han giftet seg med %(spouse)s."
 
-#: ReportUtils.py:928
+#: ReportUtils.py:929
 msgid "She married %(spouse)s."
 msgstr "Hun giftet seg med %(spouse)s."
 
-#: ReportUtils.py:931
+#: ReportUtils.py:932
 msgid "He had relationship with %(spouse)s."
 msgstr "Han hadde en relasjon til %(spouse)s."
 
-#: ReportUtils.py:934
+#: ReportUtils.py:935
 msgid "She had relationship with %(spouse)s."
 msgstr "Hun hadde en relasjon til %(spouse)s."
 
-#: ReportUtils.py:939
+#: ReportUtils.py:940
 msgid "He also married %(spouse)s."
 msgstr "Han giftet seg ogs med %(spouse)s."
 
-#: ReportUtils.py:941
+#: ReportUtils.py:942
 msgid "She also married %(spouse)s."
 msgstr "Hun giftet seg ogs med %(spouse)s."
 
-#: ReportUtils.py:944
+#: ReportUtils.py:945
 msgid "He also had relationship with %(spouse)s."
 msgstr "Han hadde ogs en relasjon til %(spouse)s."
 
-#: ReportUtils.py:947
+#: ReportUtils.py:948
 msgid "She also had relationship with %(spouse)s."
 msgstr "Hun hadde ogs en relasjon til %(spouse)s."
 
-#: ReportUtils.py:978
+#: ReportUtils.py:979
 msgid "He was the son of %(father)s and %(mother)s."
 msgstr "Han var snn av %(father)s og %(mother)s."
 
-#: ReportUtils.py:982
+#: ReportUtils.py:983
 msgid "He is the son of %(father)s and %(mother)s."
 msgstr "Han er snn av %(father)s og %(mother)s."
 
-#: ReportUtils.py:987
+#: ReportUtils.py:988
 msgid "He was the son of %(mother)s."
 msgstr "Han var snn av %(mother)s."
 
-#: ReportUtils.py:990
+#: ReportUtils.py:991
 msgid "He is the son of %(mother)s."
 msgstr "Han er snn av %(mother)s."
 
-#: ReportUtils.py:994
+#: ReportUtils.py:995
 msgid "He was the son of %(father)s."
 msgstr "Han var snn av %(father)s."
 
-#: ReportUtils.py:997
+#: ReportUtils.py:998
 msgid "He is the son of %(father)s."
 msgstr "Han er snn av %(father)s."
 
-#: ReportUtils.py:1002
+#: ReportUtils.py:1003
 msgid "She was the daughter of %(father)s and %(mother)s."
 msgstr "Hun var datter av %(father)s og %(mother)s."
 
-#: ReportUtils.py:1006
+#: ReportUtils.py:1007
 msgid "She is the daughter of %(father)s and %(mother)s."
 msgstr "Hun er datter av %(father)s og %(mother)s."
 
-#: ReportUtils.py:1011
+#: ReportUtils.py:1012
 msgid "She was the daughter of %(mother)s."
 msgstr "Hun var datter av %(mother)s."
 
-#: ReportUtils.py:1014
+#: ReportUtils.py:1015
 msgid "She is the daughter of %(mother)s."
 msgstr "Hun er datter av %(mother)s."
 
-#: ReportUtils.py:1018
+#: ReportUtils.py:1019
 msgid "She was the daughter of %(father)s."
 msgstr "Hun var datter av %(father)s."
 
-#: ReportUtils.py:1021
+#: ReportUtils.py:1022
 msgid "She is the daughter of %(father)s."
 msgstr "Hun er datter av %(father)s."
 
-#: ReportUtils.py:1069
+#: ReportUtils.py:1070
 msgid "%(male_name)s was born on %(birth_date)s in %(birth_place)s."
 msgstr "%(male_name)s ble fdt %(birth_date)s, %(birth_place)s."
 
-#: ReportUtils.py:1074
+#: ReportUtils.py:1075
 msgid "%(male_name)s was born on %(birth_date)s."
 msgstr "%(male_name)s ble fdt %(birth_date)s."
 
-#: ReportUtils.py:1078
+#: ReportUtils.py:1079
 msgid "%(male_name)s was born in %(month_year)s in %(birth_place)s."
 msgstr "%(male_name)s ble fdt %(month_year)s, %(birth_place)s."
 
-#: ReportUtils.py:1083
+#: ReportUtils.py:1084
 msgid "%(male_name)s was born in %(month_year)s."
 msgstr "%(male_name)s ble fdt %(month_year)s."
 
-#: ReportUtils.py:1087
+#: ReportUtils.py:1088
 msgid "%(male_name)s was born in %(birth_place)s."
 msgstr "%(male_name)s ble fdt %(birth_place)s."
 
-#: ReportUtils.py:1094
+#: ReportUtils.py:1095
 msgid "%(female_name)s was born on %(birth_date)s in %(birth_place)s."
 msgstr "%(female_name)s ble fdt %(birth_date)s, %(birth_place)s."
 
-#: ReportUtils.py:1099
+#: ReportUtils.py:1100
 msgid "%(female_name)s was born on %(birth_date)s."
 msgstr "%(female_name)s ble fdt %(birth_date)s."
 
-#: ReportUtils.py:1103
+#: ReportUtils.py:1104
 msgid "%(female_name)s was born in %(month_year)s in %(birth_place)s."
 msgstr "%(female_name)s ble fdt %(month_year)s, %(birth_place)s."
 
-#: ReportUtils.py:1108
+#: ReportUtils.py:1109
 msgid "%(female_name)s was born in %(month_year)s."
 msgstr "%(female_name)s ble fdt %(month_year)s."
 
-#: ReportUtils.py:1112
+#: ReportUtils.py:1113
 msgid "%(female_name)s was born in %(birth_place)s."
 msgstr "%(female_name)s ble fdt %(birth_place)s."
 
-#: ReportUtils.py:1168
+#: ReportUtils.py:1169
 msgid "%(male_name)s died on %(death_date)s in %(death_place)s."
 msgstr "%(male_name)s dde %(death_date)s, %(death_place)s."
 
-#: ReportUtils.py:1173
+#: ReportUtils.py:1174
 msgid "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d years."
 msgstr "%(male_name)s dde %(death_date)s, %(death_place)s i en alder av %(age)d r."
 
-#: ReportUtils.py:1180
+#: ReportUtils.py:1181
 msgid "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d months."
 msgstr "%(male_name)s dde %(death_date)s, %(death_place)s i en alder av %(age)d mneder."
 
-#: ReportUtils.py:1187
+#: ReportUtils.py:1188
 msgid "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d days."
 msgstr "%(male_name)s dde %(death_date)s, %(death_place)s i en alder av %(age)d dager."
 
-#: ReportUtils.py:1195
+#: ReportUtils.py:1196
 msgid "%(male_name)s died on %(death_date)s."
 msgstr "%(male_name)s dde %(death_date)s."
 
-#: ReportUtils.py:1198
+#: ReportUtils.py:1199
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d years."
 msgstr "%(male_name)s dde %(death_date)s i en alder av %(age)s r."
 
-#: ReportUtils.py:1203
+#: ReportUtils.py:1204
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d months."
 msgstr "%(male_name)s dde %(death_date)s i en alder av %(age)s mneder."
 
-#: ReportUtils.py:1208
+#: ReportUtils.py:1209
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d days."
 msgstr "%(male_name)s dde %(death_date)s i en alder av %(age)s dager."
 
-#: ReportUtils.py:1215
+#: ReportUtils.py:1216
 msgid "%(male_name)s died in %(month_year)s in %(death_place)s."
 msgstr "%(male_name)s dde %(month_year)s, %(death_place)s."
 
-#: ReportUtils.py:1220
+#: ReportUtils.py:1221
 msgid "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d years."
 msgstr "%(male_name)s dde %(month_year)s, %(death_place)s i en alder av %(age)d r."
 
-#: ReportUtils.py:1227
+#: ReportUtils.py:1228
 msgid "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d months."
 msgstr "%(male_name)s dde %(month_year)s, %(death_place)s i en alder av %(age)d mneder."
 
-#: ReportUtils.py:1234
+#: ReportUtils.py:1235
 msgid "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d days."
 msgstr "%(male_name)s dde %(month_year)s, %(death_place)s i en alder av %(age)d dager."
 
-#: ReportUtils.py:1242
+#: ReportUtils.py:1243
 msgid "%(male_name)s died in %(month_year)s."
 msgstr "%(male_name)s dde %(month_year)s."
 
-#: ReportUtils.py:1245
+#: ReportUtils.py:1246
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d years."
 msgstr "%(male_name)s dde %(month_year)s, i en alder av %(age)d r."
 
-#: ReportUtils.py:1250
+#: ReportUtils.py:1251
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d months."
 msgstr "%(male_name)s dde %(month_year)s, i en alder av %(age)d mneder."
 
-#: ReportUtils.py:1255
+#: ReportUtils.py:1256
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d days."
 msgstr "%(male_name)s dde %(month_year)s, i en alder av %(age)d dager."
 
-#: ReportUtils.py:1262
+#: ReportUtils.py:1263
 msgid "%(male_name)s died in %(death_place)s."
 msgstr "%(male_name)s dde %(death_place)s."
 
-#: ReportUtils.py:1265
+#: ReportUtils.py:1266
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d years."
 msgstr "%(male_name)s dde %(death_place)s i en alder av %(age)d r."
 
-#: ReportUtils.py:1270
+#: ReportUtils.py:1271
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d months."
 msgstr "%(male_name)s dde %(death_place)s i en alder av %(age)d mneder."
 
-#: ReportUtils.py:1275
+#: ReportUtils.py:1276
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d days."
 msgstr "%(male_name)s dde %(death_place)s i en alder av %(age)d dager."
 
-#: ReportUtils.py:1284
+#: ReportUtils.py:1285
 msgid "%(male_name)s died at the age of %(age)d years."
 msgstr "%(male_name)s dde i en alder av %(age)d r."
 
-#: ReportUtils.py:1288
+#: ReportUtils.py:1289
 msgid "%(male_name)s died at the age of %(age)d months."
 msgstr "%(male_name)s dde i en alder av %(age)d mneder."
 
-#: ReportUtils.py:1292
+#: ReportUtils.py:1293
 msgid "%(male_name)s died at the age of %(age)d days."
 msgstr "%(male_name)s dde i en alder av %(age)d dager."
 
-#: ReportUtils.py:1299
+#: ReportUtils.py:1300
 msgid "%(female_name)s died on %(death_date)s in %(death_place)s."
 msgstr "%(female_name)s dde %(month_date)s, %(death_place)s."
 
-#: ReportUtils.py:1304
+#: ReportUtils.py:1305
 msgid "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d years."
 msgstr "%(female_name)s dde %(month_date)s, %(death_place)s i en alder av %(age)d r."
 
-#: ReportUtils.py:1311
+#: ReportUtils.py:1312
 msgid "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d months."
 msgstr "%(female_name)s dde %(month_date)s, %(death_place)s i en alder av %(age)d mneder."
 
-#: ReportUtils.py:1318
+#: ReportUtils.py:1319
 msgid "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d days."
 msgstr "%(female_name)s dde %(month_date)s, %(death_place)s i en alder av %(age)d dager."
 
-#: ReportUtils.py:1326
+#: ReportUtils.py:1327
 msgid "%(female_name)s died on %(death_date)s."
 msgstr "%(female_name)s dde %(month_date)s."
 
-#: ReportUtils.py:1329
+#: ReportUtils.py:1330
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d years."
 msgstr "%(female_name)s dde %(death_date)s, i en alder av %(age)d r."
 
-#: ReportUtils.py:1334
+#: ReportUtils.py:1335
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d months."
 msgstr "%(female_name)s dde %(death_date)s, i en alder av %(age)d mneder."
 
-#: ReportUtils.py:1339
+#: ReportUtils.py:1340
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d days."
 msgstr "%(female_name)s dde %(death_date)s, i en alder av %(age)d dager."
 
-#: ReportUtils.py:1346
+#: ReportUtils.py:1347
 msgid "%(female_name)s died in %(month_year)s in %(death_place)s."
 msgstr "%(female_name)s dde %(month_year)s, %(death_place)s."
 
-#: ReportUtils.py:1351
+#: ReportUtils.py:1352
 msgid "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d years."
 msgstr "%(female_name)s dde %(month_year)s, %(death_place)s i en alder av %(age)d r."
 
-#: ReportUtils.py:1358
+#: ReportUtils.py:1359
 msgid "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d months."
 msgstr "%(female_name)s dde %(month_year)s, %(death_place)s i en alder av %(age)d mneder."
 
-#: ReportUtils.py:1365
+#: ReportUtils.py:1366
 msgid "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d days."
 msgstr "%(female_name)s dde %(month_year)s, %(death_place)s i en alder av %(age)d dager."
 
-#: ReportUtils.py:1373
+#: ReportUtils.py:1374
 msgid "%(female_name)s died in %(month_year)s."
 msgstr "%(female_name)s dde %(month_year)s."
 
-#: ReportUtils.py:1376
+#: ReportUtils.py:1377
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d years."
 msgstr "%(female_name)s dde %(month_year)s, i en alder av %(age)d r."
 
-#: ReportUtils.py:1381
+#: ReportUtils.py:1382
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d months."
 msgstr "%(female_name)s dde %(month_year)s, i en alder av %(age)d mneder."
 
-#: ReportUtils.py:1386
+#: ReportUtils.py:1387
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d days."
 msgstr "%(female_name)s dde %(month_year)s, i en alder av %(age)d dager."
 
-#: ReportUtils.py:1393
+#: ReportUtils.py:1394
 msgid "%(female_name)s died in %(death_place)s."
 msgstr "%(female_name)s dde %(death_place)s."
 
-#: ReportUtils.py:1396
+#: ReportUtils.py:1397
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d years."
 msgstr "%(female_name)s dde %(death_place)s, i en alder av %(age)d r."
 
-#: ReportUtils.py:1401
+#: ReportUtils.py:1402
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d months."
 msgstr "%(female_name)s dde %(death_place)s, i en alder av %(age)d mneder."
 
-#: ReportUtils.py:1406
+#: ReportUtils.py:1407
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d days."
 msgstr "%(female_name)s dde %(death_place)s, i en alder av %(age)d dager."
 
-#: ReportUtils.py:1415
+#: ReportUtils.py:1416
 msgid "%(female_name)s died at the age of %(age)d years."
 msgstr "%(female_name)s dde i en alder av %(age)d r."
 
-#: ReportUtils.py:1419
+#: ReportUtils.py:1420
 msgid "%(female_name)s died at the age of %(age)d months."
 msgstr "%(female_name)s dde i en alder av %(age)d mneder."
 
-#: ReportUtils.py:1423
+#: ReportUtils.py:1424
 msgid "%(female_name)s died at the age of %(age)d days."
 msgstr "%(female_name)s dde i en alder av %(age)d dager."
 
-#: ReportUtils.py:1476
+#: ReportUtils.py:1477
 msgid "%(male_name)s was buried on %(burial_date)s in %(burial_place)s."
 msgstr "%(male_name)s ble begravet %(birth_date)s, %(birth_place)s."
 
-#: ReportUtils.py:1481
+#: ReportUtils.py:1482
 msgid "%(male_name)s was buried on %(burial_date)s."
 msgstr "%(male_name)s ble begravet %(birth_date)s."
 
-#: ReportUtils.py:1485
+#: ReportUtils.py:1486
 msgid "%(male_name)s was buried in %(month_year)s in %(burial_place)s."
 msgstr "%(male_name)s ble begravet %(month_year)s, %(birth_place)s."
 
-#: ReportUtils.py:1490
+#: ReportUtils.py:1491
 msgid "%(male_name)s was buried in %(month_year)s."
 msgstr "%(male_name)s ble begravet %(month_year)s."
 
-#: ReportUtils.py:1494
+#: ReportUtils.py:1495
 msgid "%(male_name)s was buried in %(burial_place)s."
 msgstr "%(male_name)s ble begravet %(birth_place)s."
 
-#: ReportUtils.py:1497
+#: ReportUtils.py:1498
 msgid "%(male_name)s was buried."
 msgstr "%(male_name)s ble begravet."
 
-#: ReportUtils.py:1502
+#: ReportUtils.py:1503
 msgid "%(female_name)s was buried on %(burial_date)s in %(burial_place)s."
 msgstr "%(female_name)s ble begravet %(birth_date)s, %(birth_place)s."
 
-#: ReportUtils.py:1507
+#: ReportUtils.py:1508
 msgid "%(female_name)s was buried on %(burial_date)s."
 msgstr "%(female_name)s ble begravet %(birth_date)s."
 
-#: ReportUtils.py:1511
+#: ReportUtils.py:1512
 msgid "%(female_name)s was buried in %(month_year)s in %(burial_place)s."
 msgstr "%(female_name)s ble begravet %(month_year)s, %(birth_place)s."
 
-#: ReportUtils.py:1516
+#: ReportUtils.py:1517
 msgid "%(female_name)s was buried in %(month_year)s."
 msgstr "%(female_name)s ble begravet %(month_year)s."
 
-#: ReportUtils.py:1520
+#: ReportUtils.py:1521
 msgid "%(female_name)s was buried in %(burial_place)s."
 msgstr "%(female_name)s ble begravet %(birth_place)s."
 
-#: ReportUtils.py:1523
+#: ReportUtils.py:1524
 msgid "%(female_name)s was buried."
 msgstr "%(female_name)s ble begravet."
 
-#: ReportUtils.py:1553
+#: ReportUtils.py:1554
 msgid "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s %(death_place)s."
 msgstr "%(male_name)s. Fdt: %(birth_date)s, %(birth_place)s. Dde: %(death_date)s, %(death_place)s."
 
-#: ReportUtils.py:1560
+#: ReportUtils.py:1561
 msgid "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s."
 msgstr "%(male_name)s. Fdt: %(birth_date)s, %(birth_place)s. Dde: %(death_date)s."
 
-#: ReportUtils.py:1568
+#: ReportUtils.py:1569
 msgid "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_place)s."
 msgstr "%(male_name)s. Fdt: %(birth_date)s, %(birth_place)s. Dde: %(death_place)s."
 
-#: ReportUtils.py:1575
+#: ReportUtils.py:1576
 msgid "%(male_name)s Born: %(birth_date)s %(birth_place)s."
 msgstr "%(male_name)s. Fdt: %(birth_date)s, %(birth_place)s."
 
-#: ReportUtils.py:1582
+#: ReportUtils.py:1583
 msgid "%(male_name)s Born: %(birth_date)s Died: %(death_date)s %(death_place)s."
 msgstr "%(male_name)s. Fdt: %(birth_date)s. Dde: %(death_date)s, %(death_place)s."
 
-#: ReportUtils.py:1587
+#: ReportUtils.py:1588
 msgid "%(male_name)s Born: %(birth_date)s Died: %(death_date)s."
 msgstr "%(male_name)s. Fdt: %(birth_date)s. Dde: %(death_date)s."
 
-#: ReportUtils.py:1593
+#: ReportUtils.py:1594
 msgid "%(male_name)s Born: %(birth_date)s Died: %(death_place)s."
 msgstr "%(male_name)s. Fdt: %(birth_date)s. Dde: %(death_place)s."
 
-#: ReportUtils.py:1598
+#: ReportUtils.py:1599
 msgid "%(male_name)s Born: %(birth_date)s."
 msgstr "%(male_name)s. Fdt: %(birth_date)s."
 
-#: ReportUtils.py:1604
+#: ReportUtils.py:1605
 msgid "%(male_name)s Born: %(birth_place)s Died: %(death_date)s %(death_place)s."
 msgstr "%(male_name)s. Fdt: %(birth_place)s. Dde: %(death_date)s, %(death_place)s."
 
-#: ReportUtils.py:1611
+#: ReportUtils.py:1612
 msgid "%(male_name)s Born: %(birth_place)s Died: %(death_date)s."
 msgstr "%(male_name)s. Fdt: %(birth_place)s. Dde: %(death_date)s."
 
-#: ReportUtils.py:1619
+#: ReportUtils.py:1620
 msgid "%(male_name)s Born: %(birth_place)s Died: %(death_place)s."
 msgstr "%(male_name)s. Fdt: %(birth_place)s. Dde: %(death_place)s."
 
-#: ReportUtils.py:1626
+#: ReportUtils.py:1627
 msgid "%(male_name)s Born: %(birth_place)s."
 msgstr "%(male_name)s. Fdt: %(birth_place)s."
 
-#: ReportUtils.py:1632
+#: ReportUtils.py:1633
 msgid "%(male_name)s Died: %(death_date)s %(death_place)s."
 msgstr "%(male_name)s. Dde: %(death_date)s, %(death_place)s."
 
-#: ReportUtils.py:1637
+#: ReportUtils.py:1638
 msgid "%(male_name)s Died: %(death_date)s."
 msgstr "%(male_name)s. Dde: %(death_date)s."
 
-#: ReportUtils.py:1642
+#: ReportUtils.py:1643
 msgid "%(male_name)s Died: %(death_place)s."
 msgstr "%(male_name)s. Dde: %(death_place)s."
 
-#: ReportUtils.py:1645
+#: ReportUtils.py:1646
 msgid "%(male_name)s."
 msgstr "%(male_name)s."
 
-#: ReportUtils.py:1652
+#: ReportUtils.py:1653
 msgid "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s %(death_place)s."
 msgstr "%(female_name)s. Fdt: %(birth_date)s, %(birth_place)s. Dde: %(death_date)s, %(death_place)s."
 
-#: ReportUtils.py:1659
+#: ReportUtils.py:1660
 msgid "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s."
 msgstr "%(female_name)s. Fdt: %(birth_date)s, %(birth_place)s. Dde: %(death_date)s."
 
-#: ReportUtils.py:1667
+#: ReportUtils.py:1668
 msgid "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_place)s."
 msgstr "%(female_name)s. Fdt: %(birth_date)s, %(birth_place)s. Dde: %(death_place)s."
 
-#: ReportUtils.py:1674
+#: ReportUtils.py:1675
 msgid "%(female_name)s Born: %(birth_date)s %(birth_place)s."
 msgstr "%(female_name)s. Fdt: %(birth_date)s, %(birth_place)s."
 
-#: ReportUtils.py:1681
+#: ReportUtils.py:1682
 msgid "%(female_name)s Born: %(birth_date)s Died: %(death_date)s %(death_place)s."
 msgstr "%(female_name)s. Fdt: %(birth_date)s. Dde: %(death_date)s, %(death_place)s."
 
-#: ReportUtils.py:1686
+#: ReportUtils.py:1687
 msgid "%(female_name)s Born: %(birth_date)s Died: %(death_date)s."
 msgstr "%(female_name)s. Fdt: %(birth_date)s. Dde: %(death_date)s."
 
-#: ReportUtils.py:1692
+#: ReportUtils.py:1693
 msgid "%(female_name)s Born: %(birth_date)s Died: %(death_place)s."
 msgstr "%(female_name)s. Fdt: %(birth_date)s. Dde: %(death_place)s."
 
-#: ReportUtils.py:1697
+#: ReportUtils.py:1698
 msgid "%(female_name)s Born: %(birth_date)s."
 msgstr "%(female_name)s. Fdt: %(birth_date)s."
 
-#: ReportUtils.py:1703
+#: ReportUtils.py:1704
 msgid "%(female_name)s Born: %(birth_place)s Died: %(death_date)s %(death_place)s."
 msgstr "%(female_name)s. Fdt: %(birth_place)s. Dde: %(death_date)s, %(death_place)s."
 
-#: ReportUtils.py:1710
+#: ReportUtils.py:1711
 msgid "%(female_name)s Born: %(birth_place)s Died: %(death_date)s."
 msgstr "%(female_name)s. Fdt: %(birth_place)s. Dde: %(death_date)s."
 
-#: ReportUtils.py:1718
+#: ReportUtils.py:1719
 msgid "%(female_name)s Born: %(birth_place)s Died: %(death_place)s."
 msgstr "%(female_name)s. Fdt: %(birth_place)s. Dde: %(death_place)s."
 
-#: ReportUtils.py:1725
+#: ReportUtils.py:1726
 msgid "%(female_name)s Born: %(birth_place)s."
 msgstr "%(female_name)s. Fdt: %(birth_place)s."
 
-#: ReportUtils.py:1731
+#: ReportUtils.py:1732
 msgid "%(female_name)s Died: %(death_date)s %(death_place)s."
 msgstr "%(female_name)s. Dde: %(death_date)s, %(death_place)s."
 
-#: ReportUtils.py:1736
+#: ReportUtils.py:1737
 msgid "%(female_name)s Died: %(death_date)s."
 msgstr "%(female_name)s. Dde: %(death_date)s."
 
-#: ReportUtils.py:1741
+#: ReportUtils.py:1742
 msgid "%(female_name)s Died: %(death_place)s."
 msgstr "%(female_name)s. Dde: %(death_place)s."
 
-#: ReportUtils.py:1744
+#: ReportUtils.py:1745
 msgid "%(female_name)s."
 msgstr "%(female_name)s."
 
-#: ReportUtils.py:1753 const.py:490 gramps.glade:4344
+#: ReportUtils.py:1754 const.py:490 gramps.glade:4582
 #: plugins/FamilyGroup.py:376 plugins/FamilyGroup.py:378
 msgid "Married"
 msgstr "Gift"
 
-#: ReportUtils.py:1754 const.py:491
+#: ReportUtils.py:1755 const.py:491
 msgid "Unmarried"
 msgstr "Ugift"
 
-#: ReportUtils.py:1755 const.py:492
+#: ReportUtils.py:1756 const.py:492
 msgid "Civil Union"
 msgstr "Partnerskap"
 
-#: ReportUtils.py:1757 const.py:234 const.py:248 const.py:494
+#: ReportUtils.py:1758 const.py:234 const.py:248 const.py:494
 #: mergedata.glade:242
 msgid "Other"
 msgstr "Andre"
 
-#: SelectChild.py:288 SelectChild.py:307
+#: SelectChild.py:193 SelectChild.py:212
 msgid "A person cannot be linked as his/her own child"
 msgstr "En person kan ikke angis som sitt eget barn"
 
-#: SelectChild.py:332
+#: SelectChild.py:237
 msgid "Add Child to Family (%s)"
 msgstr "Legg til barn i familien (%s)"
 
@@ -3226,27 +3315,27 @@ msgstr "Forkortelse"
 msgid "Publication Information"
 msgstr "Publikasjonsinformasjon"
 
-#: SourceView.py:193
+#: SourceView.py:195
 msgid "Source Menu"
 msgstr "Kildemeny"
 
-#: SourceView.py:218
+#: SourceView.py:220
 msgid "This source is currently being used. Deleting it will remove it from the database and from all records that reference it."
 msgstr "Denne kilden er for yeblikket i bruk. Hvis du sletter denne vil den bli fjernet fra databasen og alle henviste poster."
 
-#: SourceView.py:222
+#: SourceView.py:224
 msgid "Deleting source will remove it from the database."
 msgstr "Sletting av kilden vil fjerne den fra databasen."
 
-#: SourceView.py:226
+#: SourceView.py:228
 msgid "_Delete Source"
 msgstr "Slett kil_de"
 
-#: SourceView.py:267
+#: SourceView.py:269
 msgid "Cannot merge sources."
 msgstr "Kan ikke flette sammen kilder."
 
-#: SourceView.py:268
+#: SourceView.py:270
 msgid "Exactly two sources must be selected to perform a merge. A second source can be selected by holding down the control key while clicking on the desired source."
 msgstr "Nyaktig to kilder m vre valgt for  gjennomfre en fletting. Den andre kilden kan merkes ved  holde nede Ctrl-tasten samtidig som du klikker p den nskede kilden."
 
@@ -3321,33 +3410,33 @@ msgstr ""
 msgid "In order to create valid GEDCOM files, the following information needs to be entered. If you do not plan to generate GEDCOM files, you may leave this empty."
 msgstr "For  lage gyldige GEDCOM-filer, trengs flgende informasjon. Hvis du ikke har tenkt  lage GEDCOM-filer, kan du la vre  fylle ut dette."
 
-#: StartupDialog.py:243 gramps.glade:5910 gramps.glade:5981 gramps.glade:7774
-#: gramps.glade:8584 gramps.glade:9098 gramps.glade:9534 gramps.glade:12280
-#: gramps.glade:12775 plugins/soundex.glade:110
+#: StartupDialog.py:243 gramps.glade:6235 gramps.glade:6318 gramps.glade:8240
+#: gramps.glade:9157 gramps.glade:9730 gramps.glade:10213 gramps.glade:13193
+#: gramps.glade:13747 plugins/soundex.glade:110
 msgid "Name:"
 msgstr "Navn:"
 
-#: StartupDialog.py:244 gramps.glade:9486 plugins/Ancestors.py:505
+#: StartupDialog.py:244 gramps.glade:10157 plugins/Ancestors.py:505
 msgid "Address:"
 msgstr "Adresse:"
 
-#: StartupDialog.py:245 gramps.glade:14682
+#: StartupDialog.py:245 gramps.glade:15804
 msgid "City:"
 msgstr "By:"
 
-#: StartupDialog.py:246 gramps.glade:9606
+#: StartupDialog.py:246 gramps.glade:10297
 msgid "State/Province:"
 msgstr "Stat/provins:"
 
-#: StartupDialog.py:247 gramps.glade:9510 gramps.glade:14730
+#: StartupDialog.py:247 gramps.glade:10185 gramps.glade:15860
 msgid "Country:"
 msgstr "Land:"
 
-#: StartupDialog.py:248 gramps.glade:9582
+#: StartupDialog.py:248 gramps.glade:10269
 msgid "ZIP/Postal code:"
 msgstr "Postnummer:"
 
-#: StartupDialog.py:249 gramps.glade:9868 gramps.glade:14977
+#: StartupDialog.py:249 gramps.glade:10603 gramps.glade:16147
 msgid "Phone:"
 msgstr "Telefon:"
 
@@ -3415,7 +3504,7 @@ msgstr "Internettadressebehandler"
 msgid "Internet Address Editor for %s"
 msgstr "Internettadressebehandler for %s"
 
-#: Utils.py:72
+#: Utils.py:67
 msgid "The data can only be recovered by Undo operation or by quitting with abandoning changes."
 msgstr "Dataene kan kun gjenopprettes ved hjelp av Angre-operasjonen, eller ved  avslutte uten  lagre endringene som er gjort."
 
@@ -3441,34 +3530,35 @@ msgstr ""
 "\n"
 "Prv p nytt. Vitnet har ikke blitt endret."
 
-#: WriteGedcom.py:333 plugins/DescendReport.py:116
-#: plugins/ExportVCalendar.py:85 plugins/ExportVCard.py:88
+#: WriteGedcom.py:334 plugins/DescendReport.py:116
+#: plugins/ExportVCalendar.py:87 plugins/ExportVCard.py:89
 #: plugins/FtmStyleDescendants.py:121 plugins/GraphViz.py:517
 #: plugins/IndivComplete.py:514 plugins/StatisticsChart.py:831
-#: plugins/TimeLine.py:415 plugins/WebPage.py:1269 plugins/WriteFtree.py:90
-#: plugins/WriteGeneWeb.py:91
+#: plugins/TimeLine.py:415 plugins/WebPage.py:1269 plugins/WriteFtree.py:91
+#: plugins/WriteGeneWeb.py:92
 msgid "Descendants of %s"
 msgstr "Etterkommere av %s"
 
-#: WriteGedcom.py:337 plugins/Ancestors.py:141 plugins/ExportVCalendar.py:89
-#: plugins/ExportVCard.py:92 plugins/FtmStyleAncestors.py:96
+#: WriteGedcom.py:340 plugins/Ancestors.py:141 plugins/ExportVCalendar.py:93
+#: plugins/ExportVCard.py:95 plugins/FtmStyleAncestors.py:96
 #: plugins/GraphViz.py:521 plugins/IndivComplete.py:518
 #: plugins/StatisticsChart.py:835 plugins/TimeLine.py:419
-#: plugins/WebPage.py:1277 plugins/WriteFtree.py:94 plugins/WriteGeneWeb.py:95
+#: plugins/WebPage.py:1277 plugins/WriteFtree.py:97 plugins/WriteGeneWeb.py:98
 #, fuzzy
 msgid "Ancestors of %s"
 msgstr "Aner av %s"
 
-#: WriteGedcom.py:341 plugins/ExportVCalendar.py:93 plugins/ExportVCard.py:96
+#: WriteGedcom.py:346 plugins/ExportVCalendar.py:99 plugins/ExportVCard.py:101
 #: plugins/GraphViz.py:525 plugins/IndivComplete.py:522
 #: plugins/StatisticsChart.py:839 plugins/TimeLine.py:423
-#: plugins/WebPage.py:1281 plugins/WriteFtree.py:98 plugins/WriteGeneWeb.py:99
+#: plugins/WebPage.py:1281 plugins/WriteFtree.py:103
+#: plugins/WriteGeneWeb.py:104
 #, fuzzy
 msgid "People with common ancestor with %s"
 msgstr "Personer med samme aner som %s"
 
-#: WriteGedcom.py:557 WriteGedcom.py:562 docgen/AbiWord2Doc.py:77
-#: docgen/AbiWord2Doc.py:80 docgen/AsciiDoc.py:113 docgen/AsciiDoc.py:116
+#: WriteGedcom.py:565 WriteGedcom.py:570 docgen/AbiWord2Doc.py:75
+#: docgen/AbiWord2Doc.py:78 docgen/AsciiDoc.py:113 docgen/AsciiDoc.py:116
 #: docgen/HtmlDoc.py:225 docgen/HtmlDoc.py:228 docgen/HtmlDoc.py:353
 #: docgen/HtmlDoc.py:356 docgen/LaTeXDoc.py:87 docgen/LaTeXDoc.py:90
 #: docgen/OpenSpreadSheet.py:76 docgen/OpenSpreadSheet.py:78
@@ -3477,22 +3567,22 @@ msgstr "Personer med samme aner som %s"
 #: docgen/OpenSpreadSheet.py:436 docgen/OpenSpreadSheet.py:440
 #: docgen/PSDrawDoc.py:95 docgen/PSDrawDoc.py:98 docgen/PdfDoc.py:180
 #: docgen/RTFDoc.py:80 docgen/RTFDoc.py:83 docgen/SvgDrawDoc.py:75
-#: docgen/SvgDrawDoc.py:77 plugins/ExportVCalendar.py:168
-#: plugins/ExportVCalendar.py:172 plugins/ExportVCard.py:153
-#: plugins/ExportVCard.py:157 plugins/WriteGeneWeb.py:210
-#: plugins/WriteGeneWeb.py:214
+#: docgen/SvgDrawDoc.py:77 plugins/ExportVCalendar.py:178
+#: plugins/ExportVCalendar.py:182 plugins/ExportVCard.py:162
+#: plugins/ExportVCard.py:166 plugins/WriteGeneWeb.py:219
+#: plugins/WriteGeneWeb.py:223
 msgid "Could not create %s"
 msgstr "Kunne ikke lage %s"
 
-#: WriteGedcom.py:1252
+#: WriteGedcom.py:1272
 msgid "GE_DCOM"
 msgstr "GE_DCOM"
 
-#: WriteGedcom.py:1253
+#: WriteGedcom.py:1273
 msgid "GEDCOM is used to transfer data between genealogy programs. Most genealogy software will accept a GEDCOM file as input. "
 msgstr "GEDCOM brukes til  overfre data mellom slektsforskningsprogrammer. De fleste slektsforskningsprogram vil godta en GEDCOM-fil som inndata."
 
-#: WriteGedcom.py:1255
+#: WriteGedcom.py:1275
 msgid "GEDCOM export options"
 msgstr "GEDCOM-eksportinnstillinger"
 
@@ -3772,113 +3862,113 @@ msgstr "Ukjent relasjon mellom mann og kvinne"
 msgid "An unspecified relationship between a man and woman"
 msgstr "En uspesifisert relasjon mellom mann og kvinne"
 
-#: const.py:515
+#: const.py:522
 msgid "Also Known As"
 msgstr "Ogs kjent som"
 
-#: const.py:516
+#: const.py:523
 msgid "Birth Name"
 msgstr "Fdselsnavn"
 
-#: const.py:517
+#: const.py:524
 msgid "Married Name"
 msgstr "Navn som gift"
 
-#: const.py:518
+#: const.py:525
 msgid "Other Name"
 msgstr "Annet navn"
 
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid ""
 msgstr ""
 
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid "Cleared"
 msgstr "Ryddet"
 
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid "Completed"
 msgstr "Komplet"
 
-#: const.py:903
+#: const.py:910
 msgid "Infant"
 msgstr "Spedbarn"
 
-#: const.py:903 const.py:909
+#: const.py:910 const.py:916
 msgid "Stillborn"
 msgstr "Ddfdt"
 
-#: const.py:903 const.py:909 const.py:915
+#: const.py:910 const.py:916 const.py:922
 msgid "Pre-1970"
 msgstr "Fr 1970"
 
-#: const.py:903 const.py:909 const.py:915
+#: const.py:910 const.py:916 const.py:922
 msgid "Qualified"
 msgstr "Kvalifisert"
 
-#: const.py:904 const.py:910 const.py:916
+#: const.py:911 const.py:917 const.py:923
 msgid "Submitted"
 msgstr "Avgitt"
 
-#: const.py:904 const.py:910 const.py:916
+#: const.py:911 const.py:917 const.py:923
 msgid "Uncleared"
 msgstr "Uavklart"
 
-#: const.py:908
+#: const.py:915
 msgid "BIC"
 msgstr "BIC"
 
-#: const.py:909 const.py:915
+#: const.py:916 const.py:922
 msgid "DNS"
 msgstr "DNS"
 
-#: const.py:914
+#: const.py:921
 msgid "Canceled"
 msgstr "Avbrutt"
 
-#: const.py:915
+#: const.py:922
 msgid "DNS/CAN"
 msgstr "DNS/CAN"
 
-#: const.py:921
+#: const.py:928
 msgid "Flowed"
 msgstr "Flyt"
 
-#: const.py:922
+#: const.py:929
 msgid "Preformatted"
 msgstr "Preformatert"
 
-#: const.py:934
+#: const.py:941
 msgid "Text Reports"
 msgstr "Tekstrapporter"
 
-#: const.py:935
+#: const.py:942
 msgid "Graphical Reports"
 msgstr "Grafiske rapporter"
 
-#: const.py:936
+#: const.py:943
 msgid "Code Generators"
 msgstr "Kodegeneratorer"
 
-#: const.py:937 plugins/WebPage.py:1719
+#: const.py:944 plugins/WebPage.py:1719
 msgid "Web Page"
 msgstr "Nettside"
 
-#: const.py:938
+#: const.py:945
 msgid "View"
 msgstr "Vis"
 
-#: const.py:939
+#: const.py:946
 msgid "Books"
 msgstr "Bker"
 
-#: const.py:943 plugins/ScratchPad.py:356 plugins/ScratchPad.py:405
+#: const.py:950 plugins/ScratchPad.py:356 plugins/ScratchPad.py:405
 #: plugins/ScratchPad.py:413 plugins/SimpleBookTitle.py:169
 #: plugins/SimpleBookTitle.py:170 plugins/SimpleBookTitle.py:171
 msgid "Text"
 msgstr "Tekst"
 
-#: const.py:944
+#: const.py:951
 msgid "Graphics"
 msgstr "Grafikk"
 
@@ -4188,7 +4278,7 @@ msgstr ""
 msgid "GRAMPS makes every effort to maintain compatibility with GEDCOM, the general standard of recording genealogical information. Filters exist that make importing and exporting GEDCOM files trivial."
 msgstr ""
 
-#: docgen/AbiWord2Doc.py:332
+#: docgen/AbiWord2Doc.py:340
 msgid "AbiWord document"
 msgstr "AbiWord-dokument"
 
@@ -4270,7 +4360,7 @@ msgstr "SVG (Skalerbar Vektor Grafikk)"
 msgid "Encoding"
 msgstr "Koding"
 
-#: gedcomexport.glade:127 gramps.glade:20090 gramps.glade:28994
+#: gedcomexport.glade:127 gramps.glade:21644 gramps.glade:31156
 #: plugins/genewebexport.glade:103 plugins/merge.glade:385
 #: plugins/vcalendarexport.glade:103 plugins/vcardexport.glade:103
 #: plugins/writeftree.glade:124
@@ -4372,7 +4462,7 @@ msgstr "Laget av:"
 msgid "Status"
 msgstr "Status"
 
-#: gedcomimport.glade:216 gramps.glade:3482 gramps.glade:19306
+#: gedcomimport.glade:216 gramps.glade:3660 gramps.glade:20805
 msgid "Information"
 msgstr "Informasjon"
 
@@ -4418,394 +4508,394 @@ msgstr ""
 "ASCII\n"
 "UNICODE"
 
-#: gramps.glade:10 gramps.glade:31082
+#: gramps.glade:10 gramps.glade:33389
 msgid "GRAMPS"
 msgstr "GRAMPS"
 
-#: gramps.glade:44
+#: gramps.glade:45
 msgid "_File"
 msgstr "_Fil"
 
-#: gramps.glade:53
+#: gramps.glade:54
 msgid "_New"
 msgstr "_Ny"
 
-#: gramps.glade:75
+#: gramps.glade:76
 msgid "_Open..."
 msgstr "_pne ..."
 
-#: gramps.glade:97
+#: gramps.glade:98
 msgid "Open _Recent"
 msgstr "pne _nylig brukt"
 
-#: gramps.glade:112
+#: gramps.glade:113
 msgid "_Import..."
 msgstr "_Import ..."
 
-#: gramps.glade:134
+#: gramps.glade:135
 msgid "Save _As..."
 msgstr "L_agre som ..."
 
-#: gramps.glade:156
+#: gramps.glade:157
 msgid "E_xport..."
 msgstr "_Eksport ..."
 
-#: gramps.glade:184
+#: gramps.glade:185
 msgid "A_bandon changes and quit"
 msgstr "_Avslutt uten  lagre endringer"
 
-#: gramps.glade:193
+#: gramps.glade:194
 msgid "_Quit"
 msgstr "A_vslutt"
 
-#: gramps.glade:219
+#: gramps.glade:220
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: gramps.glade:228 gramps_main.py:536
+#: gramps.glade:229 gramps_main.py:536
 msgid "_Undo"
 msgstr "_Angre"
 
-#: gramps.glade:256 gramps.glade:918
+#: gramps.glade:257 gramps.glade:919
 msgid "Add a new item"
 msgstr "Legg til et nytt element"
 
-#: gramps.glade:257 rule.glade:135 rule.glade:722
+#: gramps.glade:258 rule.glade:135 rule.glade:722
 msgid "_Add..."
 msgstr "_Legg til ..."
 
-#: gramps.glade:279 gramps.glade:936
+#: gramps.glade:280 gramps.glade:937
 msgid "Remove the currently selected item"
 msgstr "Fjern det valgte elementet"
 
-#: gramps.glade:280
+#: gramps.glade:281
 msgid "R_emove"
 msgstr "Fj_erne"
 
-#: gramps.glade:302 gramps.glade:954
+#: gramps.glade:303 gramps.glade:955
 msgid "Edit the selected item"
 msgstr "Rediger det valgte elementet"
 
-#: gramps.glade:303
+#: gramps.glade:304
 msgid "E_dit..."
 msgstr "Re_diger ..."
 
-#: gramps.glade:318
+#: gramps.glade:319
 msgid "Compare and _Merge..."
 msgstr "_Sammenligne og flett sammen ..."
 
-#: gramps.glade:340
+#: gramps.glade:341
 msgid "Fast Mer_ge"
 msgstr "_Rask sammenfletting"
 
-#: gramps.glade:355
+#: gramps.glade:356
 msgid "Prefere_nces..."
 msgstr "Foretruk_ne innstillinger ..."
 
-#: gramps.glade:376
+#: gramps.glade:377
 msgid "_Column Editor..."
 msgstr "_Kolonnebehandler ..."
 
-#: gramps.glade:397
+#: gramps.glade:398
 msgid "Set _Home person..."
 msgstr "Sett _hjemperson ..."
 
-#: gramps.glade:422
+#: gramps.glade:423
 msgid "_View"
 msgstr "_Vis"
 
-#: gramps.glade:431
+#: gramps.glade:432
 msgid "_Filter"
 msgstr "_Filter"
 
-#: gramps.glade:441
+#: gramps.glade:442
 msgid "_Sidebar"
 msgstr "_Sidestolpe"
 
-#: gramps.glade:451
+#: gramps.glade:452
 msgid "_Toolbar"
 msgstr "_Verktylinje"
 
-#: gramps.glade:465
+#: gramps.glade:466
 msgid "_Go"
 msgstr "_G"
 
-#: gramps.glade:473
+#: gramps.glade:474
 msgid "_Bookmarks"
 msgstr "_Bokmerker"
 
-#: gramps.glade:482
+#: gramps.glade:483
 msgid "_Add bookmark"
 msgstr "_Legg til bokmerke"
 
-#: gramps.glade:504
+#: gramps.glade:505
 msgid "_Edit bookmarks..."
 msgstr "_Rediger bokmerker ..."
 
-#: gramps.glade:532
+#: gramps.glade:533
 msgid "_Go to bookmark"
 msgstr "_G til bokmerke"
 
-#: gramps.glade:544
+#: gramps.glade:545
 msgid "_Reports"
 msgstr "_Rapporter"
 
-#: gramps.glade:552
+#: gramps.glade:553
 msgid "_Tools"
 msgstr "Verk_ty"
 
-#: gramps.glade:560
+#: gramps.glade:561
 msgid "_Windows"
 msgstr "_Vinduer"
 
-#: gramps.glade:568
+#: gramps.glade:569
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: gramps.glade:577
+#: gramps.glade:578
 msgid "_User manual"
 msgstr "_Brukerveiledning"
 
-#: gramps.glade:599
+#: gramps.glade:600
 msgid "_FAQ"
 msgstr "_OSS"
 
-#: gramps.glade:626
+#: gramps.glade:627
 msgid "GRAMPS _home page"
 msgstr "GRAMPS _hjemmeside"
 
-#: gramps.glade:647
+#: gramps.glade:648
 msgid "GRAMPS _mailing lists"
 msgstr "GRAMPS _e-postlister"
 
-#: gramps.glade:668
+#: gramps.glade:669
 msgid "_Report a bug"
 msgstr "_Rapporter en feil"
 
-#: gramps.glade:683
+#: gramps.glade:684
 msgid "_Show plugin status..."
 msgstr "Vi_s status for programtillegg ..."
 
-#: gramps.glade:692
+#: gramps.glade:693
 msgid "_Open example database"
 msgstr "_pne eksempel-database"
 
-#: gramps.glade:701
+#: gramps.glade:702
 msgid "_About"
 msgstr "_Om"
 
-#: gramps.glade:751
+#: gramps.glade:752
 msgid "Open database"
 msgstr "pne database"
 
-#: gramps.glade:752
+#: gramps.glade:753
 msgid "Open"
 msgstr "pne"
 
-#: gramps.glade:782
+#: gramps.glade:783
 msgid "Go back in history"
 msgstr "G tilbake i historikken"
 
-#: gramps.glade:783
+#: gramps.glade:784
 msgid "Back"
 msgstr "Tilbake"
 
-#: gramps.glade:801
+#: gramps.glade:802
 msgid "Go forward in history"
 msgstr "G fremover i historikken"
 
-#: gramps.glade:802
+#: gramps.glade:803
 msgid "Forward"
 msgstr "Fremover"
 
-#: gramps.glade:820
+#: gramps.glade:821
 msgid "Make the Home Person the active person"
 msgstr "Gjr hjempersonen til den aktive personen"
 
-#: gramps.glade:851
+#: gramps.glade:852
 msgid "Open Scratch Pad"
 msgstr "pne utklippstavle"
 
-#: gramps.glade:852
+#: gramps.glade:853
 msgid "ScratchPad"
 msgstr "Utklippstavle"
 
-#: gramps.glade:869
+#: gramps.glade:870
 msgid "Generate reports"
 msgstr "Lage rapporter"
 
-#: gramps.glade:870
+#: gramps.glade:871
 msgid "Reports"
 msgstr "Rapporter"
 
-#: gramps.glade:887
+#: gramps.glade:888
 msgid "Run tools"
 msgstr "Bruk verkty"
 
-#: gramps.glade:888
+#: gramps.glade:889
 msgid "Tools"
 msgstr "Verkty"
 
-#: gramps.glade:919
+#: gramps.glade:920
 msgid "Add"
 msgstr "Legg til"
 
-#: gramps.glade:937
+#: gramps.glade:938
 msgid "Remove"
 msgstr "Fjern"
 
-#: gramps.glade:1028 gramps.glade:1452
+#: gramps.glade:1029 gramps.glade:1486
 msgid "People"
 msgstr "Personer"
 
-#: gramps.glade:1076 gramps.glade:2237 gramps.glade:2992
+#: gramps.glade:1081 gramps.glade:2310 gramps.glade:3104
 msgid "Family"
 msgstr "Familie"
 
-#: gramps.glade:1124 gramps.glade:3039
+#: gramps.glade:1133 gramps.glade:3155
 msgid "Pedigree"
 msgstr "Stamtavle"
 
-#: gramps.glade:1172 gramps.glade:3097
+#: gramps.glade:1185 gramps.glade:3220
 msgid "Sources"
 msgstr "Kilder"
 
-#: gramps.glade:1220 gramps.glade:3155
+#: gramps.glade:1237 gramps.glade:3285
 msgid "Places"
 msgstr "Steder"
 
-#: gramps.glade:1268 gramps.glade:3554
+#: gramps.glade:1289 gramps.glade:3739
 msgid "Media"
 msgstr "Media"
 
-#: gramps.glade:1376
+#: gramps.glade:1407
 msgid "Invert"
 msgstr "Snu"
 
-#: gramps.glade:1394
+#: gramps.glade:1425
 msgid "Apply filter using the selected controls"
 msgstr "Bruk filteret med de valgte kontrollene"
 
-#: gramps.glade:1481 gramps.glade:2956
+#: gramps.glade:1519 gramps.glade:3068
 msgid "Exchange the current spouse with the active person"
 msgstr "Bytt ut gjeldende ektefelle med den aktive personen"
 
-#: gramps.glade:1547 gramps.glade:2718
+#: gramps.glade:1585 gramps.glade:2822
 msgid "Adds a new person to the database and to a new relationship"
 msgstr "Legg til en ny person i databasen med en ny relasjon"
 
-#: gramps.glade:1574 gramps.glade:2745
+#: gramps.glade:1612 gramps.glade:2849
 msgid "Selects an existing person from the database and adds to a new relationship"
 msgstr "Velger en eksisterende person fra databasen og legg til en ny relasjon"
 
-#: gramps.glade:1601 gramps.glade:2772
+#: gramps.glade:1639 gramps.glade:2876
 msgid "Removes the currently selected spouse"
 msgstr "Fjern den valgte ektefellen"
 
-#: gramps.glade:1644 gramps.glade:2865
+#: gramps.glade:1682 gramps.glade:2977
 msgid "Make the active person's parents the active family"
 msgstr "Gjr den aktive personens familie til den aktive familien"
 
-#: gramps.glade:1671 gramps.glade:2892
+#: gramps.glade:1709 gramps.glade:3004
 msgid "Adds a new set of parents to the active person"
 msgstr "Legg til et nytt sett med foreldre til den aktive personen"
 
-#: gramps.glade:1698 gramps.glade:2919
+#: gramps.glade:1736 gramps.glade:3031
 msgid "Deletes the selected parents from the active person"
 msgstr "Slett de valgte foreldrene fra den aktive personen"
 
-#: gramps.glade:1744 gramps.glade:2026 gramps.glade:2360 gramps.glade:2390
+#: gramps.glade:1782 gramps.glade:2090 gramps.glade:2447 gramps.glade:2480
 msgid "Double-click to edit the relationship to the selected parents"
 msgstr "Dobbeltklikk for  redigere relasjonene til de valgte foreldrene"
 
-#: gramps.glade:1771 gramps.glade:2596
+#: gramps.glade:1812 gramps.glade:2696
 msgid "Make the selected spouse's parents the active family"
 msgstr "Gjr den valgte ektefellens familie til den aktive familien"
 
-#: gramps.glade:1798 gramps.glade:2623
+#: gramps.glade:1839 gramps.glade:2723
 msgid "Adds a new set of parents to the selected spouse"
 msgstr "Legg til et nytt sett med foreldre til den valgte ektefellen"
 
-#: gramps.glade:1825 gramps.glade:2650
+#: gramps.glade:1866 gramps.glade:2750
 msgid "Deletes the selected parents from the selected spouse"
 msgstr "Fjern de valgte foreldrene fra den valgte ektefellen"
 
-#: gramps.glade:1862 gramps.glade:2296
+#: gramps.glade:1903 gramps.glade:2376
 msgid "_Children"
 msgstr "_Barn"
 
-#: gramps.glade:1887 gramps.glade:2809
+#: gramps.glade:1932 gramps.glade:2913
 msgid "_Active person"
 msgstr "_Aktiv person"
 
-#: gramps.glade:1912 gramps.glade:2834
+#: gramps.glade:1961 gramps.glade:2942
 msgid "Active person's _parents"
 msgstr "Den aktive personens _foreldre"
 
-#: gramps.glade:1937 gramps.glade:2687
+#: gramps.glade:1990 gramps.glade:2787
 msgid "Relati_onship"
 msgstr "Relasj_oner"
 
-#: gramps.glade:1962 gramps.glade:2565
+#: gramps.glade:2019 gramps.glade:2661
 msgid "Spo_use's parents"
 msgstr "_Ektefellens foreldre"
 
-#: gramps.glade:2056 gramps.glade:2420
+#: gramps.glade:2123 gramps.glade:2513
 msgid "Double-click to edit the active person"
 msgstr "Dobbeltklikk for  redigere den aktive personen"
 
-#: gramps.glade:2086 gramps.glade:2275
+#: gramps.glade:2156 gramps.glade:2352
 msgid "Double-click to edit the relationship information, Shift-click to edit the person"
 msgstr "Dobbeltklikk for  redigere relasjonsinformasjonen. Trykk Shift og klikk for  redigere personen"
 
-#: gramps.glade:2113 gramps.glade:2447
+#: gramps.glade:2186 gramps.glade:2543
 msgid "Make the selected child the active person"
 msgstr "Gjr det valgte barnet til den aktive personen"
 
-#: gramps.glade:2140 gramps.glade:2474
+#: gramps.glade:2213 gramps.glade:2570
 msgid "Adds a new child to the database and to the current family"
 msgstr "Legg til et nytt barn i databasen og i den aktuelle familien"
 
-#: gramps.glade:2167 gramps.glade:2501
+#: gramps.glade:2240 gramps.glade:2597
 msgid "Selects an existing person from the database and adds as a child to the current family"
 msgstr "Velger en eksisterende person fra databasen, og legger den til som et barn i den aktuelle familien"
 
-#: gramps.glade:2194 gramps.glade:2528
+#: gramps.glade:2267 gramps.glade:2624
 msgid "Deletes the selected child from the selected family"
 msgstr "Sletter det valgte barnet fra den valgte familien"
 
-#: gramps.glade:3206 gramps.glade:19030 gramps.glade:21050 gramps.glade:21315
-#: gramps.glade:22712
+#: gramps.glade:3340 gramps.glade:20485 gramps.glade:22681 gramps.glade:22959
+#: gramps.glade:24471
 msgid "Preview"
 msgstr "Forhndsvisning"
 
-#: gramps.glade:3242 gramps.glade:19066
+#: gramps.glade:3380 gramps.glade:20525
 msgid "Details:"
 msgstr "Detaljer:"
 
-#: gramps.glade:3313 gramps.glade:19137 gramps.glade:21351 gramps.glade:22748
+#: gramps.glade:3463 gramps.glade:20608 gramps.glade:22999 gramps.glade:24511
 msgid "Path:"
 msgstr "Sti:"
 
-#: gramps.glade:3338 gramps.glade:7942 gramps.glade:8512 gramps.glade:9026
-#: gramps.glade:12184 gramps.glade:12799 gramps.glade:19162 gramps.glade:22079
-#: gramps.glade:23157
+#: gramps.glade:3492 gramps.glade:8436 gramps.glade:9073 gramps.glade:9646
+#: gramps.glade:13081 gramps.glade:13775 gramps.glade:20637 gramps.glade:23799
+#: gramps.glade:24964
 msgid "Type:"
 msgstr "Type:"
 
-#: gramps.glade:3778
+#: gramps.glade:3975
 msgid "Check to show all people in the list.  Uncheck to get the list filtered by birth and death dates."
 msgstr "Kryss av for  vise alle personene i lista. Fjern krysset for  filtrere lista p fdsels- og ddsdatoer."
 
-#: gramps.glade:3780 gramps.glade:4156 gramps.glade:4574
+#: gramps.glade:3977 gramps.glade:4380 gramps.glade:4826
 msgid "_Show all"
 msgstr "_Vis alle"
 
-#: gramps.glade:3827 gramps.glade:11954
+#: gramps.glade:4024 gramps.glade:12825
 msgid "_Relationship type:"
 msgstr "_Relasjonstype:"
 
-#: gramps.glade:3855
+#: gramps.glade:4056
 msgid ""
 "Married\n"
 "Unmarried\n"
@@ -4819,651 +4909,654 @@ msgstr ""
 "Ukjent\n"
 "Annet"
 
-#: gramps.glade:4025
+#: gramps.glade:4233
 msgid "_Father's relationship to child:"
 msgstr "_Fars relasjon til barn:"
 
-#: gramps.glade:4049
+#: gramps.glade:4261
 msgid "_Mother's relationship to child:"
 msgstr "_Mors relasjon til et barn:"
 
-#: gramps.glade:4073
+#: gramps.glade:4289
 msgid "_Parents' relationship to each other:"
 msgstr "_Foreldrenes relasjon til hverandre:"
 
-#: gramps.glade:4097
+#: gramps.glade:4317
 msgid "Fat_her"
 msgstr "_Far"
 
-#: gramps.glade:4192
+#: gramps.glade:4416
 msgid "Moth_er"
 msgstr "_Mor"
 
-#: gramps.glade:4217
+#: gramps.glade:4445
 msgid "Relationships"
 msgstr "Relasjoner"
 
-#: gramps.glade:4311
+#: gramps.glade:4549
 msgid "Show _all"
 msgstr "Vis _alle"
 
-#: gramps.glade:4643
+#: gramps.glade:4895
 msgid "Relationship to father:"
 msgstr "Relasjon til far:"
 
-#: gramps.glade:4667
+#: gramps.glade:4923
 msgid "Relationship to mother:"
 msgstr "Relasjon til mor:"
 
-#: gramps.glade:4758 gramps.glade:6549 gramps.glade:11846 gramps.glade:28451
+#: gramps.glade:5023 gramps.glade:6932 gramps.glade:12713 gramps.glade:30562
 msgid "Abandon changes and close window"
 msgstr "Lukk vinduet uten  lagre endringene"
 
-#: gramps.glade:4773 gramps.glade:6564 gramps.glade:11861 gramps.glade:25038
-#: gramps.glade:27302 gramps.glade:28196 gramps.glade:28466
+#: gramps.glade:5038 gramps.glade:6947 gramps.glade:12728 gramps.glade:26958
+#: gramps.glade:29348 gramps.glade:30294 gramps.glade:30577
 msgid "Accept changes and close window"
 msgstr "Godta endringene og lukk vinduet"
 
-#: gramps.glade:4860 gramps.glade:6759 gramps.glade:14059 gramps.glade:18137
-#: gramps.glade:21096 gramps.glade:22932 gramps.glade:28635
+#: gramps.glade:5129 gramps.glade:7162 gramps.glade:15121 gramps.glade:19547
+#: gramps.glade:22731 gramps.glade:24719 gramps.glade:30762
 msgid "_Title:"
 msgstr "_Tittel:"
 
-#: gramps.glade:4885
+#: gramps.glade:5158
 msgid "_Author:"
 msgstr "_Forfatter:"
 
-#: gramps.glade:4956
+#: gramps.glade:5233
 msgid "_Publication information:"
 msgstr "_Publiseringsinformasjon:"
 
-#: gramps.glade:5023
+#: gramps.glade:5304
 msgid "A_bbreviation:"
 msgstr "_Forkortelse:"
 
-#: gramps.glade:5054 gramps.glade:12125 gramps.glade:14453 gramps.glade:14623
-#: gramps.glade:23075 gramps.glade:25412 gramps.glade:26416 gramps.glade:27784
-#: gramps.glade:29213 plugins/verify.glade:530
+#: gramps.glade:5339 gramps.glade:13014 gramps.glade:15547 gramps.glade:15737
+#: gramps.glade:24870 gramps.glade:27359 gramps.glade:28409 gramps.glade:29862
+#: gramps.glade:31390 plugins/verify.glade:530
 msgid "General"
 msgstr "Generelt"
 
-#: gramps.glade:5124 gramps.glade:10183 gramps.glade:13187 gramps.glade:15258
-#: gramps.glade:21905 gramps.glade:23465 gramps.glade:25663 gramps.glade:26665
-#: gramps.glade:28033 gramps.glade:29464
+#: gramps.glade:5413 gramps.glade:10933 gramps.glade:14198 gramps.glade:16443
+#: gramps.glade:23613 gramps.glade:25291 gramps.glade:27621 gramps.glade:28669
+#: gramps.glade:30122 gramps.glade:31652
 msgid "Format"
 msgstr "Format"
 
-#: gramps.glade:5148 gramps.glade:10208 gramps.glade:13211 gramps.glade:15282
-#: gramps.glade:21929 gramps.glade:23489 gramps.glade:25687 gramps.glade:26689
-#: gramps.glade:28057 gramps.glade:29488
+#: gramps.glade:5441 gramps.glade:10962 gramps.glade:14226 gramps.glade:16471
+#: gramps.glade:23641 gramps.glade:25319 gramps.glade:27649 gramps.glade:28697
+#: gramps.glade:30150 gramps.glade:31680
 msgid "Multiple spaces, tabs, and single line breaks are replaced with single spaces. Two consecutive line breaks mark a new paragraph."
 msgstr "Gjentakende mellomrom, tabulatorer og enkle linjeskift erstattes med et enkelt mellomrom. To etterflgende linjeskift markerer et nytt avsnitt."
 
-#: gramps.glade:5150 gramps.glade:10210 gramps.glade:13213 gramps.glade:15284
-#: gramps.glade:21931 gramps.glade:23491 gramps.glade:25689 gramps.glade:26691
-#: gramps.glade:28059 gramps.glade:29490
+#: gramps.glade:5443 gramps.glade:10964 gramps.glade:14228 gramps.glade:16473
+#: gramps.glade:23643 gramps.glade:25321 gramps.glade:27651 gramps.glade:28699
+#: gramps.glade:30152 gramps.glade:31682
 msgid "_Flowed"
 msgstr "_Flyt"
 
-#: gramps.glade:5171 gramps.glade:10231 gramps.glade:13234 gramps.glade:15305
-#: gramps.glade:21952 gramps.glade:23512 gramps.glade:25710 gramps.glade:26712
-#: gramps.glade:28080 gramps.glade:29511
+#: gramps.glade:5464 gramps.glade:10985 gramps.glade:14249 gramps.glade:16494
+#: gramps.glade:23664 gramps.glade:25342 gramps.glade:27672 gramps.glade:28720
+#: gramps.glade:30173 gramps.glade:31703
 msgid "Formatting is preserved, except for the leading whitespace. Multiple spaces, tabs, and all line breaks are respected."
 msgstr "Formateringer, bortsett fra innledende blanke tegn, blir beholdt. Gjentakende mellomrom, tabulatorer og alle linjeskift blir beholdt."
 
-#: gramps.glade:5173 gramps.glade:10233 gramps.glade:13236 gramps.glade:15307
-#: gramps.glade:21954 gramps.glade:23514 gramps.glade:25712 gramps.glade:26714
-#: gramps.glade:28082 gramps.glade:29513
+#: gramps.glade:5466 gramps.glade:10987 gramps.glade:14251 gramps.glade:16496
+#: gramps.glade:23666 gramps.glade:25344 gramps.glade:27674 gramps.glade:28722
+#: gramps.glade:30175 gramps.glade:31705
 msgid "_Preformatted"
 msgstr "_Preformatert"
 
-#: gramps.glade:5268 gramps.glade:5405 gramps.glade:10490 gramps.glade:13484
-#: gramps.glade:15587 gramps.glade:25993
+#: gramps.glade:5568 gramps.glade:5709 gramps.glade:11255 gramps.glade:14510
+#: gramps.glade:16787 gramps.glade:27966
 msgid "Add a new media object to the database and place it in this gallery"
 msgstr "Legg til et nytt mediaobjekt i databasen, og legg det til dette galleriet"
 
-#: gramps.glade:5296 gramps.glade:5489 gramps.glade:13567 gramps.glade:15670
-#: gramps.glade:26076
+#: gramps.glade:5596 gramps.glade:5793 gramps.glade:14593 gramps.glade:16870
+#: gramps.glade:28049
 msgid "Remove selected object from this gallery only"
 msgstr "Fjern det valgte objektet kun fra dette galleriet"
 
-#: gramps.glade:5337
+#: gramps.glade:5637
 msgid "Data"
 msgstr "Data"
 
-#: gramps.glade:5433 gramps.glade:10518 gramps.glade:13512 gramps.glade:15615
-#: gramps.glade:26021
+#: gramps.glade:5737 gramps.glade:11283 gramps.glade:14538 gramps.glade:16815
+#: gramps.glade:27994
 msgid "Select an existing media object from the database and place it in this gallery"
 msgstr "Velg et eksisterende mediaobjekt fra databasen, og legg det til dette galleriet"
 
-#: gramps.glade:5461 gramps.glade:10546 gramps.glade:15643 gramps.glade:26049
+#: gramps.glade:5765 gramps.glade:11311 gramps.glade:16843 gramps.glade:28022
 msgid "Edit the properties of the selected object"
 msgstr "Endre egenskapene til det valgte objektet"
 
-#: gramps.glade:5550 gramps.glade:10621 gramps.glade:13608 gramps.glade:15731
-#: gramps.glade:26137 plugins/WebPage.py:432
+#: gramps.glade:5854 gramps.glade:11386 gramps.glade:14634 gramps.glade:16931
+#: gramps.glade:28110 plugins/WebPage.py:432
 msgid "Gallery"
 msgstr "Galleri"
 
-#: gramps.glade:5595 gramps.glade:16128 gramps.glade:23593
+#: gramps.glade:5906 gramps.glade:17359 gramps.glade:25430
 msgid "References"
 msgstr "Referanser"
 
-#: gramps.glade:5742
+#: gramps.glade:6062
 msgid "Open an _existing database"
 msgstr "pne en _eksisterende database"
 
-#: gramps.glade:5762
+#: gramps.glade:6082
 msgid "Create a _new database"
 msgstr "Lag en _ny database"
 
-#: gramps.glade:5957
+#: gramps.glade:6290
 msgid "_Relationship:"
 msgstr "_Relasjon:"
 
-#: gramps.glade:6005
+#: gramps.glade:6346
 msgid "Relation_ship:"
 msgstr "Rela_sjon:"
 
-#: gramps.glade:6056
+#: gramps.glade:6405
 msgid "Father"
 msgstr "Far"
 
-#: gramps.glade:6080
+#: gramps.glade:6433
 msgid "Mother"
 msgstr "Mor"
 
-#: gramps.glade:6103
+#: gramps.glade:6460
 msgid "Preference"
 msgstr "Innstilling"
 
-#: gramps.glade:6126
+#: gramps.glade:6487
 msgid "Indicates that the parents should be used as the preferred parents for reporting and display purposes"
 msgstr "Angi at foreldrene skal bli brukt som de foretrukne foreldrene i rapporter og ved fremvisning"
 
-#: gramps.glade:6128
+#: gramps.glade:6489
 msgid "Use as preferred parents"
 msgstr "Bruk som foretrukne foreldre"
 
-#: gramps.glade:6328
+#: gramps.glade:6698
 msgid "_Text:"
 msgstr "_Tekst:"
 
-#: gramps.glade:6487
+#: gramps.glade:6865
 msgid "Select columns"
 msgstr " Velg kolonner"
 
-#: gramps.glade:6659 gramps.glade:28552
+#: gramps.glade:7046 gramps.glade:30667
 msgid "_Given name:"
 msgstr "_Fornavn:"
 
-#: gramps.glade:6684 gramps.glade:28826
+#: gramps.glade:7075 gramps.glade:30965
 msgid "_Family name:"
 msgstr "_Etternavn:"
 
-#: gramps.glade:6709
+#: gramps.glade:7104
 msgid "Famil_y prefix:"
 msgstr "Familieforstavelse:"
 
-#: gramps.glade:6734
+#: gramps.glade:7133
 msgid "S_uffix:"
 msgstr "Etterstavelse:"
 
-#: gramps.glade:6784
+#: gramps.glade:7191
 msgid "Nic_kname:"
 msgstr "_Kallenavn:"
 
-#: gramps.glade:6809 gramps.glade:28608
+#: gramps.glade:7220 gramps.glade:30731
 msgid "T_ype:"
 msgstr "T_ype:"
 
-#: gramps.glade:6833
+#: gramps.glade:7248
 msgid "An optional suffix to the name, such as \"Jr.\" or \"III\""
 msgstr "Valgfri etterstavelse p navnet, som for eksempel Jr. eller III"
 
-#: gramps.glade:6855
+#: gramps.glade:7270
 msgid "A title used to refer to the person, such as \"Dr.\" or \"Rev.\""
 msgstr "Tittel som brukes for  henvise til personen, som for eksempel Dr. eller Rev."
 
-#: gramps.glade:6877
+#: gramps.glade:7292
 msgid "A name that the person was more commonly known by"
 msgstr "Et navn som personen var mer kjent som"
 
-#: gramps.glade:6899
+#: gramps.glade:7314
 msgid "Preferred name"
 msgstr "Foretrukket navn"
 
-#: gramps.glade:6930
+#: gramps.glade:7349
 msgid "_male"
 msgstr "_mann"
 
-#: gramps.glade:6950
+#: gramps.glade:7369
 msgid "fema_le"
 msgstr "k_vinne"
 
-#: gramps.glade:6971
+#: gramps.glade:7390
 msgid "u_nknown"
 msgstr "ukje_nt"
 
-#: gramps.glade:7001
+#: gramps.glade:7420
 msgid "Birth"
 msgstr "Fdsel"
 
-#: gramps.glade:7025
+#: gramps.glade:7448
 msgid "GRAMPS _ID:"
 msgstr "GRAMPS _ID:"
 
-#: gramps.glade:7071
+#: gramps.glade:7498
 msgid "Death"
 msgstr "Dd"
 
-#: gramps.glade:7109
+#: gramps.glade:7543
 msgid "An optional prefix for the family name that is not used in sorting, such as \"de\" or \"van\""
 msgstr "Valgfri forstavelse for familienavn som ikke er med i sortering, som for eksempel de, van eller von"
 
-#: gramps.glade:7131
+#: gramps.glade:7565
 msgid "The person's given name"
 msgstr "Personens fornavn"
 
-#: gramps.glade:7176
+#: gramps.glade:7610
 msgid "Edit the preferred name"
 msgstr "Rediger det foretrukne navnet"
 
-#: gramps.glade:7206
+#: gramps.glade:7640
 msgid "Gender"
 msgstr "Kjnn"
 
-#: gramps.glade:7229
+#: gramps.glade:7667
 msgid "Identification"
 msgstr "Identifikasjon"
 
-#: gramps.glade:7277
+#: gramps.glade:7719
 msgid "Image"
 msgstr "Bilde"
 
-#: gramps.glade:7308 gramps.glade:12091
+#: gramps.glade:7754 gramps.glade:12980
 msgid "Information i_s complete"
 msgstr "Informa_sjonen er komplett"
 
-#: gramps.glade:7330
+#: gramps.glade:7776
 msgid "Information is pri_vate"
 msgstr "Informasjon er pri_vat"
 
-#: gramps.glade:7360 gramps.glade:11012 gramps.glade:18007 gramps.glade:22978
-#: gramps.glade:25147 gramps.glade:27388
+#: gramps.glade:7806 gramps.glade:11812 gramps.glade:19397 gramps.glade:24769
+#: gramps.glade:27075 gramps.glade:29438
 msgid "_Date:"
 msgstr "_Dato:"
 
-#: gramps.glade:7384 gramps.glade:11084 gramps.glade:25203
+#: gramps.glade:7834 gramps.glade:11892 gramps.glade:27139
 msgid "_Place:"
 msgstr "Ste_d:"
 
-#: gramps.glade:7431
+#: gramps.glade:7885
 msgid "Invoke birth event editor"
 msgstr "Starte fdselshendelsesbehandleren"
 
-#: gramps.glade:7486 gramps.glade:7589 gramps.glade:11628 gramps.glade:11688
-#: gramps.glade:11748 gramps.glade:13846 gramps.glade:18436 gramps.glade:23027
-#: gramps.glade:29116
+#: gramps.glade:7940 gramps.glade:8047 gramps.glade:12490 gramps.glade:12550
+#: gramps.glade:12610 gramps.glade:14899 gramps.glade:19866 gramps.glade:24822
+#: gramps.glade:31293
 msgid "Invoke date editor"
 msgstr "Starte datobehandler"
 
-#: gramps.glade:7539 gramps.glade:11177
+#: gramps.glade:7993 gramps.glade:11993
 msgid "D_ate:"
 msgstr "_Dato:"
 
-#: gramps.glade:7625
+#: gramps.glade:8083
 msgid "Invoke death event editor"
 msgstr "Starte ddsfallsbehandleren"
 
-#: gramps.glade:7655
+#: gramps.glade:8113
 msgid "Plac_e:"
 msgstr "St_ed:"
 
-#: gramps.glade:7798 gramps.glade:8608 gramps.glade:9122 gramps.glade:9558
-#: gramps.glade:12304 gramps.glade:12751
+#: gramps.glade:8268 gramps.glade:9185 gramps.glade:9758 gramps.glade:10241
+#: gramps.glade:13221 gramps.glade:13719
 msgid "Confidence:"
 msgstr "Troverdighet:"
 
-#: gramps.glade:7822
+#: gramps.glade:8296
 msgid "Family prefix:"
 msgstr "Familieforstavelse:"
 
-#: gramps.glade:7966
+#: gramps.glade:8464
 msgid "Alternate name"
 msgstr "Alternativt navn"
 
-#: gramps.glade:7990 gramps.glade:8560 gramps.glade:9074 gramps.glade:9654
-#: gramps.glade:12375 gramps.glade:12823
+#: gramps.glade:8492 gramps.glade:9129 gramps.glade:9702 gramps.glade:10353
+#: gramps.glade:13304 gramps.glade:13803
 msgid "Primary source"
 msgstr "Primrkilde"
 
-#: gramps.glade:8266
+#: gramps.glade:8807
 msgid "Create an alternate name for this person"
 msgstr "Lag et alternativt navn p denne personen"
 
-#: gramps.glade:8295
+#: gramps.glade:8836
 msgid "Edit the selected name"
 msgstr "Rediger det valgte navnet"
 
-#: gramps.glade:8323
+#: gramps.glade:8864
 msgid "Delete the selected name"
 msgstr "Slett det valgte navnet"
 
-#: gramps.glade:8375
+#: gramps.glade:8916
 msgid "Names"
 msgstr "Navn"
 
-#: gramps.glade:8416
+#: gramps.glade:8961
 msgid "Event"
 msgstr "Hendelse"
 
-#: gramps.glade:8464 gramps.glade:12232
+#: gramps.glade:9017 gramps.glade:13137
 msgid "Cause:"
 msgstr "Grunn:"
 
-#: gramps.glade:8845
+#: gramps.glade:9457
 msgid "Create a new event"
 msgstr "Lag en ny hendelse"
 
-#: gramps.glade:8874
+#: gramps.glade:9486
 msgid "Edit the selected event"
 msgstr "Rediger den valgte hendelsen"
 
-#: gramps.glade:8902
+#: gramps.glade:9514
 msgid "Delete the selected event"
 msgstr "Slett den valgte hendelsen"
 
-#: gramps.glade:9002 gramps.glade:12847 gramps.glade:22174 gramps.glade:23205
+#: gramps.glade:9618 gramps.glade:13831 gramps.glade:23910 gramps.glade:25020
 msgid "Attributes"
 msgstr "Egenskaper"
 
-#: gramps.glade:9287
+#: gramps.glade:9946
 msgid "Create a new attribute"
 msgstr "Lag en ny egenskap"
 
-#: gramps.glade:9316
+#: gramps.glade:9975
 msgid "Edit the selected attribute"
 msgstr "Rediger den valgte egenskapen"
 
-#: gramps.glade:9344 gramps.glade:13065 gramps.glade:22299 gramps.glade:23329
+#: gramps.glade:10003 gramps.glade:14072 gramps.glade:24042 gramps.glade:25151
 msgid "Delete the selected attribute"
 msgstr "Slett den valgte egenskapen"
 
-#: gramps.glade:9403 gramps.glade:13117 gramps.glade:22364 gramps.glade:23395
+#: gramps.glade:10062 gramps.glade:14124 gramps.glade:24107 gramps.glade:25217
 msgid "Attributes"
 msgstr "Egenskaper"
 
-#: gramps.glade:9438
+#: gramps.glade:10101
 msgid "City/County:"
 msgstr "By/fylke:"
 
-#: gramps.glade:9630
+#: gramps.glade:10325
 msgid "Addresses"
 msgstr "Adresser"
 
-#: gramps.glade:9995
+#: gramps.glade:10741
 msgid "Create a new address"
 msgstr "Lag ny adresse"
 
-#: gramps.glade:10024
+#: gramps.glade:10770
 msgid "Edit the selected address"
 msgstr "Rediger den valgte adressen"
 
-#: gramps.glade:10052
+#: gramps.glade:10798
 msgid "Delete the selected address"
 msgstr "Slett den valgte adressen"
 
-#: gramps.glade:10145
+#: gramps.glade:10895
 msgid "Enter miscellaneous relevant data and documentation"
 msgstr "Skriv inn annen informasjon og dokumentasjon"
 
-#: gramps.glade:10268 gramps.glade:13271 gramps.glade:21989 gramps.glade:23549
+#: gramps.glade:11022 gramps.glade:14286 gramps.glade:23701 gramps.glade:25379
 #: plugins/IndivComplete.py:166 plugins/WebPage.py:567
 msgid "Notes"
 msgstr "Kommentarer"
 
-#: gramps.glade:10326
+#: gramps.glade:11087
 msgid "Add a source"
 msgstr "Legg til kilde"
 
-#: gramps.glade:10353
+#: gramps.glade:11114
 msgid "Edit the selected source"
 msgstr "Rediger den valgte kilden"
 
-#: gramps.glade:10379
+#: gramps.glade:11140
 msgid "Remove the selected source"
 msgstr "Fjern den valgte kilden"
 
-#: gramps.glade:10423 gramps.glade:13423 gramps.glade:15520 gramps.glade:22542
-#: gramps.glade:23771 gramps.glade:25590 gramps.glade:26594 gramps.glade:27962
-#: gramps.glade:29392 plugins/Ancestors.py:159 plugins/IndivComplete.py:324
+#: gramps.glade:11184 gramps.glade:14445 gramps.glade:16716 gramps.glade:24292
+#: gramps.glade:25615 gramps.glade:27544 gramps.glade:28594 gramps.glade:30047
+#: gramps.glade:31576 plugins/Ancestors.py:159 plugins/IndivComplete.py:324
 #: plugins/ScratchPad.py:153 plugins/ScratchPad.py:293
 #: plugins/ScratchPad.py:326 plugins/WebPage.py:224
 msgid "Sources"
 msgstr "Kilder"
 
-#: gramps.glade:10573
+#: gramps.glade:11338
 msgid "Remove the selected object from this gallery only"
 msgstr "Fjern det valgte objektet fra kun dette galleriet"
 
-#: gramps.glade:10656 gramps.glade:15766
+#: gramps.glade:11425 gramps.glade:16970
 msgid "Web address:"
 msgstr "Nettadresse:"
 
-#: gramps.glade:10751 gramps.glade:15861
+#: gramps.glade:11536 gramps.glade:17081
 msgid "Internet addresses"
 msgstr "Internett-adresser"
 
-#: gramps.glade:10822
+#: gramps.glade:11614
 msgid "Add an internet reference about this person"
 msgstr "Legg til en internett-henvisning om denne personen"
 
-#: gramps.glade:10851
+#: gramps.glade:11643
 msgid "Edit the selected internet address"
 msgstr "Rediger den valgte internettadressen"
 
-#: gramps.glade:10878
+#: gramps.glade:11670
 msgid "Go to this web page"
 msgstr "G til denne nettadressen"
 
-#: gramps.glade:10907
+#: gramps.glade:11699
 msgid "Delete selected reference"
 msgstr "Slett den valgte henvisningen"
 
-#: gramps.glade:10959 gramps.glade:16075
+#: gramps.glade:11751 gramps.glade:17302
 msgid "Internet"
 msgstr "Internett"
 
-#: gramps.glade:10988
+#: gramps.glade:11784
 msgid "LDS baptism"
 msgstr "SDH-dp"
 
-#: gramps.glade:11037
+#: gramps.glade:11841
 msgid "LDS _temple:"
 msgstr "SDH-_tempel:"
 
-#: gramps.glade:11065 gramps.glade:11279 gramps.glade:11368 gramps.glade:13740
+#: gramps.glade:11873 gramps.glade:12107 gramps.glade:12204 gramps.glade:14786
 msgid "Sources..."
 msgstr "Kilder ..."
 
-#: gramps.glade:11134 gramps.glade:11299 gramps.glade:11437 gramps.glade:13760
+#: gramps.glade:11946 gramps.glade:12127 gramps.glade:12277 gramps.glade:14806
 msgid "Note..."
 msgstr "Kommentar ..."
 
-#: gramps.glade:11153
+#: gramps.glade:11965
 msgid "Endowment"
 msgstr "Begavelse"
 
-#: gramps.glade:11205
+#: gramps.glade:12025
 msgid "LDS te_mple:"
 msgstr "SDH-te_mpel:"
 
-#: gramps.glade:11229 gramps.glade:17568
+#: gramps.glade:12053 gramps.glade:18925
 msgid "P_lace:"
 msgstr "St_ed:"
 
-#: gramps.glade:11318 gramps.glade:29067
+#: gramps.glade:12146 gramps.glade:31240
 msgid "Dat_e:"
 msgstr "_Dato:"
 
-#: gramps.glade:11343
+#: gramps.glade:12175
 msgid "LD_S temple:"
 msgstr "_SDH-tempel:"
 
-#: gramps.glade:11387
+#: gramps.glade:12223
 msgid "Pla_ce:"
 msgstr "_Sted:"
 
-#: gramps.glade:11456
+#: gramps.glade:12296
 msgid "Pa_rents:"
 msgstr "Fo_reldrene:"
 
-#: gramps.glade:11481
+#: gramps.glade:12325
 msgid "Sealed to parents"
 msgstr "Bundet til foreldre"
 
-#: gramps.glade:11788 gramps.glade:13894
+#: gramps.glade:12650 gramps.glade:14947
 msgid "LDS"
 msgstr "SDH"
 
-#: gramps.glade:11978
+#: gramps.glade:12853
 msgid "_GRAMPS ID:"
 msgstr "_GRAMPS ID:"
 
-#: gramps.glade:12042 gramps.glade:14569
+#: gramps.glade:12923 gramps.glade:15675
 msgid "Last Changed:"
 msgstr "Sist endret:"
 
-#: gramps.glade:12351
+#: gramps.glade:13276
 msgid "Events"
 msgstr "Hendelser"
 
-#: gramps.glade:12586
+#: gramps.glade:13546
 msgid "Add new event for this marriage"
 msgstr "Legg til en ny hendelse for dette ekteskapet"
 
-#: gramps.glade:12640
+#: gramps.glade:13600
 msgid "Delete selected event"
 msgstr "Slett den valgte hendelsen"
 
-#: gramps.glade:13011
+#: gramps.glade:14018
 msgid "Create a new attribute for this marriage"
 msgstr "Lag en ny egenskap for dette ekteskapet"
 
-#: gramps.glade:13540
+#: gramps.glade:14566
 msgid "Edit the properties of the selected objects"
 msgstr "Endre egenskapene til det valgte objektet"
 
-#: gramps.glade:13643
+#: gramps.glade:14673
 msgid "Sealed to spouse"
 msgstr "Bundet til en ektefelle"
 
-#: gramps.glade:13691
+#: gramps.glade:14729
 msgid "Temple:"
 msgstr "Tempel:"
 
-#: gramps.glade:14087
+#: gramps.glade:15153
 msgid "C_ity:"
 msgstr "_By:"
 
-#: gramps.glade:14115 gramps.glade:26987
+#: gramps.glade:15185 gramps.glade:29016
 msgid "_State:"
 msgstr "_Stat:"
 
-#: gramps.glade:14143 gramps.glade:26930
-msgid "C_ounty:"
-msgstr "_Fylke:"
-
-#: gramps.glade:14171
-msgid "Co_untry:"
+#: gramps.glade:15217
+#, fuzzy
+msgid "Co_unty:"
 msgstr "Lan_d:"
 
-#: gramps.glade:14199
+#: gramps.glade:15249
+#, fuzzy
+msgid "Count_ry:"
+msgstr "Land:"
+
+#: gramps.glade:15281
 msgid "_Longitude:"
 msgstr "_Lengdegrad:"
 
-#: gramps.glade:14227
+#: gramps.glade:15313
 msgid "L_atitude:"
 msgstr "_Breddegrad:"
 
-#: gramps.glade:14255 gramps.glade:27016
+#: gramps.glade:15345 gramps.glade:29049
 msgid "Church _parish:"
 msgstr "Kirkes_ogn:"
 
-#: gramps.glade:14477 gramps.glade:17203 gramps.glade:27528
+#: gramps.glade:15575 gramps.glade:18532 gramps.glade:29598
 msgid "_ZIP/Postal code:"
 msgstr "Post_nummer:"
 
-#: gramps.glade:14523 gramps.glade:27150 gramps.glade:27705
-msgid "P_hone:"
-msgstr "_Telefon:"
+#: gramps.glade:15625
+#, fuzzy
+msgid "Phon_e:"
+msgstr "Telefon:"
 
-#: gramps.glade:14658
+#: gramps.glade:15776
 msgid "County:"
 msgstr "Fylke:"
 
-#: gramps.glade:14706
+#: gramps.glade:15832
 msgid "State:"
 msgstr "Stat:"
 
-#: gramps.glade:14754
+#: gramps.glade:15888
 msgid "Church parish:"
 msgstr "Kirkesogn:"
 
-#: gramps.glade:14855
+#: gramps.glade:16005
 msgid "Zip/Postal code:"
 msgstr "Postnummer:"
 
-#: gramps.glade:14927
+#: gramps.glade:16089
 msgid "Other names"
 msgstr "Andre navn"
 
-#: gramps.glade:15188
+#: gramps.glade:16369
 msgid "Other names"
 msgstr "Andre navn"
 
-#: gramps.glade:16162
+#: gramps.glade:17397
 msgid "GRAMPS Preferences"
 msgstr "GRAMPS-innstillinger"
 
-#: gramps.glade:16234
+#: gramps.glade:17470
 msgid "Categories:"
 msgstr "Kategorier:"
 
-#: gramps.glade:16349
+#: gramps.glade:17592
 msgid "To change your preferences, select one of the subcategories in the menu on the left hand side of the window."
 msgstr "For  endre innstillingene, velg en av underkategoriene i menyen p venstre side i vinduet."
 
-#: gramps.glade:16413
+#: gramps.glade:17664
 msgid "Database"
 msgstr "Database"
 
-#: gramps.glade:16438
+#: gramps.glade:17693
 msgid "_Automatically load last database"
 msgstr "Last inn den siste databasen _automatisk "
 
-#: gramps.glade:16459
+#: gramps.glade:17714
 msgid "Family name guessing"
 msgstr "Gjetting av familienavn"
 
-#: gramps.glade:16546
+#: gramps.glade:17811
 msgid "Toolbar"
 msgstr "Verktylinje"
 
-#: gramps.glade:16571
+#: gramps.glade:17840
 msgid "Active person's _relationship to Home Person"
 msgstr "Den aktive personens _relasjon til hjempersonen"
 
-#: gramps.glade:16594
+#: gramps.glade:17863
 msgid "Active person's name and _GRAMPS ID"
 msgstr "Den aktive personens navn og _GRAMPS-ID"
 
-#: gramps.glade:16616
+#: gramps.glade:17885
 msgid "Statusbar"
 msgstr "Statuslinje"
 
-#: gramps.glade:16644
+#: gramps.glade:17917
 msgid ""
 "GNOME settings\n"
 "Icons Only\n"
@@ -5477,169 +5570,169 @@ msgstr ""
 "Tekst under ikoner\n"
 "Tekst ved siden av ikoner"
 
-#: gramps.glade:16709
+#: gramps.glade:17988
 msgid "_Always display the LDS ordinance tabs"
 msgstr "Vis _alltid faneblader med SDH-ordinanser"
 
-#: gramps.glade:16731
+#: gramps.glade:18010
 msgid "Display"
 msgstr "Vis"
 
-#: gramps.glade:16755
+#: gramps.glade:18038
 msgid "Default view"
 msgstr "Standardvisning"
 
-#: gramps.glade:16780
+#: gramps.glade:18067
 msgid "_Person view"
 msgstr "_Personvisning"
 
-#: gramps.glade:16803
+#: gramps.glade:18090
 msgid "_Family view"
 msgstr "_Familievisning"
 
-#: gramps.glade:16825
+#: gramps.glade:18112
 msgid "Family view style"
 msgstr "Stil for familievisning"
 
-#: gramps.glade:16850
+#: gramps.glade:18141
 msgid "Left to right"
 msgstr "Fra venstre til hyre"
 
-#: gramps.glade:16873
+#: gramps.glade:18164
 msgid "Top to bottom"
 msgstr "Ovenfra og ned"
 
-#: gramps.glade:16898
+#: gramps.glade:18189
 msgid "_Display Tip of the Day"
 msgstr "Vis _dagens tips"
 
-#: gramps.glade:16967
+#: gramps.glade:18262
 msgid "_Date format:"
 msgstr "_Datoformat:"
 
-#: gramps.glade:16992
+#: gramps.glade:18291
 msgid "Display formats"
 msgstr "Vis formater"
 
-#: gramps.glade:17078 rule.glade:397
+#: gramps.glade:18387 rule.glade:397
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: gramps.glade:17103
+#: gramps.glade:18416
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: gramps.glade:17128 gramps.glade:26902
+#: gramps.glade:18445 gramps.glade:28919
 msgid "_City:"
 msgstr "_By:"
 
-#: gramps.glade:17153 gramps.glade:27472
+#: gramps.glade:18474 gramps.glade:29534
 msgid "_State/Province:"
 msgstr "_Stat/provins:"
 
-#: gramps.glade:17178
+#: gramps.glade:18503
 msgid "_Country:"
 msgstr "Land:"
 
-#: gramps.glade:17228
+#: gramps.glade:18561
 msgid "_Phone:"
 msgstr "Telefon:"
 
-#: gramps.glade:17253
+#: gramps.glade:18590
 msgid "_Email:"
 msgstr "_E-post:"
 
-#: gramps.glade:17446
+#: gramps.glade:18787
 msgid "Researcher information"
 msgstr "Forskerinformasjon"
 
-#: gramps.glade:17518 gramps.glade:29700
+#: gramps.glade:18867 gramps.glade:31901
 msgid "_Person:"
 msgstr "_Person:"
 
-#: gramps.glade:17543
+#: gramps.glade:18896
 msgid "_Family:"
 msgstr "_Familie:"
 
-#: gramps.glade:17593
+#: gramps.glade:18954
 msgid "_Source:"
 msgstr "_Kilde:"
 
-#: gramps.glade:17618
+#: gramps.glade:18983
 msgid "_Media object:"
 msgstr "_Mediaobjekt:"
 
-#: gramps.glade:17647
+#: gramps.glade:19016
 msgid "I"
 msgstr "I"
 
-#: gramps.glade:17668
+#: gramps.glade:19037
 msgid "F"
 msgstr "F"
 
-#: gramps.glade:17689
+#: gramps.glade:19058
 msgid "P"
 msgstr "P"
 
-#: gramps.glade:17710
+#: gramps.glade:19079
 msgid "S"
 msgstr "S"
 
-#: gramps.glade:17731
+#: gramps.glade:19100
 msgid "O"
 msgstr "O"
 
-#: gramps.glade:17748
+#: gramps.glade:19117
 msgid "GRAMPS ID prefixes"
 msgstr "GRAMPS ID forstavelser"
 
-#: gramps.glade:17957
+#: gramps.glade:19339
 msgid "_Confidence:"
 msgstr "_Troverdighet:"
 
-#: gramps.glade:17982
+#: gramps.glade:19368
 msgid "_Volume/Film/Page:"
 msgstr "_Bind/film/side:"
 
-#: gramps.glade:18035
+#: gramps.glade:19429
 msgid "Te_xt:"
 msgstr "_Tekst:"
 
-#: gramps.glade:18062
+#: gramps.glade:19460
 msgid "Co_mments:"
 msgstr "Ko_mmentarer:"
 
-#: gramps.glade:18089
+#: gramps.glade:19491
 msgid "Publication information:"
 msgstr "Publikasjonsinformasjon:"
 
-#: gramps.glade:18113 mergedata.glade:919 mergedata.glade:941
+#: gramps.glade:19519 mergedata.glade:919 mergedata.glade:941
 #: plugins.glade:362
 msgid "Author:"
 msgstr "Forfatter:"
 
-#: gramps.glade:18209
+#: gramps.glade:19631
 msgid "Source selection"
 msgstr "Valg av kilde"
 
-#: gramps.glade:18233
+#: gramps.glade:19659
 msgid "Source details"
 msgstr "Kildedetaljer"
 
-#: gramps.glade:18372
+#: gramps.glade:19802
 msgid "Creates a new source"
 msgstr "Lager en ny kilde"
 
-#: gramps.glade:18374
+#: gramps.glade:19804
 msgid "_New..."
 msgstr "_Ny ..."
 
-#: gramps.glade:18394 gramps.glade:21784 gramps.glade:25344 gramps.glade:26354
-#: gramps.glade:27557 gramps.glade:28334 gramps.glade:29869
+#: gramps.glade:19824 gramps.glade:23484 gramps.glade:27288 gramps.glade:28344
+#: gramps.glade:29631 gramps.glade:30444 gramps.glade:32078
 msgid "_Private record"
 msgstr "_Private opplysninger"
 
-#: gramps.glade:18469
+#: gramps.glade:19899
 msgid ""
 "Very Low\n"
 "Low\n"
@@ -5653,299 +5746,307 @@ msgstr ""
 "Hy\n"
 "Svrt hy"
 
-#: gramps.glade:18644
+#: gramps.glade:20083
 msgid "Double click will edit the selected source"
 msgstr "Et dobbeltklikk vil pne den valgte kilden for redigering"
 
-#: gramps.glade:19700
+#: gramps.glade:21219
 msgid "Style _name:"
 msgstr "Stil_navn:"
 
-#: gramps.glade:19858 rule.glade:1144
+#: gramps.glade:21392 rule.glade:1144
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: gramps.glade:19887
+#: gramps.glade:21425
 msgid "pt"
 msgstr "punkt"
 
-#: gramps.glade:19914 gramps.glade:20222
+#: gramps.glade:21456 gramps.glade:21788
 msgid "Pick a color"
 msgstr "Velg en farge"
 
-#: gramps.glade:19953
+#: gramps.glade:21495
 msgid "_Bold"
 msgstr "_Fet"
 
-#: gramps.glade:19975
+#: gramps.glade:21517
 msgid "_Italic"
 msgstr "_Kursiv"
 
-#: gramps.glade:19997
+#: gramps.glade:21539
 msgid "_Underline"
 msgstr "_Understrek"
 
-#: gramps.glade:20018
+#: gramps.glade:21560
 msgid "Type face"
 msgstr "Skrifttype"
 
-#: gramps.glade:20042
+#: gramps.glade:21588
 msgid "Size"
 msgstr "Strrelse"
 
-#: gramps.glade:20066
+#: gramps.glade:21616
 msgid "Color"
 msgstr "Farge"
 
-#: gramps.glade:20140
+#: gramps.glade:21702
 msgid "_Roman (Times, serif)"
 msgstr "_Roman (Times, serif)"
 
-#: gramps.glade:20162
+#: gramps.glade:21724
 msgid "_Swiss (Arial, Helvetica, sans-serif)"
 msgstr "_Swiss (Arial, Helvetica, sans-serif)"
 
-#: gramps.glade:20190
+#: gramps.glade:21752
 msgid "Font options"
 msgstr "Fontvalg"
 
-#: gramps.glade:20238
+#: gramps.glade:21804
 msgid "R_ight:"
 msgstr "_Hyre:"
 
-#: gramps.glade:20266
+#: gramps.glade:21836
 msgid "L_eft:"
 msgstr "_Venstre:"
 
-#: gramps.glade:20294
+#: gramps.glade:21868
 msgid "_Padding:"
 msgstr "_Utfylling:"
 
-#: gramps.glade:20458
+#: gramps.glade:22048
 msgid "_Left"
 msgstr "_Venstre"
 
-#: gramps.glade:20480
+#: gramps.glade:22070
 msgid "_Right"
 msgstr "Hy_re"
 
-#: gramps.glade:20503
+#: gramps.glade:22093
 msgid "_Justify"
 msgstr "_Justert"
 
-#: gramps.glade:20526
+#: gramps.glade:22116
 msgid "_Center"
 msgstr "_Midtstilt"
 
-#: gramps.glade:20548
+#: gramps.glade:22138
 msgid "Background"
 msgstr "Bakgrunn"
 
-#: gramps.glade:20572
+#: gramps.glade:22166
 msgid "Margins"
 msgstr "Marger"
 
-#: gramps.glade:20621
+#: gramps.glade:22223
 msgid "Alignment"
 msgstr "Justering"
 
-#: gramps.glade:20645
+#: gramps.glade:22251
 msgid "Borders"
 msgstr "Kanter"
 
-#: gramps.glade:20670
+#: gramps.glade:22280
 msgid "Le_ft"
 msgstr "_Venstre"
 
-#: gramps.glade:20692
+#: gramps.glade:22302
 msgid "Ri_ght"
 msgstr "_Hyre"
 
-#: gramps.glade:20714
+#: gramps.glade:22324
 msgid "_Top"
 msgstr "_verst"
 
-#: gramps.glade:20736
+#: gramps.glade:22346
 msgid "_Bottom"
 msgstr "_Nederst"
 
-#: gramps.glade:20757
+#: gramps.glade:22367
 msgid "First line"
 msgstr "Frste linje"
 
-#: gramps.glade:20826
+#: gramps.glade:22444
 msgid "I_ndent:"
 msgstr "I_nnrykk:"
 
-#: gramps.glade:20857
+#: gramps.glade:22479
 msgid "Paragraph options"
 msgstr "Avsnittsalternativer"
 
-#: gramps.glade:21143
+#: gramps.glade:22782
 msgid "Internal note"
 msgstr "Internt notat"
 
-#: gramps.glade:21399 gramps.glade:22796
+#: gramps.glade:23055 gramps.glade:24567
 msgid "Object type:"
 msgstr "Objekttype:"
 
-#: gramps.glade:21579
+#: gramps.glade:23259
 msgid "Lower X:"
 msgstr "Nedre X:"
 
-#: gramps.glade:21603
+#: gramps.glade:23287
 msgid "Upper X:"
 msgstr "vre X:"
 
-#: gramps.glade:21627
+#: gramps.glade:23315
 msgid "Upper Y:"
 msgstr "vre Y:"
 
-#: gramps.glade:21651
+#: gramps.glade:23343
 msgid "Lower Y:"
 msgstr "Nedre Y:"
 
-#: gramps.glade:21759
+#: gramps.glade:23455
 msgid "Subsection"
 msgstr "Underseksjon"
 
-#: gramps.glade:21805
+#: gramps.glade:23505
 msgid "Privacy"
 msgstr "Personlighetsgrad"
 
-#: gramps.glade:22044
+#: gramps.glade:23760
 msgid "Global Notes"
 msgstr "Globale notater"
 
-#: gramps.glade:22245
+#: gramps.glade:23988
 msgid "Creates a new object attribute from the above data"
 msgstr "Lager en ny objektegenskap av de ovenstende dataene"
 
-#: gramps.glade:23275
+#: gramps.glade:25097
 msgid "Creates a new attribute from the above data"
 msgstr "Lager en ny egenskap av de ovenstende dataene"
 
-#: gramps.glade:23969
+#: gramps.glade:25827
 msgid "Close _without saving"
 msgstr "Avslutt _uten  lagre"
 
-#: gramps.glade:24095
+#: gramps.glade:25961
 msgid "Do not ask again"
 msgstr "Ikke spr igjen"
 
-#: gramps.glade:24713
+#: gramps.glade:26616
 msgid "Remove object and all references to it from the database"
 msgstr "Fjern objektet og alle henvisningene til det fra databasen"
 
-#: gramps.glade:24758
+#: gramps.glade:26661
 msgid "_Remove Object"
 msgstr "_Slett objektet"
 
-#: gramps.glade:24785
+#: gramps.glade:26692
 msgid "Keep reference to the missing file"
 msgstr "Behold henvisningen til den savnede fila"
 
-#: gramps.glade:24788
+#: gramps.glade:26695
 msgid "_Keep Reference"
 msgstr "_Behold henvisningen"
 
-#: gramps.glade:24799
+#: gramps.glade:26706
 msgid "Select replacement for the missing file"
 msgstr "Velg en erstatning for den savnede fila"
 
-#: gramps.glade:24846
+#: gramps.glade:26753
 msgid "_Select File"
 msgstr "_Velg en fil"
 
-#: gramps.glade:24959
+#: gramps.glade:26878
 msgid "If you check this button, all the missing media files will be automatically treated according to the currently selected option. No further dialogs will be presented for any missing medial files."
 msgstr "Hvis du trykker p denne knappen vil alle manglende mediafiler automatisk bli behandlet i henhold til den valgte instillingen. Ingen flere dialogvinduer vil bli vist for manglende mediafiler."
 
-#: gramps.glade:24961
+#: gramps.glade:26880
 msgid "_Use this selection for all missing media files"
 msgstr "Br_uk dette valget for alle manglende mediafiler"
 
-#: gramps.glade:25022
+#: gramps.glade:26942
 msgid "Close window without changes"
 msgstr "Lukk vinduet uten  lagre endringene"
 
-#: gramps.glade:25123
+#: gramps.glade:27047
 msgid "_Event type:"
 msgstr "H_endelsestype:"
 
-#: gramps.glade:25175
+#: gramps.glade:27107
 msgid "De_scription:"
 msgstr "Be_skrivelse:"
 
-#: gramps.glade:25231
+#: gramps.glade:27171
 msgid "_Cause:"
 msgstr "_Grunn:"
 
-#: gramps.glade:26301
+#: gramps.glade:28283
 msgid "_Attribute:"
 msgstr "Egensk_ap:"
 
-#: gramps.glade:26325
+#: gramps.glade:28311
 msgid "_Value:"
 msgstr "_Verdi:"
 
-#: gramps.glade:26958 gramps.glade:27500
+#: gramps.glade:28951
+msgid "C_ounty:"
+msgstr "_Fylke:"
+
+#: gramps.glade:28983 gramps.glade:29566
 msgid "Cou_ntry:"
 msgstr "La_nd:"
 
-#: gramps.glade:27196
+#: gramps.glade:29187 gramps.glade:29779
+msgid "P_hone:"
+msgstr "_Telefon:"
+
+#: gramps.glade:29237
 msgid "_Zip/Postal code:"
 msgstr "_Postnummer:"
 
-#: gramps.glade:27416
+#: gramps.glade:29470
 msgid "Add_ress:"
 msgstr "Ad_resse:"
 
-#: gramps.glade:27444
+#: gramps.glade:29502
 msgid "_City/County:"
 msgstr "_By/fylke:"
 
-#: gramps.glade:28271
+#: gramps.glade:30373
 msgid "_Web address:"
 msgstr "_Nettadresse:"
 
-#: gramps.glade:28299
+#: gramps.glade:30405
 msgid "_Description:"
 msgstr "_Beskrivelse:"
 
-#: gramps.glade:28580
+#: gramps.glade:30699
 msgid "Suffi_x:"
 msgstr "Etterstave_lse:"
 
-#: gramps.glade:28664
+#: gramps.glade:30795
 msgid "P_rivate record"
 msgstr "P_rivat opplysning"
 
-#: gramps.glade:28685
+#: gramps.glade:30816
 msgid "Family _prefix:"
 msgstr "_Forstavelse:"
 
-#: gramps.glade:28798
+#: gramps.glade:30933
 msgid "P_atronymic:"
 msgstr "_Avstamningsnavn:"
 
-#: gramps.glade:28891
+#: gramps.glade:31037
 msgid "G_roup as:"
 msgstr "G_rupper som:"
 
-#: gramps.glade:28916
+#: gramps.glade:31066
 msgid "_Sort as:"
 msgstr "_Sorter som:"
 
-#: gramps.glade:28943
+#: gramps.glade:31097
 msgid "_Display as:"
 msgstr "_Vis som:"
 
-#: gramps.glade:28970
+#: gramps.glade:31128
 msgid "Name Information"
 msgstr " Navneinformasjon"
 
-#: gramps.glade:29034
+#: gramps.glade:31203
 msgid ""
 "Default (based on locale)\n"
 "Family name, Given name\n"
@@ -5955,7 +6056,7 @@ msgstr ""
 "Etternavn, Fornavn\n"
 "Fornavn, Etternavn"
 
-#: gramps.glade:29052
+#: gramps.glade:31223
 msgid ""
 "Default (based on locale)\n"
 "Given name Family name\n"
@@ -5965,95 +6066,95 @@ msgstr ""
 "Fornavn, Etternavn\n"
 "Etternavn, Fornavn\n"
 
-#: gramps.glade:29178
+#: gramps.glade:31355
 msgid "_Override"
 msgstr "_Overskriv"
 
-#: gramps.glade:29728
+#: gramps.glade:31933
 msgid "_Comment:"
 msgstr "_Kommentar:"
 
-#: gramps.glade:29780
+#: gramps.glade:31989
 msgid "Person is in the _database"
 msgstr "Personen er i _databasen"
 
-#: gramps.glade:29848
+#: gramps.glade:32057
 msgid "Choose a person from the database"
 msgstr "Velg en person fra databasen"
 
-#: gramps.glade:29850
+#: gramps.glade:32059
 msgid "_Select"
 msgstr "_Velg"
 
-#: gramps.glade:29979
+#: gramps.glade:32189
 msgid "_Next"
 msgstr "_Neste"
 
-#: gramps.glade:30038
+#: gramps.glade:32252
 msgid "_Display on startup"
 msgstr "_Vis ved oppstart"
 
-#: gramps.glade:30101
+#: gramps.glade:32319
 msgid "Gramps' Tip of the Day"
 msgstr "Dagens tips for GRAMPS"
 
-#: gramps.glade:30134
+#: gramps.glade:32356
 msgid "GRAMPS - Loading Database"
 msgstr "GRAMPS - Laster inn databasen"
 
-#: gramps.glade:30159
+#: gramps.glade:32382
 msgid "Loading database"
 msgstr " Laster inn databasen"
 
-#: gramps.glade:30183
+#: gramps.glade:32410
 msgid "GRAMPS is loading the database you selected. Please wait."
 msgstr "GRAMPS laster inn databasen du valgte. Vennligst vent."
 
-#: gramps.glade:30366
+#: gramps.glade:32606
 msgid "Calenda_r:"
 msgstr "Kalende_r:"
 
-#: gramps.glade:30416
+#: gramps.glade:32662
 msgid "Q_uality"
 msgstr "_Kvalitet"
 
-#: gramps.glade:30458
+#: gramps.glade:32710
 msgid "_Type"
 msgstr "_Type"
 
-#: gramps.glade:30500
+#: gramps.glade:32758
 msgid "Date"
 msgstr "Dato"
 
-#: gramps.glade:30524
+#: gramps.glade:32786
 msgid "_Day"
 msgstr "_Dag"
 
-#: gramps.glade:30549
+#: gramps.glade:32815
 msgid "_Month"
 msgstr "_Mned"
 
-#: gramps.glade:30574
+#: gramps.glade:32844
 msgid "_Year"
 msgstr "_r"
 
-#: gramps.glade:30658
+#: gramps.glade:32934
 msgid "Second date"
 msgstr "Andre dato"
 
-#: gramps.glade:30682
+#: gramps.glade:32962
 msgid "D_ay"
 msgstr "D_ag"
 
-#: gramps.glade:30707
+#: gramps.glade:32991
 msgid "Mo_nth"
 msgstr "M_ned"
 
-#: gramps.glade:30732
+#: gramps.glade:33020
 msgid "Y_ear"
 msgstr "_r"
 
-#: gramps.glade:30829
+#: gramps.glade:33123
 msgid "Te_xt comment:"
 msgstr "_Tekstkommentar:"
 
@@ -6164,28 +6265,30 @@ msgstr "Personer med poster som inneholder..."
 msgid "People with records matching regular expression..."
 msgstr "Personer med poster som passer regulruttrykket ..."
 
-#: gramps_main.py:1074 gramps_main.py:1097
+#: gramps_main.py:1074 gramps_main.py:1086 gramps_main.py:1104
+#: gramps_main.py:1116
 msgid "Cannot merge people."
 msgstr "Kan ikke flette personer."
 
-#: gramps_main.py:1075 gramps_main.py:1098
+#: gramps_main.py:1075 gramps_main.py:1087 gramps_main.py:1105
+#: gramps_main.py:1117
 msgid "Exactly two people must be selected to perform a merge. A second person can be selected by holding down the control key while clicking on the desired person."
 msgstr "Nyaktig to personer m vre valgt for  gjennomfre en fletting. Person nummer to kan bli valgt ved  holde nede Ctrl-tasten samtidig som man klikker p den andre personen."
 
-#: gramps_main.py:1221
+#: gramps_main.py:1235
 msgid "Cannot unpak archive"
 msgstr "Kan ikke pakke ut arkivet"
 
-#: gramps_main.py:1222 plugins/ReadPkg.py:67
+#: gramps_main.py:1236 plugins/ReadPkg.py:67
 msgid "Temporary directory %s is not writable"
 msgstr "Den midlertidige mappa %s er skrivebeskyttet"
 
-#: gramps_main.py:1264 gramps_main.py:1270 gramps_main.py:1291
-#: gramps_main.py:1295 gramps_main.py:1298
+#: gramps_main.py:1278 gramps_main.py:1284 gramps_main.py:1305
+#: gramps_main.py:1309 gramps_main.py:1312
 msgid "Cannot open database"
 msgstr "Kan ikke pne databasen"
 
-#: gramps_main.py:1265
+#: gramps_main.py:1279
 msgid ""
 "The selected file is a directory, not a file.\n"
 "A GRAMPS database must be a file."
@@ -6193,130 +6296,130 @@ msgstr ""
 "Den valgte fila er en mappe, ikke en fil.\n"
 "GRAMPS-databasen m vre en fil."
 
-#: gramps_main.py:1271
+#: gramps_main.py:1285
 msgid "You do not have read access to the selected file."
 msgstr "Du har ikke lesetilgang til den valgte fila."
 
-#: gramps_main.py:1276
+#: gramps_main.py:1290
 msgid "Read only database"
 msgstr "Skrivebeskyttet database"
 
-#: gramps_main.py:1277
+#: gramps_main.py:1291
 msgid "You do not have write access to the selected file."
 msgstr "Du har ikke skrivetilgang til den valgte fila."
 
-#: gramps_main.py:1286
+#: gramps_main.py:1300
 msgid "Read Only"
 msgstr "Skrivebeskyttet"
 
-#: gramps_main.py:1292
+#: gramps_main.py:1306
 msgid "The database file specified could not be opened."
 msgstr "Den angitte databasefila kunne ikke pnes."
 
-#: gramps_main.py:1299
+#: gramps_main.py:1313
 msgid "%s could not be opened."
 msgstr "Klarte ikke  pne %s"
 
-#: gramps_main.py:1358
+#: gramps_main.py:1372
 msgid "Save Media Object"
 msgstr "Lagre mediaobjekt"
 
-#: gramps_main.py:1404 plugins/Check.py:284 plugins/WriteCD.py:255
+#: gramps_main.py:1418 plugins/Check.py:284 plugins/WriteCD.py:255
 #: plugins/WritePkg.py:171
 msgid "Media object could not be found"
 msgstr "Fant ikke mediaobjektet"
 
-#: gramps_main.py:1405 plugins/WriteCD.py:256 plugins/WritePkg.py:172
+#: gramps_main.py:1419 plugins/WriteCD.py:256 plugins/WritePkg.py:172
 msgid "%(file_name)s is referenced in the database, but no longer exists. The file may have been deleted or moved to a different location. You may choose to either remove the reference from the database, keep the reference to the missing file, or select a new file."
 msgstr "%(file_name)s har en (eller flere) henvisning(er) i databasen, men eksisterer ikke lenger. Fila kan ha blitt slettet eller flyttet til et annet sted. Du kan enten slette referansen fra databasen, beholde referansen til den savnede fila, eller velge en ny fil."
 
-#: gramps_main.py:1451
+#: gramps_main.py:1465
 msgid "Deleting the person will remove the person from the database."
 msgstr " slette personen vil fjerne vedkommende fra databasen."
 
-#: gramps_main.py:1455
+#: gramps_main.py:1469
 msgid "_Delete Person"
 msgstr "_Slett en person"
 
-#: gramps_main.py:1519
+#: gramps_main.py:1533
 msgid "Delete Person (%s)"
 msgstr "Slett person (%s)"
 
-#: gramps_main.py:1603
+#: gramps_main.py:1617
 msgid "%(relationship)s of %(person)s"
 msgstr "%(relationship)s til %(person)s"
 
-#: gramps_main.py:1765
+#: gramps_main.py:1779
 msgid "Upgrading database..."
 msgstr "Oppgraderer databasen ..."
 
-#: gramps_main.py:1778
+#: gramps_main.py:1792
 msgid "Setup complete"
 msgstr "Ferdig med oppsett"
 
-#: gramps_main.py:1795
+#: gramps_main.py:1809
 msgid "Loading %s..."
 msgstr "Laster inn %s ..."
 
-#: gramps_main.py:1798
+#: gramps_main.py:1812
 msgid "Opening database..."
 msgstr "pner databasen ..."
 
-#: gramps_main.py:1829
+#: gramps_main.py:1843
 msgid "No Home Person has been set."
 msgstr "Ingen hjemperson er valgt."
 
-#: gramps_main.py:1830
+#: gramps_main.py:1844
 msgid "The Home Person may be set from the Edit menu."
 msgstr "Hjempersonen kan velges via Rediger-menyen."
 
-#: gramps_main.py:1836
+#: gramps_main.py:1850
 msgid "%s has been bookmarked"
 msgstr "%s er lagt til som et bokmerke"
 
-#: gramps_main.py:1839
+#: gramps_main.py:1853
 msgid "Could Not Set a Bookmark"
 msgstr "Klarte ikke  opprette bokmerket"
 
-#: gramps_main.py:1840
+#: gramps_main.py:1854
 msgid "A bookmark could not be set because no one was selected."
 msgstr "Bokmerket kunne ikke lages fordi ingen er valgt."
 
-#: gramps_main.py:1854
+#: gramps_main.py:1868
 msgid "Could not go to a Person"
 msgstr "Kunne ikke g til en person"
 
-#: gramps_main.py:1855
+#: gramps_main.py:1869
 msgid "Either stale bookmark or broken history caused by IDs reorder."
 msgstr "P grunn av omorganiserte ID-er er det enten oppsttt et gammelt bokmerke eller en delagt historie."
 
-#: gramps_main.py:1865
+#: gramps_main.py:1879
 msgid "Set %s as the Home Person"
 msgstr "Angi %s som hjemperson"
 
-#: gramps_main.py:1866
+#: gramps_main.py:1880
 msgid "Once a Home Person is defined, pressing the Home button on the toolbar will make the home person the active person."
 msgstr "S snart en hjemperson er angitt, vil man g til denne personen ved  tykke p Hjem-knappen p verktylinjen."
 
-#: gramps_main.py:1869
+#: gramps_main.py:1883
 msgid "_Set Home Person"
 msgstr "_Velg hjemperson"
 
-#: gramps_main.py:1880
+#: gramps_main.py:1894
 msgid "A person must be selected to export"
 msgstr "Du m ha valgt en person som skal eksporteres"
 
-#: gramps_main.py:1881
+#: gramps_main.py:1895
 msgid "Exporting requires that an active person be selected. Please select a person and try again."
 msgstr "Eksport krever at en aktiv person er valgt. Velg en person og prv igjen."
 
-#: gramps_main.py:1912 gramps_main.py:1916 gramps_main.py:1920
-#: gramps_main.py:1934 gramps_main.py:1936
+#: gramps_main.py:1926 gramps_main.py:1930 gramps_main.py:1934
+#: gramps_main.py:1948 gramps_main.py:1950
 #, fuzzy
 msgid "Could not create example database"
 msgstr "Kunne ikke lage eksempel database"
 
-#: gramps_main.py:1913 gramps_main.py:1917 gramps_main.py:1921
+#: gramps_main.py:1927 gramps_main.py:1931 gramps_main.py:1935
 #, fuzzy
 msgid "The directory ~/.gramps/example could not be created."
 msgstr "Klarte ikke  lage ~/.gramps/example"
@@ -6385,7 +6488,7 @@ msgstr "Forfatterens e-postadresse:"
 #: plugins/AncestorChart.py:245 plugins/AncestorChart2.py:499
 #: plugins/AncestorReport.py:290 plugins/Ancestors.py:909
 #: plugins/Ancestors.py:925 plugins/Ancestors.py:931 plugins/DesGraph.py:333
-#: plugins/DetAncestralReport.py:520 plugins/FamilyGroup.py:514
+#: plugins/DetAncestralReport.py:520 plugins/FamilyGroup.py:515
 #: plugins/FanChart.py:299 plugins/FtmStyleAncestors.py:390
 #: plugins/FtmStyleAncestors.py:395 plugins/FtmStyleAncestors.py:400
 #: plugins/FtmStyleAncestors.py:405 plugins/FtmStyleDescendants.py:536
@@ -6413,7 +6516,7 @@ msgstr "Slektstavle"
 #: plugins/AncestorReport.py:306 plugins/Ancestors.py:968
 #: plugins/BookReport.py:1117 plugins/CountAncestors.py:122
 #: plugins/DescendReport.py:198 plugins/DetAncestralReport.py:618
-#: plugins/DetDescendantReport.py:639 plugins/FamilyGroup.py:548
+#: plugins/DetDescendantReport.py:639 plugins/FamilyGroup.py:549
 #: plugins/FtmStyleAncestors.py:422 plugins/FtmStyleDescendants.py:572
 #: plugins/GraphViz.py:971 plugins/GraphViz.py:985
 #: plugins/IndivComplete.py:595 plugins/IndivSummary.py:391
@@ -6520,7 +6623,7 @@ msgstr ", og ble begravd i %s."
 
 #: plugins/AncestorReport.py:276 plugins/Ancestors.py:894
 #: plugins/DescendReport.py:174 plugins/DetAncestralReport.py:484
-#: plugins/DetDescendantReport.py:505 plugins/FamilyGroup.py:505
+#: plugins/DetDescendantReport.py:505 plugins/FamilyGroup.py:506
 #: plugins/FtmStyleAncestors.py:375 plugins/FtmStyleDescendants.py:521
 #: plugins/IndivComplete.py:552 plugins/IndivSummary.py:348
 #: plugins/SimpleBookTitle.py:265 plugins/StatisticsChart.py:812
@@ -7036,7 +7139,7 @@ msgid "Descendant Graph"
 msgstr "Slektstre over etterkommere"
 
 #: plugins/DesGraph.py:349 plugins/FanChart.py:325
-#: plugins/StatisticsChart.py:958
+#: plugins/StatisticsChart.py:963
 msgid "Alpha"
 msgstr "Alfa"
 
@@ -7225,35 +7328,35 @@ msgstr "Sammenlign individuelle hendelser"
 msgid "Aids in the analysis of data by allowing the development of custom filters that can be applied to the database to find similar events"
 msgstr "Hjelper til med  analysere data ved  la deg lage egne filtre. Disse kan brukes p databasen for  finne hendelser som ligner p hverandre."
 
-#: plugins/ExportVCalendar.py:54
+#: plugins/ExportVCalendar.py:55
 msgid "Export to vCalendar"
 msgstr "Eksporter til vCalendar"
 
-#: plugins/ExportVCalendar.py:199
+#: plugins/ExportVCalendar.py:209
 msgid "Marriage of %s"
 msgstr "Ekteskap til %s"
 
-#: plugins/ExportVCalendar.py:217 plugins/ExportVCalendar.py:219
+#: plugins/ExportVCalendar.py:227 plugins/ExportVCalendar.py:229
 msgid "Birth of %s"
 msgstr "Fdsel til %s"
 
-#: plugins/ExportVCalendar.py:228 plugins/ExportVCalendar.py:230
+#: plugins/ExportVCalendar.py:238 plugins/ExportVCalendar.py:240
 msgid "Death of %s"
 msgstr "Ddsfall til %s"
 
-#: plugins/ExportVCalendar.py:283
+#: plugins/ExportVCalendar.py:293
 msgid "Anniversary: %s"
 msgstr "Jubileum: %s"
 
-#: plugins/ExportVCalendar.py:310
+#: plugins/ExportVCalendar.py:320
 msgid "vCalendar"
 msgstr "vCalendar"
 
-#: plugins/ExportVCalendar.py:311
+#: plugins/ExportVCalendar.py:321
 msgid "vCalendar is used in many calendaring and pim applications."
 msgstr "vCalendar brukes av mange kalendere og sjette sans-programmer."
 
-#: plugins/ExportVCalendar.py:312
+#: plugins/ExportVCalendar.py:322
 msgid "vCalendar export options"
 msgstr "vCalender eksportvalg"
 
@@ -7261,15 +7364,15 @@ msgstr "vCalender eksportvalg"
 msgid "Export to vCard"
 msgstr "Eksporter til vCard"
 
-#: plugins/ExportVCard.py:234
+#: plugins/ExportVCard.py:243
 msgid "vCard"
 msgstr "vCard"
 
-#: plugins/ExportVCard.py:235
+#: plugins/ExportVCard.py:244
 msgid "vCard is used in many addressbook and pim applications."
 msgstr "vCard brukes av mange adressebok og sjette sans-programmer."
 
-#: plugins/ExportVCard.py:236
+#: plugins/ExportVCard.py:245
 msgid "vCard export options"
 msgstr "vCard eksportvalg"
 
@@ -7281,19 +7384,19 @@ msgstr "Ektemann"
 msgid "Wife"
 msgstr "Kone"
 
-#: plugins/FamilyGroup.py:383 plugins/FamilyGroup.py:547
+#: plugins/FamilyGroup.py:383 plugins/FamilyGroup.py:548
 msgid "Family Group Report"
 msgstr "Familierapport"
 
-#: plugins/FamilyGroup.py:523
+#: plugins/FamilyGroup.py:524
 msgid "The style used for the text related to the children."
 msgstr "Stil som blir brukt p tekst som henviser til barna"
 
-#: plugins/FamilyGroup.py:532
+#: plugins/FamilyGroup.py:533
 msgid "The style used for the parent's name"
 msgstr "Stil som blir brukt p foreldrenes navn"
 
-#: plugins/FamilyGroup.py:551
+#: plugins/FamilyGroup.py:552
 msgid "Creates a family group report, showing information on a set of parents and their children."
 msgstr "Lager en familierapport som viser informasjon om et foreldrepar og deres barn."
 
@@ -8228,58 +8331,58 @@ msgstr "Kryss av for 
 msgid "Sort in reverse order"
 msgstr "Sorter i motsatt rekkeflge"
 
-#: plugins/StatisticsChart.py:877
+#: plugins/StatisticsChart.py:881
 msgid "Select year range within which people need to be born to be selected for statistics."
 msgstr "Velg rsmellomrom for nr personer skal vre fdt."
 
-#: plugins/StatisticsChart.py:878
+#: plugins/StatisticsChart.py:882
 msgid "People born between"
 msgstr "Personer fdt mellom"
 
-#: plugins/StatisticsChart.py:882
+#: plugins/StatisticsChart.py:886
 #, fuzzy
 msgid "Check this if you want people who have no known birth date or year to be accounted also in the statistics."
 msgstr "Kryss av denne for  inkludere personer uten fdselsdato eller r i statistikken."
 
-#: plugins/StatisticsChart.py:883
+#: plugins/StatisticsChart.py:887
 #, fuzzy
 msgid "Include people without known birth years"
 msgstr "Ta med personer uten fdselsr"
 
-#: plugins/StatisticsChart.py:895
+#: plugins/StatisticsChart.py:899
 msgid "Select which genders are included into statistics."
 msgstr "Velg hvilke kjnn som skal tas med i statistikken."
 
-#: plugins/StatisticsChart.py:896
+#: plugins/StatisticsChart.py:900
 msgid "Genders included"
 msgstr "Inkluderte kjnn"
 
-#: plugins/StatisticsChart.py:899
+#: plugins/StatisticsChart.py:903
 msgid "With fewer items pie chart and legend will be used instead of a bar chart."
 msgstr "Med frre elementer vil et kakediagram med forklaringer bli brukt i stedet for stolpediagram."
 
-#: plugins/StatisticsChart.py:902
+#: plugins/StatisticsChart.py:907
 msgid "Max. items for a pie"
 msgstr ""
 
-#: plugins/StatisticsChart.py:921
+#: plugins/StatisticsChart.py:926
 msgid "Mark checkboxes to add charts with indicated data"
 msgstr "Kryss av i sjekkboksene for  legge til diagrammer med valgte data"
 
-#: plugins/StatisticsChart.py:922 plugins/StatisticsChart.py:927
+#: plugins/StatisticsChart.py:927 plugins/StatisticsChart.py:932
 #, fuzzy
 msgid "Chart Selection"
 msgstr "Rapport valg"
 
-#: plugins/StatisticsChart.py:926
+#: plugins/StatisticsChart.py:931
 msgid "Note that both biological and adopted children are taken into account."
 msgstr "Merk at bde biologiske og adopterte barn blir regnet med."
 
-#: plugins/StatisticsChart.py:957
+#: plugins/StatisticsChart.py:962
 msgid "Statistics Chart"
 msgstr "Statistikkdiagram"
 
-#: plugins/StatisticsChart.py:961
+#: plugins/StatisticsChart.py:966
 #, fuzzy
 msgid "Generates statistical bar and pie charts of the people in the database."
 msgstr "Lager statistiske stolpe- og kake-diagrammer over personene i databasen."
@@ -8920,31 +9023,31 @@ msgstr "Eksporter til CD (p_ortable XML)"
 msgid "Exporting to CD copies all your data and media object files to the CD Creator. You may later burn the CD with this data, and that copy will be completely portable across different machines and binary architectures."
 msgstr "Eksport til CD vil kopiere alle dine data og mediaobjektfiler til CD-lageren. Du kan senere brenne CD-en med disse dataene, og kopien vil vre kompatibel med forskjellige maskiner og binre arkitekturer."
 
-#: plugins/WriteFtree.py:273
+#: plugins/WriteFtree.py:281
 msgid "_Web Family Tree"
 msgstr "_Web Family Tree"
 
-#: plugins/WriteFtree.py:274
+#: plugins/WriteFtree.py:282
 msgid "Web Family Tree format."
 msgstr "Web Family Tree-format."
 
-#: plugins/WriteFtree.py:275
+#: plugins/WriteFtree.py:283
 msgid "Web Family Tree export options"
 msgstr "Web Family Tree-eksportvalg"
 
-#: plugins/WriteGeneWeb.py:218
+#: plugins/WriteGeneWeb.py:227
 msgid "No families matched by selected filter"
 msgstr "Sket ga ingen familier med dette filteret"
 
-#: plugins/WriteGeneWeb.py:577
+#: plugins/WriteGeneWeb.py:586
 msgid "G_eneWeb"
 msgstr "G_eneWeb"
 
-#: plugins/WriteGeneWeb.py:578
+#: plugins/WriteGeneWeb.py:587
 msgid "GeneWeb is a web based genealogy program."
 msgstr "GeneWeb er et nettbasert slektsforskningsprogram."
 
-#: plugins/WriteGeneWeb.py:579
+#: plugins/WriteGeneWeb.py:588
 msgid "GeneWeb export options"
 msgstr "GeneWeb-eksportvalg"
 
@@ -9286,6 +9389,14 @@ msgstr "Valgte regel"
 msgid "Values"
 msgstr "Verdier"
 
+#, fuzzy
+#~ msgid "Added person is not visible"
+#~ msgstr "Personen som ble lagt til er ikke synlig"
+
+#, fuzzy
+#~ msgid "The person you added is currently not visible due to the chosen filter. This may occur if you did not specify a birth date."
+#~ msgstr "Personen du la til er for tiden ikke synlig grunnet det aktive filteret. Dette kan oppst hvis du ikke spesifiserte en fdselsdato."
+
 #~ msgid "Month Day, Year"
 #~ msgstr "Mned Dag, r"
 
diff --git a/gramps2/src/po/ru.po b/gramps2/src/po/ru.po
index a82985f87..0cd8e13aa 100644
--- a/gramps2/src/po/ru.po
+++ b/gramps2/src/po/ru.po
@@ -6,15 +6,15 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: gramps 2.0.0\n"
+"Project-Id-Version: gramps 2.0.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: Wed Jun  1 09:58:59 2005\n"
+"POT-Creation-Date: Thu Jun 23 14:11:42 2005\n"
 "PO-Revision-Date: 2005-06-02 16:01-0500\n"
 "Last-Translator: Alexander Roitman \n"
 "Language-Team: Russian \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
 
 #: AddMedia.py:91 ImageSelect.py:120
 msgid "Select a media object"
@@ -32,17 +32,17 @@ msgstr "Указанный файл не найден."
 msgid "Add Media Object"
 msgstr "Добавить Документ"
 
-#: AddSpouse.py:115
+#: AddSpouse.py:114
 msgid "Choose Spouse/Partner of %s"
 msgstr "Выбрать супруга/партнёра для %s"
 
-#: AddSpouse.py:120
+#: AddSpouse.py:119
 msgid "Choose Spouse/Partner"
 msgstr "Выбрать супруга/партнёра"
 
-#: AddSpouse.py:161 ChooseParents.py:230 EditPerson.py:338 EditSource.py:305
-#: FamilyView.py:74 ImageSelect.py:1102 PeopleView.py:58 PeopleView.py:148
-#: SelectChild.py:124 SelectPerson.py:78 plugins/BookReport.py:631
+#: AddSpouse.py:142 ChooseParents.py:252 EditPerson.py:338 EditSource.py:312
+#: FamilyView.py:74 ImageSelect.py:1104 PeopleView.py:58 PeopleView.py:134
+#: SelectChild.py:129 SelectPerson.py:78 plugins/BookReport.py:631
 #: plugins/FilterEditor.py:459 plugins/IndivComplete.py:405
 #: plugins/IndivSummary.py:226 plugins/PatchNames.py:191 plugins/RelCalc.py:95
 #: plugins/ScratchPad.py:154 plugins/ScratchPad.py:195
@@ -54,31 +54,31 @@ msgstr "Выбрать супруга/партнёра"
 msgid "Name"
 msgstr "Имя"
 
-#: AddSpouse.py:166 ChooseParents.py:236 EditSource.py:305 FamilyView.py:73
-#: ImageSelect.py:1102 MediaView.py:58 MergePeople.py:107 PeopleView.py:59
-#: PlaceView.py:50 SelectChild.py:129 SelectObject.py:85 SelectPerson.py:84
+#: AddSpouse.py:146 ChooseParents.py:261 EditSource.py:312 FamilyView.py:73
+#: ImageSelect.py:1104 MediaView.py:58 MergePeople.py:107 PeopleView.py:59
+#: PlaceView.py:50 SelectChild.py:134 SelectObject.py:85 SelectPerson.py:84
 #: SourceView.py:52 Sources.py:108 Sources.py:242 Witness.py:64
 #: plugins/PatchNames.py:182 plugins/RelCalc.py:95
 msgid "ID"
 msgstr "ID"
 
-#: AddSpouse.py:171 ChooseParents.py:242 SelectChild.py:134 SelectPerson.py:90
+#: AddSpouse.py:150 ChooseParents.py:271 SelectChild.py:139 SelectPerson.py:90
 msgid "Birth date"
 msgstr "Дата рождения"
 
-#: AddSpouse.py:254 AddSpouse.py:279
+#: AddSpouse.py:232 AddSpouse.py:257
 msgid "Error adding a spouse"
 msgstr "Ошибка при добавлении супруга"
 
-#: AddSpouse.py:255
+#: AddSpouse.py:233
 msgid "A person cannot be linked as his/her spouse"
 msgstr "Лицо не может быть своим супругом"
 
-#: AddSpouse.py:263
+#: AddSpouse.py:241
 msgid "Spouse is a parent"
 msgstr "Супруг является родителем"
 
-#: AddSpouse.py:264
+#: AddSpouse.py:242
 msgid ""
 "The person selected as a spouse is a parent of the active person. Usually, "
 "this is a mistake. You may choose either to proceed with adding a spouse, or "
@@ -88,24 +88,24 @@ msgstr ""
 "Обычно это происходит по ошибке. Вы можете продолжить добавление супруга или "
 "вернуться к диалогу выбора супруга, чтобы исправить ошибку."
 
-#: AddSpouse.py:268 AddSpouse.py:289
+#: AddSpouse.py:246 AddSpouse.py:267
 msgid "Proceed with adding"
 msgstr "Продолжить добавление"
 
-#: AddSpouse.py:268 AddSpouse.py:289
+#: AddSpouse.py:246 AddSpouse.py:267
 msgid "Return to dialog"
 msgstr "Вернуться к диалогу"
 
-#: AddSpouse.py:280
+#: AddSpouse.py:258
 msgid "The spouse is already present in this family"
 msgstr "Этот супруг уже добавлен в эту семью"
 
 # !!!FIXME!!!
-#: AddSpouse.py:284
+#: AddSpouse.py:262
 msgid "Spouse is a child"
 msgstr "Супруг является ребёнком"
 
-#: AddSpouse.py:285
+#: AddSpouse.py:263
 msgid ""
 "The person selected as a spouse is a child of the active person. Usually, "
 "this is a mistake. You may choose either to proceed with adding a spouse, or "
@@ -115,10 +115,21 @@ msgstr ""
 "это происходит по ошибке. Вы можете продолжить добавление супруга или "
 "вернуться к диалогу выбора супруга, чтобы исправить ошибку."
 
-#: AddSpouse.py:315 FamilyView.py:725
+#: AddSpouse.py:293 FamilyView.py:725
 msgid "Add Spouse"
 msgstr "Добавить Супруга"
 
+#: AddSpouse.py:392 ChooseParents.py:811 GenericFilter.py:132
+#: GenericFilter.py:147 GenericFilter.py:263 GenericFilter.py:277
+#: GenericFilter.py:300 GenericFilter.py:323 GenericFilter.py:338
+#: GenericFilter.py:353 GenericFilter.py:979 GenericFilter.py:1223
+#: GenericFilter.py:1247 GenericFilter.py:1276 GenericFilter.py:1308
+#: GenericFilter.py:1325 GenericFilter.py:1346 GenericFilter.py:1429
+#: GenericFilter.py:1483 GenericFilter.py:1545 GenericFilter.py:1564
+#: GenericFilter.py:1634 GenericFilter.py:1801 SelectChild.py:305
+msgid "General filters"
+msgstr "Общие фильтры"
+
 #: AddrEdit.py:106 AddrEdit.py:174
 msgid "Address Editor"
 msgstr "Редактор адресов"
@@ -177,7 +188,7 @@ msgstr "Редактор атрибутов для %s"
 msgid "New Attribute"
 msgstr "Новый Атрибут"
 
-#: AttrEdit.py:175 EditPerson.py:326 ImageSelect.py:682 ImageSelect.py:952
+#: AttrEdit.py:175 EditPerson.py:326 ImageSelect.py:682 ImageSelect.py:954
 #: Marriage.py:214 plugins/ScratchPad.py:273 plugins/ScratchPad.py:281
 msgid "Attribute"
 msgstr "Атрибут"
@@ -198,74 +209,87 @@ msgstr ""
 msgid "Edit Bookmarks"
 msgstr "Редактор закладок"
 
-#: ChooseParents.py:121
+#: ChooseParents.py:129 ChooseParents.py:130
+#, fuzzy
+msgid "Loading..."
+msgstr "Загружаю %s..."
+
+#: ChooseParents.py:133
 msgid "Choose the Parents of %s"
 msgstr "Выбрать родителей для %s"
 
-#: ChooseParents.py:123 ChooseParents.py:268 ChooseParents.py:510
-#: ChooseParents.py:593
+#: ChooseParents.py:135 ChooseParents.py:300 ChooseParents.py:572
+#: ChooseParents.py:659
 msgid "Choose Parents"
 msgstr "Выбрать родителей"
 
-#: ChooseParents.py:304 ChooseParents.py:648
+#: ChooseParents.py:366 ChooseParents.py:714
 msgid "Par_ent"
 msgstr "Родит_ель"
 
-#: ChooseParents.py:306
+#: ChooseParents.py:368
 msgid "Fath_er"
 msgstr "От_ец"
 
-#: ChooseParents.py:314 ChooseParents.py:647
+#: ChooseParents.py:376 ChooseParents.py:713
 msgid "Pa_rent"
 msgstr "_Родитель"
 
-#: ChooseParents.py:316
+#: ChooseParents.py:378
 msgid "Mothe_r"
 msgstr "Мат_ь"
 
 # !!!FIXME!!!
-#: ChooseParents.py:502 SelectChild.py:287 SelectChild.py:306
+#: ChooseParents.py:564 SelectChild.py:192 SelectChild.py:211
 msgid "Error selecting a child"
 msgstr "Ошибка выбора ребёнка"
 
-#: ChooseParents.py:503
+#: ChooseParents.py:565
 msgid "A person cannot be linked as his/her own parent"
 msgstr "Лицо не может быть своим родителем"
 
-#: ChooseParents.py:532 ChooseParents.py:545
-msgid "Added person is not visible"
-msgstr "Добавленное лицо не показано"
-
-#: ChooseParents.py:533 ChooseParents.py:546
-msgid ""
-"The person you added is currently not visible due to the chosen filter. This "
-"may occur if you did not specify a birth date."
-msgstr ""
-"Добавленное лицо не показано из-за применённого фильтра. "
-"Это может произойти, если не указана дата рождения."
-
-#: ChooseParents.py:623
+#: ChooseParents.py:689
 msgid "Modify the Parents of %s"
 msgstr "Изменить родителей для %s"
 
-#: ChooseParents.py:624 ChooseParents.py:736
+#: ChooseParents.py:690 ChooseParents.py:802
 msgid "Modify Parents"
 msgstr "Изменить родителей"
 
-#: ChooseParents.py:650 FamilyView.py:1100 MergePeople.py:136
+#: ChooseParents.py:716 FamilyView.py:1112 MergePeople.py:136
 #: plugins/FamilyGroup.py:261 plugins/IndivComplete.py:215
 #: plugins/IndivComplete.py:217 plugins/IndivComplete.py:450
 #: plugins/IndivSummary.py:290 plugins/WebPage.py:340 plugins/WebPage.py:343
 msgid "Mother"
 msgstr "Мать"
 
-#: ChooseParents.py:651 FamilyView.py:1098 MergePeople.py:134
+#: ChooseParents.py:717 FamilyView.py:1110 MergePeople.py:134
 #: plugins/FamilyGroup.py:248 plugins/IndivComplete.py:206
 #: plugins/IndivComplete.py:208 plugins/IndivComplete.py:445
 #: plugins/IndivSummary.py:276 plugins/WebPage.py:339 plugins/WebPage.py:342
 msgid "Father"
 msgstr "Отец"
 
+#: ChooseParents.py:834
+#, fuzzy
+msgid "Likely Father"
+msgstr "Отец"
+
+#: ChooseParents.py:835
+#, fuzzy
+msgid "Matches likely fathers"
+msgstr "Выбирает всех женщин"
+
+#: ChooseParents.py:844
+#, fuzzy
+msgid "Likely Mother"
+msgstr "Мать"
+
+#: ChooseParents.py:845
+#, fuzzy
+msgid "Matches likely mothers"
+msgstr "Выбирает всех мужчин"
+
 #: ColumnOrder.py:40
 msgid "Select Columns"
 msgstr "Выбрать Колонки"
@@ -343,7 +367,7 @@ msgstr "Вычисленно"
 msgid "Date selection"
 msgstr "Выбор даты"
 
-#: DateEdit.py:264 gramps_main.py:1154 gramps_main.py:1161
+#: DateEdit.py:264 gramps_main.py:1168 gramps_main.py:1175
 msgid "Could not open help"
 msgstr "Ошибка открытия справки"
 
@@ -395,7 +419,7 @@ msgstr "Автоматически"
 msgid "Select file _type:"
 msgstr "Выбрать _тип файла:"
 
-#: DbPrompter.py:611 gramps_main.py:1374
+#: DbPrompter.py:611 gramps_main.py:1388
 msgid "All files"
 msgstr "Все файлы"
 
@@ -416,7 +440,7 @@ msgid "GEDCOM files"
 msgstr "Файлы GEDCOM"
 
 #: DisplayModels.py:47 GrampsMime.py:46 GrampsMime.py:53 MergePeople.py:50
-#: PeopleModel.py:381 SelectChild.py:245 Utils.py:123 const.py:169
+#: PeopleModel.py:387 Utils.py:118 const.py:169
 #: plugins/DetAncestralReport.py:308 plugins/DetAncestralReport.py:315
 #: plugins/DetDescendantReport.py:330 plugins/DetDescendantReport.py:337
 #: plugins/FamilyGroup.py:458 plugins/IndivComplete.py:281
@@ -424,19 +448,19 @@ msgstr "Файлы GEDCOM"
 msgid "unknown"
 msgstr "неизвестно"
 
-#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:381 SelectChild.py:241
-#: const.py:167 plugins/RelCalc.py:111
+#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:387 const.py:167
+#: plugins/RelCalc.py:111
 msgid "male"
 msgstr "мужской"
 
-#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:381 SelectChild.py:243
-#: const.py:168 plugins/RelCalc.py:113
+#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:387 const.py:168
+#: plugins/RelCalc.py:113
 msgid "female"
 msgstr "женский"
 
-#: DisplayModels.py:468 ImageSelect.py:981 MediaView.py:243 NoteEdit.py:104
-#: Utils.py:160 gramps.glade:5208 gramps.glade:15342 gramps.glade:25747
-#: gramps.glade:26749 gramps.glade:28117 gramps.glade:29548
+#: DisplayModels.py:468 ImageSelect.py:983 MediaView.py:243 NoteEdit.py:104
+#: Utils.py:155 gramps.glade:5501 gramps.glade:16531 gramps.glade:27709
+#: gramps.glade:28757 gramps.glade:30210 gramps.glade:31740
 msgid "Note"
 msgstr "Комментарий"
 
@@ -458,7 +482,7 @@ msgstr ""
 msgid "Internal Error"
 msgstr "Внутренняя ошибка"
 
-#: EditPerson.py:132 EditPerson.py:634
+#: EditPerson.py:132 EditPerson.py:635
 msgid "Edit Person"
 msgstr "Правка личной информации"
 
@@ -466,12 +490,12 @@ msgstr "Правка личной информации"
 msgid "Patronymic:"
 msgstr "Отчество:"
 
-#: EditPerson.py:306 EditSource.py:325 EventEdit.py:278 ImageSelect.py:1123
+#: EditPerson.py:306 EditSource.py:332 EventEdit.py:278 ImageSelect.py:1125
 #: Marriage.py:213 plugins/ScratchPad.py:166 plugins/ScratchPad.py:180
 msgid "Event"
 msgstr "Событие"
 
-#: EditPerson.py:307 EditPerson.py:344 EditPlace.py:130 const.py:435
+#: EditPerson.py:307 EditPerson.py:344 EditPlace.py:131 const.py:435
 #: plugins/ScratchPad.py:185 plugins/ScratchPad.py:227
 #: plugins/ScratchPad.py:262
 msgid "Description"
@@ -483,21 +507,21 @@ msgstr "Описание"
 msgid "Date"
 msgstr "Дата"
 
-#: EditPerson.py:309 EditPlace.py:271 EditSource.py:331 ImageSelect.py:1129
-#: Marriage.py:213 gramps.glade:12208 plugins/ScratchPad.py:183
+#: EditPerson.py:309 EditPlace.py:289 EditSource.py:338 ImageSelect.py:1131
+#: Marriage.py:213 gramps.glade:13109 plugins/ScratchPad.py:183
 #: plugins/ScratchPad.py:225
 msgid "Place"
 msgstr "Место"
 
-#: EditPerson.py:326 EditSource.py:156 ImageSelect.py:682 ImageSelect.py:952
-#: Marriage.py:214 gramps.glade:12727 plugins/FilterEditor.py:459
+#: EditPerson.py:326 EditSource.py:160 ImageSelect.py:682 ImageSelect.py:954
+#: Marriage.py:214 gramps.glade:13691 plugins/FilterEditor.py:459
 #: plugins/PatchNames.py:188 plugins/ScratchPad.py:284
 #: plugins/ScratchPad.py:317 plugins/ScratchPad.py:543
 #: plugins/ScratchPad.py:549
 msgid "Value"
 msgstr "Значение"
 
-#: EditPerson.py:338 EditSource.py:305 ImageSelect.py:1102 MediaView.py:59
+#: EditPerson.py:338 EditSource.py:312 ImageSelect.py:1104 MediaView.py:59
 #: MergePeople.py:152 SelectObject.py:86 plugins/BookReport.py:631
 #: plugins/BookReport.py:632 plugins/PatchNames.py:185
 #: plugins/ScratchPad.py:181 plugins/ScratchPad.py:223
@@ -507,60 +531,60 @@ msgstr "Значение"
 msgid "Type"
 msgstr "Тип"
 
-#: EditPerson.py:344 EditPlace.py:129 MediaView.py:60
+#: EditPerson.py:344 EditPlace.py:130 MediaView.py:60
 #: plugins/ScratchPad.py:260
 msgid "Path"
 msgstr "Путь"
 
-#: EditPerson.py:566 ImageSelect.py:610 ImageSelect.py:1037 MediaView.py:275
+#: EditPerson.py:567 ImageSelect.py:610 ImageSelect.py:1041 MediaView.py:275
 #: plugins/ScratchPad.py:424 plugins/ScratchPad.py:432
 msgid "Media Object"
 msgstr "Документ"
 
-#: EditPerson.py:572 ImageSelect.py:616 docgen/AbiWord2Doc.py:327
+#: EditPerson.py:573 ImageSelect.py:616 docgen/AbiWord2Doc.py:335
 #: docgen/AsciiDoc.py:371 docgen/HtmlDoc.py:486 docgen/KwordDoc.py:494
 #: docgen/PdfDoc.py:631 docgen/RTFDoc.py:427
 msgid "Open in %s"
 msgstr "Открыть в %s"
 
-#: EditPerson.py:575 ImageSelect.py:619 MediaView.py:288
+#: EditPerson.py:576 ImageSelect.py:619 MediaView.py:288
 msgid "Edit with the GIMP"
 msgstr "Правка в GIMP"
 
-#: EditPerson.py:577 ImageSelect.py:621
+#: EditPerson.py:578 ImageSelect.py:621
 msgid "Edit Object Properties"
 msgstr "Правка свойств"
 
-#: EditPerson.py:628
+#: EditPerson.py:629
 msgid "New Person"
 msgstr "Новое Лицо"
 
-#: EditPerson.py:753 GrampsCfg.py:63 const.py:233 const.py:246
+#: EditPerson.py:754 GrampsCfg.py:63 const.py:233 const.py:246
 msgid "None"
 msgstr "Нет"
 
-#: EditPerson.py:1290
+#: EditPerson.py:1291
 msgid "Save changes to %s?"
 msgstr "Сохранить изменения в %s?"
 
-#: EditPerson.py:1291 EditPerson.py:1307 Marriage.py:622 Marriage.py:635
+#: EditPerson.py:1292 EditPerson.py:1308 Marriage.py:622 Marriage.py:635
 msgid "If you close without saving, the changes you have made will be lost"
 msgstr ""
 "Если вы закроете без сохранения, произведённые изменения будут потеряны"
 
-#: EditPerson.py:1306
+#: EditPerson.py:1307
 msgid "Save Changes to %s?"
 msgstr "Сохранить изменения для %s?"
 
-#: EditPerson.py:1652
+#: EditPerson.py:1653
 msgid "Make the selected name the preferred name"
 msgstr "Сделать выделенное имя предпочитаемым"
 
-#: EditPerson.py:1696
+#: EditPerson.py:1697
 msgid "Unknown gender specified"
 msgstr "Указан неизвестный пол"
 
-#: EditPerson.py:1697
+#: EditPerson.py:1698
 msgid ""
 "The gender of the person is currently unknown. Usually, this is a mistake. "
 "You may choose to either continue saving, or returning to the Edit Person "
@@ -570,19 +594,19 @@ msgstr ""
 "сохранение или вернуться к диалогу правки личной информации, чтобы исправить "
 "ошибку."
 
-#: EditPerson.py:1701
+#: EditPerson.py:1702
 msgid "Continue saving"
 msgstr "Продолжить сохранение"
 
-#: EditPerson.py:1701
+#: EditPerson.py:1702
 msgid "Return to window"
 msgstr "Вернуться к окну"
 
-#: EditPerson.py:1729 Marriage.py:654
+#: EditPerson.py:1730 Marriage.py:654
 msgid "GRAMPS ID value was not changed."
 msgstr "Значение GRAMPS ID не было изменено."
 
-#: EditPerson.py:1730
+#: EditPerson.py:1731
 msgid ""
 "You have attempted to change the GRAMPS ID to a value of %(grampsid)s. This "
 "value is already used by %(person)s."
@@ -590,11 +614,11 @@ msgstr ""
 "Вы попытались изменить GRAMPS ID на %(grampsid)s. Оно уже используется (%"
 "(person)s)."
 
-#: EditPerson.py:1842
+#: EditPerson.py:1843
 msgid "Problem changing the gender"
 msgstr "Проблема при изменении пола"
 
-#: EditPerson.py:1843
+#: EditPerson.py:1844
 msgid ""
 "Changing the gender caused problems with marriage information.\n"
 "Please check the person's marriages."
@@ -602,96 +626,106 @@ msgstr ""
 "Изменение пола привело к конфликту в информации о браках данного лица.\n"
 "Проверьте их."
 
-#: EditPerson.py:1886
+#: EditPerson.py:1887
 msgid "Edit Person (%s)"
 msgstr "Правка личной информации (%s)"
 
-#: EditPerson.py:1902 ImageSelect.py:1162
+#: EditPerson.py:1903 ImageSelect.py:1165
 msgid "Add Place (%s)"
 msgstr "Добавить Место (%s)"
 
-#: EditPlace.py:90 EditPlace.py:277
+#: EditPlace.py:91 EditPlace.py:295
 msgid "Place Editor"
 msgstr "Редактор мест"
 
-#: EditPlace.py:149 PlaceView.py:53
+#: EditPlace.py:150 PlaceView.py:53
 msgid "City"
 msgstr "Город"
 
-#: EditPlace.py:149 PlaceView.py:54
+#: EditPlace.py:150 PlaceView.py:54
 msgid "County"
 msgstr "Область/Район/Уезд"
 
-#: EditPlace.py:150 PlaceView.py:55
+#: EditPlace.py:151 PlaceView.py:55
 msgid "State"
 msgstr "Республика"
 
-#: EditPlace.py:150 PlaceView.py:56
+#: EditPlace.py:151 PlaceView.py:56
 msgid "Country"
 msgstr "Государство/Страна"
 
-#: EditPlace.py:266 EditPlace.py:270
+#: EditPlace.py:284 EditPlace.py:288
 msgid "New Place"
 msgstr "Новое Место"
 
-#: EditPlace.py:400
+#: EditPlace.py:391
+msgid "Place title is already in use"
+msgstr ""
+
+#: EditPlace.py:392
+msgid ""
+"Each place must have a unique title, and title you have selected is already "
+"used by another place"
+msgstr ""
+
+#: EditPlace.py:427
 msgid "Edit Place (%s)"
 msgstr "Правка Места (%s)"
 
-#: EditPlace.py:518
+#: EditPlace.py:546
 msgid "People"
 msgstr "Люди"
 
-#: EditPlace.py:520 EditPlace.py:529
+#: EditPlace.py:548 EditPlace.py:557
 msgid "%s [%s]: event %s\n"
 msgstr "%s [%s]: событие %s\n"
 
-#: EditPlace.py:527
+#: EditPlace.py:555
 msgid "Families"
 msgstr "Семьи"
 
-#: EditPlace.py:535 Utils.py:115
+#: EditPlace.py:563 Utils.py:110
 msgid "%(father)s and %(mother)s"
 msgstr "%(father)s и %(mother)s"
 
-#: EditPlace.py:605 PlaceView.py:221
+#: EditPlace.py:633 PlaceView.py:224
 msgid "Delete Place (%s)"
 msgstr "Удалить Место (%s)"
 
-#: EditSource.py:86 EditSource.py:242
+#: EditSource.py:90 EditSource.py:249
 msgid "Source Editor"
 msgstr "Редактор источников"
 
-#: EditSource.py:156
+#: EditSource.py:160
 msgid "Key"
 msgstr "Ключ"
 
-#: EditSource.py:231 EditSource.py:235 Sources.py:451 Sources.py:453
+#: EditSource.py:238 EditSource.py:242 Sources.py:451 Sources.py:453
 msgid "New Source"
 msgstr "Новый Источник"
 
-#: EditSource.py:236 EditSource.py:337 ImageSelect.py:1135 Utils.py:165
-#: Utils.py:167
+#: EditSource.py:243 EditSource.py:344 ImageSelect.py:1137 Utils.py:160
+#: Utils.py:162
 msgid "Source"
 msgstr "Источник"
 
-#: EditSource.py:313 ImageSelect.py:1111 plugins/EventCmp.py:408
+#: EditSource.py:320 ImageSelect.py:1113 plugins/EventCmp.py:408
 msgid "Person"
 msgstr "Лицо"
 
-#: EditSource.py:319 ImageSelect.py:1117
+#: EditSource.py:326 ImageSelect.py:1119
 msgid "Family"
 msgstr "Семья"
 
-#: EditSource.py:343
+#: EditSource.py:350
 msgid "Media"
 msgstr "Альбом"
 
-#: EditSource.py:397
+#: EditSource.py:404
 msgid "Edit Source (%s)"
 msgstr "Правка Источника (%s)"
 
-#: EditSource.py:463
+#: EditSource.py:471
 msgid "Delete Source (%s)"
 msgstr "Удалить Источник (%s)"
 
@@ -903,22 +937,22 @@ msgstr "Место Смерти"
 
 #: FamilyView.py:395 FamilyView.py:405 FamilyView.py:426 FamilyView.py:433
 #: FamilyView.py:465 FamilyView.py:530 FamilyView.py:536 FamilyView.py:606
-#: FamilyView.py:612 FamilyView.py:1173 FamilyView.py:1179 FamilyView.py:1212
-#: FamilyView.py:1218 PedView.py:561 PedView.py:570 PeopleView.py:308
-#: gramps.glade:821 gramps_main.py:659
+#: FamilyView.py:612 FamilyView.py:1176 FamilyView.py:1182 FamilyView.py:1215
+#: FamilyView.py:1221 PedView.py:564 PedView.py:573 PeopleView.py:301
+#: gramps.glade:822 gramps_main.py:659
 msgid "Home"
 msgstr "Домой"
 
-#: FamilyView.py:396 PeopleView.py:291
+#: FamilyView.py:396 PeopleView.py:284
 msgid "Add Bookmark"
 msgstr "Добавить закладку"
 
 #: FamilyView.py:399 FamilyView.py:429 FamilyView.py:458 FamilyView.py:489
-#: PedView.py:584 PedView.py:595 PeopleView.py:304
+#: PedView.py:587 PedView.py:598 PeopleView.py:297
 msgid "People Menu"
 msgstr "Люди"
 
-#: FamilyView.py:454 FamilyView.py:486 FamilyView.py:1192 FamilyView.py:1231
+#: FamilyView.py:454 FamilyView.py:486 FamilyView.py:1195 FamilyView.py:1234
 msgid "Add parents"
 msgstr "Добавить родителей"
 
@@ -930,7 +964,7 @@ msgstr "Дети"
 msgid "Make the selected child an active person"
 msgstr "Сделать выделенного ребёнка активным лицом"
 
-#: FamilyView.py:548 FamilyView.py:1191 FamilyView.py:1230
+#: FamilyView.py:548 FamilyView.py:1194 FamilyView.py:1233
 msgid "Edit the child/parent relationships"
 msgstr "Правка родственных отношений родителей/детей"
 
@@ -976,19 +1010,19 @@ msgstr "Установть Предпочитаемого Супруга (%s)"
 msgid "Modify family"
 msgstr "Изменить семью"
 
-#: FamilyView.py:800 FamilyView.py:1445 SelectChild.py:85 SelectChild.py:148
+#: FamilyView.py:800 FamilyView.py:1448 SelectChild.py:88 SelectChild.py:153
 msgid "Add Child to Family"
 msgstr "Добавить ребёнка в семью"
 
-#: FamilyView.py:839
+#: FamilyView.py:854
 msgid "Remove Child (%s)"
 msgstr "Удалить Ребёнка (%s)"
 
-#: FamilyView.py:845
+#: FamilyView.py:862
 msgid "Remove %s as a spouse of %s?"
 msgstr "Удалить %s из супругов %s?"
 
-#: FamilyView.py:846
+#: FamilyView.py:863
 msgid ""
 "Removing a spouse removes the relationship between the spouse and the active "
 "person. It does not remove the spouse from the database"
@@ -996,27 +1030,27 @@ msgstr ""
 "Удаление супруга убирает родственные отношения между супругом и активным "
 "лицом. Это не удаляет его из базы данных."
 
-#: FamilyView.py:849
+#: FamilyView.py:866
 msgid "_Remove Spouse"
 msgstr "_Удалить супруга"
 
-#: FamilyView.py:893
+#: FamilyView.py:905
 msgid "Remove Spouse (%s)"
 msgstr "Удалить Супруга (%s)"
 
-#: FamilyView.py:934
+#: FamilyView.py:946
 msgid "Select Parents (%s)"
 msgstr "Выбрать Родителей (%s)"
 
-#: FamilyView.py:1049
+#: FamilyView.py:1061
 msgid ""
 msgstr "<двойной щелчок добавляет супруга>"
 
-#: FamilyView.py:1066
+#: FamilyView.py:1078
 msgid "Database corruption detected"
 msgstr "Обнаружена ошибка в база данных"
 
-#: FamilyView.py:1067
+#: FamilyView.py:1079
 msgid ""
 "A problem was detected with the database. Please run the Check and Repair "
 "Database tool to fix the problem."
@@ -1024,7 +1058,7 @@ msgstr ""
 "Обнаружена ошибка в базе данных. Пожалуйста, запустите инструмент Проверить "
 "и Починить Базу Данных для исправления ошибки."
 
-#: FamilyView.py:1118
+#: FamilyView.py:1130
 msgid ""
 "%s: %s [%s]\n"
 "\tRelationship: %s"
@@ -1032,31 +1066,31 @@ msgstr ""
 "%s: %s [%s]\n"
 "\tОтношение: %s"
 
-#: FamilyView.py:1120
+#: FamilyView.py:1132
 msgid "%s: unknown"
 msgstr "%s: неизвестно"
 
-#: FamilyView.py:1164
+#: FamilyView.py:1167
 msgid "Parents Menu"
 msgstr "Родители"
 
-#: FamilyView.py:1190 FamilyView.py:1229
+#: FamilyView.py:1193 FamilyView.py:1232
 msgid "Make the selected parents the active family"
 msgstr "Сделать выделенных родителей активной семьёй"
 
-#: FamilyView.py:1193 FamilyView.py:1232
+#: FamilyView.py:1196 FamilyView.py:1235
 msgid "Remove parents"
 msgstr "Удалить родителей"
 
-#: FamilyView.py:1203
+#: FamilyView.py:1206
 msgid "Spouse Parents Menu"
 msgstr "Родители супруга"
 
-#: FamilyView.py:1295 FamilyView.py:1310
+#: FamilyView.py:1298 FamilyView.py:1313
 msgid "Remove Parents of %s"
 msgstr "Удалить родителей %s"
 
-#: FamilyView.py:1296 FamilyView.py:1311
+#: FamilyView.py:1299 FamilyView.py:1314
 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 "
@@ -1066,72 +1100,62 @@ msgstr ""
 "Родители остаются в базе данных, и родственные отношения между ними не "
 "изменяются."
 
-#: FamilyView.py:1300 FamilyView.py:1315
+#: FamilyView.py:1303 FamilyView.py:1318
 msgid "_Remove Parents"
 msgstr "_Удалить родителей"
 
-#: FamilyView.py:1408
+#: FamilyView.py:1411
 msgid "Remove Parents (%s)"
 msgstr "Удалить Родителей (%s)"
 
-#: FamilyView.py:1480
+#: FamilyView.py:1483
 msgid "Attempt to Reorder Children Failed"
 msgstr "Попытка упорядочить детей не удалась"
 
-#: FamilyView.py:1481
+#: FamilyView.py:1484
 msgid "Children must be ordered by their birth dates."
 msgstr "Дети должны быть упорядочены по дню рождения."
 
-#: FamilyView.py:1486
+#: FamilyView.py:1489
 msgid "Reorder children"
 msgstr "Упорядочить детей"
 
-#: FamilyView.py:1520
+#: FamilyView.py:1523
 msgid "Reorder spouses"
 msgstr "Упорядочить супругов"
 
-#: GenericFilter.py:90
+#: GenericFilter.py:91
 msgid "Miscellaneous filters"
 msgstr "Разные фильтры"
 
-#: GenericFilter.py:91 rule.glade:1165
+#: GenericFilter.py:92 rule.glade:1165
 msgid "No description"
 msgstr "Нет описания"
 
-#: GenericFilter.py:130
+#: GenericFilter.py:131
 msgid "Everyone"
 msgstr "Все"
 
-#: GenericFilter.py:131 GenericFilter.py:146 GenericFilter.py:263
-#: GenericFilter.py:277 GenericFilter.py:295 GenericFilter.py:312
-#: GenericFilter.py:327 GenericFilter.py:342 GenericFilter.py:969
-#: GenericFilter.py:1218 GenericFilter.py:1243 GenericFilter.py:1273
-#: GenericFilter.py:1306 GenericFilter.py:1324 GenericFilter.py:1346
-#: GenericFilter.py:1431 GenericFilter.py:1489 GenericFilter.py:1554
-#: GenericFilter.py:1574 GenericFilter.py:1645 GenericFilter.py:1810
-msgid "General filters"
-msgstr "Общие фильтры"
-
-#: GenericFilter.py:132
+#: GenericFilter.py:133
 msgid "Matches everyone in the database"
 msgstr "Выбирает всех людей в базе данных"
 
-#: GenericFilter.py:145
+#: GenericFilter.py:146
 msgid "Disconnected people"
 msgstr "Несвязанные лица"
 
-#: GenericFilter.py:147
+#: GenericFilter.py:148
 msgid ""
 "Matches people that have no family relationships to any other person in the "
 "database"
 msgstr ""
 "Выбирает людей, не имеющих семейных связей ни с одним лицом из базы данных"
 
-#: GenericFilter.py:164 GenericFilter.py:260 GenericFilter.py:357
-#: GenericFilter.py:448 GenericFilter.py:492 GenericFilter.py:614
-#: GenericFilter.py:661 GenericFilter.py:759 GenericFilter.py:811
-#: GenericFilter.py:898 gramps.glade:3363 gramps.glade:19187
-#: gramps.glade:21375 gramps.glade:22772 plugins/FilterEditor.py:680
+#: GenericFilter.py:164 GenericFilter.py:260 GenericFilter.py:368
+#: GenericFilter.py:459 GenericFilter.py:502 GenericFilter.py:623
+#: GenericFilter.py:670 GenericFilter.py:768 GenericFilter.py:820
+#: GenericFilter.py:907 gramps.glade:3521 gramps.glade:20666
+#: gramps.glade:23027 gramps.glade:24539 plugins/FilterEditor.py:680
 msgid "ID:"
 msgstr "ID:"
 
@@ -1168,80 +1192,80 @@ msgstr "Лицо по умолчанию"
 msgid "Matches the default person"
 msgstr "Выбирает лицо по умолчанию"
 
-#: GenericFilter.py:294
+#: GenericFilter.py:299
 msgid "Bookmarked people"
 msgstr "Люди с закладками"
 
-#: GenericFilter.py:296
+#: GenericFilter.py:301
 msgid "Matches the people on the bookmark list"
 msgstr "Выбирает людей из списка закладок"
 
-#: GenericFilter.py:311
+#: GenericFilter.py:322
 msgid "People with complete records"
 msgstr "Люди с заполненными записями"
 
-#: GenericFilter.py:313
+#: GenericFilter.py:324
 msgid "Matches all people whose records are complete"
 msgstr "Выбирает всех людей с заполненными записями"
 
-#: GenericFilter.py:326 gramps_main.py:957 plugins/Summary.py:113
+#: GenericFilter.py:337 gramps_main.py:957 plugins/Summary.py:113
 msgid "Females"
 msgstr "Женщины"
 
-#: GenericFilter.py:328
+#: GenericFilter.py:339
 msgid "Matches all females"
 msgstr "Выбирает всех женщин"
 
-#: GenericFilter.py:341 gramps_main.py:967
+#: GenericFilter.py:352 gramps_main.py:967
 msgid "People with unknown gender"
 msgstr "Люди неизвестного пола"
 
-#: GenericFilter.py:343
+#: GenericFilter.py:354
 msgid "Matches all people with unknown gender"
 msgstr "Выбирает всех людей с неизвестным полом"
 
-#: GenericFilter.py:357 GenericFilter.py:406 GenericFilter.py:661
-#: GenericFilter.py:716 plugins/FilterEditor.py:692
+#: GenericFilter.py:368 GenericFilter.py:416 GenericFilter.py:670
+#: GenericFilter.py:724 plugins/FilterEditor.py:692
 msgid "Inclusive:"
 msgstr "Включая:"
 
-#: GenericFilter.py:358
+#: GenericFilter.py:369
 msgid "Descendants of "
 msgstr "Потомки <лица>"
 
-#: GenericFilter.py:359 GenericFilter.py:408 GenericFilter.py:450
-#: GenericFilter.py:494 GenericFilter.py:616
+#: GenericFilter.py:370 GenericFilter.py:418 GenericFilter.py:461
+#: GenericFilter.py:504 GenericFilter.py:625
 msgid "Descendant filters"
 msgstr "Фильтры потомков"
 
-#: GenericFilter.py:360
+#: GenericFilter.py:371
 msgid "Matches all descendants for the specified person"
 msgstr "Выбирает потомков указанного лица"
 
-#: GenericFilter.py:406 GenericFilter.py:535 GenericFilter.py:573
-#: GenericFilter.py:716 GenericFilter.py:861 GenericFilter.py:941
+#: GenericFilter.py:416 GenericFilter.py:544 GenericFilter.py:582
+#: GenericFilter.py:724 GenericFilter.py:870 GenericFilter.py:951
 #: GenericFilter.py:1343 GenericFilter.py:1386 plugins/FilterEditor.py:684
 msgid "Filter name:"
 msgstr "Название:"
 
-#: GenericFilter.py:407
+#: GenericFilter.py:417
 msgid "Descendants of  match"
 msgstr "Потомки соответствующих <фильтру> лиц"
 
-#: GenericFilter.py:409
+#: GenericFilter.py:419
 msgid "Matches people that are descendants of anybody matched by a filter"
 msgstr "Выбирает потомков соответствующих фильтру лиц"
 
-#: GenericFilter.py:448 GenericFilter.py:492 GenericFilter.py:759
-#: GenericFilter.py:811 plugins/FilterEditor.py:678
+#: GenericFilter.py:459 GenericFilter.py:502 GenericFilter.py:768
+#: GenericFilter.py:820 plugins/FilterEditor.py:678
 msgid "Number of generations:"
 msgstr "Число поколений:"
 
-#: GenericFilter.py:449
+#: GenericFilter.py:460
 msgid "Descendants of  not more than  generations away"
 msgstr "Потомки <лица>, отстоящие от него не более чем на  поколений"
 
-#: GenericFilter.py:451
+#: GenericFilter.py:462
 msgid ""
 "Matches people that are descendants of a specified person not more than N "
 "generations away"
@@ -1249,11 +1273,11 @@ msgstr ""
 "Выбирает потомков указанного лица, отстоящих от него не более чем на N "
 "поколений"
 
-#: GenericFilter.py:493
+#: GenericFilter.py:503
 msgid "Descendants of  at least  generations away"
 msgstr "Потомки <лица>, отстоящие от него по крайней мере на  поколений"
 
-#: GenericFilter.py:495
+#: GenericFilter.py:505
 msgid ""
 "Matches people that are descendants of a specified person at least N "
 "generations away"
@@ -1261,64 +1285,64 @@ msgstr ""
 "Выбирает потомков указанного лица, отстоящих от него по крайней мере на N "
 "поколений"
 
-#: GenericFilter.py:536
+#: GenericFilter.py:545
 msgid "Children of  match"
 msgstr "Дети соответствующих <фильтру> лиц"
 
-#: GenericFilter.py:537 GenericFilter.py:575 GenericFilter.py:863
-#: GenericFilter.py:1088 GenericFilter.py:1389 GenericFilter.py:1413
-#: GenericFilter.py:1445 GenericFilter.py:1461 GenericFilter.py:1475
+#: GenericFilter.py:546 GenericFilter.py:584 GenericFilter.py:872
+#: GenericFilter.py:1096 GenericFilter.py:1389 GenericFilter.py:1412
+#: GenericFilter.py:1442 GenericFilter.py:1457 GenericFilter.py:1470
 msgid "Family filters"
 msgstr "Семейные фильтры"
 
-#: GenericFilter.py:538
+#: GenericFilter.py:547
 msgid "Matches children of anybody matched by a filter"
 msgstr "Выбирает детей соответствующих фильтру лиц"
 
-#: GenericFilter.py:574
+#: GenericFilter.py:583
 msgid "Siblings of  match"
 msgstr "Братья и сестры одного из соответствующих <фильтру> лиц"
 
-#: GenericFilter.py:576
+#: GenericFilter.py:585
 msgid "Matches siblings of anybody matched by a filter"
 msgstr "Выбирает братьев и сестёр людей, соответствующих фильтру"
 
-#: GenericFilter.py:615
+#: GenericFilter.py:624
 msgid "Descendant family members of "
 msgstr "Члены семьи потомка <лица>"
 
-#: GenericFilter.py:617
+#: GenericFilter.py:626
 msgid ""
 "Matches people that are descendants or the spouse of a descendant of a "
 "specified person"
 msgstr "Выбирает потомков и супругов потомков указанного лица"
 
-#: GenericFilter.py:662
+#: GenericFilter.py:671
 msgid "Ancestors of "
 msgstr "Предки <лица>"
 
-#: GenericFilter.py:663 GenericFilter.py:718 GenericFilter.py:761
-#: GenericFilter.py:813 GenericFilter.py:900 GenericFilter.py:945
+#: GenericFilter.py:672 GenericFilter.py:726 GenericFilter.py:770
+#: GenericFilter.py:822 GenericFilter.py:909 GenericFilter.py:955
 msgid "Ancestral filters"
 msgstr "Фильтры предков"
 
-#: GenericFilter.py:664
+#: GenericFilter.py:673
 msgid "Matches people that are ancestors of a specified person"
 msgstr "Выбирает предков указанного лица"
 
-#: GenericFilter.py:717
+#: GenericFilter.py:725
 msgid "Ancestors of  match"
 msgstr "Предки соответствующих <фильтру> лиц"
 
-#: GenericFilter.py:719
+#: GenericFilter.py:727
 msgid "Matches people that are ancestors of anybody matched by a filter"
 msgstr "Выбирает предков соответствующих фильтру лиц"
 
-#: GenericFilter.py:760
+#: GenericFilter.py:769
 msgid "Ancestors of  not more than  generations away"
 msgstr "Предки <лица>, отстоящие от него не более чем на  поколений"
 
-#: GenericFilter.py:762
+#: GenericFilter.py:771
 msgid ""
 "Matches people that are ancestors of a specified person not more than N "
 "generations away"
@@ -1326,11 +1350,11 @@ msgstr ""
 "Выбирает предков указанного лица, отстоящих от него не более чем на N "
 "поколений"
 
-#: GenericFilter.py:812
+#: GenericFilter.py:821
 msgid "Ancestors of  at least  generations away"
 msgstr "Предкои <лица>, отстоящие от него по крайней мере на  поколений"
 
-#: GenericFilter.py:814
+#: GenericFilter.py:823
 msgid ""
 "Matches people that are ancestors of a specified person at least N "
 "generations away"
@@ -1338,192 +1362,192 @@ msgstr ""
 "Выбирает предков указанного лица, отстоящих от него по крайней мере на N "
 "поколений"
 
-#: GenericFilter.py:862
+#: GenericFilter.py:871
 msgid "Parents of  match"
 msgstr "Родители соответствующих <фильтру> лиц"
 
-#: GenericFilter.py:864
+#: GenericFilter.py:873
 msgid "Matches parents of anybody matched by a filter"
 msgstr "Выбирает предков соответствующих фильтру лиц"
 
-#: GenericFilter.py:899
+#: GenericFilter.py:908
 msgid "People with a common ancestor with "
 msgstr "Люди, имеющие общего предка с <лицом>"
 
-#: GenericFilter.py:901
+#: GenericFilter.py:910
 msgid "Matches people that have a common ancestor with a specified person"
 msgstr "Выбирает людей, имеющих общего предка с указанным лицом"
 
-#: GenericFilter.py:942
+#: GenericFilter.py:952
 msgid "People with a common ancestor with  match"
 msgstr "Люди, имеющие общего предка с соответствующими <фильтру> лицами"
 
-#: GenericFilter.py:943
+#: GenericFilter.py:953
 msgid ""
 "Matches people that have a common ancestor with anybody matched by a filter"
 msgstr ""
 "Выбирает людей, имеющих общего предка с соответствующими фильтру лицами"
 
-#: GenericFilter.py:968 gramps_main.py:962 plugins/Summary.py:112
+#: GenericFilter.py:978 gramps_main.py:962 plugins/Summary.py:112
 msgid "Males"
 msgstr "Мужчины"
 
-#: GenericFilter.py:970
+#: GenericFilter.py:980
 msgid "Matches all males"
 msgstr "Выбирает всех мужчин"
 
-#: GenericFilter.py:983 GenericFilter.py:1586 plugins/FilterEditor.py:58
+#: GenericFilter.py:993 GenericFilter.py:1575 plugins/FilterEditor.py:58
 msgid "Personal event:"
 msgstr "Личное событие:"
 
-#: GenericFilter.py:984 GenericFilter.py:1034 GenericFilter.py:1135
-#: GenericFilter.py:1175 gramps.glade:8536 gramps.glade:9462
-#: gramps.glade:12160 gramps.glade:13667
+#: GenericFilter.py:994 GenericFilter.py:1043 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:9101 gramps.glade:10129
+#: gramps.glade:13053 gramps.glade:14701
 msgid "Date:"
 msgstr "Дата:"
 
-#: GenericFilter.py:985 GenericFilter.py:1035 GenericFilter.py:1135
-#: GenericFilter.py:1175 gramps.glade:8488 gramps.glade:13715
+#: GenericFilter.py:995 GenericFilter.py:1044 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:9045 gramps.glade:14757
 #: plugins/FilterEditor.py:676
 msgid "Place:"
 msgstr "Место:"
 
-#: GenericFilter.py:986 GenericFilter.py:1036 GenericFilter.py:1135
-#: GenericFilter.py:1175 gramps.glade:8440 gramps.glade:10680
-#: gramps.glade:12256 gramps.glade:15790
+#: GenericFilter.py:996 GenericFilter.py:1045 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:8989 gramps.glade:11453
+#: gramps.glade:13165 gramps.glade:16998
 msgid "Description:"
 msgstr "Описание:"
 
-#: GenericFilter.py:987
+#: GenericFilter.py:997
 msgid "People with the personal "
 msgstr "Люди с личными <событиями>"
 
-#: GenericFilter.py:988
+#: GenericFilter.py:998
 msgid "Matches people with a personal event of a particular value"
 msgstr "Выбирает людей с определённым личным событием"
 
-#: GenericFilter.py:989 GenericFilter.py:1039 GenericFilter.py:1138
-#: GenericFilter.py:1178 GenericFilter.py:1509 GenericFilter.py:1530
-#: GenericFilter.py:1589
+#: GenericFilter.py:999 GenericFilter.py:1048 GenericFilter.py:1145
+#: GenericFilter.py:1184 GenericFilter.py:1502 GenericFilter.py:1522
+#: GenericFilter.py:1578
 msgid "Event filters"
 msgstr "Фильтры событий"
 
-#: GenericFilter.py:1033 GenericFilter.py:1586 plugins/FilterEditor.py:59
+#: GenericFilter.py:1042 GenericFilter.py:1575 plugins/FilterEditor.py:59
 msgid "Family event:"
 msgstr "Семейное событие:"
 
-#: GenericFilter.py:1037
+#: GenericFilter.py:1046
 msgid "People with the family "
 msgstr "Люди с семейными <событиями>"
 
-#: GenericFilter.py:1038
+#: GenericFilter.py:1047
 msgid "Matches people with a family event of a particular value"
 msgstr "Выбирает людей с определённым семейным событием"
 
-#: GenericFilter.py:1083
+#: GenericFilter.py:1091
 msgid "Number of relationships:"
 msgstr "Число отношений:"
 
-#: GenericFilter.py:1084 plugins/FilterEditor.py:65
+#: GenericFilter.py:1092 plugins/FilterEditor.py:65
 msgid "Relationship type:"
 msgstr "Тип отношений:"
 
-#: GenericFilter.py:1085
+#: GenericFilter.py:1093
 msgid "Number of children:"
 msgstr "Количество детей:"
 
-#: GenericFilter.py:1086
+#: GenericFilter.py:1094
 msgid "People with the "
 msgstr "Люди с информацией о родственных <отношениях>"
 
-#: GenericFilter.py:1087
+#: GenericFilter.py:1095
 msgid "Matches people with a particular relationship"
 msgstr "Выбирает людей, состоящих в данном отношении"
 
-#: GenericFilter.py:1136
+#: GenericFilter.py:1143
 msgid "People with the "
 msgstr "Люди с <данными о·рождении>"
 
-#: GenericFilter.py:1137
+#: GenericFilter.py:1144
 msgid "Matches people with birth data of a particular value"
 msgstr "Выбирает людей с определённой информацией о рождении"
 
-#: GenericFilter.py:1176
+#: GenericFilter.py:1182
 msgid "People with the "
 msgstr "Лица с <данными о смерти>"
 
-#: GenericFilter.py:1177
+#: GenericFilter.py:1183
 msgid "Matches people with death data of a particular value"
 msgstr "Выбирает людей с определённой информацией о смерти"
 
-#: GenericFilter.py:1215 GenericFilter.py:1240 gramps.glade:9050
-#: gramps.glade:22103 gramps.glade:23110
+#: GenericFilter.py:1220 GenericFilter.py:1244 gramps.glade:9674
+#: gramps.glade:23827 gramps.glade:24909
 msgid "Value:"
 msgstr "Значение:"
 
-#: GenericFilter.py:1215 plugins/FilterEditor.py:60
+#: GenericFilter.py:1220 plugins/FilterEditor.py:60
 msgid "Personal attribute:"
 msgstr "Личный атрибут:"
 
-#: GenericFilter.py:1216
+#: GenericFilter.py:1221
 msgid "People with the personal "
 msgstr "Люди с личным <атрибутом>"
 
-#: GenericFilter.py:1217
+#: GenericFilter.py:1222
 msgid "Matches people with the personal attribute of a particular value"
 msgstr "Выбирает людей с определённым личным атрибутом"
 
-#: GenericFilter.py:1240 plugins/FilterEditor.py:61
+#: GenericFilter.py:1244 plugins/FilterEditor.py:61
 msgid "Family attribute:"
 msgstr "Семейный атрибут:"
 
-#: GenericFilter.py:1241
+#: GenericFilter.py:1245
 msgid "People with the family "
 msgstr "Люди с семейным <атрибутом>"
 
-#: GenericFilter.py:1242
+#: GenericFilter.py:1246
 msgid "Matches people with the family attribute of a particular value"
 msgstr "Выбирает людей с определённым семейным атрибутом"
 
-#: GenericFilter.py:1267 gramps.glade:7894
+#: GenericFilter.py:1270 gramps.glade:8380
 msgid "Given name:"
 msgstr "Имя:"
 
-#: GenericFilter.py:1268 gramps.glade:7870
+#: GenericFilter.py:1271 gramps.glade:8352
 msgid "Family name:"
 msgstr "Фамилия:"
 
-#: GenericFilter.py:1269 gramps.glade:7846
+#: GenericFilter.py:1272 gramps.glade:8324
 msgid "Suffix:"
 msgstr "Суффикс:"
 
-#: GenericFilter.py:1270 gramps.glade:3457 gramps.glade:7918
-#: gramps.glade:19281 gramps.glade:21520 gramps.glade:30990
+#: GenericFilter.py:1273 gramps.glade:3631 gramps.glade:8408
+#: gramps.glade:20776 gramps.glade:23196 gramps.glade:33293
 #: mergedata.glade:874 mergedata.glade:896
 msgid "Title:"
 msgstr "Титул:"
 
-#: GenericFilter.py:1271
+#: GenericFilter.py:1274
 msgid "People with the "
 msgstr "Люди с <именем>"
 
-#: GenericFilter.py:1272 GenericFilter.py:1305
+#: GenericFilter.py:1275 GenericFilter.py:1307
 msgid "Matches people with a specified (partial) name"
 msgstr "Выбирает людей с указанным (частично) именем"
 
-#: GenericFilter.py:1303 GenericFilter.py:1640
+#: GenericFilter.py:1305 GenericFilter.py:1629
 msgid "Substring:"
 msgstr "Подстрока:"
 
-#: GenericFilter.py:1304
+#: GenericFilter.py:1306
 msgid "People matching the "
 msgstr "Лица с <именем>"
 
-#: GenericFilter.py:1322 gramps_main.py:992
+#: GenericFilter.py:1323 gramps_main.py:992
 msgid "People with incomplete names"
 msgstr "Лица с неполными именами"
 
-#: GenericFilter.py:1323
+#: GenericFilter.py:1324
 msgid "Matches people with firstname or lastname missing"
 msgstr "Выбирает лица с отсутствующими именем или фамилией"
 
@@ -1543,126 +1567,126 @@ msgstr "Супруги соответствующих <фильтру> лиц"
 msgid "Matches people married to anybody matching a filter"
 msgstr "Выбирает людей, состоящих в браке с соответствующими фильтру лицами"
 
-#: GenericFilter.py:1411 gramps_main.py:982
+#: GenericFilter.py:1410 gramps_main.py:982
 msgid "Adopted people"
 msgstr "Люди, являющиеся приёмными деьтми"
 
-#: GenericFilter.py:1412
+#: GenericFilter.py:1411
 msgid "Matches people who were adopted"
 msgstr "Выбирает людей, являющихся приёмными детьми"
 
-#: GenericFilter.py:1429 gramps_main.py:987
+#: GenericFilter.py:1427 gramps_main.py:987
 msgid "People with images"
 msgstr "Люди с изображеними"
 
-#: GenericFilter.py:1430
+#: GenericFilter.py:1428
 msgid "Matches people with images in the gallery"
 msgstr "Выбирает людей с изображениями в галерее"
 
-#: GenericFilter.py:1443 gramps_main.py:997
+#: GenericFilter.py:1440 gramps_main.py:997
 msgid "People with children"
 msgstr "Лица с детьми"
 
-#: GenericFilter.py:1444
+#: GenericFilter.py:1441
 msgid "Matches people who have children"
 msgstr "Выбирает людей, имеющих детей"
 
-#: GenericFilter.py:1459 gramps_main.py:1002
+#: GenericFilter.py:1455 gramps_main.py:1002
 msgid "People with no marriage records"
 msgstr "Лица без записей о браках"
 
-#: GenericFilter.py:1460
+#: GenericFilter.py:1456
 msgid "Matches people who have no spouse"
 msgstr "Выбирает людей без супругов"
 
-#: GenericFilter.py:1473 gramps_main.py:1007
+#: GenericFilter.py:1468 gramps_main.py:1007
 msgid "People with multiple marriage records"
 msgstr "Лица, состоявшие в нескольких браках"
 
-#: GenericFilter.py:1474
+#: GenericFilter.py:1469
 msgid "Matches people who have more than one spouse"
 msgstr "Выбирает людей, имеющих более одного супруга"
 
-#: GenericFilter.py:1487 gramps_main.py:1012
+#: GenericFilter.py:1481 gramps_main.py:1012
 msgid "People without a known birth date"
 msgstr "Лица без известной даты рождения"
 
-#: GenericFilter.py:1488
+#: GenericFilter.py:1482
 msgid "Matches people without a known birthdate"
 msgstr "Выбирает людей без известной даты рождения"
 
-#: GenericFilter.py:1507 gramps_main.py:1017
+#: GenericFilter.py:1500 gramps_main.py:1017
 msgid "People with incomplete events"
 msgstr "Лица с неполными событиями"
 
-#: GenericFilter.py:1508
+#: GenericFilter.py:1501
 msgid "Matches people with missing date or place in an event"
 msgstr "Выбирает людей с остсутствующей информацией о дате или месте события"
 
-#: GenericFilter.py:1528 gramps_main.py:1022
+#: GenericFilter.py:1520 gramps_main.py:1022
 msgid "Families with incomplete events"
 msgstr "Семьи с неполными событиями"
 
-#: GenericFilter.py:1529
+#: GenericFilter.py:1521
 msgid "Matches people with missing date or place in an event of the family"
 msgstr ""
 "Выбирает людей с остсутствующей информацией о дате или месте семейного "
 "события"
 
-#: GenericFilter.py:1551
+#: GenericFilter.py:1542
 msgid "On year:"
 msgstr "В году:"
 
-#: GenericFilter.py:1552 gramps_main.py:1027
+#: GenericFilter.py:1543 gramps_main.py:1027
 msgid "People probably alive"
 msgstr "Вероятно живые люди"
 
-#: GenericFilter.py:1553
+#: GenericFilter.py:1544
 msgid "Matches people without indications of death that are not too old"
 msgstr "Выбирает лица без информации о смерти с не очень большим возрастом"
 
-#: GenericFilter.py:1572 gramps_main.py:1032
+#: GenericFilter.py:1562 gramps_main.py:1032
 msgid "People marked private"
 msgstr "Люди, помеченные как личные записи"
 
-#: GenericFilter.py:1573
+#: GenericFilter.py:1563
 msgid "Matches people that are indicated as private"
 msgstr "Выбирает людей, помеченных как личные записи"
 
-#: GenericFilter.py:1587 gramps.glade:25926 gramps_main.py:1037
+#: GenericFilter.py:1576 gramps.glade:27895 gramps_main.py:1037
 msgid "Witnesses"
 msgstr "Свидетели"
 
-#: GenericFilter.py:1588
+#: GenericFilter.py:1577
 msgid "Matches people who are witnesses in any event"
 msgstr "Выбирает людей, являющиеся свидетелями в каком-либо событии"
 
-#: GenericFilter.py:1641 plugins/FilterEditor.py:694
+#: GenericFilter.py:1630 plugins/FilterEditor.py:694
 msgid "Case sensitive:"
 msgstr "Учитывать регистр:"
 
-#: GenericFilter.py:1642 plugins/FilterEditor.py:696
+#: GenericFilter.py:1631 plugins/FilterEditor.py:696
 msgid "Regular-Expression matching:"
 msgstr "Регулярное Выражение:"
 
-#: GenericFilter.py:1643
+#: GenericFilter.py:1632
 msgid "People with records containing "
 msgstr "Выбирает людей с записями, содержащими <подстроку>"
 
-#: GenericFilter.py:1644
+#: GenericFilter.py:1633
 msgid "Matches people whose records contain text matching a substring"
 msgstr ""
 "Выбирает людей, данные которых содержат текст, соотвествующий подстроке"
 
-#: GenericFilter.py:1808 plugins/FilterEditor.py:682
+#: GenericFilter.py:1799 plugins/FilterEditor.py:682
 msgid "Source ID:"
 msgstr "ID Источника:"
 
-#: GenericFilter.py:1809
+#: GenericFilter.py:1800
 msgid "People with the "
 msgstr "Лица с <источником>"
 
-#: GenericFilter.py:1811
+#: GenericFilter.py:1802
 msgid "Matches people who have a particular source"
 msgstr "Выбирает людей, ссылающихся на данный источник"
 
@@ -1679,7 +1703,7 @@ msgid "Icelandic style"
 msgstr "Исландский стиль"
 
 # !!!FIXME!!!
-#: GrampsCfg.py:70 GrampsCfg.py:74 gramps.glade:7733 gramps.glade:21835
+#: GrampsCfg.py:70 GrampsCfg.py:74 gramps.glade:8195 gramps.glade:23539
 msgid "General"
 msgstr "Общее"
 
@@ -1731,19 +1755,19 @@ msgstr "Ссылка на Документ"
 msgid "Reference Editor"
 msgstr "Редактор Ссылок"
 
-#: ImageSelect.py:828 ImageSelect.py:1191 MediaView.py:345
+#: ImageSelect.py:828 ImageSelect.py:1194 MediaView.py:345
 msgid "Edit Media Object"
 msgstr "Правка Документа"
 
-#: ImageSelect.py:910
+#: ImageSelect.py:912
 msgid "Media Properties Editor"
 msgstr "Редактор Свойств Документа"
 
-#: ImageSelect.py:1043
+#: ImageSelect.py:1047
 msgid "Properties Editor"
 msgstr "Редактор Свойств"
 
-#: ImageSelect.py:1288
+#: ImageSelect.py:1291
 msgid "Remove Media Object"
 msgstr "Удалить Документ"
 
@@ -1755,7 +1779,7 @@ msgstr "Редактор мест"
 msgid "Marriage/Relationship Editor"
 msgstr "Редактор браков/отношений"
 
-#: Marriage.py:146 Marriage.py:805 Marriage.py:828 Utils.py:135
+#: Marriage.py:146 Marriage.py:805 Marriage.py:828 Utils.py:130
 msgid "%s and %s"
 msgstr "%s и %s"
 
@@ -1846,11 +1870,11 @@ msgstr "Сравнить Людей"
 msgid "Alternate Names"
 msgstr "Альтернативные имена"
 
-#: MergePeople.py:122 gramps.glade:8961 gramps.glade:12692
+#: MergePeople.py:122 gramps.glade:9573 gramps.glade:13652
 msgid "Events"
 msgstr "События"
 
-#: MergePeople.py:129 PedView.py:693
+#: MergePeople.py:129 PedView.py:696
 msgid "Parents"
 msgstr "Родители"
 
@@ -1862,7 +1886,7 @@ msgstr "ID Семьи"
 msgid "No parents found"
 msgstr "Родители не найдены"
 
-#: MergePeople.py:140 PedView.py:598
+#: MergePeople.py:140 PedView.py:601
 msgid "Spouses"
 msgstr "Супруги"
 
@@ -1876,7 +1900,7 @@ msgid "Marriage"
 msgstr "Брак"
 
 # LDS
-#: MergePeople.py:159 const.py:902
+#: MergePeople.py:159 const.py:909
 msgid "Child"
 msgstr "Ребёнок (1-8л)"
 
@@ -1884,7 +1908,7 @@ msgstr "Ребёнок (1-8л)"
 msgid "No spouses or children found"
 msgstr "Супруги и дети не найдены"
 
-#: MergePeople.py:165 gramps.glade:10111
+#: MergePeople.py:165 gramps.glade:10857
 msgid "Addresses"
 msgstr "Адреса"
 
@@ -1960,27 +1984,27 @@ msgstr "пох."
 msgid "crem."
 msgstr "крем."
 
-#: PedView.py:379
+#: PedView.py:382
 msgid "Anchor"
 msgstr "Метка"
 
-#: PedView.py:496
+#: PedView.py:499
 msgid "Double clicking will make %s the active person"
 msgstr "Двойной щелчок сделает %s активным лицом"
 
-#: PedView.py:563
+#: PedView.py:566
 msgid "Set anchor"
 msgstr "_Поставить метку"
 
-#: PedView.py:564
+#: PedView.py:567
 msgid "Remove anchor"
 msgstr "_Снять метку"
 
-#: PedView.py:629 plugins/WebPage.py:715
+#: PedView.py:632 plugins/WebPage.py:715
 msgid "Siblings"
 msgstr "Братья/Сёстры"
 
-#: PedView.py:659 plugins/FamilyGroup.py:400 plugins/IndivComplete.py:295
+#: PedView.py:662 plugins/FamilyGroup.py:400 plugins/IndivComplete.py:295
 #: plugins/IndivSummary.py:179 plugins/WebPage.py:674
 msgid "Children"
 msgstr "Дети"
@@ -1994,7 +2018,7 @@ msgid "Cause of Death"
 msgstr "Причина Смерти"
 
 #: PeopleView.py:83 WriteGedcom.py:329 gramps_main.py:952
-#: plugins/EventCmp.py:158 plugins/ExportVCalendar.py:81
+#: plugins/EventCmp.py:158 plugins/ExportVCalendar.py:82
 #: plugins/ExportVCard.py:84 plugins/GraphViz.py:513
 #: plugins/IndivComplete.py:510 plugins/StatisticsChart.py:827
 #: plugins/TimeLine.py:411 plugins/WebPage.py:1265 plugins/WriteFtree.py:86
@@ -2002,16 +2026,16 @@ msgstr "Причина Смерти"
 msgid "Entire Database"
 msgstr "Вся база данных"
 
-#: PeopleView.py:267 gramps_main.py:1658
+#: PeopleView.py:260 gramps_main.py:1672
 msgid "Updating display..."
 msgstr "Обновляю экран..."
 
-#: PeopleView.py:295 PlaceView.py:200 SourceView.py:189 gramps.glade:955
+#: PeopleView.py:288 PlaceView.py:203 SourceView.py:191 gramps.glade:956
 #: plugins/BookReport.py:832
 msgid "Edit"
 msgstr "Правка"
 
-#: PlaceView.py:49 PlaceView.py:119
+#: PlaceView.py:49 PlaceView.py:120
 msgid "Place Name"
 msgstr "Название места"
 
@@ -2031,15 +2055,15 @@ msgstr "Долгота"
 msgid "Latitude"
 msgstr "Широта"
 
-#: PlaceView.py:204
+#: PlaceView.py:207
 msgid "Place Menu"
 msgstr "Меню Мест"
 
-#: PlaceView.py:251 SourceView.py:225 gramps_main.py:1454
+#: PlaceView.py:254 SourceView.py:227 gramps_main.py:1468
 msgid "Delete %s?"
 msgstr "Удалить %s?"
 
-#: PlaceView.py:252
+#: PlaceView.py:255
 msgid ""
 "This place is currently being used by at least one record in the database. "
 "Deleting it will remove it from the database and remove it from all records "
@@ -2049,15 +2073,15 @@ msgstr ""
 "Стирание удалит его из базы данных и изо всех записей, которые на него "
 "ссылаются."
 
-#: PlaceView.py:256
+#: PlaceView.py:259
 msgid "_Delete Place"
 msgstr "У_далить место"
 
-#: PlaceView.py:287
+#: PlaceView.py:290
 msgid "Cannot merge places."
 msgstr "Не могу слить места."
 
-#: PlaceView.py:288
+#: PlaceView.py:291
 msgid ""
 "Exactly two places must be selected to perform a merge. A second place can "
 "be selected by holding down the control key while clicking on the desired "
@@ -2077,13 +2101,13 @@ msgstr "Категория не указана"
 
 #: PluginMgr.py:162 PluginMgr.py:163 PluginMgr.py:164 PluginMgr.py:189
 #: PluginMgr.py:191 PluginMgr.py:192 PluginMgr.py:223 PluginMgr.py:224
-#: PluginMgr.py:225 ReportUtils.py:1756 Witness.py:83 Witness.py:166
-#: const.py:234 const.py:247 const.py:493 const.py:506 gramps_main.py:1736
+#: PluginMgr.py:225 ReportUtils.py:1757 Witness.py:83 Witness.py:166
+#: const.py:234 const.py:247 const.py:493 gramps_main.py:1750
 #: plugins/Check.py:474 plugins/ScratchPad.py:78 plugins/WebPage.py:334
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: Plugins.py:125 gramps.glade:1396
+#: Plugins.py:125 gramps.glade:1427
 msgid "_Apply"
 msgstr "П_рименить"
 
@@ -2243,8 +2267,8 @@ msgid ""
 "between different database versions."
 msgstr ""
 "Версия базы данных не поддерживается этой версией GRAMPS.\n"
-"Пожалуйста, обновите GRAMPS или используйте XML формат для "
-"переноски данных между различными версиями базы данных."
+"Пожалуйста, обновите GRAMPS или используйте XML формат для переноски данных "
+"между различными версиями базы данных."
 
 #: ReadGrdb.py:69
 msgid "The Database version is not supported by this version of GRAMPS."
@@ -2288,7 +2312,60 @@ msgstr ""
 "GRAMPS не может показать изображение. Это может быть вызвано повреждённым "
 "файлом."
 
+#: Relationship.py:268
+#, fuzzy
+msgid "husband"
+msgstr "Муж"
+
+#: Relationship.py:270
+#, fuzzy
+msgid "wife"
+msgstr "Жена"
+
+#: Relationship.py:272
+#, fuzzy
+msgid "gender unknown|spouse"
+msgstr "(пол неизвестен)"
+
+#: Relationship.py:275
+#, fuzzy
+msgid "unmarried|husband"
+msgstr "Не женаты"
+
 #: Relationship.py:277
+#, fuzzy
+msgid "unmarried|wife"
+msgstr "Не женаты"
+
+#: Relationship.py:279
+msgid "gender unknown,unmarried|spouse"
+msgstr ""
+
+#: Relationship.py:282
+msgid "male,civil union|partner"
+msgstr ""
+
+#: Relationship.py:284
+msgid "female,civil union|partner"
+msgstr ""
+
+#: Relationship.py:286
+msgid "gender unknown,civil union|partner"
+msgstr ""
+
+#: Relationship.py:289
+msgid "male,unknown relation|partner"
+msgstr ""
+
+#: Relationship.py:291
+msgid "female,unknown relation|partner"
+msgstr ""
+
+#: Relationship.py:293
+msgid "gender unknown,unknown relation|partner"
+msgstr ""
+
+#: Relationship.py:325
 msgid "Relationship loop detected"
 msgstr "Обнаружена петля в отношениях"
 
@@ -2300,7 +2377,7 @@ msgstr "Базовый шаблон"
 msgid "User Defined Template"
 msgstr "Шаблон пользователя"
 
-#: Report.py:152 Report.py:172 Utils.py:279
+#: Report.py:152 Report.py:172 Utils.py:274
 msgid "default"
 msgstr "по умолчанию"
 
@@ -2509,8 +2586,8 @@ msgstr "Размер"
 msgid "Height"
 msgstr "Высота"
 
-#: Report.py:1199 Report.py:1215 gramps.glade:20322 gramps.glade:20346
-#: gramps.glade:20370 gramps.glade:20802
+#: Report.py:1199 Report.py:1215 gramps.glade:21900 gramps.glade:21928
+#: gramps.glade:21956 gramps.glade:22416
 msgid "cm"
 msgstr "см"
 
@@ -2571,25 +2648,25 @@ msgstr "_Переписать"
 msgid "_Change filename"
 msgstr "_Изменить имя файла"
 
-#: ReportUtils.py:297 ReportUtils.py:298 Utils.py:170 Utils.py:172
+#: ReportUtils.py:297 ReportUtils.py:298 Utils.py:165 Utils.py:167
 msgid "Private"
 msgstr "Личное"
 
-#: ReportUtils.py:503 ReportUtils.py:1057 ReportUtils.py:1155
-#: ReportUtils.py:1446 ReportUtils.py:1539 plugins/DetAncestralReport.py:192
+#: ReportUtils.py:504 ReportUtils.py:1058 ReportUtils.py:1156
+#: ReportUtils.py:1447 ReportUtils.py:1540 plugins/DetAncestralReport.py:192
 #: plugins/DetAncestralReport.py:350 plugins/DetDescendantReport.py:216
 #: plugins/DetDescendantReport.py:371
 msgid "He"
 msgstr "Он"
 
-#: ReportUtils.py:505 ReportUtils.py:1059 ReportUtils.py:1157
-#: ReportUtils.py:1448 ReportUtils.py:1541 plugins/DetAncestralReport.py:194
+#: ReportUtils.py:506 ReportUtils.py:1060 ReportUtils.py:1158
+#: ReportUtils.py:1449 ReportUtils.py:1542 plugins/DetAncestralReport.py:194
 #: plugins/DetAncestralReport.py:348 plugins/DetDescendantReport.py:218
 #: plugins/DetDescendantReport.py:369
 msgid "She"
 msgstr "Она"
 
-#: ReportUtils.py:518
+#: ReportUtils.py:519
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died %(death_date)s in %(death_place)s%"
@@ -2598,7 +2675,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s родился %(birth_date)s в %(birth_place)s%"
 "(birth_endnotes)s, и умер %(death_date)s в %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:527
+#: ReportUtils.py:528
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
@@ -2606,7 +2683,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s родился %(birth_date)s в %(birth_place)s%"
 "(birth_endnotes)s, и умер %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:536
+#: ReportUtils.py:537
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
@@ -2614,7 +2691,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s родился %(birth_date)s в %(birth_place)s%"
 "(birth_endnotes)s, и умер в %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:544
+#: ReportUtils.py:545
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s."
@@ -2622,7 +2699,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s родился %(birth_date)s в %(birth_place)s%"
 "(birth_endnotes)s."
 
-#: ReportUtils.py:552
+#: ReportUtils.py:553
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died %(death_date)s in %(death_place)s%(death_endnotes)s."
@@ -2630,7 +2707,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s родился %(birth_date)s%(birth_endnotes)s, и умер %"
 "(death_date)s в %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:561
+#: ReportUtils.py:562
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died %(death_date)s%(death_endnotes)s."
@@ -2638,7 +2715,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s родился %(birth_date)s%(birth_endnotes)s, и умер %"
 "(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:570
+#: ReportUtils.py:571
 msgid ""
 "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died in %(death_place)s%(death_endnotes)s."
@@ -2646,11 +2723,11 @@ msgstr ""
 "%(male_name)s%(endnotes)s родился %(birth_date)s%(birth_endnotes)s, и умер в "
 "%(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:578
+#: ReportUtils.py:579
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s родился %(birth_date)s%(birth_endnotes)s."
 
-#: ReportUtils.py:586
+#: ReportUtils.py:587
 msgid ""
 "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and "
 "died %(death_date)s in %(death_place)s%(death_endnotes)s."
@@ -2658,7 +2735,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s родился в %(birth_place)s%(birth_endnotes)s, и "
 "умер %(death_date)s в %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:595
+#: ReportUtils.py:596
 msgid ""
 "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and "
 "died %(death_date)s%(death_endnotes)s."
@@ -2666,7 +2743,7 @@ msgstr ""
 "%(male_name)s%(endnotes)s родился в %(birth_place)s%(birth_endnotes)s, и "
 "умер %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:604
+#: ReportUtils.py:605
 msgid ""
 "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and "
 "died in %(death_place)s%(death_endnotes)s."
@@ -2674,12 +2751,12 @@ msgstr ""
 "%(male_name)s%(endnotes)s родился в %(birth_place)s%(birth_endnotes)s, и "
 "умер в %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:612
+#: ReportUtils.py:613
 msgid ""
 "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s родился в %(birth_place)s%(birth_endnotes)s."
 
-#: ReportUtils.py:620
+#: ReportUtils.py:621
 msgid ""
 "%(male_name)s%(endnotes)s died %(death_date)s in %(death_place)s%"
 "(death_endnotes)s."
@@ -2687,19 +2764,19 @@ msgstr ""
 "%(male_name)s%(endnotes)s умер %(death_date)s в %(death_place)s%"
 "(death_endnotes)s."
 
-#: ReportUtils.py:626
+#: ReportUtils.py:627
 msgid "%(male_name)s%(endnotes)s died %(death_date)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s умер %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:633
+#: ReportUtils.py:634
 msgid "%(male_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s."
 msgstr "%(male_name)s%(endnotes)s умер в %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:639
+#: ReportUtils.py:640
 msgid "%(male_name)s%(endnotes)s."
 msgstr "%(male_name)s%(endnotes)s."
 
-#: ReportUtils.py:646
+#: ReportUtils.py:647
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died %(death_date)s in %(death_place)s%"
@@ -2709,7 +2786,7 @@ msgstr ""
 "(birth_endnotes)s, и умерла %(death_date)s в %(death_place)s%(death_endnotes)"
 "s."
 
-#: ReportUtils.py:655
+#: ReportUtils.py:656
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
@@ -2717,7 +2794,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s родилась %(birth_date)s в %(birth_place)s%"
 "(birth_endnotes)s, и умерла %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:664
+#: ReportUtils.py:665
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
@@ -2725,7 +2802,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s родилась %(birth_date)s в %(birth_place)s%"
 "(birth_endnotes)s, и умерла в %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:672
+#: ReportUtils.py:673
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%"
 "(birth_endnotes)s."
@@ -2733,7 +2810,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s родилась %(birth_date)s в %(birth_place)s%"
 "(birth_endnotes)s."
 
-#: ReportUtils.py:680
+#: ReportUtils.py:681
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died %(death_date)s in %(death_place)s%(death_endnotes)s."
@@ -2741,7 +2818,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s родилась %(birth_date)s%(birth_endnotes)s, и "
 "умерла %(death_date)s в %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:689
+#: ReportUtils.py:690
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died %(death_date)s%(death_endnotes)s."
@@ -2749,7 +2826,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s родилась %(birth_date)s%(birth_endnotes)s, и "
 "умерла %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:698
+#: ReportUtils.py:699
 msgid ""
 "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and "
 "died in %(death_place)s%(death_endnotes)s."
@@ -2757,11 +2834,11 @@ msgstr ""
 "%(female_name)s%(endnotes)s родилась %(birth_date)s%(birth_endnotes)s, и "
 "умерла в %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:706
+#: ReportUtils.py:707
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s родилась %(birth_date)s%(birth_endnotes)s."
 
-#: ReportUtils.py:714
+#: ReportUtils.py:715
 msgid ""
 "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
 "and died %(death_date)s in %(death_place)s%(death_endnotes)s."
@@ -2769,7 +2846,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s родилась в %(birth_place)s%(birth_endnotes)s, и "
 "умерла %(death_date)s в %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:723
+#: ReportUtils.py:724
 msgid ""
 "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
 "and died %(death_date)s%(death_endnotes)s."
@@ -2777,7 +2854,7 @@ msgstr ""
 "%(female_name)s%(endnotes)s родилась в %(birth_place)s%(birth_endnotes)s, и "
 "умерла %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:732
+#: ReportUtils.py:733
 msgid ""
 "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, "
 "and died in %(death_place)s%(death_endnotes)s."
@@ -2785,13 +2862,13 @@ msgstr ""
 "%(female_name)s%(endnotes)s родилась в %(birth_place)s%(birth_endnotes)s, и "
 "умерла в %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:740
+#: ReportUtils.py:741
 msgid ""
 "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s."
 msgstr ""
 "%(female_name)s%(endnotes)s родилась в %(birth_place)s%(birth_endnotes)s."
 
-#: ReportUtils.py:748
+#: ReportUtils.py:749
 msgid ""
 "%(female_name)s%(endnotes)s died %(death_date)s in %(death_place)s%"
 "(death_endnotes)s."
@@ -2799,208 +2876,208 @@ msgstr ""
 "%(female_name)s%(endnotes)s умерла %(death_date)s в %(death_place)s%"
 "(death_endnotes)s."
 
-#: ReportUtils.py:754
+#: ReportUtils.py:755
 msgid "%(female_name)s%(endnotes)s died %(death_date)s%(death_endnotes)s."
 msgstr "%(female_name)s%(endnotes)s умерла %(death_date)s%(death_endnotes)s."
 
-#: ReportUtils.py:761
+#: ReportUtils.py:762
 msgid "%(female_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s."
 msgstr ""
 "%(female_name)s%(endnotes)s умерла в %(death_place)s%(death_endnotes)s."
 
-#: ReportUtils.py:767
+#: ReportUtils.py:768
 msgid "%(female_name)s%(endnotes)s."
 msgstr "%(female_name)s%(endnotes)s."
 
-#: ReportUtils.py:821
+#: ReportUtils.py:822
 msgid "He married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Он женился на %(spouse)s %(date)s в %(place)s%(endnotes)s."
 
-#: ReportUtils.py:827
+#: ReportUtils.py:828
 msgid "She married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Она вышла замуж за %(spouse)s в %(date)s в %(place)s%(endnotes)s."
 
-#: ReportUtils.py:834
+#: ReportUtils.py:835
 msgid "He married %(spouse)s %(date)s%(endnotes)s."
 msgstr "Он женился на %(spouse)s в %(date)s%(endnotes)s."
 
-#: ReportUtils.py:839 ReportUtils.py:850
+#: ReportUtils.py:840 ReportUtils.py:851
 msgid "She married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Она вышла замуж за %(spouse)s в %(place)s%(endnotes)s."
 
-#: ReportUtils.py:845
+#: ReportUtils.py:846
 msgid "He married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Он женился на %(spouse)s в %(place)s%(endnotes)s."
 
-#: ReportUtils.py:856
+#: ReportUtils.py:857
 msgid "He married %(spouse)s%(endnotes)s."
 msgstr "Он женился на %(spouse)s%(endnotes)s."
 
-#: ReportUtils.py:860
+#: ReportUtils.py:861
 msgid "She married %(spouse)s%(endnotes)s."
 msgstr "Она вышла замуж за %(spouse)s%(endnotes)s."
 
-#: ReportUtils.py:866
+#: ReportUtils.py:867
 msgid "He also married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr "Он также женился на %(spouse)s %(date)s в %(place)s%(endnotes)s."
 
-#: ReportUtils.py:872
+#: ReportUtils.py:873
 msgid "She also married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr ""
 "Она также вышла замуж за %(spouse)s в %(date)s в %(place)s%(endnotes)s."
 
-#: ReportUtils.py:879
+#: ReportUtils.py:880
 msgid "He also married %(spouse)s %(date)s%(endnotes)s."
 msgstr "Он также женился на %(spouse)s в %(date)s%(endnotes)s."
 
-#: ReportUtils.py:884 ReportUtils.py:895
+#: ReportUtils.py:885 ReportUtils.py:896
 msgid "She also married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Она также вышла замуж за %(spouse)s в %(place)s%(endnotes)s."
 
-#: ReportUtils.py:890
+#: ReportUtils.py:891
 msgid "He also married %(spouse)s in %(place)s%(endnotes)s."
 msgstr "Он также женился на %(spouse)s в %(place)s%(endnotes)s."
 
-#: ReportUtils.py:901
+#: ReportUtils.py:902
 msgid "He also married %(spouse)s%(endnotes)s."
 msgstr "Он также женился на %(spouse)s%(endnotes)s."
 
-#: ReportUtils.py:905
+#: ReportUtils.py:906
 msgid "She also married %(spouse)s%(endnotes)s."
 msgstr "Она также вышла замуж за %(spouse)s%(endnotes)s."
 
-#: ReportUtils.py:926
+#: ReportUtils.py:927
 msgid "He married %(spouse)s."
 msgstr "Он женился на %(spouse)s."
 
-#: ReportUtils.py:928
+#: ReportUtils.py:929
 msgid "She married %(spouse)s."
 msgstr "Она вышла замуж за %(spouse)s."
 
-#: ReportUtils.py:931
+#: ReportUtils.py:932
 msgid "He had relationship with %(spouse)s."
 msgstr "Он состоял в отношениях с %(spouse)s."
 
-#: ReportUtils.py:934
+#: ReportUtils.py:935
 msgid "She had relationship with %(spouse)s."
 msgstr "Она состояла в отношениях с %(spouse)s."
 
-#: ReportUtils.py:939
+#: ReportUtils.py:940
 msgid "He also married %(spouse)s."
 msgstr "Он также женился на %(spouse)s."
 
-#: ReportUtils.py:941
+#: ReportUtils.py:942
 msgid "She also married %(spouse)s."
 msgstr "Она также вышла замуж за %(spouse)s."
 
-#: ReportUtils.py:944
+#: ReportUtils.py:945
 msgid "He also had relationship with %(spouse)s."
 msgstr "Он также состоял в отношениях с %(spouse)s."
 
-#: ReportUtils.py:947
+#: ReportUtils.py:948
 msgid "She also had relationship with %(spouse)s."
 msgstr "Она также состояла в отношениях с %(spouse)s."
 
-#: ReportUtils.py:978
+#: ReportUtils.py:979
 msgid "He was the son of %(father)s and %(mother)s."
 msgstr "Он сын %(father)s и %(mother)s."
 
-#: ReportUtils.py:982
+#: ReportUtils.py:983
 msgid "He is the son of %(father)s and %(mother)s."
 msgstr "Он сын %(father)s и %(mother)s."
 
-#: ReportUtils.py:987
+#: ReportUtils.py:988
 msgid "He was the son of %(mother)s."
 msgstr "Он сын %(mother)s."
 
-#: ReportUtils.py:990
+#: ReportUtils.py:991
 msgid "He is the son of %(mother)s."
 msgstr "Он сын %(mother)s."
 
-#: ReportUtils.py:994
+#: ReportUtils.py:995
 msgid "He was the son of %(father)s."
 msgstr "Он сын %(father)s."
 
-#: ReportUtils.py:997
+#: ReportUtils.py:998
 msgid "He is the son of %(father)s."
 msgstr "Он сын %(father)s."
 
-#: ReportUtils.py:1002
+#: ReportUtils.py:1003
 msgid "She was the daughter of %(father)s and %(mother)s."
 msgstr "Она дочь %(father)s and %(mother)s."
 
-#: ReportUtils.py:1006
+#: ReportUtils.py:1007
 msgid "She is the daughter of %(father)s and %(mother)s."
 msgstr "Она дочь %(father)s и %(mother)s."
 
-#: ReportUtils.py:1011
+#: ReportUtils.py:1012
 msgid "She was the daughter of %(mother)s."
 msgstr "Она дочь %(mother)s."
 
-#: ReportUtils.py:1014
+#: ReportUtils.py:1015
 msgid "She is the daughter of %(mother)s."
 msgstr "Она дочь %(mother)s."
 
-#: ReportUtils.py:1018
+#: ReportUtils.py:1019
 msgid "She was the daughter of %(father)s."
 msgstr "Она дочь %(father)s."
 
-#: ReportUtils.py:1021
+#: ReportUtils.py:1022
 msgid "She is the daughter of %(father)s."
 msgstr "Она дочь %(father)s."
 
-#: ReportUtils.py:1069
+#: ReportUtils.py:1070
 msgid "%(male_name)s was born on %(birth_date)s in %(birth_place)s."
 msgstr "%(male_name)s родился %(birth_date)s в %(birth_place)s."
 
-#: ReportUtils.py:1074
+#: ReportUtils.py:1075
 msgid "%(male_name)s was born on %(birth_date)s."
 msgstr "%(male_name)s родился %(birth_date)s."
 
-#: ReportUtils.py:1078
+#: ReportUtils.py:1079
 msgid "%(male_name)s was born in %(month_year)s in %(birth_place)s."
 msgstr "%(male_name)s родился в %(month_year)s в %(birth_place)s."
 
-#: ReportUtils.py:1083
+#: ReportUtils.py:1084
 msgid "%(male_name)s was born in %(month_year)s."
 msgstr "%(male_name)s родился в %(month_year)s."
 
-#: ReportUtils.py:1087
+#: ReportUtils.py:1088
 msgid "%(male_name)s was born in %(birth_place)s."
 msgstr "%(male_name)s родился в %(birth_place)s."
 
-#: ReportUtils.py:1094
+#: ReportUtils.py:1095
 msgid "%(female_name)s was born on %(birth_date)s in %(birth_place)s."
 msgstr "%(female_name)s родилась %(birth_date)s в %(birth_place)s."
 
-#: ReportUtils.py:1099
+#: ReportUtils.py:1100
 msgid "%(female_name)s was born on %(birth_date)s."
 msgstr "%(female_name)s родилась %(birth_date)s."
 
-#: ReportUtils.py:1103
+#: ReportUtils.py:1104
 msgid "%(female_name)s was born in %(month_year)s in %(birth_place)s."
 msgstr "%(female_name)s родилась в %(month_year)s в %(birth_place)s."
 
-#: ReportUtils.py:1108
+#: ReportUtils.py:1109
 msgid "%(female_name)s was born in %(month_year)s."
 msgstr "%(female_name)s родилась в %(month_year)s."
 
-#: ReportUtils.py:1112
+#: ReportUtils.py:1113
 msgid "%(female_name)s was born in %(birth_place)s."
 msgstr "%(female_name)s родилась в %(birth_place)s."
 
-#: ReportUtils.py:1168
+#: ReportUtils.py:1169
 msgid "%(male_name)s died on %(death_date)s in %(death_place)s."
 msgstr "%(male_name)s умер %(death_date)s в %(death_place)s."
 
-#: ReportUtils.py:1173
+#: ReportUtils.py:1174
 msgid ""
 "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)"
 "d years."
 msgstr ""
 "%(male_name)s умер %(death_date)s в %(death_place)s в возрасте %(age)d лет.."
 
-#: ReportUtils.py:1180
+#: ReportUtils.py:1181
 msgid ""
 "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)"
 "d months."
@@ -3008,41 +3085,41 @@ msgstr ""
 "%(male_name)s умер %(death_date)s в %(death_place)s в возрасте %(age)d "
 "месяцев."
 
-#: ReportUtils.py:1187
+#: ReportUtils.py:1188
 msgid ""
 "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)"
 "d days."
 msgstr ""
 "%(male_name)s умер %(death_date)s в %(death_place)s в возрасте %(age)d дней."
 
-#: ReportUtils.py:1195
+#: ReportUtils.py:1196
 msgid "%(male_name)s died on %(death_date)s."
 msgstr "%(male_name)s умер %(death_date)s."
 
-#: ReportUtils.py:1198
+#: ReportUtils.py:1199
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d years."
 msgstr "%(male_name)s умер %(death_date)s в возрасте %(age)d лет."
 
-#: ReportUtils.py:1203
+#: ReportUtils.py:1204
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d months."
 msgstr "%(male_name)s умер %(death_date)s в возрасте %(age)d месяцев."
 
-#: ReportUtils.py:1208
+#: ReportUtils.py:1209
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d days."
 msgstr "%(male_name)s умер %(death_date)s в возрасте %(age)d дней."
 
-#: ReportUtils.py:1215
+#: ReportUtils.py:1216
 msgid "%(male_name)s died in %(month_year)s in %(death_place)s."
 msgstr "%(male_name)s умер в %(month_year)s в %(death_place)s."
 
-#: ReportUtils.py:1220
+#: ReportUtils.py:1221
 msgid ""
 "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)"
 "d years."
 msgstr ""
 "%(male_name)s умер в %(month_year)s в %(death_place)s в возрасте %(age)d лет."
 
-#: ReportUtils.py:1227
+#: ReportUtils.py:1228
 msgid ""
 "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)"
 "d months."
@@ -3050,7 +3127,7 @@ msgstr ""
 "%(male_name)s умер в %(month_year)s в %(death_place)s в возрасте %(age)d "
 "месяцев."
 
-#: ReportUtils.py:1234
+#: ReportUtils.py:1235
 msgid ""
 "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)"
 "d days."
@@ -3058,56 +3135,56 @@ msgstr ""
 "%(male_name)s умер в %(month_year)s в %(death_place)s в возрасте %(age)d "
 "дней."
 
-#: ReportUtils.py:1242
+#: ReportUtils.py:1243
 msgid "%(male_name)s died in %(month_year)s."
 msgstr "%(male_name)s умер в %(month_year)s."
 
-#: ReportUtils.py:1245
+#: ReportUtils.py:1246
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d years."
 msgstr "%(male_name)s умер в %(month_year)s в возрасте %(age)d лет."
 
-#: ReportUtils.py:1250
+#: ReportUtils.py:1251
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d months."
 msgstr "%(male_name)s умер в %(month_year)s в возрасте %(age)d месяцев."
 
-#: ReportUtils.py:1255
+#: ReportUtils.py:1256
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d days."
 msgstr "%(male_name)s умер в %(month_year)s в возрасте %(age)d дней."
 
-#: ReportUtils.py:1262
+#: ReportUtils.py:1263
 msgid "%(male_name)s died in %(death_place)s."
 msgstr "%(male_name)s умер в %(death_place)s."
 
-#: ReportUtils.py:1265
+#: ReportUtils.py:1266
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d years."
 msgstr "%(male_name)s умер в %(death_place)s в возрасте %(age)d лет."
 
-#: ReportUtils.py:1270
+#: ReportUtils.py:1271
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d months."
 msgstr "%(male_name)s умер в %(death_place)s в возрасте %(age)d месяцев."
 
-#: ReportUtils.py:1275
+#: ReportUtils.py:1276
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d days."
 msgstr "%(male_name)s умер в %(death_place)s в возрасте %(age)d дней."
 
-#: ReportUtils.py:1284
+#: ReportUtils.py:1285
 msgid "%(male_name)s died at the age of %(age)d years."
 msgstr "%(male_name)s умер в возрасте %(age)d лет."
 
 # !!!FIXME!!!
-#: ReportUtils.py:1288
+#: ReportUtils.py:1289
 msgid "%(male_name)s died at the age of %(age)d months."
 msgstr "%(male_name)s умер в возрасте %(age)d месяцев."
 
-#: ReportUtils.py:1292
+#: ReportUtils.py:1293
 msgid "%(male_name)s died at the age of %(age)d days."
 msgstr "%(male_name)s умер в возрасте %(age)d дней."
 
-#: ReportUtils.py:1299
+#: ReportUtils.py:1300
 msgid "%(female_name)s died on %(death_date)s in %(death_place)s."
 msgstr "%(female_name)s умерла %(death_date)s в %(death_place)s."
 
-#: ReportUtils.py:1304
+#: ReportUtils.py:1305
 msgid ""
 "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %"
 "(age)d years."
@@ -3115,7 +3192,7 @@ msgstr ""
 "%(female_name)s умерла %(death_date)s в %(death_place)s в возрасте %(age)d "
 "лет."
 
-#: ReportUtils.py:1311
+#: ReportUtils.py:1312
 msgid ""
 "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %"
 "(age)d months."
@@ -3123,7 +3200,7 @@ msgstr ""
 "%(female_name)s умерла %(death_date)s в %(death_place)s в возрасте %(age)d "
 "месяцев."
 
-#: ReportUtils.py:1318
+#: ReportUtils.py:1319
 msgid ""
 "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %"
 "(age)d days."
@@ -3131,27 +3208,27 @@ msgstr ""
 "%(female_name)s умерла %(death_date)s в %(death_place)s в возрасте %(age)d "
 "дней."
 
-#: ReportUtils.py:1326
+#: ReportUtils.py:1327
 msgid "%(female_name)s died on %(death_date)s."
 msgstr "%(female_name)s умерла %(death_date)s."
 
-#: ReportUtils.py:1329
+#: ReportUtils.py:1330
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d years."
 msgstr "%(female_name)s умерла %(death_date)s в возрасте %(age)d лет."
 
-#: ReportUtils.py:1334
+#: ReportUtils.py:1335
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d months."
 msgstr "%(female_name)s умерла %(death_date)s в возрасте %(age)d месяцев."
 
-#: ReportUtils.py:1339
+#: ReportUtils.py:1340
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d days."
 msgstr "%(female_name)s умерла %(death_date)s в возрасте %(age)d дней."
 
-#: ReportUtils.py:1346
+#: ReportUtils.py:1347
 msgid "%(female_name)s died in %(month_year)s in %(death_place)s."
 msgstr "%(female_name)s умерла в %(month_year)s в %(death_place)s."
 
-#: ReportUtils.py:1351
+#: ReportUtils.py:1352
 msgid ""
 "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %"
 "(age)d years."
@@ -3159,7 +3236,7 @@ msgstr ""
 "%(female_name)s умерла в %(month_year)s в %(death_place)s в возрасте %(age)d "
 "лет."
 
-#: ReportUtils.py:1358
+#: ReportUtils.py:1359
 msgid ""
 "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %"
 "(age)d months."
@@ -3167,7 +3244,7 @@ msgstr ""
 "%(female_name)s умерла в %(month_year)s в %(death_place)s в возрасте %(age)d "
 "месяцев."
 
-#: ReportUtils.py:1365
+#: ReportUtils.py:1366
 msgid ""
 "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %"
 "(age)d days."
@@ -3175,99 +3252,99 @@ msgstr ""
 "%(female_name)s умерла в %(month_year)s в %(death_place)s в возрасте %(age)d "
 "дней."
 
-#: ReportUtils.py:1373
+#: ReportUtils.py:1374
 msgid "%(female_name)s died in %(month_year)s."
 msgstr "%(female_name)s умерла в %(month_year)s."
 
-#: ReportUtils.py:1376
+#: ReportUtils.py:1377
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d years."
 msgstr "%(female_name)s умерла в %(month_year)s в возрасте %(age)d лет."
 
-#: ReportUtils.py:1381
+#: ReportUtils.py:1382
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d months."
 msgstr "%(female_name)s умерла в %(month_year)s в возрасте %(age)d месяцев."
 
-#: ReportUtils.py:1386
+#: ReportUtils.py:1387
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d days."
 msgstr "%(female_name)s умерла в %(month_year)s в возрасте %(age)d дней."
 
-#: ReportUtils.py:1393
+#: ReportUtils.py:1394
 msgid "%(female_name)s died in %(death_place)s."
 msgstr "%(female_name)s умерла в %(death_place)s."
 
-#: ReportUtils.py:1396
+#: ReportUtils.py:1397
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d years."
 msgstr "%(female_name)s умерла в %(death_place)s в возрасте %(age)d лет."
 
-#: ReportUtils.py:1401
+#: ReportUtils.py:1402
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d months."
 msgstr "%(female_name)s умерла в %(death_place)s в возрасте %(age)d месяцев."
 
-#: ReportUtils.py:1406
+#: ReportUtils.py:1407
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d days."
 msgstr "%(female_name)s умерла в %(death_place)s в возрасте %(age)d дней."
 
-#: ReportUtils.py:1415
+#: ReportUtils.py:1416
 msgid "%(female_name)s died at the age of %(age)d years."
 msgstr "%(female_name)s умерла в возрасте %(age)d лет."
 
-#: ReportUtils.py:1419
+#: ReportUtils.py:1420
 msgid "%(female_name)s died at the age of %(age)d months."
 msgstr "%(female_name)s умерла в возрасте %(age)d месяцев."
 
-#: ReportUtils.py:1423
+#: ReportUtils.py:1424
 msgid "%(female_name)s died at the age of %(age)d days."
 msgstr "%(female_name)s умерла в возрасте %(age)d дней."
 
-#: ReportUtils.py:1476
+#: ReportUtils.py:1477
 msgid "%(male_name)s was buried on %(burial_date)s in %(burial_place)s."
 msgstr "%(male_name)s был похоронен %(burial_date)s в %(burial_place)s."
 
-#: ReportUtils.py:1481
+#: ReportUtils.py:1482
 msgid "%(male_name)s was buried on %(burial_date)s."
 msgstr "%(male_name)s был похоронен %(burial_date)s."
 
-#: ReportUtils.py:1485
+#: ReportUtils.py:1486
 msgid "%(male_name)s was buried in %(month_year)s in %(burial_place)s."
 msgstr "%(male_name)s был похоронен в %(month_year)s в %(burial_place)s."
 
-#: ReportUtils.py:1490
+#: ReportUtils.py:1491
 msgid "%(male_name)s was buried in %(month_year)s."
 msgstr "%(male_name)s был похоронен в %(month_year)s."
 
-#: ReportUtils.py:1494
+#: ReportUtils.py:1495
 msgid "%(male_name)s was buried in %(burial_place)s."
 msgstr "%(male_name)s был похоронен в %(burial_place)s."
 
-#: ReportUtils.py:1497
+#: ReportUtils.py:1498
 msgid "%(male_name)s was buried."
 msgstr "%(male_name)s был похоронен."
 
-#: ReportUtils.py:1502
+#: ReportUtils.py:1503
 msgid "%(female_name)s was buried on %(burial_date)s in %(burial_place)s."
 msgstr "%(female_name)s была похоронена %(burial_date)s в %(burial_place)s."
 
-#: ReportUtils.py:1507
+#: ReportUtils.py:1508
 msgid "%(female_name)s was buried on %(burial_date)s."
 msgstr "%(female_name)s была похоронена %(burial_date)s."
 
-#: ReportUtils.py:1511
+#: ReportUtils.py:1512
 msgid "%(female_name)s was buried in %(month_year)s in %(burial_place)s."
 msgstr "%(female_name)s была похоронена в %(month_year)s в %(burial_place)s."
 
-#: ReportUtils.py:1516
+#: ReportUtils.py:1517
 msgid "%(female_name)s was buried in %(month_year)s."
 msgstr "%(female_name)s была похоронена в %(month_year)s."
 
-#: ReportUtils.py:1520
+#: ReportUtils.py:1521
 msgid "%(female_name)s was buried in %(burial_place)s."
 msgstr "%(female_name)s была похоронена в %(burial_place)s."
 
-#: ReportUtils.py:1523
+#: ReportUtils.py:1524
 msgid "%(female_name)s was buried."
 msgstr "%(female_name)s была похоронена."
 
-#: ReportUtils.py:1553
+#: ReportUtils.py:1554
 msgid ""
 "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s %"
 "(death_place)s."
@@ -3275,75 +3352,75 @@ msgstr ""
 "%(male_name)s Родился: %(birth_date)s %(birth_place)s Умер: %(death_date)s %"
 "(death_place)s."
 
-#: ReportUtils.py:1560
+#: ReportUtils.py:1561
 msgid ""
 "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s."
 msgstr ""
 "%(male_name)s Родился: %(birth_date)s %(birth_place)s Умер: %(death_date)s."
 
-#: ReportUtils.py:1568
+#: ReportUtils.py:1569
 msgid ""
 "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_place)s."
 msgstr ""
 "%(male_name)s Родился: %(birth_date)s %(birth_place)s Умер: %(death_place)s."
 
-#: ReportUtils.py:1575
+#: ReportUtils.py:1576
 msgid "%(male_name)s Born: %(birth_date)s %(birth_place)s."
 msgstr "%(male_name)s Родился: %(birth_date)s %(birth_place)s."
 
-#: ReportUtils.py:1582
+#: ReportUtils.py:1583
 msgid ""
 "%(male_name)s Born: %(birth_date)s Died: %(death_date)s %(death_place)s."
 msgstr ""
 "%(male_name)s Родился: %(birth_date)s  Умер: %(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1587
+#: ReportUtils.py:1588
 msgid "%(male_name)s Born: %(birth_date)s Died: %(death_date)s."
 msgstr "%(male_name)s Родился: %(birth_date)s Умер: %(death_date)s."
 
-#: ReportUtils.py:1593
+#: ReportUtils.py:1594
 msgid "%(male_name)s Born: %(birth_date)s Died: %(death_place)s."
 msgstr "%(male_name)s Родился: %(birth_date)s Умер: %(death_place)s."
 
-#: ReportUtils.py:1598
+#: ReportUtils.py:1599
 msgid "%(male_name)s Born: %(birth_date)s."
 msgstr "%(male_name)s Родился: %(birth_date)s."
 
-#: ReportUtils.py:1604
+#: ReportUtils.py:1605
 msgid ""
 "%(male_name)s Born: %(birth_place)s Died: %(death_date)s %(death_place)s."
 msgstr ""
 "%(male_name)s Родился: %(birth_place)s Умер: %(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1611
+#: ReportUtils.py:1612
 msgid "%(male_name)s Born: %(birth_place)s Died: %(death_date)s."
 msgstr "%(male_name)s Родился: %(birth_place)s Умер: %(death_date)s."
 
-#: ReportUtils.py:1619
+#: ReportUtils.py:1620
 msgid "%(male_name)s Born: %(birth_place)s Died: %(death_place)s."
 msgstr "%(male_name)s Родился: %(birth_place)s Умер: %(death_place)s."
 
-#: ReportUtils.py:1626
+#: ReportUtils.py:1627
 msgid "%(male_name)s Born: %(birth_place)s."
 msgstr "%(male_name)s Родился: %(birth_place)s."
 
-#: ReportUtils.py:1632
+#: ReportUtils.py:1633
 msgid "%(male_name)s Died: %(death_date)s %(death_place)s."
 msgstr "%(male_name)s Умер: %(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1637
+#: ReportUtils.py:1638
 msgid "%(male_name)s Died: %(death_date)s."
 msgstr "%(male_name)s Умер: %(death_date)s."
 
-#: ReportUtils.py:1642
+#: ReportUtils.py:1643
 msgid "%(male_name)s Died: %(death_place)s."
 msgstr "%(male_name)s Умер: %(death_place)s."
 
-#: ReportUtils.py:1645
+#: ReportUtils.py:1646
 msgid "%(male_name)s."
 msgstr "%(male_name)s."
 
-#: ReportUtils.py:1652
+#: ReportUtils.py:1653
 msgid ""
 "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s %"
 "(death_place)s."
@@ -3351,102 +3428,102 @@ msgstr ""
 "%(female_name)s Родилась: %(birth_date)s %(birth_place)s Умерла: %"
 "(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1659
+#: ReportUtils.py:1660
 msgid ""
 "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s."
 msgstr ""
 "%(female_name)s Родилась: %(birth_date)s %(birth_place)s Умерла: %"
 "(death_date)s."
 
-#: ReportUtils.py:1667
+#: ReportUtils.py:1668
 msgid ""
 "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_place)s."
 msgstr ""
 "%(female_name)s Родилась: %(birth_date)s %(birth_place)s Умерла: %"
 "(death_place)s."
 
-#: ReportUtils.py:1674
+#: ReportUtils.py:1675
 msgid "%(female_name)s Born: %(birth_date)s %(birth_place)s."
 msgstr "%(female_name)s Родилась: %(birth_date)s %(birth_place)s."
 
-#: ReportUtils.py:1681
+#: ReportUtils.py:1682
 msgid ""
 "%(female_name)s Born: %(birth_date)s Died: %(death_date)s %(death_place)s."
 msgstr ""
 "%(female_name)s Родилась: %(birth_date)s Умерла: %(death_date)s %"
 "(death_place)s."
 
-#: ReportUtils.py:1686
+#: ReportUtils.py:1687
 msgid "%(female_name)s Born: %(birth_date)s Died: %(death_date)s."
 msgstr "%(female_name)s Родилась: %(birth_date)s Умерла: %(death_date)s."
 
-#: ReportUtils.py:1692
+#: ReportUtils.py:1693
 msgid "%(female_name)s Born: %(birth_date)s Died: %(death_place)s."
 msgstr "%(female_name)s Родилась: %(birth_date)s Умерла: %(death_place)s."
 
-#: ReportUtils.py:1697
+#: ReportUtils.py:1698
 msgid "%(female_name)s Born: %(birth_date)s."
 msgstr "%(female_name)s Родилась: %(birth_date)s."
 
-#: ReportUtils.py:1703
+#: ReportUtils.py:1704
 msgid ""
 "%(female_name)s Born: %(birth_place)s Died: %(death_date)s %(death_place)s."
 msgstr ""
 "%(female_name)s Родилась: %(birth_place)s Умерла: %(death_date)s %"
 "(death_place)s."
 
-#: ReportUtils.py:1710
+#: ReportUtils.py:1711
 msgid "%(female_name)s Born: %(birth_place)s Died: %(death_date)s."
 msgstr "%(female_name)s Родилась: %(birth_place)s Умерла: %(death_date)s."
 
-#: ReportUtils.py:1718
+#: ReportUtils.py:1719
 msgid "%(female_name)s Born: %(birth_place)s Died: %(death_place)s."
 msgstr "%(female_name)s Родилась: %(birth_place)s Умерла: %(death_place)s."
 
-#: ReportUtils.py:1725
+#: ReportUtils.py:1726
 msgid "%(female_name)s Born: %(birth_place)s."
 msgstr "%(female_name)s Родилась: %(birth_place)s."
 
-#: ReportUtils.py:1731
+#: ReportUtils.py:1732
 msgid "%(female_name)s Died: %(death_date)s %(death_place)s."
 msgstr "%(female_name)s Умерла: %(death_date)s %(death_place)s."
 
-#: ReportUtils.py:1736
+#: ReportUtils.py:1737
 msgid "%(female_name)s Died: %(death_date)s."
 msgstr "%(female_name)s Умерла: %(death_date)s."
 
-#: ReportUtils.py:1741
+#: ReportUtils.py:1742
 msgid "%(female_name)s Died: %(death_place)s."
 msgstr "%(female_name)s Умерла: %(death_place)s."
 
-#: ReportUtils.py:1744
+#: ReportUtils.py:1745
 msgid "%(female_name)s."
 msgstr "%(female_name)s."
 
-#: ReportUtils.py:1753 const.py:490 gramps.glade:4344
+#: ReportUtils.py:1754 const.py:490 gramps.glade:4582
 #: plugins/FamilyGroup.py:376 plugins/FamilyGroup.py:378
 msgid "Married"
 msgstr "Женаты"
 
-#: ReportUtils.py:1754 const.py:491
+#: ReportUtils.py:1755 const.py:491
 msgid "Unmarried"
 msgstr "Не женаты"
 
-#: ReportUtils.py:1755 const.py:492
+#: ReportUtils.py:1756 const.py:492
 msgid "Civil Union"
 msgstr "Гражданский союз"
 
 # !!!FIXME!!! В закладке людей должно быть как минимум Другие (а что в остальных местах?)
-#: ReportUtils.py:1757 const.py:234 const.py:248 const.py:494
+#: ReportUtils.py:1758 const.py:234 const.py:248 const.py:494
 #: mergedata.glade:242
 msgid "Other"
 msgstr "Другое"
 
-#: SelectChild.py:288 SelectChild.py:307
+#: SelectChild.py:193 SelectChild.py:212
 msgid "A person cannot be linked as his/her own child"
 msgstr "Лицо не может быть своим ребёнком"
 
-#: SelectChild.py:332
+#: SelectChild.py:237
 msgid "Add Child to Family (%s)"
 msgstr "Добавить Ребёнка в Семью (%s)"
 
@@ -3462,11 +3539,11 @@ msgstr "Сокращение"
 msgid "Publication Information"
 msgstr "Информация о Публикации"
 
-#: SourceView.py:193
+#: SourceView.py:195
 msgid "Source Menu"
 msgstr "Источники"
 
-#: SourceView.py:218
+#: SourceView.py:220
 msgid ""
 "This source is currently being used. Deleting it will remove it from the "
 "database and from all records that reference it."
@@ -3474,19 +3551,19 @@ msgstr ""
 "Этот источник в настоящий момент используется. Стирание удалит его из базы "
 "данных и изо всех записей, которые на него ссылаются."
 
-#: SourceView.py:222
+#: SourceView.py:224
 msgid "Deleting source will remove it from the database."
 msgstr "Удаление источника сотрёт его из базы данных."
 
-#: SourceView.py:226
+#: SourceView.py:228
 msgid "_Delete Source"
 msgstr "У_далить источник"
 
-#: SourceView.py:267
+#: SourceView.py:269
 msgid "Cannot merge sources."
 msgstr "Не могу слить источники."
 
-#: SourceView.py:268
+#: SourceView.py:270
 msgid ""
 "Exactly two sources must be selected to perform a merge. A second source can "
 "be selected by holding down the control key while clicking on the desired "
@@ -3597,33 +3674,33 @@ msgstr ""
 "информацию. Если вы не планируете создание GEDCOM файлов, то можете оставить "
 "эту часть незаполненной."
 
-#: StartupDialog.py:243 gramps.glade:5910 gramps.glade:5981 gramps.glade:7774
-#: gramps.glade:8584 gramps.glade:9098 gramps.glade:9534 gramps.glade:12280
-#: gramps.glade:12775 plugins/soundex.glade:110
+#: StartupDialog.py:243 gramps.glade:6235 gramps.glade:6318 gramps.glade:8240
+#: gramps.glade:9157 gramps.glade:9730 gramps.glade:10213 gramps.glade:13193
+#: gramps.glade:13747 plugins/soundex.glade:110
 msgid "Name:"
 msgstr "Наименование:"
 
-#: StartupDialog.py:244 gramps.glade:9486 plugins/Ancestors.py:505
+#: StartupDialog.py:244 gramps.glade:10157 plugins/Ancestors.py:505
 msgid "Address:"
 msgstr "Адрес:"
 
-#: StartupDialog.py:245 gramps.glade:14682
+#: StartupDialog.py:245 gramps.glade:15804
 msgid "City:"
 msgstr "Город:"
 
-#: StartupDialog.py:246 gramps.glade:9606
+#: StartupDialog.py:246 gramps.glade:10297
 msgid "State/Province:"
 msgstr "Штат/Провинция:"
 
-#: StartupDialog.py:247 gramps.glade:9510 gramps.glade:14730
+#: StartupDialog.py:247 gramps.glade:10185 gramps.glade:15860
 msgid "Country:"
 msgstr "Страна:"
 
-#: StartupDialog.py:248 gramps.glade:9582
+#: StartupDialog.py:248 gramps.glade:10269
 msgid "ZIP/Postal code:"
 msgstr "Индекс/Почтовый код:"
 
-#: StartupDialog.py:249 gramps.glade:9868 gramps.glade:14977
+#: StartupDialog.py:249 gramps.glade:10603 gramps.glade:16147
 msgid "Phone:"
 msgstr "Телефон:"
 
@@ -3700,7 +3777,7 @@ msgstr "Редактор Интернет-адресов"
 msgid "Internet Address Editor for %s"
 msgstr "Редактор Интернет-адресов для %s"
 
-#: Utils.py:72
+#: Utils.py:67
 msgid ""
 "The data can only be recovered by Undo operation or by quitting with "
 "abandoning changes."
@@ -3732,32 +3809,33 @@ msgstr ""
 "\n"
 "Пожалуйста, попробуйте ещё раз. Свидетель не изменён."
 
-#: WriteGedcom.py:333 plugins/DescendReport.py:116
-#: plugins/ExportVCalendar.py:85 plugins/ExportVCard.py:88
+#: WriteGedcom.py:334 plugins/DescendReport.py:116
+#: plugins/ExportVCalendar.py:87 plugins/ExportVCard.py:89
 #: plugins/FtmStyleDescendants.py:121 plugins/GraphViz.py:517
 #: plugins/IndivComplete.py:514 plugins/StatisticsChart.py:831
-#: plugins/TimeLine.py:415 plugins/WebPage.py:1269 plugins/WriteFtree.py:90
-#: plugins/WriteGeneWeb.py:91
+#: plugins/TimeLine.py:415 plugins/WebPage.py:1269 plugins/WriteFtree.py:91
+#: plugins/WriteGeneWeb.py:92
 msgid "Descendants of %s"
 msgstr "Потомки %s"
 
-#: WriteGedcom.py:337 plugins/Ancestors.py:141 plugins/ExportVCalendar.py:89
-#: plugins/ExportVCard.py:92 plugins/FtmStyleAncestors.py:96
+#: WriteGedcom.py:340 plugins/Ancestors.py:141 plugins/ExportVCalendar.py:93
+#: plugins/ExportVCard.py:95 plugins/FtmStyleAncestors.py:96
 #: plugins/GraphViz.py:521 plugins/IndivComplete.py:518
 #: plugins/StatisticsChart.py:835 plugins/TimeLine.py:419
-#: plugins/WebPage.py:1277 plugins/WriteFtree.py:94 plugins/WriteGeneWeb.py:95
+#: plugins/WebPage.py:1277 plugins/WriteFtree.py:97 plugins/WriteGeneWeb.py:98
 msgid "Ancestors of %s"
 msgstr "Предки %s"
 
-#: WriteGedcom.py:341 plugins/ExportVCalendar.py:93 plugins/ExportVCard.py:96
+#: WriteGedcom.py:346 plugins/ExportVCalendar.py:99 plugins/ExportVCard.py:101
 #: plugins/GraphViz.py:525 plugins/IndivComplete.py:522
 #: plugins/StatisticsChart.py:839 plugins/TimeLine.py:423
-#: plugins/WebPage.py:1281 plugins/WriteFtree.py:98 plugins/WriteGeneWeb.py:99
+#: plugins/WebPage.py:1281 plugins/WriteFtree.py:103
+#: plugins/WriteGeneWeb.py:104
 msgid "People with common ancestor with %s"
 msgstr "Лица, имеющие общего предка с %s"
 
-#: WriteGedcom.py:557 WriteGedcom.py:562 docgen/AbiWord2Doc.py:77
-#: docgen/AbiWord2Doc.py:80 docgen/AsciiDoc.py:113 docgen/AsciiDoc.py:116
+#: WriteGedcom.py:565 WriteGedcom.py:570 docgen/AbiWord2Doc.py:75
+#: docgen/AbiWord2Doc.py:78 docgen/AsciiDoc.py:113 docgen/AsciiDoc.py:116
 #: docgen/HtmlDoc.py:225 docgen/HtmlDoc.py:228 docgen/HtmlDoc.py:353
 #: docgen/HtmlDoc.py:356 docgen/LaTeXDoc.py:87 docgen/LaTeXDoc.py:90
 #: docgen/OpenSpreadSheet.py:76 docgen/OpenSpreadSheet.py:78
@@ -3766,18 +3844,18 @@ msgstr "Лица, имеющие общего предка с %s"
 #: docgen/OpenSpreadSheet.py:436 docgen/OpenSpreadSheet.py:440
 #: docgen/PSDrawDoc.py:95 docgen/PSDrawDoc.py:98 docgen/PdfDoc.py:180
 #: docgen/RTFDoc.py:80 docgen/RTFDoc.py:83 docgen/SvgDrawDoc.py:75
-#: docgen/SvgDrawDoc.py:77 plugins/ExportVCalendar.py:168
-#: plugins/ExportVCalendar.py:172 plugins/ExportVCard.py:153
-#: plugins/ExportVCard.py:157 plugins/WriteGeneWeb.py:210
-#: plugins/WriteGeneWeb.py:214
+#: docgen/SvgDrawDoc.py:77 plugins/ExportVCalendar.py:178
+#: plugins/ExportVCalendar.py:182 plugins/ExportVCard.py:162
+#: plugins/ExportVCard.py:166 plugins/WriteGeneWeb.py:219
+#: plugins/WriteGeneWeb.py:223
 msgid "Could not create %s"
 msgstr "Ошибка при создании %s"
 
-#: WriteGedcom.py:1252
+#: WriteGedcom.py:1272
 msgid "GE_DCOM"
 msgstr "GE_DCOM"
 
-#: WriteGedcom.py:1253
+#: WriteGedcom.py:1273
 msgid ""
 "GEDCOM is used to transfer data between genealogy programs. Most genealogy "
 "software will accept a GEDCOM file as input. "
@@ -3785,7 +3863,7 @@ msgstr ""
 "GEDCOM используется для переноски данных между генеалогическими программами. "
 "Большинство генеалогических программ принимает данные в формате GEDCOM."
 
-#: WriteGedcom.py:1255
+#: WriteGedcom.py:1275
 msgid "GEDCOM export options"
 msgstr "Опции GEDCOM экспорта"
 
@@ -4088,127 +4166,127 @@ msgstr "Отношения между мужчиной и женщиной не
 msgid "An unspecified relationship between a man and woman"
 msgstr "Отношения между мужчиной и женщиной не указаны"
 
-#: const.py:515
+#: const.py:522
 msgid "Also Known As"
 msgstr "Он(а) же"
 
-#: const.py:516
+#: const.py:523
 msgid "Birth Name"
 msgstr "Фамилия при рождении"
 
-#: const.py:517
+#: const.py:524
 msgid "Married Name"
 msgstr "Фамилия в браке"
 
-#: const.py:518
+#: const.py:525
 msgid "Other Name"
 msgstr "Другое имя"
 
 # Кривовато немного
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid ""
 msgstr "<нет статуса>"
 
 # LDS
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid "Cleared"
 msgstr "Одобрено"
 
 # LDS
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid "Completed"
 msgstr "Выполнено"
 
 # LDS
-#: const.py:903
+#: const.py:910
 msgid "Infant"
 msgstr "Младенец (1-12м)"
 
 # LDS
-#: const.py:903 const.py:909
+#: const.py:910 const.py:916
 msgid "Stillborn"
 msgstr "Мертворождённый"
 
 # LDS
-#: const.py:903 const.py:909 const.py:915
+#: const.py:910 const.py:916 const.py:922
 msgid "Pre-1970"
 msgstr "До 1970"
 
 # LDS, An ordinance request was qualified by authorized crteria 
-#: const.py:903 const.py:909 const.py:915
+#: const.py:910 const.py:916 const.py:922
 msgid "Qualified"
 msgstr "Возможно"
 
 # LDS
-#: const.py:904 const.py:910 const.py:916
+#: const.py:911 const.py:917 const.py:923
 msgid "Submitted"
 msgstr "Запрошено"
 
 # LDS
-#: const.py:904 const.py:910 const.py:916
+#: const.py:911 const.py:917 const.py:923
 msgid "Uncleared"
 msgstr "Отозвано"
 
 # LDS
-#: const.py:908
+#: const.py:915
 msgid "BIC"
 msgstr "Рождён в завете"
 
 # LDS
-#: const.py:909 const.py:915
+#: const.py:916 const.py:922
 msgid "DNS"
 msgstr "Не приписывать"
 
 # LDS
-#: const.py:914
+#: const.py:921
 msgid "Canceled"
 msgstr "Отменено"
 
 # LDS? !!!FIXME!!!
-#: const.py:915
+#: const.py:922
 msgid "DNS/CAN"
 msgstr "Не приписывать/CAN"
 
-#: const.py:921
+#: const.py:928
 msgid "Flowed"
 msgstr "Простой текст"
 
-#: const.py:922
+#: const.py:929
 msgid "Preformatted"
 msgstr "Форматированный"
 
-#: const.py:934
+#: const.py:941
 msgid "Text Reports"
 msgstr "Текстовые отчёты"
 
-#: const.py:935
+#: const.py:942
 msgid "Graphical Reports"
 msgstr "Графические отчёты"
 
-#: const.py:936
+#: const.py:943
 msgid "Code Generators"
 msgstr "Генераторы Кода"
 
-#: const.py:937 plugins/WebPage.py:1719
+#: const.py:944 plugins/WebPage.py:1719
 msgid "Web Page"
 msgstr "Web отчёты"
 
-#: const.py:938
+#: const.py:945
 msgid "View"
 msgstr "Статистика"
 
-#: const.py:939
+#: const.py:946
 msgid "Books"
 msgstr "Книги"
 
-#: const.py:943 plugins/ScratchPad.py:356 plugins/ScratchPad.py:405
+#: const.py:950 plugins/ScratchPad.py:356 plugins/ScratchPad.py:405
 #: plugins/ScratchPad.py:413 plugins/SimpleBookTitle.py:169
 #: plugins/SimpleBookTitle.py:170 plugins/SimpleBookTitle.py:171
 msgid "Text"
 msgstr "Текст"
 
 # !!!FIXME!!!
-#: const.py:944
+#: const.py:951
 msgid "Graphics"
 msgstr "Графика"
 
@@ -4392,8 +4470,8 @@ msgid ""
 "allowing you to tailor GRAMPS to your needs."
 msgstr ""
 "Выбор Ваших настроек: Недовольны поведением GRAMPS по умолчанию? "
-"Правка > Настройки позволит Вам изменить установки, подгоняя "
-"GRAMPS под Ваши требования."
+"Правка > Настройки позволит Вам изменить установки, подгоняя GRAMPS "
+"под Ваши требования."
 
 #: data/tips.xml:134
 msgid ""
@@ -4483,11 +4561,10 @@ msgid ""
 "is full of information that will make your time spent on genealogy more "
 "productive."
 msgstr ""
-"Не забудьте прочитать руководство пользователя GRAMPS, Справка "
-"> Руководство·пользователя. Разработчики постарались сделать "
-"большинство операций интуитивными, но руководство содержит "
-"информацию, которая сделает время, потраченное на генеалогию, "
-"более продуктивным."
+"Не забудьте прочитать руководство пользователя GRAMPS, Справка > "
+"Руководство·пользователя. Разработчики постарались сделать большинство "
+"операций интуитивными, но руководство содержит информацию, которая сделает "
+"время, потраченное на генеалогию, более продуктивным."
 
 #: data/tips.xml:203
 msgid ""
@@ -4878,7 +4955,7 @@ msgstr ""
 "стандартом для записи генеалогической информации.Существующие фильтры делают "
 "импорт и экспорт файлов GEDCOM элементарной процедурой."
 
-#: docgen/AbiWord2Doc.py:332
+#: docgen/AbiWord2Doc.py:340
 msgid "AbiWord document"
 msgstr "Докуиент AbiWord"
 
@@ -4960,7 +5037,7 @@ msgstr "SVG (Scalable Vector Graphics)"
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: gedcomexport.glade:127 gramps.glade:20090 gramps.glade:28994
+#: gedcomexport.glade:127 gramps.glade:21644 gramps.glade:31156
 #: plugins/genewebexport.glade:103 plugins/merge.glade:385
 #: plugins/vcalendarexport.glade:103 plugins/vcardexport.glade:103
 #: plugins/writeftree.glade:124
@@ -5063,7 +5140,7 @@ msgstr "Создан:"
 msgid "Status"
 msgstr "Статус"
 
-#: gedcomimport.glade:216 gramps.glade:3482 gramps.glade:19306
+#: gedcomimport.glade:216 gramps.glade:3660 gramps.glade:20805
 msgid "Information"
 msgstr "Информация"
 
@@ -5116,344 +5193,344 @@ msgstr ""
 "ASCII\n"
 "UNICODE"
 
-#: gramps.glade:10 gramps.glade:31082
+#: gramps.glade:10 gramps.glade:33389
 msgid "GRAMPS"
 msgstr "GRAMPS"
 
-#: gramps.glade:44
+#: gramps.glade:45
 msgid "_File"
 msgstr "_Файл"
 
-#: gramps.glade:53
+#: gramps.glade:54
 msgid "_New"
 msgstr "_Новый"
 
-#: gramps.glade:75
+#: gramps.glade:76
 msgid "_Open..."
 msgstr "_Открыть..."
 
-#: gramps.glade:97
+#: gramps.glade:98
 msgid "Open _Recent"
 msgstr "Открыть не_давнее"
 
-#: gramps.glade:112
+#: gramps.glade:113
 msgid "_Import..."
 msgstr "_Импорт..."
 
-#: gramps.glade:134
+#: gramps.glade:135
 msgid "Save _As..."
 msgstr "Сохранить _как..."
 
-#: gramps.glade:156
+#: gramps.glade:157
 msgid "E_xport..."
 msgstr "_Экспорт..."
 
-#: gramps.glade:184
+#: gramps.glade:185
 msgid "A_bandon changes and quit"
 msgstr "От_катить изменения и выйти"
 
-#: gramps.glade:193
+#: gramps.glade:194
 msgid "_Quit"
 msgstr "_Выйти"
 
-#: gramps.glade:219
+#: gramps.glade:220
 msgid "_Edit"
 msgstr "_Правка"
 
-#: gramps.glade:228 gramps_main.py:536
+#: gramps.glade:229 gramps_main.py:536
 msgid "_Undo"
 msgstr "_Откатить"
 
-#: gramps.glade:256 gramps.glade:918
+#: gramps.glade:257 gramps.glade:919
 msgid "Add a new item"
 msgstr "Добавить"
 
-#: gramps.glade:257 rule.glade:135 rule.glade:722
+#: gramps.glade:258 rule.glade:135 rule.glade:722
 msgid "_Add..."
 msgstr "_Добавить..."
 
-#: gramps.glade:279 gramps.glade:936
+#: gramps.glade:280 gramps.glade:937
 msgid "Remove the currently selected item"
 msgstr "Удалить выделенное"
 
-#: gramps.glade:280
+#: gramps.glade:281
 msgid "R_emove"
 msgstr "У_далить"
 
-#: gramps.glade:302 gramps.glade:954
+#: gramps.glade:303 gramps.glade:955
 msgid "Edit the selected item"
 msgstr "Редактировать выделенное"
 
-#: gramps.glade:303
+#: gramps.glade:304
 msgid "E_dit..."
 msgstr "_Правка..."
 
-#: gramps.glade:318
+#: gramps.glade:319
 msgid "Compare and _Merge..."
 msgstr "Сравнение и С_лияние..."
 
-#: gramps.glade:340
+#: gramps.glade:341
 msgid "Fast Mer_ge"
 msgstr "Быстрое с_лияние"
 
-#: gramps.glade:355
+#: gramps.glade:356
 msgid "Prefere_nces..."
 msgstr "_Настройки..."
 
-#: gramps.glade:376
+#: gramps.glade:377
 msgid "_Column Editor..."
 msgstr "Редактор _Колонок..."
 
-#: gramps.glade:397
+#: gramps.glade:398
 msgid "Set _Home person..."
 msgstr "Установить _Базовое лицо..."
 
-#: gramps.glade:422
+#: gramps.glade:423
 msgid "_View"
 msgstr "_Вид"
 
-#: gramps.glade:431
+#: gramps.glade:432
 msgid "_Filter"
 msgstr "_Фильтр"
 
-#: gramps.glade:441
+#: gramps.glade:442
 msgid "_Sidebar"
 msgstr "_Боковая панель"
 
-#: gramps.glade:451
+#: gramps.glade:452
 msgid "_Toolbar"
 msgstr "_Панель инструментов"
 
-#: gramps.glade:465
+#: gramps.glade:466
 msgid "_Go"
 msgstr "Пере_ход"
 
-#: gramps.glade:473
+#: gramps.glade:474
 msgid "_Bookmarks"
 msgstr "_Закладки"
 
-#: gramps.glade:482
+#: gramps.glade:483
 msgid "_Add bookmark"
 msgstr "_Добавить закладку"
 
-#: gramps.glade:504
+#: gramps.glade:505
 msgid "_Edit bookmarks..."
 msgstr "_Правка закладок..."
 
-#: gramps.glade:532
+#: gramps.glade:533
 msgid "_Go to bookmark"
 msgstr "Пере_ход к закладке"
 
-#: gramps.glade:544
+#: gramps.glade:545
 msgid "_Reports"
 msgstr "_Отчёты"
 
-#: gramps.glade:552
+#: gramps.glade:553
 msgid "_Tools"
 msgstr "_Инструменты"
 
-#: gramps.glade:560
+#: gramps.glade:561
 msgid "_Windows"
 msgstr "_Окна"
 
-#: gramps.glade:568
+#: gramps.glade:569
 msgid "_Help"
 msgstr "_Справка"
 
-#: gramps.glade:577
+#: gramps.glade:578
 msgid "_User manual"
 msgstr "_Руководство пользователя"
 
-#: gramps.glade:599
+#: gramps.glade:600
 msgid "_FAQ"
 msgstr "_ЧАВО"
 
-#: gramps.glade:626
+#: gramps.glade:627
 msgid "GRAMPS _home page"
 msgstr "_Домашняя страница GRAMPS"
 
-#: gramps.glade:647
+#: gramps.glade:648
 msgid "GRAMPS _mailing lists"
 msgstr "_Списки рассылки GRAMPS"
 
-#: gramps.glade:668
+#: gramps.glade:669
 msgid "_Report a bug"
 msgstr "О_тослать отчёт об ошибке"
 
-#: gramps.glade:683
+#: gramps.glade:684
 msgid "_Show plugin status..."
 msgstr "Статус _загружаемых модулей..."
 
-#: gramps.glade:692
+#: gramps.glade:693
 msgid "_Open example database"
 msgstr "Образец _базы данных"
 
-#: gramps.glade:701
+#: gramps.glade:702
 msgid "_About"
 msgstr "О _программе"
 
-#: gramps.glade:751
+#: gramps.glade:752
 msgid "Open database"
 msgstr "Открыть базу данных"
 
-#: gramps.glade:752
+#: gramps.glade:753
 msgid "Open"
 msgstr "Открыть"
 
-#: gramps.glade:782
+#: gramps.glade:783
 msgid "Go back in history"
 msgstr "Шаг назад по истории"
 
-#: gramps.glade:783
+#: gramps.glade:784
 msgid "Back"
 msgstr "Назад"
 
-#: gramps.glade:801
+#: gramps.glade:802
 msgid "Go forward in history"
 msgstr "Шаг вперёд по истории"
 
-#: gramps.glade:802
+#: gramps.glade:803
 msgid "Forward"
 msgstr "Вперёд"
 
-#: gramps.glade:820
+#: gramps.glade:821
 msgid "Make the Home Person the active person"
 msgstr "Сделать Базовое лицо активным"
 
-#: gramps.glade:851
+#: gramps.glade:852
 msgid "Open Scratch Pad"
 msgstr "Открыть Черновик"
 
-#: gramps.glade:852
+#: gramps.glade:853
 msgid "ScratchPad"
 msgstr "Черновик"
 
-#: gramps.glade:869
+#: gramps.glade:870
 msgid "Generate reports"
 msgstr "Генерировать отчёты"
 
-#: gramps.glade:870
+#: gramps.glade:871
 msgid "Reports"
 msgstr "Отчёты"
 
-#: gramps.glade:887
+#: gramps.glade:888
 msgid "Run tools"
 msgstr "Запустить инструменты"
 
-#: gramps.glade:888
+#: gramps.glade:889
 msgid "Tools"
 msgstr "Инструменты"
 
-#: gramps.glade:919
+#: gramps.glade:920
 msgid "Add"
 msgstr "Добавить"
 
-#: gramps.glade:937
+#: gramps.glade:938
 msgid "Remove"
 msgstr "Удалить"
 
-#: gramps.glade:1028 gramps.glade:1452
+#: gramps.glade:1029 gramps.glade:1486
 msgid "People"
 msgstr "Люди"
 
-#: gramps.glade:1076 gramps.glade:2237 gramps.glade:2992
+#: gramps.glade:1081 gramps.glade:2310 gramps.glade:3104
 msgid "Family"
 msgstr "Семья"
 
-#: gramps.glade:1124 gramps.glade:3039
+#: gramps.glade:1133 gramps.glade:3155
 msgid "Pedigree"
 msgstr "Родословная"
 
-#: gramps.glade:1172 gramps.glade:3097
+#: gramps.glade:1185 gramps.glade:3220
 msgid "Sources"
 msgstr "Источники"
 
-#: gramps.glade:1220 gramps.glade:3155
+#: gramps.glade:1237 gramps.glade:3285
 msgid "Places"
 msgstr "Места"
 
-#: gramps.glade:1268 gramps.glade:3554
+#: gramps.glade:1289 gramps.glade:3739
 msgid "Media"
 msgstr "Альбом"
 
-#: gramps.glade:1376
+#: gramps.glade:1407
 msgid "Invert"
 msgstr "Обратить"
 
-#: gramps.glade:1394
+#: gramps.glade:1425
 msgid "Apply filter using the selected controls"
 msgstr "Отфильтровать, используя выбранные настройки"
 
-#: gramps.glade:1481 gramps.glade:2956
+#: gramps.glade:1519 gramps.glade:3068
 msgid "Exchange the current spouse with the active person"
 msgstr "Сделать текущего супруга активным лицом"
 
-#: gramps.glade:1547 gramps.glade:2718
+#: gramps.glade:1585 gramps.glade:2822
 msgid "Adds a new person to the database and to a new relationship"
 msgstr "Добавить супруга/партнёра"
 
-#: gramps.glade:1574 gramps.glade:2745
+#: gramps.glade:1612 gramps.glade:2849
 msgid ""
 "Selects an existing person from the database and adds to a new relationship"
 msgstr "Добавить супруга/партнёра из списка существующих в базе данных лиц"
 
-#: gramps.glade:1601 gramps.glade:2772
+#: gramps.glade:1639 gramps.glade:2876
 msgid "Removes the currently selected spouse"
 msgstr "Удалить выделенного супруга"
 
-#: gramps.glade:1644 gramps.glade:2865
+#: gramps.glade:1682 gramps.glade:2977
 msgid "Make the active person's parents the active family"
 msgstr "Сделать родителей активного лица активной семьёй"
 
-#: gramps.glade:1671 gramps.glade:2892
+#: gramps.glade:1709 gramps.glade:3004
 msgid "Adds a new set of parents to the active person"
 msgstr "Добавить новых родителей"
 
-#: gramps.glade:1698 gramps.glade:2919
+#: gramps.glade:1736 gramps.glade:3031
 msgid "Deletes the selected parents from the active person"
 msgstr "Удалить выделенных родителей"
 
-#: gramps.glade:1744 gramps.glade:2026 gramps.glade:2360 gramps.glade:2390
+#: gramps.glade:1782 gramps.glade:2090 gramps.glade:2447 gramps.glade:2480
 msgid "Double-click to edit the relationship to the selected parents"
 msgstr "Двойной щелчок вызывает редактор отношений к выделенным родителям"
 
-#: gramps.glade:1771 gramps.glade:2596
+#: gramps.glade:1812 gramps.glade:2696
 msgid "Make the selected spouse's parents the active family"
 msgstr "Сделать родителей выделенного супруга активной семьёй"
 
-#: gramps.glade:1798 gramps.glade:2623
+#: gramps.glade:1839 gramps.glade:2723
 msgid "Adds a new set of parents to the selected spouse"
 msgstr "Добавить выделенному супругу новых родителей"
 
-#: gramps.glade:1825 gramps.glade:2650
+#: gramps.glade:1866 gramps.glade:2750
 msgid "Deletes the selected parents from the selected spouse"
 msgstr "Удалить выделенных родителей у выделенного супруга"
 
-#: gramps.glade:1862 gramps.glade:2296
+#: gramps.glade:1903 gramps.glade:2376
 msgid "_Children"
 msgstr "Д_ети"
 
-#: gramps.glade:1887 gramps.glade:2809
+#: gramps.glade:1932 gramps.glade:2913
 msgid "_Active person"
 msgstr "_Активное лицо"
 
-#: gramps.glade:1912 gramps.glade:2834
+#: gramps.glade:1961 gramps.glade:2942
 msgid "Active person's _parents"
 msgstr "_Родители"
 
-#: gramps.glade:1937 gramps.glade:2687
+#: gramps.glade:1990 gramps.glade:2787
 msgid "Relati_onship"
 msgstr "_Супруг/партнёр"
 
-#: gramps.glade:1962 gramps.glade:2565
+#: gramps.glade:2019 gramps.glade:2661
 msgid "Spo_use's parents"
 msgstr "Роди_тели супруга/партнёра"
 
-#: gramps.glade:2056 gramps.glade:2420
+#: gramps.glade:2123 gramps.glade:2513
 msgid "Double-click to edit the active person"
 msgstr "Двойной щелчок вызывает редактор для активного лица"
 
-#: gramps.glade:2086 gramps.glade:2275
+#: gramps.glade:2156 gramps.glade:2352
 msgid ""
 "Double-click to edit the relationship information, Shift-click to edit the "
 "person"
@@ -5461,44 +5538,44 @@ msgstr ""
 "Двойной щелчок вызывает редактор информации об отношении, Shift-щелчок - о "
 "лице"
 
-#: gramps.glade:2113 gramps.glade:2447
+#: gramps.glade:2186 gramps.glade:2543
 msgid "Make the selected child the active person"
 msgstr "Сделать выделенного ребёнка активным лицом"
 
-#: gramps.glade:2140 gramps.glade:2474
+#: gramps.glade:2213 gramps.glade:2570
 msgid "Adds a new child to the database and to the current family"
 msgstr "Добавить нового ребёнка"
 
-#: gramps.glade:2167 gramps.glade:2501
+#: gramps.glade:2240 gramps.glade:2597
 msgid ""
 "Selects an existing person from the database and adds as a child to the "
 "current family"
 msgstr "Добавить ребёнка из списка существующих в базе данных лиц"
 
-#: gramps.glade:2194 gramps.glade:2528
+#: gramps.glade:2267 gramps.glade:2624
 msgid "Deletes the selected child from the selected family"
 msgstr "Удалить выделенного ребёнка"
 
-#: gramps.glade:3206 gramps.glade:19030 gramps.glade:21050 gramps.glade:21315
-#: gramps.glade:22712
+#: gramps.glade:3340 gramps.glade:20485 gramps.glade:22681 gramps.glade:22959
+#: gramps.glade:24471
 msgid "Preview"
 msgstr "Предварительный просмотр"
 
-#: gramps.glade:3242 gramps.glade:19066
+#: gramps.glade:3380 gramps.glade:20525
 msgid "Details:"
 msgstr "Подробности:"
 
-#: gramps.glade:3313 gramps.glade:19137 gramps.glade:21351 gramps.glade:22748
+#: gramps.glade:3463 gramps.glade:20608 gramps.glade:22999 gramps.glade:24511
 msgid "Path:"
 msgstr "Путь:"
 
-#: gramps.glade:3338 gramps.glade:7942 gramps.glade:8512 gramps.glade:9026
-#: gramps.glade:12184 gramps.glade:12799 gramps.glade:19162 gramps.glade:22079
-#: gramps.glade:23157
+#: gramps.glade:3492 gramps.glade:8436 gramps.glade:9073 gramps.glade:9646
+#: gramps.glade:13081 gramps.glade:13775 gramps.glade:20637 gramps.glade:23799
+#: gramps.glade:24964
 msgid "Type:"
 msgstr "Тип:"
 
-#: gramps.glade:3778
+#: gramps.glade:3975
 msgid ""
 "Check to show all people in the list.  Uncheck to get the list filtered by "
 "birth and death dates."
@@ -5506,15 +5583,15 @@ msgstr ""
 "Отметьте, чтобы показать всех людей в списке. Уберите отметку, чтобы отсеять "
 "список по датам рождения и смерти."
 
-#: gramps.glade:3780 gramps.glade:4156 gramps.glade:4574
+#: gramps.glade:3977 gramps.glade:4380 gramps.glade:4826
 msgid "_Show all"
 msgstr "По_казать всех"
 
-#: gramps.glade:3827 gramps.glade:11954
+#: gramps.glade:4024 gramps.glade:12825
 msgid "_Relationship type:"
 msgstr "Тип _отношений:"
 
-#: gramps.glade:3855
+#: gramps.glade:4056
 msgid ""
 "Married\n"
 "Unmarried\n"
@@ -5528,84 +5605,84 @@ msgstr ""
 "Неизвестно\n"
 "Другое"
 
-#: gramps.glade:4025
+#: gramps.glade:4233
 msgid "_Father's relationship to child:"
 msgstr "Отношение _отца к ребёнку:"
 
-#: gramps.glade:4049
+#: gramps.glade:4261
 msgid "_Mother's relationship to child:"
 msgstr "Отношение _матери к ребёнку:"
 
-#: gramps.glade:4073
+#: gramps.glade:4289
 msgid "_Parents' relationship to each other:"
 msgstr "Отношение _родителей между собой:"
 
-#: gramps.glade:4097
+#: gramps.glade:4317
 msgid "Fat_her"
 msgstr "Оте_ц"
 
-#: gramps.glade:4192
+#: gramps.glade:4416
 msgid "Moth_er"
 msgstr "Ма_ть"
 
-#: gramps.glade:4217
+#: gramps.glade:4445
 msgid "Relationships"
 msgstr "Отношения"
 
-#: gramps.glade:4311
+#: gramps.glade:4549
 msgid "Show _all"
 msgstr "Показать _всех"
 
-#: gramps.glade:4643
+#: gramps.glade:4895
 msgid "Relationship to father:"
 msgstr "Отношение к отцу:"
 
-#: gramps.glade:4667
+#: gramps.glade:4923
 msgid "Relationship to mother:"
 msgstr "Отношение к матери:"
 
-#: gramps.glade:4758 gramps.glade:6549 gramps.glade:11846 gramps.glade:28451
+#: gramps.glade:5023 gramps.glade:6932 gramps.glade:12713 gramps.glade:30562
 msgid "Abandon changes and close window"
 msgstr "Откатить изменения и закрыть окно"
 
-#: gramps.glade:4773 gramps.glade:6564 gramps.glade:11861 gramps.glade:25038
-#: gramps.glade:27302 gramps.glade:28196 gramps.glade:28466
+#: gramps.glade:5038 gramps.glade:6947 gramps.glade:12728 gramps.glade:26958
+#: gramps.glade:29348 gramps.glade:30294 gramps.glade:30577
 msgid "Accept changes and close window"
 msgstr "Принять изменения и закрыть окно"
 
-#: gramps.glade:4860 gramps.glade:6759 gramps.glade:14059 gramps.glade:18137
-#: gramps.glade:21096 gramps.glade:22932 gramps.glade:28635
+#: gramps.glade:5129 gramps.glade:7162 gramps.glade:15121 gramps.glade:19547
+#: gramps.glade:22731 gramps.glade:24719 gramps.glade:30762
 msgid "_Title:"
 msgstr "Титу_л:"
 
-#: gramps.glade:4885
+#: gramps.glade:5158
 msgid "_Author:"
 msgstr "_Автор:"
 
-#: gramps.glade:4956
+#: gramps.glade:5233
 msgid "_Publication information:"
 msgstr "Информация о _публикации:"
 
-#: gramps.glade:5023
+#: gramps.glade:5304
 msgid "A_bbreviation:"
 msgstr "А_ббревиатура:"
 
 # !!!FIXME!!!
-#: gramps.glade:5054 gramps.glade:12125 gramps.glade:14453 gramps.glade:14623
-#: gramps.glade:23075 gramps.glade:25412 gramps.glade:26416 gramps.glade:27784
-#: gramps.glade:29213 plugins/verify.glade:530
+#: gramps.glade:5339 gramps.glade:13014 gramps.glade:15547 gramps.glade:15737
+#: gramps.glade:24870 gramps.glade:27359 gramps.glade:28409 gramps.glade:29862
+#: gramps.glade:31390 plugins/verify.glade:530
 msgid "General"
 msgstr "Общее"
 
-#: gramps.glade:5124 gramps.glade:10183 gramps.glade:13187 gramps.glade:15258
-#: gramps.glade:21905 gramps.glade:23465 gramps.glade:25663 gramps.glade:26665
-#: gramps.glade:28033 gramps.glade:29464
+#: gramps.glade:5413 gramps.glade:10933 gramps.glade:14198 gramps.glade:16443
+#: gramps.glade:23613 gramps.glade:25291 gramps.glade:27621 gramps.glade:28669
+#: gramps.glade:30122 gramps.glade:31652
 msgid "Format"
 msgstr "Формат"
 
-#: gramps.glade:5148 gramps.glade:10208 gramps.glade:13211 gramps.glade:15282
-#: gramps.glade:21929 gramps.glade:23489 gramps.glade:25687 gramps.glade:26689
-#: gramps.glade:28057 gramps.glade:29488
+#: gramps.glade:5441 gramps.glade:10962 gramps.glade:14226 gramps.glade:16471
+#: gramps.glade:23641 gramps.glade:25319 gramps.glade:27649 gramps.glade:28697
+#: gramps.glade:30150 gramps.glade:31680
 msgid ""
 "Multiple spaces, tabs, and single line breaks are replaced with single "
 "spaces. Two consecutive line breaks mark a new paragraph."
@@ -5613,15 +5690,15 @@ msgstr ""
 "Серии пробелов, табуляции и одиночные переводы строки заменяются на один "
 "пробел. Два последовательных перевода строки обозначают новый параграф."
 
-#: gramps.glade:5150 gramps.glade:10210 gramps.glade:13213 gramps.glade:15284
-#: gramps.glade:21931 gramps.glade:23491 gramps.glade:25689 gramps.glade:26691
-#: gramps.glade:28059 gramps.glade:29490
+#: gramps.glade:5443 gramps.glade:10964 gramps.glade:14228 gramps.glade:16473
+#: gramps.glade:23643 gramps.glade:25321 gramps.glade:27651 gramps.glade:28699
+#: gramps.glade:30152 gramps.glade:31682
 msgid "_Flowed"
 msgstr "_Простой текст"
 
-#: gramps.glade:5171 gramps.glade:10231 gramps.glade:13234 gramps.glade:15305
-#: gramps.glade:21952 gramps.glade:23512 gramps.glade:25710 gramps.glade:26712
-#: gramps.glade:28080 gramps.glade:29511
+#: gramps.glade:5464 gramps.glade:10985 gramps.glade:14249 gramps.glade:16494
+#: gramps.glade:23664 gramps.glade:25342 gramps.glade:27672 gramps.glade:28720
+#: gramps.glade:30173 gramps.glade:31703
 msgid ""
 "Formatting is preserved, except for the leading whitespace. Multiple spaces, "
 "tabs, and all line breaks are respected."
@@ -5629,158 +5706,158 @@ msgstr ""
 "Форматирование, за исключением ведущих пробелов, сохраняется. Серии "
 "пробелов, табуляции и все переводы строки учитываются при отображении."
 
-#: gramps.glade:5173 gramps.glade:10233 gramps.glade:13236 gramps.glade:15307
-#: gramps.glade:21954 gramps.glade:23514 gramps.glade:25712 gramps.glade:26714
-#: gramps.glade:28082 gramps.glade:29513
+#: gramps.glade:5466 gramps.glade:10987 gramps.glade:14251 gramps.glade:16496
+#: gramps.glade:23666 gramps.glade:25344 gramps.glade:27674 gramps.glade:28722
+#: gramps.glade:30175 gramps.glade:31705
 msgid "_Preformatted"
 msgstr "_Форматированный"
 
-#: gramps.glade:5268 gramps.glade:5405 gramps.glade:10490 gramps.glade:13484
-#: gramps.glade:15587 gramps.glade:25993
+#: gramps.glade:5568 gramps.glade:5709 gramps.glade:11255 gramps.glade:14510
+#: gramps.glade:16787 gramps.glade:27966
 msgid "Add a new media object to the database and place it in this gallery"
 msgstr "Добавить новый документ в альбом и эту галерею"
 
-#: gramps.glade:5296 gramps.glade:5489 gramps.glade:13567 gramps.glade:15670
-#: gramps.glade:26076
+#: gramps.glade:5596 gramps.glade:5793 gramps.glade:14593 gramps.glade:16870
+#: gramps.glade:28049
 msgid "Remove selected object from this gallery only"
 msgstr "Удалить выделенный объект из данной галереи"
 
-#: gramps.glade:5337
+#: gramps.glade:5637
 msgid "Data"
 msgstr "Данные"
 
-#: gramps.glade:5433 gramps.glade:10518 gramps.glade:13512 gramps.glade:15615
-#: gramps.glade:26021
+#: gramps.glade:5737 gramps.glade:11283 gramps.glade:14538 gramps.glade:16815
+#: gramps.glade:27994
 msgid ""
 "Select an existing media object from the database and place it in this "
 "gallery"
 msgstr "Добавить документ из альбома"
 
-#: gramps.glade:5461 gramps.glade:10546 gramps.glade:15643 gramps.glade:26049
+#: gramps.glade:5765 gramps.glade:11311 gramps.glade:16843 gramps.glade:28022
 msgid "Edit the properties of the selected object"
 msgstr "Правка свойств выделенного документа"
 
-#: gramps.glade:5550 gramps.glade:10621 gramps.glade:13608 gramps.glade:15731
-#: gramps.glade:26137 plugins/WebPage.py:432
+#: gramps.glade:5854 gramps.glade:11386 gramps.glade:14634 gramps.glade:16931
+#: gramps.glade:28110 plugins/WebPage.py:432
 msgid "Gallery"
 msgstr "Галерея"
 
-#: gramps.glade:5595 gramps.glade:16128 gramps.glade:23593
+#: gramps.glade:5906 gramps.glade:17359 gramps.glade:25430
 msgid "References"
 msgstr "Ссылки"
 
-#: gramps.glade:5742
+#: gramps.glade:6062
 msgid "Open an _existing database"
 msgstr "_Открыть существующую базу данных"
 
-#: gramps.glade:5762
+#: gramps.glade:6082
 msgid "Create a _new database"
 msgstr "Создать _новую базу данных"
 
-#: gramps.glade:5957
+#: gramps.glade:6290
 msgid "_Relationship:"
 msgstr "_Отношение:"
 
-#: gramps.glade:6005
+#: gramps.glade:6346
 msgid "Relation_ship:"
 msgstr "Отно_шение:"
 
-#: gramps.glade:6056
+#: gramps.glade:6405
 msgid "Father"
 msgstr "Отец"
 
-#: gramps.glade:6080
+#: gramps.glade:6433
 msgid "Mother"
 msgstr "Мать"
 
 # !!!FIXME!!!
-#: gramps.glade:6103
+#: gramps.glade:6460
 msgid "Preference"
 msgstr "Предпочтение"
 
-#: gramps.glade:6126
+#: gramps.glade:6487
 msgid ""
 "Indicates that the parents should be used as the preferred parents for "
 "reporting and display purposes"
 msgstr "Отмечает родителей как предпочитаемых для отчётов и отображения"
 
-#: gramps.glade:6128
+#: gramps.glade:6489
 msgid "Use as preferred parents"
 msgstr "Использовать в качестве предпочитаемых родителей"
 
-#: gramps.glade:6328
+#: gramps.glade:6698
 msgid "_Text:"
 msgstr "_Текст:"
 
-#: gramps.glade:6487
+#: gramps.glade:6865
 msgid "Select columns"
 msgstr "Выбрать колонки"
 
-#: gramps.glade:6659 gramps.glade:28552
+#: gramps.glade:7046 gramps.glade:30667
 msgid "_Given name:"
 msgstr "_Имя:"
 
-#: gramps.glade:6684 gramps.glade:28826
+#: gramps.glade:7075 gramps.glade:30965
 msgid "_Family name:"
 msgstr "_Фамилия:"
 
-#: gramps.glade:6709
+#: gramps.glade:7104
 msgid "Famil_y prefix:"
 msgstr "Фамил_ьная приставка:"
 
-#: gramps.glade:6734
+#: gramps.glade:7133
 msgid "S_uffix:"
 msgstr "_Суффикс:"
 
-#: gramps.glade:6784
+#: gramps.glade:7191
 msgid "Nic_kname:"
 msgstr "П_розвище:"
 
-#: gramps.glade:6809 gramps.glade:28608
+#: gramps.glade:7220 gramps.glade:30731
 msgid "T_ype:"
 msgstr "_Тип:"
 
-#: gramps.glade:6833
+#: gramps.glade:7248
 msgid "An optional suffix to the name, such as \"Jr.\" or \"III\""
 msgstr "Необязательный суффикс фамилии, например \"Млад.\" или \"III\""
 
-#: gramps.glade:6855
+#: gramps.glade:7270
 msgid "A title used to refer to the person, such as \"Dr.\" or \"Rev.\""
 msgstr "Титул, используемый при обращении, например \"Г-н.\" или \"Преп.\""
 
-#: gramps.glade:6877
+#: gramps.glade:7292
 msgid "A name that the person was more commonly known by"
 msgstr "Имя, под которым лицо было наиболее известно"
 
-#: gramps.glade:6899
+#: gramps.glade:7314
 msgid "Preferred name"
 msgstr "Предпочитаемое имя"
 
-#: gramps.glade:6930
+#: gramps.glade:7349
 msgid "_male"
 msgstr "_мужской"
 
-#: gramps.glade:6950
+#: gramps.glade:7369
 msgid "fema_le"
 msgstr "_женский"
 
-#: gramps.glade:6971
+#: gramps.glade:7390
 msgid "u_nknown"
 msgstr "_неизвестно"
 
-#: gramps.glade:7001
+#: gramps.glade:7420
 msgid "Birth"
 msgstr "Рождение"
 
-#: gramps.glade:7025
+#: gramps.glade:7448
 msgid "GRAMPS _ID:"
 msgstr "_GRAMPS ID:"
 
-#: gramps.glade:7071
+#: gramps.glade:7498
 msgid "Death"
 msgstr "Смерть"
 
-#: gramps.glade:7109
+#: gramps.glade:7543
 msgid ""
 "An optional prefix for the family name that is not used in sorting, such as "
 "\"de\" or \"van\""
@@ -5788,380 +5865,383 @@ msgstr ""
 "Необязательная приставка к фамилии, которая игнорируется при упорядочении, "
 "например \"де\" или \"ван\""
 
-#: gramps.glade:7131
+#: gramps.glade:7565
 msgid "The person's given name"
 msgstr "Имя активного лица"
 
-#: gramps.glade:7176
+#: gramps.glade:7610
 msgid "Edit the preferred name"
 msgstr "Правка предпочитаемого имени"
 
-#: gramps.glade:7206
+#: gramps.glade:7640
 msgid "Gender"
 msgstr "Пол"
 
-#: gramps.glade:7229
+#: gramps.glade:7667
 msgid "Identification"
 msgstr "Идентификация"
 
-#: gramps.glade:7277
+#: gramps.glade:7719
 msgid "Image"
 msgstr "Изображение"
 
-#: gramps.glade:7308 gramps.glade:12091
+#: gramps.glade:7754 gramps.glade:12980
 msgid "Information i_s complete"
 msgstr "Информа_ция заполнена"
 
-#: gramps.glade:7330
+#: gramps.glade:7776
 msgid "Information is pri_vate"
 msgstr "Личная информац_ия"
 
-#: gramps.glade:7360 gramps.glade:11012 gramps.glade:18007 gramps.glade:22978
-#: gramps.glade:25147 gramps.glade:27388
+#: gramps.glade:7806 gramps.glade:11812 gramps.glade:19397 gramps.glade:24769
+#: gramps.glade:27075 gramps.glade:29438
 msgid "_Date:"
 msgstr "_Дата:"
 
-#: gramps.glade:7384 gramps.glade:11084 gramps.glade:25203
+#: gramps.glade:7834 gramps.glade:11892 gramps.glade:27139
 msgid "_Place:"
 msgstr "М_есто:"
 
-#: gramps.glade:7431
+#: gramps.glade:7885
 msgid "Invoke birth event editor"
 msgstr "Вызвать редактор информации о рождения"
 
-#: gramps.glade:7486 gramps.glade:7589 gramps.glade:11628 gramps.glade:11688
-#: gramps.glade:11748 gramps.glade:13846 gramps.glade:18436 gramps.glade:23027
-#: gramps.glade:29116
+#: gramps.glade:7940 gramps.glade:8047 gramps.glade:12490 gramps.glade:12550
+#: gramps.glade:12610 gramps.glade:14899 gramps.glade:19866 gramps.glade:24822
+#: gramps.glade:31293
 msgid "Invoke date editor"
 msgstr "Вызвать редактор дат"
 
-#: gramps.glade:7539 gramps.glade:11177
+#: gramps.glade:7993 gramps.glade:11993
 msgid "D_ate:"
 msgstr "Д_ата:"
 
-#: gramps.glade:7625
+#: gramps.glade:8083
 msgid "Invoke death event editor"
 msgstr "Вызвать редактор информации о смерти"
 
-#: gramps.glade:7655
+#: gramps.glade:8113
 msgid "Plac_e:"
 msgstr "Мест_о:"
 
-#: gramps.glade:7798 gramps.glade:8608 gramps.glade:9122 gramps.glade:9558
-#: gramps.glade:12304 gramps.glade:12751
+#: gramps.glade:8268 gramps.glade:9185 gramps.glade:9758 gramps.glade:10241
+#: gramps.glade:13221 gramps.glade:13719
 msgid "Confidence:"
 msgstr "Достоверность:"
 
-#: gramps.glade:7822
+#: gramps.glade:8296
 msgid "Family prefix:"
 msgstr "Фамильная приставка:"
 
-#: gramps.glade:7966
+#: gramps.glade:8464
 msgid "Alternate name"
 msgstr "Альтернативное имя"
 
-#: gramps.glade:7990 gramps.glade:8560 gramps.glade:9074 gramps.glade:9654
-#: gramps.glade:12375 gramps.glade:12823
+#: gramps.glade:8492 gramps.glade:9129 gramps.glade:9702 gramps.glade:10353
+#: gramps.glade:13304 gramps.glade:13803
 msgid "Primary source"
 msgstr "Главный источник"
 
-#: gramps.glade:8266
+#: gramps.glade:8807
 msgid "Create an alternate name for this person"
 msgstr "Добавить альтернативное имя"
 
-#: gramps.glade:8295
+#: gramps.glade:8836
 msgid "Edit the selected name"
 msgstr "Правка выделенного имени"
 
-#: gramps.glade:8323
+#: gramps.glade:8864
 msgid "Delete the selected name"
 msgstr "Удалить выделенное имя"
 
-#: gramps.glade:8375
+#: gramps.glade:8916
 msgid "Names"
 msgstr "Имена"
 
-#: gramps.glade:8416
+#: gramps.glade:8961
 msgid "Event"
 msgstr "Событие"
 
-#: gramps.glade:8464 gramps.glade:12232
+#: gramps.glade:9017 gramps.glade:13137
 msgid "Cause:"
 msgstr "Причина:"
 
-#: gramps.glade:8845
+#: gramps.glade:9457
 msgid "Create a new event"
 msgstr "Добавить новое событие"
 
-#: gramps.glade:8874
+#: gramps.glade:9486
 msgid "Edit the selected event"
 msgstr "Правка выделенного события"
 
-#: gramps.glade:8902
+#: gramps.glade:9514
 msgid "Delete the selected event"
 msgstr "Удалить выделенное событие"
 
-#: gramps.glade:9002 gramps.glade:12847 gramps.glade:22174 gramps.glade:23205
+#: gramps.glade:9618 gramps.glade:13831 gramps.glade:23910 gramps.glade:25020
 msgid "Attributes"
 msgstr "Атрибуты"
 
-#: gramps.glade:9287
+#: gramps.glade:9946
 msgid "Create a new attribute"
 msgstr "Добавить новый атрибут"
 
-#: gramps.glade:9316
+#: gramps.glade:9975
 msgid "Edit the selected attribute"
 msgstr "Правка выделенного атрибута"
 
-#: gramps.glade:9344 gramps.glade:13065 gramps.glade:22299 gramps.glade:23329
+#: gramps.glade:10003 gramps.glade:14072 gramps.glade:24042 gramps.glade:25151
 msgid "Delete the selected attribute"
 msgstr "Удалить выделенный атрибут"
 
-#: gramps.glade:9403 gramps.glade:13117 gramps.glade:22364 gramps.glade:23395
+#: gramps.glade:10062 gramps.glade:14124 gramps.glade:24107 gramps.glade:25217
 msgid "Attributes"
 msgstr "Атрибуты"
 
-#: gramps.glade:9438
+#: gramps.glade:10101
 msgid "City/County:"
 msgstr "Город/Область:"
 
-#: gramps.glade:9630
+#: gramps.glade:10325
 msgid "Addresses"
 msgstr "Адреса"
 
-#: gramps.glade:9995
+#: gramps.glade:10741
 msgid "Create a new address"
 msgstr "Добавить новый адрес"
 
-#: gramps.glade:10024
+#: gramps.glade:10770
 msgid "Edit the selected address"
 msgstr "Правка выделенного адреса"
 
-#: gramps.glade:10052
+#: gramps.glade:10798
 msgid "Delete the selected address"
 msgstr "Удалить выделенный адрес"
 
-#: gramps.glade:10145
+#: gramps.glade:10895
 msgid "Enter miscellaneous relevant data and documentation"
 msgstr "Редактировать различные данные и документацию"
 
-#: gramps.glade:10268 gramps.glade:13271 gramps.glade:21989 gramps.glade:23549
+#: gramps.glade:11022 gramps.glade:14286 gramps.glade:23701 gramps.glade:25379
 #: plugins/IndivComplete.py:166 plugins/WebPage.py:567
 msgid "Notes"
 msgstr "Комментарий"
 
-#: gramps.glade:10326
+#: gramps.glade:11087
 msgid "Add a source"
 msgstr "Добавить источник"
 
 # !!!FIXME!!!
-#: gramps.glade:10353
+#: gramps.glade:11114
 msgid "Edit the selected source"
 msgstr "Правка выделенного источника"
 
-#: gramps.glade:10379
+#: gramps.glade:11140
 msgid "Remove the selected source"
 msgstr "Удалить выделенный источник"
 
-#: gramps.glade:10423 gramps.glade:13423 gramps.glade:15520 gramps.glade:22542
-#: gramps.glade:23771 gramps.glade:25590 gramps.glade:26594 gramps.glade:27962
-#: gramps.glade:29392 plugins/Ancestors.py:159 plugins/IndivComplete.py:324
+#: gramps.glade:11184 gramps.glade:14445 gramps.glade:16716 gramps.glade:24292
+#: gramps.glade:25615 gramps.glade:27544 gramps.glade:28594 gramps.glade:30047
+#: gramps.glade:31576 plugins/Ancestors.py:159 plugins/IndivComplete.py:324
 #: plugins/ScratchPad.py:153 plugins/ScratchPad.py:293
 #: plugins/ScratchPad.py:326 plugins/WebPage.py:224
 msgid "Sources"
 msgstr "Источники"
 
-#: gramps.glade:10573
+#: gramps.glade:11338
 msgid "Remove the selected object from this gallery only"
 msgstr "Удалить выделенный документ только из данной галереи"
 
-#: gramps.glade:10656 gramps.glade:15766
+#: gramps.glade:11425 gramps.glade:16970
 msgid "Web address:"
 msgstr "Web адрес:"
 
-#: gramps.glade:10751 gramps.glade:15861
+#: gramps.glade:11536 gramps.glade:17081
 msgid "Internet addresses"
 msgstr "Адреса в Интернете"
 
-#: gramps.glade:10822
+#: gramps.glade:11614
 msgid "Add an internet reference about this person"
 msgstr "Добавить Интернет-ссылку"
 
-#: gramps.glade:10851
+#: gramps.glade:11643
 msgid "Edit the selected internet address"
 msgstr "Правка выделенного интернет-адреса"
 
-#: gramps.glade:10878
+#: gramps.glade:11670
 msgid "Go to this web page"
 msgstr "Открыть Web страницу"
 
-#: gramps.glade:10907
+#: gramps.glade:11699
 msgid "Delete selected reference"
 msgstr "Удалить выделенную ссылку"
 
-#: gramps.glade:10959 gramps.glade:16075
+#: gramps.glade:11751 gramps.glade:17302
 msgid "Internet"
 msgstr "Интернет"
 
-#: gramps.glade:10988
+#: gramps.glade:11784
 msgid "LDS baptism"
 msgstr "СПД крещение"
 
-#: gramps.glade:11037
+#: gramps.glade:11841
 msgid "LDS _temple:"
 msgstr "_Храм СПД:"
 
-#: gramps.glade:11065 gramps.glade:11279 gramps.glade:11368 gramps.glade:13740
+#: gramps.glade:11873 gramps.glade:12107 gramps.glade:12204 gramps.glade:14786
 msgid "Sources..."
 msgstr "Источники..."
 
-#: gramps.glade:11134 gramps.glade:11299 gramps.glade:11437 gramps.glade:13760
+#: gramps.glade:11946 gramps.glade:12127 gramps.glade:12277 gramps.glade:14806
 msgid "Note..."
 msgstr "Комментарий..."
 
 # LDS
 # иногда называется Дар Духа Святого
-#: gramps.glade:11153
+#: gramps.glade:11965
 msgid "Endowment"
 msgstr "Эндаумент"
 
-#: gramps.glade:11205
+#: gramps.glade:12025
 msgid "LDS te_mple:"
 msgstr "Х_рам СПД:"
 
-#: gramps.glade:11229 gramps.glade:17568
+#: gramps.glade:12053 gramps.glade:18925
 msgid "P_lace:"
 msgstr "М_есто:"
 
-#: gramps.glade:11318 gramps.glade:29067
+#: gramps.glade:12146 gramps.glade:31240
 msgid "Dat_e:"
 msgstr "Дат_а:"
 
-#: gramps.glade:11343
+#: gramps.glade:12175
 msgid "LD_S temple:"
 msgstr "Храм _СПД:"
 
-#: gramps.glade:11387
+#: gramps.glade:12223
 msgid "Pla_ce:"
 msgstr "Ме_сто:"
 
-#: gramps.glade:11456
+#: gramps.glade:12296
 msgid "Pa_rents:"
 msgstr "Ро_дители:"
 
-#: gramps.glade:11481
+#: gramps.glade:12325
 msgid "Sealed to parents"
 msgstr "Приписан(а) к родителям"
 
-#: gramps.glade:11788 gramps.glade:13894
+#: gramps.glade:12650 gramps.glade:14947
 msgid "LDS"
 msgstr "СПД"
 
-#: gramps.glade:11978
+#: gramps.glade:12853
 msgid "_GRAMPS ID:"
 msgstr "_GRAMPS ID:"
 
-#: gramps.glade:12042 gramps.glade:14569
+#: gramps.glade:12923 gramps.glade:15675
 msgid "Last Changed:"
 msgstr "Последнее Изменение:"
 
-#: gramps.glade:12351
+#: gramps.glade:13276
 msgid "Events"
 msgstr "События"
 
-#: gramps.glade:12586
+#: gramps.glade:13546
 msgid "Add new event for this marriage"
 msgstr "Добавить новое событие для этого брака"
 
-#: gramps.glade:12640
+#: gramps.glade:13600
 msgid "Delete selected event"
 msgstr "Удалить выделенное событие"
 
-#: gramps.glade:13011
+#: gramps.glade:14018
 msgid "Create a new attribute for this marriage"
 msgstr "Добавить новый атрибут для этого брака"
 
-#: gramps.glade:13540
+#: gramps.glade:14566
 msgid "Edit the properties of the selected objects"
 msgstr "Редактировать свойства выделенных объектов"
 
-#: gramps.glade:13643
+#: gramps.glade:14673
 msgid "Sealed to spouse"
 msgstr "Приписан к супругу"
 
-#: gramps.glade:13691
+#: gramps.glade:14729
 msgid "Temple:"
 msgstr "Храм:"
 
-#: gramps.glade:14087
+#: gramps.glade:15153
 msgid "C_ity:"
 msgstr "Г_ород:"
 
-#: gramps.glade:14115 gramps.glade:26987
+#: gramps.glade:15185 gramps.glade:29016
 msgid "_State:"
 msgstr "Р_еспублика:"
 
-#: gramps.glade:14143 gramps.glade:26930
-msgid "C_ounty:"
-msgstr "_Область/Район/Уезд:"
-
-#: gramps.glade:14171
-msgid "Co_untry:"
+#: gramps.glade:15217
+#, fuzzy
+msgid "Co_unty:"
 msgstr "Ст_рана/Государство:"
 
-#: gramps.glade:14199
+#: gramps.glade:15249
+#, fuzzy
+msgid "Count_ry:"
+msgstr "Страна:"
+
+#: gramps.glade:15281
 msgid "_Longitude:"
 msgstr "Дол_гота:"
 
-#: gramps.glade:14227
+#: gramps.glade:15313
 msgid "L_atitude:"
 msgstr "Ш_ирота:"
 
-#: gramps.glade:14255 gramps.glade:27016
+#: gramps.glade:15345 gramps.glade:29049
 msgid "Church _parish:"
 msgstr "Церковный _приход:"
 
-#: gramps.glade:14477 gramps.glade:17203 gramps.glade:27528
+#: gramps.glade:15575 gramps.glade:18532 gramps.glade:29598
 msgid "_ZIP/Postal code:"
 msgstr "_Индекс/Почтовый код:"
 
-#: gramps.glade:14523 gramps.glade:27150 gramps.glade:27705
-msgid "P_hone:"
-msgstr "Теле_фон:"
+#: gramps.glade:15625
+#, fuzzy
+msgid "Phon_e:"
+msgstr "Телефон:"
 
-#: gramps.glade:14658
+#: gramps.glade:15776
 msgid "County:"
 msgstr "Область/Район/Уезд:"
 
-#: gramps.glade:14706
+#: gramps.glade:15832
 msgid "State:"
 msgstr "Республика:"
 
-#: gramps.glade:14754
+#: gramps.glade:15888
 msgid "Church parish:"
 msgstr "Церковный приход:"
 
-#: gramps.glade:14855
+#: gramps.glade:16005
 msgid "Zip/Postal code:"
 msgstr "Индекс/Почтовый код:"
 
-#: gramps.glade:14927
+#: gramps.glade:16089
 msgid "Other names"
 msgstr "Другие имена"
 
-#: gramps.glade:15188
+#: gramps.glade:16369
 msgid "Other names"
 msgstr "Другие имена"
 
-#: gramps.glade:16162
+#: gramps.glade:17397
 msgid "GRAMPS Preferences"
 msgstr "Настройки GRAMPS"
 
-#: gramps.glade:16234
+#: gramps.glade:17470
 msgid "Categories:"
 msgstr "Категории:"
 
-#: gramps.glade:16349
+#: gramps.glade:17592
 msgid ""
 "To change your preferences, select one of the subcategories in the menu on "
 "the left hand side of the window."
@@ -6169,38 +6249,38 @@ msgstr ""
 "Чтобы изменить ваши настройки выберите одну из подкатегорий в меню с левой "
 "стороны окна."
 
-#: gramps.glade:16413
+#: gramps.glade:17664
 msgid "Database"
 msgstr "База данных"
 
-#: gramps.glade:16438
+#: gramps.glade:17693
 msgid "_Automatically load last database"
 msgstr "_Автоматически загружать последнюю базу данных"
 
-#: gramps.glade:16459
+#: gramps.glade:17714
 msgid "Family name guessing"
 msgstr "Угадывание фамилии"
 
 # убрать слово Панель?
 # !!!FIXME!!!
-#: gramps.glade:16546
+#: gramps.glade:17811
 msgid "Toolbar"
 msgstr "Панель инструментов"
 
-#: gramps.glade:16571
+#: gramps.glade:17840
 msgid "Active person's _relationship to Home Person"
 msgstr "Отно_шение активного лица к Базовому лицу"
 
-#: gramps.glade:16594
+#: gramps.glade:17863
 msgid "Active person's name and _GRAMPS ID"
 msgstr "Имя и _GRAMPS ID активного лица"
 
 # !!!FIXME!!!
-#: gramps.glade:16616
+#: gramps.glade:17885
 msgid "Statusbar"
 msgstr "Панель статуса"
 
-#: gramps.glade:16644
+#: gramps.glade:17917
 msgid ""
 "GNOME settings\n"
 "Icons Only\n"
@@ -6214,171 +6294,171 @@ msgstr ""
 "Текст под Пиктограммами\n"
 "Текст рядом с Пиктограммами"
 
-#: gramps.glade:16709
+#: gramps.glade:17988
 msgid "_Always display the LDS ordinance tabs"
 msgstr "_Всегда показывать закладку СПД"
 
-#: gramps.glade:16731
+#: gramps.glade:18010
 msgid "Display"
 msgstr "Просмотр"
 
-#: gramps.glade:16755
+#: gramps.glade:18038
 msgid "Default view"
 msgstr "Базовый вид"
 
-#: gramps.glade:16780
+#: gramps.glade:18067
 msgid "_Person view"
 msgstr "_Люди"
 
-#: gramps.glade:16803
+#: gramps.glade:18090
 msgid "_Family view"
 msgstr "_Семья"
 
 # !!!FIXME!!!
-#: gramps.glade:16825
+#: gramps.glade:18112
 msgid "Family view style"
 msgstr "Стиль вида Семья"
 
-#: gramps.glade:16850
+#: gramps.glade:18141
 msgid "Left to right"
 msgstr "Слева направо"
 
-#: gramps.glade:16873
+#: gramps.glade:18164
 msgid "Top to bottom"
 msgstr "Сверху вниз"
 
-#: gramps.glade:16898
+#: gramps.glade:18189
 msgid "_Display Tip of the Day"
 msgstr "_Показывать Совет Дня"
 
-#: gramps.glade:16967
+#: gramps.glade:18262
 msgid "_Date format:"
 msgstr "Формат _дат:"
 
-#: gramps.glade:16992
+#: gramps.glade:18291
 msgid "Display formats"
 msgstr "Форматы отображения"
 
-#: gramps.glade:17078 rule.glade:397
+#: gramps.glade:18387 rule.glade:397
 msgid "_Name:"
 msgstr "_Имя:"
 
-#: gramps.glade:17103
+#: gramps.glade:18416
 msgid "_Address:"
 msgstr "_Адрес:"
 
-#: gramps.glade:17128 gramps.glade:26902
+#: gramps.glade:18445 gramps.glade:28919
 msgid "_City:"
 msgstr "_Город:"
 
-#: gramps.glade:17153 gramps.glade:27472
+#: gramps.glade:18474 gramps.glade:29534
 msgid "_State/Province:"
 msgstr "_Штат/Провинция:"
 
-#: gramps.glade:17178
+#: gramps.glade:18503
 msgid "_Country:"
 msgstr "_Страна:"
 
-#: gramps.glade:17228
+#: gramps.glade:18561
 msgid "_Phone:"
 msgstr "Теле_фон:"
 
-#: gramps.glade:17253
+#: gramps.glade:18590
 msgid "_Email:"
 msgstr "_Эл. почта:"
 
-#: gramps.glade:17446
+#: gramps.glade:18787
 msgid "Researcher information"
 msgstr "Информация об исследователе"
 
-#: gramps.glade:17518 gramps.glade:29700
+#: gramps.glade:18867 gramps.glade:31901
 msgid "_Person:"
 msgstr "_Лицо:"
 
-#: gramps.glade:17543
+#: gramps.glade:18896
 msgid "_Family:"
 msgstr "_Семья:"
 
-#: gramps.glade:17593
+#: gramps.glade:18954
 msgid "_Source:"
 msgstr "_Источники:"
 
 # !!!FIXME!!!
-#: gramps.glade:17618
+#: gramps.glade:18983
 msgid "_Media object:"
 msgstr "Доку_мент:"
 
-#: gramps.glade:17647
+#: gramps.glade:19016
 msgid "I"
 msgstr "I"
 
-#: gramps.glade:17668
+#: gramps.glade:19037
 msgid "F"
 msgstr "F"
 
-#: gramps.glade:17689
+#: gramps.glade:19058
 msgid "P"
 msgstr "P"
 
-#: gramps.glade:17710
+#: gramps.glade:19079
 msgid "S"
 msgstr "S"
 
-#: gramps.glade:17731
+#: gramps.glade:19100
 msgid "O"
 msgstr "O"
 
-#: gramps.glade:17748
+#: gramps.glade:19117
 msgid "GRAMPS ID prefixes"
 msgstr "Префиксы GRAMPS ID"
 
-#: gramps.glade:17957
+#: gramps.glade:19339
 msgid "_Confidence:"
 msgstr "_Достоверность:"
 
-#: gramps.glade:17982
+#: gramps.glade:19368
 msgid "_Volume/Film/Page:"
 msgstr "Т_ом/Плёнка/Страница:"
 
-#: gramps.glade:18035
+#: gramps.glade:19429
 msgid "Te_xt:"
 msgstr "Те_кст:"
 
-#: gramps.glade:18062
+#: gramps.glade:19460
 msgid "Co_mments:"
 msgstr "Ко_мментарий:"
 
-#: gramps.glade:18089
+#: gramps.glade:19491
 msgid "Publication information:"
 msgstr "Информация о публикации:"
 
-#: gramps.glade:18113 mergedata.glade:919 mergedata.glade:941
+#: gramps.glade:19519 mergedata.glade:919 mergedata.glade:941
 #: plugins.glade:362
 msgid "Author:"
 msgstr "Автор:"
 
-#: gramps.glade:18209
+#: gramps.glade:19631
 msgid "Source selection"
 msgstr "Выбор источника"
 
-#: gramps.glade:18233
+#: gramps.glade:19659
 msgid "Source details"
 msgstr "Подробности источника"
 
-#: gramps.glade:18372
+#: gramps.glade:19802
 msgid "Creates a new source"
 msgstr "Создаёт новый источник"
 
-#: gramps.glade:18374
+#: gramps.glade:19804
 msgid "_New..."
 msgstr "_Новый..."
 
-#: gramps.glade:18394 gramps.glade:21784 gramps.glade:25344 gramps.glade:26354
-#: gramps.glade:27557 gramps.glade:28334 gramps.glade:29869
+#: gramps.glade:19824 gramps.glade:23484 gramps.glade:27288 gramps.glade:28344
+#: gramps.glade:29631 gramps.glade:30444 gramps.glade:32078
 msgid "_Private record"
 msgstr "_Личная запись"
 
-#: gramps.glade:18469
+#: gramps.glade:19899
 msgid ""
 "Very Low\n"
 "Low\n"
@@ -6392,214 +6472,214 @@ msgstr ""
 "Высокая\n"
 "Очень Высокая"
 
-#: gramps.glade:18644
+#: gramps.glade:20083
 msgid "Double click will edit the selected source"
 msgstr "Двойной щелчок откроет окно редактирования выделенного источника"
 
-#: gramps.glade:19700
+#: gramps.glade:21219
 msgid "Style _name:"
 msgstr "На_звание стиля:"
 
-#: gramps.glade:19858 rule.glade:1144
+#: gramps.glade:21392 rule.glade:1144
 msgid "Description"
 msgstr "Описание"
 
-#: gramps.glade:19887
+#: gramps.glade:21425
 msgid "pt"
 msgstr "пункт"
 
-#: gramps.glade:19914 gramps.glade:20222
+#: gramps.glade:21456 gramps.glade:21788
 msgid "Pick a color"
 msgstr "Выбрать цвет"
 
-#: gramps.glade:19953
+#: gramps.glade:21495
 msgid "_Bold"
 msgstr "_Жирный"
 
-#: gramps.glade:19975
+#: gramps.glade:21517
 msgid "_Italic"
 msgstr "_Курсив"
 
-#: gramps.glade:19997
+#: gramps.glade:21539
 msgid "_Underline"
 msgstr "Под_чёркнутый"
 
-#: gramps.glade:20018
+#: gramps.glade:21560
 msgid "Type face"
 msgstr "Стиль шрифта"
 
-#: gramps.glade:20042
+#: gramps.glade:21588
 msgid "Size"
 msgstr "Размер"
 
-#: gramps.glade:20066
+#: gramps.glade:21616
 msgid "Color"
 msgstr "Цвет"
 
 # !!!FIXME!!!
-#: gramps.glade:20140
+#: gramps.glade:21702
 msgid "_Roman (Times, serif)"
 msgstr "_Римский (Times, с засечками)"
 
 # !!!FIXME!!!
-#: gramps.glade:20162
+#: gramps.glade:21724
 msgid "_Swiss (Arial, Helvetica, sans-serif)"
 msgstr "_Швейцарский (Arial, Helvetica, без засечек)"
 
-#: gramps.glade:20190
+#: gramps.glade:21752
 msgid "Font options"
 msgstr "Параметры шрифта"
 
-#: gramps.glade:20238
+#: gramps.glade:21804
 msgid "R_ight:"
 msgstr "П_равый край:"
 
-#: gramps.glade:20266
+#: gramps.glade:21836
 msgid "L_eft:"
 msgstr "Л_евый край:"
 
-#: gramps.glade:20294
+#: gramps.glade:21868
 msgid "_Padding:"
 msgstr "_Поля:"
 
-#: gramps.glade:20458
+#: gramps.glade:22048
 msgid "_Left"
 msgstr "По _левому краю"
 
-#: gramps.glade:20480
+#: gramps.glade:22070
 msgid "_Right"
 msgstr "_По правому краю"
 
-#: gramps.glade:20503
+#: gramps.glade:22093
 msgid "_Justify"
 msgstr "По о_беим краям"
 
-#: gramps.glade:20526
+#: gramps.glade:22116
 msgid "_Center"
 msgstr "_Центрировать"
 
-#: gramps.glade:20548
+#: gramps.glade:22138
 msgid "Background"
 msgstr "Фон"
 
-#: gramps.glade:20572
+#: gramps.glade:22166
 msgid "Margins"
 msgstr "Поля"
 
-#: gramps.glade:20621
+#: gramps.glade:22223
 msgid "Alignment"
 msgstr "Выравнивание"
 
-#: gramps.glade:20645
+#: gramps.glade:22251
 msgid "Borders"
 msgstr "Границы"
 
-#: gramps.glade:20670
+#: gramps.glade:22280
 msgid "Le_ft"
 msgstr "Ле_вый край"
 
-#: gramps.glade:20692
+#: gramps.glade:22302
 msgid "Ri_ght"
 msgstr "По пр_авому краю"
 
-#: gramps.glade:20714
+#: gramps.glade:22324
 msgid "_Top"
 msgstr "По _верхнему краю"
 
-#: gramps.glade:20736
+#: gramps.glade:22346
 msgid "_Bottom"
 msgstr "По _нижнему краю"
 
-#: gramps.glade:20757
+#: gramps.glade:22367
 msgid "First line"
 msgstr "Первая строка"
 
-#: gramps.glade:20826
+#: gramps.glade:22444
 msgid "I_ndent:"
 msgstr "Отступ:"
 
-#: gramps.glade:20857
+#: gramps.glade:22479
 msgid "Paragraph options"
 msgstr "Параметры абзаца"
 
-#: gramps.glade:21143
+#: gramps.glade:22782
 msgid "Internal note"
 msgstr "Внутренняя записка"
 
-#: gramps.glade:21399 gramps.glade:22796
+#: gramps.glade:23055 gramps.glade:24567
 msgid "Object type:"
 msgstr "Тип объекта:"
 
-#: gramps.glade:21579
+#: gramps.glade:23259
 msgid "Lower X:"
 msgstr "Нижний X:"
 
-#: gramps.glade:21603
+#: gramps.glade:23287
 msgid "Upper X:"
 msgstr "Верхний X:"
 
-#: gramps.glade:21627
+#: gramps.glade:23315
 msgid "Upper Y:"
 msgstr "Верхний Y:"
 
-#: gramps.glade:21651
+#: gramps.glade:23343
 msgid "Lower Y:"
 msgstr "Нижний Y:"
 
-#: gramps.glade:21759
+#: gramps.glade:23455
 msgid "Subsection"
 msgstr "Подпункт"
 
-#: gramps.glade:21805
+#: gramps.glade:23505
 msgid "Privacy"
 msgstr "Личная информация"
 
-#: gramps.glade:22044
+#: gramps.glade:23760
 msgid "Global Notes"
 msgstr "Главные Записки"
 
-#: gramps.glade:22245
+#: gramps.glade:23988
 msgid "Creates a new object attribute from the above data"
 msgstr "Создаёт новый атрибут из вышеприведённых данных"
 
-#: gramps.glade:23275
+#: gramps.glade:25097
 msgid "Creates a new attribute from the above data"
 msgstr "Создаёт новый атрибут из вышеприведённых данных"
 
-#: gramps.glade:23969
+#: gramps.glade:25827
 msgid "Close _without saving"
 msgstr "Закрыть _без сохранения"
 
-#: gramps.glade:24095
+#: gramps.glade:25961
 msgid "Do not ask again"
 msgstr "Больше не спрашивать"
 
-#: gramps.glade:24713
+#: gramps.glade:26616
 msgid "Remove object and all references to it from the database"
 msgstr "Удалить объект и все ссылки на него"
 
-#: gramps.glade:24758
+#: gramps.glade:26661
 msgid "_Remove Object"
 msgstr "_Удалить Объект"
 
-#: gramps.glade:24785
+#: gramps.glade:26692
 msgid "Keep reference to the missing file"
 msgstr "Сохранить ссылку на утерянный файл"
 
-#: gramps.glade:24788
+#: gramps.glade:26695
 msgid "_Keep Reference"
 msgstr "_Сохранить ссылку"
 
-#: gramps.glade:24799
+#: gramps.glade:26706
 msgid "Select replacement for the missing file"
 msgstr "Выбрать замену для утерянного файла"
 
-#: gramps.glade:24846
+#: gramps.glade:26753
 msgid "_Select File"
 msgstr "_Выбрать Файл"
 
 # !!!FIXME!!!
-#: gramps.glade:24959
+#: gramps.glade:26878
 msgid ""
 "If you check this button, all the missing media files will be automatically "
 "treated according to the currently selected option. No further dialogs will "
@@ -6609,91 +6689,99 @@ msgstr ""
 "(никаких дополнительных вопросов по поводу утерянных документов не будет "
 "задано)."
 
-#: gramps.glade:24961
+#: gramps.glade:26880
 msgid "_Use this selection for all missing media files"
 msgstr "Применить ко всем утерянным документам"
 
-#: gramps.glade:25022
+#: gramps.glade:26942
 msgid "Close window without changes"
 msgstr "Откатить изменения и закрыть окно"
 
-#: gramps.glade:25123
+#: gramps.glade:27047
 msgid "_Event type:"
 msgstr "Тип _события:"
 
-#: gramps.glade:25175
+#: gramps.glade:27107
 msgid "De_scription:"
 msgstr "_Описание:"
 
-#: gramps.glade:25231
+#: gramps.glade:27171
 msgid "_Cause:"
 msgstr "При_чина:"
 
-#: gramps.glade:26301
+#: gramps.glade:28283
 msgid "_Attribute:"
 msgstr "_Атрибут:"
 
-#: gramps.glade:26325
+#: gramps.glade:28311
 msgid "_Value:"
 msgstr "_Значение:"
 
-#: gramps.glade:26958 gramps.glade:27500
+#: gramps.glade:28951
+msgid "C_ounty:"
+msgstr "_Область/Район/Уезд:"
+
+#: gramps.glade:28983 gramps.glade:29566
 msgid "Cou_ntry:"
 msgstr "_Страна/Государство:"
 
-#: gramps.glade:27196
+#: gramps.glade:29187 gramps.glade:29779
+msgid "P_hone:"
+msgstr "Теле_фон:"
+
+#: gramps.glade:29237
 msgid "_Zip/Postal code:"
 msgstr "_Индекс/Почтовый код:"
 
-#: gramps.glade:27416
+#: gramps.glade:29470
 msgid "Add_ress:"
 msgstr "Ад_рес:"
 
-#: gramps.glade:27444
+#: gramps.glade:29502
 msgid "_City/County:"
 msgstr "_Город/Область:"
 
-#: gramps.glade:28271
+#: gramps.glade:30373
 msgid "_Web address:"
 msgstr "_Web адрес:"
 
-#: gramps.glade:28299
+#: gramps.glade:30405
 msgid "_Description:"
 msgstr "_Описание:"
 
-#: gramps.glade:28580
+#: gramps.glade:30699
 msgid "Suffi_x:"
 msgstr "Суффи_кс:"
 
-#: gramps.glade:28664
+#: gramps.glade:30795
 msgid "P_rivate record"
 msgstr "Ли_чная запись"
 
-#: gramps.glade:28685
+#: gramps.glade:30816
 msgid "Family _prefix:"
 msgstr "Ф_амильная приставка:"
 
-#: gramps.glade:28798
+#: gramps.glade:30933
 msgid "P_atronymic:"
 msgstr "_Отчество:"
 
-#: gramps.glade:28891
+#: gramps.glade:31037
 msgid "G_roup as:"
 msgstr "Группировать как:"
 
-#: gramps.glade:28916
+#: gramps.glade:31066
 msgid "_Sort as:"
 msgstr "_Упорядочить как:"
 
-#: gramps.glade:28943
+#: gramps.glade:31097
 msgid "_Display as:"
 msgstr "_Показывать как:"
 
-#: gramps.glade:28970
+#: gramps.glade:31128
 msgid "Name Information"
 msgstr "Информация об Имени"
 
-#: gramps.glade:29034
+#: gramps.glade:31203
 msgid ""
 "Default (based on locale)\n"
 "Family name, Given name\n"
@@ -6703,7 +6791,7 @@ msgstr ""
 "Фамилия, Имя\n"
 "Имя, Фамилия"
 
-#: gramps.glade:29052
+#: gramps.glade:31223
 msgid ""
 "Default (based on locale)\n"
 "Given name Family name\n"
@@ -6713,95 +6801,95 @@ msgstr ""
 "Фамилия, Имя\n"
 "Имя, Фамилия\n"
 
-#: gramps.glade:29178
+#: gramps.glade:31355
 msgid "_Override"
 msgstr "_Заменить"
 
-#: gramps.glade:29728
+#: gramps.glade:31933
 msgid "_Comment:"
 msgstr "_Комментарий:"
 
-#: gramps.glade:29780
+#: gramps.glade:31989
 msgid "Person is in the _database"
 msgstr "Лицо из базы _данных"
 
-#: gramps.glade:29848
+#: gramps.glade:32057
 msgid "Choose a person from the database"
 msgstr "Выберите лицо из базы данных"
 
-#: gramps.glade:29850
+#: gramps.glade:32059
 msgid "_Select"
 msgstr "_Выбрать"
 
-#: gramps.glade:29979
+#: gramps.glade:32189
 msgid "_Next"
 msgstr "_Следующий:"
 
-#: gramps.glade:30038
+#: gramps.glade:32252
 msgid "_Display on startup"
 msgstr "_Показывать при запуске"
 
-#: gramps.glade:30101
+#: gramps.glade:32319
 msgid "Gramps' Tip of the Day"
 msgstr "Совет Дня Gramps"
 
-#: gramps.glade:30134
+#: gramps.glade:32356
 msgid "GRAMPS - Loading Database"
 msgstr "GRAMPS - Загружается База Данных"
 
-#: gramps.glade:30159
+#: gramps.glade:32382
 msgid "Loading database"
 msgstr "База данных загружается"
 
-#: gramps.glade:30183
+#: gramps.glade:32410
 msgid "GRAMPS is loading the database you selected. Please wait."
 msgstr "GRAMPS загружает выбранную базу данных. Пожалуйста, подождите."
 
-#: gramps.glade:30366
+#: gramps.glade:32606
 msgid "Calenda_r:"
 msgstr "Календ_арь:"
 
-#: gramps.glade:30416
+#: gramps.glade:32662
 msgid "Q_uality"
 msgstr "Качество"
 
-#: gramps.glade:30458
+#: gramps.glade:32710
 msgid "_Type"
 msgstr "_Тип"
 
-#: gramps.glade:30500
+#: gramps.glade:32758
 msgid "Date"
 msgstr "Дата"
 
-#: gramps.glade:30524
+#: gramps.glade:32786
 msgid "_Day"
 msgstr "_День"
 
-#: gramps.glade:30549
+#: gramps.glade:32815
 msgid "_Month"
 msgstr "_Месяц"
 
-#: gramps.glade:30574
+#: gramps.glade:32844
 msgid "_Year"
 msgstr "_Год"
 
-#: gramps.glade:30658
+#: gramps.glade:32934
 msgid "Second date"
 msgstr "Вторая дата"
 
-#: gramps.glade:30682
+#: gramps.glade:32962
 msgid "D_ay"
 msgstr "Д_ень"
 
-#: gramps.glade:30707
+#: gramps.glade:32991
 msgid "Mo_nth"
 msgstr "Ме_сяц"
 
-#: gramps.glade:30732
+#: gramps.glade:33020
 msgid "Y_ear"
 msgstr "Г_од"
 
-#: gramps.glade:30829
+#: gramps.glade:33123
 msgid "Te_xt comment:"
 msgstr "Текстовый _комментарий:"
 
@@ -6914,11 +7002,13 @@ msgstr "Люди с записями, содержащими..."
 msgid "People with records matching regular expression..."
 msgstr "Люди с записями, удовлетворяющими регулярному·выражению..."
 
-#: gramps_main.py:1074 gramps_main.py:1097
+#: gramps_main.py:1074 gramps_main.py:1086 gramps_main.py:1104
+#: gramps_main.py:1116
 msgid "Cannot merge people."
 msgstr "Ошибка слияния."
 
-#: gramps_main.py:1075 gramps_main.py:1098
+#: gramps_main.py:1075 gramps_main.py:1087 gramps_main.py:1105
+#: gramps_main.py:1117
 msgid ""
 "Exactly two people must be selected to perform a merge. A second person can "
 "be selected by holding down the control key while clicking on the desired "
@@ -6928,20 +7018,20 @@ msgstr ""
 "выбрано нажатием и удержанием клавиши Control в момент щелчка по имени "
 "желаемого лица."
 
-#: gramps_main.py:1221
+#: gramps_main.py:1235
 msgid "Cannot unpak archive"
 msgstr "Ошибка распаковки архива"
 
-#: gramps_main.py:1222 plugins/ReadPkg.py:67
+#: gramps_main.py:1236 plugins/ReadPkg.py:67
 msgid "Temporary directory %s is not writable"
 msgstr "Временный каталог %s недоступен для записи"
 
-#: gramps_main.py:1264 gramps_main.py:1270 gramps_main.py:1291
-#: gramps_main.py:1295 gramps_main.py:1298
+#: gramps_main.py:1278 gramps_main.py:1284 gramps_main.py:1305
+#: gramps_main.py:1309 gramps_main.py:1312
 msgid "Cannot open database"
 msgstr "Ошибка открытия базы данных"
 
-#: gramps_main.py:1265
+#: gramps_main.py:1279
 msgid ""
 "The selected file is a directory, not a file.\n"
 "A GRAMPS database must be a file."
@@ -6949,40 +7039,40 @@ msgstr ""
 "Выбранное имя является каталогом, а не файлом.\n"
 "База данных GRAMPS должна быть файлом."
 
-#: gramps_main.py:1271
+#: gramps_main.py:1285
 msgid "You do not have read access to the selected file."
 msgstr "У Вас нет доступа для чтения выбранного файла."
 
-#: gramps_main.py:1276
+#: gramps_main.py:1290
 msgid "Read only database"
 msgstr "База данных только для чтения"
 
-#: gramps_main.py:1277
+#: gramps_main.py:1291
 msgid "You do not have write access to the selected file."
 msgstr "У Вас нет доступа для записи выбранного файла."
 
-#: gramps_main.py:1286
+#: gramps_main.py:1300
 msgid "Read Only"
 msgstr "Только Чтение"
 
-#: gramps_main.py:1292
+#: gramps_main.py:1306
 msgid "The database file specified could not be opened."
 msgstr "Ошибка открытия укащанного файла."
 
-#: gramps_main.py:1299
+#: gramps_main.py:1313
 msgid "%s could not be opened."
 msgstr "%s не можете быть открыт."
 
-#: gramps_main.py:1358
+#: gramps_main.py:1372
 msgid "Save Media Object"
 msgstr "Сохранить Документ"
 
-#: gramps_main.py:1404 plugins/Check.py:284 plugins/WriteCD.py:255
+#: gramps_main.py:1418 plugins/Check.py:284 plugins/WriteCD.py:255
 #: plugins/WritePkg.py:171
 msgid "Media object could not be found"
 msgstr "Документ не найден"
 
-#: gramps_main.py:1405 plugins/WriteCD.py:256 plugins/WritePkg.py:172
+#: gramps_main.py:1419 plugins/WriteCD.py:256 plugins/WritePkg.py:172
 msgid ""
 "%(file_name)s is referenced in the database, but no longer exists. The file "
 "may have been deleted or moved to a different location. You may choose to "
@@ -6993,71 +7083,71 @@ msgstr ""
 "Возможно, файл был удалён или перемещён в другое место. Вы можете удалить "
 "ссылку из базы данных, оставить её как есть или выбрать новый файл."
 
-#: gramps_main.py:1451
+#: gramps_main.py:1465
 msgid "Deleting the person will remove the person from the database."
 msgstr "Удаление Лица сотрёт его из базы данных."
 
-#: gramps_main.py:1455
+#: gramps_main.py:1469
 msgid "_Delete Person"
 msgstr "У_далить Лицо"
 
-#: gramps_main.py:1519
+#: gramps_main.py:1533
 msgid "Delete Person (%s)"
 msgstr "Удалить Лицо (%s)"
 
-#: gramps_main.py:1603
+#: gramps_main.py:1617
 msgid "%(relationship)s of %(person)s"
 msgstr "%(relationship)s %(person)s"
 
-#: gramps_main.py:1765
+#: gramps_main.py:1779
 msgid "Upgrading database..."
 msgstr "Обновлется база данных..."
 
-#: gramps_main.py:1778
+#: gramps_main.py:1792
 msgid "Setup complete"
 msgstr "Установка завершена"
 
-#: gramps_main.py:1795
+#: gramps_main.py:1809
 msgid "Loading %s..."
 msgstr "Загружаю %s..."
 
-#: gramps_main.py:1798
+#: gramps_main.py:1812
 msgid "Opening database..."
 msgstr "Открывается база данных..."
 
-#: gramps_main.py:1829
+#: gramps_main.py:1843
 msgid "No Home Person has been set."
 msgstr "Базовое лицо не определено."
 
-#: gramps_main.py:1830
+#: gramps_main.py:1844
 msgid "The Home Person may be set from the Edit menu."
 msgstr "Базовое лицо может быть определено в меню Правки."
 
-#: gramps_main.py:1836
+#: gramps_main.py:1850
 msgid "%s has been bookmarked"
 msgstr "Создана закладка для %s"
 
-#: gramps_main.py:1839
+#: gramps_main.py:1853
 msgid "Could Not Set a Bookmark"
 msgstr "Ошибка создания закладки."
 
-#: gramps_main.py:1840
+#: gramps_main.py:1854
 msgid "A bookmark could not be set because no one was selected."
 msgstr "Нельзя поставить закладку: никто не выделен."
 
-#: gramps_main.py:1854
+#: gramps_main.py:1868
 msgid "Could not go to a Person"
 msgstr "Ошибка перехода на персону"
 
-#: gramps_main.py:1855
+#: gramps_main.py:1869
 msgid "Either stale bookmark or broken history caused by IDs reorder."
 msgstr "Устаревшая закладка или потеря истории, вызванная сортировкой ID."
 
-#: gramps_main.py:1865
+#: gramps_main.py:1879
 msgid "Set %s as the Home Person"
 msgstr "Установить %s как Базовое лицо"
 
-#: gramps_main.py:1866
+#: gramps_main.py:1880
 msgid ""
 "Once a Home Person is defined, pressing the Home button on the toolbar will "
 "make the home person the active person."
@@ -7065,15 +7155,15 @@ msgstr ""
 "После того, как Базовое лицо определено, нажатие кнопки Домой на панели "
 "инструментов сделает Базовое лицо активным."
 
-#: gramps_main.py:1869
+#: gramps_main.py:1883
 msgid "_Set Home Person"
 msgstr "У_становить Базовое лицо"
 
-#: gramps_main.py:1880
+#: gramps_main.py:1894
 msgid "A person must be selected to export"
 msgstr "Экспорт требует, чтобы было выделено активное лицо."
 
-#: gramps_main.py:1881
+#: gramps_main.py:1895
 msgid ""
 "Exporting requires that an active person be selected. Please select a person "
 "and try again."
@@ -7081,12 +7171,12 @@ msgstr ""
 "Экспорт требует, чтобы было выделено активное лицо. Выделите лицо и "
 "попробуйте ещё раз."
 
-#: gramps_main.py:1912 gramps_main.py:1916 gramps_main.py:1920
-#: gramps_main.py:1934 gramps_main.py:1936
+#: gramps_main.py:1926 gramps_main.py:1930 gramps_main.py:1934
+#: gramps_main.py:1948 gramps_main.py:1950
 msgid "Could not create example database"
 msgstr "Ошибка создания базы данных"
 
-#: gramps_main.py:1913 gramps_main.py:1917 gramps_main.py:1921
+#: gramps_main.py:1927 gramps_main.py:1931 gramps_main.py:1935
 msgid "The directory ~/.gramps/example could not be created."
 msgstr "Ошибка создания ~/.gramps/example."
 
@@ -7155,7 +7245,7 @@ msgstr "Эл. почта автора:"
 #: plugins/AncestorChart.py:245 plugins/AncestorChart2.py:499
 #: plugins/AncestorReport.py:290 plugins/Ancestors.py:909
 #: plugins/Ancestors.py:925 plugins/Ancestors.py:931 plugins/DesGraph.py:333
-#: plugins/DetAncestralReport.py:520 plugins/FamilyGroup.py:514
+#: plugins/DetAncestralReport.py:520 plugins/FamilyGroup.py:515
 #: plugins/FanChart.py:299 plugins/FtmStyleAncestors.py:390
 #: plugins/FtmStyleAncestors.py:395 plugins/FtmStyleAncestors.py:400
 #: plugins/FtmStyleAncestors.py:405 plugins/FtmStyleDescendants.py:536
@@ -7184,7 +7274,7 @@ msgstr "Карта предков"
 #: plugins/AncestorReport.py:306 plugins/Ancestors.py:968
 #: plugins/BookReport.py:1117 plugins/CountAncestors.py:122
 #: plugins/DescendReport.py:198 plugins/DetAncestralReport.py:618
-#: plugins/DetDescendantReport.py:639 plugins/FamilyGroup.py:548
+#: plugins/DetDescendantReport.py:639 plugins/FamilyGroup.py:549
 #: plugins/FtmStyleAncestors.py:422 plugins/FtmStyleDescendants.py:572
 #: plugins/GraphViz.py:971 plugins/GraphViz.py:985
 #: plugins/IndivComplete.py:595 plugins/IndivSummary.py:391
@@ -7292,7 +7382,7 @@ msgstr "и был(а) похоронен(а) в %s."
 
 #: plugins/AncestorReport.py:276 plugins/Ancestors.py:894
 #: plugins/DescendReport.py:174 plugins/DetAncestralReport.py:484
-#: plugins/DetDescendantReport.py:505 plugins/FamilyGroup.py:505
+#: plugins/DetDescendantReport.py:505 plugins/FamilyGroup.py:506
 #: plugins/FtmStyleAncestors.py:375 plugins/FtmStyleDescendants.py:521
 #: plugins/IndivComplete.py:552 plugins/IndivSummary.py:348
 #: plugins/SimpleBookTitle.py:265 plugins/StatisticsChart.py:812
@@ -7840,7 +7930,7 @@ msgid "Descendant Graph"
 msgstr "Дерево потомков"
 
 #: plugins/DesGraph.py:349 plugins/FanChart.py:325
-#: plugins/StatisticsChart.py:958
+#: plugins/StatisticsChart.py:963
 msgid "Alpha"
 msgstr "Альфа"
 
@@ -8033,35 +8123,35 @@ msgid ""
 "that can be applied to the database to find similar events"
 msgstr "Позволяет находить сходные события используя фильтры пользователя."
 
-#: plugins/ExportVCalendar.py:54
+#: plugins/ExportVCalendar.py:55
 msgid "Export to vCalendar"
 msgstr "Экспорт для vCalendar"
 
-#: plugins/ExportVCalendar.py:199
+#: plugins/ExportVCalendar.py:209
 msgid "Marriage of %s"
 msgstr "Брак %s"
 
-#: plugins/ExportVCalendar.py:217 plugins/ExportVCalendar.py:219
+#: plugins/ExportVCalendar.py:227 plugins/ExportVCalendar.py:229
 msgid "Birth of %s"
 msgstr "Рождение %s"
 
-#: plugins/ExportVCalendar.py:228 plugins/ExportVCalendar.py:230
+#: plugins/ExportVCalendar.py:238 plugins/ExportVCalendar.py:240
 msgid "Death of %s"
 msgstr "Смерть %s"
 
-#: plugins/ExportVCalendar.py:283
+#: plugins/ExportVCalendar.py:293
 msgid "Anniversary: %s"
 msgstr "Годовщина: %s"
 
-#: plugins/ExportVCalendar.py:310
+#: plugins/ExportVCalendar.py:320
 msgid "vCalendar"
 msgstr "vCalendar"
 
-#: plugins/ExportVCalendar.py:311
+#: plugins/ExportVCalendar.py:321
 msgid "vCalendar is used in many calendaring and pim applications."
 msgstr "vCalendar используется во многих календарных программах."
 
-#: plugins/ExportVCalendar.py:312
+#: plugins/ExportVCalendar.py:322
 msgid "vCalendar export options"
 msgstr "Опции экспорта vCalendar"
 
@@ -8070,15 +8160,15 @@ msgid "Export to vCard"
 msgstr "Экспорт для vCard"
 
 # LDS
-#: plugins/ExportVCard.py:234
+#: plugins/ExportVCard.py:243
 msgid "vCard"
 msgstr "vCard"
 
-#: plugins/ExportVCard.py:235
+#: plugins/ExportVCard.py:244
 msgid "vCard is used in many addressbook and pim applications."
 msgstr "vCard используется во многих адресных программах."
 
-#: plugins/ExportVCard.py:236
+#: plugins/ExportVCard.py:245
 msgid "vCard export options"
 msgstr "Опции экспорта vCard"
 
@@ -8090,19 +8180,19 @@ msgstr "Муж"
 msgid "Wife"
 msgstr "Жена"
 
-#: plugins/FamilyGroup.py:383 plugins/FamilyGroup.py:547
+#: plugins/FamilyGroup.py:383 plugins/FamilyGroup.py:548
 msgid "Family Group Report"
 msgstr "Отчёт о семейной группе"
 
-#: plugins/FamilyGroup.py:523
+#: plugins/FamilyGroup.py:524
 msgid "The style used for the text related to the children."
 msgstr "Стиль текста, относящегося к детям."
 
-#: plugins/FamilyGroup.py:532
+#: plugins/FamilyGroup.py:533
 msgid "The style used for the parent's name"
 msgstr "Стиль имён родителей."
 
-#: plugins/FamilyGroup.py:551
+#: plugins/FamilyGroup.py:552
 msgid ""
 "Creates a family group report, showing information on a set of parents and "
 "their children."
@@ -9128,63 +9218,63 @@ msgstr "Отметьте для сортировки в обратном пор
 msgid "Sort in reverse order"
 msgstr "Сортировать в обратном порядке"
 
-#: plugins/StatisticsChart.py:877
+#: plugins/StatisticsChart.py:881
 msgid ""
 "Select year range within which people need to be born to be selected for "
 "statistics."
 msgstr "Выбрать интервал года рождения людей, включённых в статистику."
 
-#: plugins/StatisticsChart.py:878
+#: plugins/StatisticsChart.py:882
 msgid "People born between"
 msgstr "Лица, родившиеся между"
 
-#: plugins/StatisticsChart.py:882
+#: plugins/StatisticsChart.py:886
 msgid ""
 "Check this if you want people who have no known birth date or year to be "
 "accounted also in the statistics."
 msgstr "Отметьте для включения в статистику лиц без известных дат рождения."
 
-#: plugins/StatisticsChart.py:883
+#: plugins/StatisticsChart.py:887
 msgid "Include people without known birth years"
 msgstr "Включать лиц без известного года рождения"
 
-#: plugins/StatisticsChart.py:895
+#: plugins/StatisticsChart.py:899
 msgid "Select which genders are included into statistics."
 msgstr "Выбрать пол, включённый в статистику."
 
-#: plugins/StatisticsChart.py:896
+#: plugins/StatisticsChart.py:900
 msgid "Genders included"
 msgstr "Включить пол"
 
-#: plugins/StatisticsChart.py:899
+#: plugins/StatisticsChart.py:903
 msgid ""
 "With fewer items pie chart and legend will be used instead of a bar chart."
 msgstr ""
 "При меньшем количестве элементов, вместо \"колонок\" будет использована "
 "карта \"пирога\"."
 
-#: plugins/StatisticsChart.py:902
+#: plugins/StatisticsChart.py:907
 msgid "Max. items for a pie"
 msgstr "Макс. элем. для круг. диаг."
 
-#: plugins/StatisticsChart.py:921
+#: plugins/StatisticsChart.py:926
 msgid "Mark checkboxes to add charts with indicated data"
 msgstr "Отметьте галочками карты с обозначенными данными"
 
-#: plugins/StatisticsChart.py:922 plugins/StatisticsChart.py:927
+#: plugins/StatisticsChart.py:927 plugins/StatisticsChart.py:932
 msgid "Chart Selection"
 msgstr "Выбор Диаграм"
 
-#: plugins/StatisticsChart.py:926
+#: plugins/StatisticsChart.py:931
 msgid "Note that both biological and adopted children are taken into account."
 msgstr ""
 "Заметьте, что и биологические и приёмные родители принимаются в расчёт."
 
-#: plugins/StatisticsChart.py:957
+#: plugins/StatisticsChart.py:962
 msgid "Statistics Chart"
 msgstr "Статистический График"
 
-#: plugins/StatisticsChart.py:961
+#: plugins/StatisticsChart.py:966
 msgid "Generates statistical bar and pie charts of the people in the database."
 msgstr ""
 "Генерирует статистические диаграммы (столбцовые и круговые) по лицам из базы "
@@ -9962,31 +10052,31 @@ msgstr ""
 "После этого, Вы можете выжечь CD с этими данными, и эта копия будет "
 "абсолютно портативной дла переноса на другие машины."
 
-#: plugins/WriteFtree.py:273
+#: plugins/WriteFtree.py:281
 msgid "_Web Family Tree"
 msgstr "_Web Family Tree"
 
-#: plugins/WriteFtree.py:274
+#: plugins/WriteFtree.py:282
 msgid "Web Family Tree format."
 msgstr "Формат Web Family Tree."
 
-#: plugins/WriteFtree.py:275
+#: plugins/WriteFtree.py:283
 msgid "Web Family Tree export options"
 msgstr "Опции экспорта Web Family Tree"
 
-#: plugins/WriteGeneWeb.py:218
+#: plugins/WriteGeneWeb.py:227
 msgid "No families matched by selected filter"
 msgstr "Ни одна семья не выбрана выделенным фильтром"
 
-#: plugins/WriteGeneWeb.py:577
+#: plugins/WriteGeneWeb.py:586
 msgid "G_eneWeb"
 msgstr "G_eneWeb"
 
-#: plugins/WriteGeneWeb.py:578
+#: plugins/WriteGeneWeb.py:587
 msgid "GeneWeb is a web based genealogy program."
 msgstr "GeneWeb - это генеалогическая веб-программа."
 
-#: plugins/WriteGeneWeb.py:579
+#: plugins/WriteGeneWeb.py:588
 msgid "GeneWeb export options"
 msgstr "Опции экспорта GeneWeb"
 
@@ -10351,6 +10441,16 @@ msgstr "Выделенное правило"
 msgid "Values"
 msgstr "Значения"
 
+#~ msgid "Added person is not visible"
+#~ msgstr "Добавленное лицо не показано"
+
+#~ msgid ""
+#~ "The person you added is currently not visible due to the chosen filter. "
+#~ "This may occur if you did not specify a birth date."
+#~ msgstr ""
+#~ "Добавленное лицо не показано из-за применённого фильтра. Это может "
+#~ "произойти, если не указана дата рождения."
+
 #~ msgid "Month Day, Year"
 #~ msgstr "Месяц День, Год"
 
diff --git a/gramps2/src/po/template.po b/gramps2/src/po/template.po
index c1ac8f018..f1cf2ae70 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 Jun  1 09:58:59 2005\n"
+"POT-Creation-Date: Thu Jun 23 14:11:42 2005\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -31,17 +31,17 @@ msgstr ""
 msgid "Add Media Object"
 msgstr ""
 
-#: AddSpouse.py:115
+#: AddSpouse.py:114
 msgid "Choose Spouse/Partner of %s"
 msgstr ""
 
-#: AddSpouse.py:120
+#: AddSpouse.py:119
 msgid "Choose Spouse/Partner"
 msgstr ""
 
-#: AddSpouse.py:161 ChooseParents.py:230 EditPerson.py:338 EditSource.py:305
-#: FamilyView.py:74 ImageSelect.py:1102 PeopleView.py:58 PeopleView.py:148
-#: SelectChild.py:124 SelectPerson.py:78 plugins/BookReport.py:631
+#: AddSpouse.py:142 ChooseParents.py:252 EditPerson.py:338 EditSource.py:312
+#: FamilyView.py:74 ImageSelect.py:1104 PeopleView.py:58 PeopleView.py:134
+#: SelectChild.py:129 SelectPerson.py:78 plugins/BookReport.py:631
 #: plugins/FilterEditor.py:459 plugins/IndivComplete.py:405
 #: plugins/IndivSummary.py:226 plugins/PatchNames.py:191 plugins/RelCalc.py:95
 #: plugins/ScratchPad.py:154 plugins/ScratchPad.py:195
@@ -53,58 +53,69 @@ msgstr ""
 msgid "Name"
 msgstr ""
 
-#: AddSpouse.py:166 ChooseParents.py:236 EditSource.py:305 FamilyView.py:73
-#: ImageSelect.py:1102 MediaView.py:58 MergePeople.py:107 PeopleView.py:59
-#: PlaceView.py:50 SelectChild.py:129 SelectObject.py:85 SelectPerson.py:84
+#: AddSpouse.py:146 ChooseParents.py:261 EditSource.py:312 FamilyView.py:73
+#: ImageSelect.py:1104 MediaView.py:58 MergePeople.py:107 PeopleView.py:59
+#: PlaceView.py:50 SelectChild.py:134 SelectObject.py:85 SelectPerson.py:84
 #: SourceView.py:52 Sources.py:108 Sources.py:242 Witness.py:64
 #: plugins/PatchNames.py:182 plugins/RelCalc.py:95
 msgid "ID"
 msgstr ""
 
-#: AddSpouse.py:171 ChooseParents.py:242 SelectChild.py:134 SelectPerson.py:90
+#: AddSpouse.py:150 ChooseParents.py:271 SelectChild.py:139 SelectPerson.py:90
 msgid "Birth date"
 msgstr ""
 
-#: AddSpouse.py:254 AddSpouse.py:279
+#: AddSpouse.py:232 AddSpouse.py:257
 msgid "Error adding a spouse"
 msgstr ""
 
-#: AddSpouse.py:255
+#: AddSpouse.py:233
 msgid "A person cannot be linked as his/her spouse"
 msgstr ""
 
-#: AddSpouse.py:263
+#: AddSpouse.py:241
 msgid "Spouse is a parent"
 msgstr ""
 
-#: AddSpouse.py:264
+#: AddSpouse.py:242
 msgid "The person selected as a spouse is a parent of the active person. Usually, this is a mistake. You may choose either to proceed with adding a spouse, or to return to the Choose Spouse dialog to fix the problem."
 msgstr ""
 
-#: AddSpouse.py:268 AddSpouse.py:289
+#: AddSpouse.py:246 AddSpouse.py:267
 msgid "Proceed with adding"
 msgstr ""
 
-#: AddSpouse.py:268 AddSpouse.py:289
+#: AddSpouse.py:246 AddSpouse.py:267
 msgid "Return to dialog"
 msgstr ""
 
-#: AddSpouse.py:280
+#: AddSpouse.py:258
 msgid "The spouse is already present in this family"
 msgstr ""
 
-#: AddSpouse.py:284
+#: AddSpouse.py:262
 msgid "Spouse is a child"
 msgstr ""
 
-#: AddSpouse.py:285
+#: AddSpouse.py:263
 msgid "The person selected as a spouse is a child of the active person. Usually, this is a mistake. You may choose either to proceed with adding a spouse, or to return to the Choose Spouse dialog to fix the problem."
 msgstr ""
 
-#: AddSpouse.py:315 FamilyView.py:725
+#: AddSpouse.py:293 FamilyView.py:725
 msgid "Add Spouse"
 msgstr ""
 
+#: AddSpouse.py:392 ChooseParents.py:811 GenericFilter.py:132
+#: GenericFilter.py:147 GenericFilter.py:263 GenericFilter.py:277
+#: GenericFilter.py:300 GenericFilter.py:323 GenericFilter.py:338
+#: GenericFilter.py:353 GenericFilter.py:979 GenericFilter.py:1223
+#: GenericFilter.py:1247 GenericFilter.py:1276 GenericFilter.py:1308
+#: GenericFilter.py:1325 GenericFilter.py:1346 GenericFilter.py:1429
+#: GenericFilter.py:1483 GenericFilter.py:1545 GenericFilter.py:1564
+#: GenericFilter.py:1634 GenericFilter.py:1801 SelectChild.py:305
+msgid "General filters"
+msgstr ""
+
 #: AddrEdit.py:106 AddrEdit.py:174
 msgid "Address Editor"
 msgstr ""
@@ -154,7 +165,7 @@ msgstr ""
 msgid "New Attribute"
 msgstr ""
 
-#: AttrEdit.py:175 EditPerson.py:326 ImageSelect.py:682 ImageSelect.py:952
+#: AttrEdit.py:175 EditPerson.py:326 ImageSelect.py:682 ImageSelect.py:954
 #: Marriage.py:214 plugins/ScratchPad.py:273 plugins/ScratchPad.py:281
 msgid "Attribute"
 msgstr ""
@@ -173,69 +184,81 @@ msgstr ""
 msgid "Edit Bookmarks"
 msgstr ""
 
-#: ChooseParents.py:121
+#: ChooseParents.py:129 ChooseParents.py:130
+msgid "Loading..."
+msgstr ""
+
+#: ChooseParents.py:133
 msgid "Choose the Parents of %s"
 msgstr ""
 
-#: ChooseParents.py:123 ChooseParents.py:268 ChooseParents.py:510
-#: ChooseParents.py:593
+#: ChooseParents.py:135 ChooseParents.py:300 ChooseParents.py:572
+#: ChooseParents.py:659
 msgid "Choose Parents"
 msgstr ""
 
-#: ChooseParents.py:304 ChooseParents.py:648
+#: ChooseParents.py:366 ChooseParents.py:714
 msgid "Par_ent"
 msgstr ""
 
-#: ChooseParents.py:306
+#: ChooseParents.py:368
 msgid "Fath_er"
 msgstr ""
 
-#: ChooseParents.py:314 ChooseParents.py:647
+#: ChooseParents.py:376 ChooseParents.py:713
 msgid "Pa_rent"
 msgstr ""
 
-#: ChooseParents.py:316
+#: ChooseParents.py:378
 msgid "Mothe_r"
 msgstr ""
 
-#: ChooseParents.py:502 SelectChild.py:287 SelectChild.py:306
+#: ChooseParents.py:564 SelectChild.py:192 SelectChild.py:211
 msgid "Error selecting a child"
 msgstr ""
 
-#: ChooseParents.py:503
+#: ChooseParents.py:565
 msgid "A person cannot be linked as his/her own parent"
 msgstr ""
 
-#: ChooseParents.py:532 ChooseParents.py:545
-msgid "Added person is not visible"
-msgstr ""
-
-#: ChooseParents.py:533 ChooseParents.py:546
-msgid "The person you added is currently not visible due to the chosen filter. This may occur if you did not specify a birth date."
-msgstr ""
-
-#: ChooseParents.py:623
+#: ChooseParents.py:689
 msgid "Modify the Parents of %s"
 msgstr ""
 
-#: ChooseParents.py:624 ChooseParents.py:736
+#: ChooseParents.py:690 ChooseParents.py:802
 msgid "Modify Parents"
 msgstr ""
 
-#: ChooseParents.py:650 FamilyView.py:1100 MergePeople.py:136
+#: ChooseParents.py:716 FamilyView.py:1112 MergePeople.py:136
 #: plugins/FamilyGroup.py:261 plugins/IndivComplete.py:215
 #: plugins/IndivComplete.py:217 plugins/IndivComplete.py:450
 #: plugins/IndivSummary.py:290 plugins/WebPage.py:340 plugins/WebPage.py:343
 msgid "Mother"
 msgstr ""
 
-#: ChooseParents.py:651 FamilyView.py:1098 MergePeople.py:134
+#: ChooseParents.py:717 FamilyView.py:1110 MergePeople.py:134
 #: plugins/FamilyGroup.py:248 plugins/IndivComplete.py:206
 #: plugins/IndivComplete.py:208 plugins/IndivComplete.py:445
 #: plugins/IndivSummary.py:276 plugins/WebPage.py:339 plugins/WebPage.py:342
 msgid "Father"
 msgstr ""
 
+#: ChooseParents.py:834
+msgid "Likely Father"
+msgstr ""
+
+#: ChooseParents.py:835
+msgid "Matches likely fathers"
+msgstr ""
+
+#: ChooseParents.py:844
+msgid "Likely Mother"
+msgstr ""
+
+#: ChooseParents.py:845
+msgid "Matches likely mothers"
+msgstr ""
+
 #: ColumnOrder.py:40
 msgid "Select Columns"
 msgstr ""
@@ -312,7 +335,7 @@ msgstr ""
 msgid "Date selection"
 msgstr ""
 
-#: DateEdit.py:264 gramps_main.py:1154 gramps_main.py:1161
+#: DateEdit.py:264 gramps_main.py:1168 gramps_main.py:1175
 msgid "Could not open help"
 msgstr ""
 
@@ -364,7 +387,7 @@ msgstr ""
 msgid "Select file _type:"
 msgstr ""
 
-#: DbPrompter.py:611 gramps_main.py:1374
+#: DbPrompter.py:611 gramps_main.py:1388
 msgid "All files"
 msgstr ""
 
@@ -385,7 +408,7 @@ msgid "GEDCOM files"
 msgstr ""
 
 #: DisplayModels.py:47 GrampsMime.py:46 GrampsMime.py:53 MergePeople.py:50
-#: PeopleModel.py:381 SelectChild.py:245 Utils.py:123 const.py:169
+#: PeopleModel.py:387 Utils.py:118 const.py:169
 #: plugins/DetAncestralReport.py:308 plugins/DetAncestralReport.py:315
 #: plugins/DetDescendantReport.py:330 plugins/DetDescendantReport.py:337
 #: plugins/FamilyGroup.py:458 plugins/IndivComplete.py:281
@@ -393,19 +416,19 @@ msgstr ""
 msgid "unknown"
 msgstr ""
 
-#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:381 SelectChild.py:241
-#: const.py:167 plugins/RelCalc.py:111
+#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:387 const.py:167
+#: plugins/RelCalc.py:111
 msgid "male"
 msgstr ""
 
-#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:381 SelectChild.py:243
-#: const.py:168 plugins/RelCalc.py:113
+#: DisplayModels.py:47 MergePeople.py:50 PeopleModel.py:387 const.py:168
+#: plugins/RelCalc.py:113
 msgid "female"
 msgstr ""
 
-#: DisplayModels.py:468 ImageSelect.py:981 MediaView.py:243 NoteEdit.py:104
-#: Utils.py:160 gramps.glade:5208 gramps.glade:15342 gramps.glade:25747
-#: gramps.glade:26749 gramps.glade:28117 gramps.glade:29548
+#: DisplayModels.py:468 ImageSelect.py:983 MediaView.py:243 NoteEdit.py:104
+#: Utils.py:155 gramps.glade:5501 gramps.glade:16531 gramps.glade:27709
+#: gramps.glade:28757 gramps.glade:30210 gramps.glade:31740
 msgid "Note"
 msgstr ""
 
@@ -422,7 +445,7 @@ msgstr ""
 msgid "Internal Error"
 msgstr ""
 
-#: EditPerson.py:132 EditPerson.py:634
+#: EditPerson.py:132 EditPerson.py:635
 msgid "Edit Person"
 msgstr ""
 
@@ -430,12 +453,12 @@ msgstr ""
 msgid "Patronymic:"
 msgstr ""
 
-#: EditPerson.py:306 EditSource.py:325 EventEdit.py:278 ImageSelect.py:1123
+#: EditPerson.py:306 EditSource.py:332 EventEdit.py:278 ImageSelect.py:1125
 #: Marriage.py:213 plugins/ScratchPad.py:166 plugins/ScratchPad.py:180
 msgid "Event"
 msgstr ""
 
-#: EditPerson.py:307 EditPerson.py:344 EditPlace.py:130 const.py:435
+#: EditPerson.py:307 EditPerson.py:344 EditPlace.py:131 const.py:435
 #: plugins/ScratchPad.py:185 plugins/ScratchPad.py:227
 #: plugins/ScratchPad.py:262
 msgid "Description"
@@ -447,21 +470,21 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#: EditPerson.py:309 EditPlace.py:271 EditSource.py:331 ImageSelect.py:1129
-#: Marriage.py:213 gramps.glade:12208 plugins/ScratchPad.py:183
+#: EditPerson.py:309 EditPlace.py:289 EditSource.py:338 ImageSelect.py:1131
+#: Marriage.py:213 gramps.glade:13109 plugins/ScratchPad.py:183
 #: plugins/ScratchPad.py:225
 msgid "Place"
 msgstr ""
 
-#: EditPerson.py:326 EditSource.py:156 ImageSelect.py:682 ImageSelect.py:952
-#: Marriage.py:214 gramps.glade:12727 plugins/FilterEditor.py:459
+#: EditPerson.py:326 EditSource.py:160 ImageSelect.py:682 ImageSelect.py:954
+#: Marriage.py:214 gramps.glade:13691 plugins/FilterEditor.py:459
 #: plugins/PatchNames.py:188 plugins/ScratchPad.py:284
 #: plugins/ScratchPad.py:317 plugins/ScratchPad.py:543
 #: plugins/ScratchPad.py:549
 msgid "Value"
 msgstr ""
 
-#: EditPerson.py:338 EditSource.py:305 ImageSelect.py:1102 MediaView.py:59
+#: EditPerson.py:338 EditSource.py:312 ImageSelect.py:1104 MediaView.py:59
 #: MergePeople.py:152 SelectObject.py:86 plugins/BookReport.py:631
 #: plugins/BookReport.py:632 plugins/PatchNames.py:185
 #: plugins/ScratchPad.py:181 plugins/ScratchPad.py:223
@@ -471,179 +494,187 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: EditPerson.py:344 EditPlace.py:129 MediaView.py:60
+#: EditPerson.py:344 EditPlace.py:130 MediaView.py:60
 #: plugins/ScratchPad.py:260
 msgid "Path"
 msgstr ""
 
-#: EditPerson.py:566 ImageSelect.py:610 ImageSelect.py:1037 MediaView.py:275
+#: EditPerson.py:567 ImageSelect.py:610 ImageSelect.py:1041 MediaView.py:275
 #: plugins/ScratchPad.py:424 plugins/ScratchPad.py:432
 msgid "Media Object"
 msgstr ""
 
-#: EditPerson.py:572 ImageSelect.py:616 docgen/AbiWord2Doc.py:327
+#: EditPerson.py:573 ImageSelect.py:616 docgen/AbiWord2Doc.py:335
 #: docgen/AsciiDoc.py:371 docgen/HtmlDoc.py:486 docgen/KwordDoc.py:494
 #: docgen/PdfDoc.py:631 docgen/RTFDoc.py:427
 msgid "Open in %s"
 msgstr ""
 
-#: EditPerson.py:575 ImageSelect.py:619 MediaView.py:288
+#: EditPerson.py:576 ImageSelect.py:619 MediaView.py:288
 msgid "Edit with the GIMP"
 msgstr ""
 
-#: EditPerson.py:577 ImageSelect.py:621
+#: EditPerson.py:578 ImageSelect.py:621
 msgid "Edit Object Properties"
 msgstr ""
 
-#: EditPerson.py:628
+#: EditPerson.py:629
 msgid "New Person"
 msgstr ""
 
-#: EditPerson.py:753 GrampsCfg.py:63 const.py:233 const.py:246
+#: EditPerson.py:754 GrampsCfg.py:63 const.py:233 const.py:246
 msgid "None"
 msgstr ""
 
-#: EditPerson.py:1290
+#: EditPerson.py:1291
 msgid "Save changes to %s?"
 msgstr ""
 
-#: EditPerson.py:1291 EditPerson.py:1307 Marriage.py:622 Marriage.py:635
+#: EditPerson.py:1292 EditPerson.py:1308 Marriage.py:622 Marriage.py:635
 msgid "If you close without saving, the changes you have made will be lost"
 msgstr ""
 
-#: EditPerson.py:1306
+#: EditPerson.py:1307
 msgid "Save Changes to %s?"
 msgstr ""
 
-#: EditPerson.py:1652
+#: EditPerson.py:1653
 msgid "Make the selected name the preferred name"
 msgstr ""
 
-#: EditPerson.py:1696
+#: EditPerson.py:1697
 msgid "Unknown gender specified"
 msgstr ""
 
-#: EditPerson.py:1697
+#: EditPerson.py:1698
 msgid "The gender of the person is currently unknown. Usually, this is a mistake. You may choose to either continue saving, or returning to the Edit Person dialog to fix the problem."
 msgstr ""
 
-#: EditPerson.py:1701
+#: EditPerson.py:1702
 msgid "Continue saving"
 msgstr ""
 
-#: EditPerson.py:1701
+#: EditPerson.py:1702
 msgid "Return to window"
 msgstr ""
 
-#: EditPerson.py:1729 Marriage.py:654
+#: EditPerson.py:1730 Marriage.py:654
 msgid "GRAMPS ID value was not changed."
 msgstr ""
 
-#: EditPerson.py:1730
+#: EditPerson.py:1731
 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:1842
+#: EditPerson.py:1843
 msgid "Problem changing the gender"
 msgstr ""
 
-#: EditPerson.py:1843
+#: EditPerson.py:1844
 msgid ""
 "Changing the gender caused problems with marriage information.\n"
 "Please check the person's marriages."
 msgstr ""
 
-#: EditPerson.py:1886
+#: EditPerson.py:1887
 msgid "Edit Person (%s)"
 msgstr ""
 
-#: EditPerson.py:1902 ImageSelect.py:1162
+#: EditPerson.py:1903 ImageSelect.py:1165
 msgid "Add Place (%s)"
 msgstr ""
 
-#: EditPlace.py:90 EditPlace.py:277
+#: EditPlace.py:91 EditPlace.py:295
 msgid "Place Editor"
 msgstr ""
 
-#: EditPlace.py:149 PlaceView.py:53
+#: EditPlace.py:150 PlaceView.py:53
 msgid "City"
 msgstr ""
 
-#: EditPlace.py:149 PlaceView.py:54
+#: EditPlace.py:150 PlaceView.py:54
 msgid "County"
 msgstr ""
 
-#: EditPlace.py:150 PlaceView.py:55
+#: EditPlace.py:151 PlaceView.py:55
 msgid "State"
 msgstr ""
 
-#: EditPlace.py:150 PlaceView.py:56
+#: EditPlace.py:151 PlaceView.py:56
 msgid "Country"
 msgstr ""
 
-#: EditPlace.py:266 EditPlace.py:270
+#: EditPlace.py:284 EditPlace.py:288
 msgid "New Place"
 msgstr ""
 
-#: EditPlace.py:400
+#: EditPlace.py:391
+msgid "Place title is already in use"
+msgstr ""
+
+#: EditPlace.py:392
+msgid "Each place must have a unique title, and title you have selected is already used by another place"
+msgstr ""
+
+#: EditPlace.py:427
 msgid "Edit Place (%s)"
 msgstr ""
 
-#: EditPlace.py:518
+#: EditPlace.py:546
 msgid "People"
 msgstr ""
 
-#: EditPlace.py:520 EditPlace.py:529
+#: EditPlace.py:548 EditPlace.py:557
 msgid ""
 "%s [%s]: event %s\n"
 msgstr ""
 
-#: EditPlace.py:527
+#: EditPlace.py:555
 msgid "Families"
 msgstr ""
 
-#: EditPlace.py:535 Utils.py:115
+#: EditPlace.py:563 Utils.py:110
 msgid "%(father)s and %(mother)s"
 msgstr ""
 
-#: EditPlace.py:605 PlaceView.py:221
+#: EditPlace.py:633 PlaceView.py:224
 msgid "Delete Place (%s)"
 msgstr ""
 
-#: EditSource.py:86 EditSource.py:242
+#: EditSource.py:90 EditSource.py:249
 msgid "Source Editor"
 msgstr ""
 
-#: EditSource.py:156
+#: EditSource.py:160
 msgid "Key"
 msgstr ""
 
-#: EditSource.py:231 EditSource.py:235 Sources.py:451 Sources.py:453
+#: EditSource.py:238 EditSource.py:242 Sources.py:451 Sources.py:453
 msgid "New Source"
 msgstr ""
 
-#: EditSource.py:236 EditSource.py:337 ImageSelect.py:1135 Utils.py:165
-#: Utils.py:167
+#: EditSource.py:243 EditSource.py:344 ImageSelect.py:1137 Utils.py:160
+#: Utils.py:162
 msgid "Source"
 msgstr ""
 
-#: EditSource.py:313 ImageSelect.py:1111 plugins/EventCmp.py:408
+#: EditSource.py:320 ImageSelect.py:1113 plugins/EventCmp.py:408
 msgid "Person"
 msgstr ""
 
-#: EditSource.py:319 ImageSelect.py:1117
+#: EditSource.py:326 ImageSelect.py:1119
 msgid "Family"
 msgstr ""
 
-#: EditSource.py:343
+#: EditSource.py:350
 msgid "Media"
 msgstr ""
 
-#: EditSource.py:397
+#: EditSource.py:404
 msgid "Edit Source (%s)"
 msgstr ""
 
-#: EditSource.py:463
+#: EditSource.py:471
 msgid "Delete Source (%s)"
 msgstr ""
 
@@ -813,22 +844,22 @@ msgstr ""
 
 #: FamilyView.py:395 FamilyView.py:405 FamilyView.py:426 FamilyView.py:433
 #: FamilyView.py:465 FamilyView.py:530 FamilyView.py:536 FamilyView.py:606
-#: FamilyView.py:612 FamilyView.py:1173 FamilyView.py:1179 FamilyView.py:1212
-#: FamilyView.py:1218 PedView.py:561 PedView.py:570 PeopleView.py:308
-#: gramps.glade:821 gramps_main.py:659
+#: FamilyView.py:612 FamilyView.py:1176 FamilyView.py:1182 FamilyView.py:1215
+#: FamilyView.py:1221 PedView.py:564 PedView.py:573 PeopleView.py:301
+#: gramps.glade:822 gramps_main.py:659
 msgid "Home"
 msgstr ""
 
-#: FamilyView.py:396 PeopleView.py:291
+#: FamilyView.py:396 PeopleView.py:284
 msgid "Add Bookmark"
 msgstr ""
 
 #: FamilyView.py:399 FamilyView.py:429 FamilyView.py:458 FamilyView.py:489
-#: PedView.py:584 PedView.py:595 PeopleView.py:304
+#: PedView.py:587 PedView.py:598 PeopleView.py:297
 msgid "People Menu"
 msgstr ""
 
-#: FamilyView.py:454 FamilyView.py:486 FamilyView.py:1192 FamilyView.py:1231
+#: FamilyView.py:454 FamilyView.py:486 FamilyView.py:1195 FamilyView.py:1234
 msgid "Add parents"
 msgstr ""
 
@@ -840,7 +871,7 @@ msgstr ""
 msgid "Make the selected child an active person"
 msgstr ""
 
-#: FamilyView.py:548 FamilyView.py:1191 FamilyView.py:1230
+#: FamilyView.py:548 FamilyView.py:1194 FamilyView.py:1233
 msgid "Edit the child/parent relationships"
 msgstr ""
 
@@ -884,143 +915,133 @@ msgstr ""
 msgid "Modify family"
 msgstr ""
 
-#: FamilyView.py:800 FamilyView.py:1445 SelectChild.py:85 SelectChild.py:148
+#: FamilyView.py:800 FamilyView.py:1448 SelectChild.py:88 SelectChild.py:153
 msgid "Add Child to Family"
 msgstr ""
 
-#: FamilyView.py:839
+#: FamilyView.py:854
 msgid "Remove Child (%s)"
 msgstr ""
 
-#: FamilyView.py:845
+#: FamilyView.py:862
 msgid "Remove %s as a spouse of %s?"
 msgstr ""
 
-#: FamilyView.py:846
+#: FamilyView.py:863
 msgid "Removing a spouse removes the relationship between the spouse and the active person. It does not remove the spouse from the database"
 msgstr ""
 
-#: FamilyView.py:849
+#: FamilyView.py:866
 msgid "_Remove Spouse"
 msgstr ""
 
-#: FamilyView.py:893
+#: FamilyView.py:905
 msgid "Remove Spouse (%s)"
 msgstr ""
 
-#: FamilyView.py:934
+#: FamilyView.py:946
 msgid "Select Parents (%s)"
 msgstr ""
 
-#: FamilyView.py:1049
+#: FamilyView.py:1061
 msgid ""
 msgstr ""
 
-#: FamilyView.py:1066
+#: FamilyView.py:1078
 msgid "Database corruption detected"
 msgstr ""
 
-#: FamilyView.py:1067
+#: FamilyView.py:1079
 msgid "A problem was detected with the database. Please run the Check and Repair Database tool to fix the problem."
 msgstr ""
 
-#: FamilyView.py:1118
+#: FamilyView.py:1130
 msgid ""
 "%s: %s [%s]\n"
 "\tRelationship: %s"
 msgstr ""
 
-#: FamilyView.py:1120
+#: FamilyView.py:1132
 msgid "%s: unknown"
 msgstr ""
 
-#: FamilyView.py:1164
+#: FamilyView.py:1167
 msgid "Parents Menu"
 msgstr ""
 
-#: FamilyView.py:1190 FamilyView.py:1229
+#: FamilyView.py:1193 FamilyView.py:1232
 msgid "Make the selected parents the active family"
 msgstr ""
 
-#: FamilyView.py:1193 FamilyView.py:1232
+#: FamilyView.py:1196 FamilyView.py:1235
 msgid "Remove parents"
 msgstr ""
 
-#: FamilyView.py:1203
+#: FamilyView.py:1206
 msgid "Spouse Parents Menu"
 msgstr ""
 
-#: FamilyView.py:1295 FamilyView.py:1310
+#: FamilyView.py:1298 FamilyView.py:1313
 msgid "Remove Parents of %s"
 msgstr ""
 
-#: FamilyView.py:1296 FamilyView.py:1311
+#: FamilyView.py:1299 FamilyView.py:1314
 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:1300 FamilyView.py:1315
+#: FamilyView.py:1303 FamilyView.py:1318
 msgid "_Remove Parents"
 msgstr ""
 
-#: FamilyView.py:1408
+#: FamilyView.py:1411
 msgid "Remove Parents (%s)"
 msgstr ""
 
-#: FamilyView.py:1480
+#: FamilyView.py:1483
 msgid "Attempt to Reorder Children Failed"
 msgstr ""
 
-#: FamilyView.py:1481
+#: FamilyView.py:1484
 msgid "Children must be ordered by their birth dates."
 msgstr ""
 
-#: FamilyView.py:1486
+#: FamilyView.py:1489
 msgid "Reorder children"
 msgstr ""
 
-#: FamilyView.py:1520
+#: FamilyView.py:1523
 msgid "Reorder spouses"
 msgstr ""
 
-#: GenericFilter.py:90
+#: GenericFilter.py:91
 msgid "Miscellaneous filters"
 msgstr ""
 
-#: GenericFilter.py:91 rule.glade:1165
+#: GenericFilter.py:92 rule.glade:1165
 msgid "No description"
 msgstr ""
 
-#: GenericFilter.py:130
+#: GenericFilter.py:131
 msgid "Everyone"
 msgstr ""
 
-#: GenericFilter.py:131 GenericFilter.py:146 GenericFilter.py:263
-#: GenericFilter.py:277 GenericFilter.py:295 GenericFilter.py:312
-#: GenericFilter.py:327 GenericFilter.py:342 GenericFilter.py:969
-#: GenericFilter.py:1218 GenericFilter.py:1243 GenericFilter.py:1273
-#: GenericFilter.py:1306 GenericFilter.py:1324 GenericFilter.py:1346
-#: GenericFilter.py:1431 GenericFilter.py:1489 GenericFilter.py:1554
-#: GenericFilter.py:1574 GenericFilter.py:1645 GenericFilter.py:1810
-msgid "General filters"
-msgstr ""
-
-#: GenericFilter.py:132
+#: GenericFilter.py:133
 msgid "Matches everyone in the database"
 msgstr ""
 
-#: GenericFilter.py:145
+#: GenericFilter.py:146
 msgid "Disconnected people"
 msgstr ""
 
-#: GenericFilter.py:147
+#: GenericFilter.py:148
 msgid "Matches people that have no family relationships to any other person in the database"
 msgstr ""
 
-#: GenericFilter.py:164 GenericFilter.py:260 GenericFilter.py:357
-#: GenericFilter.py:448 GenericFilter.py:492 GenericFilter.py:614
-#: GenericFilter.py:661 GenericFilter.py:759 GenericFilter.py:811
-#: GenericFilter.py:898 gramps.glade:3363 gramps.glade:19187
-#: gramps.glade:21375 gramps.glade:22772 plugins/FilterEditor.py:680
+#: GenericFilter.py:164 GenericFilter.py:260 GenericFilter.py:368
+#: GenericFilter.py:459 GenericFilter.py:502 GenericFilter.py:623
+#: GenericFilter.py:670 GenericFilter.py:768 GenericFilter.py:820
+#: GenericFilter.py:907 gramps.glade:3521 gramps.glade:20666
+#: gramps.glade:23027 gramps.glade:24539 plugins/FilterEditor.py:680
 msgid "ID:"
 msgstr ""
 
@@ -1052,342 +1073,342 @@ msgstr ""
 msgid "Matches the default person"
 msgstr ""
 
-#: GenericFilter.py:294
+#: GenericFilter.py:299
 msgid "Bookmarked people"
 msgstr ""
 
-#: GenericFilter.py:296
+#: GenericFilter.py:301
 msgid "Matches the people on the bookmark list"
 msgstr ""
 
-#: GenericFilter.py:311
+#: GenericFilter.py:322
 msgid "People with complete records"
 msgstr ""
 
-#: GenericFilter.py:313
+#: GenericFilter.py:324
 msgid "Matches all people whose records are complete"
 msgstr ""
 
-#: GenericFilter.py:326 gramps_main.py:957 plugins/Summary.py:113
+#: GenericFilter.py:337 gramps_main.py:957 plugins/Summary.py:113
 msgid "Females"
 msgstr ""
 
-#: GenericFilter.py:328
+#: GenericFilter.py:339
 msgid "Matches all females"
 msgstr ""
 
-#: GenericFilter.py:341 gramps_main.py:967
+#: GenericFilter.py:352 gramps_main.py:967
 msgid "People with unknown gender"
 msgstr ""
 
-#: GenericFilter.py:343
+#: GenericFilter.py:354
 msgid "Matches all people with unknown gender"
 msgstr ""
 
-#: GenericFilter.py:357 GenericFilter.py:406 GenericFilter.py:661
-#: GenericFilter.py:716 plugins/FilterEditor.py:692
+#: GenericFilter.py:368 GenericFilter.py:416 GenericFilter.py:670
+#: GenericFilter.py:724 plugins/FilterEditor.py:692
 msgid "Inclusive:"
 msgstr ""
 
-#: GenericFilter.py:358
+#: GenericFilter.py:369
 msgid "Descendants of "
 msgstr ""
 
-#: GenericFilter.py:359 GenericFilter.py:408 GenericFilter.py:450
-#: GenericFilter.py:494 GenericFilter.py:616
+#: GenericFilter.py:370 GenericFilter.py:418 GenericFilter.py:461
+#: GenericFilter.py:504 GenericFilter.py:625
 msgid "Descendant filters"
 msgstr ""
 
-#: GenericFilter.py:360
+#: GenericFilter.py:371
 msgid "Matches all descendants for the specified person"
 msgstr ""
 
-#: GenericFilter.py:406 GenericFilter.py:535 GenericFilter.py:573
-#: GenericFilter.py:716 GenericFilter.py:861 GenericFilter.py:941
+#: GenericFilter.py:416 GenericFilter.py:544 GenericFilter.py:582
+#: GenericFilter.py:724 GenericFilter.py:870 GenericFilter.py:951
 #: GenericFilter.py:1343 GenericFilter.py:1386 plugins/FilterEditor.py:684
 msgid "Filter name:"
 msgstr ""
 
-#: GenericFilter.py:407
+#: GenericFilter.py:417
 msgid "Descendants of  match"
 msgstr ""
 
-#: GenericFilter.py:409
+#: GenericFilter.py:419
 msgid "Matches people that are descendants of anybody matched by a filter"
 msgstr ""
 
-#: GenericFilter.py:448 GenericFilter.py:492 GenericFilter.py:759
-#: GenericFilter.py:811 plugins/FilterEditor.py:678
+#: GenericFilter.py:459 GenericFilter.py:502 GenericFilter.py:768
+#: GenericFilter.py:820 plugins/FilterEditor.py:678
 msgid "Number of generations:"
 msgstr ""
 
-#: GenericFilter.py:449
+#: GenericFilter.py:460
 msgid "Descendants of  not more than  generations away"
 msgstr ""
 
-#: GenericFilter.py:451
+#: GenericFilter.py:462
 msgid "Matches people that are descendants of a specified person not more than N generations away"
 msgstr ""
 
-#: GenericFilter.py:493
+#: GenericFilter.py:503
 msgid "Descendants of  at least  generations away"
 msgstr ""
 
-#: GenericFilter.py:495
+#: GenericFilter.py:505
 msgid "Matches people that are descendants of a specified person at least N generations away"
 msgstr ""
 
-#: GenericFilter.py:536
+#: GenericFilter.py:545
 msgid "Children of  match"
 msgstr ""
 
-#: GenericFilter.py:537 GenericFilter.py:575 GenericFilter.py:863
-#: GenericFilter.py:1088 GenericFilter.py:1389 GenericFilter.py:1413
-#: GenericFilter.py:1445 GenericFilter.py:1461 GenericFilter.py:1475
+#: GenericFilter.py:546 GenericFilter.py:584 GenericFilter.py:872
+#: GenericFilter.py:1096 GenericFilter.py:1389 GenericFilter.py:1412
+#: GenericFilter.py:1442 GenericFilter.py:1457 GenericFilter.py:1470
 msgid "Family filters"
 msgstr ""
 
-#: GenericFilter.py:538
+#: GenericFilter.py:547
 msgid "Matches children of anybody matched by a filter"
 msgstr ""
 
-#: GenericFilter.py:574
+#: GenericFilter.py:583
 msgid "Siblings of  match"
 msgstr ""
 
-#: GenericFilter.py:576
+#: GenericFilter.py:585
 msgid "Matches siblings of anybody matched by a filter"
 msgstr ""
 
-#: GenericFilter.py:615
+#: GenericFilter.py:624
 msgid "Descendant family members of "
 msgstr ""
 
-#: GenericFilter.py:617
+#: GenericFilter.py:626
 msgid "Matches people that are descendants or the spouse of a descendant of a specified person"
 msgstr ""
 
-#: GenericFilter.py:662
+#: GenericFilter.py:671
 msgid "Ancestors of "
 msgstr ""
 
-#: GenericFilter.py:663 GenericFilter.py:718 GenericFilter.py:761
-#: GenericFilter.py:813 GenericFilter.py:900 GenericFilter.py:945
+#: GenericFilter.py:672 GenericFilter.py:726 GenericFilter.py:770
+#: GenericFilter.py:822 GenericFilter.py:909 GenericFilter.py:955
 msgid "Ancestral filters"
 msgstr ""
 
-#: GenericFilter.py:664
+#: GenericFilter.py:673
 msgid "Matches people that are ancestors of a specified person"
 msgstr ""
 
-#: GenericFilter.py:717
+#: GenericFilter.py:725
 msgid "Ancestors of  match"
 msgstr ""
 
-#: GenericFilter.py:719
+#: GenericFilter.py:727
 msgid "Matches people that are ancestors of anybody matched by a filter"
 msgstr ""
 
-#: GenericFilter.py:760
+#: GenericFilter.py:769
 msgid "Ancestors of  not more than  generations away"
 msgstr ""
 
-#: GenericFilter.py:762
+#: GenericFilter.py:771
 msgid "Matches people that are ancestors of a specified person not more than N generations away"
 msgstr ""
 
-#: GenericFilter.py:812
+#: GenericFilter.py:821
 msgid "Ancestors of  at least  generations away"
 msgstr ""
 
-#: GenericFilter.py:814
+#: GenericFilter.py:823
 msgid "Matches people that are ancestors of a specified person at least N generations away"
 msgstr ""
 
-#: GenericFilter.py:862
+#: GenericFilter.py:871
 msgid "Parents of  match"
 msgstr ""
 
-#: GenericFilter.py:864
+#: GenericFilter.py:873
 msgid "Matches parents of anybody matched by a filter"
 msgstr ""
 
-#: GenericFilter.py:899
+#: GenericFilter.py:908
 msgid "People with a common ancestor with "
 msgstr ""
 
-#: GenericFilter.py:901
+#: GenericFilter.py:910
 msgid "Matches people that have a common ancestor with a specified person"
 msgstr ""
 
-#: GenericFilter.py:942
+#: GenericFilter.py:952
 msgid "People with a common ancestor with  match"
 msgstr ""
 
-#: GenericFilter.py:943
+#: GenericFilter.py:953
 msgid "Matches people that have a common ancestor with anybody matched by a filter"
 msgstr ""
 
-#: GenericFilter.py:968 gramps_main.py:962 plugins/Summary.py:112
+#: GenericFilter.py:978 gramps_main.py:962 plugins/Summary.py:112
 msgid "Males"
 msgstr ""
 
-#: GenericFilter.py:970
+#: GenericFilter.py:980
 msgid "Matches all males"
 msgstr ""
 
-#: GenericFilter.py:983 GenericFilter.py:1586 plugins/FilterEditor.py:58
+#: GenericFilter.py:993 GenericFilter.py:1575 plugins/FilterEditor.py:58
 msgid "Personal event:"
 msgstr ""
 
-#: GenericFilter.py:984 GenericFilter.py:1034 GenericFilter.py:1135
-#: GenericFilter.py:1175 gramps.glade:8536 gramps.glade:9462
-#: gramps.glade:12160 gramps.glade:13667
+#: GenericFilter.py:994 GenericFilter.py:1043 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:9101 gramps.glade:10129
+#: gramps.glade:13053 gramps.glade:14701
 msgid "Date:"
 msgstr ""
 
-#: GenericFilter.py:985 GenericFilter.py:1035 GenericFilter.py:1135
-#: GenericFilter.py:1175 gramps.glade:8488 gramps.glade:13715
+#: GenericFilter.py:995 GenericFilter.py:1044 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:9045 gramps.glade:14757
 #: plugins/FilterEditor.py:676
 msgid "Place:"
 msgstr ""
 
-#: GenericFilter.py:986 GenericFilter.py:1036 GenericFilter.py:1135
-#: GenericFilter.py:1175 gramps.glade:8440 gramps.glade:10680
-#: gramps.glade:12256 gramps.glade:15790
+#: GenericFilter.py:996 GenericFilter.py:1045 GenericFilter.py:1142
+#: GenericFilter.py:1181 gramps.glade:8989 gramps.glade:11453
+#: gramps.glade:13165 gramps.glade:16998
 msgid "Description:"
 msgstr ""
 
-#: GenericFilter.py:987
+#: GenericFilter.py:997
 msgid "People with the personal "
 msgstr ""
 
-#: GenericFilter.py:988
+#: GenericFilter.py:998
 msgid "Matches people with a personal event of a particular value"
 msgstr ""
 
-#: GenericFilter.py:989 GenericFilter.py:1039 GenericFilter.py:1138
-#: GenericFilter.py:1178 GenericFilter.py:1509 GenericFilter.py:1530
-#: GenericFilter.py:1589
+#: GenericFilter.py:999 GenericFilter.py:1048 GenericFilter.py:1145
+#: GenericFilter.py:1184 GenericFilter.py:1502 GenericFilter.py:1522
+#: GenericFilter.py:1578
 msgid "Event filters"
 msgstr ""
 
-#: GenericFilter.py:1033 GenericFilter.py:1586 plugins/FilterEditor.py:59
+#: GenericFilter.py:1042 GenericFilter.py:1575 plugins/FilterEditor.py:59
 msgid "Family event:"
 msgstr ""
 
-#: GenericFilter.py:1037
+#: GenericFilter.py:1046
 msgid "People with the family "
 msgstr ""
 
-#: GenericFilter.py:1038
+#: GenericFilter.py:1047
 msgid "Matches people with a family event of a particular value"
 msgstr ""
 
-#: GenericFilter.py:1083
+#: GenericFilter.py:1091
 msgid "Number of relationships:"
 msgstr ""
 
-#: GenericFilter.py:1084 plugins/FilterEditor.py:65
+#: GenericFilter.py:1092 plugins/FilterEditor.py:65
 msgid "Relationship type:"
 msgstr ""
 
-#: GenericFilter.py:1085
+#: GenericFilter.py:1093
 msgid "Number of children:"
 msgstr ""
 
-#: GenericFilter.py:1086
+#: GenericFilter.py:1094
 msgid "People with the "
 msgstr ""
 
-#: GenericFilter.py:1087
+#: GenericFilter.py:1095
 msgid "Matches people with a particular relationship"
 msgstr ""
 
-#: GenericFilter.py:1136
+#: GenericFilter.py:1143
 msgid "People with the "
 msgstr ""
 
-#: GenericFilter.py:1137
+#: GenericFilter.py:1144
 msgid "Matches people with birth data of a particular value"
 msgstr ""
 
-#: GenericFilter.py:1176
+#: GenericFilter.py:1182
 msgid "People with the "
 msgstr ""
 
-#: GenericFilter.py:1177
+#: GenericFilter.py:1183
 msgid "Matches people with death data of a particular value"
 msgstr ""
 
-#: GenericFilter.py:1215 GenericFilter.py:1240 gramps.glade:9050
-#: gramps.glade:22103 gramps.glade:23110
+#: GenericFilter.py:1220 GenericFilter.py:1244 gramps.glade:9674
+#: gramps.glade:23827 gramps.glade:24909
 msgid "Value:"
 msgstr ""
 
-#: GenericFilter.py:1215 plugins/FilterEditor.py:60
+#: GenericFilter.py:1220 plugins/FilterEditor.py:60
 msgid "Personal attribute:"
 msgstr ""
 
-#: GenericFilter.py:1216
+#: GenericFilter.py:1221
 msgid "People with the personal "
 msgstr ""
 
-#: GenericFilter.py:1217
+#: GenericFilter.py:1222
 msgid "Matches people with the personal attribute of a particular value"
 msgstr ""
 
-#: GenericFilter.py:1240 plugins/FilterEditor.py:61
+#: GenericFilter.py:1244 plugins/FilterEditor.py:61
 msgid "Family attribute:"
 msgstr ""
 
-#: GenericFilter.py:1241
+#: GenericFilter.py:1245
 msgid "People with the family "
 msgstr ""
 
-#: GenericFilter.py:1242
+#: GenericFilter.py:1246
 msgid "Matches people with the family attribute of a particular value"
 msgstr ""
 
-#: GenericFilter.py:1267 gramps.glade:7894
+#: GenericFilter.py:1270 gramps.glade:8380
 msgid "Given name:"
 msgstr ""
 
-#: GenericFilter.py:1268 gramps.glade:7870
+#: GenericFilter.py:1271 gramps.glade:8352
 msgid "Family name:"
 msgstr ""
 
-#: GenericFilter.py:1269 gramps.glade:7846
+#: GenericFilter.py:1272 gramps.glade:8324
 msgid "Suffix:"
 msgstr ""
 
-#: GenericFilter.py:1270 gramps.glade:3457 gramps.glade:7918
-#: gramps.glade:19281 gramps.glade:21520 gramps.glade:30990
+#: GenericFilter.py:1273 gramps.glade:3631 gramps.glade:8408
+#: gramps.glade:20776 gramps.glade:23196 gramps.glade:33293
 #: mergedata.glade:874 mergedata.glade:896
 msgid "Title:"
 msgstr ""
 
-#: GenericFilter.py:1271
+#: GenericFilter.py:1274
 msgid "People with the "
 msgstr ""
 
-#: GenericFilter.py:1272 GenericFilter.py:1305
+#: GenericFilter.py:1275 GenericFilter.py:1307
 msgid "Matches people with a specified (partial) name"
 msgstr ""
 
-#: GenericFilter.py:1303 GenericFilter.py:1640
+#: GenericFilter.py:1305 GenericFilter.py:1629
 msgid "Substring:"
 msgstr ""
 
-#: GenericFilter.py:1304
+#: GenericFilter.py:1306
 msgid "People matching the "
 msgstr ""
 
-#: GenericFilter.py:1322 gramps_main.py:992
+#: GenericFilter.py:1323 gramps_main.py:992
 msgid "People with incomplete names"
 msgstr ""
 
-#: GenericFilter.py:1323
+#: GenericFilter.py:1324
 msgid "Matches people with firstname or lastname missing"
 msgstr ""
 
@@ -1407,123 +1428,123 @@ msgstr ""
 msgid "Matches people married to anybody matching a filter"
 msgstr ""
 
-#: GenericFilter.py:1411 gramps_main.py:982
+#: GenericFilter.py:1410 gramps_main.py:982
 msgid "Adopted people"
 msgstr ""
 
-#: GenericFilter.py:1412
+#: GenericFilter.py:1411
 msgid "Matches people who were adopted"
 msgstr ""
 
-#: GenericFilter.py:1429 gramps_main.py:987
+#: GenericFilter.py:1427 gramps_main.py:987
 msgid "People with images"
 msgstr ""
 
-#: GenericFilter.py:1430
+#: GenericFilter.py:1428
 msgid "Matches people with images in the gallery"
 msgstr ""
 
-#: GenericFilter.py:1443 gramps_main.py:997
+#: GenericFilter.py:1440 gramps_main.py:997
 msgid "People with children"
 msgstr ""
 
-#: GenericFilter.py:1444
+#: GenericFilter.py:1441
 msgid "Matches people who have children"
 msgstr ""
 
-#: GenericFilter.py:1459 gramps_main.py:1002
+#: GenericFilter.py:1455 gramps_main.py:1002
 msgid "People with no marriage records"
 msgstr ""
 
-#: GenericFilter.py:1460
+#: GenericFilter.py:1456
 msgid "Matches people who have no spouse"
 msgstr ""
 
-#: GenericFilter.py:1473 gramps_main.py:1007
+#: GenericFilter.py:1468 gramps_main.py:1007
 msgid "People with multiple marriage records"
 msgstr ""
 
-#: GenericFilter.py:1474
+#: GenericFilter.py:1469
 msgid "Matches people who have more than one spouse"
 msgstr ""
 
-#: GenericFilter.py:1487 gramps_main.py:1012
+#: GenericFilter.py:1481 gramps_main.py:1012
 msgid "People without a known birth date"
 msgstr ""
 
-#: GenericFilter.py:1488
+#: GenericFilter.py:1482
 msgid "Matches people without a known birthdate"
 msgstr ""
 
-#: GenericFilter.py:1507 gramps_main.py:1017
+#: GenericFilter.py:1500 gramps_main.py:1017
 msgid "People with incomplete events"
 msgstr ""
 
-#: GenericFilter.py:1508
+#: GenericFilter.py:1501
 msgid "Matches people with missing date or place in an event"
 msgstr ""
 
-#: GenericFilter.py:1528 gramps_main.py:1022
+#: GenericFilter.py:1520 gramps_main.py:1022
 msgid "Families with incomplete events"
 msgstr ""
 
-#: GenericFilter.py:1529
+#: GenericFilter.py:1521
 msgid "Matches people with missing date or place in an event of the family"
 msgstr ""
 
-#: GenericFilter.py:1551
+#: GenericFilter.py:1542
 msgid "On year:"
 msgstr ""
 
-#: GenericFilter.py:1552 gramps_main.py:1027
+#: GenericFilter.py:1543 gramps_main.py:1027
 msgid "People probably alive"
 msgstr ""
 
-#: GenericFilter.py:1553
+#: GenericFilter.py:1544
 msgid "Matches people without indications of death that are not too old"
 msgstr ""
 
-#: GenericFilter.py:1572 gramps_main.py:1032
+#: GenericFilter.py:1562 gramps_main.py:1032
 msgid "People marked private"
 msgstr ""
 
-#: GenericFilter.py:1573
+#: GenericFilter.py:1563
 msgid "Matches people that are indicated as private"
 msgstr ""
 
-#: GenericFilter.py:1587 gramps.glade:25926 gramps_main.py:1037
+#: GenericFilter.py:1576 gramps.glade:27895 gramps_main.py:1037
 msgid "Witnesses"
 msgstr ""
 
-#: GenericFilter.py:1588
+#: GenericFilter.py:1577
 msgid "Matches people who are witnesses in any event"
 msgstr ""
 
-#: GenericFilter.py:1641 plugins/FilterEditor.py:694
+#: GenericFilter.py:1630 plugins/FilterEditor.py:694
 msgid "Case sensitive:"
 msgstr ""
 
-#: GenericFilter.py:1642 plugins/FilterEditor.py:696
+#: GenericFilter.py:1631 plugins/FilterEditor.py:696
 msgid "Regular-Expression matching:"
 msgstr ""
 
-#: GenericFilter.py:1643
+#: GenericFilter.py:1632
 msgid "People with records containing "
 msgstr ""
 
-#: GenericFilter.py:1644
+#: GenericFilter.py:1633
 msgid "Matches people whose records contain text matching a substring"
 msgstr ""
 
-#: GenericFilter.py:1808 plugins/FilterEditor.py:682
+#: GenericFilter.py:1799 plugins/FilterEditor.py:682
 msgid "Source ID:"
 msgstr ""
 
-#: GenericFilter.py:1809
+#: GenericFilter.py:1800
 msgid "People with the "
 msgstr ""
 
-#: GenericFilter.py:1811
+#: GenericFilter.py:1802
 msgid "Matches people who have a particular source"
 msgstr ""
 
@@ -1539,7 +1560,7 @@ msgstr ""
 msgid "Icelandic style"
 msgstr ""
 
-#: GrampsCfg.py:70 GrampsCfg.py:74 gramps.glade:7733 gramps.glade:21835
+#: GrampsCfg.py:70 GrampsCfg.py:74 gramps.glade:8195 gramps.glade:23539
 msgid "General"
 msgstr ""
 
@@ -1591,19 +1612,19 @@ msgstr ""
 msgid "Reference Editor"
 msgstr ""
 
-#: ImageSelect.py:828 ImageSelect.py:1191 MediaView.py:345
+#: ImageSelect.py:828 ImageSelect.py:1194 MediaView.py:345
 msgid "Edit Media Object"
 msgstr ""
 
-#: ImageSelect.py:910
+#: ImageSelect.py:912
 msgid "Media Properties Editor"
 msgstr ""
 
-#: ImageSelect.py:1043
+#: ImageSelect.py:1047
 msgid "Properties Editor"
 msgstr ""
 
-#: ImageSelect.py:1288
+#: ImageSelect.py:1291
 msgid "Remove Media Object"
 msgstr ""
 
@@ -1615,7 +1636,7 @@ msgstr ""
 msgid "Marriage/Relationship Editor"
 msgstr ""
 
-#: Marriage.py:146 Marriage.py:805 Marriage.py:828 Utils.py:135
+#: Marriage.py:146 Marriage.py:805 Marriage.py:828 Utils.py:130
 msgid "%s and %s"
 msgstr ""
 
@@ -1700,11 +1721,11 @@ msgstr ""
 msgid "Alternate Names"
 msgstr ""
 
-#: MergePeople.py:122 gramps.glade:8961 gramps.glade:12692
+#: MergePeople.py:122 gramps.glade:9573 gramps.glade:13652
 msgid "Events"
 msgstr ""
 
-#: MergePeople.py:129 PedView.py:693
+#: MergePeople.py:129 PedView.py:696
 msgid "Parents"
 msgstr ""
 
@@ -1716,7 +1737,7 @@ msgstr ""
 msgid "No parents found"
 msgstr ""
 
-#: MergePeople.py:140 PedView.py:598
+#: MergePeople.py:140 PedView.py:601
 msgid "Spouses"
 msgstr ""
 
@@ -1729,7 +1750,7 @@ msgstr ""
 msgid "Marriage"
 msgstr ""
 
-#: MergePeople.py:159 const.py:902
+#: MergePeople.py:159 const.py:909
 msgid "Child"
 msgstr ""
 
@@ -1737,7 +1758,7 @@ msgstr ""
 msgid "No spouses or children found"
 msgstr ""
 
-#: MergePeople.py:165 gramps.glade:10111
+#: MergePeople.py:165 gramps.glade:10857
 msgid "Addresses"
 msgstr ""
 
@@ -1809,27 +1830,27 @@ msgstr ""
 msgid "crem."
 msgstr ""
 
-#: PedView.py:379
+#: PedView.py:382
 msgid "Anchor"
 msgstr ""
 
-#: PedView.py:496
+#: PedView.py:499
 msgid "Double clicking will make %s the active person"
 msgstr ""
 
-#: PedView.py:563
+#: PedView.py:566
 msgid "Set anchor"
 msgstr ""
 
-#: PedView.py:564
+#: PedView.py:567
 msgid "Remove anchor"
 msgstr ""
 
-#: PedView.py:629 plugins/WebPage.py:715
+#: PedView.py:632 plugins/WebPage.py:715
 msgid "Siblings"
 msgstr ""
 
-#: PedView.py:659 plugins/FamilyGroup.py:400 plugins/IndivComplete.py:295
+#: PedView.py:662 plugins/FamilyGroup.py:400 plugins/IndivComplete.py:295
 #: plugins/IndivSummary.py:179 plugins/WebPage.py:674
 msgid "Children"
 msgstr ""
@@ -1843,7 +1864,7 @@ msgid "Cause of Death"
 msgstr ""
 
 #: PeopleView.py:83 WriteGedcom.py:329 gramps_main.py:952
-#: plugins/EventCmp.py:158 plugins/ExportVCalendar.py:81
+#: plugins/EventCmp.py:158 plugins/ExportVCalendar.py:82
 #: plugins/ExportVCard.py:84 plugins/GraphViz.py:513
 #: plugins/IndivComplete.py:510 plugins/StatisticsChart.py:827
 #: plugins/TimeLine.py:411 plugins/WebPage.py:1265 plugins/WriteFtree.py:86
@@ -1851,16 +1872,16 @@ msgstr ""
 msgid "Entire Database"
 msgstr ""
 
-#: PeopleView.py:267 gramps_main.py:1658
+#: PeopleView.py:260 gramps_main.py:1672
 msgid "Updating display..."
 msgstr ""
 
-#: PeopleView.py:295 PlaceView.py:200 SourceView.py:189 gramps.glade:955
+#: PeopleView.py:288 PlaceView.py:203 SourceView.py:191 gramps.glade:956
 #: plugins/BookReport.py:832
 msgid "Edit"
 msgstr ""
 
-#: PlaceView.py:49 PlaceView.py:119
+#: PlaceView.py:49 PlaceView.py:120
 msgid "Place Name"
 msgstr ""
 
@@ -1880,27 +1901,27 @@ msgstr ""
 msgid "Latitude"
 msgstr ""
 
-#: PlaceView.py:204
+#: PlaceView.py:207
 msgid "Place Menu"
 msgstr ""
 
-#: PlaceView.py:251 SourceView.py:225 gramps_main.py:1454
+#: PlaceView.py:254 SourceView.py:227 gramps_main.py:1468
 msgid "Delete %s?"
 msgstr ""
 
-#: PlaceView.py:252
+#: PlaceView.py:255
 msgid "This place is currently being used by at least one record in the database. Deleting it will remove it from the database and remove it from all records that reference it."
 msgstr ""
 
-#: PlaceView.py:256
+#: PlaceView.py:259
 msgid "_Delete Place"
 msgstr ""
 
-#: PlaceView.py:287
+#: PlaceView.py:290
 msgid "Cannot merge places."
 msgstr ""
 
-#: PlaceView.py:288
+#: PlaceView.py:291
 msgid "Exactly two places must be selected to perform a merge. A second place can be selected by holding down the control key while clicking on the desired place."
 msgstr ""
 
@@ -1914,13 +1935,13 @@ msgstr ""
 
 #: PluginMgr.py:162 PluginMgr.py:163 PluginMgr.py:164 PluginMgr.py:189
 #: PluginMgr.py:191 PluginMgr.py:192 PluginMgr.py:223 PluginMgr.py:224
-#: PluginMgr.py:225 ReportUtils.py:1756 Witness.py:83 Witness.py:166
-#: const.py:234 const.py:247 const.py:493 const.py:506 gramps_main.py:1736
+#: PluginMgr.py:225 ReportUtils.py:1757 Witness.py:83 Witness.py:166
+#: const.py:234 const.py:247 const.py:493 gramps_main.py:1750
 #: plugins/Check.py:474 plugins/ScratchPad.py:78 plugins/WebPage.py:334
 msgid "Unknown"
 msgstr ""
 
-#: Plugins.py:125 gramps.glade:1396
+#: Plugins.py:125 gramps.glade:1427
 msgid "_Apply"
 msgstr ""
 
@@ -2106,7 +2127,55 @@ msgstr ""
 msgid "GRAMPS is not able to display the image file. This may be caused by a corrupt file."
 msgstr ""
 
+#: Relationship.py:268
+msgid "husband"
+msgstr ""
+
+#: Relationship.py:270
+msgid "wife"
+msgstr ""
+
+#: Relationship.py:272
+msgid "gender unknown|spouse"
+msgstr ""
+
+#: Relationship.py:275
+msgid "unmarried|husband"
+msgstr ""
+
 #: Relationship.py:277
+msgid "unmarried|wife"
+msgstr ""
+
+#: Relationship.py:279
+msgid "gender unknown,unmarried|spouse"
+msgstr ""
+
+#: Relationship.py:282
+msgid "male,civil union|partner"
+msgstr ""
+
+#: Relationship.py:284
+msgid "female,civil union|partner"
+msgstr ""
+
+#: Relationship.py:286
+msgid "gender unknown,civil union|partner"
+msgstr ""
+
+#: Relationship.py:289
+msgid "male,unknown relation|partner"
+msgstr ""
+
+#: Relationship.py:291
+msgid "female,unknown relation|partner"
+msgstr ""
+
+#: Relationship.py:293
+msgid "gender unknown,unknown relation|partner"
+msgstr ""
+
+#: Relationship.py:325
 msgid "Relationship loop detected"
 msgstr ""
 
@@ -2118,7 +2187,7 @@ msgstr ""
 msgid "User Defined Template"
 msgstr ""
 
-#: Report.py:152 Report.py:172 Utils.py:279
+#: Report.py:152 Report.py:172 Utils.py:274
 msgid "default"
 msgstr ""
 
@@ -2326,8 +2395,8 @@ msgstr ""
 msgid "Height"
 msgstr ""
 
-#: Report.py:1199 Report.py:1215 gramps.glade:20322 gramps.glade:20346
-#: gramps.glade:20370 gramps.glade:20802
+#: Report.py:1199 Report.py:1215 gramps.glade:21900 gramps.glade:21928
+#: gramps.glade:21956 gramps.glade:22416
 msgid "cm"
 msgstr ""
 
@@ -2385,711 +2454,711 @@ msgstr ""
 msgid "_Change filename"
 msgstr ""
 
-#: ReportUtils.py:297 ReportUtils.py:298 Utils.py:170 Utils.py:172
+#: ReportUtils.py:297 ReportUtils.py:298 Utils.py:165 Utils.py:167
 msgid "Private"
 msgstr ""
 
-#: ReportUtils.py:503 ReportUtils.py:1057 ReportUtils.py:1155
-#: ReportUtils.py:1446 ReportUtils.py:1539 plugins/DetAncestralReport.py:192
+#: ReportUtils.py:504 ReportUtils.py:1058 ReportUtils.py:1156
+#: ReportUtils.py:1447 ReportUtils.py:1540 plugins/DetAncestralReport.py:192
 #: plugins/DetAncestralReport.py:350 plugins/DetDescendantReport.py:216
 #: plugins/DetDescendantReport.py:371
 msgid "He"
 msgstr ""
 
-#: ReportUtils.py:505 ReportUtils.py:1059 ReportUtils.py:1157
-#: ReportUtils.py:1448 ReportUtils.py:1541 plugins/DetAncestralReport.py:194
+#: ReportUtils.py:506 ReportUtils.py:1060 ReportUtils.py:1158
+#: ReportUtils.py:1449 ReportUtils.py:1542 plugins/DetAncestralReport.py:194
 #: plugins/DetAncestralReport.py:348 plugins/DetDescendantReport.py:218
 #: plugins/DetDescendantReport.py:369
 msgid "She"
 msgstr ""
 
-#: ReportUtils.py:518
+#: ReportUtils.py:519
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:527
+#: ReportUtils.py:528
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:536
+#: ReportUtils.py:537
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:544
+#: ReportUtils.py:545
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:552
+#: ReportUtils.py:553
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:561
+#: ReportUtils.py:562
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:570
+#: ReportUtils.py:571
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:578
+#: ReportUtils.py:579
 msgid "%(male_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:586
+#: ReportUtils.py:587
 msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:595
+#: ReportUtils.py:596
 msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:604
+#: ReportUtils.py:605
 msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:612
+#: ReportUtils.py:613
 msgid "%(male_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:620
+#: ReportUtils.py:621
 msgid "%(male_name)s%(endnotes)s died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:626
+#: ReportUtils.py:627
 msgid "%(male_name)s%(endnotes)s died %(death_date)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:633
+#: ReportUtils.py:634
 msgid "%(male_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:639
+#: ReportUtils.py:640
 msgid "%(male_name)s%(endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:646
+#: ReportUtils.py:647
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:655
+#: ReportUtils.py:656
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:664
+#: ReportUtils.py:665
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:672
+#: ReportUtils.py:673
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s in %(birth_place)s%(birth_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:680
+#: ReportUtils.py:681
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:689
+#: ReportUtils.py:690
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:698
+#: ReportUtils.py:699
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:706
+#: ReportUtils.py:707
 msgid "%(female_name)s%(endnotes)s was born %(birth_date)s%(birth_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:714
+#: ReportUtils.py:715
 msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:723
+#: ReportUtils.py:724
 msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died %(death_date)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:732
+#: ReportUtils.py:733
 msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s, and died in %(death_place)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:740
+#: ReportUtils.py:741
 msgid "%(female_name)s%(endnotes)s was born in %(birth_place)s%(birth_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:748
+#: ReportUtils.py:749
 msgid "%(female_name)s%(endnotes)s died %(death_date)s in %(death_place)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:754
+#: ReportUtils.py:755
 msgid "%(female_name)s%(endnotes)s died %(death_date)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:761
+#: ReportUtils.py:762
 msgid "%(female_name)s%(endnotes)s died in %(death_place)s%(death_endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:767
+#: ReportUtils.py:768
 msgid "%(female_name)s%(endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:821
+#: ReportUtils.py:822
 msgid "He married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:827
+#: ReportUtils.py:828
 msgid "She married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:834
+#: ReportUtils.py:835
 msgid "He married %(spouse)s %(date)s%(endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:839 ReportUtils.py:850
+#: ReportUtils.py:840 ReportUtils.py:851
 msgid "She married %(spouse)s in %(place)s%(endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:845
+#: ReportUtils.py:846
 msgid "He married %(spouse)s in %(place)s%(endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:856
+#: ReportUtils.py:857
 msgid "He married %(spouse)s%(endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:860
+#: ReportUtils.py:861
 msgid "She married %(spouse)s%(endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:866
+#: ReportUtils.py:867
 msgid "He also married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:872
+#: ReportUtils.py:873
 msgid "She also married %(spouse)s %(date)s in %(place)s%(endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:879
+#: ReportUtils.py:880
 msgid "He also married %(spouse)s %(date)s%(endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:884 ReportUtils.py:895
+#: ReportUtils.py:885 ReportUtils.py:896
 msgid "She also married %(spouse)s in %(place)s%(endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:890
+#: ReportUtils.py:891
 msgid "He also married %(spouse)s in %(place)s%(endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:901
+#: ReportUtils.py:902
 msgid "He also married %(spouse)s%(endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:905
+#: ReportUtils.py:906
 msgid "She also married %(spouse)s%(endnotes)s."
 msgstr ""
 
-#: ReportUtils.py:926
+#: ReportUtils.py:927
 msgid "He married %(spouse)s."
 msgstr ""
 
-#: ReportUtils.py:928
+#: ReportUtils.py:929
 msgid "She married %(spouse)s."
 msgstr ""
 
-#: ReportUtils.py:931
+#: ReportUtils.py:932
 msgid "He had relationship with %(spouse)s."
 msgstr ""
 
-#: ReportUtils.py:934
+#: ReportUtils.py:935
 msgid "She had relationship with %(spouse)s."
 msgstr ""
 
-#: ReportUtils.py:939
+#: ReportUtils.py:940
 msgid "He also married %(spouse)s."
 msgstr ""
 
-#: ReportUtils.py:941
+#: ReportUtils.py:942
 msgid "She also married %(spouse)s."
 msgstr ""
 
-#: ReportUtils.py:944
+#: ReportUtils.py:945
 msgid "He also had relationship with %(spouse)s."
 msgstr ""
 
-#: ReportUtils.py:947
+#: ReportUtils.py:948
 msgid "She also had relationship with %(spouse)s."
 msgstr ""
 
-#: ReportUtils.py:978
+#: ReportUtils.py:979
 msgid "He was the son of %(father)s and %(mother)s."
 msgstr ""
 
-#: ReportUtils.py:982
+#: ReportUtils.py:983
 msgid "He is the son of %(father)s and %(mother)s."
 msgstr ""
 
-#: ReportUtils.py:987
+#: ReportUtils.py:988
 msgid "He was the son of %(mother)s."
 msgstr ""
 
-#: ReportUtils.py:990
+#: ReportUtils.py:991
 msgid "He is the son of %(mother)s."
 msgstr ""
 
-#: ReportUtils.py:994
+#: ReportUtils.py:995
 msgid "He was the son of %(father)s."
 msgstr ""
 
-#: ReportUtils.py:997
+#: ReportUtils.py:998
 msgid "He is the son of %(father)s."
 msgstr ""
 
-#: ReportUtils.py:1002
+#: ReportUtils.py:1003
 msgid "She was the daughter of %(father)s and %(mother)s."
 msgstr ""
 
-#: ReportUtils.py:1006
+#: ReportUtils.py:1007
 msgid "She is the daughter of %(father)s and %(mother)s."
 msgstr ""
 
-#: ReportUtils.py:1011
+#: ReportUtils.py:1012
 msgid "She was the daughter of %(mother)s."
 msgstr ""
 
-#: ReportUtils.py:1014
+#: ReportUtils.py:1015
 msgid "She is the daughter of %(mother)s."
 msgstr ""
 
-#: ReportUtils.py:1018
+#: ReportUtils.py:1019
 msgid "She was the daughter of %(father)s."
 msgstr ""
 
-#: ReportUtils.py:1021
+#: ReportUtils.py:1022
 msgid "She is the daughter of %(father)s."
 msgstr ""
 
-#: ReportUtils.py:1069
+#: ReportUtils.py:1070
 msgid "%(male_name)s was born on %(birth_date)s in %(birth_place)s."
 msgstr ""
 
-#: ReportUtils.py:1074
+#: ReportUtils.py:1075
 msgid "%(male_name)s was born on %(birth_date)s."
 msgstr ""
 
-#: ReportUtils.py:1078
+#: ReportUtils.py:1079
 msgid "%(male_name)s was born in %(month_year)s in %(birth_place)s."
 msgstr ""
 
-#: ReportUtils.py:1083
+#: ReportUtils.py:1084
 msgid "%(male_name)s was born in %(month_year)s."
 msgstr ""
 
-#: ReportUtils.py:1087
+#: ReportUtils.py:1088
 msgid "%(male_name)s was born in %(birth_place)s."
 msgstr ""
 
-#: ReportUtils.py:1094
+#: ReportUtils.py:1095
 msgid "%(female_name)s was born on %(birth_date)s in %(birth_place)s."
 msgstr ""
 
-#: ReportUtils.py:1099
+#: ReportUtils.py:1100
 msgid "%(female_name)s was born on %(birth_date)s."
 msgstr ""
 
-#: ReportUtils.py:1103
+#: ReportUtils.py:1104
 msgid "%(female_name)s was born in %(month_year)s in %(birth_place)s."
 msgstr ""
 
-#: ReportUtils.py:1108
+#: ReportUtils.py:1109
 msgid "%(female_name)s was born in %(month_year)s."
 msgstr ""
 
-#: ReportUtils.py:1112
+#: ReportUtils.py:1113
 msgid "%(female_name)s was born in %(birth_place)s."
 msgstr ""
 
-#: ReportUtils.py:1168
+#: ReportUtils.py:1169
 msgid "%(male_name)s died on %(death_date)s in %(death_place)s."
 msgstr ""
 
-#: ReportUtils.py:1173
+#: ReportUtils.py:1174
 msgid "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d years."
 msgstr ""
 
-#: ReportUtils.py:1180
+#: ReportUtils.py:1181
 msgid "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d months."
 msgstr ""
 
-#: ReportUtils.py:1187
+#: ReportUtils.py:1188
 msgid "%(male_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d days."
 msgstr ""
 
-#: ReportUtils.py:1195
+#: ReportUtils.py:1196
 msgid "%(male_name)s died on %(death_date)s."
 msgstr ""
 
-#: ReportUtils.py:1198
+#: ReportUtils.py:1199
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d years."
 msgstr ""
 
-#: ReportUtils.py:1203
+#: ReportUtils.py:1204
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d months."
 msgstr ""
 
-#: ReportUtils.py:1208
+#: ReportUtils.py:1209
 msgid "%(male_name)s died on %(death_date)s at the age of %(age)d days."
 msgstr ""
 
-#: ReportUtils.py:1215
+#: ReportUtils.py:1216
 msgid "%(male_name)s died in %(month_year)s in %(death_place)s."
 msgstr ""
 
-#: ReportUtils.py:1220
+#: ReportUtils.py:1221
 msgid "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d years."
 msgstr ""
 
-#: ReportUtils.py:1227
+#: ReportUtils.py:1228
 msgid "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d months."
 msgstr ""
 
-#: ReportUtils.py:1234
+#: ReportUtils.py:1235
 msgid "%(male_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d days."
 msgstr ""
 
-#: ReportUtils.py:1242
+#: ReportUtils.py:1243
 msgid "%(male_name)s died in %(month_year)s."
 msgstr ""
 
-#: ReportUtils.py:1245
+#: ReportUtils.py:1246
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d years."
 msgstr ""
 
-#: ReportUtils.py:1250
+#: ReportUtils.py:1251
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d months."
 msgstr ""
 
-#: ReportUtils.py:1255
+#: ReportUtils.py:1256
 msgid "%(male_name)s died in %(month_year)s at the age of %(age)d days."
 msgstr ""
 
-#: ReportUtils.py:1262
+#: ReportUtils.py:1263
 msgid "%(male_name)s died in %(death_place)s."
 msgstr ""
 
-#: ReportUtils.py:1265
+#: ReportUtils.py:1266
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d years."
 msgstr ""
 
-#: ReportUtils.py:1270
+#: ReportUtils.py:1271
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d months."
 msgstr ""
 
-#: ReportUtils.py:1275
+#: ReportUtils.py:1276
 msgid "%(male_name)s died in %(death_place)s at the age of %(age)d days."
 msgstr ""
 
-#: ReportUtils.py:1284
+#: ReportUtils.py:1285
 msgid "%(male_name)s died at the age of %(age)d years."
 msgstr ""
 
-#: ReportUtils.py:1288
+#: ReportUtils.py:1289
 msgid "%(male_name)s died at the age of %(age)d months."
 msgstr ""
 
-#: ReportUtils.py:1292
+#: ReportUtils.py:1293
 msgid "%(male_name)s died at the age of %(age)d days."
 msgstr ""
 
-#: ReportUtils.py:1299
+#: ReportUtils.py:1300
 msgid "%(female_name)s died on %(death_date)s in %(death_place)s."
 msgstr ""
 
-#: ReportUtils.py:1304
+#: ReportUtils.py:1305
 msgid "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d years."
 msgstr ""
 
-#: ReportUtils.py:1311
+#: ReportUtils.py:1312
 msgid "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d months."
 msgstr ""
 
-#: ReportUtils.py:1318
+#: ReportUtils.py:1319
 msgid "%(female_name)s died on %(death_date)s in %(death_place)s at the age of %(age)d days."
 msgstr ""
 
-#: ReportUtils.py:1326
+#: ReportUtils.py:1327
 msgid "%(female_name)s died on %(death_date)s."
 msgstr ""
 
-#: ReportUtils.py:1329
+#: ReportUtils.py:1330
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d years."
 msgstr ""
 
-#: ReportUtils.py:1334
+#: ReportUtils.py:1335
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d months."
 msgstr ""
 
-#: ReportUtils.py:1339
+#: ReportUtils.py:1340
 msgid "%(female_name)s died on %(death_date)s at the age of %(age)d days."
 msgstr ""
 
-#: ReportUtils.py:1346
+#: ReportUtils.py:1347
 msgid "%(female_name)s died in %(month_year)s in %(death_place)s."
 msgstr ""
 
-#: ReportUtils.py:1351
+#: ReportUtils.py:1352
 msgid "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d years."
 msgstr ""
 
-#: ReportUtils.py:1358
+#: ReportUtils.py:1359
 msgid "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d months."
 msgstr ""
 
-#: ReportUtils.py:1365
+#: ReportUtils.py:1366
 msgid "%(female_name)s died in %(month_year)s in %(death_place)s at the age of %(age)d days."
 msgstr ""
 
-#: ReportUtils.py:1373
+#: ReportUtils.py:1374
 msgid "%(female_name)s died in %(month_year)s."
 msgstr ""
 
-#: ReportUtils.py:1376
+#: ReportUtils.py:1377
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d years."
 msgstr ""
 
-#: ReportUtils.py:1381
+#: ReportUtils.py:1382
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d months."
 msgstr ""
 
-#: ReportUtils.py:1386
+#: ReportUtils.py:1387
 msgid "%(female_name)s died in %(month_year)s at the age of %(age)d days."
 msgstr ""
 
-#: ReportUtils.py:1393
+#: ReportUtils.py:1394
 msgid "%(female_name)s died in %(death_place)s."
 msgstr ""
 
-#: ReportUtils.py:1396
+#: ReportUtils.py:1397
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d years."
 msgstr ""
 
-#: ReportUtils.py:1401
+#: ReportUtils.py:1402
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d months."
 msgstr ""
 
-#: ReportUtils.py:1406
+#: ReportUtils.py:1407
 msgid "%(female_name)s died in %(death_place)s at the age of %(age)d days."
 msgstr ""
 
-#: ReportUtils.py:1415
+#: ReportUtils.py:1416
 msgid "%(female_name)s died at the age of %(age)d years."
 msgstr ""
 
-#: ReportUtils.py:1419
+#: ReportUtils.py:1420
 msgid "%(female_name)s died at the age of %(age)d months."
 msgstr ""
 
-#: ReportUtils.py:1423
+#: ReportUtils.py:1424
 msgid "%(female_name)s died at the age of %(age)d days."
 msgstr ""
 
-#: ReportUtils.py:1476
+#: ReportUtils.py:1477
 msgid "%(male_name)s was buried on %(burial_date)s in %(burial_place)s."
 msgstr ""
 
-#: ReportUtils.py:1481
+#: ReportUtils.py:1482
 msgid "%(male_name)s was buried on %(burial_date)s."
 msgstr ""
 
-#: ReportUtils.py:1485
+#: ReportUtils.py:1486
 msgid "%(male_name)s was buried in %(month_year)s in %(burial_place)s."
 msgstr ""
 
-#: ReportUtils.py:1490
+#: ReportUtils.py:1491
 msgid "%(male_name)s was buried in %(month_year)s."
 msgstr ""
 
-#: ReportUtils.py:1494
+#: ReportUtils.py:1495
 msgid "%(male_name)s was buried in %(burial_place)s."
 msgstr ""
 
-#: ReportUtils.py:1497
+#: ReportUtils.py:1498
 msgid "%(male_name)s was buried."
 msgstr ""
 
-#: ReportUtils.py:1502
+#: ReportUtils.py:1503
 msgid "%(female_name)s was buried on %(burial_date)s in %(burial_place)s."
 msgstr ""
 
-#: ReportUtils.py:1507
+#: ReportUtils.py:1508
 msgid "%(female_name)s was buried on %(burial_date)s."
 msgstr ""
 
-#: ReportUtils.py:1511
+#: ReportUtils.py:1512
 msgid "%(female_name)s was buried in %(month_year)s in %(burial_place)s."
 msgstr ""
 
-#: ReportUtils.py:1516
+#: ReportUtils.py:1517
 msgid "%(female_name)s was buried in %(month_year)s."
 msgstr ""
 
-#: ReportUtils.py:1520
+#: ReportUtils.py:1521
 msgid "%(female_name)s was buried in %(burial_place)s."
 msgstr ""
 
-#: ReportUtils.py:1523
+#: ReportUtils.py:1524
 msgid "%(female_name)s was buried."
 msgstr ""
 
-#: ReportUtils.py:1553
+#: ReportUtils.py:1554
 msgid "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s %(death_place)s."
 msgstr ""
 
-#: ReportUtils.py:1560
+#: ReportUtils.py:1561
 msgid "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s."
 msgstr ""
 
-#: ReportUtils.py:1568
+#: ReportUtils.py:1569
 msgid "%(male_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_place)s."
 msgstr ""
 
-#: ReportUtils.py:1575
+#: ReportUtils.py:1576
 msgid "%(male_name)s Born: %(birth_date)s %(birth_place)s."
 msgstr ""
 
-#: ReportUtils.py:1582
+#: ReportUtils.py:1583
 msgid "%(male_name)s Born: %(birth_date)s Died: %(death_date)s %(death_place)s."
 msgstr ""
 
-#: ReportUtils.py:1587
+#: ReportUtils.py:1588
 msgid "%(male_name)s Born: %(birth_date)s Died: %(death_date)s."
 msgstr ""
 
-#: ReportUtils.py:1593
+#: ReportUtils.py:1594
 msgid "%(male_name)s Born: %(birth_date)s Died: %(death_place)s."
 msgstr ""
 
-#: ReportUtils.py:1598
+#: ReportUtils.py:1599
 msgid "%(male_name)s Born: %(birth_date)s."
 msgstr ""
 
-#: ReportUtils.py:1604
+#: ReportUtils.py:1605
 msgid "%(male_name)s Born: %(birth_place)s Died: %(death_date)s %(death_place)s."
 msgstr ""
 
-#: ReportUtils.py:1611
+#: ReportUtils.py:1612
 msgid "%(male_name)s Born: %(birth_place)s Died: %(death_date)s."
 msgstr ""
 
-#: ReportUtils.py:1619
+#: ReportUtils.py:1620
 msgid "%(male_name)s Born: %(birth_place)s Died: %(death_place)s."
 msgstr ""
 
-#: ReportUtils.py:1626
+#: ReportUtils.py:1627
 msgid "%(male_name)s Born: %(birth_place)s."
 msgstr ""
 
-#: ReportUtils.py:1632
+#: ReportUtils.py:1633
 msgid "%(male_name)s Died: %(death_date)s %(death_place)s."
 msgstr ""
 
-#: ReportUtils.py:1637
+#: ReportUtils.py:1638
 msgid "%(male_name)s Died: %(death_date)s."
 msgstr ""
 
-#: ReportUtils.py:1642
+#: ReportUtils.py:1643
 msgid "%(male_name)s Died: %(death_place)s."
 msgstr ""
 
-#: ReportUtils.py:1645
+#: ReportUtils.py:1646
 msgid "%(male_name)s."
 msgstr ""
 
-#: ReportUtils.py:1652
+#: ReportUtils.py:1653
 msgid "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s %(death_place)s."
 msgstr ""
 
-#: ReportUtils.py:1659
+#: ReportUtils.py:1660
 msgid "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_date)s."
 msgstr ""
 
-#: ReportUtils.py:1667
+#: ReportUtils.py:1668
 msgid "%(female_name)s Born: %(birth_date)s %(birth_place)s Died: %(death_place)s."
 msgstr ""
 
-#: ReportUtils.py:1674
+#: ReportUtils.py:1675
 msgid "%(female_name)s Born: %(birth_date)s %(birth_place)s."
 msgstr ""
 
-#: ReportUtils.py:1681
+#: ReportUtils.py:1682
 msgid "%(female_name)s Born: %(birth_date)s Died: %(death_date)s %(death_place)s."
 msgstr ""
 
-#: ReportUtils.py:1686
+#: ReportUtils.py:1687
 msgid "%(female_name)s Born: %(birth_date)s Died: %(death_date)s."
 msgstr ""
 
-#: ReportUtils.py:1692
+#: ReportUtils.py:1693
 msgid "%(female_name)s Born: %(birth_date)s Died: %(death_place)s."
 msgstr ""
 
-#: ReportUtils.py:1697
+#: ReportUtils.py:1698
 msgid "%(female_name)s Born: %(birth_date)s."
 msgstr ""
 
-#: ReportUtils.py:1703
+#: ReportUtils.py:1704
 msgid "%(female_name)s Born: %(birth_place)s Died: %(death_date)s %(death_place)s."
 msgstr ""
 
-#: ReportUtils.py:1710
+#: ReportUtils.py:1711
 msgid "%(female_name)s Born: %(birth_place)s Died: %(death_date)s."
 msgstr ""
 
-#: ReportUtils.py:1718
+#: ReportUtils.py:1719
 msgid "%(female_name)s Born: %(birth_place)s Died: %(death_place)s."
 msgstr ""
 
-#: ReportUtils.py:1725
+#: ReportUtils.py:1726
 msgid "%(female_name)s Born: %(birth_place)s."
 msgstr ""
 
-#: ReportUtils.py:1731
+#: ReportUtils.py:1732
 msgid "%(female_name)s Died: %(death_date)s %(death_place)s."
 msgstr ""
 
-#: ReportUtils.py:1736
+#: ReportUtils.py:1737
 msgid "%(female_name)s Died: %(death_date)s."
 msgstr ""
 
-#: ReportUtils.py:1741
+#: ReportUtils.py:1742
 msgid "%(female_name)s Died: %(death_place)s."
 msgstr ""
 
-#: ReportUtils.py:1744
+#: ReportUtils.py:1745
 msgid "%(female_name)s."
 msgstr ""
 
-#: ReportUtils.py:1753 const.py:490 gramps.glade:4344
+#: ReportUtils.py:1754 const.py:490 gramps.glade:4582
 #: plugins/FamilyGroup.py:376 plugins/FamilyGroup.py:378
 msgid "Married"
 msgstr ""
 
-#: ReportUtils.py:1754 const.py:491
+#: ReportUtils.py:1755 const.py:491
 msgid "Unmarried"
 msgstr ""
 
-#: ReportUtils.py:1755 const.py:492
+#: ReportUtils.py:1756 const.py:492
 msgid "Civil Union"
 msgstr ""
 
-#: ReportUtils.py:1757 const.py:234 const.py:248 const.py:494
+#: ReportUtils.py:1758 const.py:234 const.py:248 const.py:494
 #: mergedata.glade:242
 msgid "Other"
 msgstr ""
 
-#: SelectChild.py:288 SelectChild.py:307
+#: SelectChild.py:193 SelectChild.py:212
 msgid "A person cannot be linked as his/her own child"
 msgstr ""
 
-#: SelectChild.py:332
+#: SelectChild.py:237
 msgid "Add Child to Family (%s)"
 msgstr ""
 
@@ -3105,27 +3174,27 @@ msgstr ""
 msgid "Publication Information"
 msgstr ""
 
-#: SourceView.py:193
+#: SourceView.py:195
 msgid "Source Menu"
 msgstr ""
 
-#: SourceView.py:218
+#: SourceView.py:220
 msgid "This source is currently being used. Deleting it will remove it from the database and from all records that reference it."
 msgstr ""
 
-#: SourceView.py:222
+#: SourceView.py:224
 msgid "Deleting source will remove it from the database."
 msgstr ""
 
-#: SourceView.py:226
+#: SourceView.py:228
 msgid "_Delete Source"
 msgstr ""
 
-#: SourceView.py:267
+#: SourceView.py:269
 msgid "Cannot merge sources."
 msgstr ""
 
-#: SourceView.py:268
+#: SourceView.py:270
 msgid "Exactly two sources must be selected to perform a merge. A second source can be selected by holding down the control key while clicking on the desired source."
 msgstr ""
 
@@ -3190,33 +3259,33 @@ msgstr ""
 msgid "In order to create valid GEDCOM files, the following information needs to be entered. If you do not plan to generate GEDCOM files, you may leave this empty."
 msgstr ""
 
-#: StartupDialog.py:243 gramps.glade:5910 gramps.glade:5981 gramps.glade:7774
-#: gramps.glade:8584 gramps.glade:9098 gramps.glade:9534 gramps.glade:12280
-#: gramps.glade:12775 plugins/soundex.glade:110
+#: StartupDialog.py:243 gramps.glade:6235 gramps.glade:6318 gramps.glade:8240
+#: gramps.glade:9157 gramps.glade:9730 gramps.glade:10213 gramps.glade:13193
+#: gramps.glade:13747 plugins/soundex.glade:110
 msgid "Name:"
 msgstr ""
 
-#: StartupDialog.py:244 gramps.glade:9486 plugins/Ancestors.py:505
+#: StartupDialog.py:244 gramps.glade:10157 plugins/Ancestors.py:505
 msgid "Address:"
 msgstr ""
 
-#: StartupDialog.py:245 gramps.glade:14682
+#: StartupDialog.py:245 gramps.glade:15804
 msgid "City:"
 msgstr ""
 
-#: StartupDialog.py:246 gramps.glade:9606
+#: StartupDialog.py:246 gramps.glade:10297
 msgid "State/Province:"
 msgstr ""
 
-#: StartupDialog.py:247 gramps.glade:9510 gramps.glade:14730
+#: StartupDialog.py:247 gramps.glade:10185 gramps.glade:15860
 msgid "Country:"
 msgstr ""
 
-#: StartupDialog.py:248 gramps.glade:9582
+#: StartupDialog.py:248 gramps.glade:10269
 msgid "ZIP/Postal code:"
 msgstr ""
 
-#: StartupDialog.py:249 gramps.glade:9868 gramps.glade:14977
+#: StartupDialog.py:249 gramps.glade:10603 gramps.glade:16147
 msgid "Phone:"
 msgstr ""
 
@@ -3277,7 +3346,7 @@ msgstr ""
 msgid "Internet Address Editor for %s"
 msgstr ""
 
-#: Utils.py:72
+#: Utils.py:67
 msgid "The data can only be recovered by Undo operation or by quitting with abandoning changes."
 msgstr ""
 
@@ -3300,32 +3369,33 @@ msgid ""
 "Please try again. The witness has not been changed."
 msgstr ""
 
-#: WriteGedcom.py:333 plugins/DescendReport.py:116
-#: plugins/ExportVCalendar.py:85 plugins/ExportVCard.py:88
+#: WriteGedcom.py:334 plugins/DescendReport.py:116
+#: plugins/ExportVCalendar.py:87 plugins/ExportVCard.py:89
 #: plugins/FtmStyleDescendants.py:121 plugins/GraphViz.py:517
 #: plugins/IndivComplete.py:514 plugins/StatisticsChart.py:831
-#: plugins/TimeLine.py:415 plugins/WebPage.py:1269 plugins/WriteFtree.py:90
-#: plugins/WriteGeneWeb.py:91
+#: plugins/TimeLine.py:415 plugins/WebPage.py:1269 plugins/WriteFtree.py:91
+#: plugins/WriteGeneWeb.py:92
 msgid "Descendants of %s"
 msgstr ""
 
-#: WriteGedcom.py:337 plugins/Ancestors.py:141 plugins/ExportVCalendar.py:89
-#: plugins/ExportVCard.py:92 plugins/FtmStyleAncestors.py:96
+#: WriteGedcom.py:340 plugins/Ancestors.py:141 plugins/ExportVCalendar.py:93
+#: plugins/ExportVCard.py:95 plugins/FtmStyleAncestors.py:96
 #: plugins/GraphViz.py:521 plugins/IndivComplete.py:518
 #: plugins/StatisticsChart.py:835 plugins/TimeLine.py:419
-#: plugins/WebPage.py:1277 plugins/WriteFtree.py:94 plugins/WriteGeneWeb.py:95
+#: plugins/WebPage.py:1277 plugins/WriteFtree.py:97 plugins/WriteGeneWeb.py:98
 msgid "Ancestors of %s"
 msgstr ""
 
-#: WriteGedcom.py:341 plugins/ExportVCalendar.py:93 plugins/ExportVCard.py:96
+#: WriteGedcom.py:346 plugins/ExportVCalendar.py:99 plugins/ExportVCard.py:101
 #: plugins/GraphViz.py:525 plugins/IndivComplete.py:522
 #: plugins/StatisticsChart.py:839 plugins/TimeLine.py:423
-#: plugins/WebPage.py:1281 plugins/WriteFtree.py:98 plugins/WriteGeneWeb.py:99
+#: plugins/WebPage.py:1281 plugins/WriteFtree.py:103
+#: plugins/WriteGeneWeb.py:104
 msgid "People with common ancestor with %s"
 msgstr ""
 
-#: WriteGedcom.py:557 WriteGedcom.py:562 docgen/AbiWord2Doc.py:77
-#: docgen/AbiWord2Doc.py:80 docgen/AsciiDoc.py:113 docgen/AsciiDoc.py:116
+#: WriteGedcom.py:565 WriteGedcom.py:570 docgen/AbiWord2Doc.py:75
+#: docgen/AbiWord2Doc.py:78 docgen/AsciiDoc.py:113 docgen/AsciiDoc.py:116
 #: docgen/HtmlDoc.py:225 docgen/HtmlDoc.py:228 docgen/HtmlDoc.py:353
 #: docgen/HtmlDoc.py:356 docgen/LaTeXDoc.py:87 docgen/LaTeXDoc.py:90
 #: docgen/OpenSpreadSheet.py:76 docgen/OpenSpreadSheet.py:78
@@ -3334,22 +3404,22 @@ msgstr ""
 #: docgen/OpenSpreadSheet.py:436 docgen/OpenSpreadSheet.py:440
 #: docgen/PSDrawDoc.py:95 docgen/PSDrawDoc.py:98 docgen/PdfDoc.py:180
 #: docgen/RTFDoc.py:80 docgen/RTFDoc.py:83 docgen/SvgDrawDoc.py:75
-#: docgen/SvgDrawDoc.py:77 plugins/ExportVCalendar.py:168
-#: plugins/ExportVCalendar.py:172 plugins/ExportVCard.py:153
-#: plugins/ExportVCard.py:157 plugins/WriteGeneWeb.py:210
-#: plugins/WriteGeneWeb.py:214
+#: docgen/SvgDrawDoc.py:77 plugins/ExportVCalendar.py:178
+#: plugins/ExportVCalendar.py:182 plugins/ExportVCard.py:162
+#: plugins/ExportVCard.py:166 plugins/WriteGeneWeb.py:219
+#: plugins/WriteGeneWeb.py:223
 msgid "Could not create %s"
 msgstr ""
 
-#: WriteGedcom.py:1252
+#: WriteGedcom.py:1272
 msgid "GE_DCOM"
 msgstr ""
 
-#: WriteGedcom.py:1253
+#: WriteGedcom.py:1273
 msgid "GEDCOM is used to transfer data between genealogy programs. Most genealogy software will accept a GEDCOM file as input. "
 msgstr ""
 
-#: WriteGedcom.py:1255
+#: WriteGedcom.py:1275
 msgid "GEDCOM export options"
 msgstr ""
 
@@ -3629,113 +3699,113 @@ msgstr ""
 msgid "An unspecified relationship between a man and woman"
 msgstr ""
 
-#: const.py:515
+#: const.py:522
 msgid "Also Known As"
 msgstr ""
 
-#: const.py:516
+#: const.py:523
 msgid "Birth Name"
 msgstr ""
 
-#: const.py:517
+#: const.py:524
 msgid "Married Name"
 msgstr ""
 
-#: const.py:518
+#: const.py:525
 msgid "Other Name"
 msgstr ""
 
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid ""
 msgstr ""
 
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid "Cleared"
 msgstr ""
 
-#: const.py:902 const.py:908 const.py:914
+#: const.py:909 const.py:915 const.py:921
 msgid "Completed"
 msgstr ""
 
-#: const.py:903
+#: const.py:910
 msgid "Infant"
 msgstr ""
 
-#: const.py:903 const.py:909
+#: const.py:910 const.py:916
 msgid "Stillborn"
 msgstr ""
 
-#: const.py:903 const.py:909 const.py:915
+#: const.py:910 const.py:916 const.py:922
 msgid "Pre-1970"
 msgstr ""
 
-#: const.py:903 const.py:909 const.py:915
+#: const.py:910 const.py:916 const.py:922
 msgid "Qualified"
 msgstr ""
 
-#: const.py:904 const.py:910 const.py:916
+#: const.py:911 const.py:917 const.py:923
 msgid "Submitted"
 msgstr ""
 
-#: const.py:904 const.py:910 const.py:916
+#: const.py:911 const.py:917 const.py:923
 msgid "Uncleared"
 msgstr ""
 
-#: const.py:908
+#: const.py:915
 msgid "BIC"
 msgstr ""
 
-#: const.py:909 const.py:915
+#: const.py:916 const.py:922
 msgid "DNS"
 msgstr ""
 
-#: const.py:914
+#: const.py:921
 msgid "Canceled"
 msgstr ""
 
-#: const.py:915
+#: const.py:922
 msgid "DNS/CAN"
 msgstr ""
 
-#: const.py:921
+#: const.py:928
 msgid "Flowed"
 msgstr ""
 
-#: const.py:922
+#: const.py:929
 msgid "Preformatted"
 msgstr ""
 
-#: const.py:934
+#: const.py:941
 msgid "Text Reports"
 msgstr ""
 
-#: const.py:935
+#: const.py:942
 msgid "Graphical Reports"
 msgstr ""
 
-#: const.py:936
+#: const.py:943
 msgid "Code Generators"
 msgstr ""
 
-#: const.py:937 plugins/WebPage.py:1719
+#: const.py:944 plugins/WebPage.py:1719
 msgid "Web Page"
 msgstr ""
 
-#: const.py:938
+#: const.py:945
 msgid "View"
 msgstr ""
 
-#: const.py:939
+#: const.py:946
 msgid "Books"
 msgstr ""
 
-#: const.py:943 plugins/ScratchPad.py:356 plugins/ScratchPad.py:405
+#: const.py:950 plugins/ScratchPad.py:356 plugins/ScratchPad.py:405
 #: plugins/ScratchPad.py:413 plugins/SimpleBookTitle.py:169
 #: plugins/SimpleBookTitle.py:170 plugins/SimpleBookTitle.py:171
 msgid "Text"
 msgstr ""
 
-#: const.py:944
+#: const.py:951
 msgid "Graphics"
 msgstr ""
 
@@ -4043,7 +4113,7 @@ msgstr ""
 msgid "GRAMPS makes every effort to maintain compatibility with GEDCOM, the general standard of recording genealogical information. Filters exist that make importing and exporting GEDCOM files trivial."
 msgstr ""
 
-#: docgen/AbiWord2Doc.py:332
+#: docgen/AbiWord2Doc.py:340
 msgid "AbiWord document"
 msgstr ""
 
@@ -4123,7 +4193,7 @@ msgstr ""
 msgid "Encoding"
 msgstr ""
 
-#: gedcomexport.glade:127 gramps.glade:20090 gramps.glade:28994
+#: gedcomexport.glade:127 gramps.glade:21644 gramps.glade:31156
 #: plugins/genewebexport.glade:103 plugins/merge.glade:385
 #: plugins/vcalendarexport.glade:103 plugins/vcardexport.glade:103
 #: plugins/writeftree.glade:124
@@ -4225,7 +4295,7 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: gedcomimport.glade:216 gramps.glade:3482 gramps.glade:19306
+#: gedcomimport.glade:216 gramps.glade:3660 gramps.glade:20805
 msgid "Information"
 msgstr ""
 
@@ -4266,394 +4336,394 @@ msgid ""
 "UNICODE"
 msgstr ""
 
-#: gramps.glade:10 gramps.glade:31082
+#: gramps.glade:10 gramps.glade:33389
 msgid "GRAMPS"
 msgstr ""
 
-#: gramps.glade:44
+#: gramps.glade:45
 msgid "_File"
 msgstr ""
 
-#: gramps.glade:53
+#: gramps.glade:54
 msgid "_New"
 msgstr ""
 
-#: gramps.glade:75
+#: gramps.glade:76
 msgid "_Open..."
 msgstr ""
 
-#: gramps.glade:97
+#: gramps.glade:98
 msgid "Open _Recent"
 msgstr ""
 
-#: gramps.glade:112
+#: gramps.glade:113
 msgid "_Import..."
 msgstr ""
 
-#: gramps.glade:134
+#: gramps.glade:135
 msgid "Save _As..."
 msgstr ""
 
-#: gramps.glade:156
+#: gramps.glade:157
 msgid "E_xport..."
 msgstr ""
 
-#: gramps.glade:184
+#: gramps.glade:185
 msgid "A_bandon changes and quit"
 msgstr ""
 
-#: gramps.glade:193
+#: gramps.glade:194
 msgid "_Quit"
 msgstr ""
 
-#: gramps.glade:219
+#: gramps.glade:220
 msgid "_Edit"
 msgstr ""
 
-#: gramps.glade:228 gramps_main.py:536
+#: gramps.glade:229 gramps_main.py:536
 msgid "_Undo"
 msgstr ""
 
-#: gramps.glade:256 gramps.glade:918
+#: gramps.glade:257 gramps.glade:919
 msgid "Add a new item"
 msgstr ""
 
-#: gramps.glade:257 rule.glade:135 rule.glade:722
+#: gramps.glade:258 rule.glade:135 rule.glade:722
 msgid "_Add..."
 msgstr ""
 
-#: gramps.glade:279 gramps.glade:936
+#: gramps.glade:280 gramps.glade:937
 msgid "Remove the currently selected item"
 msgstr ""
 
-#: gramps.glade:280
+#: gramps.glade:281
 msgid "R_emove"
 msgstr ""
 
-#: gramps.glade:302 gramps.glade:954
+#: gramps.glade:303 gramps.glade:955
 msgid "Edit the selected item"
 msgstr ""
 
-#: gramps.glade:303
+#: gramps.glade:304
 msgid "E_dit..."
 msgstr ""
 
-#: gramps.glade:318
+#: gramps.glade:319
 msgid "Compare and _Merge..."
 msgstr ""
 
-#: gramps.glade:340
+#: gramps.glade:341
 msgid "Fast Mer_ge"
 msgstr ""
 
-#: gramps.glade:355
+#: gramps.glade:356
 msgid "Prefere_nces..."
 msgstr ""
 
-#: gramps.glade:376
+#: gramps.glade:377
 msgid "_Column Editor..."
 msgstr ""
 
-#: gramps.glade:397
+#: gramps.glade:398
 msgid "Set _Home person..."
 msgstr ""
 
-#: gramps.glade:422
+#: gramps.glade:423
 msgid "_View"
 msgstr ""
 
-#: gramps.glade:431
+#: gramps.glade:432
 msgid "_Filter"
 msgstr ""
 
-#: gramps.glade:441
+#: gramps.glade:442
 msgid "_Sidebar"
 msgstr ""
 
-#: gramps.glade:451
+#: gramps.glade:452
 msgid "_Toolbar"
 msgstr ""
 
-#: gramps.glade:465
+#: gramps.glade:466
 msgid "_Go"
 msgstr ""
 
-#: gramps.glade:473
+#: gramps.glade:474
 msgid "_Bookmarks"
 msgstr ""
 
-#: gramps.glade:482
+#: gramps.glade:483
 msgid "_Add bookmark"
 msgstr ""
 
-#: gramps.glade:504
+#: gramps.glade:505
 msgid "_Edit bookmarks..."
 msgstr ""
 
-#: gramps.glade:532
+#: gramps.glade:533
 msgid "_Go to bookmark"
 msgstr ""
 
-#: gramps.glade:544
+#: gramps.glade:545
 msgid "_Reports"
 msgstr ""
 
-#: gramps.glade:552
+#: gramps.glade:553
 msgid "_Tools"
 msgstr ""
 
-#: gramps.glade:560
+#: gramps.glade:561
 msgid "_Windows"
 msgstr ""
 
-#: gramps.glade:568
+#: gramps.glade:569
 msgid "_Help"
 msgstr ""
 
-#: gramps.glade:577
+#: gramps.glade:578
 msgid "_User manual"
 msgstr ""
 
-#: gramps.glade:599
+#: gramps.glade:600
 msgid "_FAQ"
 msgstr ""
 
-#: gramps.glade:626
+#: gramps.glade:627
 msgid "GRAMPS _home page"
 msgstr ""
 
-#: gramps.glade:647
+#: gramps.glade:648
 msgid "GRAMPS _mailing lists"
 msgstr ""
 
-#: gramps.glade:668
+#: gramps.glade:669
 msgid "_Report a bug"
 msgstr ""
 
-#: gramps.glade:683
+#: gramps.glade:684
 msgid "_Show plugin status..."
 msgstr ""
 
-#: gramps.glade:692
+#: gramps.glade:693
 msgid "_Open example database"
 msgstr ""
 
-#: gramps.glade:701
+#: gramps.glade:702
 msgid "_About"
 msgstr ""
 
-#: gramps.glade:751
+#: gramps.glade:752
 msgid "Open database"
 msgstr ""
 
-#: gramps.glade:752
+#: gramps.glade:753
 msgid "Open"
 msgstr ""
 
-#: gramps.glade:782
+#: gramps.glade:783
 msgid "Go back in history"
 msgstr ""
 
-#: gramps.glade:783
+#: gramps.glade:784
 msgid "Back"
 msgstr ""
 
-#: gramps.glade:801
+#: gramps.glade:802
 msgid "Go forward in history"
 msgstr ""
 
-#: gramps.glade:802
+#: gramps.glade:803
 msgid "Forward"
 msgstr ""
 
-#: gramps.glade:820
+#: gramps.glade:821
 msgid "Make the Home Person the active person"
 msgstr ""
 
-#: gramps.glade:851
+#: gramps.glade:852
 msgid "Open Scratch Pad"
 msgstr ""
 
-#: gramps.glade:852
+#: gramps.glade:853
 msgid "ScratchPad"
 msgstr ""
 
-#: gramps.glade:869
+#: gramps.glade:870
 msgid "Generate reports"
 msgstr ""
 
-#: gramps.glade:870
+#: gramps.glade:871
 msgid "Reports"
 msgstr ""
 
-#: gramps.glade:887
+#: gramps.glade:888
 msgid "Run tools"
 msgstr ""
 
-#: gramps.glade:888
+#: gramps.glade:889
 msgid "Tools"
 msgstr ""
 
-#: gramps.glade:919
+#: gramps.glade:920
 msgid "Add"
 msgstr ""
 
-#: gramps.glade:937
+#: gramps.glade:938
 msgid "Remove"
 msgstr ""
 
-#: gramps.glade:1028 gramps.glade:1452
+#: gramps.glade:1029 gramps.glade:1486
 msgid "People"
 msgstr ""
 
-#: gramps.glade:1076 gramps.glade:2237 gramps.glade:2992
+#: gramps.glade:1081 gramps.glade:2310 gramps.glade:3104
 msgid "Family"
 msgstr ""
 
-#: gramps.glade:1124 gramps.glade:3039
+#: gramps.glade:1133 gramps.glade:3155
 msgid "Pedigree"
 msgstr ""
 
-#: gramps.glade:1172 gramps.glade:3097
+#: gramps.glade:1185 gramps.glade:3220
 msgid "Sources"
 msgstr ""
 
-#: gramps.glade:1220 gramps.glade:3155
+#: gramps.glade:1237 gramps.glade:3285
 msgid "Places"
 msgstr ""
 
-#: gramps.glade:1268 gramps.glade:3554
+#: gramps.glade:1289 gramps.glade:3739
 msgid "Media"
 msgstr ""
 
-#: gramps.glade:1376
+#: gramps.glade:1407
 msgid "Invert"
 msgstr ""
 
-#: gramps.glade:1394
+#: gramps.glade:1425
 msgid "Apply filter using the selected controls"
 msgstr ""
 
-#: gramps.glade:1481 gramps.glade:2956
+#: gramps.glade:1519 gramps.glade:3068
 msgid "Exchange the current spouse with the active person"
 msgstr ""
 
-#: gramps.glade:1547 gramps.glade:2718
+#: gramps.glade:1585 gramps.glade:2822
 msgid "Adds a new person to the database and to a new relationship"
 msgstr ""
 
-#: gramps.glade:1574 gramps.glade:2745
+#: gramps.glade:1612 gramps.glade:2849
 msgid "Selects an existing person from the database and adds to a new relationship"
 msgstr ""
 
-#: gramps.glade:1601 gramps.glade:2772
+#: gramps.glade:1639 gramps.glade:2876
 msgid "Removes the currently selected spouse"
 msgstr ""
 
-#: gramps.glade:1644 gramps.glade:2865
+#: gramps.glade:1682 gramps.glade:2977
 msgid "Make the active person's parents the active family"
 msgstr ""
 
-#: gramps.glade:1671 gramps.glade:2892
+#: gramps.glade:1709 gramps.glade:3004
 msgid "Adds a new set of parents to the active person"
 msgstr ""
 
-#: gramps.glade:1698 gramps.glade:2919
+#: gramps.glade:1736 gramps.glade:3031
 msgid "Deletes the selected parents from the active person"
 msgstr ""
 
-#: gramps.glade:1744 gramps.glade:2026 gramps.glade:2360 gramps.glade:2390
+#: gramps.glade:1782 gramps.glade:2090 gramps.glade:2447 gramps.glade:2480
 msgid "Double-click to edit the relationship to the selected parents"
 msgstr ""
 
-#: gramps.glade:1771 gramps.glade:2596
+#: gramps.glade:1812 gramps.glade:2696
 msgid "Make the selected spouse's parents the active family"
 msgstr ""
 
-#: gramps.glade:1798 gramps.glade:2623
+#: gramps.glade:1839 gramps.glade:2723
 msgid "Adds a new set of parents to the selected spouse"
 msgstr ""
 
-#: gramps.glade:1825 gramps.glade:2650
+#: gramps.glade:1866 gramps.glade:2750
 msgid "Deletes the selected parents from the selected spouse"
 msgstr ""
 
-#: gramps.glade:1862 gramps.glade:2296
+#: gramps.glade:1903 gramps.glade:2376
 msgid "_Children"
 msgstr ""
 
-#: gramps.glade:1887 gramps.glade:2809
+#: gramps.glade:1932 gramps.glade:2913
 msgid "_Active person"
 msgstr ""
 
-#: gramps.glade:1912 gramps.glade:2834
+#: gramps.glade:1961 gramps.glade:2942
 msgid "Active person's _parents"
 msgstr ""
 
-#: gramps.glade:1937 gramps.glade:2687
+#: gramps.glade:1990 gramps.glade:2787
 msgid "Relati_onship"
 msgstr ""
 
-#: gramps.glade:1962 gramps.glade:2565
+#: gramps.glade:2019 gramps.glade:2661
 msgid "Spo_use's parents"
 msgstr ""
 
-#: gramps.glade:2056 gramps.glade:2420
+#: gramps.glade:2123 gramps.glade:2513
 msgid "Double-click to edit the active person"
 msgstr ""
 
-#: gramps.glade:2086 gramps.glade:2275
+#: gramps.glade:2156 gramps.glade:2352
 msgid "Double-click to edit the relationship information, Shift-click to edit the person"
 msgstr ""
 
-#: gramps.glade:2113 gramps.glade:2447
+#: gramps.glade:2186 gramps.glade:2543
 msgid "Make the selected child the active person"
 msgstr ""
 
-#: gramps.glade:2140 gramps.glade:2474
+#: gramps.glade:2213 gramps.glade:2570
 msgid "Adds a new child to the database and to the current family"
 msgstr ""
 
-#: gramps.glade:2167 gramps.glade:2501
+#: gramps.glade:2240 gramps.glade:2597
 msgid "Selects an existing person from the database and adds as a child to the current family"
 msgstr ""
 
-#: gramps.glade:2194 gramps.glade:2528
+#: gramps.glade:2267 gramps.glade:2624
 msgid "Deletes the selected child from the selected family"
 msgstr ""
 
-#: gramps.glade:3206 gramps.glade:19030 gramps.glade:21050 gramps.glade:21315
-#: gramps.glade:22712
+#: gramps.glade:3340 gramps.glade:20485 gramps.glade:22681 gramps.glade:22959
+#: gramps.glade:24471
 msgid "Preview"
 msgstr ""
 
-#: gramps.glade:3242 gramps.glade:19066
+#: gramps.glade:3380 gramps.glade:20525
 msgid "Details:"
 msgstr ""
 
-#: gramps.glade:3313 gramps.glade:19137 gramps.glade:21351 gramps.glade:22748
+#: gramps.glade:3463 gramps.glade:20608 gramps.glade:22999 gramps.glade:24511
 msgid "Path:"
 msgstr ""
 
-#: gramps.glade:3338 gramps.glade:7942 gramps.glade:8512 gramps.glade:9026
-#: gramps.glade:12184 gramps.glade:12799 gramps.glade:19162 gramps.glade:22079
-#: gramps.glade:23157
+#: gramps.glade:3492 gramps.glade:8436 gramps.glade:9073 gramps.glade:9646
+#: gramps.glade:13081 gramps.glade:13775 gramps.glade:20637 gramps.glade:23799
+#: gramps.glade:24964
 msgid "Type:"
 msgstr ""
 
-#: gramps.glade:3778
+#: gramps.glade:3975
 msgid "Check to show all people in the list.  Uncheck to get the list filtered by birth and death dates."
 msgstr ""
 
-#: gramps.glade:3780 gramps.glade:4156 gramps.glade:4574
+#: gramps.glade:3977 gramps.glade:4380 gramps.glade:4826
 msgid "_Show all"
 msgstr ""
 
-#: gramps.glade:3827 gramps.glade:11954
+#: gramps.glade:4024 gramps.glade:12825
 msgid "_Relationship type:"
 msgstr ""
 
-#: gramps.glade:3855
+#: gramps.glade:4056
 msgid ""
 "Married\n"
 "Unmarried\n"
@@ -4662,651 +4732,651 @@ msgid ""
 "Other"
 msgstr ""
 
-#: gramps.glade:4025
+#: gramps.glade:4233
 msgid "_Father's relationship to child:"
 msgstr ""
 
-#: gramps.glade:4049
+#: gramps.glade:4261
 msgid "_Mother's relationship to child:"
 msgstr ""
 
-#: gramps.glade:4073
+#: gramps.glade:4289
 msgid "_Parents' relationship to each other:"
 msgstr ""
 
-#: gramps.glade:4097
+#: gramps.glade:4317
 msgid "Fat_her"
 msgstr ""
 
-#: gramps.glade:4192
+#: gramps.glade:4416
 msgid "Moth_er"
 msgstr ""
 
-#: gramps.glade:4217
+#: gramps.glade:4445
 msgid "Relationships"
 msgstr ""
 
-#: gramps.glade:4311
+#: gramps.glade:4549
 msgid "Show _all"
 msgstr ""
 
-#: gramps.glade:4643
+#: gramps.glade:4895
 msgid "Relationship to father:"
 msgstr ""
 
-#: gramps.glade:4667
+#: gramps.glade:4923
 msgid "Relationship to mother:"
 msgstr ""
 
-#: gramps.glade:4758 gramps.glade:6549 gramps.glade:11846 gramps.glade:28451
+#: gramps.glade:5023 gramps.glade:6932 gramps.glade:12713 gramps.glade:30562
 msgid "Abandon changes and close window"
 msgstr ""
 
-#: gramps.glade:4773 gramps.glade:6564 gramps.glade:11861 gramps.glade:25038
-#: gramps.glade:27302 gramps.glade:28196 gramps.glade:28466
+#: gramps.glade:5038 gramps.glade:6947 gramps.glade:12728 gramps.glade:26958
+#: gramps.glade:29348 gramps.glade:30294 gramps.glade:30577
 msgid "Accept changes and close window"
 msgstr ""
 
-#: gramps.glade:4860 gramps.glade:6759 gramps.glade:14059 gramps.glade:18137
-#: gramps.glade:21096 gramps.glade:22932 gramps.glade:28635
+#: gramps.glade:5129 gramps.glade:7162 gramps.glade:15121 gramps.glade:19547
+#: gramps.glade:22731 gramps.glade:24719 gramps.glade:30762
 msgid "_Title:"
 msgstr ""
 
-#: gramps.glade:4885
+#: gramps.glade:5158
 msgid "_Author:"
 msgstr ""
 
-#: gramps.glade:4956
+#: gramps.glade:5233
 msgid "_Publication information:"
 msgstr ""
 
-#: gramps.glade:5023
+#: gramps.glade:5304
 msgid "A_bbreviation:"
 msgstr ""
 
-#: gramps.glade:5054 gramps.glade:12125 gramps.glade:14453 gramps.glade:14623
-#: gramps.glade:23075 gramps.glade:25412 gramps.glade:26416 gramps.glade:27784
-#: gramps.glade:29213 plugins/verify.glade:530
+#: gramps.glade:5339 gramps.glade:13014 gramps.glade:15547 gramps.glade:15737
+#: gramps.glade:24870 gramps.glade:27359 gramps.glade:28409 gramps.glade:29862
+#: gramps.glade:31390 plugins/verify.glade:530
 msgid "General"
 msgstr ""
 
-#: gramps.glade:5124 gramps.glade:10183 gramps.glade:13187 gramps.glade:15258
-#: gramps.glade:21905 gramps.glade:23465 gramps.glade:25663 gramps.glade:26665
-#: gramps.glade:28033 gramps.glade:29464
+#: gramps.glade:5413 gramps.glade:10933 gramps.glade:14198 gramps.glade:16443
+#: gramps.glade:23613 gramps.glade:25291 gramps.glade:27621 gramps.glade:28669
+#: gramps.glade:30122 gramps.glade:31652
 msgid "Format"
 msgstr ""
 
-#: gramps.glade:5148 gramps.glade:10208 gramps.glade:13211 gramps.glade:15282
-#: gramps.glade:21929 gramps.glade:23489 gramps.glade:25687 gramps.glade:26689
-#: gramps.glade:28057 gramps.glade:29488
+#: gramps.glade:5441 gramps.glade:10962 gramps.glade:14226 gramps.glade:16471
+#: gramps.glade:23641 gramps.glade:25319 gramps.glade:27649 gramps.glade:28697
+#: gramps.glade:30150 gramps.glade:31680
 msgid "Multiple spaces, tabs, and single line breaks are replaced with single spaces. Two consecutive line breaks mark a new paragraph."
 msgstr ""
 
-#: gramps.glade:5150 gramps.glade:10210 gramps.glade:13213 gramps.glade:15284
-#: gramps.glade:21931 gramps.glade:23491 gramps.glade:25689 gramps.glade:26691
-#: gramps.glade:28059 gramps.glade:29490
+#: gramps.glade:5443 gramps.glade:10964 gramps.glade:14228 gramps.glade:16473
+#: gramps.glade:23643 gramps.glade:25321 gramps.glade:27651 gramps.glade:28699
+#: gramps.glade:30152 gramps.glade:31682
 msgid "_Flowed"
 msgstr ""
 
-#: gramps.glade:5171 gramps.glade:10231 gramps.glade:13234 gramps.glade:15305
-#: gramps.glade:21952 gramps.glade:23512 gramps.glade:25710 gramps.glade:26712
-#: gramps.glade:28080 gramps.glade:29511
+#: gramps.glade:5464 gramps.glade:10985 gramps.glade:14249 gramps.glade:16494
+#: gramps.glade:23664 gramps.glade:25342 gramps.glade:27672 gramps.glade:28720
+#: gramps.glade:30173 gramps.glade:31703
 msgid "Formatting is preserved, except for the leading whitespace. Multiple spaces, tabs, and all line breaks are respected."
 msgstr ""
 
-#: gramps.glade:5173 gramps.glade:10233 gramps.glade:13236 gramps.glade:15307
-#: gramps.glade:21954 gramps.glade:23514 gramps.glade:25712 gramps.glade:26714
-#: gramps.glade:28082 gramps.glade:29513
+#: gramps.glade:5466 gramps.glade:10987 gramps.glade:14251 gramps.glade:16496
+#: gramps.glade:23666 gramps.glade:25344 gramps.glade:27674 gramps.glade:28722
+#: gramps.glade:30175 gramps.glade:31705
 msgid "_Preformatted"
 msgstr ""
 
-#: gramps.glade:5268 gramps.glade:5405 gramps.glade:10490 gramps.glade:13484
-#: gramps.glade:15587 gramps.glade:25993
+#: gramps.glade:5568 gramps.glade:5709 gramps.glade:11255 gramps.glade:14510
+#: gramps.glade:16787 gramps.glade:27966
 msgid "Add a new media object to the database and place it in this gallery"
 msgstr ""
 
-#: gramps.glade:5296 gramps.glade:5489 gramps.glade:13567 gramps.glade:15670
-#: gramps.glade:26076
+#: gramps.glade:5596 gramps.glade:5793 gramps.glade:14593 gramps.glade:16870
+#: gramps.glade:28049
 msgid "Remove selected object from this gallery only"
 msgstr ""
 
-#: gramps.glade:5337
+#: gramps.glade:5637
 msgid "Data"
 msgstr ""
 
-#: gramps.glade:5433 gramps.glade:10518 gramps.glade:13512 gramps.glade:15615
-#: gramps.glade:26021
+#: gramps.glade:5737 gramps.glade:11283 gramps.glade:14538 gramps.glade:16815
+#: gramps.glade:27994
 msgid "Select an existing media object from the database and place it in this gallery"
 msgstr ""
 
-#: gramps.glade:5461 gramps.glade:10546 gramps.glade:15643 gramps.glade:26049
+#: gramps.glade:5765 gramps.glade:11311 gramps.glade:16843 gramps.glade:28022
 msgid "Edit the properties of the selected object"
 msgstr ""
 
-#: gramps.glade:5550 gramps.glade:10621 gramps.glade:13608 gramps.glade:15731
-#: gramps.glade:26137 plugins/WebPage.py:432
+#: gramps.glade:5854 gramps.glade:11386 gramps.glade:14634 gramps.glade:16931
+#: gramps.glade:28110 plugins/WebPage.py:432
 msgid "Gallery"
 msgstr ""
 
-#: gramps.glade:5595 gramps.glade:16128 gramps.glade:23593
+#: gramps.glade:5906 gramps.glade:17359 gramps.glade:25430
 msgid "References"
 msgstr ""
 
-#: gramps.glade:5742
+#: gramps.glade:6062
 msgid "Open an _existing database"
 msgstr ""
 
-#: gramps.glade:5762
+#: gramps.glade:6082
 msgid "Create a _new database"
 msgstr ""
 
-#: gramps.glade:5957
+#: gramps.glade:6290
 msgid "_Relationship:"
 msgstr ""
 
-#: gramps.glade:6005
+#: gramps.glade:6346
 msgid "Relation_ship:"
 msgstr ""
 
-#: gramps.glade:6056
+#: gramps.glade:6405
 msgid "Father"
 msgstr ""
 
-#: gramps.glade:6080
+#: gramps.glade:6433
 msgid "Mother"
 msgstr ""
 
-#: gramps.glade:6103
+#: gramps.glade:6460
 msgid "Preference"
 msgstr ""
 
-#: gramps.glade:6126
+#: gramps.glade:6487
 msgid "Indicates that the parents should be used as the preferred parents for reporting and display purposes"
 msgstr ""
 
-#: gramps.glade:6128
+#: gramps.glade:6489
 msgid "Use as preferred parents"
 msgstr ""
 
-#: gramps.glade:6328
+#: gramps.glade:6698
 msgid "_Text:"
 msgstr ""
 
-#: gramps.glade:6487
+#: gramps.glade:6865
 msgid "Select columns"
 msgstr ""
 
-#: gramps.glade:6659 gramps.glade:28552
+#: gramps.glade:7046 gramps.glade:30667
 msgid "_Given name:"
 msgstr ""
 
-#: gramps.glade:6684 gramps.glade:28826
+#: gramps.glade:7075 gramps.glade:30965
 msgid "_Family name:"
 msgstr ""
 
-#: gramps.glade:6709
+#: gramps.glade:7104
 msgid "Famil_y prefix:"
 msgstr ""
 
-#: gramps.glade:6734
+#: gramps.glade:7133
 msgid "S_uffix:"
 msgstr ""
 
-#: gramps.glade:6784
+#: gramps.glade:7191
 msgid "Nic_kname:"
 msgstr ""
 
-#: gramps.glade:6809 gramps.glade:28608
+#: gramps.glade:7220 gramps.glade:30731
 msgid "T_ype:"
 msgstr ""
 
-#: gramps.glade:6833
+#: gramps.glade:7248
 msgid "An optional suffix to the name, such as \"Jr.\" or \"III\""
 msgstr ""
 
-#: gramps.glade:6855
+#: gramps.glade:7270
 msgid "A title used to refer to the person, such as \"Dr.\" or \"Rev.\""
 msgstr ""
 
-#: gramps.glade:6877
+#: gramps.glade:7292
 msgid "A name that the person was more commonly known by"
 msgstr ""
 
-#: gramps.glade:6899
+#: gramps.glade:7314
 msgid "Preferred name"
 msgstr ""
 
-#: gramps.glade:6930
+#: gramps.glade:7349
 msgid "_male"
 msgstr ""
 
-#: gramps.glade:6950
+#: gramps.glade:7369
 msgid "fema_le"
 msgstr ""
 
-#: gramps.glade:6971
+#: gramps.glade:7390
 msgid "u_nknown"
 msgstr ""
 
-#: gramps.glade:7001
+#: gramps.glade:7420
 msgid "Birth"
 msgstr ""
 
-#: gramps.glade:7025
+#: gramps.glade:7448
 msgid "GRAMPS _ID:"
 msgstr ""
 
-#: gramps.glade:7071
+#: gramps.glade:7498
 msgid "Death"
 msgstr ""
 
-#: gramps.glade:7109
+#: gramps.glade:7543
 msgid "An optional prefix for the family name that is not used in sorting, such as \"de\" or \"van\""
 msgstr ""
 
-#: gramps.glade:7131
+#: gramps.glade:7565
 msgid "The person's given name"
 msgstr ""
 
-#: gramps.glade:7176
+#: gramps.glade:7610
 msgid "Edit the preferred name"
 msgstr ""
 
-#: gramps.glade:7206
+#: gramps.glade:7640
 msgid "Gender"
 msgstr ""
 
-#: gramps.glade:7229
+#: gramps.glade:7667
 msgid "Identification"
 msgstr ""
 
-#: gramps.glade:7277
+#: gramps.glade:7719
 msgid "Image"
 msgstr ""
 
-#: gramps.glade:7308 gramps.glade:12091
+#: gramps.glade:7754 gramps.glade:12980
 msgid "Information i_s complete"
 msgstr ""
 
-#: gramps.glade:7330
+#: gramps.glade:7776
 msgid "Information is pri_vate"
 msgstr ""
 
-#: gramps.glade:7360 gramps.glade:11012 gramps.glade:18007 gramps.glade:22978
-#: gramps.glade:25147 gramps.glade:27388
+#: gramps.glade:7806 gramps.glade:11812 gramps.glade:19397 gramps.glade:24769
+#: gramps.glade:27075 gramps.glade:29438
 msgid "_Date:"
 msgstr ""
 
-#: gramps.glade:7384 gramps.glade:11084 gramps.glade:25203
+#: gramps.glade:7834 gramps.glade:11892 gramps.glade:27139
 msgid "_Place:"
 msgstr ""
 
-#: gramps.glade:7431
+#: gramps.glade:7885
 msgid "Invoke birth event editor"
 msgstr ""
 
-#: gramps.glade:7486 gramps.glade:7589 gramps.glade:11628 gramps.glade:11688
-#: gramps.glade:11748 gramps.glade:13846 gramps.glade:18436 gramps.glade:23027
-#: gramps.glade:29116
+#: gramps.glade:7940 gramps.glade:8047 gramps.glade:12490 gramps.glade:12550
+#: gramps.glade:12610 gramps.glade:14899 gramps.glade:19866 gramps.glade:24822
+#: gramps.glade:31293
 msgid "Invoke date editor"
 msgstr ""
 
-#: gramps.glade:7539 gramps.glade:11177
+#: gramps.glade:7993 gramps.glade:11993
 msgid "D_ate:"
 msgstr ""
 
-#: gramps.glade:7625
+#: gramps.glade:8083
 msgid "Invoke death event editor"
 msgstr ""
 
-#: gramps.glade:7655
+#: gramps.glade:8113
 msgid "Plac_e:"
 msgstr ""
 
-#: gramps.glade:7798 gramps.glade:8608 gramps.glade:9122 gramps.glade:9558
-#: gramps.glade:12304 gramps.glade:12751
+#: gramps.glade:8268 gramps.glade:9185 gramps.glade:9758 gramps.glade:10241
+#: gramps.glade:13221 gramps.glade:13719
 msgid "Confidence:"
 msgstr ""
 
-#: gramps.glade:7822
+#: gramps.glade:8296
 msgid "Family prefix:"
 msgstr ""
 
-#: gramps.glade:7966
+#: gramps.glade:8464
 msgid "Alternate name"
 msgstr ""
 
-#: gramps.glade:7990 gramps.glade:8560 gramps.glade:9074 gramps.glade:9654
-#: gramps.glade:12375 gramps.glade:12823
+#: gramps.glade:8492 gramps.glade:9129 gramps.glade:9702 gramps.glade:10353
+#: gramps.glade:13304 gramps.glade:13803
 msgid "Primary source"
 msgstr ""
 
-#: gramps.glade:8266
+#: gramps.glade:8807
 msgid "Create an alternate name for this person"
 msgstr ""
 
-#: gramps.glade:8295
+#: gramps.glade:8836
 msgid "Edit the selected name"
 msgstr ""
 
-#: gramps.glade:8323
+#: gramps.glade:8864
 msgid "Delete the selected name"
 msgstr ""
 
-#: gramps.glade:8375
+#: gramps.glade:8916
 msgid "Names"
 msgstr ""
 
-#: gramps.glade:8416
+#: gramps.glade:8961
 msgid "Event"
 msgstr ""
 
-#: gramps.glade:8464 gramps.glade:12232
+#: gramps.glade:9017 gramps.glade:13137
 msgid "Cause:"
 msgstr ""
 
-#: gramps.glade:8845
+#: gramps.glade:9457
 msgid "Create a new event"
 msgstr ""
 
-#: gramps.glade:8874
+#: gramps.glade:9486
 msgid "Edit the selected event"
 msgstr ""
 
-#: gramps.glade:8902
+#: gramps.glade:9514
 msgid "Delete the selected event"
 msgstr ""
 
-#: gramps.glade:9002 gramps.glade:12847 gramps.glade:22174 gramps.glade:23205
+#: gramps.glade:9618 gramps.glade:13831 gramps.glade:23910 gramps.glade:25020
 msgid "Attributes"
 msgstr ""
 
-#: gramps.glade:9287
+#: gramps.glade:9946
 msgid "Create a new attribute"
 msgstr ""
 
-#: gramps.glade:9316
+#: gramps.glade:9975
 msgid "Edit the selected attribute"
 msgstr ""
 
-#: gramps.glade:9344 gramps.glade:13065 gramps.glade:22299 gramps.glade:23329
+#: gramps.glade:10003 gramps.glade:14072 gramps.glade:24042 gramps.glade:25151
 msgid "Delete the selected attribute"
 msgstr ""
 
-#: gramps.glade:9403 gramps.glade:13117 gramps.glade:22364 gramps.glade:23395
+#: gramps.glade:10062 gramps.glade:14124 gramps.glade:24107 gramps.glade:25217
 msgid "Attributes"
 msgstr ""
 
-#: gramps.glade:9438
+#: gramps.glade:10101
 msgid "City/County:"
 msgstr ""
 
-#: gramps.glade:9630
+#: gramps.glade:10325
 msgid "Addresses"
 msgstr ""
 
-#: gramps.glade:9995
+#: gramps.glade:10741
 msgid "Create a new address"
 msgstr ""
 
-#: gramps.glade:10024
+#: gramps.glade:10770
 msgid "Edit the selected address"
 msgstr ""
 
-#: gramps.glade:10052
+#: gramps.glade:10798
 msgid "Delete the selected address"
 msgstr ""
 
-#: gramps.glade:10145
+#: gramps.glade:10895
 msgid "Enter miscellaneous relevant data and documentation"
 msgstr ""
 
-#: gramps.glade:10268 gramps.glade:13271 gramps.glade:21989 gramps.glade:23549
+#: gramps.glade:11022 gramps.glade:14286 gramps.glade:23701 gramps.glade:25379
 #: plugins/IndivComplete.py:166 plugins/WebPage.py:567
 msgid "Notes"
 msgstr ""
 
-#: gramps.glade:10326
+#: gramps.glade:11087
 msgid "Add a source"
 msgstr ""
 
-#: gramps.glade:10353
+#: gramps.glade:11114
 msgid "Edit the selected source"
 msgstr ""
 
-#: gramps.glade:10379
+#: gramps.glade:11140
 msgid "Remove the selected source"
 msgstr ""
 
-#: gramps.glade:10423 gramps.glade:13423 gramps.glade:15520 gramps.glade:22542
-#: gramps.glade:23771 gramps.glade:25590 gramps.glade:26594 gramps.glade:27962
-#: gramps.glade:29392 plugins/Ancestors.py:159 plugins/IndivComplete.py:324
+#: gramps.glade:11184 gramps.glade:14445 gramps.glade:16716 gramps.glade:24292
+#: gramps.glade:25615 gramps.glade:27544 gramps.glade:28594 gramps.glade:30047
+#: gramps.glade:31576 plugins/Ancestors.py:159 plugins/IndivComplete.py:324
 #: plugins/ScratchPad.py:153 plugins/ScratchPad.py:293
 #: plugins/ScratchPad.py:326 plugins/WebPage.py:224
 msgid "Sources"
 msgstr ""
 
-#: gramps.glade:10573
+#: gramps.glade:11338
 msgid "Remove the selected object from this gallery only"
 msgstr ""
 
-#: gramps.glade:10656 gramps.glade:15766
+#: gramps.glade:11425 gramps.glade:16970
 msgid "Web address:"
 msgstr ""
 
-#: gramps.glade:10751 gramps.glade:15861
+#: gramps.glade:11536 gramps.glade:17081
 msgid "Internet addresses"
 msgstr ""
 
-#: gramps.glade:10822
+#: gramps.glade:11614
 msgid "Add an internet reference about this person"
 msgstr ""
 
-#: gramps.glade:10851
+#: gramps.glade:11643
 msgid "Edit the selected internet address"
 msgstr ""
 
-#: gramps.glade:10878
+#: gramps.glade:11670
 msgid "Go to this web page"
 msgstr ""
 
-#: gramps.glade:10907
+#: gramps.glade:11699
 msgid "Delete selected reference"
 msgstr ""
 
-#: gramps.glade:10959 gramps.glade:16075
+#: gramps.glade:11751 gramps.glade:17302
 msgid "Internet"
 msgstr ""
 
-#: gramps.glade:10988
+#: gramps.glade:11784
 msgid "LDS baptism"
 msgstr ""
 
-#: gramps.glade:11037
+#: gramps.glade:11841
 msgid "LDS _temple:"
 msgstr ""
 
-#: gramps.glade:11065 gramps.glade:11279 gramps.glade:11368 gramps.glade:13740
+#: gramps.glade:11873 gramps.glade:12107 gramps.glade:12204 gramps.glade:14786
 msgid "Sources..."
 msgstr ""
 
-#: gramps.glade:11134 gramps.glade:11299 gramps.glade:11437 gramps.glade:13760
+#: gramps.glade:11946 gramps.glade:12127 gramps.glade:12277 gramps.glade:14806
 msgid "Note..."
 msgstr ""
 
-#: gramps.glade:11153
+#: gramps.glade:11965
 msgid "Endowment"
 msgstr ""
 
-#: gramps.glade:11205
+#: gramps.glade:12025
 msgid "LDS te_mple:"
 msgstr ""
 
-#: gramps.glade:11229 gramps.glade:17568
+#: gramps.glade:12053 gramps.glade:18925
 msgid "P_lace:"
 msgstr ""
 
-#: gramps.glade:11318 gramps.glade:29067
+#: gramps.glade:12146 gramps.glade:31240
 msgid "Dat_e:"
 msgstr ""
 
-#: gramps.glade:11343
+#: gramps.glade:12175
 msgid "LD_S temple:"
 msgstr ""
 
-#: gramps.glade:11387
+#: gramps.glade:12223
 msgid "Pla_ce:"
 msgstr ""
 
-#: gramps.glade:11456
+#: gramps.glade:12296
 msgid "Pa_rents:"
 msgstr ""
 
-#: gramps.glade:11481
+#: gramps.glade:12325
 msgid "Sealed to parents"
 msgstr ""
 
-#: gramps.glade:11788 gramps.glade:13894
+#: gramps.glade:12650 gramps.glade:14947
 msgid "LDS"
 msgstr ""
 
-#: gramps.glade:11978
+#: gramps.glade:12853
 msgid "_GRAMPS ID:"
 msgstr ""
 
-#: gramps.glade:12042 gramps.glade:14569
+#: gramps.glade:12923 gramps.glade:15675
 msgid "Last Changed:"
 msgstr ""
 
-#: gramps.glade:12351
+#: gramps.glade:13276
 msgid "Events"
 msgstr ""
 
-#: gramps.glade:12586
+#: gramps.glade:13546
 msgid "Add new event for this marriage"
 msgstr ""
 
-#: gramps.glade:12640
+#: gramps.glade:13600
 msgid "Delete selected event"
 msgstr ""
 
-#: gramps.glade:13011
+#: gramps.glade:14018
 msgid "Create a new attribute for this marriage"
 msgstr ""
 
-#: gramps.glade:13540
+#: gramps.glade:14566
 msgid "Edit the properties of the selected objects"
 msgstr ""
 
-#: gramps.glade:13643
+#: gramps.glade:14673
 msgid "Sealed to spouse"
 msgstr ""
 
-#: gramps.glade:13691
+#: gramps.glade:14729
 msgid "Temple:"
 msgstr ""
 
-#: gramps.glade:14087
+#: gramps.glade:15153
 msgid "C_ity:"
 msgstr ""
 
-#: gramps.glade:14115 gramps.glade:26987
+#: gramps.glade:15185 gramps.glade:29016
 msgid "_State:"
 msgstr ""
 
-#: gramps.glade:14143 gramps.glade:26930
-msgid "C_ounty:"
+#: gramps.glade:15217
+msgid "Co_unty:"
 msgstr ""
 
-#: gramps.glade:14171
-msgid "Co_untry:"
+#: gramps.glade:15249
+msgid "Count_ry:"
 msgstr ""
 
-#: gramps.glade:14199
+#: gramps.glade:15281
 msgid "_Longitude:"
 msgstr ""
 
-#: gramps.glade:14227
+#: gramps.glade:15313
 msgid "L_atitude:"
 msgstr ""
 
-#: gramps.glade:14255 gramps.glade:27016
+#: gramps.glade:15345 gramps.glade:29049
 msgid "Church _parish:"
 msgstr ""
 
-#: gramps.glade:14477 gramps.glade:17203 gramps.glade:27528
+#: gramps.glade:15575 gramps.glade:18532 gramps.glade:29598
 msgid "_ZIP/Postal code:"
 msgstr ""
 
-#: gramps.glade:14523 gramps.glade:27150 gramps.glade:27705
-msgid "P_hone:"
+#: gramps.glade:15625
+msgid "Phon_e:"
 msgstr ""
 
-#: gramps.glade:14658
+#: gramps.glade:15776
 msgid "County:"
 msgstr ""
 
-#: gramps.glade:14706
+#: gramps.glade:15832
 msgid "State:"
 msgstr ""
 
-#: gramps.glade:14754
+#: gramps.glade:15888
 msgid "Church parish:"
 msgstr ""
 
-#: gramps.glade:14855
+#: gramps.glade:16005
 msgid "Zip/Postal code:"
 msgstr ""
 
-#: gramps.glade:14927
+#: gramps.glade:16089
 msgid "Other names"
 msgstr ""
 
-#: gramps.glade:15188
+#: gramps.glade:16369
 msgid "Other names"
 msgstr ""
 
-#: gramps.glade:16162
+#: gramps.glade:17397
 msgid "GRAMPS Preferences"
 msgstr ""
 
-#: gramps.glade:16234
+#: gramps.glade:17470
 msgid "Categories:"
 msgstr ""
 
-#: gramps.glade:16349
+#: gramps.glade:17592
 msgid "To change your preferences, select one of the subcategories in the menu on the left hand side of the window."
 msgstr ""
 
-#: gramps.glade:16413
+#: gramps.glade:17664
 msgid "Database"
 msgstr ""
 
-#: gramps.glade:16438
+#: gramps.glade:17693
 msgid "_Automatically load last database"
 msgstr ""
 
-#: gramps.glade:16459
+#: gramps.glade:17714
 msgid "Family name guessing"
 msgstr ""
 
-#: gramps.glade:16546
+#: gramps.glade:17811
 msgid "Toolbar"
 msgstr ""
 
-#: gramps.glade:16571
+#: gramps.glade:17840
 msgid "Active person's _relationship to Home Person"
 msgstr ""
 
-#: gramps.glade:16594
+#: gramps.glade:17863
 msgid "Active person's name and _GRAMPS ID"
 msgstr ""
 
-#: gramps.glade:16616
+#: gramps.glade:17885
 msgid "Statusbar"
 msgstr ""
 
-#: gramps.glade:16644
+#: gramps.glade:17917
 msgid ""
 "GNOME settings\n"
 "Icons Only\n"
@@ -5315,169 +5385,169 @@ msgid ""
 "Text Beside Icons"
 msgstr ""
 
-#: gramps.glade:16709
+#: gramps.glade:17988
 msgid "_Always display the LDS ordinance tabs"
 msgstr ""
 
-#: gramps.glade:16731
+#: gramps.glade:18010
 msgid "Display"
 msgstr ""
 
-#: gramps.glade:16755
+#: gramps.glade:18038
 msgid "Default view"
 msgstr ""
 
-#: gramps.glade:16780
+#: gramps.glade:18067
 msgid "_Person view"
 msgstr ""
 
-#: gramps.glade:16803
+#: gramps.glade:18090
 msgid "_Family view"
 msgstr ""
 
-#: gramps.glade:16825
+#: gramps.glade:18112
 msgid "Family view style"
 msgstr ""
 
-#: gramps.glade:16850
+#: gramps.glade:18141
 msgid "Left to right"
 msgstr ""
 
-#: gramps.glade:16873
+#: gramps.glade:18164
 msgid "Top to bottom"
 msgstr ""
 
-#: gramps.glade:16898
+#: gramps.glade:18189
 msgid "_Display Tip of the Day"
 msgstr ""
 
-#: gramps.glade:16967
+#: gramps.glade:18262
 msgid "_Date format:"
 msgstr ""
 
-#: gramps.glade:16992
+#: gramps.glade:18291
 msgid "Display formats"
 msgstr ""
 
-#: gramps.glade:17078 rule.glade:397
+#: gramps.glade:18387 rule.glade:397
 msgid "_Name:"
 msgstr ""
 
-#: gramps.glade:17103
+#: gramps.glade:18416
 msgid "_Address:"
 msgstr ""
 
-#: gramps.glade:17128 gramps.glade:26902
+#: gramps.glade:18445 gramps.glade:28919
 msgid "_City:"
 msgstr ""
 
-#: gramps.glade:17153 gramps.glade:27472
+#: gramps.glade:18474 gramps.glade:29534
 msgid "_State/Province:"
 msgstr ""
 
-#: gramps.glade:17178
+#: gramps.glade:18503
 msgid "_Country:"
 msgstr ""
 
-#: gramps.glade:17228
+#: gramps.glade:18561
 msgid "_Phone:"
 msgstr ""
 
-#: gramps.glade:17253
+#: gramps.glade:18590
 msgid "_Email:"
 msgstr ""
 
-#: gramps.glade:17446
+#: gramps.glade:18787
 msgid "Researcher information"
 msgstr ""
 
-#: gramps.glade:17518 gramps.glade:29700
+#: gramps.glade:18867 gramps.glade:31901
 msgid "_Person:"
 msgstr ""
 
-#: gramps.glade:17543
+#: gramps.glade:18896
 msgid "_Family:"
 msgstr ""
 
-#: gramps.glade:17593
+#: gramps.glade:18954
 msgid "_Source:"
 msgstr ""
 
-#: gramps.glade:17618
+#: gramps.glade:18983
 msgid "_Media object:"
 msgstr ""
 
-#: gramps.glade:17647
+#: gramps.glade:19016
 msgid "I"
 msgstr ""
 
-#: gramps.glade:17668
+#: gramps.glade:19037
 msgid "F"
 msgstr ""
 
-#: gramps.glade:17689
+#: gramps.glade:19058
 msgid "P"
 msgstr ""
 
-#: gramps.glade:17710
+#: gramps.glade:19079
 msgid "S"
 msgstr ""
 
-#: gramps.glade:17731
+#: gramps.glade:19100
 msgid "O"
 msgstr ""
 
-#: gramps.glade:17748
+#: gramps.glade:19117
 msgid "GRAMPS ID prefixes"
 msgstr ""
 
-#: gramps.glade:17957
+#: gramps.glade:19339
 msgid "_Confidence:"
 msgstr ""
 
-#: gramps.glade:17982
+#: gramps.glade:19368
 msgid "_Volume/Film/Page:"
 msgstr ""
 
-#: gramps.glade:18035
+#: gramps.glade:19429
 msgid "Te_xt:"
 msgstr ""
 
-#: gramps.glade:18062
+#: gramps.glade:19460
 msgid "Co_mments:"
 msgstr ""
 
-#: gramps.glade:18089
+#: gramps.glade:19491
 msgid "Publication information:"
 msgstr ""
 
-#: gramps.glade:18113 mergedata.glade:919 mergedata.glade:941
+#: gramps.glade:19519 mergedata.glade:919 mergedata.glade:941
 #: plugins.glade:362
 msgid "Author:"
 msgstr ""
 
-#: gramps.glade:18209
+#: gramps.glade:19631
 msgid "Source selection"
 msgstr ""
 
-#: gramps.glade:18233
+#: gramps.glade:19659
 msgid "Source details"
 msgstr ""
 
-#: gramps.glade:18372
+#: gramps.glade:19802
 msgid "Creates a new source"
 msgstr ""
 
-#: gramps.glade:18374
+#: gramps.glade:19804
 msgid "_New..."
 msgstr ""
 
-#: gramps.glade:18394 gramps.glade:21784 gramps.glade:25344 gramps.glade:26354
-#: gramps.glade:27557 gramps.glade:28334 gramps.glade:29869
+#: gramps.glade:19824 gramps.glade:23484 gramps.glade:27288 gramps.glade:28344
+#: gramps.glade:29631 gramps.glade:30444 gramps.glade:32078
 msgid "_Private record"
 msgstr ""
 
-#: gramps.glade:18469
+#: gramps.glade:19899
 msgid ""
 "Very Low\n"
 "Low\n"
@@ -5486,401 +5556,409 @@ msgid ""
 "Very High"
 msgstr ""
 
-#: gramps.glade:18644
+#: gramps.glade:20083
 msgid "Double click will edit the selected source"
 msgstr ""
 
-#: gramps.glade:19700
+#: gramps.glade:21219
 msgid "Style _name:"
 msgstr ""
 
-#: gramps.glade:19858 rule.glade:1144
+#: gramps.glade:21392 rule.glade:1144
 msgid "Description"
 msgstr ""
 
-#: gramps.glade:19887
+#: gramps.glade:21425
 msgid "pt"
 msgstr ""
 
-#: gramps.glade:19914 gramps.glade:20222
+#: gramps.glade:21456 gramps.glade:21788
 msgid "Pick a color"
 msgstr ""
 
-#: gramps.glade:19953
+#: gramps.glade:21495
 msgid "_Bold"
 msgstr ""
 
-#: gramps.glade:19975
+#: gramps.glade:21517
 msgid "_Italic"
 msgstr ""
 
-#: gramps.glade:19997
+#: gramps.glade:21539
 msgid "_Underline"
 msgstr ""
 
-#: gramps.glade:20018
+#: gramps.glade:21560
 msgid "Type face"
 msgstr ""
 
-#: gramps.glade:20042
+#: gramps.glade:21588
 msgid "Size"
 msgstr ""
 
-#: gramps.glade:20066
+#: gramps.glade:21616
 msgid "Color"
 msgstr ""
 
-#: gramps.glade:20140
+#: gramps.glade:21702
 msgid "_Roman (Times, serif)"
 msgstr ""
 
-#: gramps.glade:20162
+#: gramps.glade:21724
 msgid "_Swiss (Arial, Helvetica, sans-serif)"
 msgstr ""
 
-#: gramps.glade:20190
+#: gramps.glade:21752
 msgid "Font options"
 msgstr ""
 
-#: gramps.glade:20238
+#: gramps.glade:21804
 msgid "R_ight:"
 msgstr ""
 
-#: gramps.glade:20266
+#: gramps.glade:21836
 msgid "L_eft:"
 msgstr ""
 
-#: gramps.glade:20294
+#: gramps.glade:21868
 msgid "_Padding:"
 msgstr ""
 
-#: gramps.glade:20458
+#: gramps.glade:22048
 msgid "_Left"
 msgstr ""
 
-#: gramps.glade:20480
+#: gramps.glade:22070
 msgid "_Right"
 msgstr ""
 
-#: gramps.glade:20503
+#: gramps.glade:22093
 msgid "_Justify"
 msgstr ""
 
-#: gramps.glade:20526
+#: gramps.glade:22116
 msgid "_Center"
 msgstr ""
 
-#: gramps.glade:20548
+#: gramps.glade:22138
 msgid "Background"
 msgstr ""
 
-#: gramps.glade:20572
+#: gramps.glade:22166
 msgid "Margins"
 msgstr ""
 
-#: gramps.glade:20621
+#: gramps.glade:22223
 msgid "Alignment"
 msgstr ""
 
-#: gramps.glade:20645
+#: gramps.glade:22251
 msgid "Borders"
 msgstr ""
 
-#: gramps.glade:20670
+#: gramps.glade:22280
 msgid "Le_ft"
 msgstr ""
 
-#: gramps.glade:20692
+#: gramps.glade:22302
 msgid "Ri_ght"
 msgstr ""
 
-#: gramps.glade:20714
+#: gramps.glade:22324
 msgid "_Top"
 msgstr ""
 
-#: gramps.glade:20736
+#: gramps.glade:22346
 msgid "_Bottom"
 msgstr ""
 
-#: gramps.glade:20757
+#: gramps.glade:22367
 msgid "First line"
 msgstr ""
 
-#: gramps.glade:20826
+#: gramps.glade:22444
 msgid "I_ndent:"
 msgstr ""
 
-#: gramps.glade:20857
+#: gramps.glade:22479
 msgid "Paragraph options"
 msgstr ""
 
-#: gramps.glade:21143
+#: gramps.glade:22782
 msgid "Internal note"
 msgstr ""
 
-#: gramps.glade:21399 gramps.glade:22796
+#: gramps.glade:23055 gramps.glade:24567
 msgid "Object type:"
 msgstr ""
 
-#: gramps.glade:21579
+#: gramps.glade:23259
 msgid "Lower X:"
 msgstr ""
 
-#: gramps.glade:21603
+#: gramps.glade:23287
 msgid "Upper X:"
 msgstr ""
 
-#: gramps.glade:21627
+#: gramps.glade:23315
 msgid "Upper Y:"
 msgstr ""
 
-#: gramps.glade:21651
+#: gramps.glade:23343
 msgid "Lower Y:"
 msgstr ""
 
-#: gramps.glade:21759
+#: gramps.glade:23455
 msgid "Subsection"
 msgstr ""
 
-#: gramps.glade:21805
+#: gramps.glade:23505
 msgid "Privacy"
 msgstr ""
 
-#: gramps.glade:22044
+#: gramps.glade:23760
 msgid "Global Notes"
 msgstr ""
 
-#: gramps.glade:22245
+#: gramps.glade:23988
 msgid "Creates a new object attribute from the above data"
 msgstr ""
 
-#: gramps.glade:23275
+#: gramps.glade:25097
 msgid "Creates a new attribute from the above data"
 msgstr ""
 
-#: gramps.glade:23969
+#: gramps.glade:25827
 msgid "Close _without saving"
 msgstr ""
 
-#: gramps.glade:24095
+#: gramps.glade:25961
 msgid "Do not ask again"
 msgstr ""
 
-#: gramps.glade:24713
+#: gramps.glade:26616
 msgid "Remove object and all references to it from the database"
 msgstr ""
 
-#: gramps.glade:24758
+#: gramps.glade:26661
 msgid "_Remove Object"
 msgstr ""
 
-#: gramps.glade:24785
+#: gramps.glade:26692
 msgid "Keep reference to the missing file"
 msgstr ""
 
-#: gramps.glade:24788
+#: gramps.glade:26695
 msgid "_Keep Reference"
 msgstr ""
 
-#: gramps.glade:24799
+#: gramps.glade:26706
 msgid "Select replacement for the missing file"
 msgstr ""
 
-#: gramps.glade:24846
+#: gramps.glade:26753
 msgid "_Select File"
 msgstr ""
 
-#: gramps.glade:24959
+#: gramps.glade:26878
 msgid "If you check this button, all the missing media files will be automatically treated according to the currently selected option. No further dialogs will be presented for any missing medial files."
 msgstr ""
 
-#: gramps.glade:24961
+#: gramps.glade:26880
 msgid "_Use this selection for all missing media files"
 msgstr ""
 
-#: gramps.glade:25022
+#: gramps.glade:26942
 msgid "Close window without changes"
 msgstr ""
 
-#: gramps.glade:25123
+#: gramps.glade:27047
 msgid "_Event type:"
 msgstr ""
 
-#: gramps.glade:25175
+#: gramps.glade:27107
 msgid "De_scription:"
 msgstr ""
 
-#: gramps.glade:25231
+#: gramps.glade:27171
 msgid "_Cause:"
 msgstr ""
 
-#: gramps.glade:26301
+#: gramps.glade:28283
 msgid "_Attribute:"
 msgstr ""
 
-#: gramps.glade:26325
+#: gramps.glade:28311
 msgid "_Value:"
 msgstr ""
 
-#: gramps.glade:26958 gramps.glade:27500
+#: gramps.glade:28951
+msgid "C_ounty:"
+msgstr ""
+
+#: gramps.glade:28983 gramps.glade:29566
 msgid "Cou_ntry:"
 msgstr ""
 
-#: gramps.glade:27196
+#: gramps.glade:29187 gramps.glade:29779
+msgid "P_hone:"
+msgstr ""
+
+#: gramps.glade:29237
 msgid "_Zip/Postal code:"
 msgstr ""
 
-#: gramps.glade:27416
+#: gramps.glade:29470
 msgid "Add_ress:"
 msgstr ""
 
-#: gramps.glade:27444
+#: gramps.glade:29502
 msgid "_City/County:"
 msgstr ""
 
-#: gramps.glade:28271
+#: gramps.glade:30373
 msgid "_Web address:"
 msgstr ""
 
-#: gramps.glade:28299
+#: gramps.glade:30405
 msgid "_Description:"
 msgstr ""
 
-#: gramps.glade:28580
+#: gramps.glade:30699
 msgid "Suffi_x:"
 msgstr ""
 
-#: gramps.glade:28664
+#: gramps.glade:30795
 msgid "P_rivate record"
 msgstr ""
 
-#: gramps.glade:28685
+#: gramps.glade:30816
 msgid "Family _prefix:"
 msgstr ""
 
-#: gramps.glade:28798
+#: gramps.glade:30933
 msgid "P_atronymic:"
 msgstr ""
 
-#: gramps.glade:28891
+#: gramps.glade:31037
 msgid "G_roup as:"
 msgstr ""
 
-#: gramps.glade:28916
+#: gramps.glade:31066
 msgid "_Sort as:"
 msgstr ""
 
-#: gramps.glade:28943
+#: gramps.glade:31097
 msgid "_Display as:"
 msgstr ""
 
-#: gramps.glade:28970
+#: gramps.glade:31128
 msgid "Name Information"
 msgstr ""
 
-#: gramps.glade:29034
+#: gramps.glade:31203
 msgid ""
 "Default (based on locale)\n"
 "Family name, Given name\n"
 "Given name, Family name"
 msgstr ""
 
-#: gramps.glade:29052
+#: gramps.glade:31223
 msgid ""
 "Default (based on locale)\n"
 "Given name Family name\n"
 "Family name Given name\n"
 msgstr ""
 
-#: gramps.glade:29178
+#: gramps.glade:31355
 msgid "_Override"
 msgstr ""
 
-#: gramps.glade:29728
+#: gramps.glade:31933
 msgid "_Comment:"
 msgstr ""
 
-#: gramps.glade:29780
+#: gramps.glade:31989
 msgid "Person is in the _database"
 msgstr ""
 
-#: gramps.glade:29848
+#: gramps.glade:32057
 msgid "Choose a person from the database"
 msgstr ""
 
-#: gramps.glade:29850
+#: gramps.glade:32059
 msgid "_Select"
 msgstr ""
 
-#: gramps.glade:29979
+#: gramps.glade:32189
 msgid "_Next"
 msgstr ""
 
-#: gramps.glade:30038
+#: gramps.glade:32252
 msgid "_Display on startup"
 msgstr ""
 
-#: gramps.glade:30101
+#: gramps.glade:32319
 msgid "Gramps' Tip of the Day"
 msgstr ""
 
-#: gramps.glade:30134
+#: gramps.glade:32356
 msgid "GRAMPS - Loading Database"
 msgstr ""
 
-#: gramps.glade:30159
+#: gramps.glade:32382
 msgid "Loading database"
 msgstr ""
 
-#: gramps.glade:30183
+#: gramps.glade:32410
 msgid "GRAMPS is loading the database you selected. Please wait."
 msgstr ""
 
-#: gramps.glade:30366
+#: gramps.glade:32606
 msgid "Calenda_r:"
 msgstr ""
 
-#: gramps.glade:30416
+#: gramps.glade:32662
 msgid "Q_uality"
 msgstr ""
 
-#: gramps.glade:30458
+#: gramps.glade:32710
 msgid "_Type"
 msgstr ""
 
-#: gramps.glade:30500
+#: gramps.glade:32758
 msgid "Date"
 msgstr ""
 
-#: gramps.glade:30524
+#: gramps.glade:32786
 msgid "_Day"
 msgstr ""
 
-#: gramps.glade:30549
+#: gramps.glade:32815
 msgid "_Month"
 msgstr ""
 
-#: gramps.glade:30574
+#: gramps.glade:32844
 msgid "_Year"
 msgstr ""
 
-#: gramps.glade:30658
+#: gramps.glade:32934
 msgid "Second date"
 msgstr ""
 
-#: gramps.glade:30682
+#: gramps.glade:32962
 msgid "D_ay"
 msgstr ""
 
-#: gramps.glade:30707
+#: gramps.glade:32991
 msgid "Mo_nth"
 msgstr ""
 
-#: gramps.glade:30732
+#: gramps.glade:33020
 msgid "Y_ear"
 msgstr ""
 
-#: gramps.glade:30829
+#: gramps.glade:33123
 msgid "Te_xt comment:"
 msgstr ""
 
@@ -5957,156 +6035,158 @@ msgstr ""
 msgid "People with records matching regular expression..."
 msgstr ""
 
-#: gramps_main.py:1074 gramps_main.py:1097
+#: gramps_main.py:1074 gramps_main.py:1086 gramps_main.py:1104
+#: gramps_main.py:1116
 msgid "Cannot merge people."
 msgstr ""
 
-#: gramps_main.py:1075 gramps_main.py:1098
+#: gramps_main.py:1075 gramps_main.py:1087 gramps_main.py:1105
+#: gramps_main.py:1117
 msgid "Exactly two people must be selected to perform a merge. A second person can be selected by holding down the control key while clicking on the desired person."
 msgstr ""
 
-#: gramps_main.py:1221
+#: gramps_main.py:1235
 msgid "Cannot unpak archive"
 msgstr ""
 
-#: gramps_main.py:1222 plugins/ReadPkg.py:67
+#: gramps_main.py:1236 plugins/ReadPkg.py:67
 msgid "Temporary directory %s is not writable"
 msgstr ""
 
-#: gramps_main.py:1264 gramps_main.py:1270 gramps_main.py:1291
-#: gramps_main.py:1295 gramps_main.py:1298
+#: gramps_main.py:1278 gramps_main.py:1284 gramps_main.py:1305
+#: gramps_main.py:1309 gramps_main.py:1312
 msgid "Cannot open database"
 msgstr ""
 
-#: gramps_main.py:1265
+#: gramps_main.py:1279
 msgid ""
 "The selected file is a directory, not a file.\n"
 "A GRAMPS database must be a file."
 msgstr ""
 
-#: gramps_main.py:1271
+#: gramps_main.py:1285
 msgid "You do not have read access to the selected file."
 msgstr ""
 
-#: gramps_main.py:1276
+#: gramps_main.py:1290
 msgid "Read only database"
 msgstr ""
 
-#: gramps_main.py:1277
+#: gramps_main.py:1291
 msgid "You do not have write access to the selected file."
 msgstr ""
 
-#: gramps_main.py:1286
+#: gramps_main.py:1300
 msgid "Read Only"
 msgstr ""
 
-#: gramps_main.py:1292
+#: gramps_main.py:1306
 msgid "The database file specified could not be opened."
 msgstr ""
 
-#: gramps_main.py:1299
+#: gramps_main.py:1313
 msgid "%s could not be opened."
 msgstr ""
 
-#: gramps_main.py:1358
+#: gramps_main.py:1372
 msgid "Save Media Object"
 msgstr ""
 
-#: gramps_main.py:1404 plugins/Check.py:284 plugins/WriteCD.py:255
+#: gramps_main.py:1418 plugins/Check.py:284 plugins/WriteCD.py:255
 #: plugins/WritePkg.py:171
 msgid "Media object could not be found"
 msgstr ""
 
-#: gramps_main.py:1405 plugins/WriteCD.py:256 plugins/WritePkg.py:172
+#: gramps_main.py:1419 plugins/WriteCD.py:256 plugins/WritePkg.py:172
 msgid "%(file_name)s is referenced in the database, but no longer exists. The file may have been deleted or moved to a different location. You may choose to either remove the reference from the database, keep the reference to the missing file, or select a new file."
 msgstr ""
 
-#: gramps_main.py:1451
+#: gramps_main.py:1465
 msgid "Deleting the person will remove the person from the database."
 msgstr ""
 
-#: gramps_main.py:1455
+#: gramps_main.py:1469
 msgid "_Delete Person"
 msgstr ""
 
-#: gramps_main.py:1519
+#: gramps_main.py:1533
 msgid "Delete Person (%s)"
 msgstr ""
 
-#: gramps_main.py:1603
+#: gramps_main.py:1617
 msgid "%(relationship)s of %(person)s"
 msgstr ""
 
-#: gramps_main.py:1765
+#: gramps_main.py:1779
 msgid "Upgrading database..."
 msgstr ""
 
-#: gramps_main.py:1778
+#: gramps_main.py:1792
 msgid "Setup complete"
 msgstr ""
 
-#: gramps_main.py:1795
+#: gramps_main.py:1809
 msgid "Loading %s..."
 msgstr ""
 
-#: gramps_main.py:1798
+#: gramps_main.py:1812
 msgid "Opening database..."
 msgstr ""
 
-#: gramps_main.py:1829
+#: gramps_main.py:1843
 msgid "No Home Person has been set."
 msgstr ""
 
-#: gramps_main.py:1830
+#: gramps_main.py:1844
 msgid "The Home Person may be set from the Edit menu."
 msgstr ""
 
-#: gramps_main.py:1836
+#: gramps_main.py:1850
 msgid "%s has been bookmarked"
 msgstr ""
 
-#: gramps_main.py:1839
+#: gramps_main.py:1853
 msgid "Could Not Set a Bookmark"
 msgstr ""
 
-#: gramps_main.py:1840
+#: gramps_main.py:1854
 msgid "A bookmark could not be set because no one was selected."
 msgstr ""
 
-#: gramps_main.py:1854
+#: gramps_main.py:1868
 msgid "Could not go to a Person"
 msgstr ""
 
-#: gramps_main.py:1855
+#: gramps_main.py:1869
 msgid "Either stale bookmark or broken history caused by IDs reorder."
 msgstr ""
 
-#: gramps_main.py:1865
+#: gramps_main.py:1879
 msgid "Set %s as the Home Person"
 msgstr ""
 
-#: gramps_main.py:1866
+#: gramps_main.py:1880
 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:1869
+#: gramps_main.py:1883
 msgid "_Set Home Person"
 msgstr ""
 
-#: gramps_main.py:1880
+#: gramps_main.py:1894
 msgid "A person must be selected to export"
 msgstr ""
 
-#: gramps_main.py:1881
+#: gramps_main.py:1895
 msgid "Exporting requires that an active person be selected. Please select a person and try again."
 msgstr ""
 
-#: gramps_main.py:1912 gramps_main.py:1916 gramps_main.py:1920
-#: gramps_main.py:1934 gramps_main.py:1936
+#: gramps_main.py:1926 gramps_main.py:1930 gramps_main.py:1934
+#: gramps_main.py:1948 gramps_main.py:1950
 msgid "Could not create example database"
 msgstr ""
 
-#: gramps_main.py:1913 gramps_main.py:1917 gramps_main.py:1921
+#: gramps_main.py:1927 gramps_main.py:1931 gramps_main.py:1935
 msgid "The directory ~/.gramps/example could not be created."
 msgstr ""
 
@@ -6174,7 +6254,7 @@ msgstr ""
 #: plugins/AncestorChart.py:245 plugins/AncestorChart2.py:499
 #: plugins/AncestorReport.py:290 plugins/Ancestors.py:909
 #: plugins/Ancestors.py:925 plugins/Ancestors.py:931 plugins/DesGraph.py:333
-#: plugins/DetAncestralReport.py:520 plugins/FamilyGroup.py:514
+#: plugins/DetAncestralReport.py:520 plugins/FamilyGroup.py:515
 #: plugins/FanChart.py:299 plugins/FtmStyleAncestors.py:390
 #: plugins/FtmStyleAncestors.py:395 plugins/FtmStyleAncestors.py:400
 #: plugins/FtmStyleAncestors.py:405 plugins/FtmStyleDescendants.py:536
@@ -6202,7 +6282,7 @@ msgstr ""
 #: plugins/AncestorReport.py:306 plugins/Ancestors.py:968
 #: plugins/BookReport.py:1117 plugins/CountAncestors.py:122
 #: plugins/DescendReport.py:198 plugins/DetAncestralReport.py:618
-#: plugins/DetDescendantReport.py:639 plugins/FamilyGroup.py:548
+#: plugins/DetDescendantReport.py:639 plugins/FamilyGroup.py:549
 #: plugins/FtmStyleAncestors.py:422 plugins/FtmStyleDescendants.py:572
 #: plugins/GraphViz.py:971 plugins/GraphViz.py:985
 #: plugins/IndivComplete.py:595 plugins/IndivSummary.py:391
@@ -6308,7 +6388,7 @@ msgstr ""
 
 #: plugins/AncestorReport.py:276 plugins/Ancestors.py:894
 #: plugins/DescendReport.py:174 plugins/DetAncestralReport.py:484
-#: plugins/DetDescendantReport.py:505 plugins/FamilyGroup.py:505
+#: plugins/DetDescendantReport.py:505 plugins/FamilyGroup.py:506
 #: plugins/FtmStyleAncestors.py:375 plugins/FtmStyleDescendants.py:521
 #: plugins/IndivComplete.py:552 plugins/IndivSummary.py:348
 #: plugins/SimpleBookTitle.py:265 plugins/StatisticsChart.py:812
@@ -6842,7 +6922,7 @@ msgid "Descendant Graph"
 msgstr ""
 
 #: plugins/DesGraph.py:349 plugins/FanChart.py:325
-#: plugins/StatisticsChart.py:958
+#: plugins/StatisticsChart.py:963
 msgid "Alpha"
 msgstr ""
 
@@ -7031,35 +7111,35 @@ msgstr ""
 msgid "Aids in the analysis of data by allowing the development of custom filters that can be applied to the database to find similar events"
 msgstr ""
 
-#: plugins/ExportVCalendar.py:54
+#: plugins/ExportVCalendar.py:55
 msgid "Export to vCalendar"
 msgstr ""
 
-#: plugins/ExportVCalendar.py:199
+#: plugins/ExportVCalendar.py:209
 msgid "Marriage of %s"
 msgstr ""
 
-#: plugins/ExportVCalendar.py:217 plugins/ExportVCalendar.py:219
+#: plugins/ExportVCalendar.py:227 plugins/ExportVCalendar.py:229
 msgid "Birth of %s"
 msgstr ""
 
-#: plugins/ExportVCalendar.py:228 plugins/ExportVCalendar.py:230
+#: plugins/ExportVCalendar.py:238 plugins/ExportVCalendar.py:240
 msgid "Death of %s"
 msgstr ""
 
-#: plugins/ExportVCalendar.py:283
+#: plugins/ExportVCalendar.py:293
 msgid "Anniversary: %s"
 msgstr ""
 
-#: plugins/ExportVCalendar.py:310
+#: plugins/ExportVCalendar.py:320
 msgid "vCalendar"
 msgstr ""
 
-#: plugins/ExportVCalendar.py:311
+#: plugins/ExportVCalendar.py:321
 msgid "vCalendar is used in many calendaring and pim applications."
 msgstr ""
 
-#: plugins/ExportVCalendar.py:312
+#: plugins/ExportVCalendar.py:322
 msgid "vCalendar export options"
 msgstr ""
 
@@ -7067,15 +7147,15 @@ msgstr ""
 msgid "Export to vCard"
 msgstr ""
 
-#: plugins/ExportVCard.py:234
+#: plugins/ExportVCard.py:243
 msgid "vCard"
 msgstr ""
 
-#: plugins/ExportVCard.py:235
+#: plugins/ExportVCard.py:244
 msgid "vCard is used in many addressbook and pim applications."
 msgstr ""
 
-#: plugins/ExportVCard.py:236
+#: plugins/ExportVCard.py:245
 msgid "vCard export options"
 msgstr ""
 
@@ -7087,19 +7167,19 @@ msgstr ""
 msgid "Wife"
 msgstr ""
 
-#: plugins/FamilyGroup.py:383 plugins/FamilyGroup.py:547
+#: plugins/FamilyGroup.py:383 plugins/FamilyGroup.py:548
 msgid "Family Group Report"
 msgstr ""
 
-#: plugins/FamilyGroup.py:523
+#: plugins/FamilyGroup.py:524
 msgid "The style used for the text related to the children."
 msgstr ""
 
-#: plugins/FamilyGroup.py:532
+#: plugins/FamilyGroup.py:533
 msgid "The style used for the parent's name"
 msgstr ""
 
-#: plugins/FamilyGroup.py:551
+#: plugins/FamilyGroup.py:552
 msgid "Creates a family group report, showing information on a set of parents and their children."
 msgstr ""
 
@@ -8033,55 +8113,55 @@ msgstr ""
 msgid "Sort in reverse order"
 msgstr ""
 
-#: plugins/StatisticsChart.py:877
+#: plugins/StatisticsChart.py:881
 msgid "Select year range within which people need to be born to be selected for statistics."
 msgstr ""
 
-#: plugins/StatisticsChart.py:878
+#: plugins/StatisticsChart.py:882
 msgid "People born between"
 msgstr ""
 
-#: plugins/StatisticsChart.py:882
+#: plugins/StatisticsChart.py:886
 msgid "Check this if you want people who have no known birth date or year to be accounted also in the statistics."
 msgstr ""
 
-#: plugins/StatisticsChart.py:883
+#: plugins/StatisticsChart.py:887
 msgid "Include people without known birth years"
 msgstr ""
 
-#: plugins/StatisticsChart.py:895
+#: plugins/StatisticsChart.py:899
 msgid "Select which genders are included into statistics."
 msgstr ""
 
-#: plugins/StatisticsChart.py:896
+#: plugins/StatisticsChart.py:900
 msgid "Genders included"
 msgstr ""
 
-#: plugins/StatisticsChart.py:899
+#: plugins/StatisticsChart.py:903
 msgid "With fewer items pie chart and legend will be used instead of a bar chart."
 msgstr ""
 
-#: plugins/StatisticsChart.py:902
+#: plugins/StatisticsChart.py:907
 msgid "Max. items for a pie"
 msgstr ""
 
-#: plugins/StatisticsChart.py:921
+#: plugins/StatisticsChart.py:926
 msgid "Mark checkboxes to add charts with indicated data"
 msgstr ""
 
-#: plugins/StatisticsChart.py:922 plugins/StatisticsChart.py:927
+#: plugins/StatisticsChart.py:927 plugins/StatisticsChart.py:932
 msgid "Chart Selection"
 msgstr ""
 
-#: plugins/StatisticsChart.py:926
+#: plugins/StatisticsChart.py:931
 msgid "Note that both biological and adopted children are taken into account."
 msgstr ""
 
-#: plugins/StatisticsChart.py:957
+#: plugins/StatisticsChart.py:962
 msgid "Statistics Chart"
 msgstr ""
 
-#: plugins/StatisticsChart.py:961
+#: plugins/StatisticsChart.py:966
 msgid "Generates statistical bar and pie charts of the people in the database."
 msgstr ""
 
@@ -8775,31 +8855,31 @@ msgstr ""
 msgid "Exporting to CD copies all your data and media object files to the CD Creator. You may later burn the CD with this data, and that copy will be completely portable across different machines and binary architectures."
 msgstr ""
 
-#: plugins/WriteFtree.py:273
+#: plugins/WriteFtree.py:281
 msgid "_Web Family Tree"
 msgstr ""
 
-#: plugins/WriteFtree.py:274
+#: plugins/WriteFtree.py:282
 msgid "Web Family Tree format."
 msgstr ""
 
-#: plugins/WriteFtree.py:275
+#: plugins/WriteFtree.py:283
 msgid "Web Family Tree export options"
 msgstr ""
 
-#: plugins/WriteGeneWeb.py:218
+#: plugins/WriteGeneWeb.py:227
 msgid "No families matched by selected filter"
 msgstr ""
 
-#: plugins/WriteGeneWeb.py:577
+#: plugins/WriteGeneWeb.py:586
 msgid "G_eneWeb"
 msgstr ""
 
-#: plugins/WriteGeneWeb.py:578
+#: plugins/WriteGeneWeb.py:587
 msgid "GeneWeb is a web based genealogy program."
 msgstr ""
 
-#: plugins/WriteGeneWeb.py:579
+#: plugins/WriteGeneWeb.py:588
 msgid "GeneWeb export options"
 msgstr ""
 
diff --git a/gramps2/src/system_filters.xml b/gramps2/src/system_filters.xml
index c5bc6b331..ca376f71c 100644
--- a/gramps2/src/system_filters.xml
+++ b/gramps2/src/system_filters.xml
@@ -1,9 +1,3 @@
 
 
-  
-    
-    
-  
-  
-