aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp/attachments.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-07-07 19:15:33 +0200
committerMarc Alexander <admin@m-a-styles.de>2016-07-07 19:15:33 +0200
commit55b854906d31d60f9f3065910a3d1b1ca6d0b6bf (patch)
tree9e362967c05c308824001f2a81d9ef62c8b5740f /phpBB/language/en/acp/attachments.php
parentcddb884be6c8a8890f4fbd7415763d46e51e050b (diff)
parent7dc1af25bc2dc0ba59990d53cb7dcdb9c0d48480 (diff)
downloadforums-55b854906d31d60f9f3065910a3d1b1ca6d0b6bf.tar
forums-55b854906d31d60f9f3065910a3d1b1ca6d0b6bf.tar.gz
forums-55b854906d31d60f9f3065910a3d1b1ca6d0b6bf.tar.bz2
forums-55b854906d31d60f9f3065910a3d1b1ca6d0b6bf.tar.xz
forums-55b854906d31d60f9f3065910a3d1b1ca6d0b6bf.zip
Merge pull request #4342 from Senky/ticket/14654
[ticket/14654] Change Imagemagick to ImageMagick
Diffstat (limited to 'phpBB/language/en/acp/attachments.php')
-rw-r--r--phpBB/language/en/acp/attachments.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index cf2f0a45d2..7d3d93d693 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -117,7 +117,7 @@ $lang = array_merge($lang, array(
'IMAGE_LINK_SIZE' => 'Image link dimensions',
'IMAGE_LINK_SIZE_EXPLAIN' => 'Display image attachment as an inline text link if image is larger than this. To disable this behaviour, set the values to 0px by 0px.',
- 'IMAGICK_PATH' => 'Imagemagick path',
+ 'IMAGICK_PATH' => 'ImageMagick path',
'IMAGICK_PATH_EXPLAIN' => 'Full path to the imagemagick convert application, e.g. <samp>/usr/bin/</samp>.',
'MAX_ATTACHMENTS' => 'Maximum number of attachments per post',
@@ -153,7 +153,7 @@ $lang = array_merge($lang, array(
'REMOVE_DISALLOWED_IPS' => 'Remove or un-exclude <em>disallowed</em> IPs/hostnames',
'RESYNC_FILES_STATS_CONFIRM' => 'Are you sure you wish to resynchronise file statistics?',
- 'SEARCH_IMAGICK' => 'Search for Imagemagick',
+ 'SEARCH_IMAGICK' => 'Search for ImageMagick',
'SECURE_ALLOW_DENY' => 'Allow/Deny list',
'SECURE_ALLOW_DENY_EXPLAIN' => 'Change the default behaviour when secure downloads are enabled of the Allow/Deny list to that of a <strong>whitelist</strong> (Allow) or a <strong>blacklist</strong> (Deny).',
'SECURE_DOWNLOADS' => 'Enable secure downloads',