diff options
| author | Nils Adermann <naderman@naderman.de> | 2007-04-15 10:59:26 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-04-15 10:59:26 +0000 |
| commit | fb2454314450ad36dc5c1480749dad51d9d1c87e (patch) | |
| tree | dd503ebacd6c8b112193fb3739e779fce81333b8 /phpBB/language | |
| parent | 5cde784419c77fe808e03b47007ef8f12fa83049 (diff) | |
| download | forums-fb2454314450ad36dc5c1480749dad51d9d1c87e.tar forums-fb2454314450ad36dc5c1480749dad51d9d1c87e.tar.gz forums-fb2454314450ad36dc5c1480749dad51d9d1c87e.tar.bz2 forums-fb2454314450ad36dc5c1480749dad51d9d1c87e.tar.xz forums-fb2454314450ad36dc5c1480749dad51d9d1c87e.zip | |
- m_warn is no longer a local moderation permission
- magic urls should properly use html entities
- speed up posting on big boards, MAX(post_id) query can be simplified a lot in certain cases
- user IP list should be labelled with "Other users" [Bug #9707]
git-svn-id: file:///svn/phpbb/trunk@7355 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/permissions_phpbb.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/mcp.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index 47105d8828..97b7425f52 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -175,7 +175,7 @@ $lang = array_merge($lang, array( 'acl_m_merge' => array('lang' => 'Can merge topics', 'cat' => 'topic_actions'), 'acl_m_info' => array('lang' => 'Can view post details', 'cat' => 'misc'), - 'acl_m_warn' => array('lang' => 'Can issue warnings', 'cat' => 'misc'), + 'acl_m_warn' => array('lang' => 'Can issue warnings', 'cat' => 'misc'), // This moderator setting is only global (and not local) 'acl_m_ban' => array('lang' => 'Can manage bans', 'cat' => 'misc'), // This moderator setting is only global (and not local) )); diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index d985cb6c6d..433846b402 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -222,7 +222,7 @@ $lang = array_merge($lang, array( 'NO_TOPICS_QUEUE' => 'No topics', 'ONLY_TOPIC' => 'Only topic "%s"', - 'OTHER_USERS' => 'Users posting from this IP', + 'OTHER_USERS' => 'Other users posting from this IP', 'POSTER' => 'Poster', 'POSTS_APPROVED_SUCCESS' => 'The selected posts have been approved', |