Merge "Reword administration menu title (bug #1037450)"

htdocs/lang/en.utf8/admin.php

@@ -806,7 +806,6 @@ $string['institutionadmin'] = 'Institution admin';
 $string['institutionadministrator'] = 'Institution administrator';
 $string['institutionadmindescription'] = 'If checked, the user can administer all users in this institution.';
 $string['settingsfor'] = 'Settings for:';
-$string['institutionadministration'] = 'Institution administration';
 $string['institutionmembers'] = 'Institution members';
 $string['notadminforinstitution'] = 'You are not an administrator for that institution';
 $string['institutionmemberspagedescription'] = 'On this page, you can see users who have requested membership of your institution and add them as members. You can also remove users from your institution and invite users to join.';

htdocs/lang/en.utf8/mahara.php

@@ -553,8 +553,7 @@ $string['groups']             = 'Groups';
 $string['mygroups']           = 'My groups';
 $string['findgroups']         = 'Find groups';
 $string['returntosite']       = 'Return to site';
-$string['siteadministration'] = 'Site administration';
-$string['institutionadministration'] = 'Institution administration';
+$string['administration'] = 'Administration';
 $string['siteinformation']    = 'Site information';
 $string['institutioninformation'] = 'Institution information';
 

htdocs/theme/default/templates/header/navigation.tpl

@@ -23,9 +23,9 @@
 {if $ADMIN || $INSTITUTIONALADMIN || $STAFF || $INSTITUTIONALSTAFF}
                 <li class="returntosite"><span><a href="{$WWWROOT}" accesskey="h" class="return-site">{str tag="returntosite"}</a></span></li>
 {elseif $USER->get('admin') && !$MOBILE}
-                <li class="siteadmin"><span><a href="{$WWWROOT}admin/" accesskey="a" class="admin-site">{str tag="siteadministration"}</a></span></li>
+                <li class="siteadmin"><span><a href="{$WWWROOT}admin/" accesskey="a" class="admin-site">{str tag="administration"}</a></span></li>
 {elseif $USER->is_institutional_admin() && !$MOBILE}
-                <li class="instituteadmin"><span><a href="{$WWWROOT}admin/users/search.php" accesskey="a" class="admin-user">{str tag="institutionadministration"}</a></span></li>
+                <li class="instituteadmin"><span><a href="{$WWWROOT}admin/users/search.php" accesskey="a" class="admin-user">{str tag="administration"}</a></span></li>
 {elseif $USER->get('staff')}
                 <li class="siteinfo"><span><a href="{$WWWROOT}admin/users/search.php" accesskey="a" class="admin-user">{str tag="siteinformation"}</a></span></li>
 {elseif $USER->is_institutional_staff()}

htdocs/theme/default/templates/viewmicroheader.tpl

@@ -35,9 +35,9 @@
             {/if}
           {/foreach}
           {if $USER->get('admin')}
-            <a href="{$WWWROOT}admin/">{str tag="siteadministration"}</a> |
+            <a href="{$WWWROOT}admin/">{str tag="administration"}</a> |
           {elseif $USER->is_institutional_admin()}
-            <a href="{$WWWROOT}admin/users/search.php">{str tag="institutionadministration"}</a> |
+            <a href="{$WWWROOT}admin/users/search.php">{str tag="administration"}</a> |
           {/if}
 
           {if $mnethost}<a href="{$mnethost.url}">{str tag=backto arg1=$mnethost.name}</a>&nbsp;{/if}

htdocs/theme/raw/templates/header/navigation.tpl

@@ -23,9 +23,9 @@
 {if $ADMIN || $INSTITUTIONALADMIN || $STAFF || $INSTITUTIONALSTAFF}
                 <li class="returntosite"><span><a href="{$WWWROOT}" accesskey="h" class="return-site">{str tag="returntosite"}</a></span></li>
 {elseif $USER->get('admin')}
-                <li class="siteadmin"><span><a href="{$WWWROOT}admin/" accesskey="a" class="admin-site">{str tag="siteadministration"}</a></span></li>
+                <li class="siteadmin"><span><a href="{$WWWROOT}admin/" accesskey="a" class="admin-site">{str tag="administration"}</a></span></li>
 {elseif $USER->is_institutional_admin()}
-                <li class="instituteadmin"><span><a href="{$WWWROOT}admin/users/search.php" accesskey="a" class="admin-user">{str tag="institutionadministration"}</a></span></li>
+                <li class="instituteadmin"><span><a href="{$WWWROOT}admin/users/search.php" accesskey="a" class="admin-user">{str tag="administration"}</a></span></li>
 {elseif $USER->get('staff')}
                 <li class="siteinfo"><span><a href="{$WWWROOT}admin/users/search.php" accesskey="a" class="admin-user">{str tag="siteinformation"}</a></span></li>
 {elseif $USER->is_institutional_staff()}

htdocs/theme/raw/templates/viewmicroheader.tpl

@@ -34,9 +34,9 @@
             {/if}
           {/foreach}
           {if $USER->get('admin')}
-            <a href="{$WWWROOT}admin/">{str tag="siteadministration"}</a> |
+            <a href="{$WWWROOT}admin/">{str tag="administration"}</a> |
           {elseif $USER->is_institutional_admin()}
-            <a href="{$WWWROOT}admin/users/search.php">{str tag="institutionadministration"}</a> |
+            <a href="{$WWWROOT}admin/users/search.php">{str tag="administration"}</a> |
           {/if}
 
           {if $mnethost}<a href="{$mnethost.url}">{str tag=backto arg1=$mnethost.name}</a>&nbsp;{/if}