diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-06-08 08:28:55 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-06-08 08:28:55 +0000 |
| commit | eaa66690104c130eb15aef16a01a393611d257a8 (patch) | |
| tree | 61068cb11896b28b7cfc7b248fce321f8176e2ab /phpBB/language | |
| parent | 011b47c01deded9e8e933cd1ca48fa4cec557ee5 (diff) | |
| download | forums-eaa66690104c130eb15aef16a01a393611d257a8.tar forums-eaa66690104c130eb15aef16a01a393611d257a8.tar.gz forums-eaa66690104c130eb15aef16a01a393611d257a8.tar.bz2 forums-eaa66690104c130eb15aef16a01a393611d257a8.tar.xz forums-eaa66690104c130eb15aef16a01a393611d257a8.zip | |
other fixes
git-svn-id: file:///svn/phpbb/trunk@7726 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index b7b3cd2b44..2c8d60565e 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -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.', diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 47a3442187..64de2e9ed7 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -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', |