Added support for marriage types, along with more translation information
svn: r60
This commit is contained in:
@@ -432,7 +432,7 @@ def on_save_clicked(obj):
|
||||
#
|
||||
#------------------------------------------------------------------------
|
||||
def get_description():
|
||||
return _("Creates a family group report, showing information on a set of parents and their children.")
|
||||
return _("Produces a detailed report on the selected person.")
|
||||
|
||||
def get_name():
|
||||
return _("Generate files/Individual Summary")
|
||||
|
||||
@@ -68,8 +68,7 @@ def ancestors_of(p1,list):
|
||||
#
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
def get_name(p1):
|
||||
|
||||
def get_name_obj(p1):
|
||||
if p1 == None:
|
||||
return None
|
||||
else:
|
||||
@@ -874,8 +873,8 @@ class Merge:
|
||||
f2 = p2.getMainFamily()
|
||||
|
||||
if f1 and f2:
|
||||
dad1 = get_name(f1.getFather())
|
||||
dad2 = get_name(f2.getFather())
|
||||
dad1 = get_name_obj(f1.getFather())
|
||||
dad2 = get_name_obj(f2.getFather())
|
||||
|
||||
value = self.name_match(dad1,dad2)
|
||||
|
||||
@@ -884,8 +883,8 @@ class Merge:
|
||||
|
||||
chance = chance + value
|
||||
|
||||
mom1 = get_name(f1.getMother())
|
||||
mom2 = get_name(f2.getMother())
|
||||
mom1 = get_name_obj(f1.getMother())
|
||||
mom2 = get_name_obj(f2.getMother())
|
||||
|
||||
value = self.name_match(mom1,mom2)
|
||||
if value == -1:
|
||||
@@ -902,8 +901,8 @@ class Merge:
|
||||
if father1 == father2:
|
||||
chance = chance + 1
|
||||
else:
|
||||
fname1 = get_name(father1)
|
||||
fname2 = get_name(father2)
|
||||
fname1 = get_name_obj(father1)
|
||||
fname2 = get_name_obj(father2)
|
||||
value = self.name_match(fname1,fname2)
|
||||
if value != -1:
|
||||
chance = chance + value
|
||||
@@ -914,8 +913,8 @@ class Merge:
|
||||
if mother1 == mother2:
|
||||
chance = chance + 1
|
||||
else:
|
||||
mname1 = get_name(mother1)
|
||||
mname2 = get_name(mother2)
|
||||
mname1 = get_name_obj(mother1)
|
||||
mname2 = get_name_obj(mother2)
|
||||
value = self.name_match(mname1,mname2)
|
||||
if value != -1:
|
||||
chance = chance + value
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
<widget>
|
||||
<class>GtkDialog</class>
|
||||
<name>filters</name>
|
||||
<title>Gramps - Event Correlation</title>
|
||||
<title>Gramps - Event Comparison</title>
|
||||
<type>GTK_WINDOW_DIALOG</type>
|
||||
<position>GTK_WIN_POS_NONE</position>
|
||||
<modal>False</modal>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
<widget>
|
||||
<class>GtkWindow</class>
|
||||
<name>status</name>
|
||||
<title>GEDCOM import status</title>
|
||||
<title>GEDCOM Import Status</title>
|
||||
<type>GTK_WINDOW_TOPLEVEL</type>
|
||||
<position>GTK_WIN_POS_CENTER</position>
|
||||
<modal>False</modal>
|
||||
@@ -92,7 +92,7 @@
|
||||
<widget>
|
||||
<class>GtkWindow</class>
|
||||
<name>gedcomImport</name>
|
||||
<title>Gramps - GEDCOM import</title>
|
||||
<title>Gramps - GEDCOM Import</title>
|
||||
<type>GTK_WINDOW_TOPLEVEL</type>
|
||||
<position>GTK_WIN_POS_CENTER</position>
|
||||
<modal>True</modal>
|
||||
|
||||
@@ -204,7 +204,7 @@
|
||||
<widget>
|
||||
<class>GtkLabel</class>
|
||||
<name>label8</name>
|
||||
<label>Birth date : </label>
|
||||
<label>Birth Date : </label>
|
||||
<justify>GTK_JUSTIFY_CENTER</justify>
|
||||
<wrap>False</wrap>
|
||||
<xalign>1</xalign>
|
||||
@@ -230,7 +230,7 @@
|
||||
<widget>
|
||||
<class>GtkLabel</class>
|
||||
<name>label12</name>
|
||||
<label>Death date : </label>
|
||||
<label>Death Date : </label>
|
||||
<justify>GTK_JUSTIFY_CENTER</justify>
|
||||
<wrap>False</wrap>
|
||||
<xalign>1</xalign>
|
||||
@@ -856,7 +856,7 @@
|
||||
<widget>
|
||||
<class>GtkLabel</class>
|
||||
<name>label13</name>
|
||||
<label>Death date : </label>
|
||||
<label>Death Date : </label>
|
||||
<justify>GTK_JUSTIFY_CENTER</justify>
|
||||
<wrap>False</wrap>
|
||||
<xalign>1</xalign>
|
||||
@@ -960,7 +960,7 @@
|
||||
<widget>
|
||||
<class>GtkLabel</class>
|
||||
<name>label9</name>
|
||||
<label>Birth date : </label>
|
||||
<label>Birth Date : </label>
|
||||
<justify>GTK_JUSTIFY_CENTER</justify>
|
||||
<wrap>False</wrap>
|
||||
<xalign>1</xalign>
|
||||
@@ -1579,7 +1579,7 @@
|
||||
<widget>
|
||||
<class>GtkLabel</class>
|
||||
<name>label44</name>
|
||||
<label>Please be patient. This may take a while.</label>
|
||||
<label>Please be patient. This may take a while.</label>
|
||||
<justify>GTK_JUSTIFY_CENTER</justify>
|
||||
<wrap>True</wrap>
|
||||
<xalign>0.5</xalign>
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
<widget>
|
||||
<class>GtkButton</class>
|
||||
<name>button3</name>
|
||||
<tooltip>Close window</tooltip>
|
||||
<tooltip>Close Window</tooltip>
|
||||
<can_default>True</can_default>
|
||||
<can_focus>True</can_focus>
|
||||
<signal>
|
||||
|
||||
Reference in New Issue
Block a user