Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

1 files changed, 7 insertions, 2 deletions

diff --git a/mod/file/languages/en.php b/mod/file/languages/en.php
index 72b198d54..278076927 100644
--- a/mod/file/languages/en.php
+++ b/mod/file/languages/en.php
@@ -35,6 +35,9 @@ $english = array(
 	'file:desc' => "Description",
 	'file:tags' => "Tags",
 
+	'file:list:list' => 'Switch to the list view',
+	'file:list:gallery' => 'Switch to the gallery view',
+
 	'file:types' => "Uploaded file types",
 
 	'file:type:' => 'Files',
@@ -75,6 +78,8 @@ $english = array(
 
 	'item:object:file' => 'Files',
 
+	'file:newupload' => 'A new file has been uploaded',
+
 	/**
 	 * Embed media
 	 **/
@@ -93,12 +98,12 @@ $english = array(
 	 * Error messages
 	 */
 
-		'file:none' => "No files uploaded.",
+		'file:none' => "No files.",
 		'file:uploadfailed' => "Sorry; we could not save your file.",
 		'file:downloadfailed' => "Sorry; this file is not available at this time.",
 		'file:deletefailed' => "Your file could not be deleted at this time.",
 		'file:noaccess' => "You do not have permissions to change this file",
-		'file:cannotload' => "There was an error loading the file",
+		'file:cannotload' => "There was an error uploading the file",
 		'file:nofile' => "You must select a file",
 );