diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-03-19 18:49:47 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-03-19 18:49:47 +0100 |
| commit | d1248ad5ce0e1a0cd6b44905e61ffbbd6d2304e1 (patch) | |
| tree | 7c8ccf9996bb29c8253b7587a5426f420a0a3976 | |
| parent | c46efa461e6224e0863e18fda52a131fe7e690f1 (diff) | |
| parent | 927220c87372c41abd0d8f4ff30937e7e4befceb (diff) | |
| download | forums-d1248ad5ce0e1a0cd6b44905e61ffbbd6d2304e1.tar forums-d1248ad5ce0e1a0cd6b44905e61ffbbd6d2304e1.tar.gz forums-d1248ad5ce0e1a0cd6b44905e61ffbbd6d2304e1.tar.bz2 forums-d1248ad5ce0e1a0cd6b44905e61ffbbd6d2304e1.tar.xz forums-d1248ad5ce0e1a0cd6b44905e61ffbbd6d2304e1.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14758] Improve the ACP Parameter wording
| -rw-r--r-- | phpBB/language/en/acp/attachments.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php index 20264536ff..123c35a502 100644 --- a/phpBB/language/en/acp/attachments.php +++ b/phpBB/language/en/acp/attachments.php @@ -119,7 +119,7 @@ $lang = array_merge($lang, array( 'MAX_EXTGROUP_FILESIZE' => 'Maximum file size', 'MAX_IMAGE_SIZE' => 'Maximum image dimensions', 'MAX_IMAGE_SIZE_EXPLAIN' => 'Maximum size of image attachments. Set both values to 0px by 0px to disable dimension checking.', - 'MAX_THUMB_WIDTH' => 'Maximum thumbnail width in pixel', + 'MAX_THUMB_WIDTH' => 'Maximum thumbnail width/height in pixel', 'MAX_THUMB_WIDTH_EXPLAIN' => 'A generated thumbnail will not exceed the width set here.', 'MIN_THUMB_FILESIZE' => 'Minimum thumbnail file size', 'MIN_THUMB_FILESIZE_EXPLAIN' => 'Do not create a thumbnail for images smaller than this.', |