Fixing some strings

diff --git a/admin/settings/authenticationandsecurity.php b/admin/settings/authenticationandsecurity.php
index 42dfc770d5bcefee85182f1ad5137b494161b4a2..c500e5cfd4625b16f008664c003ba42cd503e2f6 100644 (file)
--- a/admin/settings/authenticationandsecurity.php
+++ b/admin/settings/authenticationandsecurity.php
@@ -10,16 +10,16 @@ if (!isset($site)) {
 }
 
 // stuff under the "usermanagement" subcategory
-$ADMIN->add('authenticationandsecurity', new admin_category('usermanagement', get_string('usermanagement', 'admin')), 0);
-$ADMIN->add('usermanagement', new admin_externalpage('editusers', get_string('editusers','admin'), $CFG->wwwroot . '/admin/user.php'), 1);
+$ADMIN->add('authenticationandsecurity', new admin_category('usermanagement', get_string('users')), 0);
+$ADMIN->add('usermanagement', new admin_externalpage('editusers', get_string('userlist','admin'), $CFG->wwwroot . '/admin/user.php'), 1);
 $ADMIN->add('usermanagement', new admin_externalpage('addnewuser', get_string('addnewuser'), $CFG->wwwroot . '/admin/user.php?newuser=true&sesskey='. (isset($USER->sesskey) ? $USER->sesskey : '')), 0);
-$ADMIN->add('usermanagement', new admin_externalpage('uploadusers', get_string('uploadusers','admin'), $CFG->wwwroot . '/admin/uploaduser.php'), 2);
+$ADMIN->add('usermanagement', new admin_externalpage('uploadusers', get_string('uploadusers'), $CFG->wwwroot . '/admin/uploaduser.php'), 2);
 
 
 // stuff under the "roles" subcategory
 $ADMIN->add('authenticationandsecurity', new admin_category('roles', get_string('roles')));
-$ADMIN->add('roles', new admin_externalpage('manageroles', get_string('manageroles', 'admin'), $CFG->wwwroot . '/admin/roles/manage.php'));
-$ADMIN->add('roles', new admin_externalpage('assignsitewideroles', get_string('assignsitewideroles', 'admin'), $CFG->wwwroot . '/admin/roles/assign.php?contextid=' . $site->id));
+$ADMIN->add('roles', new admin_externalpage('manageroles', get_string('manageroles'), $CFG->wwwroot . '/admin/roles/manage.php'));
+$ADMIN->add('roles', new admin_externalpage('assignsitewideroles', get_string('assignsiteroles'), $CFG->wwwroot . '/admin/roles/assign.php?contextid=' . $site->id));
 
 
 
@@ -122,4 +122,4 @@ $ADMIN->add('authenticationandsecurity', $temp);
 
 $ADMIN->add('authenticationandsecurity', new admin_externalpage('userauthentication', get_string('authentication','admin'), $CFG->wwwroot . '/admin/auth.php'));
 
-?>
\ No newline at end of file
+?>

diff --git a/admin/settings/userinterface.php b/admin/settings/userinterface.php
index a71ba189884b733058848894393f19c4d2cfa774..614cba7b01e0b8bb3d08a5017ec367287cd11d34 100644 (file)
--- a/admin/settings/userinterface.php
+++ b/admin/settings/userinterface.php
@@ -111,9 +111,9 @@ $ADMIN->add('userinterface', $temp);
 
 
 
-$ADMIN->add('userinterface', new admin_externalpage('timezoneimport', get_string('timezoneimport'), $CFG->wwwroot . '/admin/timezoneimport.php'));
-$ADMIN->add('userinterface', new admin_externalpage('themeselector', get_string('themeselector', 'admin'), $CFG->wwwroot . '/theme/index.php'));
+$ADMIN->add('userinterface', new admin_externalpage('timezoneimport', get_string('updatetimezones', 'admin'), $CFG->wwwroot . '/admin/timezoneimport.php'));
+$ADMIN->add('userinterface', new admin_externalpage('themeselector', get_string('themes'), $CFG->wwwroot . '/theme/index.php'));
 $ADMIN->add('userinterface', new admin_externalpage('langedit', get_string('langedit', 'admin'), $CFG->wwwroot . '/admin/lang.php'));
 $ADMIN->add('userinterface', new admin_externalpage('langimport', get_string('langimport', 'admin'), $CFG->wwwroot . '/admin/langimport.php'));
 
-?>
\ No newline at end of file
+?>

diff --git a/lang/en_utf8/admin.php b/lang/en_utf8/admin.php
index 26abce5c43d2ef4bfdd54853c6c528dbd3e6cb05..2160ea763e3879968235755942c62f3cb4981a1f 100644 (file)
--- a/lang/en_utf8/admin.php
+++ b/lang/en_utf8/admin.php
@@ -4,6 +4,7 @@
 
 // begin {added with admin cleanup}
 $string['userinterface'] = 'User Interface';
+$string['userlist'] = 'Browse list of users';
 $string['serverinterface'] = 'Server Interface';
 $string['authenticationandsecurity'] = 'Authentication & Security';
 $string['maintenanceandauditing'] = 'Maintenance & Auditing';
@@ -203,6 +204,7 @@ $string['install'] = 'Install selected language pack';
 $string['installedlangs'] = 'Installed language packs';
 $string['invaliduserchangeme'] = 'Username "changeme" is reserved -- you cannot create an account with it.';
 $string['lang16notify'] = 'Moodle 1.6 and above allows you to install and update language packs directly from download.moodle.org by following the link below';
+$string['langedit'] = 'Language editing';
 $string['langimport'] = 'Language import utility';
 $string['langimportsuccess'] = 'Language pack successfully upgraded';
 $string['langpackremoved'] = 'Language pack was uninstalled';
@@ -286,6 +288,7 @@ $string['userscreated']  = 'Users created';
 $string['usersrenamed']  = 'Users renamed';
 $string['usersupdated']  = 'Users updated';
 $string['updateaccounts']  = 'Update existing accounts';
+$string['updatetimezones'] = 'Update timezones';
 $string['upwards']  = 'upwards';
 
 ?>

diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php
index b4758e96a7df0022654fd5bdbef4cb1dc6480b30..6de3e17e37116ea9b1963bd789300cc6e290dce6 100644 (file)
--- a/lang/en_utf8/moodle.php
+++ b/lang/en_utf8/moodle.php
@@ -954,6 +954,7 @@ $string['noteuserschangednonetocourse'] = 'Note: course users need to be restore
 $string['nothingnew'] = 'Nothing new since your last login';
 $string['nothingtodisplay'] = 'Nothing to display';
 $string['noticenewerbackup'] = 'This backup file has been created with Moodle $a->backuprelease ($a->backupversion) and it\'s newer than your currently installed Moodle $a->serverrelease ($a->serverversion). This could cause some inconsistencies because backwards compatibility of backup files cannot be guaranteed.';
+$string['notifications'] = 'Notifications';
 $string['notifyloginfailuresmessage'] = '$a->time, IP: $a->ip, User: $a->info';
 $string['notifyloginfailuresmessageend'] = 'You can view these logs at $a/course/log.php?id=1&chooselog=1&modid=site_errors.';
 $string['notifyloginfailuresmessagestart'] = 'Here is a list of failed login attempts at $a since you were last notified ';