Merge branch 'MDL-49983-master-fix-2' of https://github.com/xow/moodle

nilo72 · May 5, 2015 · ce16ceb · ce16ceb
2 parents d2bec50 + ad13aff
commit ce16ceb
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 8 deletions.
diff --git a/lang/en/badges.php b/lang/en/badges.php
@@ -284,7 +284,6 @@
 $string['makeprivate'] = 'Make private';
 $string['makepublic'] = 'Make public';
 $string['managebadges'] = 'Manage badges';
-$string['managemybadges'] = 'Manage my badges';
 $string['message'] = 'Message body';
 $string['messagebody'] = '<p>You have been awarded the badge "%badgename%"!</p>
 <p>More information about this badge can be found on the %badgelink% badge information page.</p>

diff --git a/lang/en/blog.php b/lang/en/blog.php
@@ -108,7 +108,6 @@
 $string['invalidurl'] = 'This URL is unreachable';
 $string['linktooriginalentry'] = 'Link to original blog entry';
 $string['maxexternalblogsperuser'] = 'Maximum number of external blogs per user';
-$string['myprofilemyblogs'] = 'My blog entries';
 $string['myprofileuserblogs'] = 'View all blog entries';
 $string['name'] = 'Name';
 $string['name_help'] = 'Enter a descriptive name for your external blog. (If no name is supplied, the title of your external blog will be used).';

diff --git a/lang/en/deprecated.txt b/lang/en/deprecated.txt
@@ -12,15 +12,11 @@ lockmethod,core_cache
 lockmethod_help,core_cache
 personalrepositories,core_repository
 siteblog,core_blog
-managemybadges,core_badges
 mybackpack,core_badges
 mybadges,core_badges
 myfiles,core
 myfilesmanage,core
-mygrades,core_grades
-mypreferences,core
 mypreferences,core_grades
 myprofile,core
-myprofilemyblogs,core_blog
 viewallmyentries,core_blog
 userspreferences,core
diff --git a/lang/en/grades.php b/lang/en/grades.php
@@ -459,7 +459,6 @@
 $string['multfactor'] = 'Multiplicator';
 $string['multfactorvalue'] = 'Multiplicator value for {$a}';
 $string['multfactor_help'] = 'The multiplicator is the factor by which all grades for this grade item will be multiplied, with a maximum value of the maximum grade. For example, if the multiplicator is 2 and the maximum grade is 100, then all grades less than 50 are multiplied by 2, and all grades 50 and above are changed to 100.';
-$string['mygrades'] = 'My grades';
 $string['mygrades_desc'] = 'This setting determines the grades link in the user menu. If an external gradebook is used, \'External URL\' should be selected and the URL specified below.';
 $string['mypreferences'] = 'My preferences';
 $string['myreportpreferences'] = 'My report preferences';

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
@@ -1221,7 +1221,6 @@
 $string['myhome'] = 'Dashboard';
 $string['mymoodledashboard'] = 'My Moodle dashboard';
 $string['myprofile'] = 'My profile';
-$string['mypreferences'] = 'My preferences';
 $string['name'] = 'Name';
 $string['nameforlink'] = 'What do you want to call this link?';
 $string['nameforpage'] = 'Name';