diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-12 23:19:55 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-12 23:19:55 +0000 |
| commit | 9988679d567a8bba9bade92dd9524bb012a1fe43 (patch) | |
| tree | 72da21e7465fed3ca99f20bd809a3df9c020530d /phpBB/language/en/acp/common.php | |
| parent | f4cfd3665f7cf1ed96ce4c2eca03ac6854aae258 (diff) | |
| download | forums-9988679d567a8bba9bade92dd9524bb012a1fe43.tar forums-9988679d567a8bba9bade92dd9524bb012a1fe43.tar.gz forums-9988679d567a8bba9bade92dd9524bb012a1fe43.tar.bz2 forums-9988679d567a8bba9bade92dd9524bb012a1fe43.tar.xz forums-9988679d567a8bba9bade92dd9524bb012a1fe43.zip | |
- streamlined reports to consist of the feature set we decided upon (Nils, your turn now)
- use getenv instead of $_ENV (with $_ENV the case could be wrong)
- permission fixes (there was a bug arising with getting permission flags - re-added them and handled roles deletion differently)
- implemented max login attempts
- changed the expected return parameters for logins/sessions
- added acp page for editing report/denial reasons
- other fixes here and there
git-svn-id: file:///svn/phpbb/trunk@5622 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp/common.php')
| -rw-r--r-- | phpBB/language/en/acp/common.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 32a7bed741..1b2f237da2 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -104,6 +104,7 @@ $lang = array_merge($lang, array( 'ACP_MANAGE_EXTENSIONS' => 'Manage Extensions', 'ACP_MANAGE_FORUMS' => 'Manage Forums', 'ACP_MANAGE_RANKS' => 'Manage Ranks', + 'ACP_MANAGE_REASONS' => 'Manage Report/Denial Reasons', 'ACP_MANAGE_USERS' => 'Manage Users', 'ACP_MASS_EMAIL' => 'Mass Email', 'ACP_MESSAGES' => 'Messages', @@ -124,6 +125,7 @@ $lang = array_merge($lang, array( 'ACP_PRUNING' => 'Pruning', 'ACP_RANKS' => 'Ranks', + 'ACP_REASONS' => 'Report/Denial Reasons', 'ACP_SERVER_CONFIGURATION' => 'Server Configuration', 'ACP_SERVER_SETTINGS' => 'Server Settings', @@ -458,6 +460,10 @@ $lang = array_merge($lang, array( 'LOG_PRUNE_USER_DEL_DEL' => '<b>Users pruned and posts deleted</b><br />» %s', 'LOG_PRUNE_USER_DEL_ANON' => '<b>Users pruned and posts retained</b><br />» %s', + 'LOG_REASON_ADDED' => '<b>Added report/denial reason</b><br />» %s', + 'LOG_REASON_REMOVED' => '<b>Removed report/denial reason</b><br />» %s', + 'LOG_REASON_UPDATED' => '<b>Updated report/denial reason</b><br />» %s', + 'LOG_RESET_DATE' => '<b>Board start date reset</b>', 'LOG_RESET_ONLINE' => '<b>Most users online reset</b>', 'LOG_RESYNC_POSTCOUNTS' => '<b>User postcounts synced</b>', |