aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/attachments.php1
-rw-r--r--phpBB/language/en/acp/board.php2
-rw-r--r--phpBB/language/en/acp/common.php4
-rw-r--r--phpBB/language/en/acp/permissions_phpbb.php2
-rw-r--r--phpBB/language/en/common.php3
5 files changed, 8 insertions, 4 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'),
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index f31968f885..0bd4a1e454 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -381,7 +381,8 @@ $lang = array_merge($lang, array(
'POST_DETAILS' => 'Post details',
'POST_NEW_TOPIC' => 'Post new topic',
'POST_PCT' => '%.2f%% of all posts',
- 'POST_PCT_ACTIVE' => '%.2f%% of your posts',
+ 'POST_PCT_ACTIVE' => '%.2f%% of user’s posts',
+ 'POST_PCT_ACTIVE_OWN' => '%.2f%% of your posts',
'POST_REPORTED' => 'Click to view report',
'POST_SUBJECT' => 'Post subject',
'POST_TIME' => 'Post time',