aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-05-30 23:01:19 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-05-30 23:01:19 +0200
commit9f87c497fe25611ddd2f6963ce38b7edad876de3 (patch)
treefa1a2019cdd0550e413135f594d340eb12cc8dd5 /phpBB/language
parent669a6c3e3d29688b69bb0fb39dd7d4099c78ffbd (diff)
parent7f00c38c50dbd6689f80afaf324c1ee81173d15a (diff)
downloadforums-9f87c497fe25611ddd2f6963ce38b7edad876de3.tar
forums-9f87c497fe25611ddd2f6963ce38b7edad876de3.tar.gz
forums-9f87c497fe25611ddd2f6963ce38b7edad876de3.tar.bz2
forums-9f87c497fe25611ddd2f6963ce38b7edad876de3.tar.xz
forums-9f87c497fe25611ddd2f6963ce38b7edad876de3.zip
Merge pull request #2447 from n-aleha/ticket/11467
[ticket/11467] Add language variables for extension exception messages * n-aleha/ticket/11467: [ticket/11467] Add user object to extension manager for tests [ticket/11467] Add language variables to tests [ticket/11467] Add language variables for extension exception messages
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/acp/extensions.php3
-rw-r--r--phpBB/language/en/common.php2
2 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index e9f1c3ac5c..6ec722bb78 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -117,4 +117,7 @@ $lang = array_merge($lang, array(
'VERSIONCHECK_FORCE_UPDATE_ALL' => 'Re-Check all versions',
'FORCE_UNSTABLE' => 'Always check for unstable versions',
'EXTENSIONS_VERSION_CHECK_SETTINGS' => 'Version check settings',
+
+ 'META_FIELD_NOT_SET' => 'Required meta field %s has not been set.',
+ 'META_FIELD_INVALID' => 'Meta field %s is invalid.',
));
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 5e524a6164..2020783100 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -231,6 +231,8 @@ $lang = array_merge($lang, array(
'FILESIZE' => 'File size',
'FILEDATE' => 'File date',
'FILE_COMMENT' => 'File comment',
+ 'FILE_CONTENT_ERR' => 'Could not read the contents of file: %s',
+ 'FILE_JSON_DECODE_ERR' => 'Failed to decode json file: %s',
'FILE_NOT_FOUND' => 'The requested file could not be found: %s',
'FIND_USERNAME' => 'Find a member',
'FOLDER' => 'Folder',