Merge branch 'master' into filesystem

2012-09-22 14:28:14 +02:00 · 2012-09-22 14:28:14 +02:00 · 93292516d9
parent 954596c251 b4de89e6b4
commit 93292516d9
645 changed files with 21354 additions and 9922 deletions
--- a/3rdparty/MDB2/Driver/Reverse/oci8.php
+++ b/3rdparty/MDB2/Driver/Reverse/oci8.php
@ -84,12 +84,12 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common
            $owner = $db->dsn['username'];
        }

-        $query = 'SELECT column_name name,
-                         data_type "type",
-                         nullable,
-                         data_default "default",
-                         COALESCE(data_precision, data_length) "length",
-                         data_scale "scale"
+        $query = 'SELECT column_name AS "name",
+                         data_type AS "type",
+                         nullable AS "nullable",
+                         data_default AS "default",
+                         COALESCE(data_precision, data_length) AS "length",
+                         data_scale AS "scale"
                    FROM all_tab_columns
                   WHERE (table_name=? OR table_name=?)
                     AND (owner=? OR owner=?)
@ -146,6 +146,10 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common
            if ($default === 'NULL') {
                $default = null;
            }
+			//ugly hack, but works for the reverse direction
+			if ($default == "''") {
+				$default = '';
+			}
            if ((null === $default) && $notnull) {
                $default = '';
            }
@ -221,11 +225,11 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common
            $owner = $db->dsn['username'];
        }

-        $query = "SELECT aic.column_name,
-                         aic.column_position,
-                         aic.descend,
-                         aic.table_owner,
-                         alc.constraint_type
+        $query = 'SELECT aic.column_name AS "column_name",
+                         aic.column_position AS "column_position",
+                         aic.descend AS "descend",
+                         aic.table_owner AS "table_owner",
+                         alc.constraint_type AS "constraint_type"
                    FROM all_ind_columns aic
               LEFT JOIN all_constraints alc
                      ON aic.index_name = alc.constraint_name
@ -234,7 +238,7 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common
                   WHERE (aic.table_name=? OR aic.table_name=?)
                     AND (aic.index_name=? OR aic.index_name=?)
                     AND (aic.table_owner=? OR aic.table_owner=?)
-                ORDER BY column_position";
+                ORDER BY column_position';
        $stmt = $db->prepare($query);
        if (PEAR::isError($stmt)) {
            return $stmt;
@ -331,9 +335,9 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common
                         \'SIMPLE\' "match",
                         CASE alc.deferrable WHEN \'NOT DEFERRABLE\' THEN 0 ELSE 1 END "deferrable",
                         CASE alc.deferred WHEN \'IMMEDIATE\' THEN 0 ELSE 1 END "initiallydeferred",
-                         alc.search_condition,
+                         alc.search_condition AS "search_condition",
                         alc.table_name,
-                         cols.column_name,
+                         cols.column_name AS "column_name",
                         cols.position,
                         r_alc.table_name "references_table",
                         r_cols.column_name "references_field",
@ -509,14 +513,14 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common
            return $db;
        }

-        $query = 'SELECT trigger_name,
-                         table_name,
-                         trigger_body,
-                         trigger_type,
-                         triggering_event trigger_event,
-                         description trigger_comment,
-                         1 trigger_enabled,
-                         when_clause
+        $query = 'SELECT trigger_name AS "trigger_name",
+                         table_name AS "table_name",
+                         trigger_body AS "trigger_body",
+                         trigger_type AS "trigger_type",
+                         triggering_event AS "trigger_event",
+                         description AS "trigger_comment",
+                         1 AS "trigger_enabled",
+                         when_clause AS "when_clause"
                    FROM user_triggers
                   WHERE trigger_name = \''. strtoupper($trigger).'\'';
        $types = array(
--- a/3rdparty/MDB2/Driver/oci8.php
+++ b/3rdparty/MDB2/Driver/oci8.php
@ -634,6 +634,59 @@ class MDB2_Driver_oci8 extends MDB2_Driver_Common
        return $query;
    }

+    /**
+     * Obtain DBMS specific SQL code portion needed to declare a generic type
+     * field to be used in statement like CREATE TABLE, without the field name
+     * and type values (ie. just the character set, default value, if the
+     * field is permitted to be NULL or not, and the collation options).
+     *
+     * @param array  $field  associative array with the name of the properties
+     *      of the field being declared as array indexes. Currently, the types
+     *      of supported field properties are as follows:
+     *
+     *      default
+     *          Text value to be used as default for this field.
+     *      notnull
+     *          Boolean flag that indicates whether this field is constrained
+     *          to not be set to null.
+     *      charset
+     *          Text value with the default CHARACTER SET for this field.
+     *      collation
+     *          Text value with the default COLLATION for this field.
+     * @return string  DBMS specific SQL code portion that should be used to
+     *      declare the specified field's options.
+     * @access protected
+     */
+    function _getDeclarationOptions($field)
+    {
+        $charset = empty($field['charset']) ? '' :
+            ' '.$this->_getCharsetFieldDeclaration($field['charset']);
+
+        $notnull = empty($field['notnull']) ? ' NULL' : ' NOT NULL';
+        $default = '';
+        if (array_key_exists('default', $field)) {
+            if ($field['default'] === '') {
+                $db = $this->getDBInstance();
+                if (PEAR::isError($db)) {
+                    return $db;
+                }
+                $valid_default_values = $this->getValidTypes();
+                $field['default'] = $valid_default_values[$field['type']];
+                if ($field['default'] === '' && ($db->options['portability'] & MDB2_PORTABILITY_EMPTY_TO_NULL)) {
+                    $field['default'] = ' ';
+                }
+            }
+            if (null !== $field['default']) {
+                $default = ' DEFAULT ' . $this->quote($field['default'], $field['type']);
+            }
+        }
+
+        $collation = empty($field['collation']) ? '' :
+            ' '.$this->_getCollationFieldDeclaration($field['collation']);
+
+        return $charset.$default.$notnull.$collation;
+    }
+
    // }}}
    // {{{ _doQuery()

--- a/3
+++ b/3
@ -19,3 +19,6 @@ With help from many libraries and frameworks including:
 	SabreDAV
 	jQuery
 	…
+
+"Lock” symbol from thenounproject.com collection
+"Clock” symbol by Brandon Hopkins, from thenounproject.com collection
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@ -7,15 +7,15 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();

 // Get data
-$dir = stripslashes($_GET["dir"]);
-$files = isset($_GET["file"]) ? stripslashes($_GET["file"]) : stripslashes($_GET["files"]);
+$dir = stripslashes($_POST["dir"]);
+$files = isset($_POST["file"]) ? stripslashes($_POST["file"]) : stripslashes($_POST["files"]);

 $files = explode(';', $files);
 $filesWithError = '';
 $success = true;
 //Now delete
 foreach($files as $file) {
-    if( !OC_Files::delete( $dir, $file )) {
+	if( !OC_Files::delete( $dir, $file )) {
 		$filesWithError .= $file . "\n";
 		$success = false;
 	}
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@ -67,7 +67,7 @@ if($source) {
 	$result=OC_Filesystem::file_put_contents($target, $sourceStream);
 	if($result) {
 		$mime=OC_Filesystem::getMimetype($target);
-		$eventSource->send('success', $mime);
+		$eventSource->send('success', array('mime'=>$mime, 'size'=>OC_Filesystem::filesize($target)));
 	} else {
 		$eventSource->send('error', "Error while downloading ".$source. ' to '.$target);
 	}
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@ -49,7 +49,7 @@ if(strpos($dir, '..') === false) {
 	for($i=0;$i<$fileCount;$i++) {
        $target = OCP\Files::buildNotExistingFileName(stripslashes($dir), $files['name'][$i]);
 		if(is_uploaded_file($files['tmp_name'][$i]) and OC_Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
-			$meta=OC_FileCache_Cached::get($target);
+			$meta = OC_FileCache::get($target);
 			$result[]=array( "status" => "success", 'mime'=>$meta['mimetype'],'size'=>$meta['size'],'name'=>basename($target));
 		}
 	}
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@ -12,14 +12,15 @@
 .file_upload_wrapper, #file_newfolder_name { background-repeat:no-repeat; background-position:.5em .5em; padding-left:2em; }
 .file_upload_wrapper { font-weight:bold; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; padding-left:0; overflow:hidden; position:relative; margin:0;}
 .file_upload_wrapper .file_upload_button_wrapper { position:absolute; top:0; left:0; width:100%; height:100%; cursor:pointer; z-index:1000; }
-#new { float:left; border-top-right-radius:0; border-bottom-right-radius:0; margin:0 0 0 1em; border-right:none; z-index:1010; height:1.3em; }
+#new { background-color:#5bb75b; float:left; border-top-right-radius:0; border-bottom-right-radius:0; margin:0 0 0 1em; border-right:none; z-index:1010; height:1.3em; }
+#new:hover, a.file_upload_button_wrapper:hover + button.file_upload_filename { background-color:#4b964b; }
 #new.active { border-bottom-left-radius:0; border-bottom:none; }
 #new>a { padding:.5em 1.2em .3em; color:#fff; text-shadow:0 1px 0 #51a351; }
 #new>ul { display:none; position:fixed; text-align:left; padding:.5em; background:#f8f8f8; margin-top:0.075em; border:1px solid #ddd; min-width:7em; margin-left:-.5em; z-index:-1; }
 #new>ul>li { margin:.3em; padding-left:2em; background-repeat:no-repeat; cursor:pointer; padding-bottom:0.1em }
 #new>ul>li>p { cursor:pointer; }
 #new>ul>li>input { padding:0.3em; margin:-0.3em; }
-#new, .file_upload_filename { background:#5bb75b; border:1px solid; border-color:#51a351 #419341 #387038; -moz-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; }
+#new, .file_upload_filename { border:1px solid; border-color:#51a351 #419341 #387038; -moz-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; }
 #new .popup { border-top-left-radius:0; }

 #file_newfolder_name { background-image:url('%webroot%/core/img/places/folder.svg'); font-weight:normal; width:7em; }
@ -29,8 +30,7 @@

 .file_upload_start { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; z-index:1; position:absolute; left:0; top:0; width:100%; cursor:pointer;}
 .file_upload_filename.active { border-bottom-right-radius:0 }
-.file_upload_filename { z-index:100; padding-left: 0.8em; padding-right: 0.8em; cursor:pointer; border-top-left-radius:0; border-bottom-left-radius:0; }
-.file_upload_filename img { position: absolute; top: 0.4em; left: 0.4em; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
+.file_upload_filename { background-color:#5bb75b; z-index:100; cursor:pointer; border-top-left-radius:0; border-bottom-left-radius:0; background-image: url('%webroot%/core/img/actions/upload-white.svg'); background-repeat: no-repeat; background-position: center; height: 2.29em; width: 2.5em; }

 #upload { position:absolute; right:13.5em; top:0em; }
 #upload #uploadprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; }
@ -47,9 +47,6 @@ tbody a { color:#000; }
 span.extension, span.uploading, td.date { color:#999; }
 span.extension { text-transform:lowercase; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; }
 tr:hover span.extension { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; color:#777; }
-div.crumb { float:left; display:block; background:no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; }
-div.crumb:first-child { padding-left:1em; }
-div.crumb.last { font-weight:bold; }
 table tr.mouseOver td { background-color:#eee; }
 table th { height:2em; padding:0 .5em; color:#999; }
 table th .name { float:left; margin-left:.5em; }
@ -90,3 +87,6 @@ a.action>img { max-height:16px; max-width:16px; vertical-align:text-bottom; }
 #navigation>ul>li:first-child+li { padding-top:2.9em; }

 #scanning-message{ top:40%; left:40%; position:absolute; display:none; }
+
+div.crumb a{ padding: 0.9em 0 0.7em 0; }
+
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@ -179,6 +179,7 @@ FileActions.register('all','Delete', OC.PERMISSION_DELETE, function(){return OC.
 	$('.tipsy').remove();
 });

+// t('files', 'Rename')
 FileActions.register('all','Rename', OC.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/rename');},function(filename){
 	FileList.rename(filename);
 });
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@ -145,31 +145,33 @@ var FileList={
 			if (newname != name) {
 				if (FileList.checkName(name, newname, false)) {
 					newname = name;
-				} else {
+				} else {					
 					$.get(OC.filePath('files','ajax','rename.php'), { dir : $('#dir').val(), newname: newname, file: name },function(result) {
 						if (!result || result.status == 'error') {
 							OC.dialogs.alert(result.data.message, 'Error moving file');
 							newname = name;
 						}
+						tr.data('renaming',false);
 					});
+					
+				}
+			
+				tr.attr('data-file', newname);
+				var path = td.children('a.name').attr('href');
+				td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname)));
+				if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') {
+					var basename=newname.substr(0,newname.lastIndexOf('.'));
+				} else {
+					var basename=newname;
+				}
+				td.children('a.name').empty();
+				var span=$('<span class="nametext"></span>');
+				span.text(basename);
+				td.children('a.name').append(span);
+				if (newname.indexOf('.') > 0 && tr.data('type') != 'dir') {
+					span.append($('<span class="extension">'+newname.substr(newname.lastIndexOf('.'))+'</span>'));
 				}
 			}
-			tr.attr('data-file', newname);
-			var path = td.children('a.name').attr('href');
-			td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname)));
-			if (newname.indexOf('.') > 0) {
-				var basename=newname.substr(0,newname.lastIndexOf('.'));
-			} else {
-				var basename=newname;
-			}
-			td.children('a.name').empty();
-			var span=$('<span class="nametext"></span>');
-			span.text(basename);
-			td.children('a.name').append(span);
-			if (newname.indexOf('.') > 0) {
-				span.append($('<span class="extension">'+newname.substr(newname.lastIndexOf('.'))+'</span>'));
-			}
-			tr.data('renaming',false);
 			return false;
 		});
 		input.click(function(event){
@ -255,21 +257,23 @@ var FileList={
 	},
 	do_delete:function(files){
 		// Finish any existing actions
-		if (FileList.lastAction || !FileList.useUndo) {
-			if(!FileList.deleteFiles) {
-				FileList.prepareDeletion(files);
-			}
+		if (FileList.lastAction) {
 			FileList.lastAction();
-			return;
 		}
+		
 		FileList.prepareDeletion(files);
-		// NOTE: Temporary fix to change the text to unshared for files in root of Shared folder
-		if ($('#dir').val() == '/Shared') {
-			$('#notification').html(t('files', 'unshared')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
+		
+		if (!FileList.useUndo) {
+			FileList.lastAction();
 		} else {
-			$('#notification').html(t('files', 'deleted')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
+			// NOTE: Temporary fix to change the text to unshared for files in root of Shared folder
+			if ($('#dir').val() == '/Shared') {
+				$('#notification').html(t('files', 'unshared')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
+			} else {
+				$('#notification').html(t('files', 'deleted')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
+			}
+			$('#notification').fadeIn();
 		}
-		$('#notification').fadeIn();
 	},
 	finishDelete:function(ready,sync){
 		if(!FileList.deleteCanceled && FileList.deleteFiles){
@ -277,6 +281,7 @@ var FileList={
 			$.ajax({
 				url: OC.filePath('files', 'ajax', 'delete.php'),
 				async:!sync,
+				type:'post',
 				data: {dir:$('#dir').val(),files:fileNames},
 				complete: function(data){
 					boolOperationFinished(data, function(){
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@ -253,10 +253,10 @@ $(document).ready(function() {
 									var img = OC.imagePath('core', 'loading.gif');
 									var tr=$('tr').filterAttr('data-file',dirName);
 									tr.find('td.filename').attr('style','background-image:url('+img+')');
-									uploadtext.text('1 file uploading');
+									uploadtext.text(t('files', '1 file uploading'));
 									uploadtext.show();
 								} else {
-									uploadtext.text(currentUploads + ' files uploading')
+									uploadtext.text(currentUploads + ' ' + t('files', 'files uploading'));
 								}
 							}
 						}
@ -301,7 +301,7 @@ $(document).ready(function() {
 												uploadtext.text('');
 												uploadtext.hide();
 											} else {
-												uploadtext.text(currentUploads + ' files uploading')
+												uploadtext.text(currentUploads + ' ' + t('files', 'files uploading'));
 											}
 										})
 								.error(function(jqXHR, textStatus, errorThrown) {
@ -316,7 +316,7 @@ $(document).ready(function() {
 											uploadtext.text('');
 											uploadtext.hide();
 										} else {
-											uploadtext.text(currentUploads + ' files uploading')
+											uploadtext.text(currentUploads + ' ' + t('files', 'files uploading'));
 										}
 										$('#notification').hide();
 										$('#notification').text(t('files', 'Upload cancelled.'));
@ -356,12 +356,13 @@ $(document).ready(function() {
 										$('#notification').fadeIn();
 									}
 								});
-								uploadingFiles[files[i].name] = jqXHR;
+								uploadingFiles[uniqueName] = jqXHR;
 							}
 						}
 					}else{
 						data.submit().success(function(data, status) {
-							response = jQuery.parseJSON(data[0].body.innerText);
+							// in safari data is a string
+							response = jQuery.parseJSON(typeof data === 'string' ? data : data[0].body.innerText);
 							if(response[0] != undefined && response[0].status == 'success') {
 								var file=response[0];
 								delete uploadingFiles[file.name];
@ -556,10 +557,12 @@ $(document).ready(function() {
 					eventSource.listen('progress',function(progress){
 						$('#uploadprogressbar').progressbar('value',progress);
 					});
-					eventSource.listen('success',function(mime){
+					eventSource.listen('success',function(data){
+						var mime=data.mime;
+						var size=data.size;
 						$('#uploadprogressbar').fadeOut();
 						var date=new Date();
-						FileList.addFile(localName,0,date,false,hidden);
+						FileList.addFile(localName,size,date,false,hidden);
 						var tr=$('tr').filterAttr('data-file',localName);
 						tr.data('mime',mime);
 						getMimeIcon(mime,function(path){
@ -661,7 +664,7 @@ function scanFiles(force,dir){
 	var scannerEventSource=new OC.EventSource(OC.filePath('files','ajax','scan.php'),{force:force,dir:dir});
 	scanFiles.cancel=scannerEventSource.close.bind(scannerEventSource);
 	scannerEventSource.listen('scanning',function(data){
-		$('#scan-count').text(data.count+' files scanned');
+		$('#scan-count').text(data.count + ' ' + t('files', 'files scanned'));
 		$('#scan-current').text(data.file+'/');
 	});
 	scannerEventSource.listen('success',function(success){
@ -669,7 +672,7 @@ function scanFiles(force,dir){
 		if(success){
 			window.location.reload();
 		}else{
-			alert('error while scanning');
+			alert(t('files', 'error while scanning'));
 		}
 	});
 }
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@ -7,6 +7,7 @@
 "Missing a temporary folder" => "S'ha perdut un fitxer temporal",
 "Failed to write to disk" => "Ha fallat en escriure al disc",
 "Files" => "Fitxers",
+"Unshare" => "Deixa de compartir",
 "Delete" => "Suprimeix",
 "already exists" => "ja existeix",
 "replace" => "substitueix",
@ -15,6 +16,7 @@
 "replaced" => "substituït",
 "undo" => "desfés",
 "with" => "per",
+"unshared" => "No compartits",
 "deleted" => "esborrat",
 "generating ZIP-file, it may take some time." => "s'estan generant fitxers ZIP, pot trigar una estona.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes",
@ -23,6 +25,8 @@
 "Upload cancelled." => "La pujada s'ha cancel·lat.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.",
 "Invalid name, '/' is not allowed." => "El nom no és vàlid, no es permet '/'.",
+"files scanned" => "arxius escanejats",
+"error while scanning" => "error durant l'escaneig",
 "Size" => "Mida",
 "Modified" => "Modificat",
 "folder" => "carpeta",
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@ -7,6 +7,7 @@
 "Missing a temporary folder" => "Chybí adresář pro dočasné soubory",
 "Failed to write to disk" => "Zápis na disk selhal",
 "Files" => "Soubory",
+"Unshare" => "Zrušit sdílení",
 "Delete" => "Smazat",
 "already exists" => "již existuje",
 "replace" => "nahradit",
@ -15,6 +16,7 @@
 "replaced" => "nahrazeno",
 "undo" => "zpět",
 "with" => "s",
+"unshared" => "sdílení zrušeno",
 "deleted" => "smazáno",
 "generating ZIP-file, it may take some time." => "generuji ZIP soubor, může to nějakou dobu trvat.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo má velikost 0 bajtů",
@ -23,6 +25,8 @@
 "Upload cancelled." => "Odesílání zrušeno.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Probíhá odesílání souboru. Opuštění stránky vyústí ve zrušení nahrávání.",
 "Invalid name, '/' is not allowed." => "Neplatný název, znak '/' není povolen",
+"files scanned" => "soubory prohledány",
+"error while scanning" => "chyba při prohledávání",
 "Size" => "Velikost",
 "Modified" => "Změněno",
 "folder" => "složka",
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@ -7,13 +7,16 @@
 "Missing a temporary folder" => "Mangler en midlertidig mappe",
 "Failed to write to disk" => "Fejl ved skrivning til disk.",
 "Files" => "Filer",
+"Unshare" => "Fjern deling",
 "Delete" => "Slet",
 "already exists" => "findes allerede",
 "replace" => "erstat",
+"suggest name" => "foreslå navn",
 "cancel" => "fortryd",
 "replaced" => "erstattet",
 "undo" => "fortryd",
 "with" => "med",
+"unshared" => "udelt",
 "deleted" => "Slettet",
 "generating ZIP-file, it may take some time." => "genererer ZIP-fil, det kan tage lidt tid.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kunne ikke uploade din fil, da det enten er en mappe eller er tom",
@ -35,6 +38,7 @@
 "Enable ZIP-download" => "Muliggør ZIP-download",
 "0 is unlimited" => "0 er ubegrænset",
 "Maximum input size for ZIP files" => "Maksimal størrelse på ZIP filer",
+"Save" => "Gem",
 "New" => "Ny",
 "Text file" => "Tekstfil",
 "Folder" => "Mappe",
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@ -7,7 +7,9 @@
 "Missing a temporary folder" => "Temporärer Ordner fehlt.",
 "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
 "Files" => "Dateien",
+"Unshare" => "Nicht mehr teilen",
 "Delete" => "Löschen",
+"Rename" => "Umbenennen",
 "already exists" => "ist bereits vorhanden",
 "replace" => "ersetzen",
 "suggest name" => "Name vorschlagen",
@ -15,14 +17,17 @@
 "replaced" => "ersetzt",
 "undo" => "rückgängig machen",
 "with" => "mit",
+"unshared" => "Nicht mehr teilen",
 "deleted" => "gelöscht",
 "generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.",
-"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, da sie ein Verzeichnis ist oder 0 Bytes hat.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis ist oder 0 Bytes hat.",
 "Upload Error" => "Fehler beim Hochladen",
 "Pending" => "Ausstehend",
 "Upload cancelled." => "Hochladen abgebrochen.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
 "Invalid name, '/' is not allowed." => "Ungültiger Name: \"/\" ist nicht erlaubt.",
+"files scanned" => "Dateien gescannt",
+"error while scanning" => "Fehler beim Scannen",
 "Size" => "Größe",
 "Modified" => "Bearbeitet",
 "folder" => "Ordner",
@ -50,5 +55,5 @@
 "Upload too large" => "Upload zu groß",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server.",
 "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
-"Current scanning" => "Scannen"
+"Current scanning" => "Scanne"
 );
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@ -3,24 +3,30 @@
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Το αρχείο που μεταφορτώθηκε υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"upload_max_filesize\" του php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Το αρχείο υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"MAX_FILE_SIZE\" που έχει οριστεί στην HTML φόρμα",
 "The uploaded file was only partially uploaded" => "Το αρχείο μεταφορώθηκε μόνο εν μέρει",
-"No file was uploaded" => "Το αρχείο δεν μεταφορτώθηκε",
-"Missing a temporary folder" => "Λείπει ένας προσωρινός φάκελος",
-"Failed to write to disk" => "Η εγγραφή στο δίσκο απέτυχε",
+"No file was uploaded" => "Κανένα αρχείο δεν μεταφορτώθηκε",
+"Missing a temporary folder" => "Λείπει ο προσωρινός φάκελος",
+"Failed to write to disk" => "Αποτυχία εγγραφής στο δίσκο",
 "Files" => "Αρχεία",
+"Unshare" => "Διακοπή κοινής χρήσης",
 "Delete" => "Διαγραφή",
 "already exists" => "υπάρχει ήδη",
 "replace" => "αντικατέστησε",
+"suggest name" => "συνιστώμενο όνομα",
 "cancel" => "ακύρωση",
 "replaced" => "αντικαταστάθηκε",
 "undo" => "αναίρεση",
 "with" => "με",
+"unshared" => "Διακόπηκε ο διαμοιρασμός",
 "deleted" => "διαγράφηκε",
 "generating ZIP-file, it may take some time." => "παραγωγή αρχείου ZIP, ίσως διαρκέσει αρκετά.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Αδυναμία στην μεταφόρτωση του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes",
 "Upload Error" => "Σφάλμα Μεταφόρτωσης",
-"Pending" => "Εν αναμονή",
+"Pending" => "Εκκρεμεί",
 "Upload cancelled." => "Η μεταφόρτωση ακυρώθηκε.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Η μεταφόρτωση του αρχείου βρίσκεται σε εξέλιξη.  Έξοδος από την σελίδα τώρα θα ακυρώσει την μεταφόρτωση.",
 "Invalid name, '/' is not allowed." => "Μη έγκυρο όνομα, το '/' δεν επιτρέπεται.",
+"files scanned" => "αρχεία σαρώθηκαν",
+"error while scanning" => "σφάλμα κατά την ανίχνευση",
 "Size" => "Μέγεθος",
 "Modified" => "Τροποποιήθηκε",
 "folder" => "φάκελος",
@ -34,18 +40,19 @@
 "Enable ZIP-download" => "Ενεργοποίηση κατεβάσματος ZIP",
 "0 is unlimited" => "0 για απεριόριστο",
 "Maximum input size for ZIP files" => "Μέγιστο μέγεθος για αρχεία ZIP",
+"Save" => "Αποθήκευση",
 "New" => "Νέο",
 "Text file" => "Αρχείο κειμένου",
 "Folder" => "Φάκελος",
 "From url" => "Από την διεύθυνση",
 "Upload" => "Μεταφόρτωση",
-"Cancel upload" => "Ακύρωση ανεβάσματος",
+"Cancel upload" => "Ακύρωση μεταφόρτωσης",
 "Nothing in here. Upload something!" => "Δεν υπάρχει τίποτα εδώ. Ανέβασε κάτι!",
 "Name" => "Όνομα",
-"Share" => "Διαμοίρασε",
+"Share" => "Διαμοιρασμός",
 "Download" => "Λήψη",
-"Upload too large" => "Πολύ μεγάλο το αρχείο προς μεταφόρτωση",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος μεταφόρτωσης αρχείων σε αυτόν το διακομιστή.",
-"Files are being scanned, please wait." => "Τα αρχεία ανιχνεύονται, παρακαλώ περιμένετε",
+"Upload too large" => "Πολύ μεγάλο αρχείο προς μεταφόρτωση",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να μεταφορτώσετε υπερβαίνουν το μέγιστο μέγεθος μεταφόρτωσης αρχείων σε αυτόν το διακομιστή.",
+"Files are being scanned, please wait." => "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε",
 "Current scanning" => "Τρέχουσα αναζήτηση "
 );
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@ -7,19 +7,23 @@
 "Missing a temporary folder" => "Mankas tempa dosierujo",
 "Failed to write to disk" => "Malsukcesis skribo al disko",
 "Files" => "Dosieroj",
+"Unshare" => "Malkunhavigi",
 "Delete" => "Forigi",
 "already exists" => "jam ekzistas",
 "replace" => "anstataŭigi",
+"suggest name" => "sugesti nomon",
 "cancel" => "nuligi",
 "replaced" => "anstataŭigita",
 "undo" => "malfari",
 "with" => "kun",
+"unshared" => "malkunhavigita",
 "deleted" => "forigita",
 "generating ZIP-file, it may take some time." => "generanta ZIP-dosiero, ĝi povas daŭri iom da tempo",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn",
 "Upload Error" => "Alŝuta eraro",
 "Pending" => "Traktotaj",
 "Upload cancelled." => "La alŝuto nuliĝis.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.",
 "Invalid name, '/' is not allowed." => "Nevalida nomo, “/” ne estas permesata.",
 "Size" => "Grando",
 "Modified" => "Modifita",
@ -34,6 +38,7 @@
 "Enable ZIP-download" => "Kapabligi ZIP-elŝuton",
 "0 is unlimited" => "0 signifas senlime",
 "Maximum input size for ZIP files" => "Maksimuma enirgrando por ZIP-dosieroj",
+"Save" => "Konservi",
 "New" => "Nova",
 "Text file" => "Tekstodosiero",
 "Folder" => "Dosierujo",
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@ -7,7 +7,8 @@
 "Missing a temporary folder" => "Falta un directorio temporal",
 "Failed to write to disk" => "La escritura en disco ha fallado",
 "Files" => "Archivos",
-"Delete" => "Eliminado",
+"Unshare" => "Dejar de compartir",
+"Delete" => "Eliminar",
 "already exists" => "ya existe",
 "replace" => "reemplazar",
 "suggest name" => "sugerir nombre",
@ -15,6 +16,7 @@
 "replaced" => "reemplazado",
 "undo" => "deshacer",
 "with" => "con",
+"unshared" => "no compartido",
 "deleted" => "borrado",
 "generating ZIP-file, it may take some time." => "generando un fichero ZIP, puede llevar un tiempo.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes",
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@ -7,19 +7,23 @@
 "Missing a temporary folder" => "Ajutiste failide kaust puudub",
 "Failed to write to disk" => "Kettale kirjutamine ebaõnnestus",
 "Files" => "Failid",
+"Unshare" => "Lõpeta jagamine",
 "Delete" => "Kustuta",
 "already exists" => "on juba olemas",
 "replace" => "asenda",
+"suggest name" => "soovita nime",
 "cancel" => "loobu",
 "replaced" => "asendatud",
 "undo" => "tagasi",
 "with" => "millega",
+"unshared" => "jagamata",
 "deleted" => "kustutatud",
 "generating ZIP-file, it may take some time." => "ZIP-faili loomine, see võib veidi aega võtta.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suurus on 0 baiti",
 "Upload Error" => "Üleslaadimise viga",
 "Pending" => "Ootel",
 "Upload cancelled." => "Üleslaadimine tühistati.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös.  Lehelt lahkumine katkestab selle üleslaadimise.",
 "Invalid name, '/' is not allowed." => "Vigane nimi, '/' pole lubatud.",
 "Size" => "Suurus",
 "Modified" => "Muudetud",
@ -34,6 +38,7 @@
 "Enable ZIP-download" => "Luba ZIP-ina allalaadimine",
 "0 is unlimited" => "0 tähendab piiramatut",
 "Maximum input size for ZIP files" => "Maksimaalne ZIP-faili sisestatava faili suurus",
+"Save" => "Salvesta",
 "New" => "Uus",
 "Text file" => "Tekstifail",
 "Folder" => "Kaust",
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@ -7,20 +7,26 @@
 "Missing a temporary folder" => "Aldi baterako karpeta falta da",
 "Failed to write to disk" => "Errore bat izan da diskoan idazterakoan",
 "Files" => "Fitxategiak",
+"Unshare" => "Ez partekatu",
 "Delete" => "Ezabatu",
 "already exists" => "dagoeneko existitzen da",
 "replace" => "ordeztu",
+"suggest name" => "aholkatu izena",
 "cancel" => "ezeztatu",
 "replaced" => "ordeztua",
 "undo" => "desegin",
 "with" => "honekin",
+"unshared" => "Ez partekatuta",
 "deleted" => "ezabatuta",
 "generating ZIP-file, it may take some time." => "ZIP-fitxategia sortzen ari da, denbora har dezake",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu",
 "Upload Error" => "Igotzean errore bat suertatu da",
 "Pending" => "Zain",
 "Upload cancelled." => "Igoera ezeztatuta",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
 "Invalid name, '/' is not allowed." => "Baliogabeko izena, '/' ezin da erabili. ",
+"files scanned" => "fitxategiak eskaneatuta",
+"error while scanning" => "errore bat egon da eskaneatzen zen bitartean",
 "Size" => "Tamaina",
 "Modified" => "Aldatuta",
 "folder" => "karpeta",
@ -34,6 +40,7 @@
 "Enable ZIP-download" => "Gaitu ZIP-deskarga",
 "0 is unlimited" => "0 mugarik gabe esan nahi du",
 "Maximum input size for ZIP files" => "ZIP fitxategien gehienezko tamaina",
+"Save" => "Gorde",
 "New" => "Berria",
 "Text file" => "Testu fitxategia",
 "Folder" => "Karpeta",
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@ -7,13 +7,16 @@
 "Missing a temporary folder" => "Il manque un répertoire temporaire",
 "Failed to write to disk" => "Erreur d'écriture sur le disque",
 "Files" => "Fichiers",
+"Unshare" => "Ne plus partager",
 "Delete" => "Supprimer",
 "already exists" => "existe déjà",
 "replace" => "remplacer",
+"suggest name" => "Suggérer un nom",
 "cancel" => "annuler",
 "replaced" => "remplacé",
 "undo" => "annuler",
 "with" => "avec",
+"unshared" => "non partagée",
 "deleted" => "supprimé",
 "generating ZIP-file, it may take some time." => "Fichier ZIP en cours d'assemblage ;  cela peut prendre du temps.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet.",
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@ -7,20 +7,26 @@
 "Missing a temporary folder" => "Falta un cartafol temporal",
 "Failed to write to disk" => "Erro ao escribir no disco",
 "Files" => "Ficheiros",
+"Unshare" => "Deixar de compartir",
 "Delete" => "Eliminar",
 "already exists" => "xa existe",
 "replace" => "substituír",
+"suggest name" => "suxira nome",
 "cancel" => "cancelar",
 "replaced" => "substituído",
 "undo" => "desfacer",
 "with" => "con",
+"unshared" => "non compartido",
 "deleted" => "eliminado",
 "generating ZIP-file, it may take some time." => "xerando ficheiro ZIP, pode levar un anaco.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Non se puido subir o ficheiro pois ou é un directorio ou ten 0 bytes",
 "Upload Error" => "Erro na subida",
 "Pending" => "Pendentes",
 "Upload cancelled." => "Subida cancelada.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "A subida do ficheiro está en curso. Saír agora da páxina cancelará a subida.",
 "Invalid name, '/' is not allowed." => "Nome non válido, '/' non está permitido.",
+"files scanned" => "ficheiros analizados",
+"error while scanning" => "erro mentras analizaba",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
 "folder" => "cartafol",
@ -34,6 +40,7 @@
 "Enable ZIP-download" => "Habilitar a descarga-ZIP",
 "0 is unlimited" => "0 significa ilimitado",
 "Maximum input size for ZIP files" => "Tamaño máximo de descarga para os ZIP",
+"Save" => "Gardar",
 "New" => "Novo",
 "Text file" => "Ficheiro de texto",
 "Folder" => "Cartafol",
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@ -8,6 +8,7 @@
 "Failed to write to disk" => "הכתיבה לכונן נכשלה",
 "Files" => "קבצים",
 "Delete" => "מחיקה",
+"already exists" => "כבר קיים",
 "generating ZIP-file, it may take some time." => "יוצר קובץ ZIP, אנא המתן.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים",
 "Upload Error" => "שגיאת העלאה",
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@ -7,6 +7,7 @@
 "Missing a temporary folder" => "Cartella temporanea mancante",
 "Failed to write to disk" => "Scrittura su disco non riuscita",
 "Files" => "File",
+"Unshare" => "Rimuovi condivisione",
 "Delete" => "Elimina",
 "already exists" => "esiste già",
 "replace" => "sostituisci",
@ -15,6 +16,7 @@
 "replaced" => "sostituito",
 "undo" => "annulla",
 "with" => "con",
+"unshared" => "condivisione rimossa",
 "deleted" => "eliminati",
 "generating ZIP-file, it may take some time." => "creazione file ZIP, potrebbe richiedere del tempo.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile inviare il file poiché è una cartella o ha dimensione 0 byte",
@ -23,6 +25,8 @@
 "Upload cancelled." => "Invio annullato",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.",
 "Invalid name, '/' is not allowed." => "Nome non valido",
+"files scanned" => "file analizzati",
+"error while scanning" => "errore durante la scansione",
 "Size" => "Dimensione",
 "Modified" => "Modificato",
 "folder" => "cartella",
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@ -7,13 +7,16 @@
 "Missing a temporary folder" => "テンポラリフォルダが見つかりません",
 "Failed to write to disk" => "ディスクへの書き込みに失敗しました",
 "Files" => "ファイル",
+"Unshare" => "共有しない",
 "Delete" => "削除",
 "already exists" => "既に存在します",
 "replace" => "置き換え",
+"suggest name" => "推奨名称",
 "cancel" => "キャンセル",
 "replaced" => "置換：",
 "undo" => "元に戻す",
 "with" => "←",
+"unshared" => "未共有",
 "deleted" => "削除",
 "generating ZIP-file, it may take some time." => "ZIPファイルを生成中です、しばらくお待ちください。",
 "Unable to upload your file as it is a directory or has 0 bytes" => "アップロード使用としているファイルがディレクトリ、もしくはサイズが0バイトのため、アップロードできません。",
@ -22,6 +25,8 @@
 "Upload cancelled." => "アップロードはキャンセルされました。",
 "File upload is in progress. Leaving the page now will cancel the upload." => "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。",
 "Invalid name, '/' is not allowed." => "無効な名前、'/' は使用できません。",
+"files scanned" => "ファイルをスキャンしました",
+"error while scanning" => "スキャン中のエラー",
 "Size" => "サイズ",
 "Modified" => "更新日時",
 "folder" => "フォルダ",
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@ -34,6 +34,7 @@
 "Enable ZIP-download" => "Aktiver nedlasting av ZIP",
 "0 is unlimited" => "0 er ubegrenset",
 "Maximum input size for ZIP files" => "Maksimal størrelse på ZIP-filer",
+"Save" => "Lagre",
 "New" => "Ny",
 "Text file" => "Tekstfil",
 "Folder" => "Mappe",
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@ -7,13 +7,16 @@
 "Missing a temporary folder" => "Een tijdelijke map mist",
 "Failed to write to disk" => "Schrijven naar schijf mislukt",
 "Files" => "Bestanden",
+"Unshare" => "Stop delen",
 "Delete" => "Verwijder",
 "already exists" => "bestaat al",
 "replace" => "vervang",
+"suggest name" => "Stel een naam voor",
 "cancel" => "annuleren",
 "replaced" => "vervangen",
 "undo" => "ongedaan maken",
 "with" => "door",
+"unshared" => "niet gedeeld",
 "deleted" => "verwijderd",
 "generating ZIP-file, it may take some time." => "aanmaken ZIP-file, dit kan enige tijd duren.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "uploaden van de file mislukt, het is of een directory of de bestandsgrootte is 0 bytes",
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@ -7,6 +7,7 @@
 "Missing a temporary folder" => "Brak katalogu tymczasowego",
 "Failed to write to disk" => "Błąd zapisu na dysk",
 "Files" => "Pliki",
+"Unshare" => "Nie udostępniaj",
 "Delete" => "Usuwa element",
 "already exists" => "Już istnieje",
 "replace" => "zastap",
@ -15,6 +16,7 @@
 "replaced" => "zastąpione",
 "undo" => "wróć",
 "with" => "z",
+"unshared" => "Nie udostępnione",
 "deleted" => "skasuj",
 "generating ZIP-file, it may take some time." => "Generowanie pliku ZIP, może potrwać pewien czas.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nie można wczytać pliku jeśli jest katalogiem lub ma 0 bajtów",
@ -23,6 +25,8 @@
 "Upload cancelled." => "Wczytywanie anulowane.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Wysyłanie pliku jest w toku. Teraz opuszczając stronę wysyłanie zostanie anulowane.",
 "Invalid name, '/' is not allowed." => "Nieprawidłowa nazwa '/' jest niedozwolone.",
+"files scanned" => "Pliki skanowane",
+"error while scanning" => "Wystąpił błąd podczas skanowania",
 "Size" => "Rozmiar",
 "Modified" => "Czas modyfikacji",
 "folder" => "folder",
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@ -7,9 +7,32 @@
 "Missing a temporary folder" => "Lipsește un dosar temporar",
 "Failed to write to disk" => "Eroare la scriere pe disc",
 "Files" => "Fișiere",
+"Unshare" => "Anulează partajarea",
 "Delete" => "Șterge",
+"already exists" => "deja există",
+"replace" => "înlocuire",
+"suggest name" => "sugerează nume",
+"cancel" => "anulare",
+"replaced" => "înlocuit",
+"undo" => "Anulează ultima acțiune",
+"with" => "cu",
+"unshared" => "nepartajat",
+"deleted" => "șters",
+"generating ZIP-file, it may take some time." => "se generază fișierul ZIP, va dura ceva timp.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nu s-a putut încărca fișierul tău deoarece pare să fie un director sau are 0 bytes.",
+"Upload Error" => "Eroare la încărcare",
+"Pending" => "În așteptare",
+"Upload cancelled." => "Încărcare anulată.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.",
+"Invalid name, '/' is not allowed." => "Nume invalid, '/' nu este permis.",
+"files scanned" => "fișiere scanate",
+"error while scanning" => "eroare la scanarea",
 "Size" => "Dimensiune",
 "Modified" => "Modificat",
+"folder" => "director",
+"folders" => "directoare",
+"file" => "fișier",
+"files" => "fișiere",
 "File handling" => "Manipulare fișiere",
 "Maximum upload size" => "Dimensiune maximă admisă la încărcare",
 "max. possible: " => "max. posibil:",
@ -17,6 +40,7 @@
 "Enable ZIP-download" => "Activează descărcare fișiere compresate",
 "0 is unlimited" => "0 e nelimitat",
 "Maximum input size for ZIP files" => "Dimensiunea maximă de intrare pentru fișiere compresate",
+"Save" => "Salvare",
 "New" => "Nou",
 "Text file" => "Fișier text",
 "Folder" => "Dosar",
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@ -7,13 +7,16 @@
 "Missing a temporary folder" => "Невозможно найти временную папку",
 "Failed to write to disk" => "Ошибка записи на диск",
 "Files" => "Файлы",
+"Unshare" => "Отменить публикацию",
 "Delete" => "Удалить",
 "already exists" => "уже существует",
 "replace" => "заменить",
+"suggest name" => "предложить название",
 "cancel" => "отмена",
 "replaced" => "заменён",
 "undo" => "отмена",
 "with" => "с",
+"unshared" => "публикация отменена",
 "deleted" => "удален",
 "generating ZIP-file, it may take some time." => "создание ZIP-файла, это может занять некоторое время.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Не удается загрузить файл размером 0 байт в каталог",
@ -35,6 +38,7 @@
 "Enable ZIP-download" => "Включить ZIP-скачивание",
 "0 is unlimited" => "0 - без ограничений",
 "Maximum input size for ZIP files" => "Максимальный исходный размер для ZIP файлов",
+"Save" => "Сохранить",
 "New" => "Новый",
 "Text file" => "Текстовый файл",
 "Folder" => "Папка",
--- a/apps/files/l10n/ru_RU.php
+++ b/apps/files/l10n/ru_RU.php
@ -0,0 +1,56 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Ошибка отсутствует, файл загружен успешно.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Размер загруженного файла превышает заданный в директиве upload_max_filesize в php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Размер загруженного",
+"The uploaded file was only partially uploaded" => "Загружаемый файл был загружен частично",
+"No file was uploaded" => "Файл не был загружен",
+"Missing a temporary folder" => "Отсутствует временная папка",
+"Failed to write to disk" => "Не удалось записать на диск",
+"Files" => "Файлы",
+"Unshare" => "Скрыть",
+"Delete" => "Удалить",
+"already exists" => "уже существует",
+"replace" => "отмена",
+"suggest name" => "подобрать название",
+"cancel" => "отменить",
+"replaced" => "заменено",
+"undo" => "отменить действие",
+"with" => "с",
+"unshared" => "скрытый",
+"deleted" => "удалено",
+"generating ZIP-file, it may take some time." => "Создание ZIP-файла, это может занять некоторое время.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Невозможно загрузить файл,\n так как он имеет нулевой размер или является директорией",
+"Upload Error" => "Ошибка загрузки",
+"Pending" => "Ожидающий решения",
+"Upload cancelled." => "Загрузка отменена",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Процесс загрузки файла. Если покинуть страницу сейчас, загрузка будет отменена.",
+"Invalid name, '/' is not allowed." => "Неправильное имя, '/' не допускается.",
+"Size" => "Размер",
+"Modified" => "Изменен",
+"folder" => "папка",
+"folders" => "папки",
+"file" => "файл",
+"files" => "файлы",
+"File handling" => "Работа с файлами",
+"Maximum upload size" => "Максимальный размер загружаемого файла",
+"max. possible: " => "Максимально возможный",
+"Needed for multi-file and folder downloads." => "Необходимо для множественной загрузки.",
+"Enable ZIP-download" => "Включение ZIP-загрузки",
+"0 is unlimited" => "0 без ограничений",
+"Maximum input size for ZIP files" => "Максимальный размер входящих ZIP-файлов ",
+"Save" => "Сохранить",
+"New" => "Новый",
+"Text file" => "Текстовый файл",
+"Folder" => "Папка",
+"From url" => "Из url",
+"Upload" => "Загрузить ",
+"Cancel upload" => "Отмена загрузки",
+"Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
+"Name" => "Имя",
+"Share" => "Сделать общим",
+"Download" => "Загрузить",
+"Upload too large" => "Загрузка слишком велика",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Размер файлов, которые Вы пытаетесь загрузить, превышает максимально допустимый размер для загрузки на данный сервер.",
+"Files are being scanned, please wait." => "Файлы сканируются, пожалуйста, подождите.",
+"Current scanning" => "Текущее сканирование"
+);
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@ -7,13 +7,26 @@
 "Missing a temporary folder" => "Chýbajúci dočasný priečinok",
 "Failed to write to disk" => "Zápis na disk sa nepodaril",
 "Files" => "Súbory",
+"Unshare" => "Nezdielať",
 "Delete" => "Odstrániť",
+"already exists" => "už existuje",
+"replace" => "nahradiť",
+"suggest name" => "pomôcť s menom",
+"cancel" => "zrušiť",
+"replaced" => "zmenené",
+"undo" => "vrátiť",
+"with" => "s",
+"unshared" => "zdielané",
+"deleted" => "zmazané",
 "generating ZIP-file, it may take some time." => "generujem ZIP-súbor, môže to chvíľu trvať.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nemôžem nahrať súbor lebo je to priečinok alebo má 0 bajtov.",
 "Upload Error" => "Chyba nahrávania",
 "Pending" => "Čaká sa",
 "Upload cancelled." => "Nahrávanie zrušené",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
 "Invalid name, '/' is not allowed." => "Chybný názov, \"/\" nie je povolené",
+"files scanned" => "skontrolovaných súborov",
+"error while scanning" => "chyba počas kontroly",
 "Size" => "Veľkosť",
 "Modified" => "Upravené",
 "folder" => "priečinok",
@ -21,23 +34,24 @@
 "file" => "súbor",
 "files" => "súbory",
 "File handling" => "Nastavenie správanie k súborom",
-"Maximum upload size" => "Maximálna veľkosť nahratia",
+"Maximum upload size" => "Maximálna veľkosť odosielaného súboru",
 "max. possible: " => "najväčšie možné:",
 "Needed for multi-file and folder downloads." => "Vyžadované pre sťahovanie viacerých súborov a adresárov.",
 "Enable ZIP-download" => "Povoliť sťahovanie ZIP súborov",
 "0 is unlimited" => "0 znamená neobmedzené",
 "Maximum input size for ZIP files" => "Najväčšia veľkosť ZIP súborov",
+"Save" => "Uložiť",
 "New" => "Nový",
 "Text file" => "Textový súbor",
 "Folder" => "Priečinok",
 "From url" => "Z url",
 "Upload" => "Nahrať",
 "Cancel upload" => "Zrušiť odosielanie",
-"Nothing in here. Upload something!" => "Nič tu nie je. Nahrajte niečo!",
+"Nothing in here. Upload something!" => "Žiadny súbor. Nahrajte niečo!",
 "Name" => "Meno",
 "Share" => "Zdielať",
 "Download" => "Stiahnuť",
-"Upload too large" => "Nahrávanie príliš veľké",
+"Upload too large" => "Odosielaný súbor je príliš veľký",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Súbory ktoré sa snažíte nahrať presahujú maximálnu veľkosť pre nahratie súborov na tento server.",
 "Files are being scanned, please wait." => "Súbory sa práve prehľadávajú, prosím čakajte.",
 "Current scanning" => "Práve prehliadané"
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@ -7,6 +7,7 @@
 "Missing a temporary folder" => "Manjka začasna mapa",
 "Failed to write to disk" => "Pisanje na disk je spodletelo",
 "Files" => "Datoteke",
+"Unshare" => "Odstrani iz souporabe",
 "Delete" => "Izbriši",
 "already exists" => "že obstaja",
 "replace" => "nadomesti",
@ -15,6 +16,7 @@
 "replaced" => "nadomeščen",
 "undo" => "razveljavi",
 "with" => "z",
+"unshared" => "odstranjeno iz souporabe",
 "deleted" => "izbrisano",
 "generating ZIP-file, it may take some time." => "Ustvarjam ZIP datoteko. To lahko traja nekaj časa.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nalaganje ni mogoče, saj gre za mapo, ali pa ima datoteka velikost 0 bajtov.",
@ -23,6 +25,8 @@
 "Upload cancelled." => "Nalaganje je bilo preklicano.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Nalaganje datoteke je v teku. Če zapustite to stran zdaj, boste nalaganje preklicali.",
 "Invalid name, '/' is not allowed." => "Neveljavno ime. Znak '/' ni dovoljen.",
+"files scanned" => "pregledanih datotek",
+"error while scanning" => "napaka med pregledovanjem datotek",
 "Size" => "Velikost",
 "Modified" => "Spremenjeno",
 "folder" => "mapa",
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@ -7,6 +7,7 @@
 "Missing a temporary folder" => "Saknar en tillfällig mapp",
 "Failed to write to disk" => "Misslyckades spara till disk",
 "Files" => "Filer",
+"Unshare" => "Sluta dela",
 "Delete" => "Radera",
 "already exists" => "finns redan",
 "replace" => "ersätt",
@ -15,6 +16,7 @@
 "replaced" => "ersatt",
 "undo" => "ångra",
 "with" => "med",
+"unshared" => "Ej delad",
 "deleted" => "raderad",
 "generating ZIP-file, it may take some time." => "genererar ZIP-fil, det kan ta lite tid.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller har 0 bytes.",
@ -23,6 +25,8 @@
 "Upload cancelled." => "Uppladdning avbruten.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
 "Invalid name, '/' is not allowed." => "Ogiltigt namn, '/' är inte tillåten.",
+"files scanned" => "filer skannade",
+"error while scanning" => "fel vid skanning",
 "Size" => "Storlek",
 "Modified" => "Ändrad",
 "folder" => "mapp",
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@ -7,6 +7,7 @@
 "Missing a temporary folder" => "แฟ้มเอกสารชั่วคราวเกิดการสูญหาย",
 "Failed to write to disk" => "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว",
 "Files" => "ไฟล์",
+"Unshare" => "ยกเลิกการแชร์ข้อมูล",
 "Delete" => "ลบ",
 "already exists" => "มีอยู่แล้ว",
 "replace" => "แทนที่",
@ -15,6 +16,7 @@
 "replaced" => "แทนที่แล้ว",
 "undo" => "เลิกทำ",
 "with" => "กับ",
+"unshared" => "ยกเลิกการแชร์ข้อมูลแล้ว",
 "deleted" => "ลบแล้ว",
 "generating ZIP-file, it may take some time." => "กำลังสร้างไฟล์บีบอัด ZIP อาจใช้เวลาสักครู่",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่หรือมีขนาด 0 ไบต์",
@ -23,6 +25,8 @@
 "Upload cancelled." => "การอัพโหลดถูกยกเลิก",
 "File upload is in progress. Leaving the page now will cancel the upload." => "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
 "Invalid name, '/' is not allowed." => "ชื่อที่ใช้ไม่ถูกต้อง '/' ไม่อนุญาตให้ใช้งาน",
+"files scanned" => "ไฟล์ต่างๆได้รับการสแกนแล้ว",
+"error while scanning" => "พบข้อผิดพลาดในระหว่างการสแกนไฟล์",
 "Size" => "ขนาด",
 "Modified" => "ปรับปรุงล่าสุด",
 "folder" => "โฟลเดอร์",
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@ -1,9 +1,28 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Không có lỗi, các tập tin đã được tải lên thành công",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Những tập tin được tải lên vượt quá upload_max_filesize được chỉ định trong php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Kích thước những tập tin tải lên vượt quá MAX_FILE_SIZE đã được quy định",
+"The uploaded file was only partially uploaded" => "Tập tin tải lên mới chỉ tải lên được một phần",
+"No file was uploaded" => "Không có tập tin nào được tải lên",
+"Missing a temporary folder" => "Không tìm thấy thư mục tạm",
+"Failed to write to disk" => "Không thể ghi vào đĩa cứng",
 "Files" => "Tập tin",
+"Unshare" => "Không chia sẽ",
 "Delete" => "Xóa",
+"already exists" => "đã tồn tại",
+"replace" => "thay thế",
+"suggest name" => "tên gợi ý",
+"cancel" => "hủy",
+"replaced" => "đã được thay thế",
+"undo" => "lùi lại",
+"with" => "với",
+"deleted" => "đã xóa",
+"generating ZIP-file, it may take some time." => "Tạo tập tinh ZIP, điều này có thể mất một ít thời gian",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Không thể tải lên tập tin này do nó là một thư mục hoặc kích thước tập tin bằng 0 byte",
 "Upload Error" => "Tải lên lỗi",
 "Pending" => "Chờ",
 "Upload cancelled." => "Hủy tải lên",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.",
 "Invalid name, '/' is not allowed." => "Tên không hợp lệ ,không được phép dùng '/'",
 "Size" => "Kích cỡ",
 "Modified" => "Thay đổi",
@ -13,9 +32,11 @@
 "files" => "files",
 "File handling" => "Xử lý tập tin",
 "Maximum upload size" => "Kích thước tối đa ",
+"Needed for multi-file and folder downloads." => "Cần thiết cho tải nhiều tập tin và thư mục.",
 "Enable ZIP-download" => "Cho phép ZIP-download",
 "0 is unlimited" => "0 là không giới hạn",
 "Maximum input size for ZIP files" => "Kích thước tối đa cho các tập tin ZIP",
+"Save" => "Lưu",
 "New" => "Mới",
 "Text file" => "Tập tin văn bản",
 "Folder" => "Folder",
@ -27,5 +48,7 @@
 "Share" => "Chia sẻ",
 "Download" => "Tải xuống",
 "Upload too large" => "File tải lên quá lớn",
-"Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng chờ."
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Các tập tin bạn đang cố gắng tải lên vượt quá kích thước tối đa cho phép trên máy chủ này.",
+"Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng chờ.",
+"Current scanning" => "Hiện tại đang quét"
 );
--- a/apps/files/l10n/zh_CN.GB2312.php
+++ b/apps/files/l10n/zh_CN.GB2312.php
@ -7,20 +7,26 @@
 "Missing a temporary folder" => "丢失了一个临时文件夹",
 "Failed to write to disk" => "写磁盘失败",
 "Files" => "文件",
+"Unshare" => "取消共享",
 "Delete" => "删除",
 "already exists" => "已经存在了",
 "replace" => "替换",
+"suggest name" => "推荐名称",
 "cancel" => "取消",
 "replaced" => "替换过了",
 "undo" => "撤销",
 "with" => "随着",
+"unshared" => "已取消共享",
 "deleted" => "删除",
 "generating ZIP-file, it may take some time." => "正在生成ZIP文件,这可能需要点时间",
 "Unable to upload your file as it is a directory or has 0 bytes" => "不能上传你指定的文件,可能因为它是个文件夹或者大小为0",
 "Upload Error" => "上传错误",
 "Pending" => "Pending",
 "Upload cancelled." => "上传取消了",
+"File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传。关闭页面会取消上传。",
 "Invalid name, '/' is not allowed." => "非法文件名,\"/\"是不被许可的",
+"files scanned" => "文件已扫描",
+"error while scanning" => "扫描出错",
 "Size" => "大小",
 "Modified" => "修改日期",
 "folder" => "文件夹",
@ -34,6 +40,7 @@
 "Enable ZIP-download" => "支持ZIP下载",
 "0 is unlimited" => "0是无限的",
 "Maximum input size for ZIP files" => "最大的ZIP文件输入大小",
+"Save" => "保存",
 "New" => "新建",
 "Text file" => "文本文档",
 "Folder" => "文件夹",
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@ -7,6 +7,7 @@
 "Missing a temporary folder" => "缺少临时目录",
 "Failed to write to disk" => "写入磁盘失败",
 "Files" => "文件",
+"Unshare" => "取消分享",
 "Delete" => "删除",
 "already exists" => "已经存在",
 "replace" => "替换",
@ -15,6 +16,7 @@
 "replaced" => "已经替换",
 "undo" => "撤销",
 "with" => "随着",
+"unshared" => "已取消分享",
 "deleted" => "已经删除",
 "generating ZIP-file, it may take some time." => "正在生成 ZIP 文件，可能需要一些时间",
 "Unable to upload your file as it is a directory or has 0 bytes" => "无法上传文件，因为它是一个目录或者大小为 0 字节",
@ -23,6 +25,8 @@
 "Upload cancelled." => "上传已取消",
 "File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传中。现在离开此页会导致上传动作被取消。",
 "Invalid name, '/' is not allowed." => "非法的名称，不允许使用‘/’。",
+"files scanned" => "已扫描文件",
+"error while scanning" => "扫描时出错",
 "Size" => "大小",
 "Modified" => "修改日期",
 "folder" => "文件夹",
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@ -16,9 +16,9 @@
 					<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
 					<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
 					<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
-					<button class="file_upload_filename">&nbsp;<img class='svg action' alt="Upload" src="<?php echo OCP\image_path("core", "actions/upload-white.svg"); ?>" /></button>
 					<input class="file_upload_start" type="file" name='files[]'/>
-						<a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo  ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
+					<a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo $l->t('Upload'); echo  ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
+					<button class="file_upload_filename"></button>
 					<iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>
 				</form>
 			</div>
--- a/apps/files_encryption/l10n/da.php
+++ b/apps/files_encryption/l10n/da.php
@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Kryptering",
+"Exclude the following file types from encryption" => "Ekskluder følgende filtyper fra kryptering",
+"None" => "Ingen",
+"Enable Encryption" => "Aktivér kryptering"
+);
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Encriptado",
+"Exclude the following file types from encryption" => "Excluír os seguintes tipos de ficheiro da encriptación",
+"None" => "Nada",
+"Enable Encryption" => "Habilitar encriptación"
+);
--- a/apps/files_encryption/l10n/ro.php
+++ b/apps/files_encryption/l10n/ro.php
@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Încriptare",
+"Exclude the following file types from encryption" => "Exclude următoarele tipuri de fișiere de la încriptare",
+"None" => "Niciuna",
+"Enable Encryption" => "Activare încriptare"
+);
--- a/apps/files_encryption/l10n/ru_RU.php
+++ b/apps/files_encryption/l10n/ru_RU.php
@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Шифрование",
+"Exclude the following file types from encryption" => "Исключите следующие типы файлов из шифрования",
+"None" => "Ни один",
+"Enable Encryption" => "Включить шифрование"
+);
--- a/apps/files_encryption/l10n/vi.php
+++ b/apps/files_encryption/l10n/vi.php
@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Mã hóa",
+"Exclude the following file types from encryption" => "Loại trừ các loại tập tin sau đây từ mã hóa",
+"None" => "none",
+"Enable Encryption" => "BẬT mã hóa"
+);
--- a/apps/files_encryption/l10n/zh_CN.GB2312.php
+++ b/apps/files_encryption/l10n/zh_CN.GB2312.php
@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "加密",
+"Exclude the following file types from encryption" => "从加密中排除如下文件类型",
+"None" => "无",
+"Enable Encryption" => "启用加密"
+);
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "加密",
+"Exclude the following file types from encryption" => "从加密中排除列出的文件类型",
 "None" => "None",
 "Enable Encryption" => "开启加密"
 );
--- a/apps/files_external/ajax/addRootCertificate.php
+++ b/apps/files_external/ajax/addRootCertificate.php
@ -2,25 +2,21 @@

 OCP\JSON::checkAppEnabled('files_external');

-$view = \OCP\Files::getStorage("files_external");
-$from = $_FILES['rootcert_import']['tmp_name'];
-$path = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("").'uploads/';
-if(!file_exists($path)) mkdir($path,0700,true);
-$to = $path.$_FILES['rootcert_import']['name'];
-move_uploaded_file($from, $to);
+$fh = fopen($_FILES['rootcert_import']['tmp_name'], 'r');
+$data = fread($fh, filesize($_FILES['rootcert_import']['tmp_name']));
+fclose($fh);
+
+$view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_external/uploads');
+if (!$view->file_exists('')) $view->mkdir('');

 //check if it is a PEM certificate, otherwise convert it if possible
-$fh = fopen($to, 'r');
-$data = fread($fh, filesize($to));
-fclose($fh);
-if (!strpos($data, 'BEGIN CERTIFICATE')) {
-	$pem = chunk_split(base64_encode($data), 64, "\n");
-	$pem = "-----BEGIN CERTIFICATE-----\n".$pem."-----END CERTIFICATE-----\n";
-	$fh = fopen($to, 'w');
-	fwrite($fh, $pem);
-	fclose($fh);
+if (!strpos($data, 'BEGIN CERTIFICATE')) {
+	$data = chunk_split(base64_encode($data), 64, "\n");
+	$data = "-----BEGIN CERTIFICATE-----\n".$data."-----END CERTIFICATE-----\n";
 }

+$view->file_put_contents($_FILES['rootcert_import']['name'], $data);
+
 OC_Mount_Config::createCertificateBundle();

 header("Location: settings/personal.php");
--- a/apps/files_external/js/dropbox.js
+++ b/apps/files_external/js/dropbox.js
@ -19,6 +19,7 @@ $(document).ready(function() {
 						if (result && result.status == 'success') {
 							$(token).val(result.access_token);
 							$(token_secret).val(result.access_token_secret);
+							$(configured).val('true');
 							OC.MountConfig.saveStorage(tr);
 							$(tr).find('.configuration input').attr('disabled', 'disabled');
 							$(tr).find('.configuration').append('<span id="access" style="padding-left:0.5em;">Access granted</span>');
--- a/apps/files_external/l10n/el.php
+++ b/apps/files_external/l10n/el.php
@ -1,10 +1,18 @@
 <?php $TRANSLATIONS = array(
-"External Storage" => "Εξωτερική αποθήκευση",
+"External Storage" => "Εξωτερικό Αποθηκευτικό Μέσο",
 "Mount point" => "Σημείο προσάρτησης",
+"Backend" => "Σύστημα υποστήριξης",
 "Configuration" => "Ρυθμίσεις",
 "Options" => "Επιλογές",
+"Applicable" => "Εφαρμόσιμο",
+"Add mount point" => "Προσθήκη σημείου προσάρτησης",
+"None set" => "Κανένα επιλεγμένο",
 "All Users" => "Όλοι οι χρήστες",
 "Groups" => "Ομάδες",
 "Users" => "Χρήστες",
-"Delete" => "Διαγραφή"
+"Delete" => "Διαγραφή",
+"SSL root certificates" => "Πιστοποιητικά SSL root",
+"Import Root Certificate" => "Εισαγωγή Πιστοποιητικού Root",
+"Enable User External Storage" => "Ενεργοποίηση Εξωτερικού Αποθηκευτικού Χώρου Χρήστη",
+"Allow users to mount their own external storage" => "Να επιτρέπεται στους χρήστες να προσαρτούν δικό τους εξωτερικό αποθηκευτικό χώρο"
 );
--- a/apps/files_external/l10n/et_EE.php
+++ b/apps/files_external/l10n/et_EE.php
@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
 "External Storage" => "Väline salvestuskoht",
 "Mount point" => "Ühenduspunkt",
+"Backend" => "Admin",
 "Configuration" => "Seadistamine",
 "Options" => "Valikud",
+"Applicable" => "Rakendatav",
 "Add mount point" => "Lisa ühenduspunkt",
 "None set" => "Pole määratud",
 "All Users" => "Kõik kasutajad",
 "Groups" => "Grupid",
 "Users" => "Kasutajad",
-"Delete" => "Kustuta"
+"Delete" => "Kustuta",
+"SSL root certificates" => "SSL root sertifikaadid",
+"Import Root Certificate" => "Impordi root sertifikaadid",
+"Enable User External Storage" => "Luba kasutajatele väline salvestamine",
+"Allow users to mount their own external storage" => "Luba kasutajatel ühendada külge nende enda välised salvestusseadmed"
 );
--- a/apps/files_external/l10n/eu.php
+++ b/apps/files_external/l10n/eu.php
@ -4,6 +4,7 @@
 "Backend" => "Motorra",
 "Configuration" => "Konfigurazioa",
 "Options" => "Aukerak",
+"Applicable" => "Aplikagarria",
 "Add mount point" => "Gehitu muntatze puntua",
 "None set" => "Ezarri gabe",
 "All Users" => "Erabiltzaile guztiak",
--- a/apps/files_external/l10n/gl.php
+++ b/apps/files_external/l10n/gl.php
@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Almacenamento externo",
+"Mount point" => "Punto de montaxe",
+"Backend" => "Almacén",
+"Configuration" => "Configuración",
+"Options" => "Opcións",
+"Applicable" => "Aplicable",
+"Add mount point" => "Engadir punto de montaxe",
+"None set" => "Non establecido",
+"All Users" => "Tódolos usuarios",
+"Groups" => "Grupos",
+"Users" => "Usuarios",
+"Delete" => "Eliminar",
+"SSL root certificates" => "Certificados raíz SSL",
+"Import Root Certificate" => "Importar Certificado Raíz",
+"Enable User External Storage" => "Habilitar almacenamento externo do usuario",
+"Allow users to mount their own external storage" => "Permitir aos usuarios montar os seus propios almacenamentos externos"
+);
--- a/apps/files_external/l10n/ro.php
+++ b/apps/files_external/l10n/ro.php
@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Stocare externă",
+"Mount point" => "Punctul de montare",
+"Backend" => "Backend",
+"Configuration" => "Configurație",
+"Options" => "Opțiuni",
+"Applicable" => "Aplicabil",
+"Add mount point" => "Adaugă punct de montare",
+"None set" => "Niciunul",
+"All Users" => "Toți utilizatorii",
+"Groups" => "Grupuri",
+"Users" => "Utilizatori",
+"Delete" => "Șterge",
+"SSL root certificates" => "Certificate SSL root",
+"Import Root Certificate" => "Importă certificat root",
+"Enable User External Storage" => "Permite stocare externă pentru utilizatori",
+"Allow users to mount their own external storage" => "Permite utilizatorilor să monteze stocare externă proprie"
+);
--- a/apps/files_external/l10n/ru_RU.php
+++ b/apps/files_external/l10n/ru_RU.php
@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Внешние системы хранения данных",
+"Mount point" => "Точка монтирования",
+"Backend" => "Бэкэнд",
+"Configuration" => "Конфигурация",
+"Options" => "Опции",
+"Applicable" => "Применимый",
+"Add mount point" => "Добавить точку монтирования",
+"None set" => "Не задан",
+"All Users" => "Все пользователи",
+"Groups" => "Группы",
+"Users" => "Пользователи",
+"Delete" => "Удалить",
+"SSL root certificates" => "Корневые сертификаты SSL",
+"Import Root Certificate" => "Импортировать корневые сертификаты",
+"Enable User External Storage" => "Включить пользовательскую внешнюю систему хранения данных",
+"Allow users to mount their own external storage" => "Разрешить пользователям монтировать их собственную внешнюю систему хранения данных"
+);
--- a/apps/files_external/l10n/uk.php
+++ b/apps/files_external/l10n/uk.php
@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Groups" => "Групи",
+"Users" => "Користувачі",
+"Delete" => "Видалити"
+);
--- a/apps/files_external/l10n/vi.php
+++ b/apps/files_external/l10n/vi.php
@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Lưu trữ ngoài",
+"Mount point" => "Điểm gắn",
+"Backend" => "phụ trợ",
+"Configuration" => "Cấu hình",
+"Options" => "Tùy chọn",
+"Applicable" => "Áp dụng",
+"Add mount point" => "Thêm điểm lắp",
+"None set" => "không",
+"All Users" => "Tất cả người dùng",
+"Groups" => "Nhóm",
+"Users" => "Người dùng",
+"Delete" => "Xóa",
+"SSL root certificates" => "Chứng chỉ SSL root",
+"Import Root Certificate" => "Nhập Root Certificate",
+"Enable User External Storage" => "Kích hoạt tính năng lưu trữ ngoài",
+"Allow users to mount their own external storage" => "Cho phép người dùng kết nối với lưu trữ riêng bên ngoài của họ"
+);
--- a/apps/files_external/l10n/zh_CN.GB2312.php
+++ b/apps/files_external/l10n/zh_CN.GB2312.php
@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "外部存储",
+"Mount point" => "挂载点",
+"Backend" => "后端",
+"Configuration" => "配置",
+"Options" => "选项",
+"Applicable" => "可应用",
+"Add mount point" => "添加挂载点",
+"None set" => "未设置",
+"All Users" => "所有用户",
+"Groups" => "群组",
+"Users" => "用户",
+"Delete" => "删除",
+"SSL root certificates" => "SSL 根证书",
+"Import Root Certificate" => "导入根证书",
+"Enable User External Storage" => "启用用户外部存储",
+"Allow users to mount their own external storage" => "允许用户挂载他们的外部存储"
+);
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@ -270,6 +270,7 @@ class OC_Mount_Config {
 			fclose($fh);
 			if (strpos($data, 'BEGIN CERTIFICATE')) {
 				fwrite($fh_certs, $data);
+				fwrite($fh_certs, "\r\n");
 			}
 		}

--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@ -21,7 +21,9 @@
 */

 OCP\Util::addScript('files_external', 'settings');
+OCP\Util::addscript('3rdparty', 'chosen/chosen.jquery.min');
 OCP\Util::addStyle('files_external', 'settings');
+OCP\Util::addStyle('3rdparty', 'chosen/chosen');
 $tmpl = new OCP\Template('files_external', 'settings');
 $tmpl->assign('isAdminPage', true, false);
 $tmpl->assign('mounts', OC_Mount_Config::getSystemMountPoints());
--- a/apps/files_sharing/appinfo/update.php
+++ b/apps/files_sharing/appinfo/update.php
@ -1,16 +1,57 @@
 <?php
-
-// touch shared directories to trigger one-time re-scan for all users
-$datadir = \OCP\Config::getSystemValue('datadirectory');
-$currentVersion=OC_Appconfig::getValue('files_sharing', 'installed_version');
-if (version_compare($currentVersion, '0.2.2', '<')) {
-	if ($handle = opendir($datadir)) {
-		while (false !== ($entry = readdir($handle))) {
-			$sharedFolder = $datadir.'/'.$entry.'/files/Shared';
-			if ($entry != "." && $entry != ".." && is_dir($sharedFolder)) {
-				touch($sharedFolder);
+$installedVersion = OCP\Config::getAppValue('files_sharing', 'installed_version');
+if (version_compare($installedVersion, '0.3', '<')) {
+	$update_error = false;
+	$query = OCP\DB::prepare('SELECT * FROM `*PREFIX*sharing`');
+	$result = $query->execute();
+	$groupShares = array();
+	while ($row = $result->fetchRow()) {
+		$itemSource = OC_FileCache::getId($row['source'], '');
+		if ($itemSource != -1) {
+			$file = OC_FileCache::get($row['source'], '');
+			if ($file['mimetype'] == 'httpd/unix-directory') {
+				$itemType = 'folder';
+			} else {
+				$itemType = 'file';
+			}
+			if ($row['permissions'] == 0) {
+				$permissions = OCP\Share::PERMISSION_READ;
+			} else {
+				$permissions = OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE;
+				if ($itemType == 'folder') {
+					$permissions |= OCP\Share::PERMISSION_CREATE;
+				}
+			}
+			$pos = strrpos($row['uid_shared_with'], '@');
+			if ($pos !== false && OC_Group::groupExists(substr($row['uid_shared_with'], $pos + 1))) {
+				$shareType = OCP\Share::SHARE_TYPE_GROUP;
+				$shareWith = substr($row['uid_shared_with'], 0, $pos);
+				if (isset($groupShares[$shareWith][$itemSource])) {
+					continue;
+				} else {
+					$groupShares[$shareWith][$itemSource] = true;
+				}
+			} else if ($row['uid_shared_with'] == 'public') {
+				$shareType = OCP\Share::SHARE_TYPE_LINK;
+				$shareWith = null;
+			} else {
+				$shareType = OCP\Share::SHARE_TYPE_USER;
+				$shareWith = $row['uid_shared_with'];
+			}
+			OC_User::setUserId($row['uid_owner']);
+			try {
+				OCP\Share::shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions);
+			}
+			catch (Exception $e) {
+				$update_error = true;
+				echo 'Skipping sharing "'.$row['source'].'" to "'.$shareWith.'" (error is "'.$e->getMessage().'")<br/>';
 			}
 		}
-		closedir($handle);
 	}
-}
+	if ($update_error) {
+		throw new Exception('There were some problems upgrading the sharing of files');
+	}
+	// NOTE: Let's drop the table after more testing
+// 	$query = OCP\DB::prepare('DROP TABLE `*PREFIX*sharing`');
+// 	$query->execute();
+}
--- a/apps/files_sharing/appinfo/version
+++ b/apps/files_sharing/appinfo/version
@ -1 +1 @@
-0.3.1
+0.3.2
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@ -1,8 +1,11 @@
 body { background:#ddd; }
 #header { position:fixed; top:0; left:0; right:0; z-index:100; height:2.5em; line-height:2.5em; padding:.5em; background:#1d2d44; -moz-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; -webkit-box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; box-shadow:0 0 10px rgba(0, 0, 0, .5), inset 0 -2px 10px #222; }
 #details { color:#fff; }
-#header #download { margin-left:2em; font-weight:bold; color:#fff; }
+#header #download { margin-left:2em; font-weight:bold; }
+#header #download img { padding-left: 0.1em; padding-right: 0.3em; vertical-align: text-bottom; }
 #preview { min-height:30em; margin:50px auto; padding-top:2em; border-bottom:1px solid #f8f8f8; background:#eee; text-align:center; }
 #noPreview { display:none; padding-top:5em; }
 p.info { width:22em; text-align: center; margin:2em auto; color:#777; text-shadow:#fff 0 1px 0; }
-p.info a { font-weight:bold; color:#777; }
+p.info a { font-weight:bold; color:#777; }
+#imgframe { width:80%; height: 75%; margin: 0 auto; padding-bottom:2em; }
+#imgframe img { max-height:100%; max-width: 100%; }
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@ -1,6 +1,10 @@
 // Override download path to files_sharing/public.php
 function fileDownloadPath(dir, file) {
-	return $('#downloadURL').val();
+	var url = $('#downloadURL').val();
+	if (url.indexOf('&path=') != -1) {
+		url += '/'+file;
+	}
+	return url;
 }

 $(document).ready(function() {
@ -13,10 +17,21 @@ $(document).ready(function() {
 			var action = FileActions.getDefault(mimetype, 'file', OC.PERMISSION_READ);
 			if (typeof action === 'undefined') {
 				$('#noPreview').show();
+				if (mimetype != 'httpd/unix-directory') {
+					// NOTE: Remove when a better file previewer solution exists
+					$('#content').remove();
+					$('table').remove();
+				}
 			} else {
 				action($('#filename').val());
 			}
 		}
+		FileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function(filename) {
+			var tr = $('tr').filterAttr('data-file', filename)
+			if (tr.length > 0) {
+				window.location = $(tr).find('a.name').attr('href');
+			}
+		});
 	}

 });
--- a/apps/files_sharing/l10n/da.php
+++ b/apps/files_sharing/l10n/da.php
@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Kodeord",
+"Submit" => "Send",
+"Download" => "Download",
+"No preview available for" => "Forhåndsvisning ikke tilgængelig for",
+"web services under your control" => "Webtjenester under din kontrol"
+);
--- a/apps/files_sharing/l10n/de.php
+++ b/apps/files_sharing/l10n/de.php
@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Passwort",
 "Submit" => "Absenden",
+"%s shared the folder %s with you" => "%s hat mit Ihnen den Ordner %s geteilt",
+"%s shared the file %s with you" => "%s hat mit Ihnen die Datei %s geteilt",
 "Download" => "Download",
 "No preview available for" => "Es ist keine Vorschau verfügbar für",
 "web services under your control" => "Web-Services unter Ihrer Kontrolle"
--- a/apps/files_sharing/l10n/el.php
+++ b/apps/files_sharing/l10n/el.php
@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Συνθηματικό",
-"Submit" => "Καταχώρηση"
+"Submit" => "Καταχώρηση",
+"Download" => "Λήψη",
+"No preview available for" => "Δεν υπάρχει διαθέσιμη προεπισκόπηση για",
+"web services under your control" => "υπηρεσίες δικτύου υπό τον έλεγχό σας"
 );
--- a/apps/files_sharing/l10n/eo.php
+++ b/apps/files_sharing/l10n/eo.php
@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Pasvorto",
-"Submit" => "Sendi"
+"Submit" => "Sendi",
+"Download" => "Elŝuti",
+"No preview available for" => "Ne haveblas antaŭvido por",
+"web services under your control" => "TTT-servoj regataj de vi"
 );
--- a/apps/files_sharing/l10n/et_EE.php
+++ b/apps/files_sharing/l10n/et_EE.php
@ -1,3 +1,7 @@
 <?php $TRANSLATIONS = array(
-"Delete" => "Kustutamine"
+"Password" => "Parool",
+"Submit" => "Saada",
+"Download" => "Lae alla",
+"No preview available for" => "Eelvaadet pole saadaval",
+"web services under your control" => "veebitenused sinu kontrolli all"
 );
--- a/apps/files_sharing/l10n/gl.php
+++ b/apps/files_sharing/l10n/gl.php
@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Contrasinal",
+"Submit" => "Enviar",
+"Download" => "Baixar",
+"No preview available for" => "Sen vista previa dispoñible para ",
+"web services under your control" => "servizos web baixo o seu control"
+);
--- a/apps/files_sharing/l10n/ro.php
+++ b/apps/files_sharing/l10n/ro.php
@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Parolă",
+"Submit" => "Trimite",
+"Download" => "Descarcă",
+"No preview available for" => "Nici o previzualizare disponibilă pentru ",
+"web services under your control" => "servicii web controlate de tine"
+);
--- a/apps/files_sharing/l10n/ru.php
+++ b/apps/files_sharing/l10n/ru.php
@ -2,5 +2,6 @@
 "Password" => "Пароль",
 "Submit" => "Отправить",
 "Download" => "Скачать",
+"No preview available for" => "Предпросмотр недоступен для",
 "web services under your control" => "веб-сервисы под вашим управлением"
 );
--- a/apps/files_sharing/l10n/ru_RU.php
+++ b/apps/files_sharing/l10n/ru_RU.php
@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Пароль",
+"Submit" => "Передать",
+"Download" => "Загрузка",
+"No preview available for" => "Предварительный просмотр недоступен",
+"web services under your control" => "веб-сервисы под Вашим контролем"
+);
--- a/apps/files_sharing/l10n/uk.php
+++ b/apps/files_sharing/l10n/uk.php
@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Пароль",
+"Download" => "Завантажити"
+);
--- a/apps/files_sharing/l10n/vi.php
+++ b/apps/files_sharing/l10n/vi.php
@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Mật khẩu",
+"Submit" => "Xác nhận",
+"Download" => "Tải về",
+"No preview available for" => "Không có xem trước cho",
+"web services under your control" => "dịch vụ web dưới sự kiểm soát của bạn"
+);
--- a/apps/files_sharing/l10n/zh_CN.GB2312.php
+++ b/apps/files_sharing/l10n/zh_CN.GB2312.php
@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Password" => "密码",
+"Submit" => "提交",
+"Download" => "下载",
+"No preview available for" => "没有预览可用于",
+"web services under your control" => "您控制的网络服务"
+);
--- a/apps/files_sharing/l10n/zh_TW.php
+++ b/apps/files_sharing/l10n/zh_TW.php
@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Password" => "密碼",
+"Submit" => "送出",
+"Download" => "下載",
+"No preview available for" => "無法預覽"
+);
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@ -30,7 +30,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {

 	public function isValidSource($itemSource, $uidOwner) {
 		$path = OC_FileCache::getPath($itemSource, $uidOwner);
-		if (OC_Filesystem::file_exists($path)) {
+		if ($path) {
 			$this->path = $path;
 			return true;
 		}
@ -47,7 +47,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 	}

 	public function generateTarget($filePath, $shareWith, $exclude = null) {
-		$target = $filePath;
+		$target = '/'.basename($filePath);
 		if (isset($exclude)) {
 			if ($pos = strrpos($target, '.')) {
 				$name = substr($target, 0, $pos);
@ -72,8 +72,16 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 			// Only 1 item should come through for this format call
 			return array('path' => $items[key($items)]['path'], 'permissions' => $items[key($items)]['permissions']);
 		} else if ($format == self::FORMAT_FILE_APP) {
+			if (isset($parameters['mimetype_filter']) && $parameters['mimetype_filter']) {
+				$mimetype_filter = $parameters['mimetype_filter'];
+			}
 			$files = array();
 			foreach ($items as $item) {
+				if (isset($mimetype_filter)
+					&& strpos($item['mimetype'], $mimetype_filter) !== 0
+					&& $item['mimetype'] != 'httpd/unix-directory') {
+					continue;
+				}
 				$file = array();
 				$file['id'] = $item['file_source'];
 				$file['path'] = $item['file_target'];
@ -116,4 +124,4 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 		return array();
 	}

-}
+}
--- a/apps/files_sharing/lib/share/folder.php
+++ b/apps/files_sharing/lib/share/folder.php
@ -19,7 +19,7 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */

-class OC_Share_Backend_Folder extends OC_Share_Backend_File {
+class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share_Backend_Collection {

 	public function formatItems($items, $format, $parameters = null) {
 		if ($format == self::FORMAT_SHARED_STORAGE) {
@ -50,12 +50,22 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File {
 	}

 	public function getChildren($itemSource) {
-		$files = OC_FileCache::getFolderContent($itemSource);
-		$sources = array();
-		foreach ($files as $file) {
-			$sources[] = $file['path'];
+		$children = array();
+		$parents = array($itemSource);
+		while (!empty($parents)) {
+			$parents = "'".implode("','", $parents)."'";
+			$query = OC_DB::prepare('SELECT `id`, `name`, `mimetype` FROM `*PREFIX*fscache` WHERE `parent` IN ('.$parents.')');
+			$result = $query->execute();
+			$parents = array();
+			while ($file = $result->fetchRow()) {
+				$children[] = array('source' => $file['id'], 'file_path' => $file['name']);
+				// If a child folder is found look inside it 
+				if ($file['mimetype'] == 'httpd/unix-directory') {
+					$parents[] = $file['id'];
+				}
+			}
 		}
-		return $sources;
+		return $children;
 	}

 }
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@ -1,13 +1,21 @@
 <?php
 // Load other apps for file previews
 OC_App::loadApps();
-if (isset($_GET['file'])) {
-	$pos = strpos($_GET['file'], '/', 1);
-	$uidOwner = substr($_GET['file'], 1, $pos - 1);
+if (isset($_GET['file']) || isset($_GET['dir'])) {
+	if (isset($_GET['dir'])) {
+		$type = 'folder';
+		$path = $_GET['dir'];
+		$baseDir = basename($path);
+		$dir = $baseDir;
+	} else {
+		$type = 'file';
+		$path = $_GET['file'];
+	}
+	$uidOwner = substr($path, 1, strpos($path, '/', 1) - 1);
 	if (OCP\User::userExists($uidOwner)) {
 		OC_Util::setupFS($uidOwner);
-		$fileSource = OC_Filecache::getId($_GET['file'], '');
-		if ($fileSource != -1 && ($linkItem = OCP\Share::getItemSharedWithByLink('file', $fileSource, $uidOwner))) {
+		$fileSource = OC_Filecache::getId($path, '');
+		if ($fileSource != -1 && ($linkItem = OCP\Share::getItemSharedWithByLink($type, $fileSource, $uidOwner))) {
 			if (isset($linkItem['share_with'])) {
 				// Check password
 				if (isset($_POST['password'])) {
@ -35,6 +43,16 @@ if (isset($_GET['file'])) {
 				}
 			}
 			$path = $linkItem['path'];
+			if (isset($_GET['path'])) {
+				$path .= $_GET['path'];
+				$dir .= $_GET['path'];
+				if (!OC_Filesystem::file_exists($path)) {
+					header('HTTP/1.0 404 Not Found');
+					$tmpl = new OCP\Template('', '404', 'guest');
+					$tmpl->printPage();
+					exit();
+				}
+			}
 			// Download the file
 			if (isset($_GET['download'])) {
 				$mimetype = OC_Filesystem::getMimeType($path);
@ -50,18 +68,84 @@ if (isset($_GET['file'])) {
 				OCP\Util::addScript('files_sharing', 'public');
 				OCP\Util::addScript('files', 'fileactions');
 				$tmpl = new OCP\Template('files_sharing', 'public', 'base');
-				$tmpl->assign('details', $uidOwner.' shared the file '.basename($path).' with you');
 				$tmpl->assign('owner', $uidOwner);
-				$tmpl->assign('name', basename($path));
 				// Show file list
 				if (OC_Filesystem::is_dir($path)) {
-					// TODO
+					OCP\Util::addStyle('files', 'files');
+					OCP\Util::addScript('files', 'files');
+					OCP\Util::addScript('files', 'filelist');
+					$files = array();
+					$rootLength = strlen($baseDir) + 1;
+					foreach (OC_Files::getDirectoryContent($path) as $i) {
+						$i['date'] = OCP\Util::formatDate($i['mtime']);
+						if ($i['type'] == 'file') {
+							$fileinfo = pathinfo($i['name']);
+							$i['basename'] = $fileinfo['filename'];
+							$i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : '';
+						}
+						$i['directory'] = substr($i['directory'], $rootLength);
+						if ($i['directory'] == '/') {
+							$i['directory'] = '';
+						}
+						$i['permissions'] = OCP\Share::PERMISSION_READ;
+						$files[] = $i;
+					}
+					// Make breadcrumb
+					$breadcrumb = array();
+					$pathtohere = '';
+					foreach (explode('/', $dir) as $i) {
+						if ($i != '') {
+							if ($i != $baseDir) {
+								$pathtohere .= '/'.$i;
+							}
+							$breadcrumb[] = array('dir' => $pathtohere, 'name' => $i);
+						}
+					}
+					$list = new OCP\Template('files', 'part.list', '');
+					$list->assign('files', $files, false);
+					$list->assign('baseURL', OCP\Util::linkToPublic('files').'&dir='.$_GET['dir'].'&path=', false);
+					$list->assign('downloadURL', OCP\Util::linkToPublic('files').'&download&dir='.$_GET['dir'].'&path=', false);
+					$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '' );
+					$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
+					$breadcrumbNav->assign('baseURL', OCP\Util::linkToPublic('files').'&dir='.$_GET['dir'].'&path=', false);
+					$folder = new OCP\Template('files', 'index', '');
+					$folder->assign('fileList', $list->fetchPage(), false);
+					$folder->assign('breadcrumb', $breadcrumbNav->fetchPage(), false);
+					$folder->assign('dir', basename($dir));
+					$folder->assign('isCreatable', false);
+					$folder->assign('permissions', 0);
+					$folder->assign('files', $files);
+					$folder->assign('uploadMaxFilesize', 0);
+					$folder->assign('uploadMaxHumanFilesize', 0);
+					$folder->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
+					$tmpl->assign('folder', $folder->fetchPage(), false);
+					$tmpl->assign('uidOwner', $uidOwner);
+					$tmpl->assign('dir', basename($dir));
+					$tmpl->assign('filename', basename($path));
+					$tmpl->assign('mimetype', OC_Filesystem::getMimeType($path));
+					$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
+					if (isset($_GET['path'])) {
+						$getPath = $_GET['path'];
+					} else {
+						$getPath = '';
+					}
+					$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&download&dir='.$_GET['dir'].'&path='.$getPath);
 				} else {
 					// Show file preview if viewer is available
+					$tmpl->assign('uidOwner', $uidOwner);
 					$tmpl->assign('dir', dirname($path));
 					$tmpl->assign('filename', basename($path));
 					$tmpl->assign('mimetype', OC_Filesystem::getMimeType($path));
-					$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&file='.$_GET['file'].'&download');
+					if ($type == 'file') {
+						$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&file='.$_GET['file'].'&download');
+					} else {
+						if (isset($_GET['path'])) {
+							$getPath = $_GET['path'];
+						} else {
+							$getPath = '';
+						}
+						$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&download&dir='.$_GET['dir'].'&path='.$getPath);
+					}
 				}
 				$tmpl->printPage();
 			}
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@ -5,21 +5,33 @@
 <header><div id="header">
 	<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a>
 	<div class="header-right">
-		<span id="details"><?php echo $_['details']; ?></span>
-		<a href="<?php echo $_['downloadURL']; ?>" id="download"><img class="svg" alt="Download" src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /><?php echo $l->t('Download')?></a>
+	<?php if (isset($_['folder'])): ?>
+		<span id="details"><?php echo $l->t('%s shared the folder %s with you', array($_['uidOwner'], $_['filename'])) ?></span>
+	<?php else: ?>
+		<span id="details"><?php echo $l->t('%s shared the file %s with you', array($_['uidOwner'], $_['filename'])) ?></span>
+	<?php endif; ?>
+		<?php if (!isset($_['folder']) || $_['allowZipDownload']): ?>
+			<a href="<?php echo $_['downloadURL']; ?>" class="button" id="download"><img class="svg" alt="Download" src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /><?php echo $l->t('Download')?></a>
+		<?php endif; ?>
 	</div>
 </div></header>
 <div id="preview">
-	<?php if (substr($_['mimetype'], 0 , strpos($_['mimetype'], '/')) == 'image'): ?>
-		<img src="<?php echo $_['downloadURL']; ?>" />
+	<?php if (isset($_['folder'])): ?>
+		<?php echo $_['folder']; ?>
+	<?php else: ?>
+		<?php if (substr($_['mimetype'], 0 , strpos($_['mimetype'], '/')) == 'image'): ?>
+			<div id="imgframe">
+				<img src="<?php echo $_['downloadURL']; ?>" />
+			</div>
+		<?php endif; ?>
+		<ul id="noPreview">
+			<li class="error">
+				<?php echo $l->t('No preview available for').' '.$_['filename']; ?><br />
+				<a href="<?php echo $_['downloadURL']; ?>" id="download"><img class="svg" alt="Download" src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /><?php echo $l->t('Download')?></a>
+			</li>
+		</ul>
 	<?php endif; ?>
-	<ul id="noPreview">
-		<li class="error">
-			<?php echo $l->t('No preview available for').' '.$_['filename']; ?><br />
-			<a href="<?php echo $_['downloadURL']; ?>" id="download"><img class="svg" alt="Download" src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /><?php echo $l->t('Download')?></a>
-		</li>
-	</ul>
 	<div id="content"></div>
 	<table></table>
 </div>
-<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash; <?php echo $l->t('web services under your control'); ?></p></footer>
+<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash; <?php echo $l->t('web services under your control'); ?></p></footer>
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@ -10,25 +10,34 @@ $(document).ready(function() {

 $(document).ready(function(){
 	if (typeof FileActions !== 'undefined') {
-		// Add history button to files/index.php
-		FileActions.register('file','History', OC.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/history');},function(filename){
-
-			if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback
-
-			var file = $('#dir').val()+'/'+filename;
-			// Check if drop down is already visible for a different file
-			if (($('#dropdown').length > 0)) {
-				if (file != $('#dropdown').data('file')) {
-					$('#dropdown').hide('blind', function() {
-						$('#dropdown').remove();
-						$('tr').removeClass('mouseOver');
-						createVersionsDropdown(filename, file);
-					});
-				}
-			} else {
-				createVersionsDropdown(filename, file);
+		// Add history button to 'files/index.php'
+		FileActions.register(
+			'file'
+			, t('files_versions', 'History')
+			, OC.PERMISSION_UPDATE
+			, function() {
+				// Specify icon for hitory button
+				return OC.imagePath('core','actions/history');
 			}
-		});
+			,function(filename){
+				// Action to perform when clicked
+				if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback
+
+				var file = $('#dir').val()+'/'+filename;
+				// Check if drop down is already visible for a different file
+				if (($('#dropdown').length > 0)) {
+					if (file != $('#dropdown').data('file')) {
+						$('#dropdown').hide('blind', function() {
+							$('#dropdown').remove();
+							$('tr').removeClass('mouseOver');
+							createVersionsDropdown(filename, file);
+						});
+					}
+				} else {
+					createVersionsDropdown(filename, file);
+				}
+			}
+		);
 	}
 });

@ -42,7 +51,6 @@ function createVersionsDropdown(filename, files) {
 	html += '<option value=""></option>';
 	html += '</select>';
 	html += '</div>';
-	//html += '<input type="button" value="Revert file" onclick="revertFile()" />';
 	html += '<input type="button" value="All versions..." onclick="window.location=\''+historyUrl+'\'" name="makelink" id="makelink" />';
 	html += '<input id="link" style="display:none; width:90%;" />';

@ -60,9 +68,7 @@ function createVersionsDropdown(filename, files) {
 		data: { source: files },
 		async: false,
 		success: function( versions ) {
-
-			//alert("helo "+OC.linkTo('files_versions', 'ajax/getVersions.php'));
-
+			
 			if (versions) {
 				$.each( versions, function(index, row ) {
 					addVersion( row );
@ -103,7 +109,7 @@ function createVersionsDropdown(filename, files) {

 	}

-	function addVersion(revision ) {
+	function addVersion( revision ) {
 		name=formatDate(revision.version*1000);
 		var version=$('<option/>');
 		version.attr('value',revision.version);
@ -122,8 +128,23 @@ function createVersionsDropdown(filename, files) {

 		version.appendTo('#found_versions');
 	}
-
+	
+	$('tr').filterAttr('data-file',filename).addClass('mouseOver');
 	$('#dropdown').show('blind');


 }
+
+$(this).click(
+	function(event) {
+	
+	if ($('#dropdown').has(event.target).length === 0) {
+		$('#dropdown').hide('blind', function() {
+			$('#dropdown').remove();
+			$('tr').removeClass('mouseOver');
+		});
+	}
+
+	
+	}
+);
--- a/apps/files_versions/l10n/ca.php
+++ b/apps/files_versions/l10n/ca.php
@ -2,5 +2,6 @@
 "Expire all versions" => "Expira totes les versions",
 "Versions" => "Versions",
 "This will delete all existing backup versions of your files" => "Això eliminarà totes les versions de còpia de seguretat dels vostres fitxers",
-"Enable Files Versioning" => "Habilita les versions de fitxers"
+"Files Versioning" => "Fitxers de Versions",
+"Enable" => "Permetre"
 );
--- a/apps/files_versions/l10n/cs_CZ.php
+++ b/apps/files_versions/l10n/cs_CZ.php
@ -2,5 +2,6 @@
 "Expire all versions" => "Vypršet všechny verze",
 "Versions" => "Verze",
 "This will delete all existing backup versions of your files" => "Odstraní všechny existující zálohované verze Vašich souborů",
-"Enable Files Versioning" => "Povolit verzování souborů"
+"Files Versioning" => "Verzování souborů",
+"Enable" => "Povolit"
 );
--- a/apps/files_versions/l10n/da.php
+++ b/apps/files_versions/l10n/da.php
@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Lad alle versioner udløbe",
+"Versions" => "Versioner",
+"This will delete all existing backup versions of your files" => "Dette vil slette alle eksisterende backupversioner af dine filer"
+);
--- a/apps/files_versions/l10n/de.php
+++ b/apps/files_versions/l10n/de.php
@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "Alle Versionen löschen",
+"History" => "Historie",
 "Versions" => "Versionen",
 "This will delete all existing backup versions of your files" => "Dies löscht alle vorhandenen Sicherungsversionen Ihrer Dateien.",
-"Enable Files Versioning" => "Datei-Versionierung aktivieren"
+"Files Versioning" => "Dateiversionierung",
+"Enable" => "Aktivieren"
 );
--- a/apps/files_versions/l10n/el.php
+++ b/apps/files_versions/l10n/el.php
@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "Λήξη όλων των εκδόσεων",
-"Enable Files Versioning" => "Ενεργοποίηση παρακολούθησης εκδόσεων αρχείων"
+"Versions" => "Εκδόσεις",
+"This will delete all existing backup versions of your files" => "Αυτό θα διαγράψει όλες τις υπάρχουσες εκδόσεις των αντιγράφων ασφαλείας των αρχείων σας",
+"Files Versioning" => "Εκδόσεις Αρχείων",
+"Enable" => "Ενεργοποίηση"
 );
--- a/apps/files_versions/l10n/eo.php
+++ b/apps/files_versions/l10n/eo.php
@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "Eksvalidigi ĉiujn eldonojn",
-"Enable Files Versioning" => "Kapabligi dosiereldonkontrolon"
+"Versions" => "Eldonoj",
+"This will delete all existing backup versions of your files" => "Ĉi tio forigos ĉiujn estantajn sekurkopiajn eldonojn de viaj dosieroj"
 );
--- a/apps/files_versions/l10n/es.php
+++ b/apps/files_versions/l10n/es.php
@ -2,5 +2,6 @@
 "Expire all versions" => "Expirar todas las versiones",
 "Versions" => "Versiones",
 "This will delete all existing backup versions of your files" => "Esto eliminará todas las versiones guardadas como copia de seguridad de tus archivos",
-"Enable Files Versioning" => "Habilitar versionamiento de archivos"
+"Files Versioning" => "Versionado de archivos",
+"Enable" => "Habilitar"
 );
--- a/apps/files_versions/l10n/et_EE.php
+++ b/apps/files_versions/l10n/et_EE.php
@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "Kõikide versioonide aegumine",
-"Enable Files Versioning" => "Luba failide versioonihaldus"
+"Versions" => "Versioonid",
+"This will delete all existing backup versions of your files" => "See kustutab kõik sinu failidest tehtud varuversiooni"
 );
--- a/apps/files_versions/l10n/eu.php
+++ b/apps/files_versions/l10n/eu.php
@ -2,5 +2,6 @@
 "Expire all versions" => "Iraungi bertsio guztiak",
 "Versions" => "Bertsioak",
 "This will delete all existing backup versions of your files" => "Honek zure fitxategien bertsio guztiak ezabatuko ditu",
-"Enable Files Versioning" => "Gaitu fitxategien bertsioak"
+"Files Versioning" => "Fitxategien Bertsioak",
+"Enable" => "Gaitu"
 );
--- a/apps/files_versions/l10n/fa.php
+++ b/apps/files_versions/l10n/fa.php
@ -1,4 +1,3 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "انقضای تمامی نسخه‌ها",
-"Enable Files Versioning" => "فعال‌کردن پرونده‌های نسخه‌بندی"
+"Expire all versions" => "انقضای تمامی نسخه‌ها"
 );
--- a/apps/files_versions/l10n/fi_FI.php
+++ b/apps/files_versions/l10n/fi_FI.php
@ -2,5 +2,6 @@
 "Expire all versions" => "Vanhenna kaikki versiot",
 "Versions" => "Versiot",
 "This will delete all existing backup versions of your files" => "Tämä poistaa kaikki tiedostojesi olemassa olevat varmuuskopioversiot",
-"Enable Files Versioning" => "Käytä tiedostojen versiointia"
+"Files Versioning" => "Tiedostojen versiointi",
+"Enable" => "Käytä"
 );
--- a/apps/files_versions/l10n/fr.php
+++ b/apps/files_versions/l10n/fr.php
@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "Supprimer les versions intermédiaires",
 "Versions" => "Versions",
-"This will delete all existing backup versions of your files" => "Cette opération va effacer toutes les versions intermédiaires de vos fichiers (et ne garder que la dernière version en date).",
-"Enable Files Versioning" => "Activer le versionnage"
+"This will delete all existing backup versions of your files" => "Cette opération va effacer toutes les versions intermédiaires de vos fichiers (et ne garder que la dernière version en date)."
 );
--- a/apps/files_versions/l10n/gl.php
+++ b/apps/files_versions/l10n/gl.php
@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Caducar todas as versións",
+"Versions" => "Versións",
+"This will delete all existing backup versions of your files" => "Esto eliminará todas as copias de respaldo existentes dos seus ficheiros",
+"Files Versioning" => "Versionado de ficheiros",
+"Enable" => "Habilitar"
+);
--- a/apps/files_versions/l10n/he.php
+++ b/apps/files_versions/l10n/he.php
@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "הפגת תוקף כל הגרסאות",
 "Versions" => "גרסאות",
-"This will delete all existing backup versions of your files" => "פעולה זו תמחק את כל גיבויי הגרסאות הקיימים של הקבצים שלך",
-"Enable Files Versioning" => "הפעלת ניהול גרסאות לקבצים"
+"This will delete all existing backup versions of your files" => "פעולה זו תמחק את כל גיבויי הגרסאות הקיימים של הקבצים שלך"
 );
--- a/apps/files_versions/l10n/it.php
+++ b/apps/files_versions/l10n/it.php
@ -2,5 +2,6 @@
 "Expire all versions" => "Scadenza di tutte le versioni",
 "Versions" => "Versioni",
 "This will delete all existing backup versions of your files" => "Ciò eliminerà tutte le versioni esistenti dei tuoi file",
-"Enable Files Versioning" => "Abilita controllo di versione"
+"Files Versioning" => "Controllo di versione dei file",
+"Enable" => "Abilita"
 );
--- a/apps/files_versions/l10n/ja_JP.php
+++ b/apps/files_versions/l10n/ja_JP.php
@ -2,5 +2,6 @@
 "Expire all versions" => "すべてのバージョンを削除する",
 "Versions" => "バージョン",
 "This will delete all existing backup versions of your files" => "これは、あなたのファイルのすべてのバックアップバージョンを削除します",
-"Enable Files Versioning" => "ファイルのバージョン管理を有効にする"
+"Files Versioning" => "ファイルのバージョン管理",
+"Enable" => "有効化"
 );
--- a/apps/files_versions/l10n/lt_LT.php
+++ b/apps/files_versions/l10n/lt_LT.php
@ -1,4 +1,3 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Panaikinti visų versijų galiojimą",
-"Enable Files Versioning" => "Įjungti failų versijų vedimą"
+"Expire all versions" => "Panaikinti visų versijų galiojimą"
 );
--- a/apps/files_versions/l10n/nl.php
+++ b/apps/files_versions/l10n/nl.php
@ -2,5 +2,6 @@
 "Expire all versions" => "Alle versies laten verlopen",
 "Versions" => "Versies",
 "This will delete all existing backup versions of your files" => "Dit zal alle bestaande backup versies van uw bestanden verwijderen",
-"Enable Files Versioning" => "Activeer file versioning"
+"Files Versioning" => "Bestand versies",
+"Enable" => "Zet aan"
 );
--- a/apps/files_versions/l10n/pl.php
+++ b/apps/files_versions/l10n/pl.php
@ -2,5 +2,6 @@
 "Expire all versions" => "Wygasają wszystkie wersje",
 "Versions" => "Wersje",
 "This will delete all existing backup versions of your files" => "Spowoduje to usunięcie wszystkich istniejących wersji kopii zapasowych plików",
-"Enable Files Versioning" => "Włącz wersjonowanie plików"
+"Files Versioning" => "Wersjonowanie plików",
+"Enable" => "Włącz"
 );
--- a/apps/files_versions/l10n/pt_BR.php
+++ b/apps/files_versions/l10n/pt_BR.php
@ -1,4 +1,3 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Expirar todas as versões",
-"Enable Files Versioning" => "Habilitar versionamento de arquivos"
+"Expire all versions" => "Expirar todas as versões"
 );
--- a/Show More
+++ b/Show More
 @ -1 +1 @@
 .3.1
 .3.2