aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2017-07-16 15:00:22 +0200
committerMarc Alexander <admin@m-a-styles.de>2017-07-16 15:00:22 +0200
commit65aaef1f83920fc25266fbea5608427bb930f329 (patch)
tree1e15869f2ef0e321b2bec513946bb3e26824176b /phpBB/language
parent50d2e337b02e8bdec80ed0672cf2e1fe384b6f3e (diff)
parent149375253685b3a38996f63015a74b7a0f53aa14 (diff)
downloadforums-65aaef1f83920fc25266fbea5608427bb930f329.tar
forums-65aaef1f83920fc25266fbea5608427bb930f329.tar.gz
forums-65aaef1f83920fc25266fbea5608427bb930f329.tar.bz2
forums-65aaef1f83920fc25266fbea5608427bb930f329.tar.xz
forums-65aaef1f83920fc25266fbea5608427bb930f329.zip
Merge branch 'prep-release-3.1.11' into 3.1.x
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/common.php13
1 files changed, 8 insertions, 5 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php
index 562b446f8a..f5591e7b1e 100644
--- a/phpBB/language/en/acp/common.php
+++ b/phpBB/language/en/acp/common.php
@@ -417,11 +417,14 @@ $lang = array_merge($lang, array(
'UPLOAD_DIR_SIZE' => 'Size of posted attachments',
'USERS_PER_DAY' => 'Users per day',
- 'VALUE' => 'Value',
- 'VERSIONCHECK_FAIL' => 'Failed to obtain latest version information.',
- 'VERSIONCHECK_FORCE_UPDATE' => 'Re-Check version',
- 'VIEW_ADMIN_LOG' => 'View administrator log',
- 'VIEW_INACTIVE_USERS' => 'View inactive users',
+ 'VALUE' => 'Value',
+ 'VERSIONCHECK_FAIL' => 'Failed to obtain latest version information.',
+ 'VERSIONCHECK_FORCE_UPDATE' => 'Re-Check version',
+ 'VERSIONCHECK_INVALID_ENTRY' => 'Latest version information contains an unsupported entry.',
+ 'VERSIONCHECK_INVALID_URL' => 'Latest version information contains invalid URL.',
+ 'VERSIONCHECK_INVALID_VERSION' => 'Latest version information contains an invalid version.',
+ 'VIEW_ADMIN_LOG' => 'View administrator log',
+ 'VIEW_INACTIVE_USERS' => 'View inactive users',
'WELCOME_PHPBB' => 'Welcome to phpBB',
'WRITABLE_CONFIG' => 'Your config file (config.php) is currently world-writable. We strongly encourage you to change the permissions to 640 or at least to 644 (for example: <a href="http://en.wikipedia.org/wiki/Chmod" rel="external">chmod</a> 640 config.php).',