Typos in msgctxt strings for relationships. Consistent use of punctuation

20 files changed, 111 insertions, 111 deletions

diff --git a/library/WT/Controller/Base.php b/library/WT/Controller/Base.php
index d9c7ac2d42..eafcbf1814 100644
--- a/library/WT/Controller/Base.php
+++ b/library/WT/Controller/Base.php
@@ -64,7 +64,7 @@ class WT_Controller_Base {
 
 	// Make a list of inline Javascript, so we can render them in the footer
 	// NOTE: there is no need to use "jQuery(document).ready(function(){...})", etc.
-	// as this Javascript won't be inserted until the very end of the page.
+	// as this Javascript won’t be inserted until the very end of the page.
 	public function addInlineJavascript($script, $priority=self::JS_PRIORITY_NORMAL) {
 		if (WT_DEBUG) {
 			/* Show where the JS was added */
diff --git a/library/WT/Controller/Familybook.php b/library/WT/Controller/Familybook.php
index 5a8dcd2d16..3550070672 100644
--- a/library/WT/Controller/Familybook.php
+++ b/library/WT/Controller/Familybook.php
@@ -244,14 +244,14 @@ class WT_Controller_Familybook extends WT_Controller_Chart {
 			echo '<table>';
 			$this->printEmptyBox($bwidth, $bheight);
 
-			//-- recursively get the father's family
+			//-- recursively get the father’s family
 			$this->print_person_pedigree($person, $count+1);
 			echo '</td>',
 				 '<td>',
 				 '</tr>';
 			$this->printEmptyBox($bwidth, $bheight);
 
-			//-- recursively get the mother's family
+			//-- recursively get the mother’s family
 			$this->print_person_pedigree($person, $count+1);
 			echo '</td>',
 				 '<td>',
@@ -272,7 +272,7 @@ class WT_Controller_Familybook extends WT_Controller_Chart {
 			echo '</td>';
 			if ($family->getHusband()) {
 				echo '<td>';
-				//-- recursively get the father's family
+				//-- recursively get the father’s family
 				$this->print_person_pedigree($family->getHusband(), $count+1);
 				echo '</td>';
 			} else {
@@ -294,7 +294,7 @@ class WT_Controller_Familybook extends WT_Controller_Chart {
 			echo '</td>';
 			if ($family->getWife()) {
 				echo '<td>';
-				//-- recursively print the mother's family
+				//-- recursively print the mother’s family
 				$this->print_person_pedigree($family->getWife(), $count+1);
 				echo '</td>';
 			} else {
diff --git a/library/WT/Controller/Hourglass.php b/library/WT/Controller/Hourglass.php
index 6a60a2859d..149ef02508 100644
--- a/library/WT/Controller/Hourglass.php
+++ b/library/WT/Controller/Hourglass.php
@@ -130,7 +130,7 @@ class WT_Controller_Hourglass extends WT_Controller_Chart {
 			echo '</td>';
 			echo '<td>';
 
-				//-- recursively get the father's family
+				//-- recursively get the father’s family
 				$this->print_person_pedigree($person, $count+1);
 				echo '</td>';
 				echo '<td>';
@@ -139,7 +139,7 @@ class WT_Controller_Hourglass extends WT_Controller_Chart {
 				 '<div style="width:',$bwidth,'px; height:',$bheight,'px;"></div>';
 				 echo '</td>';
 			echo '<td>';
-				//-- recursively get the father's family
+				//-- recursively get the father’s family
 				$this->print_person_pedigree($person, $count+1);
 				echo '</td>';
 				echo '<td>';
@@ -163,7 +163,7 @@ class WT_Controller_Hourglass extends WT_Controller_Chart {
 				if ($count==$this->generations-1 && $family->getHusband()->getChildFamilies()) {
 					echo "<a href=\"#\" onclick=\"return ChangeDiv('td_".$ARID."','".$ARID."','".$this->show_full."','".$this->show_spouse."','".$this->box_width."')\" class=\"".$this->right_arrow."\"></a> ";
 				}
-				//-- recursively get the father's family
+				//-- recursively get the father’s family
 				$this->print_person_pedigree($family->getHusband(), $count+1);
 				echo "</td>";
 			}
@@ -183,7 +183,7 @@ class WT_Controller_Hourglass extends WT_Controller_Chart {
 					echo "<a href=\"#\" onclick=\"ChangeDiv('td_".$ARID."','".$ARID."','".$this->show_full."','".$this->show_spouse."','".$this->box_width."'); return false;\" class=\"".$this->right_arrow."\"></a> ";
 				}
 
-				//-- recursively print the mother's family
+				//-- recursively print the mother’s family
 				$this->print_person_pedigree($family->getWife(), $count+1);
 				echo "</td>";
 			}
diff --git a/library/WT/Controller/Page.php b/library/WT/Controller/Page.php
index 8520a3f1e0..53d0f6e54d 100644
--- a/library/WT/Controller/Page.php
+++ b/library/WT/Controller/Page.php
@@ -48,7 +48,7 @@ class WT_Controller_Page extends WT_Controller_Base {
 		}
 	}
 
-	// What should this page show in the browser's title bar?
+	// What should this page show in the browser’s title bar?
 	public function setPageTitle($page_title) {
 		$this->page_title=$page_title;
 		return $this;
@@ -125,14 +125,14 @@ class WT_Controller_Page extends WT_Controller_Base {
 
 	// Print the page header, using the theme
 	public function pageHeader() {
-		// Import global variables into the local scope, for the theme's header.php
+		// Import global variables into the local scope, for the theme’s header.php
 		global $SEARCH_SPIDER, $TEXT_DIRECTION, $REQUIRE_AUTHENTICATION, $headerfile, $view;
 
 		// The title often includes the names of records, which may have markup
 		// that cannot be used in the page title.
 		$title=html_entity_decode(strip_tags($this->page_title), ENT_QUOTES, 'UTF-8');
 
-		// Initialise variables for the theme's header.php
+		// Initialise variables for the theme’s header.php
 		$LINK_CANONICAL  =$this->canonical_url;
 		$META_ROBOTS     =$this->meta_robots;
 		$META_DESCRIPTION=WT_GED_ID ? get_gedcom_setting(WT_GED_ID, 'META_DESCRIPTION') : '';
diff --git a/library/WT/Controller/Pedigree.php b/library/WT/Controller/Pedigree.php
index a7929ddc40..e6233fed0b 100644
--- a/library/WT/Controller/Pedigree.php
+++ b/library/WT/Controller/Pedigree.php
@@ -147,7 +147,7 @@ class WT_Controller_Pedigree extends WT_Controller_Chart {
 		$this->offsetarray = array();
 		$this->minyoffset = 0;
 		if ($this->treesize<3) $this->treesize=3;
-		// -- loop through all of id's in the array starting at the last and working to the first
+		// -- loop through all of IDs in the array starting at the last and working to the first
 		//-- calculation the box positions
 		for ($i=($this->treesize-1); $i>=0; $i--) {
 			// -- check to see if we have moved to the next generation
diff --git a/library/WT/Controller/Search.php b/library/WT/Controller/Search.php
index 3a30ef2ea2..b68f9b744d 100644
--- a/library/WT/Controller/Search.php
+++ b/library/WT/Controller/Search.php
@@ -248,10 +248,10 @@ class WT_Controller_Search extends WT_Controller_Page {
 
 	/**
 	 * Handles searches entered in the top search box in the themes and
-	 * prepares the search to do a general search on indi's, fams, and sources.
+	 * prepares the search to do a general search on individuals, families and sources.
 	 */
 	function TopSearch() {
-		// first set some required variables. Search only in current gedcom, only in indi's.
+		// first set some required variables. Search only in current gedcom, only in individuals.
 		$this->srindi = "yes";
 
 		// Enable the default gedcom for search
@@ -295,7 +295,7 @@ class WT_Controller_Search extends WT_Controller_Page {
 			$logstring = "Type: General\nQuery: ".$this->query;
 			AddToSearchlog($logstring, $this->sgeds);
 
-			// Search the indi's
+			// Search the individuals
 			if (isset ($this->srindi)) {
 				$this->myindilist=search_indis($query_terms, array_keys($this->sgeds), 'AND');
 			} else {
@@ -524,7 +524,7 @@ class WT_Controller_Search extends WT_Controller_Page {
 			}
 		}
 
-		// Now we have the final list of indi's to be printed.
+		// Now we have the final list of individuals to be printed.
 		// We may add the assos at this point.
 
 		if ($this->showasso == 'on') {
diff --git a/library/WT/DB.php b/library/WT/DB.php
index 1978982b61..bd30bdd4f7 100644
--- a/library/WT/DB.php
+++ b/library/WT/DB.php
@@ -219,8 +219,8 @@ class WT_DB {
 		try {
 			$current_version=(int)WT_Site::preference($schema_name);
 		} catch (PDOException $e) {
-			// During initial installation, this table won't exist.
-			// It will only be a problem if we can't subsequently create it.
+			// During initial installation, this table won’t exist.
+			// It will only be a problem if we can’t subsequently create it.
 			$current_version=0;
 		}
 
diff --git a/library/WT/Date.php b/library/WT/Date.php
index fa258da632..121c2f1a36 100644
--- a/library/WT/Date.php
+++ b/library/WT/Date.php
@@ -291,7 +291,7 @@ class WT_Date {
 	}
 
 	// Calculate the the age of a person, on a date.
-	// If $d2 is null, today's date is used.
+	// If $d2 is null, today’s date is used.
 	static function getAge(WT_Date $d1, WT_Date $d2=null, $format) {
 		if ($d2) {
 			if ($d2->MaxJD()>=$d1->MinJD() && $d2->MinJD()<=$d1->MinJD()) {
@@ -339,7 +339,7 @@ class WT_Date {
 		if (is_null($d2)) {
 			return $d1->date1->GetAge(true, WT_CLIENT_JD, $warn_on_negative);
 		} else {
-			// If dates overlap, then can't calculate age.
+			// If dates overlap, then can’t calculate age.
 			if (self::Compare($d1, $d2)) {
 				return $d1->date1->GetAge(true, $d2->MinJD(), $warn_on_negative);
 			} if (self::Compare($d1, $d2)==0 && $d1->date1->minJD==$d2->MinJD()) {
diff --git a/library/WT/Date/Roman.php b/library/WT/Date/Roman.php
index 85236e3627..8df74dbf15 100644
--- a/library/WT/Date/Roman.php
+++ b/library/WT/Date/Roman.php
@@ -4,7 +4,7 @@
 // Definitions for the Roman calendar
 // TODO The 5.5.1 gedcom spec mentions this calendar, but gives no details of
 // how it is to be represented....  This class is just a place holder so that
-// webtrees won't compain if it receives one.
+// webtrees won’t compain if it receives one.
 //
 // NOTE: Since different calendars start their days at different times, (civil
 // midnight, solar midnight, sunset, sunrise, etc.), we convert on the basis of
@@ -36,10 +36,10 @@ class WT_Date_Roman extends WT_Date_Calendar {
 	const CALENDAR_ESCAPE = '@#DROMAN@';
 
 	protected function FormatGedcomYear() {
-		return sprintf('%04dAUC',$this->y);
+		return sprintf('%04dAUC', $this->y);
 	}
 
 	protected function FormatLongYear() {
-		return $this->y.'AUC';
+		return $this->y . 'AUC';
 	}
 }
diff --git a/library/WT/Gedcom/Tag.php b/library/WT/Gedcom/Tag.php
index 006f16469e..7395061c30 100644
--- a/library/WT/Gedcom/Tag.php
+++ b/library/WT/Gedcom/Tag.php
@@ -340,14 +340,14 @@ class WT_Gedcom_Tag {
 			}
 		case '_ADOP_GCH1':
 			switch ($sex) {
-			case 'M': return WT_I18N::translate_c('daughter\'s son', 'Adoption of a grandson');
-			case 'F': return WT_I18N::translate_c('daughter\'s daughter','Adoption of a granddaughter');
+			case 'M': return WT_I18N::translate_c('daughter’s son',     'Adoption of a grandson');
+			case 'F': return WT_I18N::translate_c('daughter’s daughter','Adoption of a granddaughter');
 			default:  return WT_I18N::translate('Adoption of a grandchild');
 			}
 		case '_ADOP_GCH2':
 			switch ($sex) {
-			case 'M': return WT_I18N::translate_c('son\'s son',      'Adoption of a grandson');
-			case 'F': return WT_I18N::translate_c('son\'s daughter',     'Adoption of a granddaughter');
+			case 'M': return WT_I18N::translate_c('son’s son',      'Adoption of a grandson');
+			case 'F': return WT_I18N::translate_c('son’s daughter', 'Adoption of a granddaughter');
 			default:  return WT_I18N::translate('Adoption of a grandchild');
 			}
 		case '_ADOP_HSIB':
@@ -364,20 +364,20 @@ class WT_Gedcom_Tag {
 			}
 		case '_ADPF':
 			switch ($sex) {
-			case 'M': return /* I18N: gedcom tag _ADPF */ WT_I18N::translate_c('MALE', 'Adopted by father');
+			case 'M': return /* I18N: gedcom tag _ADPF */ WT_I18N::translate_c('MALE',   'Adopted by father');
 			case 'F': return /* I18N: gedcom tag _ADPF */ WT_I18N::translate_c('FEMALE', 'Adopted by father');
 			default:  return /* I18N: gedcom tag _ADPF */ WT_I18N::translate('Adopted by father');
 			}
 		case '_ADPM':
 			switch ($sex) {
-			case 'M': return /* I18N: gedcom tag _ADPM */ WT_I18N::translate_c('MALE', 'Adopted by mother');
+			case 'M': return /* I18N: gedcom tag _ADPM */ WT_I18N::translate_c('MALE',   'Adopted by mother');
 			case 'F': return /* I18N: gedcom tag _ADPM */ WT_I18N::translate_c('FEMALE', 'Adopted by mother');
 			default:  return /* I18N: gedcom tag _ADPM */ WT_I18N::translate('Adopted by mother');
 			}
 		case '_AKA':
 		case '_AKAN':
 			switch ($sex) {
-			case 'M': return /* I18N: gedcom tag _AKA */ WT_I18N::translate_c('MALE', 'Also known as');
+			case 'M': return /* I18N: gedcom tag _AKA */ WT_I18N::translate_c('MALE',   'Also known as');
 			case 'F': return /* I18N: gedcom tag _AKA */ WT_I18N::translate_c('FEMALE', 'Also known as');
 			default:  return /* I18N: gedcom tag _AKA */ WT_I18N::translate('Also known as');
 			}
@@ -396,14 +396,14 @@ class WT_Gedcom_Tag {
 			}
 		case '_BAPM_GCH1':
 			switch ($sex) {
-			case 'M': return WT_I18N::translate_c('daughter\'s son', 'Baptism of a grandson');
-			case 'F': return WT_I18N::translate_c('daughter\'s daughter','Baptism of a granddaughter');
+			case 'M': return WT_I18N::translate_c('daughter’s son',     'Baptism of a grandson');
+			case 'F': return WT_I18N::translate_c('daughter’s daughter','Baptism of a granddaughter');
 			default:  return WT_I18N::translate('Baptism of a grandchild');
 			}
 		case '_BAPM_GCH2':
 			switch ($sex) {
-			case 'M': return WT_I18N::translate_c('son\'s son',      'Baptism of a grandson');
-			case 'F': return WT_I18N::translate_c('son\'s daughter',     'Baptism of a granddaughter');
+			case 'M': return WT_I18N::translate_c('son’s son',      'Baptism of a grandson');
+			case 'F': return WT_I18N::translate_c('son’s daughter', 'Baptism of a granddaughter');
 			default:  return WT_I18N::translate('Baptism of a grandchild');
 			}
 		case '_BAPM_HSIB':
@@ -433,14 +433,14 @@ class WT_Gedcom_Tag {
 			}
 		case '_BIRT_GCH1':
 			switch ($sex) {
-			case 'M': return WT_I18N::translate_c('daughter\'s son',      'Birth of a grandson');
-			case 'F': return WT_I18N::translate_c('daughter\'s daughter', 'Birth of a granddaughter');
+			case 'M': return WT_I18N::translate_c('daughter’s son',      'Birth of a grandson');
+			case 'F': return WT_I18N::translate_c('daughter’s daughter', 'Birth of a granddaughter');
 			default:  return WT_I18N::translate('Birth of a grandchild');
 			}
 		case '_BIRT_GCH2':
 			switch ($sex) {
-			case 'M': return WT_I18N::translate_c('son\'s son',      'Birth of a grandson');
-			case 'F': return WT_I18N::translate_c('son\'s daughter', 'Birth of a granddaughter');
+			case 'M': return WT_I18N::translate_c('son’s son',      'Birth of a grandson');
+			case 'F': return WT_I18N::translate_c('son’s daughter', 'Birth of a granddaughter');
 			default:  return WT_I18N::translate('Birth of a grandchild');
 			}
 		case '_BIRT_HSIB':
@@ -472,14 +472,14 @@ class WT_Gedcom_Tag {
 			}
 		case '_BURI_GCH1':
 			switch ($sex) {
-			case 'M': return WT_I18N::translate_c('daughter\'s son', 'Burial of a grandson');
-			case 'F': return WT_I18N::translate_c('daughter\'s daughter','Burial of a granddaughter');
+			case 'M': return WT_I18N::translate_c('daughter’s son',     'Burial of a grandson');
+			case 'F': return WT_I18N::translate_c('daughter’s daughter','Burial of a granddaughter');
 			default:  return WT_I18N::translate('Burial of a grandchild');
 			}
 		case '_BURI_GCH2':
 			switch ($sex) {
-			case 'M': return WT_I18N::translate_c('son\'s son',      'Burial of a grandson');
-			case 'F': return WT_I18N::translate_c('son\'s daughter', 'Burial of a granddaughter');
+			case 'M': return WT_I18N::translate_c('son’s son',      'Burial of a grandson');
+			case 'F': return WT_I18N::translate_c('son’s daughter', 'Burial of a granddaughter');
 			default:  return WT_I18N::translate('Burial of a grandchild');
 			}
 		case '_BURI_GPAR':
@@ -538,14 +538,14 @@ class WT_Gedcom_Tag {
 			}
 		case '_CHR_GCH1':
 			switch ($sex) {
-			case 'M': return WT_I18N::translate_c('daughter\'s son', 'Christening of a grandson');
-			case 'F': return WT_I18N::translate_c('daughter\'s daughter','Christening of a granddaughter');
+			case 'M': return WT_I18N::translate_c('daughter’s son',     'Christening of a grandson');
+			case 'F': return WT_I18N::translate_c('daughter’s daughter','Christening of a granddaughter');
 			default:  return WT_I18N::translate('Christening of a grandchild');
 			}
 		case '_CHR_GCH2':
 			switch ($sex) {
-			case 'M': return WT_I18N::translate_c ('son\'s son',      'Christening of a grandson');
-			case 'F': return WT_I18N::translate_c ('son\'s daughter',     'Christening of a granddaughter');
+			case 'M': return WT_I18N::translate_c ('son’s son',      'Christening of a grandson');
+			case 'F': return WT_I18N::translate_c ('son’s daughter', 'Christening of a granddaughter');
 			default:  return WT_I18N::translate('Christening of a grandchild');
 			}
 		case '_CHR_HSIB':
@@ -575,14 +575,14 @@ class WT_Gedcom_Tag {
 			}
 		case '_CREM_GCH1':
 			switch ($sex) {
-			case 'M': return WT_I18N::translate_c('daughter\'s son', 'Cremation of a grandson');
-			case 'F': return WT_I18N::translate_c('daughter\'s daughter','Cremation of a granddaughter');
+			case 'M': return WT_I18N::translate_c('daughter’s son',     'Cremation of a grandson');
+			case 'F': return WT_I18N::translate_c('daughter’s daughter','Cremation of a granddaughter');
 			default:  return WT_I18N::translate('Cremation of a grandchild');
 			}
 		case '_CREM_GCH2':
 			switch ($sex) {
-			case 'M': return WT_I18N::translate_c('son\'s son',      'Cremation of a grandson');
-			case 'F': return WT_I18N::translate_c('son\'s daughter', 'Cremation of a granddaughter');
+			case 'M': return WT_I18N::translate_c('son’s son',      'Cremation of a grandson');
+			case 'F': return WT_I18N::translate_c('son’s daughter', 'Cremation of a granddaughter');
 			default:  return WT_I18N::translate('Cremation of a grandchild');
 			}
 		case '_CREM_GPAR':
@@ -642,14 +642,14 @@ class WT_Gedcom_Tag {
 			}
 		case '_DEAT_GCH1':
 			switch ($sex) {
-			case 'M': return WT_I18N::translate_c('daughter\'s son', 'Death of a grandson');
-			case 'F': return WT_I18N::translate_c('daughter\'s daughter','Death of a granddaughter');
+			case 'M': return WT_I18N::translate_c('daughter’s son',     'Death of a grandson');
+			case 'F': return WT_I18N::translate_c('daughter’s daughter','Death of a granddaughter');
 			default:  return WT_I18N::translate('Death of a grandchild');
 			}
 		case '_DEAT_GCH2':
 			switch ($sex) {
-			case 'M': return WT_I18N::translate_c('son\'s son',      'Death of a grandson');
-			case 'F': return WT_I18N::translate_c('son\'s daughter',     'Death of a granddaughter');
+			case 'M': return WT_I18N::translate_c('son’s son',      'Death of a grandson');
+			case 'F': return WT_I18N::translate_c('son’s daughter', 'Death of a granddaughter');
 			default:  return WT_I18N::translate('Death of a grandchild');
 			}
 		case '_DEAT_GPAR':
@@ -747,14 +747,14 @@ class WT_Gedcom_Tag {
 			}
 		case '_MARR_GCH1':
 			switch ($sex) {
-			case 'M': return WT_I18N::translate_c('daughter\'s son', 'Marriage of a grandson');
-			case 'F': return WT_I18N::translate_c('daughter\'s daughter','Marriage of a granddaughter');
+			case 'M': return WT_I18N::translate_c('daughter’s son',     'Marriage of a grandson');
+			case 'F': return WT_I18N::translate_c('daughter’s daughter','Marriage of a granddaughter');
 			default:  return WT_I18N::translate('Marriage of a grandchild');
 			}
 		case '_MARR_GCH2':
 			switch ($sex) {
-			case 'M': return WT_I18N::translate_c('son\'s son',      'Marriage of a grandson');
-			case 'F': return WT_I18N::translate_c('son\'s daughter',     'Marriage of a granddaughter');
+			case 'M': return WT_I18N::translate_c('son’s son',      'Marriage of a grandson');
+			case 'F': return WT_I18N::translate_c('son’s daughter', 'Marriage of a granddaughter');
 			default:  return WT_I18N::translate('Marriage of a grandchild');
 			}
 		case '_MARR_HSIB':
@@ -775,17 +775,17 @@ class WT_Gedcom_Tag {
 			case 'F': return WT_I18N::translate('Marriage of a sister');
 			default:  return WT_I18N::translate('Marriage of a sibling');
 			}
-		case '_MBON': return /* I18N: gedcom tag _MBON */ WT_I18N::translate('Marriage bond');
-		case '_MDCL': return /* I18N: gedcom tag _MDCL */ WT_I18N::translate('Medical');
-		case '_MEDC': return /* I18N: gedcom tag _MEDC */ WT_I18N::translate('Medical condition');
-		case '_MEND': return /* I18N: gedcom tag _MEND */ WT_I18N::translate('Marriage ending status');
-		case '_MILI': return /* I18N: gedcom tag _MILI */ WT_I18N::translate('Military');
-		case '_MILT': return /* I18N: gedcom tag _MILT */ WT_I18N::translate('Military service');
-		case '_MREL': return /* I18N: gedcom tag _MREL */ WT_I18N::translate('Relationship to mother');
+		case '_MBON':  return /* I18N: gedcom tag _MBON  */ WT_I18N::translate('Marriage bond');
+		case '_MDCL':  return /* I18N: gedcom tag _MDCL  */ WT_I18N::translate('Medical');
+		case '_MEDC':  return /* I18N: gedcom tag _MEDC  */ WT_I18N::translate('Medical condition');
+		case '_MEND':  return /* I18N: gedcom tag _MEND  */ WT_I18N::translate('Marriage ending status');
+		case '_MILI':  return /* I18N: gedcom tag _MILI  */ WT_I18N::translate('Military');
+		case '_MILT':  return /* I18N: gedcom tag _MILT  */ WT_I18N::translate('Military service');
+		case '_MREL':  return /* I18N: gedcom tag _MREL  */ WT_I18N::translate('Relationship to mother');
 		case '_MSTAT': return /* I18N: gedcom tag _MSTAT */ WT_I18N::translate('Marriage beginning status');
-		case '_NAME': return /* I18N: gedcom tag _NAME */ WT_I18N::translate('Mailing name');
-		case '_NAMS': return /* I18N: gedcom tag _NAMS */ WT_I18N::translate('Namesake');
-		case '_NLIV': return /* I18N: gedcom tag _NLIV */ WT_I18N::translate('Not living');
+		case '_NAME':  return /* I18N: gedcom tag _NAME  */ WT_I18N::translate('Mailing name');
+		case '_NAMS':  return /* I18N: gedcom tag _NAMS  */ WT_I18N::translate('Namesake');
+		case '_NLIV':  return /* I18N: gedcom tag _NLIV  */ WT_I18N::translate('Not living');
 		case '_NMAR':
 			switch ($sex) {
 			case 'M': return /* I18N: gedcom tag _NMAR */ WT_I18N::translate_c('MALE',   'Never married');
@@ -799,24 +799,24 @@ class WT_Gedcom_Tag {
 			default:  return /* I18N: gedcom tag _NMR */ WT_I18N::translate  (          'Not married');
 			}
 		case '_WT_USER': return WT_I18N::translate('by');
-		case '_PRMN':  return /* I18N: gedcom tag _PRMN */  WT_I18N::translate('Permanent number');
-		case '_SCBK':  return /* I18N: gedcom tag _SCBK */  WT_I18N::translate('Scrapbook');
-		case '_SEPR':  return /* I18N: gedcom tag _SEPR */  WT_I18N::translate('Separated');
+		case '_PRMN':  return /* I18N: gedcom tag _PRMN  */ WT_I18N::translate('Permanent number');
+		case '_SCBK':  return /* I18N: gedcom tag _SCBK  */ WT_I18N::translate('Scrapbook');
+		case '_SEPR':  return /* I18N: gedcom tag _SEPR  */ WT_I18N::translate('Separated');
 		case '_SSHOW': return /* I18N: gedcom tag _SSHOW */ WT_I18N::translate('Slide show');
-		case '_STAT':  return /* I18N: gedcom tag _STAT */  WT_I18N::translate('Marriage status');
-		case '_SUBQ':  return /* I18N: gedcom tag _SUBQ */  WT_I18N::translate('Short version');
-		case '_TODO':  return /* I18N: gedcom tag _TODO */  WT_I18N::translate('Research task');
-		case '_TYPE':  return /* I18N: gedcom tag _TYPE */  WT_I18N::translate('Media type');
-		case '_UID':   return /* I18N: gedcom tag _UID */   WT_I18N::translate('Globally unique identifier');
-		case '_URL':   return /* I18N: gedcom tag _URL */   WT_I18N::translate('Web URL');
-		case '_WEIG':  return /* I18N: gedcom tag _WEIG */  WT_I18N::translate('Weight');
-		case '_WITN':  return /* I18N: gedcom tag _WITN */  WT_I18N::translate('Witness');
-		case '_YART':  return /* I18N: gedcom tag _YART */  WT_I18N::translate('Yahrzeit');
+		case '_STAT':  return /* I18N: gedcom tag _STAT  */ WT_I18N::translate('Marriage status');
+		case '_SUBQ':  return /* I18N: gedcom tag _SUBQ  */ WT_I18N::translate('Short version');
+		case '_TODO':  return /* I18N: gedcom tag _TODO  */ WT_I18N::translate('Research task');
+		case '_TYPE':  return /* I18N: gedcom tag _TYPE  */ WT_I18N::translate('Media type');
+		case '_UID':   return /* I18N: gedcom tag _UID   */ WT_I18N::translate('Globally unique identifier');
+		case '_URL':   return /* I18N: gedcom tag _URL   */ WT_I18N::translate('Web URL');
+		case '_WEIG':  return /* I18N: gedcom tag _WEIG  */ WT_I18N::translate('Weight');
+		case '_WITN':  return /* I18N: gedcom tag _WITN  */ WT_I18N::translate('Witness');
+		case '_YART':  return /* I18N: gedcom tag _YART  */ WT_I18N::translate('Yahrzeit');
 		// Brit milah applies only to males, no need for male/female translations
 		case '__BRTM_CHIL': return WT_I18N::translate  ('Brit milah of a son');
 		case '__BRTM_GCHI': return WT_I18N::translate  ('Brit milah of a grandson');
-		case '__BRTM_GCH1': return WT_I18N::translate_c('daughter\'s son', 'Brit milah of a grandson');
-		case '__BRTM_GCH2': return WT_I18N::translate_c('son\'s son', 'Brit milah of a grandson');
+		case '__BRTM_GCH1': return WT_I18N::translate_c('daughter’s son', 'Brit milah of a grandson');
+		case '__BRTM_GCH2': return WT_I18N::translate_c('son’s son',      'Brit milah of a grandson');
 		case '__BRTM_HSIB': return WT_I18N::translate  ('Brit milah of a half-brother');
 		case '__BRTM_SIBL': return WT_I18N::translate  ('Brit milah of a brother');
 		// These "pseudo" tags are generated internally to present information about a media object
diff --git a/library/WT/I18N.php b/library/WT/I18N.php
index 5aea313e6a..ecdad491b7 100644
--- a/library/WT/I18N.php
+++ b/library/WT/I18N.php
@@ -88,7 +88,7 @@ class WT_I18N {
 					$prefs=array();
 				}
 				if (WT_GED_ID) {
-					// Add the gedcom's default language as a low-priority
+					// Add the tree’s default language as a low-priority
 					$locale=get_gedcom_setting(WT_GED_ID, 'LANGUAGE');
 					$prefs[]=$locale.';q=0.2';
 				}
diff --git a/library/WT/Individual.php b/library/WT/Individual.php
index c0ecff4274..626e6a1aac 100644
--- a/library/WT/Individual.php
+++ b/library/WT/Individual.php
@@ -825,11 +825,11 @@ class WT_Individual extends WT_GedcomRecord {
 		return '@P.N. /@N.N./';
 	}
 
-	// Convert a name record into 'full' and 'sort' versions.
-	// Use the NAME field to generate the 'full' version, as the
-	// gedcom spec says that this is the individual's name, as they would write it.
+	// Convert a name record into ‘full’ and ‘sort’ versions.
+	// Use the NAME field to generate the ‘full’ version, as the
+	// gedcom spec says that this is the individual’s name, as they would write it.
 	// Use the SURN field to generate the sortable names.  Note that this field
-	// may also be used for the 'true' surname, perhaps spelt differently to that
+	// may also be used for the ‘true’ surname, perhaps spelt differently to that
 	// recorded in the NAME field. e.g.
 	//
 	// 1 NAME Robert /de Gliderow/
diff --git a/library/WT/Menu.php b/library/WT/Menu.php
index cb93949969..a1d4bc473e 100644
--- a/library/WT/Menu.php
+++ b/library/WT/Menu.php
@@ -194,7 +194,7 @@ class WT_Menu {
 	}
 
 	/**
-	* returns the number of submenu's in this menu
+	* returns the number of submenus in this menu
 	* @return int
 	*/
 	function subCount() {
diff --git a/library/WT/Place.php b/library/WT/Place.php
index 8083186920..65f972fc64 100644
--- a/library/WT/Place.php
+++ b/library/WT/Place.php
@@ -106,7 +106,7 @@ class WT_Place {
 		return implode(WT_I18N::$list_separator, $tmp);
 	}
 
-	// For lists and charts, where the full name won't fit.
+	// For lists and charts, where the full name won’t fit.
 	public function getShortName() {
 		global $SHOW_PEDIGREE_PLACES, $SHOW_PEDIGREE_PLACES_SUFFIX;
 
diff --git a/library/WT/Report/Base.php b/library/WT/Report/Base.php
index 9d605d5824..5beac66016 100644
--- a/library/WT/Report/Base.php
+++ b/library/WT/Report/Base.php
@@ -784,7 +784,7 @@ class TextBox extends Element {
 	*/
 	public $padding;
 	/**
-	* Resets this box last height after it's done
+	* Resets this box last height after it’s done
 	*/
 	public $reseth;
 
diff --git a/library/WT/Report/HTML.php b/library/WT/Report/HTML.php
index e40a0c04e1..a409ce27ef 100644
--- a/library/WT/Report/HTML.php
+++ b/library/WT/Report/HTML.php
@@ -518,7 +518,7 @@ class WT_Report_HTML extends WT_Report_Base {
 			foreach ($lines as $line) {
 				$wtext = utf8_wordwrap($line, $lw, "\n", true);
 				$wraptext .= $wtext;
-				// Add a new line as long as it's not the last line
+				// Add a new line as long as it’s not the last line
 				if ($lfct > 1) {
 					$wraptext.= "\n";
 				}
@@ -541,7 +541,7 @@ class WT_Report_HTML extends WT_Report_Base {
 			$htmlcode .= " class=\"". $style["name"]. "\"";
 		}
 		if (!empty($color)) {
-			// Check if Text Color is set and if it's valid HTML color
+			// Check if Text Color is set and if it’s valid HTML color
 			if (preg_match("/#?(..)(..)(..)/", $color)) {
 				$htmlcode .= " style=\"color:$color;\"";
 			}
@@ -865,14 +865,14 @@ class TextBoxHTML extends TextBox {
 				}
 				// Collect the Footnote links
 				elseif ($element->get_type() == "Footnote") {
-					// Check if the Footnote has been set with it's link number
+					// Check if the Footnote has been set with it’s link number
 					$html->checkFootnote($element);
 					// Save first the last element if any
 					if (!empty($lastelement)) {
 						$newelements[] = $lastelement;
 						$lastelement = array();
 					}
-					// Save the Footnote with it's link number as key for sorting later
+					// Save the Footnote with it’s link number as key for sorting later
 					$footnote_element[$element->num] = $element;
 				}
 				//-- do not keep empty footnotes
@@ -996,7 +996,7 @@ class TextBoxHTML extends TextBox {
 				$fH += abs($html->getFootnotesHeight($cW));
 			}
 		}
-		// Add up what's the final height
+		// Add up what’s the final height
 		$cH = $this->height;
 		// If any element exist
 		if ($cE > 0) {
@@ -1040,7 +1040,7 @@ class TextBoxHTML extends TextBox {
 				echo " background-color:", $this->bgcolor, ";";
 			}
 		}
-		// Print padding only when it's set
+		// Print padding only when it’s set
 		if ($this->padding) {
 			// Use Cell around padding to support RTL also
 			echo "padding:", $cP, "pt;";
@@ -1234,7 +1234,7 @@ class TextHTML extends Text {
 					}
 					// Check the Line Feed counter
 					if ($lfct > 1) {
-						// Add a new line feed as long as it's not the last line
+						// Add a new line feed as long as it’s not the last line
 						$newtext.= "\n";
 						// Reset the line width
 						$lw = 0;
@@ -1394,7 +1394,7 @@ class FootnoteHTML extends Footnote {
 					}
 					// Check the Line Feed counter
 					if ($lfct > 1) {
-						// Add a new line feed as long as it's not the last line
+						// Add a new line feed as long as it’s not the last line
 						$newtext.= "\n";
 						// Reset the line width
 						$lw = 0;
diff --git a/library/WT/Report/PDF.php b/library/WT/Report/PDF.php
index dd8c21dc49..cba3f40b05 100644
--- a/library/WT/Report/PDF.php
+++ b/library/WT/Report/PDF.php
@@ -868,14 +868,14 @@ class TextBoxPDF extends TextBox {
 				}
 				// Collect the Footnote links
 				elseif ($element->get_type() == "Footnote") {
-					// Check if the Footnote has been set with it's link number
+					// Check if the Footnote has been set with it’s link number
 					$pdf->checkFootnote($element);
 					// Save first the last element if any
 					if (!empty($lastelement)) {
 						$newelements[] = $lastelement;
 						$lastelement = array();
 					}
-					// Save the Footnote with it's link number as key for sorting later
+					// Save the Footnote with it’s link number as key for sorting later
 					$footnote_element[$element->num] = $element;
 				}
 				//-- do not keep empty footnotes
@@ -996,7 +996,7 @@ class TextBoxPDF extends TextBox {
 				if ($w > $cWT) {
 					$w = $lw[0];
 				}
-				// Footnote is at the bottom of the page. No need to calculate it's height or wrap the text!
+				// Footnote is at the bottom of the page. No need to calculate it’s height or wrap the text!
 				// We are changing the margins anyway!
 				// For anything else but text (images), get the height
 				$eH += $this->elements[$i]->getHeight($pdf);
@@ -1006,7 +1006,7 @@ class TextBoxPDF extends TextBox {
 			//}
 		}
 
-		// Add up what's the final height
+		// Add up what’s the final height
 		$cH = $this->height;
 		// If any element exist
 		if ($cE > 0) {
@@ -1274,7 +1274,7 @@ class TextPDF extends Text {
 					}
 					// Check the Line Feed counter
 					if ($lfct > 1) {
-						// Add a new line as long as it's not the last line
+						// Add a new line as long as it’s not the last line
 						$newtext.= "\n";
 						// Reset the line width
 						$lw = 0;
@@ -1427,7 +1427,7 @@ class FootnotePDF extends Footnote {
 					}
 					// Check the Line Feed counter
 					if ($lfct > 1) {
-						// Add a new line feed as long as it's not the last line
+						// Add a new line feed as long as it’s not the last line
 						$newtext.= "\n";
 						// Reset the line width
 						$lw = 0;
diff --git a/library/WT/Site.php b/library/WT/Site.php
index 3f3b90f69a..9b82b283a5 100644
--- a/library/WT/Site.php
+++ b/library/WT/Site.php
@@ -26,7 +26,7 @@ if (!defined('WT_WEBTREES')) {
 class WT_Site {
 	static $setting=null;
 
-	// Get and Set the site's configuration settings
+	// Get and Set the site’s configuration settings
 	public static function preference($setting_name, $setting_value=null) {
 		// There are lots of settings, and we need to fetch lots of them on every page
 		// so it is quicker to fetch them all in one go.
diff --git a/library/WT/Soundex.php b/library/WT/Soundex.php
index 04bc0a2706..1da1b1c052 100644
--- a/library/WT/Soundex.php
+++ b/library/WT/Soundex.php
@@ -97,7 +97,7 @@ class WT_Soundex {
 	// function call to achieve the desired transformations.
 	//
 	// Note about the use of "\x01":
-	// This code, which can't legitimately occur in the kind of text we're dealing with,
+	// This code, which can’t legitimately occur in the kind of text we're dealing with,
 	// is used as a place-holder so that conditional string replacements can be done.
 	private static $transformNameTable=array(
 		// Force Yiddish ligatures to be treated as separate letters
@@ -736,7 +736,7 @@ class WT_Soundex {
 
 		$result = array_flip(array_flip($result)); // Kill the double results in the array
 
-		// We're done.  All that's left is to sort the result
+		// We're done.  All that’s left is to sort the result
 		sort($result);
 		return $result;
 	}
diff --git a/library/WT/Tree.php b/library/WT/Tree.php
index 574d7d6d68..9463cd7cd3 100644
--- a/library/WT/Tree.php
+++ b/library/WT/Tree.php
@@ -56,7 +56,7 @@ class WT_Tree {
 		$this->imported       =$imported;
 	}
 
-	// Get and Set the tree's configuration settings
+	// Get and Set the tree’s configuration settings
 	public function preference($setting_name, $setting_value=null) {
 		// There are lots of settings, and we need to fetch lots of them on every page
 		// so it is quicker to fetch them all in one go.
@@ -87,7 +87,7 @@ class WT_Tree {
 		}
 	}
 
-	// Get and Set the tree's configuration settings
+	// Get and Set the tree’s configuration settings
 	public function userPreference($user_id, $setting_name, $setting_value=null) {
 		// There are lots of settings, and we need to fetch lots of them on every page
 		// so it is quicker to fetch them all in one go.
@@ -242,7 +242,7 @@ class WT_Tree {
 		set_gedcom_setting($tree_id, 'INDI_FACTS_UNIQUE',            '');
 		set_gedcom_setting($tree_id, 'KEEP_ALIVE_YEARS_BIRTH',       '');
 		set_gedcom_setting($tree_id, 'KEEP_ALIVE_YEARS_DEATH',       '');
-		set_gedcom_setting($tree_id, 'LANGUAGE',                     WT_LOCALE); // Defualt to the current admin's language`
+		set_gedcom_setting($tree_id, 'LANGUAGE',                     WT_LOCALE); // Default to the current admin’s language
 		set_gedcom_setting($tree_id, 'MAX_ALIVE_AGE',                120);
 		set_gedcom_setting($tree_id, 'MAX_DESCENDANCY_GENERATIONS',  '15');
 		set_gedcom_setting($tree_id, 'MAX_PEDIGREE_GENERATIONS',     '10');