Merge branch 'issue_4886' into master_tj

diff --cc install/db/language_text.sql
index bf9461c,a37854b..49e49c2
--- 1/install/db/language_text.sql
--- 2/install/db/language_text.sql
+++ b/install/db/language_text.sql
@@@ -66,9 -66,8 +66,9 @@@ INSERT INTO `language_text` VALUES ('en
  INSERT INTO `language_text` VALUES ('en', '_msgs','TR_ERROR_FIRST_LAST_NAME_UNIQUE','First, second, and last names combination must be unique.','2010-01-27 15:48:35','');
  INSERT INTO `language_text` VALUES ('en', '_msgs','TR_ERROR_FOLDER_NOT_CREATED','The folder \" %s \" could not be created.','2010-04-01 15:23:52','');
  INSERT INTO `language_text` VALUES ('en', '_msgs','TR_ERROR_ID_ZERO','Content ID was zero, or was missing.','2010-05-20 12:08:10','');
- INSERT INTO `language_text` VALUES ('en', '_msgs','TR_ERROR_IMPORT_CARTRIDGE_FAILED','Import failed. Does not appear to be a valid content package or common cartridge.','2010-01-27 15:48:35','');
+ INSERT INTO `language_text` VALUES ('en', '_msgs','TR_ERROR_IMPORT_CARTRIDGE_FAILED','Import failed. Does not appear to be a valid content package or common cartridge: %s','2011-10-09 16:47:00','');
  INSERT INTO `language_text` VALUES ('en', '_msgs','TR_ERROR_IMPORT_FAILED','Import Failed','2010-01-27 15:48:35','');
 +INSERT INTO `language_text` VALUES ('en', '_msgs','TR_ERROR_IMPORTDIR_IMS_NOTVALID','Import failed. Is not a ZIP file.','2011-10-09 01:00:00','');
  INSERT INTO `language_text` VALUES ('en', '_msgs','TR_ERROR_INVALID_CHECKBOX_STATUS','Invalid checkbox status.','2010-01-27 15:48:35','');
  INSERT INTO `language_text` VALUES ('en', '_msgs','TR_ERROR_INVALID_FORMAT','Invalid format.','2010-01-27 15:48:35','');
  INSERT INTO `language_text` VALUES ('en', '_msgs','TR_ERROR_INVALID_INPUT','Invalid URL: %s','2010-05-25 11:28:35','');