diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2004-02-08 00:25:48 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2004-02-08 00:25:48 +0000 |
| commit | 3bdcc8e59c13d678252d0c7ea2d18486a7480f8b (patch) | |
| tree | ab4d57838369f83bdc6cfa28be3d564655361bc2 /phpBB/language | |
| parent | 259881d1bf96df31998aaaf0c0291587d65aa458 (diff) | |
| download | forums-3bdcc8e59c13d678252d0c7ea2d18486a7480f8b.tar forums-3bdcc8e59c13d678252d0c7ea2d18486a7480f8b.tar.gz forums-3bdcc8e59c13d678252d0c7ea2d18486a7480f8b.tar.bz2 forums-3bdcc8e59c13d678252d0c7ea2d18486a7480f8b.tar.xz forums-3bdcc8e59c13d678252d0c7ea2d18486a7480f8b.zip | |
"Overview" functionality ... couple of issues, couple unfinished areas ... topics where user has posted not resyncing correctly when moving posts
git-svn-id: file:///svn/phpbb/trunk@4807 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/lang_admin.php | 35 | ||||
| -rw-r--r-- | phpBB/language/en/lang_main.php | 2 |
2 files changed, 29 insertions, 8 deletions
diff --git a/phpBB/language/en/lang_admin.php b/phpBB/language/en/lang_admin.php index b08d750cf2..db19cbaf65 100644 --- a/phpBB/language/en/lang_admin.php +++ b/phpBB/language/en/lang_admin.php @@ -102,6 +102,9 @@ $lang += array( 'log_index_delete' => '<b>Deleted inactive users</b><br />» %s', 'LOG_INDEX_REMIND' => '<b>Sent reminder emails to inactive users</b><br />» %s', + 'LOG_USER_INACTIVE' => '<b>User deactivated</b><br />» %s', + 'LOG_USER_ACTIVE' => '<b>User activated</b><br />» %s', + 'LOG_MASS_EMAIL' => '<b>Sent mass email</b><br />» %s', 'LOG_MAIL_SESSION' => '<b>Logged Mail Session</b><br />» %s', @@ -1027,7 +1030,8 @@ $lang += array( 'Admin_user_updated' => 'The users profile was successfully updated.', - 'USER_ADMIN_MAIN' => 'Overview', + 'SELECT_FORM' => 'Select form', + 'USER_ADMIN_OVERVIEW' => 'Overview', 'USER_ADMIN_FEEDBACK' => 'Feedback', 'USER_ADMIN_PROFILE' => 'Profile', 'USER_ADMIN_PREFS' => 'Preferences', @@ -1036,6 +1040,20 @@ $lang += array( 'USER_ADMIN_GROUP' => 'Groups', 'USER_ADMIN_PERM' => 'Permissions', + 'FOUNDER' => 'Founder', + 'FOUNDER_EXPLAIN' => 'Founders can never be banned, deleted or altered by non-founder members', + 'USER_INFO' => 'Basic information', + 'REGISTERED' => 'Registered', + 'REGISTERED_IP' => 'Registered from IP', + 'LAST_ACTIVE' => 'Last active', + 'WARNINGS' => 'Warnings', + 'WARNINGS_EXPLAIN' => 'You can directly alter the warnings this users has received.', + 'USER_TOOLS' => 'Basic tools', + 'QUICK_TOOLS' => 'Quick tools', + 'DELETE_USER' => 'Delete users', + 'DELETE_USER_EXPLAIN' => 'Please note that deleting a user is final, they cannot be recovered', + 'RETAIN_POSTS' => 'Retain posts', + 'DELETE_POSTS' => 'Delete posts', 'USER_ADMIN_BAN_USER' => 'Ban by username', 'USER_ADMIN_BAN_EMAIL' => 'Ban by email', 'USER_ADMIN_BAN_IP' => 'Ban by IP', @@ -1043,15 +1061,16 @@ $lang += array( 'USER_ADMIN_DEACTIVATE' => 'Deactivate account', 'USER_ADMIN_ACTIVATE' => 'Activate account', 'USER_ADMIN_MOVE_POSTS' => 'Move all posts', + 'MOVE_POSTS_EXPLAIN' => 'Please select the forum to which you wish to move all the posts this user has made.', - 'User_delete' => 'Delete this user', - 'User_delete_explain' => 'Click here to delete this user, this cannot be undone.', - 'User_deleted' => 'User was successfully deleted.', - 'User_status' => 'User is active', - 'User_allowpm' => 'Can send Private Messages', - 'User_allowavatar' => 'Can display avatar', - 'Admin_avatar_explain' => 'Here you can see and delete the users current avatar.', + 'USER_ADMIN_BAN_NAME_REASON' => 'Username banned via user management', + 'USER_ADMIN_BAN_IP_REASON' => 'IP banned via user management', + 'USER_ADMIN_BAN_EMAIL_REASON' => 'Email address banned via user management', + 'USER_DELETED' => 'User deleted successfully', + 'USER_OVERVIEW_UPDATED' => 'User details updated', + 'USER_ADMIN_INACTIVE' => 'User deactivated successfully.', + 'USER_ADMIN_ACTIVE' => 'User activated successfully.', ); // Group admin diff --git a/phpBB/language/en/lang_main.php b/phpBB/language/en/lang_main.php index 05b60ce7fa..35d3115a97 100644 --- a/phpBB/language/en/lang_main.php +++ b/phpBB/language/en/lang_main.php @@ -849,6 +849,8 @@ $lang += array( 'TOO_SHORT_NEW_PASSWORD' => 'The password you entered is too short.', 'USERNAME_TAKEN_USERNAME' => 'The username you entered is already in use, please select an alternative.', 'EMAIL_TAKEN_EMAIL' => 'The email address you specified is already in use, please select an alternative.', + 'TOO_SHORT_USER_PASSWORD' => 'The password you entered is too short.', + 'TOO_LONG_USER_PASSWORD' => 'The password you entered is too long.', 'ACCOUNT_ADDED' => 'Thank you for registering, your account has been created. You may now login with your username and password', 'ACCOUNT_INACTIVE' => 'Your account has been created. However, this forum requires account activation, an activation key has been sent to the email address you provided. Please check your email for further information', |