Index: modules/user/user.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.test,v
retrieving revision 1.44
diff -u -r1.44 user.test
--- modules/user/user.test	1 Jul 2009 12:06:22 -0000	1.44
+++ modules/user/user.test	12 Jul 2009 07:15:31 -0000
@@ -534,7 +534,7 @@
     // Try to upload a file that is not an image for the user picture.
     $not_an_image = current($this->drupalGetTestFiles('html'));
     $this->saveUserPicture($not_an_image);
-    $this->assertRaw(t('Only JPEG, PNG and GIF images are allowed.'), t('Non-image files are not accepted.'));
+    $this->assertRaw(t('The file is not a known image format.'), t('Non-image files are not accepted.'));
   }
 
   /**
Index: includes/file.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/file.inc,v
retrieving revision 1.174
diff -u -r1.174 file.inc
--- includes/file.inc	10 Jul 2009 04:08:20 -0000	1.174
+++ includes/file.inc	12 Jul 2009 07:15:30 -0000
@@ -1147,7 +1147,7 @@
 
   $info = image_get_info($file->filepath);
   if (!$info || empty($info['extension'])) {
-    $errors[] = t('Only JPEG, PNG and GIF images are allowed.');
+    $errors[] = t('The file is not a known image format.');
   }
 
   return $errors;