Chart options. Use friendly "Individual", instead of "Root Person ID"

11 files changed, 13 insertions, 19 deletions

diff --git a/ancestry.php b/ancestry.php
index 363f7da29d..95a561de28 100644
--- a/ancestry.php
+++ b/ancestry.php
@@ -64,7 +64,7 @@ echo WT_JS_START, 'var pastefield; function paste_id(value) {pastefield.value=va
 
 	<!-- // NOTE: Root ID -->
 <tr>
-	<td class="descriptionbox"><?php echo WT_I18N::translate('Root Person ID'), help_link('rootid'); ?></td>
+	<td class="descriptionbox"><?php echo WT_I18N::translate('Individual'); ?></td>
 <td class="optionbox">
 <input class="pedigree_form" type="text" name="rootid" id="rootid" size="3" value="<?php echo htmlspecialchars($controller->rootid); ?>" />
 <?php print_findindi_link('rootid', ''); ?>
diff --git a/compact.php b/compact.php
index 636ba5a088..bac175dc0f 100644
--- a/compact.php
+++ b/compact.php
@@ -72,7 +72,7 @@ echo '<tr>';
 
 // NOTE: Root ID
 echo '<td class="descriptionbox">';
-echo WT_I18N::translate('Root Person ID'), help_link('rootid'), '</td>';
+echo WT_I18N::translate('Individual'), '</td>';
 echo '<td class="optionbox vmiddle">';
 echo '<input class="pedigree_form" type="text" name="rootid" id="rootid" size="3" value="', $rootid, '" />';
 print_findindi_link('rootid','');
diff --git a/descendancy.php b/descendancy.php
index d5ee0effed..f31a3f6963 100644
--- a/descendancy.php
+++ b/descendancy.php
@@ -61,7 +61,7 @@ echo '</td><td width="50px">&nbsp;</td><td><form method="get" name="people" acti
 echo '<input type="hidden" name="show_full" value="', $controller->show_full, '" />';
 echo '<table class="list_table">';
 echo '<tr><td class="descriptionbox">';
-echo WT_I18N::translate('Root Person ID'), help_link('desc_rootid'), '</td>';
+echo WT_I18N::translate('Individual'), '</td>';
 echo '<td class="optionbox">';
 echo '<input class="pedigree_form" type="text" id="rootid" name="rootid" size="3" value="', $controller->rootid, '" />';
 print_findindi_link("rootid", "");
diff --git a/familybook.php b/familybook.php
index a44220c78d..cec89be6fc 100644
--- a/familybook.php
+++ b/familybook.php
@@ -247,7 +247,7 @@ $gencount=0;
 <table><tr>
 
 <td class="descriptionbox">
-	<?php echo WT_I18N::translate('Root Person ID'), help_link('desc_rootid'); ?>
+	<?php echo WT_I18N::translate('Individual'); ?>
 </td>
 <td class="optionbox">
 	<input class="pedigree_form" type="text" name="rootid" id="rootid" size="3" value="<?php echo $pid; ?>" />
diff --git a/fanchart.php b/fanchart.php
index c52578cbdc..ccc7d0d526 100644
--- a/fanchart.php
+++ b/fanchart.php
@@ -411,7 +411,7 @@ echo '<table class="list_table"><tr>';
 
 // NOTE: rootid
 echo '<td class="descriptionbox">';
-echo WT_I18N::translate('Individual'), help_link('rootid');
+echo WT_I18N::translate('Individual');
 echo '</td><td class="optionbox">';
 echo '<input class="pedigree_form" type="text" name="rootid" id="rootid" size="3" value="', $rootid, '" />';
 print_findindi_link('rootid', '');
diff --git a/help_text.php b/help_text.php
index 4986dd5ca6..69dd95e893 100644
--- a/help_text.php
+++ b/help_text.php
@@ -2216,11 +2216,6 @@ case 'desc_generations':
 	$text=WT_I18N::translate('Here you can set the number of generations to display on this page.<br /><br />The right number for you depends of the size of your screen and whether you show details or not.  Processing time will increase as you increase the number of generations.');
 	break;
 
-case 'desc_rootid':
-	$title=WT_I18N::translate('Root individual');
-	$text=WT_I18N::translate('If you want to display a chart with a new starting (root) person, the ID of that new starting person is typed here.<br /><br />If you don\'t know the ID of that person, use the <b>Find ID</b> link.<br /><br /><b>ID NUMBER</b><br />The ID numbers used inside <b>webtrees</b> are <u>not</u> the identification numbers issued by various governments (driving permit or passport numbers, for instance).  The ID number referred to here is simply a number used within the database to uniquely identify each individual; it was assigned by the ancestry program that created the GEDCOM file which was imported into <b>webtrees</b>.');
-	break;
-
 case 'download_gedcom':
 	$title=WT_I18N::translate('Download family tree');
 	$text=WT_I18N::translate('This option will download the family tree to a GEDCOM file on your computer.');
@@ -2676,11 +2671,6 @@ case 'role':
 		'</dd>';
 	break;
 
-case 'rootid':
-	$title=WT_I18N::translate('Pedigree chart root person');
-	$text=WT_I18N::translate('If you want to display a chart with a new starting (root) person, the ID of that new starting person is typed here.<br /><br />If you don\'t know the ID of that person, use the <b>Find ID</b> link.<br /><br /><b>ID NUMBER</b><br />The ID numbers used inside <b>webtrees</b> are <u>not</u> the identification numbers issued by various governments (driving permit or passport numbers, for instance).  The ID number referred to here is simply a number used within the database to uniquely identify each individual; it was assigned by the ancestry program that created the GEDCOM file which was imported into <b>webtrees</b>.');
-	break;
-
 case 'search_exclude_tags':
 	$title=WT_I18N::translate('Exclude filter');
 	$text=WT_I18N::translate('The <b>Exclude some non-genealogical data</b> choice will cause the Search function to ignore the following GEDCOM tags:<div style="padding-left:30px;"><b>_WT_USER</b> - Last change by<br /><b>CHAN</b> - Last change date<br /><b>FILE</b> - External File<br /><b>FORM</b> - Format<br /><b>TYPE</b> - Type<br /><b>SUBM</b> - Submitter<br /><b>REFN</b> - Reference Number</div><br />In addition to these optionally excluded tags, the Search function always excludes these tags:<div style="padding-left:30px;"><b>_UID</b> - Globally unique Identifier<br /><b>RESN</b> - Restriction</div>');
diff --git a/hourglass.php b/hourglass.php
index 35f753107a..1d0adeece5 100644
--- a/hourglass.php
+++ b/hourglass.php
@@ -53,7 +53,7 @@ $gencount=0;
 
 		<!-- // NOTE: Root ID -->
 	<td class="descriptionbox">
-	<?php echo WT_I18N::translate('Root Person ID'), help_link('desc_rootid'); ?>
+	<?php echo WT_I18N::translate('Individual'); ?>
 	</td>
 	<td class="optionbox">
 	<input class="pedigree_form" type="text" name="rootid" id="rootid" size="3" value="<?php echo $controller->pid; ?>" />
diff --git a/includes/old_messages.php b/includes/old_messages.php
index ca46a4c9f2..aba5c6dfce 100644
--- a/includes/old_messages.php
+++ b/includes/old_messages.php
@@ -63,6 +63,7 @@ exit;
 /* I18N: This message is deleted in webtrees-1.2.5  */ WT_I18N::translate('ID');
 /* I18N: This message is deleted in webtrees-1.2.5  */ WT_I18N::translate('If a person’s name is not known, it should be left blank.  If you enter “Unknown” as a name, it will be listed under “U”.');
 /* I18N: This message is deleted in webtrees-1.2.5  */ WT_I18N::translate('If you have changed your password, you need to confirm it as well.  This is just to make sure that you did not make a typing error in the password field.<br /><br />If the password and its confirmation are not identical, you will get a suitable error message.  You will have to re-type both the original password and its confirmation.');
+/* I18N: This message is deleted in webtrees-1.2.5  */ WT_I18N::translate('If you want to display a chart with a new starting (root) person, the ID of that new starting person is typed here.<br /><br />If you don\'t know the ID of that person, use the <b>Find ID</b> link.<br /><br /><b>ID NUMBER</b><br />The ID numbers used inside <b>webtrees</b> are <u>not</u> the identification numbers issued by various governments (driving permit or passport numbers, for instance).  The ID number referred to here is simply a number used within the database to uniquely identify each individual; it was assigned by the ancestry program that created the GEDCOM file which was imported into <b>webtrees</b>.');
 /* I18N: This message is deleted in webtrees-1.2.5  */ WT_I18N::translate('Image viewer');
 /* I18N: This message is deleted in webtrees-1.2.5  */ WT_I18N::translate('In this box you can change your real name.  This is the name that other users see when you are logged in.<br /><br />Although the choice of what to put into this field is yours, you should inform the administrator when you change it.  When others see an unknown person on-line, they might wonder and ask questions.  The admin can find out without having received your notice, but you should save him that unnecessary work.');
 /* I18N: This message is deleted in webtrees-1.2.5  */ WT_I18N::translate('In this box you have to type your real name.<br /><br />We need your first and last names to determine whether you qualify for an account at this site, and what your rights should be.  This name will be visible to other logged-in family members and users.');
@@ -77,11 +78,14 @@ exit;
 /* I18N: This message is deleted in webtrees-1.2.5  */ WT_I18N::translate('On Mouse Over');
 /* I18N: This message is deleted in webtrees-1.2.5  */ WT_I18N::translate('Partner');
 /* I18N: This message is deleted in webtrees-1.2.5  */ WT_I18N::translate('Passwords must be at least 6 characters long and are case-sensitive, so that "s3CR#t" is different to "S3CR#t".');
+/* I18N: This message is deleted in webtrees-1.2.5  */ WT_I18N::translate('Pedigree chart root person');
 /* I18N: This message is deleted in webtrees-1.2.5  */ WT_I18N::translate('PopUp links on charts');
 /* I18N: This message is deleted in webtrees-1.2.5  */ WT_I18N::translate('Remove custom tags');
 /* I18N: This message is deleted in webtrees-1.2.5  */ WT_I18N::translate('Remove custom webtrees tags? (eg. _WT_USER, _THUM)');
 /* I18N: This message is deleted in webtrees-1.2.5  */ WT_I18N::translate('Result Page');
 /* I18N: This message is deleted in webtrees-1.2.5  */ WT_I18N::translate('Results per page');
+/* I18N: This message is deleted in webtrees-1.2.5  */ WT_I18N::translate('Root individual');
+/* I18N: This message is deleted in webtrees-1.2.5  */ WT_I18N::translate('Root Person ID');
 /* I18N: This message is deleted in webtrees-1.2.5  */ WT_I18N::translate('Search all');
 /* I18N: This message is deleted in webtrees-1.2.5  */ WT_I18N::translate('Search on this level');
 /* I18N: This message is deleted in webtrees-1.2.5  */ WT_I18N::translate('Show married names on individual list');
diff --git a/modules_v3/charts/module.php b/modules_v3/charts/module.php
index 97f74bc435..0c6a54feb1 100644
--- a/modules_v3/charts/module.php
+++ b/modules_v3/charts/module.php
@@ -217,7 +217,7 @@ class charts_WT_Module extends WT_Module implements WT_Module_Block {
 			</td>
 		</tr>
 		<tr>
-			<td class="descriptionbox wrap width33"><?php echo WT_I18N::translate('Root Person ID'); ?></td>
+			<td class="descriptionbox wrap width33"><?php echo WT_I18N::translate('Individual'); ?></td>
 			<td class="optionbox">
 				<input type="text" name="pid" id="pid" value="<?php echo $pid; ?>" size="5" />
 				<?php
diff --git a/modules_v3/googlemap/pedigree_map.php b/modules_v3/googlemap/pedigree_map.php
index 6422ab78db..469cbbd7cd 100644
--- a/modules_v3/googlemap/pedigree_map.php
+++ b/modules_v3/googlemap/pedigree_map.php
@@ -88,7 +88,7 @@ echo '<h2>', $controller->getPageTitle(), '</h2>';
 		<table class="pedigree_table" width="555">
 			<tr>
 				<td class="descriptionbox wrap">
-					<?php echo WT_I18N::translate('Root Person ID'), help_link('rootid'); ?>
+					<?php echo WT_I18N::translate('Individual'); ?>
 				</td>
 				<td class="descriptionbox wrap">
 					<?php echo WT_I18N::translate('Generations'), help_link('PEDIGREE_GENERATIONS'); ?>
diff --git a/pedigree.php b/pedigree.php
index f446add0d1..372787e82e 100644
--- a/pedigree.php
+++ b/pedigree.php
@@ -62,7 +62,7 @@ echo '<h2>', WT_I18N::translate('Pedigree tree of %s', $controller->name), help_
 			</tr>
 			<tr>
 				<td class="descriptionbox wrap">
-					<?php echo WT_I18N::translate('Root Person ID'), help_link('rootid'); ?>
+					<?php echo WT_I18N::translate('Individual'); ?>
 				</td>
 				<td class="descriptionbox wrap">
 					<?php echo WT_I18N::translate('Generations'), help_link('PEDIGREE_GENERATIONS'); ?>