diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-10-09 17:59:27 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-10-09 17:59:27 +0000 |
| commit | 0513ef4d17e32c8be1fec6615918e6d694667738 (patch) | |
| tree | f7aad03713f11023643d7c6fb7192b5b96a1ffe2 /phpBB/language/en | |
| parent | 9732b0deb29ed149c4e9b602fc7d16ac721389a6 (diff) | |
| download | forums-0513ef4d17e32c8be1fec6615918e6d694667738.tar forums-0513ef4d17e32c8be1fec6615918e6d694667738.tar.gz forums-0513ef4d17e32c8be1fec6615918e6d694667738.tar.bz2 forums-0513ef4d17e32c8be1fec6615918e6d694667738.tar.xz forums-0513ef4d17e32c8be1fec6615918e6d694667738.zip | |
- added new query type to dbal's sql_build_array
- allow setting custom template path
- adjusted module class to correctly parse trees with more than one category
- added caching to module class
git-svn-id: file:///svn/phpbb/trunk@5268 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/admin.php | 5 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/language/en/admin.php b/phpBB/language/en/admin.php index 9cc232b612..e150053a40 100644 --- a/phpBB/language/en/admin.php +++ b/phpBB/language/en/admin.php @@ -35,13 +35,14 @@ $lang += array( 'NO_ADMIN' => 'You are not authorised to administer this board.', 'NO_FRAMES' => 'Sorry, your browser does not support frames.', - 'ADMIN_TITLE' => 'Administration Panel', + 'ADMIN_PANEL' => 'Administration Control Panel', 'ADMIN' => 'Administration', 'RETURN_TO' => 'Return to ...', 'FORUM_INDEX' => 'Forum Index', 'ADMIN_INDEX' => 'Admin Index', + 'ACP_MAIN' => 'Admin index', 'ACP_INDEX' => 'Admin index', 'ACP_CAT_GENERAL' => 'General', @@ -54,7 +55,7 @@ $lang += array( 'ACP_CAT_USERGROUP' => 'Users & Groups', 'ACP_USERS_MANAGE' => 'Edit user data', - + 'LOGGED_IN_AS' => 'You are logged in as:', 'DB_CAT' => 'Database', 'DB_BACKUP' => 'Backup Database', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 44b20f25fc..524adb2042 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -201,6 +201,7 @@ $lang += array( 'LOGIN_FORUM' => 'To view or post in this forum you must enter a password.', 'LOGIN_INFO' => 'In order to login you must be registered. Registering takes only a few seconds but gives you increased capabilies. The board administrator may also grant additional permissions to registered users. Before you login please ensure you are familiar with our terms of use and related policies. Please ensure you read any forum rules as you navigate around the board.', 'LOGIN_VIEWFORUM' => 'The board administrator requires you to be registered and logged in to view this forum.', + 'LOGOUT' => 'Logout', 'LOGOUT_USER' => 'Logout [ %s ]', 'LOG_ADMIN_AUTH_FAIL' => '<b>Failed administration login attempt</b>', 'LOG_ADMIN_AUTH_SUCCESS'=> '<b>Sucessful administration login</b>', |