aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp/users.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-04-22 15:27:40 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-04-22 15:27:40 +0000
commit550f270a0027e67a0eb19d99fbe54d6045696a0b (patch)
treec0a38cbb0715d7a17b7226c134568d9392e550da /phpBB/language/en/acp/users.php
parent782c536c703959c643dc77b846c9617326b2a98e (diff)
downloadforums-550f270a0027e67a0eb19d99fbe54d6045696a0b.tar
forums-550f270a0027e67a0eb19d99fbe54d6045696a0b.tar.gz
forums-550f270a0027e67a0eb19d99fbe54d6045696a0b.tar.bz2
forums-550f270a0027e67a0eb19d99fbe54d6045696a0b.tar.xz
forums-550f270a0027e67a0eb19d99fbe54d6045696a0b.zip
#10005, #10003, #10001, #9999, #9945, #9965, #9909, #9906, #9877, #9861, #9831, #9830, #9815, #9665, #9624
prosilver adjustments for important announcements in ucp - #9995 MCP fixes for user notes/warnings - #9981 Preserving imageset values on save/edit find a member link for Mass PM's - #9925 syndicate window.onload events where necessary - #9878 Duplicate topics in forums with announcements - #9840 Email template for forced re-activation - #9808 Topic pagination adjustment - #9763 Changed compose message layout in UCP - #9706, #9702 Fixed inline attachment font size (hopefully) git-svn-id: file:///svn/phpbb/trunk@7384 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp/users.php')
-rw-r--r--phpBB/language/en/acp/users.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
index 41deacbcaf..abcc874e40 100644
--- a/phpBB/language/en/acp/users.php
+++ b/phpBB/language/en/acp/users.php
@@ -54,7 +54,7 @@ $lang = array_merge($lang, array(
'DELETE_USER' => 'Delete user',
'DELETE_USER_EXPLAIN' => 'Please note that deleting a user is final, they cannot be recovered',
- 'FORCE_REACTIVATION_SUCCESS' => 'Successfully forced re-activation.',
+ 'FORCE_REACTIVATION_SUCCESS' => 'Successfully forced reactivation.',
'FOUNDER' => 'Founder',
'FOUNDER_EXPLAIN' => 'Founders have all admin permissions and can never be banned, deleted or altered by non-founder members',
@@ -99,7 +99,7 @@ $lang = array_merge($lang, array(
'USER_ADMIN_DEL_POSTS' => 'Delete all posts',
'USER_ADMIN_DEL_SIG' => 'Delete signature',
'USER_ADMIN_EXPLAIN' => 'Here you can change your users information and certain specific options. To modify the users permissions please use the user and group permissions system.',
- 'USER_ADMIN_FORCE' => 'Force re-activation',
+ 'USER_ADMIN_FORCE' => 'Force reactivation',
'USER_ADMIN_MOVE_POSTS' => 'Move all posts',
'USER_ADMIN_SIG_REMOVED' => 'Successfully removed signature from user account.',
'USER_ATTACHMENTS_REMOVED' => 'Successfully removed all attachments made by this user.',