I18N: "Admin" is used to mean both Administrator and Administration. Use the full word for consistency.

6 files changed, 6 insertions, 12 deletions

diff --git a/help_text.php b/help_text.php
index 55b63aa213..258450842d 100644
--- a/help_text.php
+++ b/help_text.php
@@ -1000,13 +1000,7 @@ case 'RESN':
 		'</li><li><b>'.i18n::translate_c('Restriction status', 'Do not change').'</b><br />'.i18n::translate('This setting has no influence on the visibility of the fact data. It restricts editing rights to site administrators and GEDCOM administrators. If the information applies to the user himself, he can also view and, assuming he has editing rights, edit it.').
 		'</li><li><b>'.i18n::translate_c('Restriction status', 'Privacy').'</b><br />'.i18n::translate('Site administrators and GEDCOM administrators can view and edit the information. If the information applies to the user himself, he can also view and, assuming he has editing rights, edit it. It will be hidden from all other users regardless of their login status.').
 		'</li><li><b>'.i18n::translate_c('Restriction status', 'Confidential').'</b><br />'.i18n::translate('Only site administrators and GEDCOM administrators can view and edit the information. It will be hidden from all other users regardless of their login status.').
-		'</li></ul><br /><table><tr><th></th><th colspan="2">'.i18n::translate('Admin').'</th><th colspan="2">'.i18n::translate('Owner').'</th><th colspan="2">'.i18n::translate('Others').
-		'</th></tr><tr><th></th><th>R</th><th>W</th><th>R</th><th>W</th><th>R</th><th>W</th></tr>'.
-		'<tr><td><img src="images/RESN_none.gif" alt="" /> '.i18n::translate_c('Restriction status', 'None').'</td><th><img src="images/checked.gif" alt="" /></th><th><img src="images/checked.gif" alt="" /></th><th><img src="images/checked_qm.gif" alt="" /></th><th><img src="images/checked_qm.gif" alt="" /></th><th><img src="images/checked_qm.gif" alt="" /></th><th><img src="images/checked_qm.gif" alt="" /></th></tr><tr><td><img src="images/RESN_locked.gif" alt="" /> '.
-		i18n::translate_c('Restriction status', 'Do not change').'</td><th><img src="images/checked.gif" alt="" /></th><th><img src="images/checked.gif" alt="" /></th><th><img src="images/checked_qm.gif" alt="" /></th><th><img src="images/checked_qm.gif" alt="" /></th><th><img src="images/checked_qm.gif" alt="" /></th><th><img src="images/forbidden.gif" alt="" /></th></tr><tr><td><img src="images/RESN_privacy.gif" alt="" /> '.
-		i18n::translate_c('Restriction status', 'Privacy').'</td><th><img src="images/checked.gif" alt="" /></th><th><img src="images/checked.gif" alt="" /></th><th><img src="images/checked_qm.gif" alt="" /></th><th><img src="images/checked_qm.gif" alt="" /></th><th><img src="images/forbidden.gif" alt="" /></th><th><img src="images/forbidden.gif" alt="" /></th></tr><tr><td><img src="images/RESN_confidential.gif" alt="" /> '.
-		i18n::translate_c('Restriction status', 'Confidential').'</td><th><img src="images/checked.gif" alt="" /></th><th><img src="images/checked.gif" alt="" /></th><th><img src="images/forbidden.gif" alt="" /></th><th><img src="images/forbidden.gif" alt="" /></th><th><img src="images/forbidden.gif" alt="" /></th><th><img src="images/forbidden.gif" alt="" /></th></tr></table>'.
-		'<ul><li>R : '.i18n::translate('can read').'</li><li>W : '.i18n::translate('can edit').'</li><li><img src="images/checked_qm.gif" alt="" /> : '.i18n::translate('depends on global privacy settings').'</li></ul>';
+		'</li></ul>';
 	break;
 
 case 'RETI':
diff --git a/includes/classes/class_menubar.php b/includes/classes/class_menubar.php
index d2d9cf8c3e..2888e8b8a2 100644
--- a/includes/classes/class_menubar.php
+++ b/includes/classes/class_menubar.php
@@ -123,7 +123,7 @@ class MenuBar {
 		if (WT_USER_GEDCOM_ADMIN){
 			$menu->addSeparator();
 			//-- admin submenu
-			$submenu = new Menu(i18n::translate('Admin'), "admin.php");
+			$submenu = new Menu(i18n::translate('Administration'), "admin.php");
 			$submenu->addIcon('admin');
 			$submenu->addClass("submenuitem$ff", "submenuitem_hover$ff", "", "icon_small_admin");
 			$menu->addSubmenu($submenu);
diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php
index 0c8de0fe05..b13471f257 100644
--- a/includes/functions/functions_print.php
+++ b/includes/functions/functions_print.php
@@ -596,7 +596,7 @@ function print_user_links() {
 	if (WT_USER_ID) {
 		echo '<a href="edituser.php" class="link">', i18n::translate('Logged in as '), ' (', WT_USER_NAME, ')</a><br />';
 		if (WT_USER_GEDCOM_ADMIN) {
-			echo "<a href=\"admin.php\" class=\"link\">", i18n::translate('Admin'), "</a> | ";
+			echo "<a href=\"admin.php\" class=\"link\">", i18n::translate('Administration'), "</a> | ";
 		}
 		echo "<a href=\"index.php?logout=1\" class=\"link\">", i18n::translate('Logout'), "</a>";
 	} else {
diff --git a/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php b/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php
index 2999b282f3..54eefaa1b9 100644
--- a/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php
+++ b/modules/GEDFact_assistant/_MEDIA/media_0_inverselink.php
@@ -57,7 +57,7 @@ if (empty($linktoid) || empty($linkto)) {
 if (WT_USER_IS_ADMIN) {
 	print_simple_header(i18n::translate('Link media')." ".$toitems);
 }else{
-	print_simple_header(i18n::translate('Admin'));
+	print_simple_header(i18n::translate('Administration'));
 	echo i18n::translate('Unable to authenticate user.');
 }
 
diff --git a/themes/colors/header.php b/themes/colors/header.php
index bb156e7f58..57d0a4fe48 100644
--- a/themes/colors/header.php
+++ b/themes/colors/header.php
@@ -122,7 +122,7 @@ if ($view!='simple') {
 				'<li><a href="edituser.php" class="icon_color">', getUserFullName(WT_USER_ID), '</a></li>',
 				' | <li><a href="index.php?logout=1" class="icon_color">', i18n::translate('Logout'), '</a></li>';
 			if (WT_USER_GEDCOM_ADMIN) {
-				echo ' | <li><a href="admin.php" class="icon_color">', i18n::translate('Admin'), '</a></li>';
+				echo ' | <li><a href="admin.php" class="icon_color">', i18n::translate('Administration'), '</a></li>';
 			}
 			if (WT_USER_CAN_ACCEPT && exists_pending_change()) {
 				echo ' | <li><a href="javascript:;" onclick="window.open(\'edit_changes.php\',\'_blank\',\'width=600,height=500,resizable=1,scrollbars=1\'); return false;" style="color:red;">', i18n::translate('Pending Changes'), '</a></li>';
diff --git a/themes/fab/header.php b/themes/fab/header.php
index c4b221bd28..090bc6fa82 100644
--- a/themes/fab/header.php
+++ b/themes/fab/header.php
@@ -107,7 +107,7 @@ if ($view!='simple') {
 				'<li><a href="edituser.php" class="link">', getUserFullName(WT_USER_ID), '</a></li>',
 				' | <li><a href="index.php?logout=1" class="link">', i18n::translate('Logout'), '</a></li>';
 			if (WT_USER_GEDCOM_ADMIN) {
-				echo ' | <li><a href="admin.php" class="link">', i18n::translate('Admin'), '</a></li>';
+				echo ' | <li><a href="admin.php" class="link">', i18n::translate('Administration'), '</a></li>';
 			}
 			if (WT_USER_CAN_ACCEPT && exists_pending_change()) {
 				echo ' | <li><a href="javascript:;" onclick="window.open(\'edit_changes.php\',\'_blank\',\'width=600,height=500,resizable=1,scrollbars=1\'); return false;" style="color:red;">', i18n::translate('Pending Changes'), '</a></li>';