aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-02-23 13:50:27 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-02-23 13:50:27 +0000
commite855a348e3bb762ed2afd01343123980c26e6d46 (patch)
tree321611ff71907583894a8605718ac7336ba4ff1b /phpBB/language/en/acp
parent85a4e318819d4322684e8ee17d030064e8987a6b (diff)
downloadforums-e855a348e3bb762ed2afd01343123980c26e6d46.tar
forums-e855a348e3bb762ed2afd01343123980c26e6d46.tar.gz
forums-e855a348e3bb762ed2afd01343123980c26e6d46.tar.bz2
forums-e855a348e3bb762ed2afd01343123980c26e6d46.tar.xz
forums-e855a348e3bb762ed2afd01343123980c26e6d46.zip
- fixed some convertor bugs
- adjusted forum standard access (+polls) role to include f_delete (no update, only new installations will have the change included) git-svn-id: file:///svn/phpbb/trunk@7040 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp')
-rw-r--r--phpBB/language/en/acp/board.php2
-rw-r--r--phpBB/language/en/acp/permissions.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 865a68d60b..16fd53ce71 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -308,7 +308,7 @@ $lang = array_merge($lang, array(
'ENABLE_GZIP' => 'Enable GZip compression',
'FORCE_SERVER_VARS' => 'Force server URL settings',
- 'FORCE_SERVER_VARS_EXPLAIN' => 'If set to yes the server settings defined here will be used in favour of the automatically determined values',
+ 'FORCE_SERVER_VARS_EXPLAIN' => 'If set to yes the server settings defined here will be used in favour of the automatically determined values.',
'ICONS_PATH' => 'Post icons storage path',
'ICONS_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. <samp>images/icons</samp>',
'PATH_SETTINGS' => 'Path settings',
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index e29067895a..70226c0684 100644
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -181,7 +181,7 @@ $lang = array_merge($lang, array(
'ROLE_DESCRIPTION_FORUM_ONQUEUE' => 'Can use most forum features including attachments, but posts and topics need to be approved by a moderator.',
'ROLE_DESCRIPTION_FORUM_POLLS' => 'Like Standard Access but can also create polls.',
'ROLE_DESCRIPTION_FORUM_READONLY' => 'Can read the forum, but cannot create new topics or reply to posts.',
- 'ROLE_DESCRIPTION_FORUM_STANDARD' => 'Can use most forum features including attachments, but cannot lock or delete own topics, and cannot create polls.',
+ 'ROLE_DESCRIPTION_FORUM_STANDARD' => 'Can use most forum features including attachments and deleting own topics, but cannot lock own topics, and cannot create polls.',
'ROLE_DESCRIPTION_MOD_FULL' => 'Can use all moderating features, including banning.',
'ROLE_DESCRIPTION_MOD_QUEUE' => 'Can use the Moderation Queue to validate and edit posts, but nothing else.',
'ROLE_DESCRIPTION_MOD_SIMPLE' => 'Can only use basic topic actions. Cannot send warnings or use moderation queue.',