diff options
| author | Rubén Calvo <rubencm@gmail.com> | 2018-08-30 21:15:56 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-05-09 19:01:00 +0200 |
| commit | 4f5a8f6983660a4392c67ffb6a41c87cafee9f89 (patch) | |
| tree | 9d828d02712e40f454bf323ef8c550fd96567ca2 /phpBB/language | |
| parent | 3914515199ba9f3c2ce84e28b0a9a2c4e3dfb270 (diff) | |
| download | forums-4f5a8f6983660a4392c67ffb6a41c87cafee9f89.tar forums-4f5a8f6983660a4392c67ffb6a41c87cafee9f89.tar.gz forums-4f5a8f6983660a4392c67ffb6a41c87cafee9f89.tar.bz2 forums-4f5a8f6983660a4392c67ffb6a41c87cafee9f89.tar.xz forums-4f5a8f6983660a4392c67ffb6a41c87cafee9f89.zip | |
[ticket/15255] Move language strings from acp/common to common
PHPBB3-15255
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/common.php | 10 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 11 |
2 files changed, 11 insertions, 10 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 083dc9dff5..5ac4b445dc 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -226,16 +226,6 @@ $lang = array_merge($lang, array( 'BACK' => 'Back', - 'CANNOT_CHANGE_FILE_GROUP' => 'Unable to change file group', - 'CANNOT_CHANGE_FILE_PERMISSIONS' => 'Unable to change file permissions', - 'CANNOT_COPY_FILES' => 'Unable to copy files', - 'CANNOT_CREATE_SYMLINK' => 'Unable to create a symlink', - 'CANNOT_DELETE_FILES' => 'Unable to delete files from the system', - 'CANNOT_DUMP_FILE' => 'Unable to dump file', - 'CANNOT_MIRROR_DIRECTORY' => 'Unable to mirror directory', - 'CANNOT_RENAME_FILE' => 'Unable to rename a file from the system', - 'CANNOT_TOUCH_FILES' => 'Unable to determine if the file exists', - 'CONTAINER_EXCEPTION' => 'phpBB encountered an error building the container due to an installed extension. For this reason, all extensions have been temporarily disabled. Please try purging your forum cache. All extensions will automatically be re-enabled once the container error is resolved. If this error continues, please visit <a href="https://www.phpbb.com/support">phpBB.com</a> for support.', 'EXCEPTION' => 'Exception', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index f3ea471012..8a2767e564 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -266,6 +266,17 @@ $lang = array_merge($lang, array( 'FSOCK_DISABLED' => 'The operation could not be completed because the <var>fsockopen</var> function has been disabled or the server being queried could not be found.', 'FSOCK_TIMEOUT' => 'A timeout occurred while reading from the network stream.', + 'FILESYSTEM_CANNOT_CHANGE_FILE_GROUP' => 'Unable to change file group', + 'FILESYSTEM_CANNOT_CHANGE_FILE_PERMISSIONS' => 'Unable to change file permissions', + 'FILESYSTEM_CANNOT_COPY_FILES' => 'Unable to copy files', + 'FILESYSTEM_CANNOT_CREATE_SYMLINK' => 'Unable to create a symlink', + 'FILESYSTEM_CANNOT_CREATE_DIRECTORY' => 'Unable to create directory', + 'FILESYSTEM_CANNOT_DELETE_FILES' => 'Unable to delete files from the system', + 'FILESYSTEM_CANNOT_DUMP_FILE' => 'Unable to dump file', + 'FILESYSTEM_CANNOT_MIRROR_DIRECTORY' => 'Unable to mirror directory', + 'FILESYSTEM_CANNOT_RENAME_FILE' => 'Unable to rename a file from the system', + 'FILESYSTEM_CANNOT_TOUCH_FILES' => 'Unable to determine if the file exists', + 'FTP_FSOCK_HOST' => 'FTP host', 'FTP_FSOCK_HOST_EXPLAIN' => 'FTP server used to connect your site.', 'FTP_FSOCK_PASSWORD' => 'FTP password', |