diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-03-11 12:13:59 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-03-11 12:13:59 +0100 |
| commit | 8b24ccb894b2ec515b4bed3c582b215d1d6baab9 (patch) | |
| tree | 1524b8021d4a0306dab60f07016a76b9853690c6 /phpBB | |
| parent | 4bd5d6c0977bfda1e75665ae28598e0b259c89e7 (diff) | |
| download | forums-8b24ccb894b2ec515b4bed3c582b215d1d6baab9.tar forums-8b24ccb894b2ec515b4bed3c582b215d1d6baab9.tar.gz forums-8b24ccb894b2ec515b4bed3c582b215d1d6baab9.tar.bz2 forums-8b24ccb894b2ec515b4bed3c582b215d1d6baab9.tar.xz forums-8b24ccb894b2ec515b4bed3c582b215d1d6baab9.zip | |
[ticket/9657] Fix some language problems and inconsistences
PHPBB3-9657
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/language/en/acp/permissions_phpbb.php | 6 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/mcp.php | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index 87e316383c..d2834c24f7 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -153,7 +153,7 @@ $lang = array_merge($lang, array( 'acl_f_reply' => array('lang' => 'Can reply to topics', 'cat' => 'post'), 'acl_f_edit' => array('lang' => 'Can edit own posts', 'cat' => 'post'), 'acl_f_delete' => array('lang' => 'Can permanently delete own posts', 'cat' => 'post'), - 'acl_f_softdelete' => array('lang' => 'Can soft delete own posts<br /><em>Soft deleted posts can be restored by moderators, having the approve posts permission.</em>', 'cat' => 'post'), + 'acl_f_softdelete' => array('lang' => 'Can soft delete own posts<br /><em>Moderators, who have the approve posts permission, can restore soft deleted posts.</em>', 'cat' => 'post'), 'acl_f_ignoreflood' => array('lang' => 'Can ignore flood limit', 'cat' => 'post'), 'acl_f_postcount' => array('lang' => 'Increment post counter<br /><em>Please note that this setting only affects new posts.</em>', 'cat' => 'post'), 'acl_f_noapprove' => array('lang' => 'Can post without approval', 'cat' => 'post'), @@ -174,11 +174,11 @@ $lang = array_merge($lang, array( // Moderator Permissions $lang = array_merge($lang, array( 'acl_m_edit' => array('lang' => 'Can edit posts', 'cat' => 'post_actions'), - 'acl_m_delete' => array('lang' => 'Can delete posts permanently', 'cat' => 'post_actions'), + 'acl_m_delete' => array('lang' => 'Can permanently delete posts', 'cat' => 'post_actions'), + 'acl_m_softdelete' => array('lang' => 'Can soft delete posts<br /><em>Moderators, who have the approve posts permission, can restore soft deleted posts.</em>', 'cat' => 'post_actions'), 'acl_m_approve' => array('lang' => 'Can approve posts', 'cat' => 'post_actions'), 'acl_m_report' => array('lang' => 'Can close and delete reports', 'cat' => 'post_actions'), 'acl_m_chgposter' => array('lang' => 'Can change post author', 'cat' => 'post_actions'), - 'acl_m_softdelete' => array('lang' => 'Can soft delete posts<br /><em>Soft deleted posts can be restored by moderators, having the approve posts permission.</em>', 'cat' => 'post_actions'), 'acl_m_restore' => array('lang' => 'Can restore deleted posts', 'cat' => 'post_actions'), 'acl_m_move' => array('lang' => 'Can move topics', 'cat' => 'topic_actions'), diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index ab18a4b1e1..51862830cd 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -513,7 +513,7 @@ $lang = array_merge($lang, array( 'POSTS' => 'Posts', 'POSTS_UNAPPROVED' => 'At least one post in this topic has not been approved.', 'POST_BY_AUTHOR' => 'by', - 'POST_BY_FOE' => 'This post was made by <strong>%1$s</strong> who is currently on your ignore list.', + 'POST_BY_FOE' => '<strong>%1$s</strong>, who is currently on your ignore list, made this post.', 'POST_DISPLAY' => '%1$sDisplay this post%2$s.', 'POST_DAY' => '%.2f posts per day', 'POST_DELETED' => 'Deleted post:', diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index d260093cdb..f25c104545 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -202,9 +202,9 @@ $lang = array_merge($lang, array( 'MCP_QUEUE_UNAPPROVED_TOPICS' => 'Topics awaiting approval', 'MCP_QUEUE_UNAPPROVED_TOPICS_EXPLAIN' => 'This is a list of all topics which require approving before they will be visible to users.', 'MCP_QUEUE_DELETED_POSTS' => 'Deleted posts', - 'MCP_QUEUE_DELETED_POSTS_EXPLAIN' => 'This is a list of all posts which have been deleted. You can restore or permanently delete the posts from this screen.', + 'MCP_QUEUE_DELETED_POSTS_EXPLAIN' => 'This is a list of all soft deleted posts. You can restore or permanently delete the posts from this screen.', 'MCP_QUEUE_DELETED_TOPICS' => 'Deleted topics', - 'MCP_QUEUE_DELETED_TOPICS_EXPLAIN' => 'This is a list of all topics which have been deleted. You can restore or permanently delete the topics from this screen.', + 'MCP_QUEUE_DELETED_TOPICS_EXPLAIN' => 'This is a list of all soft deleted topics. You can restore or permanently delete the topics from this screen.', 'MCP_VIEW_USER' => 'View warnings for a specific user', |