mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

other fixes

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@7726 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2007-06-08 08:28:55 +00:00
parent 011b47c01d
commit eaa6669010
6 changed files with 213 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/language/en/acp/board.php
View File

@@ -184,10 +184,10 @@ $lang = array_merge($lang, array(
'ACC_ACTIVATION' => 'Account activation',
'ACC_ACTIVATION_EXPLAIN' => 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations.',
'ACC_ADMIN' => 'Admin',
'ACC_ADMIN' => 'By Admin',
'ACC_DISABLE' => 'Disable',
'ACC_NONE' => 'None',
'ACC_USER' => 'User',
'ACC_USER' => 'By User',
// 'ACC_USER_ADMIN' => 'User + Admin',
'ALLOW_EMAIL_REUSE' => 'Allow e-mail address re-use',
'ALLOW_EMAIL_REUSE_EXPLAIN' => 'Different users can register with the same e-mail address.',

2
phpBB/language/en/acp/common.php
View File

@@ -647,7 +647,7 @@ $lang = array_merge($lang, array(
'LOG_USER_DEL_AVATAR_USER' => '<strong>User avatar removed</strong>',
'LOG_USER_DEL_SIG_USER' => '<strong>User signature removed</strong>',
'LOG_USER_FEEDBACK' => '<strong>Added user feedback</strong><br />» %s',
'LOG_USER_GENERAL' => '<strong>Entry added:</strong><br />%s',
'LOG_USER_GENERAL' => '<strong>Entry added:</strong><br />» %s',
'LOG_USER_INACTIVE_USER' => '<strong>User account de-activated</strong>',
'LOG_USER_LOCK' => '<strong>User locked own topic</strong><br />» %s',
'LOG_USER_MOVE_POSTS_USER' => '<strong>Moved all posts to forum</strong>» %s',