diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-04-29 08:35:30 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-04-29 08:35:30 +0200 |
| commit | 055d7658db7817b80d00b27d6e99cad961d0ee15 (patch) | |
| tree | aa34996f9d7248e7c58d64361329685a64b21d91 /phpBB/language | |
| parent | bd2ddc1d2ec3e94a13e397198a8406d81481e9f2 (diff) | |
| parent | 2575b499a38ccf2480d5da9d5c566f47a9e2d824 (diff) | |
| download | forums-055d7658db7817b80d00b27d6e99cad961d0ee15.tar forums-055d7658db7817b80d00b27d6e99cad961d0ee15.tar.gz forums-055d7658db7817b80d00b27d6e99cad961d0ee15.tar.bz2 forums-055d7658db7817b80d00b27d6e99cad961d0ee15.tar.xz forums-055d7658db7817b80d00b27d6e99cad961d0ee15.zip | |
Merge branch 'prep-release-3.2.6' into 3.2.x
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index eb53ac0370..9b45ffa45b 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -111,9 +111,9 @@ $lang = array_merge($lang, array( 'ALLOW_GRAVATAR' => 'Enable gravatar avatars', 'ALLOW_LOCAL' => 'Enable gallery avatars', 'ALLOW_REMOTE' => 'Enable remote avatars', - 'ALLOW_REMOTE_EXPLAIN' => 'Avatars linked to from another website.', + 'ALLOW_REMOTE_EXPLAIN' => 'Avatars linked to from another website.<br><em><strong class="error">Warning:</strong> Enabling this feature might allow users to check for the existence of files and services that are only accessible on the local network.</em>', 'ALLOW_REMOTE_UPLOAD' => 'Enable remote avatar uploading', - 'ALLOW_REMOTE_UPLOAD_EXPLAIN' => 'Allow uploading of avatars from another website.', + 'ALLOW_REMOTE_UPLOAD_EXPLAIN' => 'Allow uploading of avatars from another website.<br><em><strong class="error">Warning:</strong> Enabling this feature might allow users to check for the existence of files and services that are only accessible on the local network.</em>', 'ALLOW_UPLOAD' => 'Enable avatar uploading', 'AVATAR_GALLERY_PATH' => 'Avatar gallery path', 'AVATAR_GALLERY_PATH_EXPLAIN' => 'Path under your phpBB root directory for pre-loaded images, e.g. <samp>images/avatars/gallery</samp>.<br>Double dots like <samp>../</samp> will be stripped from the path for security reasons.', diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 0d5f6fee25..1c2253542c 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -325,6 +325,7 @@ $lang = array_merge($lang, array( 'TOTAL_SIZE' => 'Total size', 'UCP' => 'User Control Panel', + 'URL_INVALID' => 'The provided URL for the setting “%1$s” is invalid.', 'USERNAMES_EXPLAIN' => 'Place each username on a separate line.', 'USER_CONTROL_PANEL' => 'User Control Panel', |