Use translate_fact() to translate fact names

14 files changed, 63 insertions, 63 deletions

diff --git a/edit_interface.php b/edit_interface.php
index cc1d085ae0..cd96a7e530 100644
--- a/edit_interface.php
+++ b/edit_interface.php
@@ -682,7 +682,7 @@ case 'addnewsource':
 	?>
 		function check_form(frm) {
 			if (frm.TITL.value=="") {
-				alert('<?php echo i18n::translate('You must provide a ').i18n::translate('TITL'); ?>');
+				alert('<?php echo i18n::translate('You must provide a ').translate_fact('TITL'); ?>');
 				frm.TITL.focus();
 				return false;
 			}
@@ -696,10 +696,10 @@ case 'addnewsource':
 		<input type="hidden" name="action" value="addsourceaction" />
 		<input type="hidden" name="pid" value="newsour" />
 		<table class="facts_table">
-			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo i18n::translate('ABBR'), help_link('ABBR'); ?></td>
+			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo translate_fact('ABBR'), help_link('ABBR'); ?></td>
 			<td class="optionbox wrap"><input tabindex="<?php echo $tabkey; ?>" type="text" name="ABBR" id="ABBR" value="" size="40" maxlength="255" /> <?php print_specialchar_link("ABBR", false); ?></td></tr>
 			<?php $tabkey++; ?>
-			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo i18n::translate('TITL'), help_link('TITL'); ?></td>
+			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo translate_fact('TITL'), help_link('TITL'); ?></td>
 			<td class="optionbox wrap"><input tabindex="<?php echo $tabkey; ?>" type="text" name="TITL" id="TITL" value="" size="60" /> <?php print_specialchar_link("TITL", false); ?></td></tr>
 			<?php $tabkey++; ?>
 			<?php if (strstr($ADVANCED_NAME_FACTS, "_HEB")!==false) { ?>
@@ -708,20 +708,20 @@ case 'addnewsource':
 			<?php $tabkey++; ?>
 			<?php } ?>
 			<?php if (strstr($ADVANCED_NAME_FACTS, "ROMN")!==false) { ?>
-			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo i18n::translate('ROMN'), help_link('ROMN'); ?></td>
+			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo translate_fact('ROMN'), help_link('ROMN'); ?></td>
 			<td class="optionbox wrap"><input tabindex="<?php echo $tabkey; ?>" type="text" name="ROMN" id="ROMN" value="" size="60" /> <?php print_specialchar_link("ROMN", false); ?></td></tr>
 			<?php $tabkey++; ?>
 			<?php } ?>
-			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo i18n::translate('AUTH'), help_link('AUTH'); ?></td>
+			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo translate_fact('AUTH'), help_link('AUTH'); ?></td>
 			<td class="optionbox wrap"><input tabindex="<?php echo $tabkey; ?>" type="text" name="AUTH" id="AUTH" value="" size="40" maxlength="255" /> <?php print_specialchar_link("AUTH", false); ?></td></tr>
 			<?php $tabkey++; ?>
-			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo i18n::translate('PUBL'), help_link('PUBL'); ?></td>
+			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo translate_fact('PUBL'), help_link('PUBL'); ?></td>
 			<td class="optionbox wrap"><textarea tabindex="<?php echo $tabkey; ?>" name="PUBL" id="PUBL" rows="5" cols="60"></textarea><br /><?php print_specialchar_link("PUBL", true); ?></td></tr>
 			<?php $tabkey++; ?>
-			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo i18n::translate('REPO'), help_link('REPO'); ?></td>
+			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo translate_fact('REPO'), help_link('REPO'); ?></td>
 			<td class="optionbox wrap"><input tabindex="<?php echo $tabkey; ?>" type="text" name="REPO" id="REPO" value="" size="10" /> <?php print_findrepository_link("REPO"); echo help_link('REPO'); print_addnewrepository_link("REPO"); ?></td></tr>
 			<?php $tabkey++; ?>
-			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo i18n::translate('CALN'), help_link('CALN'); ?></td>
+			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo translate_fact('CALN'), help_link('CALN'); ?></td>
 			<td class="optionbox wrap"><input tabindex="<?php echo $tabkey; ?>" type="text" name="CALN" id="CALN" value="" /></td></tr>
 		<?php
 			if (WT_USER_IS_ADMIN) {
@@ -832,7 +832,7 @@ case 'addnewnote':
 	?>
 		function check_form(frm) {
 			if (frm.TITL.value=="") {
-				alert('<?php echo i18n::translate('You must provide a ').i18n::translate('TITL'); ?>');
+				alert('<?php echo i18n::translate('You must provide a ').translate_fact('TITL'); ?>');
 				frm.TITL.focus();
 				return false;
 			}
@@ -963,7 +963,7 @@ case 'addnewnote_assisted':
 		function check_form(frm) {
 			/*
 			if (frm.TITL.value=="") {
-				alert('<?php echo i18n::translate('You must provide a ').i18n::translate('TITL'); ?>');
+				alert('<?php echo i18n::translate('You must provide a ').translate_fact('TITL'); ?>');
 				frm.TITL.focus();
 				return false;
 			}
@@ -1002,7 +1002,7 @@ case 'addmedia_links':
 	?>
 		function check_form(frm) {
 			if (frm.TITL.value=="") {
-				alert('<?php echo i18n::translate('You must provide a ').i18n::translate('TITL'); ?>');
+				alert('<?php echo i18n::translate('You must provide a ').translate_fact('TITL'); ?>');
 				frm.TITL.focus();
 				return false;
 			}
@@ -1088,7 +1088,7 @@ case 'editnote':
 	?>
 		function check_form(frm) {
 			if (frm.TITL.value=="") {
-				alert('<?php echo i18n::translate('You must provide a ').i18n::translate('TITL'); ?>');
+				alert('<?php echo i18n::translate('You must provide a ').translate_fact('TITL'); ?>');
 				frm.TITL.focus();
 				return false;
 			}
@@ -1146,7 +1146,7 @@ case 'addnewrepository':
 	?>
 		function check_form(frm) {
 			if (frm.NAME.value=="") {
-				alert('<?php echo i18n::translate('You must provide a '), " ", i18n::translate('NAME'); ?>');
+				alert('<?php echo i18n::translate('You must provide a '), " ", translate_fact('NAME'); ?>');
 				frm.NAME.focus();
 				return false;
 			}
@@ -1162,7 +1162,7 @@ case 'addnewrepository':
 		<input type="hidden" name="action" value="addrepoaction" />
 		<input type="hidden" name="pid" value="newrepo" />
 		<table class="facts_table">
-			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo i18n::translate('NAME'), help_link('edit_REPO_NAME'); ?></td>
+			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo translate_fact('NAME'), help_link('edit_REPO_NAME'); ?></td>
 			<td class="optionbox wrap"><input tabindex="<?php echo $tabkey; ?>" type="text" name="NAME" id="NAME" value="" size="40" maxlength="255" /> <?php print_specialchar_link("NAME", false); ?></td></tr>
 			<?php $tabkey++; ?>
 			<?php if (strstr($ADVANCED_NAME_FACTS, "_HEB")!==false) { ?>
@@ -1171,23 +1171,23 @@ case 'addnewrepository':
 			<?php $tabkey++; ?>
 			<?php } ?>
 			<?php if (strstr($ADVANCED_NAME_FACTS, "ROMN")!==false) { ?>
-			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo i18n::translate('ROMN'), help_link('ROMN'); ?></td>
+			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo translate_fact('ROMN'), help_link('ROMN'); ?></td>
 			<td class="optionbox wrap"><input tabindex="<?php echo $tabkey; ?>" type="text" name="ROMN" id="ROMN" value="" size="40" maxlength="255" /> <?php print_specialchar_link("ROMN", false); ?></td></tr>
 			<?php $tabkey++; ?>
 			<?php } ?>
-			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo i18n::translate('ADDR'), help_link('ADDR'); ?></td>
+			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo translate_fact('ADDR'), help_link('ADDR'); ?></td>
 			<td class="optionbox wrap"><textarea tabindex="<?php echo $tabkey; ?>" name="ADDR" id="ADDR" rows="5" cols="60"></textarea><?php print_specialchar_link("ADDR", true); ?> </td></tr>
 			<?php $tabkey++; ?>
-			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo i18n::translate('PHON'), help_link('PHON'); ?></td>
+			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo translate_fact('PHON'), help_link('PHON'); ?></td>
 			<td class="optionbox wrap"><input tabindex="<?php echo $tabkey; ?>" type="text" name="PHON" id="PHON" value="" size="40" maxlength="255" /> </td></tr>
 			<?php $tabkey++; ?>
-			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo i18n::translate('FAX'), help_link('FAX'); ?></td>
+			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo translate_fact('FAX'), help_link('FAX'); ?></td>
 			<td class="optionbox wrap"><input tabindex="<?php echo $tabkey; ?>" type="text" name="FAX" id="FAX" value="" size="40" /></td></tr>
 			<?php $tabkey++; ?>
-			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo i18n::translate('EMAIL'), help_link('EMAIL'); ?></td>
+			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo translate_fact('EMAIL'), help_link('EMAIL'); ?></td>
 			<td class="optionbox wrap"><input tabindex="<?php echo $tabkey; ?>" type="text" name="EMAIL" id="EMAIL" value="" size="40" maxlength="255" /></td></tr>
 			<?php $tabkey++; ?>
-			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo i18n::translate('WWW'), help_link('URL'); ?></td>
+			<tr><td class="descriptionbox <?php echo $TEXT_DIRECTION; ?> wrap width25"><?php echo translate_fact('WWW'), help_link('URL'); ?></td>
 			<td class="optionbox wrap"><input tabindex="<?php echo $tabkey; ?>" type="text" name="WWW" id="WWW" value="" size="40" maxlength="255" /> </td></tr>
 		<?php
 			if (WT_USER_IS_ADMIN) {
diff --git a/includes/controllers/descendancy_ctrl.php b/includes/controllers/descendancy_ctrl.php
index 2c4ea544fb..efa1cdb59e 100644
--- a/includes/controllers/descendancy_ctrl.php
+++ b/includes/controllers/descendancy_ctrl.php
@@ -308,12 +308,12 @@ function print_family_descendancy(&$person, &$family, $depth) {
 		$children = $family->getChildren();
 		print "<tr><td colspan=\"3\" class=\"details1\" >&nbsp;&nbsp;";
 		if ($children) {
-			print i18n::translate('NCHI').": ".count($children);
+			print translate_fact('NCHI').": ".count($children);
 		} else {
 			// Distinguish between no children (NCHI 0) and no recorded
 			// children (no CHIL records)
 			if (strpos($family->getGedcomRecord(), "\n1 NCHI 0")) {
-				print i18n::translate('NCHI').": ".count($children);
+				print translate_fact('NCHI').": ".count($children);
 			} else {
 				print i18n::translate('No children');
 			}
diff --git a/includes/controllers/lifespan_ctrl.php b/includes/controllers/lifespan_ctrl.php
index db8ce89478..df92d4f7cf 100644
--- a/includes/controllers/lifespan_ctrl.php
+++ b/includes/controllers/lifespan_ctrl.php
@@ -496,7 +496,7 @@ class LifespanControllerRoot extends BaseController {
 					$indiName = PrintReady(str_replace(array('<span class="starredname">', '</span>'), array('<u>', '</u>'), $value->getFullName()));
 					echo "\n\t<table><tr>\n\t\t<td width=\"15\"><a class=\"showit\" href=\"#\"><b>";
 					echo abbreviate_fact('BIRT');
-					echo "</b><span>", $value->getSexImage(), $indiName, "<br/>", i18n::translate('BIRT'), " ", strip_tags($bdate->Display(false)), " ", PrintReady($value->getBirthPlace()), "</span></a></td>" ,
+					echo "</b><span>", $value->getSexImage(), $indiName, "<br/>", translate_fact('BIRT'), " ", strip_tags($bdate->Display(false)), " ", PrintReady($value->getBirthPlace()), "</span></a></td>" ,
 						"\n\t\t<td align=\"left\" width=\"100%\"><a href=\"", encode_url($value->getLinkUrl()), "\">", $value->getSexImage(), $indiName, ":  $lifespan </a></td>" ,
 						"\n\t\t<td width=\"15\">";
 					if ($value->isDead()) {
@@ -504,7 +504,7 @@ class LifespanControllerRoot extends BaseController {
 							print "<a class=\"showit\" href=\"#\"><b>";
 							echo abbreviate_fact('DEAT');
 							if (!$deathReal) print "*";
-							print "</b><span>".$value->getSexImage().$indiName."<br/>".i18n::translate('DEAT')." ".strip_tags($ddate->Display(false))." ".PrintReady($value->getDeathPlace())."</span></a>";
+							print "</b><span>".$value->getSexImage().$indiName."<br/>".translate_fact('DEAT')." ".strip_tags($ddate->Display(false))." ".PrintReady($value->getDeathPlace())."</span></a>";
 						}
 					}
 					print "</td></tr></table>";
@@ -525,7 +525,7 @@ class LifespanControllerRoot extends BaseController {
 						print "\n\t<table dir=\"ltr\"><tr>\n\t\t<td width=\"15\"><a class=\"showit\" href=\"#\"><b>";
 						echo abbreviate_fact('BIRT');
 						if (!$birthReal) print "*";
-						print "</b><span>".$value->getSexImage().$indiName."<br/>".i18n::translate('BIRT')." ".strip_tags($bdate->Display(false))." ".PrintReady($value->getBirthPlace())."</span></a></td>" .
+						print "</b><span>".$value->getSexImage().$indiName."<br/>".translate_fact('BIRT')." ".strip_tags($bdate->Display(false))." ".PrintReady($value->getBirthPlace())."</span></a></td>" .
 						"<td align=\"left\" width=\"100%\"><a href=\"".encode_url($value->getLinkUrl())."\">".$value->getSexImage().$indiName."</a></td>" .
 						"\n\t\t<td width=\"15\">";
 						if ($value->isDead()) {
@@ -533,7 +533,7 @@ class LifespanControllerRoot extends BaseController {
 								print "<a class=\"showit\" href=\"#\"><b>";
 								echo abbreviate_fact('DEAT');
 								if (!$deathReal) print "*";
-								print "</b><span>".$value->getSexImage().$indiName."<br/>".i18n::translate('DEAT')." ".strip_tags($ddate->Display(false))." ".PrintReady($value->getDeathPlace())."</span></a>";
+								print "</b><span>".$value->getSexImage().$indiName."<br/>".translate_fact('DEAT')." ".strip_tags($ddate->Display(false))." ".PrintReady($value->getDeathPlace())."</span></a>";
 							}
 						}
 						print "</td></tr></table>";
@@ -544,13 +544,13 @@ class LifespanControllerRoot extends BaseController {
 						$indiName = PrintReady(str_replace(array('<span class="starredname">', '</span>'), array('<u>', '</u>'), $value->getFullName()));
 						print "<a class=\"showit\" href=\"".encode_url($value->getLinkUrl())."\"><b>";
 						echo abbreviate_fact('BIRT');
-						print "</b><span>".$value->getSexImage().$indiName."<br/>".i18n::translate('BIRT')." ".strip_tags($bdate->Display(false))." ".PrintReady($value->getBirthPlace())."<br/>";
+						print "</b><span>".$value->getSexImage().$indiName."<br/>".translate_fact('BIRT')." ".strip_tags($bdate->Display(false))." ".PrintReady($value->getBirthPlace())."<br/>";
 						foreach($eventinformation as $evtwidth=>$val){
 							$text = explode("-fact,", $val);
 							$val = $text[1];
 							print $val."<br />\n";
 						}
-						if ($value->isDead() && $deathReal) print i18n::translate('DEAT')." ".strip_tags($ddate->Display(false))." ".PrintReady($value->getDeathPlace());
+						if ($value->isDead() && $deathReal) print translate_fact('DEAT')." ".strip_tags($ddate->Display(false))." ".PrintReady($value->getDeathPlace());
 						print "</span></a>";
 						echo '</div>';
 					}
diff --git a/includes/functions/functions_places.php b/includes/functions/functions_places.php
index bf6f6feefa..f8f291ecf0 100644
--- a/includes/functions/functions_places.php
+++ b/includes/functions/functions_places.php
@@ -45,7 +45,7 @@ function get_plac_label() {
 	if (empty($HEAD_PLAC_FORM)) $HEAD_PLAC_FORM = i18n::translate('City, County, State/Province, Country');
 	$plac_label = explode(',', $HEAD_PLAC_FORM);
 	$plac_label = array_reverse($plac_label);
-	if ($HEAD_PLAC_FORM == i18n::translate('City, County, State/Province, Country')) $plac_label[0] = i18n::translate('CTRY');
+	if ($HEAD_PLAC_FORM == i18n::translate('City, County, State/Province, Country')) $plac_label[0] = translate_fact('CTRY');
 
 	return $plac_label;
 }
@@ -300,7 +300,7 @@ function print_place_subfields($element_id) {
 		$subtagid=$element_id."_".$i;
 		$subtagname=$element_id."_".$i;
 		$plac_label[$i]=trim($plac_label[$i]);
-		if (in_array(utf8_strtolower($plac_label[$i]), array("country", "pays", "land", "zeme", "ülke", "país", "ország", "nazione", "kraj", "maa", utf8_strtolower(i18n::translate('CTRY'))))) {
+		if (in_array(utf8_strtolower($plac_label[$i]), array("country", "pays", "land", "zeme", "ülke", "país", "ország", "nazione", "kraj", "maa", utf8_strtolower(translate_fact('CTRY'))))) {
 			$cols="8";
 			$subtagname=$element_id."_PLAC_CTRY";
 			$icountry=$i;
diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php
index 87b39ffb9e..896da48e5c 100644
--- a/includes/functions/functions_print.php
+++ b/includes/functions/functions_print.php
@@ -1843,7 +1843,7 @@ function format_fact_date(&$eventObj, $anchor=false, $time=false) {
 		}
 	}
 	// print gedcom ages
-	foreach (array(i18n::translate('AGE')=>$fact_age, i18n::translate('Husband')=>$husb_age, i18n::translate('Wife')=>$wife_age) as $label=>$age) {
+	foreach (array(translate_fact('AGE')=>$fact_age, translate_fact('HUSB')=>$husb_age, translate_fact('WIFE')=>$wife_age) as $label=>$age) {
 		if ($age!='') {
 			$html.=' <span class="label">'.$label.':</span> <span class="age">'.PrintReady(get_age_at_event($age, false)).'</span>';
 		}
@@ -1922,13 +1922,13 @@ function format_fact_place(&$eventObj, $anchor=false, $sub=false, $lds=false) {
 			$cts = preg_match('/\d LATI (.*)/', $placerec, $match);
 			if ($cts>0) {
 				$map_lati=$match[1];
-				$html.='<br /><span class="label">'.i18n::translate('LATI').': </span>'.$map_lati;
+				$html.='<br /><span class="label">'.translate_fact('LATI').': </span>'.$map_lati;
 			}
 			$map_long="";
 			$cts = preg_match('/\d LONG (.*)/', $placerec, $match);
 			if ($cts>0) {
 				$map_long=$match[1];
-				$html.=' <span class="label">'.i18n::translate('LONG').': </span>'.$map_long;
+				$html.=' <span class="label">'.translate_fact('LONG').': </span>'.$map_long;
 			}
 			if ($map_lati && $map_long && empty($SEARCH_SPIDER)) {
 				$map_lati=trim(strtr($map_lati, "NSEW,�", " - -. ")); // S5,6789 ==> -5.6789
diff --git a/includes/functions/functions_print_lists.php b/includes/functions/functions_print_lists.php
index f13f7855fb..4b18661028 100644
--- a/includes/functions/functions_print_lists.php
+++ b/includes/functions/functions_print_lists.php
@@ -109,7 +109,7 @@ function print_indi_table($datalist, $legend="", $option="") {
 	echo "<thead><tr>";
 	echo "<td></td>";
 	if ($SHOW_ID_NUMBERS) echo "<th class=\"list_label rela\">INDI</th>";
-	echo '<th class="list_label"><a href="javascript:;" onclick="sortByOtherCol(this, 2)">', i18n::translate('NAME'), '</a></th>';
+	echo '<th class="list_label"><a href="javascript:;" onclick="sortByOtherCol(this, 2)">', translate_fact('NAME'), '</a></th>';
 	echo "<th class=\"list_label\" style=\"display:none\">GIVN</th>";
 	echo "<th class=\"list_label\" style=\"display:none\">SURN</th>";
 	if ($option=="sosa") echo "<th class=\"list_label\">Sosa</th>";
@@ -392,7 +392,7 @@ function print_indi_table($datalist, $legend="", $option="") {
 	if ($SHOW_ID_NUMBERS) echo "<td></td>"; // INDI:ID
 	echo "<td class=\"list_label\">"; // NAME
 	if (count($unique_indis)>1) {
-		echo '<a href="javascript:;" onclick="sortByOtherCol(this, 1)"><img src="images/topdown.gif" alt="" border="0" /> ', i18n::translate('GIVN'), '</a><br />';
+		echo '<a href="javascript:;" onclick="sortByOtherCol(this, 1)"><img src="images/topdown.gif" alt="" border="0" /> ', translate_fact('GIVN'), '</a><br />';
 	}
 	echo "<input id=\"cb_parents_$table_id\" type=\"checkbox\" onclick=\"toggleByClassName('DIV', 'parents_$table_id');\" /><label for=\"cb_parents_$table_id\">", i18n::translate('Show parents'), "</label><br />";
 	echo i18n::translate('Total individuals'), ' : ', count($unique_indis);
@@ -481,13 +481,13 @@ function print_fam_table($datalist, $legend="", $option="") {
 	echo i18n::translate('Leaves'), "</button> ";
 	echo "<br />";
 	echo "<button type=\"button\" class=\"MARR_U\" title=\"", i18n::translate('Show couples with an unknown marriage date.'), "\" >";
-	echo i18n::translate('MARR'), " ?</button> ";
+	echo translate_fact('MARR'), " ?</button> ";
 	echo "<button type=\"button\" class=\"MARR_YES\" title=\"", i18n::translate('Show couples who married more than 100 years ago.'), "\" >";
-	echo i18n::translate('MARR'), "&gt;100</button> ";
+	echo translate_fact('MARR'), "&gt;100</button> ";
 	echo "<button type=\"button\" class=\"MARR_Y100\" title=\"", i18n::translate('Show couples who married within the last 100 years.'), "\" >";
-	echo i18n::translate('MARR'), "&lt;=100</button> ";
+	echo translate_fact('MARR'), "&lt;=100</button> ";
 	echo "<button type=\"button\" class=\"MARR_DIV\" title=\"", i18n::translate('Show divorced couples.'), "\" >";
-	echo i18n::translate('DIV'), "</button> ";
+	echo translate_fact('DIV'), "</button> ";
 	echo "<button type=\"button\" class=\"reset\" title=\"", i18n::translate('Reset to the list defaults.'), "\" >";
 	echo i18n::translate('Reset'), "</button> ";
 	//-- table header
@@ -496,11 +496,11 @@ function print_fam_table($datalist, $legend="", $option="") {
 	echo "<td></td>";
 	if ($SHOW_ID_NUMBERS) echo "<th class=\"list_label rela\">FAM</th>";
 	if ($SHOW_ID_NUMBERS) echo "<th class=\"list_label rela\">INDI</th>";
-	echo "<th class=\"list_label\">", i18n::translate('NAME'), "</th>";
+	echo "<th class=\"list_label\">", translate_fact('NAME'), "</th>";
 	echo "<th style=\"display:none\">HUSB:GIVN</th>";
 	echo "<th class=\"list_label\">", translate_fact('AGE'), "</th>";
 	if ($SHOW_ID_NUMBERS) echo "<th class=\"list_label rela\">INDI</th>";
-	echo "<th class=\"list_label\">", i18n::translate('NAME'), "</th>";
+	echo "<th class=\"list_label\">", translate_fact('NAME'), "</th>";
 	echo "<th style=\"display:none\">WIFE:GIVN</th>";
 	echo "<th class=\"list_label\">", translate_fact('AGE'), "</th>";
 	echo "<th class=\"list_label\">", translate_fact('MARR'), "</th>";
@@ -771,7 +771,7 @@ function print_fam_table($datalist, $legend="", $option="") {
 	if ($SHOW_ID_NUMBERS) echo "<td></td>"; // HUSB:ID
 	echo "<td class=\"list_label\">"; // HUSB:NAME
 	if ($num>1) {
-		echo '<a href="javascript:;" onclick="sortByOtherCol(this, 1)"><img src="images/topdown.gif" alt="" border="0" /> ', i18n::translate('GIVN'), '</a><br />';
+		echo '<a href="javascript:;" onclick="sortByOtherCol(this, 1)"><img src="images/topdown.gif" alt="" border="0" /> ', translate_fact('GIVN'), '</a><br />';
 	}
 	echo "<input id=\"cb_parents_$table_id\" type=\"checkbox\" onclick=\"toggleByClassName('DIV', 'parents_$table_id');\" /><label for=\"cb_parents_$table_id\">", i18n::translate('Show parents'), "</label><br />";
 	echo i18n::translate('Total families'), " : ", $num;
@@ -781,7 +781,7 @@ function print_fam_table($datalist, $legend="", $option="") {
 	echo "<td></td>"; // HUSB:AGE
 	if ($SHOW_ID_NUMBERS) echo "<td></td>"; // WIFE:ID
 	echo "<td class=\"list_label\" style=\"vertical-align: top;\">"; // WIFE:NAME
-	echo '<a href="javascript:;" onclick="sortByOtherCol(this, 1)"><img src="images/topdown.gif" alt="" border="0" /> ', i18n::translate('GIVN'), '</a><br />';
+	echo '<a href="javascript:;" onclick="sortByOtherCol(this, 1)"><img src="images/topdown.gif" alt="" border="0" /> ', translate_fact('GIVN'), '</a><br />';
 	echo "</td>";
 	echo "<td style=\"display:none\">WIFE:GIVN</td>";
 	echo "<td></td>"; // WIFE:AGE
@@ -1063,7 +1063,7 @@ function print_repo_table($repos, $legend='') {
 	if ($SHOW_ID_NUMBERS) {
 		echo '<th class="list_label rela">REPO</th>';
 	}
-	echo '<th class="list_label">', i18n::translate('NAME'), '</th>';
+	echo '<th class="list_label">', translate_fact('NAME'), '</th>';
 	echo '<th class="list_label">', i18n::translate('Sources'), '</th>';
 	if ($SHOW_LAST_CHANGE) {
 		echo '<th class="list_label rela">', translate_fact('CHAN'), '</th>';
@@ -1305,7 +1305,7 @@ function format_surname_table($surnames, $type) {
 	$table_id ='ID'.floor(microtime()*1000000); // sorttable requires a unique ID
 	$html='<table id="'.$table_id.'" class="sortable list_table center">';
 	$html.='<tr><th></th>';
-	$html.='<th class="list_label"><a href="javascript:;" onclick="sortByOtherCol(this, 1)">'.i18n::translate('SURN').'</a></th>';
+	$html.='<th class="list_label"><a href="javascript:;" onclick="sortByOtherCol(this, 1)">'.translate_fact('SURN').'</a></th>';
 	$html.='<th style="display:none;">SURN</th>'; // hidden column for sorting surnames
 	$html.='<th class="list_label">';
 	if ($type=='famlist') {
@@ -1603,7 +1603,7 @@ function print_changes_table($datalist, $showChange=true, $total='', $show_WT_US
 	if ($SHOW_ID_NUMBERS) echo "<td></td>";
 	echo "<td class=\"list_label\">";
 	if ($n>1 && $indi) {
-		echo '<a href="javascript:;" onclick="sortByOtherCol(this, 1)"><img src="images/topdown.gif" alt="" border="0" /> ', i18n::translate('GIVN'), '</a><br />';
+		echo '<a href="javascript:;" onclick="sortByOtherCol(this, 1)"><img src="images/topdown.gif" alt="" border="0" /> ', translate_fact('GIVN'), '</a><br />';
 	}
 	if ($indi) {
 		echo "<input id=\"cb_parents_$table_id\" type=\"checkbox\" onclick=\"toggleByClassName('DIV', 'parents_$table_id');\" /><label for=\"cb_parents_$table_id\">", i18n::translate('Show parents'), "</label><br />";
diff --git a/includes/functions/functions_rss.php b/includes/functions/functions_rss.php
index b34f42205c..f639789eea 100644
--- a/includes/functions/functions_rss.php
+++ b/includes/functions/functions_rss.php
@@ -392,7 +392,7 @@ function getRecentChanges() {
 				if ($SHOW_ID_NUMBERS) {
 					$recentText .= ' '.WT_LPARENS.$gid.WT_RPARENS;
 				}
-				$recentText.='</a> '.i18n::translate('CHAN').' - '.$record->LastChangeTimestamp(false).'</li>';
+				$recentText.='</a> '.translate_fact('CHAN').' - '.$record->LastChangeTimestamp(false).'</li>';
 			}
 		}
 	}
diff --git a/lifespan.php b/lifespan.php
index 879c20a2cb..e5691af4f9 100644
--- a/lifespan.php
+++ b/lifespan.php
@@ -305,7 +305,7 @@ var oldMx = 0;
 			<td align="center"><?php print i18n::translate('Speed');?></td>
 				<td align="center"><?php print i18n::translate('Begin Year');?></td>
 				<td align="center"><?php print i18n::translate('End Year');?></td>
-				<td align="center"><?php print i18n::translate('PLAC');?></td>
+				<td align="center"><?php print translate_fact('PLAC');?></td>
 		</tr>
 		<tr>
 			<td><select name="speedMenu" size="1">
diff --git a/media.php b/media.php
index 9fa2636da2..60d690a3ff 100644
--- a/media.php
+++ b/media.php
@@ -775,8 +775,8 @@ if (check_media_structure()) {
 	<!-- // NOTE: Row 1 left: Sort sequence -->
 	<tr><td class="descriptionbox wrap width25" <?php print $legendAlign;?>><?php echo i18n::translate('Sequence'), help_link('sortby'); ?></td>
 	<td class="optionbox wrap"><select name="sortby">
-		<option value="title" <?php if ($sortby=='title') print "selected=\"selected\"";?>><?php print i18n::translate('TITL');?></option>
-		<option value="file" <?php if ($sortby=='file') print "selected=\"selected\"";?>><?php print i18n::translate('FILE');?></option>
+		<option value="title" <?php if ($sortby=='title') print "selected=\"selected\"";?>><?php print translate_fact('TITL');?></option>
+		<option value="file" <?php if ($sortby=='file') print "selected=\"selected\"";?>><?php print translate_fact('FILE');?></option>
 	</select></td>
 
 	<!-- // NOTE: Row 1 right, Upload media files -->
diff --git a/modules/GEDFact_assistant/_CENS/census_3_find.php b/modules/GEDFact_assistant/_CENS/census_3_find.php
index d15c6eb2f9..e5f31d7d38 100644
--- a/modules/GEDFact_assistant/_CENS/census_3_find.php
+++ b/modules/GEDFact_assistant/_CENS/census_3_find.php
@@ -528,7 +528,7 @@ if ($action=="filter") {
 						if ($ABBREVIATE_CHART_LABELS) {
 							$born=abbreviate_fact('BIRT');
 						} else {
-							$born=i18n::translate('BIRT');
+							$born=translate_fact('BIRT');
 						}
 
 						echo "</span><br><span class=\"list_item\">", $born, " ", $indi->getbirthyear(), "&nbsp;&nbsp;&nbsp;", $indi->getbirthplace(), "</span>";
diff --git a/modules/GEDFact_assistant/_MEDIA/media_3_find.php b/modules/GEDFact_assistant/_MEDIA/media_3_find.php
index aa21ca3a88..aec368ef9b 100644
--- a/modules/GEDFact_assistant/_MEDIA/media_3_find.php
+++ b/modules/GEDFact_assistant/_MEDIA/media_3_find.php
@@ -451,7 +451,7 @@ if ($action=="filter") {
 					if ($ABBREVIATE_CHART_LABELS) {
 						$born=abbreviate_fact('BIRT');
 					} else {
-						$born=i18n::translate('BIRT');
+						$born=translate_fact('BIRT');
 					}
 
 				
diff --git a/modules/googlemap/googlemap.php b/modules/googlemap/googlemap.php
index b3baf855d8..6c403ab740 100644
--- a/modules/googlemap/googlemap.php
+++ b/modules/googlemap/googlemap.php
@@ -145,19 +145,19 @@ function print_address_structure_map($factrec, $level) {
 	$resultText = "<table>";
 	$ct = preg_match_all("/$level PHON (.*)/", $factrec, $omatch, PREG_SET_ORDER);
 	for($i=0; $i<$ct; $i++) {
-		$resultText .= "<tr><td><span class=\"label\"><b>".i18n::translate('PHON').": </b></span></td><td><span class=\"field\">";
+		$resultText .= "<tr><td><span class=\"label\"><b>".translate_fact('PHON').": </b></span></td><td><span class=\"field\">";
 		$resultText .= getLRM() . $omatch[$i][1]. getLRM();
 		$resultText .= "</span></td></tr>";
 	}
 	$ct = preg_match_all("/$level FAX (.*)/", $factrec, $omatch, PREG_SET_ORDER);
 	for($i=0; $i<$ct; $i++) {
-		$resultText .= "<tr><td><span class=\"label\"><b>".i18n::translate('FAX').": </b></span></td><td><span class=\"field\">";
+		$resultText .= "<tr><td><span class=\"label\"><b>".translate_fact('FAX').": </b></span></td><td><span class=\"field\">";
 		$resultText .= getLRM() . $omatch[$i][1] . getLRM();
 		$resultText .= "</span></td></tr>";
 	}
 	$ct = preg_match_all("/$level EMAIL (.*)/", $factrec, $omatch, PREG_SET_ORDER);
 	for($i=0; $i<$ct; $i++) {
-		$resultText .= "<tr><td><span class=\"label\"><b>".i18n::translate('EMAIL').": </b></span></td><td><span class=\"field\">";
+		$resultText .= "<tr><td><span class=\"label\"><b>".translate_fact('EMAIL').": </b></span></td><td><span class=\"field\">";
 		$resultText .= "<a href=\"mailto:".$omatch[$i][1]."\">".$omatch[$i][1]."</a>";
 		$resultText .= "</span></td></tr>";
 	}
@@ -624,7 +624,7 @@ function build_indiv_map($indifacts, $famids) {
 												$markers[$i]["fact"] = i18n::translate('Son');
 												$markers[$i]["class"]  = "person_box";
 											} else {
-												$markers[$i]["fact"]     = i18n::translate('CHIL');
+												$markers[$i]["fact"]     = translate_fact('CHIL');
 												$markers[$i]["class"]    = "person_boxNN";
 											}
 										$markers[$i]["placerec"] = $placerec;
@@ -649,7 +649,7 @@ function build_indiv_map($indifacts, $famids) {
 											if ((count($latlongval) != 0) && ($latlongval["lati"] != NULL) && ($latlongval["long"] != NULL)) {
 												$i = $i + 1;
 												$markers[$i]=array('index'=>'', 'tabindex'=>'', 'placed'=>'no');
-												$markers[$i]["fact"]     = i18n::translate('CHIL');
+												$markers[$i]["fact"]     = translate_fact('CHIL');
 												$markers[$i]["class"]    = "option_boxNN";
 												if (strpos($srec, "\n1 SEX F")!==false) {
 													$markers[$i]["fact"] = i18n::translate('Daughter');
diff --git a/modules/googlemap/placecheck.php b/modules/googlemap/placecheck.php
index 0666353121..7b706f5edd 100644
--- a/modules/googlemap/placecheck.php
+++ b/modules/googlemap/placecheck.php
@@ -128,8 +128,8 @@ echo "</td>";
 echo "<td rowspan='2'>";
 echo "<table align='right'>";
 echo "<tr><td colspan='4' align='center' class='descriptionbox'><strong>", i18n::translate('Key to colors used below'), "</strong></td></tr>";
-echo "<tr><td class='facts_value error'>", i18n::translate('PLAC'), "</td><td class='facts_value error' align='center '><strong>X</strong></td><td align='center' class='facts_value error'><strong>X</strong></td><td class='facts_value'><font size=\"-2\">", i18n::translate('this place and its coordinates do not exist in the GoogleMap tables'), "</font></td></tr>";
-echo "<tr><td class='facts_value'><a>", i18n::translate('PLAC'), "</a></td><td class='facts_value error' align='center '><strong>X</strong></td><td align='center' class='facts_value error'><strong>X</strong></td><td class='facts_value'><font size=\"-2\">", i18n::translate('this place exists in the GoogleMap tables, but has no coordinates'), "</font></td></tr>";
+echo "<tr><td class='facts_value error'>", translate_fact('PLAC'), "</td><td class='facts_value error' align='center '><strong>X</strong></td><td align='center' class='facts_value error'><strong>X</strong></td><td class='facts_value'><font size=\"-2\">", i18n::translate('this place and its coordinates do not exist in the GoogleMap tables'), "</font></td></tr>";
+echo "<tr><td class='facts_value'><a>", translate_fact('PLAC'), "</a></td><td class='facts_value error' align='center '><strong>X</strong></td><td align='center' class='facts_value error'><strong>X</strong></td><td class='facts_value'><font size=\"-2\">", i18n::translate('this place exists in the GoogleMap tables, but has no coordinates'), "</font></td></tr>";
 echo "<tr><td class='facts_value'><strong>".i18n::translate('Unknown')."</font></td><td class='facts_value error' align='center '><strong>X</strong></td><td align='center' class='facts_value error'><strong>X</strong></td><td class='facts_value'><font size=\"-2\">", i18n::translate('this place level is blank in your GEDCOM file. It should be added to<br />GoogleMap places as "unknown" with coordinates from its parent<br />level before you add any place to the next level'), "</font></td></tr>";
 echo "<tr><td class='facts_value'><a>".i18n::translate('Unknown')."</a></td><td class='facts_value' align='center'>N55.0</td><td align='center' class='facts_value'>W75.0</td><td class='facts_value'><font size=\"-2\">", i18n::translate('this place level is blank in your GEDCOM file, but exists as \'unknown\'<br />in the GoogleMap places table with coordinates. No action required<br />until the missing level can be entered'), "</font></td></tr>";
 echo "</table>";
@@ -231,7 +231,7 @@ case 'go':
 	echo "</tr><tr>";
 	$cols=0;
 	while ($cols<$max) {
-		echo "<td class='descriptionbox' align='center'><strong>", i18n::translate('PLAC'), "</strong></td><td class='descriptionbox' align='center'><strong>", i18n::translate('Latitude'), "</strong><td class='descriptionbox' align='center'><strong>", i18n::translate('Longitude'), "</strong></td></td>";
+		echo "<td class='descriptionbox' align='center'><strong>", translate_fact('PLAC'), "</strong></td><td class='descriptionbox' align='center'><strong>", i18n::translate('Latitude'), "</strong><td class='descriptionbox' align='center'><strong>", i18n::translate('Longitude'), "</strong></td></td>";
 		$cols++;
 	}
 	echo "</tr>";
diff --git a/modules/googlemap/places.php b/modules/googlemap/places.php
index 2484af68ba..3342d80ff5 100644
--- a/modules/googlemap/places.php
+++ b/modules/googlemap/places.php
@@ -584,9 +584,9 @@ echo "</form>";
 $placelist=get_place_list_loc($parent);
 
 echo "<table class=\"facts_table\"><tr>";
-echo "<th class=\"descriptionbox\">", i18n::translate('PLAC'), "</th>";
-echo "<th class=\"descriptionbox\">", i18n::translate('LATI'), "</th>";
-echo "<th class=\"descriptionbox\">", i18n::translate('LONG'), "</th>";
+echo "<th class=\"descriptionbox\">", translate_fact('PLAC'), "</th>";
+echo "<th class=\"descriptionbox\">", translate_fact('LATI'), "</th>";
+echo "<th class=\"descriptionbox\">", translate_fact('LONG'), "</th>";
 echo "<th class=\"descriptionbox\">".i18n::translate('Zoom factor')."</th>";
 echo "<th class=\"descriptionbox\">".i18n::translate('Icon')."</th>";
 echo "<th class=\"descriptionbox\" colspan=\"2\">";