diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-30 23:01:57 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-30 23:01:57 +0200 |
| commit | e8af120037b0098f35b25a461d11c4977dae4582 (patch) | |
| tree | c8b13394ce875cc7e9fd912aff2af3647b86269e /phpBB/language | |
| parent | be8770532c8bda7b5d73075705518ac1bb5d3d37 (diff) | |
| parent | 9f87c497fe25611ddd2f6963ce38b7edad876de3 (diff) | |
| download | forums-e8af120037b0098f35b25a461d11c4977dae4582.tar forums-e8af120037b0098f35b25a461d11c4977dae4582.tar.gz forums-e8af120037b0098f35b25a461d11c4977dae4582.tar.bz2 forums-e8af120037b0098f35b25a461d11c4977dae4582.tar.xz forums-e8af120037b0098f35b25a461d11c4977dae4582.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[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.php | 3 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 2 |
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', |