From 1c30c4186b121c542eadecdeed227bd12c320682 Mon Sep 17 00:00:00 2001
From: David Rothstein <drothstein@gmail.com>
Date: Thu, 7 Apr 2016 23:15:20 -0400
Subject: [PATCH] Issue #2563403 by sashi.kiran, jenlampton, albertski,
 Daniel_Rose: Changed help text on image fields to clarify that uploaded
 images which are too large will be resized rather than rejected

---
 CHANGELOG.txt               | 2 ++
 modules/file/file.field.inc | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e6e6e19fd001..6b27de57697a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,8 @@
 
 Drupal 7.44, xxxx-xx-xx (development version)
 -----------------------
+- Changed help text on image fields to clarify that uploaded images which are
+  too large will be resized rather than rejected (translatable string change).
 - Changed wording on the Update Manager settings page to clarify that the
   option to check for disabled module updates also applies to uninstalled
   modules (administrative-facing translatable string change).
diff --git a/modules/file/file.field.inc b/modules/file/file.field.inc
index d592381bd56f..ceb18b61004d 100644
--- a/modules/file/file.field.inc
+++ b/modules/file/file.field.inc
@@ -965,7 +965,7 @@ function theme_file_upload_help($variables) {
       $descriptions[] = t('Images must be larger than !min pixels.', array('!min' => '<strong>' . $min . '</strong>'));
     }
     elseif ($max) {
-      $descriptions[] = t('Images must be smaller than !max pixels.', array('!max' => '<strong>' . $max . '</strong>'));
+      $descriptions[] = t('Images larger than !max pixels will be resized.', array('!max' => '<strong>' . $max . '</strong>'));
     }
   }