L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-57563 lang: Merge English strings from the en_fix language pack

Browse Source
This commit is contained in:
Helen Foster
2017-01-05 10:46:12 +01:00
committed by David Mudrák
parent 6b5bff8870
commit 530656cedb
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/en/admin.php
+1 -1
View File
@@ -27,7 +27,7 @@ $string['accounts'] = 'Accounts';
$string['addcategory'] = 'Add a category';
$string['additionalhtml'] = 'Additional HTML';
$string['additionalhtml_heading'] = 'Additional HTML to be added to every page.';
$string['additionalhtml_desc'] = 'These settings allow you to specify HTML that you want added to every page. You can set HTML that will be added within the HEAD tag for the page, immediately after the BODY tag has been opened, or immediately before the body tag is closed.<br />Doing this allows you add custom headers or footers on every page, or add support for services like Google Analytics very easily and independent of your chosen theme.';
$string['additionalhtml_desc'] = 'These settings allow you to specify HTML that you want added to every page. You can set HTML that will be added within the HEAD tag for the page, immediately after the BODY tag has been opened, or immediately before the body tag is closed.<br />Doing this allows you to add custom headers or footers on every page, or add support for services like Google Analytics very easily, independent of your chosen theme.';
$string['additionalhtmlhead'] = 'Within HEAD';
$string['additionalhtmlhead_desc'] = 'Content here will be added to the bottom of the HEAD tag for every page.';
$string['additionalhtmltopofbody'] = 'When BODY is opened';
lang/en/moodle.php
+5 -11
View File
@@ -666,20 +666,14 @@ If you need help, please contact the site administrator,
{$a->admin}';
$string['emailpasswordchangeinfodisabled'] = 'Hi {$a->firstname},
Someone (probably you) has requested a new password for your
account on \'{$a->sitename}\'.
Someone (probably you) has requested a new password for your account on \'{$a->sitename}\'.
Unfortunately your account on this site is disabled and can not be reset,
please contact the site administrator,
{$a->admin}';
Unfortunately your account on this site is disabled, so the password cannot be reset. Please contact the site administrator {$a->admin}.';
$string['emailpasswordchangeinfofail'] = 'Hi {$a->firstname},
Someone (probably you) has requested a new password for your
account on \'{$a->sitename}\'.
Someone (probably you) has requested a new password for your account on \'{$a->sitename}\'.
Unfortunately passwords can not be reset on this site,
please contact the site administrator,
{$a->admin}';
Unfortunately passwords cannot be reset on this site. Please contact the site administrator {$a->admin}.';
$string['emailpasswordchangeinfosubject'] = '{$a}: Change password information';
$string['emailpasswordsent'] = 'Thank you for confirming the change of password.
An email containing your new password has been sent to your address at<br /><b>{$a->email}</b>.<br />
@@ -1256,7 +1250,7 @@ $string['newsectionname'] = 'New name for section {$a}';
$string['newsitem'] = 'news item';
$string['newsitems'] = 'news items';
$string['newsitemsnumber'] = 'News items to show';
$string['newsitemsnumber_help'] = 'This setting determines how many recent items appear in the latest news block on the course page. If set to "0 news items" then the latest news block will not be displayed.';
$string['newsitemsnumber_help'] = 'This setting determines how many recent items appear in the latest announcements block on the course page. If set to zero, the latest announcements block will not be displayed.';
$string['newuser'] = 'New user';
$string['newusernewpasswordsubj'] = 'New user account';
$string['newusernewpasswordtext'] = 'Hi {$a->firstname},