#1218624 - Interactive tree event sequence - dev / do not abbreviate chart labels

author: fisharebest <fisharebest@gmail.com> 2013-08-30 14:50:12 +0100
committer: fisharebest <fisharebest@gmail.com> 2013-08-30 14:50:12 +0100
commit: ddb2811bbf06dd8f9870a11534e059d7290d016f (patch)
tree: a632425ea635056b772754cf58928b2c370bdfb8 /modules_v3
parent: 2a638691b1be77284f6032804ecc71b1957cec59 (diff)
download: webtrees-ddb2811bbf06dd8f9870a11534e059d7290d016f.tar.gz
webtrees-ddb2811bbf06dd8f9870a11534e059d7290d016f.tar.bz2
webtrees-ddb2811bbf06dd8f9870a11534e059d7290d016f.zip
18 files changed, 318 insertions, 321 deletions
diff --git a/modules_v3/GEDFact_assistant/CENS_ctrl.php b/modules_v3/GEDFact_assistant/CENS_ctrl.php
index 2a799b8299..e33548bff4 100644
--- a/modules_v3/GEDFact_assistant/CENS_ctrl.php
+++ b/modules_v3/GEDFact_assistant/CENS_ctrl.php
@@ -58,7 +58,7 @@ echo '</h3>';
 		<?php
 
 global $tabno, $linkToID, $SEARCH_SPIDER;
-global $SHOW_AGE_DIFF, $GEDCOM, $ABBREVIATE_CHART_LABELS;
+global $SHOW_AGE_DIFF, $GEDCOM;
 global $show_full, $famid;
 echo '<link type="text/css" href="', WT_STATIC_URL, WT_MODULES_DIR, 'GEDFact_assistant/css/cens_style.css" rel="stylesheet">';
 
diff --git a/modules_v3/GEDFact_assistant/MEDIA_ctrl.php b/modules_v3/GEDFact_assistant/MEDIA_ctrl.php
index 3e86845bc6..81a70c9b28 100644
--- a/modules_v3/GEDFact_assistant/MEDIA_ctrl.php
+++ b/modules_v3/GEDFact_assistant/MEDIA_ctrl.php
@@ -29,7 +29,7 @@ echo '<link href="'.WT_STATIC_URL.WT_MODULES_DIR.'GEDFact_assistant/css/gf_style
 
 global $tabno, $linkToID, $SEARCH_SPIDER;
 global $SHOW_AGE_DIFF;
-global $GEDCOM, $ABBREVIATE_CHART_LABELS;
+global $GEDCOM;
 global $show_full;
 global $famid, $censyear, $censdate;
 
diff --git a/modules_v3/GEDFact_assistant/_CENS/census_3_search_add.php b/modules_v3/GEDFact_assistant/_CENS/census_3_search_add.php
index cae6b2f4c1..eb48c4e62a 100644
--- a/modules_v3/GEDFact_assistant/_CENS/census_3_search_add.php
+++ b/modules_v3/GEDFact_assistant/_CENS/census_3_search_add.php
@@ -1327,7 +1327,6 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1",
 	global $HIDE_LIVE_PEOPLE, $SHOW_LIVING_NAMES, $SCRIPT_NAME;
 	global $SHOW_HIGHLIGHT_IMAGES, $bwidth, $bheight, $PEDIGREE_FULL_DETAILS, $SHOW_PEDIGREE_PLACES;
 	global $TEXT_DIRECTION, $DEFAULT_PEDIGREE_GENERATIONS, $OLD_PGENS, $talloffset, $PEDIGREE_LAYOUT, $MEDIA_DIRECTORY;
-	global $ABBREVIATE_CHART_LABELS;
 	global $chart_style, $box_width, $generations, $show_spouse, $show_full;
 	global $CHART_BOX_TAGS, $SHOW_LDS_AT_GLANCE, $PEDIGREE_SHOW_GENDER;
 	global $SEARCH_SPIDER;
diff --git a/modules_v3/GEDFact_assistant/_MEDIA/media_1_ctrl.php b/modules_v3/GEDFact_assistant/_MEDIA/media_1_ctrl.php
index c50c731e28..b582cff3b6 100644
--- a/modules_v3/GEDFact_assistant/_MEDIA/media_1_ctrl.php
+++ b/modules_v3/GEDFact_assistant/_MEDIA/media_1_ctrl.php
@@ -540,7 +540,6 @@ function print_pedigree_person_nav2($pid) {
 	global $HIDE_LIVE_PEOPLE, $SHOW_LIVING_NAMES;
 	global $SHOW_HIGHLIGHT_IMAGES, $bwidth, $bheight, $PEDIGREE_FULL_DETAILS, $SHOW_PEDIGREE_PLACES;
 	global $TEXT_DIRECTION, $DEFAULT_PEDIGREE_GENERATIONS, $OLD_PGENS, $talloffset, $PEDIGREE_LAYOUT, $MEDIA_DIRECTORY;
-	global $ABBREVIATE_CHART_LABELS;
 	global $chart_style, $box_width, $generations, $show_spouse, $show_full;
 	global $CHART_BOX_TAGS, $SHOW_LDS_AT_GLANCE, $PEDIGREE_SHOW_GENDER;
 	global $SEARCH_SPIDER;
diff --git a/modules_v3/GEDFact_assistant/module.php b/modules_v3/GEDFact_assistant/module.php
index 191c822552..34f7ab5f4b 100644
--- a/modules_v3/GEDFact_assistant/module.php
+++ b/modules_v3/GEDFact_assistant/module.php
@@ -57,7 +57,7 @@ class GEDFact_assistant_WT_Module extends WT_Module {
 	}
 
 	private static function media_3_find() {
-		global $MEDIA_DIRECTORY, $ABBREVIATE_CHART_LABELS;
+		global $MEDIA_DIRECTORY;
 
 		$controller=new WT_Controller_Simple();
 		
diff --git a/modules_v3/ahnentafel_report/report.xml b/modules_v3/ahnentafel_report/report.xml
index 54519206d8..778f4a6a48 100644
--- a/modules_v3/ahnentafel_report/report.xml
+++ b/modules_v3/ahnentafel_report/report.xml
@@ -444,13 +444,13 @@
 												<Text style="label1" > <br /></Text>
 												<!-- Start BIRT -->
 												<Gedcom id="BIRT">
-													<Text style="label1" > <varLetter var="BIRT" /> <GedcomValue tag="DATE" level="2"/> <GedcomValue tag="PLAC" level="2"/> <br /></Text>
+													<Text style="label1" > <var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="DATE" level="2"/> <GedcomValue tag="PLAC" level="2"/> <br /></Text>
 												</Gedcom>
 												<if condition="@SEX=='M'"><SetVar name="gender" value="male" /></if>
 												<if condition="@SEX=='F'"><SetVar name="gender" value="female" /></if>
 												<RepeatTag tag="FAMS">
 													<Gedcom id="@FAMS">
-														<Text style="label1"> <varLetter var="MARR" /> </Text>
+														<Text style="label1"> <var var="WT_I18N::translate('Marriage')" /> </Text>
 														<if condition="$gender=='male'"><Text style="namech"><GetPersonName id="@WIFE" /></Text></if>
 														<if condition="$gender=='female'"><Text style="namech"><GetPersonName id="@HUSB" /></Text></if>
 														<Text style="label1"><Gedcom id="MARR"><if condition="@DATE!=''"> <GedcomValue tag="DATE" level="2" /></if><if condition="@PLAC!=''"> <GedcomValue tag="PLAC" level="2" /></if></Gedcom> <br /></Text>
@@ -458,7 +458,7 @@
 												</RepeatTag>
 												<!-- End BIRT start DEAT --> 
 												<Gedcom id="DEAT">
-													<Text style="label1"> <varLetter var="DEAT" /> <GedcomValue tag="DATE" level="2"/> <GedcomValue tag="PLAC" level="2"/> <br /></Text>
+													<Text style="label1"> <var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DATE" level="2"/> <GedcomValue tag="PLAC" level="2"/> <br /></Text>
 												</Gedcom>
 											</TextBox>
 										</Gedcom>
diff --git a/modules_v3/cemetery_report/report.xml b/modules_v3/cemetery_report/report.xml
index 43c904b12b..75e6ab1d84 100644
--- a/modules_v3/cemetery_report/report.xml
+++ b/modules_v3/cemetery_report/report.xml
@@ -4,7 +4,7 @@
 	<Description><var var="WT_I18N::translate('A report of individuals who were buried in a given place.')" /></Description>
 	<Input name="deathplace" lookup="PLAC" type="text"><var var="WT_I18N::translate('Burial Place contains')" /> </Input>
 	<Input name="sortby" type="select" default="NAME" options="NAME=>WT_I18N::translate('sort by name')|DEAT:DATE=>WT_I18N::translate('sort by date of death')"><var var="WT_I18N::translate('Sort order')" /></Input>
-	<Input name="adlist" type="select" default="none" options="none=>WT_I18N::translate('None')|_MARNM=>WT_Gedcom_Tag::getLabel('_MARNM')|HUSB=>WT_I18N::translate('Husband')"><var var="WT_I18N::translate('Name List')" /></Input>
+	<Input name="adlist" type="select" default="none" options="none=>WT_I18N::translate('None')|_MARNM=>WT_I18N::translate('('Married Name')|HUSB=>WT_I18N::translate('Husband')"><var var="WT_I18N::translate('Name List')" /></Input>
 	<Input name="pageSize" type="select" default="A4" options="letter=>WT_I18N::translate_c('paper size','Letter')|A3=>WT_I18N::translate_c('paper size', 'A3')|A4=>WT_I18N::translate_c('paper size','A4')|legal=>WT_I18N::translate_c('paper size','Legal')"><var var="WT_I18N::translate('Page size')" /></Input>
 	<Input name="fonts" type="select" default="dejavusans" options="arialunicid0=>WT_I18N::translate_c('font name', 'Arial')|dejavusans=>WT_I18N::translate_c('font name', 'DejaVu')|helvetica=>WT_I18N::translate_c('font name', 'Helvetica')"><var var="WT_I18N::translate('Font')"/></Input>
 
@@ -41,7 +41,7 @@
 			<SetVar name="fill" value="" />
 			<if condition="$sortby=='DEAT:DATE'"><SetVar name="fill" value="#AAAAAA" /></if>
 			<TextBox bgcolor="$fill" border="1" width="$datewidth">
-				<Text style="label"><var var="WT_Gedcom_Tag::getLabel('DEAT:DATE')" /></Text>
+				<Text style="label"><var var="WT_I18N::translate('Date of death')" /></Text>
 			</TextBox>
 			<!-- should print and sort by burial date -->
 
diff --git a/modules_v3/change_report/report.xml b/modules_v3/change_report/report.xml
index dc76deaa59..9b95c2b9d6 100644
--- a/modules_v3/change_report/report.xml
+++ b/modules_v3/change_report/report.xml
@@ -112,7 +112,7 @@
 				</TextBox>
 
 				<TextBox height="12" width="$datewidth">
-					<Text style="text"><varLetter var="BIRT" />: <GedcomValue tag="BIRT:DATE" /><br /><varLetter var="DEAT" />: <GedcomValue tag="DEAT:DATE" /></Text>
+					<Text style="text"><var var="WT_I18N::translate('Birth')" />: <GedcomValue tag="BIRT:DATE" /><br /><var var="WT_I18N::translate('Death')" />: <GedcomValue tag="DEAT:DATE" /></Text>
 				</TextBox>
 
 				<TextBox height="12" newline="1">
diff --git a/modules_v3/death_report/report.xml b/modules_v3/death_report/report.xml
index 54e3c36084..ac596d1239 100644
--- a/modules_v3/death_report/report.xml
+++ b/modules_v3/death_report/report.xml
@@ -7,7 +7,7 @@
 	<Input name="deathdate1" lookup="DATE" type="text"><var var="WT_I18N::translate('Death Date range start')" /></Input>
 	<Input name="deathdate2" lookup="DATE" type="text"><var var="WT_I18N::translate('Death Date range end')" /></Input>
 	<Input name="sortby" type="select" default="NAME" options="NAME=>WT_I18N::translate('sort by name')|DEAT:DATE=>WT_I18N::translate('sort by date of death')"><var var="WT_I18N::translate('Sort order')" /></Input>
-	<Input name="adlist" type="select" default="none" options="none=>WT_I18N::translate('None')|_MARNM=>WT_Gedcom_Tag::getLabel('_MARNM')|HUSB=>WT_I18N::translate('Husband')"><var var="WT_I18N::translate('Name List')" /></Input>
+	<Input name="adlist" type="select" default="none" options="none=>WT_I18N::translate('None')|_MARNM=>WT_I18N::translate('Married Name')|HUSB=>WT_I18N::translate('Husband')"><var var="WT_I18N::translate('Name List')" /></Input>
 	<Input name="pageSize" type="select" default="A4" options="letter=>WT_I18N::translate_c('paper size','Letter')|A3=>WT_I18N::translate_c('paper size', 'A3')|A4=>WT_I18N::translate_c('paper size','A4')|legal=>WT_I18N::translate_c('paper size','Legal')"><var var="WT_I18N::translate('Page size')" /></Input>
 	<Input name="fonts" type="select" default="dejavusans" options="arialunicid0=>WT_I18N::translate_c('font name', 'Arial')|dejavusans=>WT_I18N::translate_c('font name', 'DejaVu')|helvetica=>WT_I18N::translate_c('font name', 'Helvetica')"><var var="WT_I18N::translate('Font')"/></Input>
 
diff --git a/modules_v3/descendancy_report/report.xml b/modules_v3/descendancy_report/report.xml
index 60a8b10c0d..66734d452c 100644
--- a/modules_v3/descendancy_report/report.xml
+++ b/modules_v3/descendancy_report/report.xml
@@ -555,7 +555,7 @@
 												<Text style="label1"> </Text> <!-- @@ -->
 											</if>
 											<Gedcom id="BIRT">
-												<Text style="label1"> <varLetter var="BIRT" />: <GedcomValue tag="DATE" level="2"/>  <GedcomValue tag="PLAC" level="2"/></Text>
+												<Text style="label1"> <var var="WT_I18N::translate('Birth')" />: <GedcomValue tag="DATE" level="2"/>  <GedcomValue tag="PLAC" level="2"/></Text>
 											</Gedcom>
 											<SetVar name="showMarraige" value="T" />
 											<RepeatTag tag="FAMS">
@@ -572,7 +572,7 @@
 												</if>
 												<RepeatTag tag="FAMS">
 													<Gedcom id="@FAMS">
-														<Text style="label1"> <varLetter var="MARR" />: </Text>
+														<Text style="label1"> <var var="WT_I18N::translate('Marriage')" />: </Text>
 														<if condition="$gender=='male'">
 															<Text style="name"><GetPersonName id="@WIFE" /></Text>
 														</if>
@@ -591,7 +591,7 @@
 												</RepeatTag>
 											</if>
 											<Gedcom id="DEAT">
-												<Text style="label1"> <varLetter var="DEAT" />: <GedcomValue tag="DATE" level="2"/> <GedcomValue tag="PLAC" level="2"/></Text>
+												<Text style="label1"> <var var="WT_I18N::translate('Death')" />: <GedcomValue tag="DATE" level="2"/> <GedcomValue tag="PLAC" level="2"/></Text>
 											</Gedcom>
 										</TextBox>
 									</Gedcom>
diff --git a/modules_v3/fact_sources/report.xml b/modules_v3/fact_sources/report.xml
index 810dd9b2c7..7e38c6bc3a 100644
--- a/modules_v3/fact_sources/report.xml
+++ b/modules_v3/fact_sources/report.xml
@@ -62,13 +62,13 @@
 			<if condition="$sortby=='BIRT:DATE'">
 				<SetVar name="fill" value="#AAAAAA" />
 			</if>
-			<Cell bgcolor="$fill" border="1" style="list_label" width="$datebirth"><var var="WT_Gedcom_Tag::getLabel('BIRT:DATE')" /></Cell>
+			<Cell bgcolor="$fill" border="1" style="list_label" width="$datebirth"><var var="WT_I18N::translate('Date of birth')" /></Cell>
 			<!-- Name of the fact that contains the source -->
 			<Cell border="1" style="list_label" width="$fact"><var var="WT_I18N::translate('Event')" /></Cell>
 			<!-- Date of the fact -->
-			<Cell border="1" style="list_label" width="$dateevent"><var var="WT_Gedcom_Tag::getLabel('DATE')" /></Cell>
+			<Cell border="1" style="list_label" width="$dateevent"><var var="WT_I18N::translate('Date')" /></Cell>
 			<!-- Detailed source text -->
-			<Cell border="1" newline="1" style="list_label"><var var="WT_Gedcom_Tag::getLabel('SOUR:PAGE')" /></Cell>
+			<Cell border="1" newline="1" style="list_label"><var var="WT_I18N::translate('Citation details')" /></Cell>
 			<TextBox height="$vspace" newline="1" padding="0"/>
 
 			<!-- Individual List -->
@@ -153,9 +153,9 @@
 			<!-- Name of the fact that contains the source -->
 			<Cell border="1" style="list_label" width="$fact"><var var="WT_I18N::translate('Event')" /></Cell>
 			<!-- Date of the fact -->
-			<Cell bgcolor="#AAAAAA" border="1" style="list_label" width="$dateevent"><var var="WT_Gedcom_Tag::getLabel('DATE')" /></Cell>
+			<Cell bgcolor="#AAAAAA" border="1" style="list_label" width="$dateevent"><var var="WT_I18N::translate('Date')" /></Cell>
 			<!-- Detailed source text -->
-			<Cell border="1" newline="1" style="list_label"><var var="WT_Gedcom_Tag::getLabel('SOUR:PAGE')" /></Cell>
+			<Cell border="1" newline="1" style="list_label"><var var="WT_I18N::translate('Citation_details')" /></Cell>
 
 			<!-- Family List -->
 			<TextBox height="$vspace" newline="1" padding="0"/>
@@ -266,12 +266,12 @@
 			<if condition="$sortby=='BIRT:DATE'">
 				<SetVar name="fill" value="#AAAAAA" />
 			</if>
-			<Cell bgcolor="$fill" border="1" style="list_label" width="$fact"><var var="WT_Gedcom_Tag::getLabel('BIRT:DATE')" /></Cell>
-			<Cell border="1" style="list_label" width="$dateevent"><var var="WT_Gedcom_Tag::getLabel('BIRT:PLAC')" /></Cell>
-			<Cell border="1" style="list_label" width="$fact"><var var="WT_Gedcom_Tag::getLabel('DEAT:DATE')" /></Cell>
-			<Cell border="1" style="list_label" width="$dateevent"><var var="WT_Gedcom_Tag::getLabel('DEAT:PLAC')" /></Cell>
+			<Cell bgcolor="$fill" border="1" style="list_label" width="$fact"><var var="WT_I18N::translate('Date of birth')" /></Cell>
+			<Cell border="1" style="list_label" width="$dateevent"><var var="WT_I18N::translate('Place of birth')" /></Cell>
+			<Cell border="1" style="list_label" width="$fact"><var var="WT_I18N::translate('Date of death')" /></Cell>
+			<Cell border="1" style="list_label" width="$dateevent"><var var="WT_I18N::translate('Place of death')" /></Cell>
 			<!-- Detailed source text -->
-			<Cell border="1" newline="1" style="list_label"><var var="WT_Gedcom_Tag::getLabel('SOUR:PAGE')" /></Cell>
+			<Cell border="1" newline="1" style="list_label"><var var="WT_I18N::translate('Citation details')" /></Cell>
 			<TextBox height="$vspace" newline="1" padding="0"/>
 
 			<!-- Individual List -->
@@ -313,11 +313,11 @@
 			<!-- Family Name -->
 			<Cell border="1" style="list_label" width="$namefam"><var var="WT_I18N::translate('Name')" /></Cell>
 			<!-- Name of the fact that contains the source -->
-			<Cell bgcolor="#AAAAAA" border="1" style="list_label" width="$dateevent"><var var="WT_Gedcom_Tag::getLabel('MARR:DATE')" /></Cell>
+			<Cell bgcolor="#AAAAAA" border="1" style="list_label" width="$dateevent"><var var="WT_I18N::translate('Date of marriage')" /></Cell>
 			<!-- Date of the fact -->
-			<Cell border="1" style="list_label" width="$fact"><var var="WT_Gedcom_Tag::getLabel('MARR:PLAC')" /></Cell>
+			<Cell border="1" style="list_label" width="$fact"><var var="WT_I18N::translate('Place of marriage')" /></Cell>
 			<!-- Detailed source text -->
-			<Cell border="1" newline="1" style="list_label"><var var="WT_Gedcom_Tag::getLabel('SOUR:PAGE')" /></Cell>
+			<Cell border="1" newline="1" style="list_label"><var var="WT_I18N::translate('Citation details')" /></Cell>
 
 			<!-- Family List -->
 			<TextBox height="$vspace" newline="1" padding="0"/>
diff --git a/modules_v3/family_group_report/report.xml b/modules_v3/family_group_report/report.xml
index 458b77b6fe..7345907e19 100644
--- a/modules_v3/family_group_report/report.xml
+++ b/modules_v3/family_group_report/report.xml
@@ -306,7 +306,7 @@
 					<if condition="$blanks==1 or @CREM:DATE!='' or @CREM:PLAC!=''">
 						<!-- print Cremation -->
 						<TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth">
-							<Text color="$tcolor" style="fact"><var var="WT_Gedcom_Tag::getLabel('CREM')" />  </Text>
+							<Text color="$tcolor" style="fact"><var var="WT_I18N::translate('Cremation')" />  </Text>
 							<Text color="$tcolor" style="text"><GedcomValue tag="CREM:DATE" /> </Text>
 							<if condition="$sources==1">
 								<RepeatTag tag="CREM:SOUR">
@@ -333,7 +333,7 @@
 						<!-- Look for Level 2 CREM subordinate to BURI (should have been at Level 1) -->
 						<if condition="@BURI:CREM!='' and $level1CREM!=1">
 							<TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth">
-								<Text color="$tcolor" style="fact"><var var="WT_Gedcom_Tag::getLabel('CREM')" />  </Text>
+								<Text color="$tcolor" style="fact"><var var="WT_I18N::translate('Cremation')" />  </Text>
 								<Text color="$tcolor" style="text"> </Text>
 							</TextBox>
 							<TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1">
@@ -461,14 +461,14 @@
 							<Text color="$tcolor" style="fact"><var var="WT_I18N::translate('Father')" />  </Text>
 							<Text color="$tcolor" style="name"><GetPersonName id="@HUSB" /></Text>
 							<Gedcom id="@HUSB">
-								<Text color="$tcolor" style="text"> (<varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE"/><Gedcom id="DEAT"> - <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE"/></Gedcom>)</Text>
+								<Text color="$tcolor" style="text"> (<var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE"/><Gedcom id="DEAT"> - <var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE"/></Gedcom>)</Text>
 							</Gedcom>
 						</TextBox>
 						<TextBox bgcolor="$femalebox_bgcolor" border="1" left="15" width="$width1" newline="1">
 							<Text color="$tcolor" style="fact"><var var="WT_I18N::translate('Mother')" />  </Text>
 							<Text color="$tcolor" style="name"><GetPersonName id="@WIFE" /></Text>
 							<Gedcom id="@WIFE">
-								<Text color="$tcolor" style="text"> (<varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE"/><Gedcom id="DEAT"> - <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE"/></Gedcom>)</Text>
+								<Text color="$tcolor" style="text"> (<var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE"/><Gedcom id="DEAT"> - <var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE"/></Gedcom>)</Text>
 							</Gedcom>
 						</TextBox>
 					</Gedcom>
@@ -657,7 +657,7 @@
 					<if condition="$blanks==1 or @CREM:DATE!='' or @CREM:PLAC!=''">
 						<!-- print Cremation -->
 						<TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth">
-							<Text color="$tcolor" style="fact"><var var="WT_Gedcom_Tag::getLabel('CREM')" />  </Text>
+							<Text color="$tcolor" style="fact"><var var="WT_I18N::translate('Cremation')" />  </Text>
 							<Text color="$tcolor" style="text"><GedcomValue tag="CREM:DATE" /> </Text>
 							<if condition="$sources==1">
 								<RepeatTag tag="CREM:SOUR">
@@ -684,7 +684,7 @@
 						<!-- Look for Level 2 CREM subordinate to BURI (should have been at Level 1) -->
 						<if condition="@BURI:CREM!='' and $level1CREM!=1">
 							<TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth">
-								<Text color="$tcolor" style="fact"><var var="WT_Gedcom_Tag::getLabel('CREM')" />  </Text>
+								<Text color="$tcolor" style="fact"><var var="WT_I18N::translate('Cremation')" />  </Text>
 								<Text color="$tcolor" style="text"> </Text>
 							</TextBox>
 							<TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1">
@@ -721,14 +721,14 @@
 							<Text color="$tcolor" style="fact"><var var="WT_I18N::translate('Father')" />  </Text>
 							<Text color="$tcolor" style="name"><GetPersonName id="@HUSB" /></Text>
 							<Gedcom id="@HUSB">
-								<Text color="$tcolor" style="text"> (<varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE"/><Gedcom id="DEAT"> - <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE"/></Gedcom>)</Text>
+								<Text color="$tcolor" style="text"> (<var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE"/><Gedcom id="DEAT"> - <var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE"/></Gedcom>)</Text>
 							</Gedcom>
 						</TextBox>
 						<TextBox bgcolor="$femalebox_bgcolor" border="1" left="15" width="$width1" newline="1">
 							<Text color="$tcolor" style="fact"><var var="WT_I18N::translate('Mother')" />  </Text>
 							<Text color="$tcolor" style="name"><GetPersonName id="@WIFE" /></Text>
 							<Gedcom id="@WIFE">
-								<Text color="$tcolor" style="text"> (<varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE"/><Gedcom id="DEAT"> - <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE"/></Gedcom>)</Text>
+								<Text color="$tcolor" style="text"> (<var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE"/><Gedcom id="DEAT"> - <var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE"/></Gedcom>)</Text>
 							</Gedcom>
 						</TextBox>
 					</Gedcom>
@@ -998,7 +998,7 @@
 						<if condition="$blanks==1 or @CREM:DATE!='' or @CREM:PLAC!=''">
 							<!-- print Cremation -->
 							<TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth">
-								<Text color="$tcolor" style="fact"><var var="WT_Gedcom_Tag::getLabel('CREM')" />  </Text>
+								<Text color="$tcolor" style="fact"><var var="WT_I18N::translate('Cremation')" />  </Text>
 								<Text color="$tcolor" style="text"><GedcomValue tag="CREM:DATE" /> </Text>
 								<if condition="$sources==1">
 									<RepeatTag tag="CREM:SOUR">
@@ -1025,7 +1025,7 @@
 							<!-- Look for Level 2 CREM subordinate to BURI (should have been at Level 1) -->
 							<if condition="@BURI:CREM!='' and $level1CREM!=1">
 								<TextBox bgcolor="$factbox_bgcolor" border="1" left="15" width="$dwidth">
-									<Text color="$tcolor" style="fact"><var var="WT_Gedcom_Tag::getLabel('CREM')" />  </Text>
+									<Text color="$tcolor" style="fact"><var var="WT_I18N::translate('Cremation')" />  </Text>
 									<Text color="$tcolor" style="text"> </Text>
 								</TextBox>
 								<TextBox bgcolor="$factbox_bgcolor" border="1" width="$width2" newline="1">
@@ -1066,7 +1066,7 @@
 										<Text color="$tcolor" style="fact"><var var="WT_I18N::translate('Wife')" />  </Text>
 										<Text color="$tcolor" style="name"><GetPersonName id="@WIFE" /></Text>
 										<Gedcom id="@WIFE">
-											<Text color="$tcolor" style="text"> (<varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE"/><Gedcom id="DEAT"> - <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE"/></Gedcom>)</Text>
+											<Text color="$tcolor" style="text"> (<var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE"/><Gedcom id="DEAT"> - <var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE"/></Gedcom>)</Text>
 										</Gedcom>
 									</TextBox>
 								</if>
@@ -1075,7 +1075,7 @@
 										<Text color="$tcolor" style="fact"><var var="WT_I18N::translate('Husband')" />  </Text>
 										<Text color="$tcolor" style="name"><GetPersonName id="@HUSB" /></Text>
 										<Gedcom id="@HUSB">
-											<Text color="$tcolor" style="text"> (<varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE"/><Gedcom id="DEAT"> - <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE"/></Gedcom>)</Text>
+											<Text color="$tcolor" style="text"> (<var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE"/><Gedcom id="DEAT"> - <var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE"/></Gedcom>)</Text>
 										</Gedcom>
 									</TextBox>
 								</if>
diff --git a/modules_v3/missing_facts_report/report.xml b/modules_v3/missing_facts_report/report.xml
index cb2ee6aac0..08a71036b5 100644
--- a/modules_v3/missing_facts_report/report.xml
+++ b/modules_v3/missing_facts_report/report.xml
@@ -9,18 +9,18 @@
 	<Input name="fonts" type="select" default="dejavusans" options="arialunicid0=>WT_I18N::translate_c('font name', 'Arial')|dejavusans=>WT_I18N::translate_c('font name', 'DejaVu')|helvetica=>WT_I18N::translate_c('font name', 'Helvetica')"><var var="WT_I18N::translate('Font')"/></Input>
 	
 	<Input name="fsour" type="checkbox" default="0"><var var="WT_I18N::translate('Sources to the events')" /></Input>
-	<Input name="fbirt" type="checkbox" default="1"><var var="WT_Gedcom_Tag::getLabel('BIRT')"/></Input>
-	<Input name="fbapm" type="checkbox" default="0"><var var="WT_Gedcom_Tag::getLabel('BAPM')"/> / <var var="WT_Gedcom_Tag::getLabel('CHR')"/></Input>
-	<Input name="fbarm" type="checkbox" default="0"><var var="WT_Gedcom_Tag::getLabel('BARM')"/></Input>
-	<Input name="fbasm" type="checkbox" default="0"><var var="WT_Gedcom_Tag::getLabel('BASM')"/></Input>
-	<Input name="fconf" type="checkbox" default="0"><var var="WT_Gedcom_Tag::getLabel('CONF')"/></Input>
-	<Input name="fenga" type="checkbox" default="0"><var var="WT_Gedcom_Tag::getLabel('ENGA')"/></Input>
-	<Input name="ffcom" type="checkbox" default="0"><var var="WT_Gedcom_Tag::getLabel('FCOM')"/></Input>
-	<Input name="fmarb" type="checkbox" default="0"><var var="WT_Gedcom_Tag::getLabel('MARB')"/></Input>
-	<Input name="fmarr" type="checkbox" default="0"><var var="WT_Gedcom_Tag::getLabel('MARR')"/></Input>
-	<Input name="fdeat" type="checkbox" default="1"><var var="WT_Gedcom_Tag::getLabel('DEAT')"/></Input>
-	<Input name="fburi" type="checkbox" default="0"><var var="WT_Gedcom_Tag::getLabel('BURI')"/></Input>
-	<Input name="freli" type="checkbox" default="0"><var var="WT_Gedcom_Tag::getLabel('RELI')"/></Input>
+	<Input name="fbirt" type="checkbox" default="1"><var var="WT_I18N::translate('Birth')"/></Input>
+	<Input name="fbapm" type="checkbox" default="0"><var var="WT_I18N::translate('Baptism')"/> / <var var="WT_I18N::translate('Christening')"/></Input>
+	<Input name="fbarm" type="checkbox" default="0"><var var="WT_I18N::translate('Bar mitzvah')"/></Input>
+	<Input name="fbasm" type="checkbox" default="0"><var var="WT_I18N::translate('Bat mitzvah')"/></Input>
+	<Input name="fconf" type="checkbox" default="0"><var var="WT_I18N::translate('Confirmation')"/></Input>
+	<Input name="fenga" type="checkbox" default="0"><var var="WT_I18N::translate('Engagement')"/></Input>
+	<Input name="ffcom" type="checkbox" default="0"><var var="WT_I18N::translate('First communion')"/></Input>
+	<Input name="fmarb" type="checkbox" default="0"><var var="WT_I18N::translate('Marriage banns')"/></Input>
+	<Input name="fmarr" type="checkbox" default="0"><var var="WT_I18N::translate('Marriage')"/></Input>
+	<Input name="fdeat" type="checkbox" default="1"><var var="WT_I18N::translate('Death')"/></Input>
+	<Input name="fburi" type="checkbox" default="0"><var var="WT_I18N::translate('Burial')"/></Input>
+	<Input name="freli" type="checkbox" default="0"><var var="WT_I18N::translate('Religion')"/></Input>
 
 	<!-- Header -->
 	<Style name="header" font="$fonts" size="18" style="b"/>
@@ -74,7 +74,7 @@
 							<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 							<SetVar name="printname" value="1" />
 						</if>
-						<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('BIRT:DATE')" /></Cell>
+						<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Date of birth')" /></Cell>
 					</if>
 					<if condition="@BIRT:PLAC==''">
 						<!-- Missing event counter -->
@@ -86,7 +86,7 @@
 							<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 							<SetVar name="printname" value="1" />
 						</if>
-						<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('BIRT:PLAC')" /></Cell>
+						<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Place of birth')" /></Cell>
 					</if>
 					<if condition="$fsour=='1'">
 						<!-- Total Event Counter -->
@@ -101,7 +101,7 @@
 								<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 								<SetVar name="printname" value="1" />
 							</if>
-							<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('BIRT:SOUR')" /></Cell>
+							<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Source')" /></Cell>
 						</if>
 					</if>
 				</if>
@@ -122,7 +122,7 @@
 								<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 								<SetVar name="printname" value="1" />
 							</if>
-							<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('BAPM:DATE')" /></Cell>
+							<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Date of baptism')" /></Cell>
 						</if>
 						<if condition="@BAPM:PLAC==''">
 							<SetVar name="nrmissingevent" value="$nrmissingevent + 1" />
@@ -133,7 +133,7 @@
 								<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 								<SetVar name="printname" value="1" />
 							</if>
-							<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('BAPM:PLAC')" /></Cell>
+							<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Place of baptism')" /></Cell>
 						</if>
 						<if condition="$fsour=='1'">
 							<SetVar name="nrevent" value="$nrevent + 1" />
@@ -146,7 +146,7 @@
 									<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 									<SetVar name="printname" value="1" />
 								</if>
-								<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('BAPM:SOUR')" /></Cell>
+								<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Source')" /></Cell>
 							</if>
 						</if>
 						<SetVar name="printbapm" value="1" />
@@ -163,7 +163,7 @@
 								<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 								<SetVar name="printname" value="1" />
 							</if>
-							<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('CHR:DATE')" /></Cell>
+							<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Date of christening')" /></Cell>
 						</if>
 						<if condition="@CHR:PLAC==''">
 							<SetVar name="nrmissingevent" value="$nrmissingevent + 1" />
@@ -174,7 +174,7 @@
 								<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 								<SetVar name="printname" value="1" />
 							</if>
-							<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('CHR:PLAC')" /></Cell>
+							<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Place of christening')" /></Cell>
 						</if>
 						<if condition="$fsour=='1'">
 							<SetVar name="nrevent" value="$nrevent + 1" />
@@ -187,7 +187,7 @@
 									<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 									<SetVar name="printname" value="1" />
 								</if>
-								<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('CHR:SOUR')" /></Cell>
+								<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Source')" /></Cell>
 							</if>
 						</if>
 					</if>
@@ -205,7 +205,7 @@
 							<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 							<SetVar name="printname" value="1" />
 						</if>
-						<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('BARM:DATE')" /></Cell>
+						<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Date of bar mitzvah')" /></Cell>
 					</if>
 					<if condition="@BARM:PLAC==''">
 						<SetVar name="nrmissingevent" value="$nrmissingevent + 1" />
@@ -216,7 +216,7 @@
 							<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 							<SetVar name="printname" value="1" />
 						</if>
-						<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('BARM:PLAC')" /></Cell>
+						<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Place of bar mitzvah')" /></Cell>
 					</if>
 					<if condition="$fsour=='1'">
 						<SetVar name="nrevent" value="$nrevent + 1" />
@@ -229,7 +229,7 @@
 								<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 								<SetVar name="printname" value="1" />
 							</if>
-							<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('BARM:SOUR')" /></Cell>
+							<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Source')" /></Cell>
 						</if>
 					</if>
 				</if>
@@ -246,7 +246,7 @@
 							<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 							<SetVar name="printname" value="1" />
 						</if>
-						<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('BASM:DATE')" /></Cell>
+						<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Date of bat mitzvah')" /></Cell>
 					</if>
 					<if condition="@BASM:PLAC==''">
 						<SetVar name="nrmissingevent" value="$nrmissingevent + 1" />
@@ -257,7 +257,7 @@
 							<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 							<SetVar name="printname" value="1" />
 						</if>
-						<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('BASM:PLAC')" /></Cell>
+						<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Place of bat mitzvah')" /></Cell>
 					</if>
 					<if condition="$fsour=='1'">
 						<SetVar name="nrevent" value="$nrevent + 1" />
@@ -270,7 +270,7 @@
 								<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 								<SetVar name="printname" value="1" />
 							</if>
-							<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('BASM:SOUR')" /></Cell>
+							<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Source')" /></Cell>
 						</if>
 					</if>
 				</if>
@@ -287,7 +287,7 @@
 							<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 							<SetVar name="printname" value="1" />
 						</if>
-						<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('CONF:DATE')" /></Cell>
+						<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Date of confirmation')" /></Cell>
 					</if>
 					<if condition="@CONF:PLAC==''">
 						<SetVar name="nrmissingevent" value="$nrmissingevent + 1" />
@@ -298,7 +298,7 @@
 							<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 							<SetVar name="printname" value="1" />
 						</if>
-						<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('CONF:PLAC')" /></Cell>
+						<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Place of confirmation')" /></Cell>
 					</if>
 					<if condition="$fsour=='1'">
 						<SetVar name="nrevent" value="$nrevent + 1" />
@@ -311,7 +311,7 @@
 								<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 								<SetVar name="printname" value="1" />
 							</if>
-							<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('CONF:SOUR')" /></Cell>
+							<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Source')" /></Cell>
 						</if>
 					</if>
 				</if>
@@ -329,7 +329,7 @@
 								<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 								<SetVar name="printname" value="1" />
 							</if>
-							<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('ENGA:DATE')" /></Cell>
+							<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Date of engagement')" /></Cell>
 						</if>
 						<if condition="@ENGA:PLAC==''">
 							<SetVar name="nrmissingevent" value="$nrmissingevent + 1" />
@@ -340,7 +340,7 @@
 								<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 								<SetVar name="printname" value="1" />
 							</if>
-							<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('ENGA:PLAC')" /></Cell>
+							<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Place of engagement')" /></Cell>
 						</if>
 						<if condition="$fsour=='1'">
 							<SetVar name="nrevent" value="$nrevent + 1" />
@@ -353,7 +353,7 @@
 									<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 									<SetVar name="printname" value="1" />
 								</if>
-								<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('ENGA:SOUR')" /></Cell>
+								<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Source')" /></Cell>
 							</if>
 						</if>
 					</Gedcom>
@@ -371,7 +371,7 @@
 							<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 							<SetVar name="printname" value="1" />
 						</if>
-						<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('FCOM:DATE')" /></Cell>
+						<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Date of first communion')" /></Cell>
 					</if>
 					<if condition="@FCOM:PLAC==''">
 						<SetVar name="nrmissingevent" value="$nrmissingevent + 1" />
@@ -382,7 +382,7 @@
 							<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 							<SetVar name="printname" value="1" />
 						</if>
-						<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('FCOM:PLAC')" /></Cell>
+						<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Place of first communion')" /></Cell>
 					</if>
 					<if condition="$fsour=='1'">
 						<SetVar name="nrevent" value="$nrevent + 1" />
@@ -395,7 +395,7 @@
 								<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 								<SetVar name="printname" value="1" />
 							</if>
-							<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('FCOM:SOUR')" /></Cell>
+							<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Source')" /></Cell>
 						</if>
 					</if>
 				</if>
@@ -413,7 +413,7 @@
 								<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 								<SetVar name="printname" value="1" />
 							</if>
-							<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('MARB:DATE')" /></Cell>
+							<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Date of marriage banns')" /></Cell>
 						</if>
 						<if condition="@MARB:PLAC==''">
 							<SetVar name="nrmissingevent" value="$nrmissingevent + 1" />
@@ -424,7 +424,7 @@
 								<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 								<SetVar name="printname" value="1" />
 							</if>
-							<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('MARB:PLAC')" /></Cell>
+							<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Place of marriage banns')" /></Cell>
 						</if>
 						<if condition="$fsour=='1'">
 							<SetVar name="nrevent" value="$nrevent + 1" />
@@ -437,7 +437,7 @@
 									<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 									<SetVar name="printname" value="1" />
 								</if>
-								<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('MARB:SOUR')" /></Cell>
+								<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Source')" /></Cell>
 							</if>
 						</if>
 					</Gedcom>
@@ -456,7 +456,7 @@
 								<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 								<SetVar name="printname" value="1" />
 							</if>
-							<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('MARR:DATE')" /></Cell>
+							<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Date of marriage')" /></Cell>
 						</if>
 						<if condition="@MARR:PLAC==''">
 							<SetVar name="nrmissingevent" value="$nrmissingevent + 1" />
@@ -467,7 +467,7 @@
 								<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 								<SetVar name="printname" value="1" />
 							</if>
-							<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('MARR:PLAC')" /></Cell>
+							<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Place of marriage')" /></Cell>
 						</if>
 						<if condition="$fsour=='1'">
 							<SetVar name="nrevent" value="$nrevent + 1" />
@@ -480,7 +480,7 @@
 									<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 									<SetVar name="printname" value="1" />
 								</if>
-								<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('MARR:SOUR')" /></Cell>
+								<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Source')" /></Cell>
 							</if>
 						</if>
 					</Gedcom>
@@ -498,7 +498,7 @@
 							<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 							<SetVar name="printname" value="1" />
 						</if>
-						<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('DEAT:DATE')" /></Cell>
+						<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Date of death')" /></Cell>
 					</if>
 					<if condition="@DEAT:PLAC==''">
 						<SetVar name="nrmissingevent" value="$nrmissingevent + 1" />
@@ -509,7 +509,7 @@
 							<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 							<SetVar name="printname" value="1" />
 						</if>
-						<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('DEAT:PLAC')" /></Cell>
+						<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Place of death')" /></Cell>
 					</if>
 					<if condition="$fsour=='1'">
 						<SetVar name="nrevent" value="$nrevent + 1" />
@@ -522,7 +522,7 @@
 								<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 								<SetVar name="printname" value="1" />
 							</if>
-							<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('DEAT:SOUR')" /></Cell>
+							<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Source')" /></Cell>
 						</if>
 					</if>
 				</if>
@@ -539,7 +539,7 @@
 							<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 							<SetVar name="printname" value="1" />
 						</if>
-						<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('BURI:DATE')" /></Cell>
+						<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Date of burial')" /></Cell>
 					</if>
 					<if condition="@BURI:PLAC==''">
 						<SetVar name="nrmissingevent" value="$nrmissingevent + 1" />
@@ -550,7 +550,7 @@
 							<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 							<SetVar name="printname" value="1" />
 						</if>
-						<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('BURI:PLAC')" /></Cell>
+						<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Place of burial')" /></Cell>
 					</if>
 					<if condition="$fsour=='1'">
 						<SetVar name="nrevent" value="$nrevent + 1" />
@@ -563,7 +563,7 @@
 								<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 								<SetVar name="printname" value="1" />
 							</if>
-							<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('BURI:SOUR')" /></Cell>
+							<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Source')" /></Cell>
 						</if>
 					</if>
 				</if>
@@ -580,7 +580,7 @@
 							<Cell style="list_value" width="$name"><GetPersonName id="" /></Cell>
 							<SetVar name="printname" value="1" />
 						</if>
-						<Cell newline="1" style="list_value"><var var="WT_Gedcom_Tag::getLabel('RELI')" /></Cell>
+						<Cell newline="1" style="list_value"><var var="WT_I18N::translate('Religion')" /></Cell>
 					</if>
 				</if>
 
diff --git a/modules_v3/occupation_report/report.xml b/modules_v3/occupation_report/report.xml
index 59ef951ed0..870a420015 100644
--- a/modules_v3/occupation_report/report.xml
+++ b/modules_v3/occupation_report/report.xml
@@ -2,7 +2,7 @@
 <Report>
 	<Title><var var="WT_I18N::translate('Occupations')" /></Title>
 	<Description><var var="WT_I18N::translate('A report of individuals who had a given occupation.')" /></Description>
-	<Input name="occupation" lookup="OCCU" type="text"><var var="WT_Gedcom_Tag::getLabel('OCCU')" /> </Input>
+	<Input name="occupation" lookup="OCCU" type="text"><var var="WT_I18N::translate('Occupation')" /> </Input>
 	<Input name="sortby" type="select" default="NAME" options="NAME=>WT_I18N::translate('sort by name')|BIRT:DATE=>WT_I18N::translate('sort by date of birth')"><var var="WT_I18N::translate('Sort order')" /></Input>
 	<Input name="pageSize" type="select" default="A4" options="letter=>WT_I18N::translate_c('paper size','Letter')|A3=>WT_I18N::translate_c('paper size', 'A3')|A4=>WT_I18N::translate_c('paper size','A4')|legal=>WT_I18N::translate_c('paper size','Legal')"><var var="WT_I18N::translate('Page size')" /></Input>
 	<Input name="fonts" type="select" default="dejavusans" options="arialunicid0=>WT_I18N::translate_c('font name', 'Arial')|dejavusans=>WT_I18N::translate_c('font name', 'DejaVu')|helvetica=>WT_I18N::translate_c('font name', 'Helvetica')"><var var="WT_I18N::translate('Font')"/></Input>
@@ -43,22 +43,22 @@
 			<SetVar name="fill" value="" />
 			<if condition="$sortby=='BIRT:DATE'"><SetVar name="fill" value="#AAAAAA" /></if>
 			<TextBox bgcolor="$fill" border="1" width="$datewidth">
-				<Text style="label"><var var="WT_Gedcom_Tag::getLabel('BIRT:DATE')" /></Text>
+				<Text style="label"><var var="WT_I18N::translate('Date of birth')" /></Text>
 			</TextBox>
 			<!-- should print and sort by birth date -->
 
 			<TextBox border="1" width="$occuwidth">
-				<Text style="label"><var var="WT_Gedcom_Tag::getLabel('OCCU')" /></Text>
+				<Text style="label"><var var="WT_I18N::translate('Occupation')" /></Text>
 			</TextBox>
 			<TextBox border="1" width="$occudatewidth">
-				<Text style="label"><var var="WT_Gedcom_Tag::getLabel('DATE')" /></Text>
+				<Text style="label"><var var="WT_I18N::translate('Date')" /></Text>
 			</TextBox>
 			<TextBox border="1" width="$placewidth">
-				<Text style="label"><var var="WT_Gedcom_Tag::getLabel('PLAC')" /></Text>
+				<Text style="label"><var var="WT_I18N::translate('Place')" /></Text>
 			</TextBox>
 
 			<TextBox border="1" newline="1">
-				<Text style="label"><var var="WT_Gedcom_Tag::getLabel('NOTE')" /></Text>
+				<Text style="label"><var var="WT_I18N::translate('Note')" /></Text>
 			</TextBox>
 		</Header>
 		<Body>
diff --git a/modules_v3/pedigree_report/report.xml b/modules_v3/pedigree_report/report.xml
index c6b87ccad6..f84db916d9 100644
--- a/modules_v3/pedigree_report/report.xml
+++ b/modules_v3/pedigree_report/report.xml
@@ -62,15 +62,15 @@
 					<Text style="name"><GetPersonName id="$pid" truncate="$trunc_place" /></Text>
 				</TextBox>
 				<TextBox padding="0" width="160" height="10" align="left" left="$name_1_2_3" top="372" reseth="1">
-					<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_place" />
-						<br /><varLetter var="BIRT" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_place" />
+					<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_place" />
+						<br /><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_place" />
 						<Gedcom id="@FAMS">
-							<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_place" />
-							<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_place" />
+							<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_place" />
+							<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_place" />
 						</Gedcom>
 						<Gedcom id="DEAT">
-							<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_place" />
-							<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_place" />
+							<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_place" />
+							<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_place" />
 						</Gedcom>
 					</Text>
 				</TextBox>
@@ -83,15 +83,15 @@
 				</TextBox>
 				<TextBox padding="0" width="130" height="10" align="left" left="$name_1_2_3" top="222" reseth="1">
 					<Gedcom id="@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_123_place" />
-							<br /><varLetter var="BIRT" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_123_place" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_123_place" />
+							<br /><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_123_place" />
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_123_place" />
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_123_place" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_123_place" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_123_place" />
 							</Gedcom>
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_123_place" />
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_123_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_123_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_123_place" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -105,11 +105,11 @@
 				</TextBox>
 				<TextBox padding="0" width="130" height="10" align="left" left="$name_1_2_3" top="572" reseth="1">
 					<Gedcom id="@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_123_place" />
-							<br /><varLetter var="BIRT" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_123_place" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_123_place" />
+							<br /><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_123_place" />
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_123_place" />
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_123_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_123_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_123_place" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -123,15 +123,15 @@
 				</TextBox>
 				<TextBox padding="0" width="122" height="10" align="left" left="$name_4_to_7" top="132" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_4_to_7_place" />
-							<br /><varLetter var="BIRT" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_4_to_7_place" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_4_to_7_place" />
+							<br /><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_4_to_7_place" />
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_4_to_7_place" />
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_4_to_7_place" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_4_to_7_place" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_4_to_7_place" />
 							</Gedcom>
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_4_to_7_place" />
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_4_to_7_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_4_to_7_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_4_to_7_place" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -145,11 +145,11 @@
 				</TextBox>
 				<TextBox padding="0" width="122" height="10" align="left" left="$name_4_to_7" top="292" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_4_to_7_place" />
-							<br /><varLetter var="BIRT" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_4_to_7_place" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_4_to_7_place" />
+							<br /><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_4_to_7_place" />
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_4_to_7_place" />
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_4_to_7_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_4_to_7_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_4_to_7_place" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -164,15 +164,15 @@
 				</TextBox>
 				<TextBox padding="0" width="122" height="10" align="left" left="$name_4_to_7" top="452" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_4_to_7_place" />
-							<br /><varLetter var="BIRT" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_4_to_7_place" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_4_to_7_place" />
+							<br /><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_4_to_7_place" />
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_4_to_7_place" />
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_4_to_7_place" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_4_to_7_place" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_4_to_7_place" />
 							</Gedcom>
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_4_to_7_place" />
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_4_to_7_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_4_to_7_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_4_to_7_place" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -186,11 +186,11 @@
 				</TextBox>
 				<TextBox padding="0" width="122" height="10" align="left" left="$name_4_to_7" top="612" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_4_to_7_place" />
-							<br /><varLetter var="BIRT" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_4_to_7_place" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_4_to_7_place" />
+							<br /><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_4_to_7_place" />
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_4_to_7_place" />
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_4_to_7_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_4_to_7_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_4_to_7_place" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -209,15 +209,15 @@
 				</TextBox>
 				<TextBox padding="0" width="130" height="10" align="left" left="$name_8_to_15" top="92" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@HUSB:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
-							<br /><varLetter var="BIRT" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_dateplace" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
+							<br /><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_dateplace" />
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_dateplace" />
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_dateplace" />
 							</Gedcom>
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_dateplace" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -231,11 +231,11 @@
 				</TextBox>
 				<TextBox padding="0" width="130" height="10" align="left" left="$name_8_to_15" top="172" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@HUSB:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
-							<br /><varLetter var="BIRT" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_dateplace" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
+							<br /><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_dateplace" />
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_dateplace" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -252,15 +252,15 @@
 				</TextBox>
 				<TextBox padding="0" width="130" height="10" align="left" left="$name_8_to_15" top="252" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@WIFE:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
-							<br /><varLetter var="BIRT" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_dateplace" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
+							<br /><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_dateplace" />
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_dateplace" />
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_dateplace" />
 							</Gedcom>
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_dateplace" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -274,11 +274,11 @@
 				</TextBox>
 				<TextBox padding="0" width="130" height="10" align="left" left="$name_8_to_15" top="332" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@WIFE:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
-							<br /><varLetter var="BIRT" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_dateplace" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
+							<br /><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_dateplace" />
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_dateplace" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -295,15 +295,15 @@
 				</TextBox>
 				<TextBox padding="0" width="130" height="10" align="left" left="$name_8_to_15" top="412" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@HUSB:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
-							<br /><varLetter var="BIRT" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_dateplace" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
+							<br /><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_dateplace" />
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_dateplace" />
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_dateplace" />
 							</Gedcom>
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_dateplace" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -317,11 +317,11 @@
 				</TextBox>
 				<TextBox padding="0" width="130" height="10" align="left" left="$name_8_to_15" top="492" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@HUSB:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
-							<br /><varLetter var="BIRT" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_dateplace" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
+							<br /><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_dateplace" />
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_dateplace" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -338,15 +338,15 @@
 				</TextBox>
 				<TextBox padding="0" width="130" height="10" align="left" left="$name_8_to_15" top="572" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@WIFE:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
-							<br /><varLetter var="BIRT" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_dateplace" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
+							<br /><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_dateplace" />
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_dateplace" />
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_dateplace" />
 							</Gedcom>
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_dateplace" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -360,11 +360,11 @@
 				</TextBox>
 				<TextBox padding="0" width="130" height="10" align="left" left="$name_8_to_15" top="652" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@WIFE:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
-							<br /><varLetter var="BIRT" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_dateplace" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
+							<br /><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_dateplace" />
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_dateplace" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -383,12 +383,12 @@
 				</TextBox>
 				<TextBox padding="0" width="135" height="10" align="left" left="$name_16_to_31" top="72" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@HUSB:@FAMC:@HUSB:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="30" />
 							</Gedcom>
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -402,9 +402,9 @@
 				</TextBox>
 				<TextBox padding="0" width="135" height="10" align="left" left="$name_16_to_31" top="112" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@HUSB:@FAMC:@HUSB:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -421,12 +421,12 @@
 				</TextBox>
 				<TextBox padding="0" width="135" height="10" align="left" left="$name_16_to_31" top="152" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@HUSB:@FAMC:@WIFE:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="30" />
 							</Gedcom>
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -440,9 +440,9 @@
 				</TextBox>
 				<TextBox padding="0" width="135" height="10" align="left" left="$name_16_to_31" top="192" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@HUSB:@FAMC:@WIFE:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -459,12 +459,12 @@
 				</TextBox>
 				<TextBox padding="0" width="135" height="10" align="left" left="$name_16_to_31" top="232" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@WIFE:@FAMC:@HUSB:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="30" />
 							</Gedcom>
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -478,9 +478,9 @@
 				</TextBox>
 				<TextBox padding="0" width="135" height="10" align="left" left="$name_16_to_31" top="272" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@WIFE:@FAMC:@HUSB:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -497,12 +497,12 @@
 				</TextBox>
 				<TextBox padding="0" width="135" height="10" align="left" left="$name_16_to_31" top="312" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@WIFE:@FAMC:@WIFE:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="30" />
 							</Gedcom>
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -516,9 +516,9 @@
 				</TextBox>
 				<TextBox padding="0" width="135" height="10" align="left" left="$name_16_to_31" top="352" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@WIFE:@FAMC:@WIFE:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -535,12 +535,12 @@
 				</TextBox>
 				<TextBox padding="0" width="135" height="10" align="left" left="$name_16_to_31" top="392" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@HUSB:@FAMC:@HUSB:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="30" />
 							</Gedcom>
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -554,9 +554,9 @@
 				</TextBox>
 				<TextBox padding="0" width="135" height="10" align="left" left="$name_16_to_31" top="432" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@HUSB:@FAMC:@HUSB:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -573,12 +573,12 @@
 				</TextBox>
 				<TextBox padding="0" width="135" height="10" align="left" left="$name_16_to_31" top="472" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@HUSB:@FAMC:@WIFE:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="30" />
 							</Gedcom>
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -592,9 +592,9 @@
 				</TextBox>
 				<TextBox padding="0" width="135" height="10" align="left" left="$name_16_to_31" top="512" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@HUSB:@FAMC:@WIFE:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -611,12 +611,12 @@
 				</TextBox>
 				<TextBox padding="0" width="135" height="10" align="left" left="$name_16_to_31" top="552" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@WIFE:@FAMC:@HUSB:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="30" />
 							</Gedcom>
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -630,9 +630,9 @@
 				</TextBox>
 				<TextBox padding="0" width="135" height="10" align="left" left="$name_16_to_31" top="592" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@WIFE:@FAMC:@HUSB:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -649,12 +649,12 @@
 				</TextBox>
 				<TextBox padding="0" width="135" height="10" align="left" left="$name_16_to_31" top="632" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@WIFE:@FAMC:@WIFE:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="30" />
 							</Gedcom>
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -668,9 +668,9 @@
 				</TextBox>
 				<TextBox padding="0" width="135" height="10" align="left" left="$name_16_to_31" top="672" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@WIFE:@FAMC:@WIFE:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="30" />
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="30" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -758,15 +758,15 @@
 					<Text style="name"><GetPersonName id="$pid" truncate="$truncatename" /></Text>
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="160" height="10" align="left" left="$name_1_2_3" top="272" reseth="1">
-					<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_place" />
-						<br /><varLetter var="BIRT" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_place" />
+					<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_place" />
+						<br /><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_place" />
 						<Gedcom id="@FAMS">
-							<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_place" />
-							<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_place" />
+							<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_place" />
+							<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_place" />
 						</Gedcom>
 						<Gedcom id="DEAT">
-							<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_place" />
-							<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_place" />
+							<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_place" />
+							<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_place" />
 						</Gedcom>
 					</Text>
 				</TextBox>
@@ -779,15 +779,15 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="160" height="10" align="left" left="$name_1_2_3" top="152" reseth="1">
 					<Gedcom id="@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_place" />
-							<br /><varLetter var="BIRT" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_place" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_place" />
+							<br /><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_place" />
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_place" />
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_place" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_place" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_place" />
 							</Gedcom>
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_place" />
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_place" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -801,11 +801,11 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="160" height="10" align="left" left="$name_1_2_3" top="427" reseth="1">
 					<Gedcom id="@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_place" />
-							<br /><varLetter var="BIRT" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_place" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_place" />
+							<br /><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_place" />
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_place" />
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_place" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -819,15 +819,15 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="160" height="10" align="left" left="$name_4_to_7" top="97" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_place" />
-							<br /><varLetter var="BIRT" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_place" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_place" />
+							<br /><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_place" />
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_place" />
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_place" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_place" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_place" />
 							</Gedcom>
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_place" />
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_place" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -841,11 +841,11 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="160" height="10" align="left" left="$name_4_to_7" top="217" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_place" />
-							<br /><varLetter var="BIRT" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_place" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_place" />
+							<br /><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_place" />
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_place" />
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_place" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -859,15 +859,15 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="160" height="10" align="left" left="$name_4_to_7" top="337" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_place" />
-							<br /><varLetter var="BIRT" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_place" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_place" />
+							<br /><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_place" />
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_place" />
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_place" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_place" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:PLAC" truncate="$trunc_place" />
 							</Gedcom>
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_place" />
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_place" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -881,11 +881,11 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="160" height="10" align="left" left="$name_4_to_7" top="457" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_place" />
-							<br /><varLetter var="BIRT" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_place" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_place" />
+							<br /><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:PLAC" truncate="$trunc_place" />
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_place" />
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_place" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:PLAC" truncate="$trunc_place" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -903,14 +903,14 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="160" height="10" align="left" left="$name_8_to_15" top="67" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@HUSB:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
 							 <GedcomValue tag="BIRT:PLAC" truncate="$trunc_dateplace" />
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_dateplace" />
 								 <GedcomValue tag="MARR:PLAC" truncate="$trunc_dateplace" />
 							</Gedcom>
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
 									 <GedcomValue tag="DEAT:PLAC" truncate="$trunc_dateplace" />
 							</Gedcom>
 						</Text>
@@ -925,10 +925,10 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="160" height="10" align="left" left="$name_8_to_15" top="127" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@HUSB:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
 							 <GedcomValue tag="BIRT:PLAC" truncate="32" />
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
 									 <GedcomValue tag="DEAT:PLAC" truncate="$trunc_dateplace" />
 							</Gedcom>
 						</Text>
@@ -946,14 +946,14 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="160" height="10" align="left" left="$name_8_to_15" top="187" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@WIFE:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
 							 <GedcomValue tag="BIRT:PLAC" truncate="$trunc_dateplace" />
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_dateplace" />
 								 <GedcomValue tag="MARR:PLAC" truncate="$trunc_dateplace" />
 							</Gedcom>
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
 									 <GedcomValue tag="DEAT:PLAC" truncate="$trunc_dateplace" />
 							</Gedcom>
 						</Text>
@@ -968,10 +968,10 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="160" height="10" align="left" left="$name_8_to_15" top="247" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@WIFE:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
 							 <GedcomValue tag="BIRT:PLAC" truncate="$trunc_dateplace" />
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
 									 <GedcomValue tag="DEAT:PLAC" truncate="32" />
 							</Gedcom>
 						</Text>
@@ -989,14 +989,14 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="160" height="10" align="left" left="$name_8_to_15" top="307" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@HUSB:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
 							 <GedcomValue tag="BIRT:PLAC" truncate="$trunc_dateplace" />
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_dateplace" />
 								 <GedcomValue tag="MARR:PLAC" truncate="$trunc_dateplace" />
 							</Gedcom>
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
 									 <GedcomValue tag="DEAT:PLAC" truncate="$trunc_dateplace" />
 							</Gedcom>
 						</Text>
@@ -1011,10 +1011,10 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="160" height="10" align="left" left="$name_8_to_15" top="367" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@HUSB:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
 							 <GedcomValue tag="BIRT:PLAC" truncate="32" />
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
 									 <GedcomValue tag="DEAT:PLAC" truncate="$trunc_dateplace" />
 							</Gedcom>
 						</Text>
@@ -1032,14 +1032,14 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="160" height="10" align="left" left="$name_8_to_15" top="427" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@WIFE:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
 							 <GedcomValue tag="BIRT:PLAC" truncate="$trunc_dateplace" />
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="$trunc_dateplace" />
 								 <GedcomValue tag="MARR:PLAC" truncate="$trunc_dateplace" />
 							</Gedcom>
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
 									 <GedcomValue tag="DEAT:PLAC" truncate="$trunc_dateplace" />
 							</Gedcom>
 						</Text>
@@ -1054,10 +1054,10 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="160" height="10" align="left" left="$name_8_to_15" top="487" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@WIFE:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="$trunc_dateplace" />
 							 <GedcomValue tag="BIRT:PLAC" truncate="$trunc_dateplace" />
 							<Gedcom id="DEAT">
-								<br /><varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
+								<br /><var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="$trunc_dateplace" />
 									 <GedcomValue tag="DEAT:PLAC" truncate="$trunc_dateplace" />
 							</Gedcom>
 						</Text>
@@ -1077,12 +1077,12 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="180" height="10" align="left" left="$name_16_to_31" top="52" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@HUSB:@FAMC:@HUSB:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
 							<Gedcom id="DEAT">
-								 <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
+								 <var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
 							</Gedcom>
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="20" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="20" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -1096,9 +1096,9 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="180" height="10" align="left" left="$name_16_to_31" top="82" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@HUSB:@FAMC:@HUSB:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
 							<Gedcom id="DEAT">
-								 <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
+								 <var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -1115,12 +1115,12 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="180" height="10" align="left" left="$name_16_to_31" top="112" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@HUSB:@FAMC:@WIFE:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
 							<Gedcom id="DEAT">
-								 <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
+								 <var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
 							</Gedcom>
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="20" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="20" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -1134,9 +1134,9 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="180" height="10" align="left" left="$name_16_to_31" top="142" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@HUSB:@FAMC:@WIFE:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
 							<Gedcom id="DEAT">
-								 <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
+								 <var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -1153,12 +1153,12 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="180" height="10" align="left" left="$name_16_to_31" top="172" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@WIFE:@FAMC:@HUSB:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
 							<Gedcom id="DEAT">
-								 <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
+								 <var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
 							</Gedcom>
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="20" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="20" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -1172,9 +1172,9 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="180" height="10" align="left" left="$name_16_to_31" top="202" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@WIFE:@FAMC:@HUSB:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
 							<Gedcom id="DEAT">
-								 <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
+								 <var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -1191,12 +1191,12 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="180" height="10" align="left" left="$name_16_to_31" top="232" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@WIFE:@FAMC:@WIFE:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
 							<Gedcom id="DEAT">
-								 <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
+								 <var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
 							</Gedcom>
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="20" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="20" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -1210,9 +1210,9 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="180" height="10" align="left" left="$name_16_to_31" top="262" reseth="1">
 					<Gedcom id="@FAMC:@HUSB:@FAMC:@WIFE:@FAMC:@WIFE:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
 							<Gedcom id="DEAT">
-								 <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
+								 <var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -1229,12 +1229,12 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="180" height="10" align="left" left="$name_16_to_31" top="292" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@HUSB:@FAMC:@HUSB:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
 							<Gedcom id="DEAT">
-								 <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
+								 <var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
 							</Gedcom>
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="20" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="20" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -1248,9 +1248,9 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="180" height="10" align="left" left="$name_16_to_31" top="322" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@HUSB:@FAMC:@HUSB:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
 							<Gedcom id="DEAT">
-								 <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
+								 <var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -1267,12 +1267,12 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="180" height="10" align="left" left="$name_16_to_31" top="352" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@HUSB:@FAMC:@WIFE:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
 							<Gedcom id="DEAT">
-								 <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
+								 <var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
 							</Gedcom>
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="20" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="20" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -1286,9 +1286,9 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="180" height="10" align="left" left="$name_16_to_31" top="382" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@HUSB:@FAMC:@WIFE:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
 							<Gedcom id="DEAT">
-								 <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
+								 <var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -1305,12 +1305,12 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="180" height="10" align="left" left="$name_16_to_31" top="412" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@WIFE:@FAMC:@HUSB:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
 							<Gedcom id="DEAT">
-								 <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
+								 <var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
 							</Gedcom>
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="20" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="20" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -1324,9 +1324,9 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="180" height="10" align="left" left="$name_16_to_31" top="442" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@WIFE:@FAMC:@HUSB:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
 							<Gedcom id="DEAT">
-								 <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
+								 <var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -1343,12 +1343,12 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="180" height="10" align="left" left="$name_16_to_31" top="472" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@WIFE:@FAMC:@WIFE:@FAMC:@HUSB">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
 							<Gedcom id="DEAT">
-								 <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
+								 <var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
 							</Gedcom>
 							<Gedcom id="@FAMS">
-								<br /><varLetter var="MARR" /> <GedcomValue tag="MARR:DATE" truncate="20" />
+								<br /><var var="WT_I18N::translate('Marriage')" /> <GedcomValue tag="MARR:DATE" truncate="20" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
@@ -1362,9 +1362,9 @@
 				</TextBox>
 				<TextBox padding="0" pagecheck="0" width="180" height="10" align="left" left="$name_16_to_31" top="502" reseth="1">
 					<Gedcom id="@FAMC:@WIFE:@FAMC:@WIFE:@FAMC:@WIFE:@FAMC:@WIFE">
-						<Text style="text"><varLetter var="BIRT" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
+						<Text style="text"><var var="WT_I18N::translate('Birth')" /> <GedcomValue tag="BIRT:DATE" truncate="20" />
 							<Gedcom id="DEAT">
-								 <varLetter var="DEAT" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
+								 <var var="WT_I18N::translate('Death')" /> <GedcomValue tag="DEAT:DATE" truncate="20" />
 							</Gedcom>
 						</Text>
 					</Gedcom>
diff --git a/modules_v3/relative_ext_report/report.xml b/modules_v3/relative_ext_report/report.xml
index 99ca480289..4a19105eed 100644
--- a/modules_v3/relative_ext_report/report.xml
+++ b/modules_v3/relative_ext_report/report.xml
@@ -106,12 +106,12 @@
 					<Gedcom id="@FAMS">
 						<TextBox height="$height2" left="$width1" width="$widthB2">
 							<if condition="$sex=='M'">
-								<Text style="minibold"><var var="WT_Gedcom_Tag::getLabel('WIFE')" />: </Text>
+								<Text style="minibold"><var var="WT_I18N::translate('Wife')" />: </Text>
 								<Text style="mini"><GetPersonName id="@WIFE" /> <GedcomValue tag="MARR:DATE" />
 								</Text>
 							</if>
 							<if condition="$sex=='F'">
-								<Text style="minibold"><var var="WT_Gedcom_Tag::getLabel('HUSB')" />: </Text>
+								<Text style="minibold"><var var="WT_I18N::translate('Husband')" />: </Text>
 								<Text style="mini"><GetPersonName id="@HUSB" /> <GedcomValue tag="MARR:DATE" />
 								</Text>
 							</if>
diff --git a/modules_v3/relatives/module.php b/modules_v3/relatives/module.php
index ef92bfc68e..f52d5e23e1 100644
--- a/modules_v3/relatives/module.php
+++ b/modules_v3/relatives/module.php
@@ -75,7 +75,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 
 		///// HUSB /////
 		$found = false;
-		foreach ($family->getFacts('HUSB', $access_level) as $fact) {
+		foreach ($family->getFacts('HUSB', false, $access_level) as $fact) {
 			$found |= !$fact->isOld();
 			$person = $fact->getTarget();
 			if ($person instanceof WT_Individual) {
@@ -238,14 +238,11 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 
 	// Implement WT_Module_Tab
 	public function getTabContent() {
-		global $SHOW_AGE_DIFF, $GEDCOM, $ABBREVIATE_CHART_LABELS, $show_full, $personcount, $controller;
+		global $SHOW_AGE_DIFF, $GEDCOM, $show_full, $personcount, $controller;
 
 		if (isset($show_full)) $saved_show_full = $show_full; // We always want to see full details here
 		$show_full = 1;
 
-		$saved_ABBREVIATE_CHART_LABELS = $ABBREVIATE_CHART_LABELS;
-		$ABBREVIATE_CHART_LABELS = false; // Override GEDCOM configuration
-
 		ob_start();
 		?>
 		<table class="facts_table"><tr><td class="descriptionbox rela">
@@ -343,7 +340,6 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab {
 		<br>
 		<?php
 
-		$ABBREVIATE_CHART_LABELS = $saved_ABBREVIATE_CHART_LABELS; // Restore GEDCOM configuration
 		unset($show_full);
 		if (isset($saved_show_full)) $show_full = $saved_show_full;
 
diff --git a/modules_v3/tree/class_treeview.php b/modules_v3/tree/class_treeview.php
index bdd742e741..e04ed41d2e 100644
--- a/modules_v3/tree/class_treeview.php
+++ b/modules_v3/tree/class_treeview.php
@@ -133,16 +133,19 @@ class TreeView {
 	private function getPersonDetails($personGroup, $individual, $family) {
 		$r = $this->getThumbnail($personGroup, $individual);
 		$r .= '<a class="tv_link" href="'.$individual->getHtmlUrl().'">'.$individual->getFullName().'</a> <a href="module.php?mod=tree&amp;mod_action=treeview&allPartners='.($this->allPartners ? 'true' : 'false').'&amp;rootid='.$individual->getXref().'" title="'.WT_I18N::translate('Interactive tree of %s', strip_tags($individual->getFullName())).'" class="icon-button_indi tv_link tv_treelink"></a>';
-		foreach ($individual->getFacts(WT_EVENTS_BIRT) as $fact) {
-			$r .= '<div><b>'.$fact->getLabel(true).'</b> '.$fact->getDate()->Display().' '.$fact->getPlace() . '</div>';
+		foreach ($individual->getFacts(WT_EVENTS_BIRT, true) as $fact) {
+			//$r .= '<div><b>'.$fact->getLabel(true).'</b> '.$fact->getDate()->Display().' '.$fact->getPlace() . '</div>';
+			$r .= $fact->summary();
 		}
 		if ($family) {
-			foreach ($family->getFacts(WT_EVENTS_MARR) as $fact) {
-				$r .= '<div><b>'.$fact->getLabel(true).'</b> '.$fact->getDate()->Display().' '.$fact->getPlace() . ' <a href="'.$family->getHtmlUrl().'" class="icon-button_family tv_link tv_treelink" title="'.strip_tags($family->getFullName()).'"></a></div>';;
+			foreach ($family->getFacts(WT_EVENTS_MARR, true) as $fact) {
+				//$r .= '<div><b>'.$fact->getLabel(true).'</b> '.$fact->getDate()->Display().' '.$fact->getPlace() . ' <a href="'.$family->getHtmlUrl().'" class="icon-button_family tv_link tv_treelink" title="'.strip_tags($family->getFullName()).'"></a></div>';;
+				$r .= $fact->summary();
 			}
 		}
-		foreach ($individual->getFacts(WT_EVENTS_DEAT) as $fact) {
-			$r .= '<div><b>'.$fact->getLabel(true).'</b> '.$fact->getDate()->Display().' '.$fact->getPlace() . '</div>';
+		foreach ($individual->getFacts(WT_EVENTS_DEAT, true) as $fact) {
+			//$r .= '<div><b>'.$fact->getLabel(true).'</b> '.$fact->getDate()->Display().' '.$fact->getPlace() . '</div>';
+			$r .= $fact->summary();
 		}
 		return '<div class="tv'.$individual->getSex().' tv_person_expanded">' . $r . '</div>';
 	}
author	fisharebest <fisharebest@gmail.com>	2013-08-30 14:50:12 +0100
committer	fisharebest <fisharebest@gmail.com>	2013-08-30 14:50:12 +0100
commit	ddb2811bbf06dd8f9870a11534e059d7290d016f (patch)
tree	a632425ea635056b772754cf58928b2c370bdfb8 /modules_v3
parent	2a638691b1be77284f6032804ecc71b1957cec59 (diff)
download	webtrees-ddb2811bbf06dd8f9870a11534e059d7290d016f.tar.gz webtrees-ddb2811bbf06dd8f9870a11534e059d7290d016f.tar.bz2 webtrees-ddb2811bbf06dd8f9870a11534e059d7290d016f.zip