Merge "Bug 1754208: Some more small language fixes"

htdocs/account/cancelrequest.php

@@ -13,7 +13,7 @@ define('INTERNAL', 1);
 define('MENUITEM', 'settings/preferences');
 
 require(dirname(dirname(__FILE__)) . '/init.php');
-define('TITLE', get_string('deleteaccount', 'account', display_name($USER, null, false, false, true)));
+define('TITLE', get_string('deleteaccountuser', 'account', display_name($USER, null, false, false, true)));
 
 if (!$USER->can_delete_self()) {
     throw new AccessDeniedException(get_string('accessdenied', 'error'));

htdocs/account/delete.php

@@ -13,7 +13,7 @@ define('INTERNAL', 1);
 define('MENUITEM', 'settings/preferences');
 
 require(dirname(dirname(__FILE__)) . '/init.php');
-define('TITLE', get_string('deleteaccount', 'account', display_name($USER, null, false, false, true)));
+define('TITLE', get_string('deleteaccountuser', 'account', display_name($USER, null, false, false, true)));
 
 if (!$USER->can_delete_self()) {
     throw new AccessDeniedException(get_string('accessdenied', 'error'));

htdocs/account/resendnotification.php

@@ -13,7 +13,7 @@ define('INTERNAL', 1);
 define('MENUITEM', 'settings/preferences');
 
 require(dirname(dirname(__FILE__)) . '/init.php');
-define('TITLE', get_string('deleteaccount', 'account', display_name($USER, null, false, false, true)));
+define('TITLE', get_string('deleteaccountuser', 'account', display_name($USER, null, false, false, true)));
 
 if (!$USER->can_delete_self()) {
     throw new AccessDeniedException(get_string('accessdenied', 'error'));

htdocs/admin/site/options.php

@@ -328,8 +328,8 @@ $siteoptionform = array(
                 ),
                 'defaultreviewselfdeletion' => array(
                     'type'         => 'switchbox',
-                    'title'        => get_string('defaultreviewselfdeletion', 'admin'),
-                    'description'  => get_string('defaultreviewselfdeletiondescription', 'admin'),
+                    'title'        => get_string('defaultreviewsselfdeletion', 'admin'),
+                    'description'  => get_string('defaultreviewsselfdeletiondescription', 'admin'),
                     'defaultvalue' => get_config('defaultreviewselfdeletion'),
                     'disabled'     => in_array('defaultreviewselfdeletion', $OVERRIDDEN),
                 ),

htdocs/admin/users/institutions.php

@@ -594,8 +594,8 @@ if ($institution || $add) {
     );
     $elements['reviewselfdeletion'] = array(
         'type'         => 'switchbox',
-        'title'        => get_string('reviewselfdeletion', 'admin'),
-        'description'  => get_string('reviewselfdeletiondescription','admin'),
+        'title'        => get_string('reviewsselfdeletion', 'admin'),
+        'description'  => get_string('reviewsselfdeletiondescription','admin'),
         'disabled'     => get_config('defaultreviewselfdeletion') == true,
         'defaultvalue' => get_config('defaultreviewselfdeletion') ? get_config('defaultreviewselfdeletion') : (isset($data->reviewselfdeletion) && $data->reviewselfdeletion),
     );

htdocs/lang/en.utf8/account.php

@@ -75,7 +75,7 @@ Please check that your email account is working as expected before you re-enable
 EOF;
 $string['maildisableddescription'] = 'Sending of email to your account has been disabled. You may <a href="%s">re-enable your email</a> from the account preferences page.';
 
-$string['deleteaccount']  = 'Delete account of user %s';
+$string['deleteaccountuser']  = 'Delete account of %s';
 $string['deleteaccountdescription']  = 'If you delete your account, all your content will be deleted permanently. You cannot get it back. Your profile information and your pages will no longer be visible to other users. The content of any forum posts you have written will still be visible, but your name will no longer be displayed.';
 $string['sendnotificationdescription']  = 'A notification will be sent to an administrator, who needs to approve the deletion of your account. If you request to delete your account, all your personal content will be deleted permanently. That means any files you uploaded, journal entries you wrote, and pages and collections you created will be deleted. You cannot get any of that back. If you uploaded files to groups, created journal entries and portfolios, and contributed to forums there, they will stay on the site, but your name will no longer be displayed.';
 $string['pendingdeletionsince'] = 'Account pending deletion since %s';

htdocs/lang/en.utf8/admin.php

@@ -490,10 +490,10 @@ $string['watchlistdelaydescription'] = 'The delay in minutes between sending ema
 $string['watchlistdelaytitle'] = 'Watchlist notification delay';
 $string['defaultmultipleblogs'] = 'Multiple journals';
 $string['defaultmultipleblogsdescription1'] = 'Allow users to have multiple journals by default. Users can override this in their account settings page.';
-$string['defaultreviewselfdeletion'] = 'Review account before self-deletion';
-$string['defaultreviewselfdeletiondescription'] = 'Force all institutions to review account deletion requests.';
-$string['reviewselfdeletion'] = 'Review account before self-deletion';
-$string['reviewselfdeletiondescription'] = 'An institution administrator must approve the request from users to delete their account.';
+$string['defaultreviewsselfdeletion'] = 'Review accounts before self-deletion';
+$string['defaultreviewsselfdeletiondescription'] = 'Force all institutions to review account deletion requests.';
+$string['reviewsselfdeletion'] = 'Review accounts before self-deletion';
+$string['reviewsselfdeletiondescription'] = 'An institution administrator must approve requests from people who wish to delete their accounts.';
 $string['mathjax'] = 'Enable MathJax';
 $string['mathjaxdescription'] = 'MathJax renders LaTeX markup into properly formatted math and science equations on portfolio pages.';
 $string['mathjaxconfig'] = 'MathJax configuration';
@@ -1371,7 +1371,7 @@ $string['lastupdated'] = 'Last updated on';
 $string['newprivacy'] = 'Before entering your account, please read the information displayed below.';
 $string['privacyagreement'] = 'I consent to the %s';
 $string['privacyagreementdescription'] = 'By choosing "Yes", you give your consent to the clauses of the privacy statement above.';
-$string['privacyagreedto'] = 'You agreed to this %s in %s.';
+$string['privacyagreedto'] = 'You consented to this %s in %s.';
 $string['agreementsaved'] = 'Agreement saved';
 $string['refuseprivacy'] = 'Refuse privacy statement or terms and conditions';
 $string['confirmprivacyrefusal'] = 'Are you really sure you wish to continue?';