Merge branch 'develop-olympus' into develop-ascraeus

* develop-olympus:
  [ticket/10687] Improve error message if unable to get image dimensions
This commit is contained in:
Cesar G 2014-04-10 17:42:59 -07:00
commit 251b2ba28f

View file

@ -758,7 +758,7 @@ $lang = array_merge($lang, array(
), ),
'TRACKED_PHP_ERROR' => 'Tracked PHP errors: %s', 'TRACKED_PHP_ERROR' => 'Tracked PHP errors: %s',
'UNABLE_GET_IMAGE_SIZE' => 'It was not possible to determine the dimensions of the image.', 'UNABLE_GET_IMAGE_SIZE' => 'It was not possible to determine the dimensions of the image. Please verify that the URL you entered is correct.',
'UNABLE_TO_DELIVER_FILE'=> 'Unable to deliver file.', 'UNABLE_TO_DELIVER_FILE'=> 'Unable to deliver file.',
'UNKNOWN_BROWSER' => 'Unknown browser', 'UNKNOWN_BROWSER' => 'Unknown browser',
'UNMARK_ALL' => 'Unmark all', 'UNMARK_ALL' => 'Unmark all',