diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-27 17:43:55 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-12-27 17:43:55 +0000 |
| commit | 945afbc5fa427f6e6fa15f3e2f5c67969121b01e (patch) | |
| tree | 1742cf822c3339eec48d8d54e6ce08c51316b59b /phpBB/language/en/acp | |
| parent | b9da985180730252133699242ef639f91da2880e (diff) | |
| download | forums-945afbc5fa427f6e6fa15f3e2f5c67969121b01e.tar forums-945afbc5fa427f6e6fa15f3e2f5c67969121b01e.tar.gz forums-945afbc5fa427f6e6fa15f3e2f5c67969121b01e.tar.bz2 forums-945afbc5fa427f6e6fa15f3e2f5c67969121b01e.tar.xz forums-945afbc5fa427f6e6fa15f3e2f5c67969121b01e.zip | |
Unused Code inside function update_forum_data [Bug #6606]
Copy permissions protection for groups [Bug #6594]
HTML issues in ACP [Bug #6580, #6578]
Always send the correct encoding [related to bug #6576]
Mass email fixes for first loop iteration [Bug #6570]
Extension groups to be allowed in PM's and/or Posts [Bug #6558]
Extension allowance checking clarified (no longer using forum id 0 for private messaging)
Using request_var() array method for some variables [Bug #6556]
Added confirmation for deletion of ranks/smilies/icons/word censores [Bug #6548, #6530, #6512, #6466]
Only show postable forums in dropdown list for moving posts on forum deletion as well as correct re-indexing [Bug #6510, #6476, #6384]
Jabber password being password field in jabber settings screen [Bug #6478]
user activity language variable if viewing not own profile [Bug #6432]
Show moderator group/user-name colour [Bug #6402]
Log rank creation/updating/removing [Bug #6398]
Update check permission changed from a_ to a_board [Bug #6392]
git-svn-id: file:///svn/phpbb/trunk@6816 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp')
| -rw-r--r-- | phpBB/language/en/acp/attachments.php | 1 | ||||
| -rw-r--r-- | phpBB/language/en/acp/board.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/acp/permissions_phpbb.php | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php index c906834f5d..85143d3eb2 100644 --- a/phpBB/language/en/acp/attachments.php +++ b/phpBB/language/en/acp/attachments.php @@ -121,6 +121,7 @@ $lang = array_merge($lang, array( 'NO_UPLOAD_DIR' => 'The upload directory you specified does not exist.', 'NO_WRITE_UPLOAD' => 'The upload directory you specified cannot be written to. Please alter the permissions to allow the webserver to write to it.', + 'ONLY_ALLOWED_IN_PM' => 'Only allowed in private messages', 'ORDER_ALLOW_DENY' => 'Allow', 'ORDER_DENY_ALLOW' => 'Deny', diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 3aee12ad37..3bf098312c 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -315,8 +315,6 @@ $lang = array_merge($lang, array( 'RANKS_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. <samp>images/ranks</samp>', 'SCRIPT_PATH' => 'Script path', 'SCRIPT_PATH_EXPLAIN' => 'The path where phpBB is located relative to the domain name, e.g. <samp>/phpBB3</samp>', - 'SEND_ENCODING' => 'Send encoding', - 'SEND_ENCODING_EXPLAIN' => 'Send the file encoding from phpBB via HTTP overriding the webserver’s configuration', 'SERVER_NAME' => 'Domain name', 'SERVER_NAME_EXPLAIN' => 'The domain name this board runs from (for example: <samp>www.foo.bar</samp>)', 'SERVER_PORT' => 'Server port', diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index e60eda4209..8ac4602dd9 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -559,6 +559,10 @@ $lang = array_merge($lang, array( 'LOG_PRUNE_USER_DEL_DEL' => '<strong>Users pruned and posts deleted</strong><br />» %s', 'LOG_PRUNE_USER_DEL_ANON' => '<strong>Users pruned and posts retained</strong><br />» %s', + 'LOG_RANK_ADDED' => '<strong>Added new rank</strong><br />» %s', + 'LOG_RANK_REMOVED' => '<strong>Removed rank</strong><br />» %s', + 'LOG_RANK_UPDATED' => '<strong>Updated rank</strong><br />» %s', + 'LOG_REASON_ADDED' => '<strong>Added report/denial reason</strong><br />» %s', 'LOG_REASON_REMOVED' => '<strong>Removed report/denial reason</strong><br />» %s', 'LOG_REASON_UPDATED' => '<strong>Updated report/denial reason</strong><br />» %s', diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index df2d9e8c6f..8f936ec6e1 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -181,7 +181,7 @@ $lang = array_merge($lang, array( // Admin Permissions $lang = array_merge($lang, array( - 'acl_a_board' => array('lang' => 'Can alter board settings', 'cat' => 'settings'), + 'acl_a_board' => array('lang' => 'Can alter board settings/check for updates', 'cat' => 'settings'), 'acl_a_server' => array('lang' => 'Can alter server/communication settings', 'cat' => 'settings'), 'acl_a_jabber' => array('lang' => 'Can alter Jabber settings', 'cat' => 'settings'), 'acl_a_phpinfo' => array('lang' => 'Can view php settings', 'cat' => 'settings'), |